diff --git a/.github/actions/install-node-dependencies/action.yml b/.github/actions/install-node-dependencies/action.yml
index 8b7801881eb..f06f0ffa8d8 100644
--- a/.github/actions/install-node-dependencies/action.yml
+++ b/.github/actions/install-node-dependencies/action.yml
@@ -28,10 +28,9 @@ runs:
   steps:
     # setup-node needs pnpm on PATH to locate and restore its store.
     - name: Setup pnpm
-      uses: pnpm/action-setup@v6
+      uses: pnpm/setup@v2
       with:
-        version: 10.24.0
-        run_install: false
+        install: false
 
     - name: Setup Node.js
       id: default-node
@@ -88,7 +87,7 @@ runs:
         pnpm install --frozen-lockfile --ignore-scripts
         # Job containers can run composite steps from a source mirror without .git.
         if [ "$(git -C "$GITHUB_WORKSPACE" rev-parse --is-inside-work-tree 2>/dev/null)" = true ]; then
-          git -C "$GITHUB_WORKSPACE" diff --exit-code -- package.json pnpm-lock.yaml
+          git -C "$GITHUB_WORKSPACE" diff --exit-code -- package.json pnpm-lock.yaml pnpm-workspace.yaml
         fi
 
     # Why cached: `--ignore-scripts` leaves node-pty without build/Release, so
diff --git a/.github/workflows/adhoc-mac-build.yml b/.github/workflows/adhoc-mac-build.yml
index 552444046ce..59d705bf67e 100644
--- a/.github/workflows/adhoc-mac-build.yml
+++ b/.github/workflows/adhoc-mac-build.yml
@@ -171,10 +171,9 @@ jobs:
           persist-credentials: false
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6
+        uses: pnpm/setup@v2
         with:
-          version: 10.24.0
-          run_install: false
+          install: false
 
       - name: Setup Node.js
         uses: actions/setup-node@v6
diff --git a/.github/workflows/daemon-relocation-spike.yml b/.github/workflows/daemon-relocation-spike.yml
index 161c4894138..2ffd4a58661 100644
--- a/.github/workflows/daemon-relocation-spike.yml
+++ b/.github/workflows/daemon-relocation-spike.yml
@@ -43,10 +43,9 @@ jobs:
           node-version-file: package.json
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6
+        uses: pnpm/setup@v2
         with:
-          version: 10.24.0
-          run_install: false
+          install: false
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
diff --git a/.github/workflows/daily-mac-build.yml b/.github/workflows/daily-mac-build.yml
index b439b7caad4..45130e932d8 100644
--- a/.github/workflows/daily-mac-build.yml
+++ b/.github/workflows/daily-mac-build.yml
@@ -145,10 +145,9 @@ jobs:
 
       - name: Setup pnpm
         if: steps.freshness.outputs.should_build == 'true'
-        uses: pnpm/action-setup@v6
+        uses: pnpm/setup@v2
         with:
-          version: 10.24.0
-          run_install: false
+          install: false
 
       - name: Setup Node.js
         if: steps.freshness.outputs.should_build == 'true'
diff --git a/.github/workflows/dev-channel-win-build.yml b/.github/workflows/dev-channel-win-build.yml
index 35abbf1c495..e16a50f1c3c 100644
--- a/.github/workflows/dev-channel-win-build.yml
+++ b/.github/workflows/dev-channel-win-build.yml
@@ -191,10 +191,9 @@ jobs:
 
       # pnpm must be on PATH before setup-node so setup-node can locate the store.
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6
+        uses: pnpm/setup@v2
         with:
-          version: 10.24.0
-          run_install: false
+          install: false
 
       - name: Setup Node.js
         uses: actions/setup-node@v6
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 92e33a18d19..c23aa0cb679 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -55,9 +55,13 @@ jobs:
         env:
           VITE_EXPOSE_STORE: 'true'
         run: |
-          npx electron-vite build --mode e2e
-          pnpm run build:web-from-renderer
-          pnpm run build:relay
+          status=0
+          pnpm run build:relay &
+          relay_pid=$!
+          npx electron-vite build --mode e2e || status=1
+          pnpm run build:web-from-renderer || status=1
+          wait "$relay_pid" || status=1
+          exit "$status"
 
       - name: Upload E2E build output
         uses: actions/upload-artifact@v7
@@ -71,9 +75,29 @@ jobs:
           retention-days: 1
           if-no-files-found: error
 
+  # Build Electron-native dependencies once per workflow. Consumer shards restore
+  # this immutable cache instead of compiling the same ABI concurrently.
+  prepare-native-cache:
+    name: prepare Electron native cache
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+        with:
+          ref: ${{ inputs.ref || github.ref }}
+
+      - name: Install native build tools
+        run: sudo apt-get update && sudo apt-get install -y build-essential python3
+
+      - uses: ./.github/actions/install-node-dependencies
+        with:
+          native-runtime: electron
+
   e2e:
     name: e2e ${{ matrix.shard_name }}
-    needs: build
+    needs: [build, prepare-native-cache]
     if: inputs.test_files == ''
     runs-on: ubuntu-latest
     timeout-minutes: 30
@@ -159,7 +183,7 @@ jobs:
 
   changed-e2e:
     name: changed e2e specs
-    needs: build
+    needs: [build, prepare-native-cache]
     if: inputs.test_files != ''
     runs-on: ubuntu-latest
     # Why 45: pr.yml now maps SSH source edits onto Docker-backed specs, so this lane can
@@ -227,8 +251,7 @@ jobs:
 
   ssh-docker-watcher-isolation:
     name: ssh docker watcher isolation
-    needs: build
-    # Why ssh_source_changed first: this lane used to trigger on SSH source only as a side
+    needs: [build, prepare-native-cache]
     # effect of one route listing a startup-readiness spec — pruning that spec would have
     # silently retired the whole lane. The signal is now derived from the SSH routes directly.
     # The two spec clauses stay for their honest purpose: changed-e2e hands these specs to this
diff --git a/.github/workflows/golden-e2e-experiment.yml b/.github/workflows/golden-e2e-experiment.yml
index 3216fb66a72..d46c80033fa 100644
--- a/.github/workflows/golden-e2e-experiment.yml
+++ b/.github/workflows/golden-e2e-experiment.yml
@@ -43,10 +43,9 @@ jobs:
           node-version-file: package.json
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6
+        uses: pnpm/setup@v2
         with:
-          version: 10.24.0
-          run_install: false
+          install: false
 
       # Why: Linux golden E2E uses the same native install path as PR/release CI,
       # which needs pnpm to bypass its non-executable bundled gyp_main.py.
diff --git a/.github/workflows/hourly-mac-build.yml b/.github/workflows/hourly-mac-build.yml
index d4dc4d3e391..ac3af92a3bc 100644
--- a/.github/workflows/hourly-mac-build.yml
+++ b/.github/workflows/hourly-mac-build.yml
@@ -135,10 +135,9 @@ jobs:
 
       - name: Setup pnpm
         if: steps.freshness.outputs.should_build == 'true'
-        uses: pnpm/action-setup@v6
+        uses: pnpm/setup@v2
         with:
-          version: 10.24.0
-          run_install: false
+          install: false
 
       - name: Setup Node.js
         if: steps.freshness.outputs.should_build == 'true'
diff --git a/.github/workflows/linux-wayland-gpu-sandbox.yml b/.github/workflows/linux-wayland-gpu-sandbox.yml
index 96256d5193c..15af59da8a5 100644
--- a/.github/workflows/linux-wayland-gpu-sandbox.yml
+++ b/.github/workflows/linux-wayland-gpu-sandbox.yml
@@ -24,10 +24,9 @@ jobs:
           node-version-file: package.json
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6
+        uses: pnpm/setup@v2
         with:
-          version: 10.24.0
-          run_install: false
+          install: false
 
       # Why: mirrors pr.yml so native module rebuilds do not use pnpm's
       # non-executable bundled gyp_main.py on Linux runners.
@@ -44,12 +43,9 @@ jobs:
           fi
 
       - name: Install dependencies
-        # Why: pnpm 10.24's frozen headless fast path can fail on fresh Ubuntu
-        # runners while creating the root node_modules. Use the normal resolver
-        # path, then verify package metadata stayed unchanged.
         run: |
-          pnpm install --no-frozen-lockfile --prefer-frozen-lockfile=false
-          git diff --exit-code package.json pnpm-lock.yaml
+          pnpm install --frozen-lockfile
+          git diff --exit-code package.json pnpm-lock.yaml pnpm-workspace.yaml
 
       - name: Start Weston
         run: |
diff --git a/.github/workflows/mobile-android-release.yml b/.github/workflows/mobile-android-release.yml
index 6dfc99b8273..35e900dc31c 100644
--- a/.github/workflows/mobile-android-release.yml
+++ b/.github/workflows/mobile-android-release.yml
@@ -44,10 +44,9 @@ jobs:
           node-version: 24
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6
+        uses: pnpm/setup@v2
         with:
-          version: 10.24.0
-          run_install: false
+          install: false
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
diff --git a/.github/workflows/mobile-ios-release.yml b/.github/workflows/mobile-ios-release.yml
index 31fe546fbf0..934b3f694a3 100644
--- a/.github/workflows/mobile-ios-release.yml
+++ b/.github/workflows/mobile-ios-release.yml
@@ -64,10 +64,9 @@ jobs:
           node-version: 24
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6
+        uses: pnpm/setup@v2
         with:
-          version: 10.24.0
-          run_install: false
+          install: false
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
diff --git a/.github/workflows/mobile.yml b/.github/workflows/mobile.yml
index ce968e54fab..59f6cf20bf4 100644
--- a/.github/workflows/mobile.yml
+++ b/.github/workflows/mobile.yml
@@ -51,10 +51,9 @@ jobs:
           working-directory: mobile
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6
+        uses: pnpm/setup@v2
         with:
-          version: 10.24.0
-          run_install: false
+          install: false
 
       # Why: the mobile typecheck imports shared types from ../src/shared, and
       # some of those files import runtime deps (tweetnacl, ws) resolved from
diff --git a/.github/workflows/release-cut.yml b/.github/workflows/release-cut.yml
index 1d65ad89a21..f4db35bc314 100644
--- a/.github/workflows/release-cut.yml
+++ b/.github/workflows/release-cut.yml
@@ -864,10 +864,9 @@ jobs:
           node-version-file: package.json
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6
+        uses: pnpm/setup@v2
         with:
-          version: 10.24.0
-          run_install: false
+          install: false
 
       # Why: Linux terminal golden E2E uses the same native install path as
       # release CI, which needs pnpm to bypass its non-executable gyp_main.py.
@@ -1080,10 +1079,9 @@ jobs:
           node-version-file: package.json
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6
+        uses: pnpm/setup@v2
         with:
-          version: 10.24.0
-          run_install: false
+          install: false
 
       # Why: keep the non-blocking evidence lane on the same Linux native
       # install path as the blocking golden and release build jobs.
@@ -1195,10 +1193,9 @@ jobs:
 
       # pnpm must be on PATH before setup-node so setup-node can locate the store for caching.
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6
+        uses: pnpm/setup@v2
         with:
-          version: 10.24.0
-          run_install: false
+          install: false
 
       - name: Setup Node.js
         uses: actions/setup-node@v6
diff --git a/.github/workflows/release-mac-build.yml b/.github/workflows/release-mac-build.yml
index 54fbc65d9c8..f97ac0e5537 100644
--- a/.github/workflows/release-mac-build.yml
+++ b/.github/workflows/release-mac-build.yml
@@ -38,10 +38,9 @@ jobs:
           ref: refs/tags/${{ inputs.tag }}
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6
+        uses: pnpm/setup@v2
         with:
-          version: 10.24.0
-          run_install: false
+          install: false
 
       - name: Setup Node.js
         uses: actions/setup-node@v6
diff --git a/.github/workflows/terminal-ime-e2e.yml b/.github/workflows/terminal-ime-e2e.yml
index 5cf83589b02..83f5b839828 100644
--- a/.github/workflows/terminal-ime-e2e.yml
+++ b/.github/workflows/terminal-ime-e2e.yml
@@ -41,10 +41,9 @@ jobs:
           node-version-file: package.json
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6
+        uses: pnpm/setup@v2
         with:
-          version: 10.24.0
-          run_install: false
+          install: false
 
       - name: Use external node-gyp to avoid pnpm bundled copy
         run: |
diff --git a/.github/workflows/terminal-perf.yml b/.github/workflows/terminal-perf.yml
index 6c3866a8ea0..38d0a25bbb7 100644
--- a/.github/workflows/terminal-perf.yml
+++ b/.github/workflows/terminal-perf.yml
@@ -73,10 +73,9 @@ jobs:
           node-version-file: package.json
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6
+        uses: pnpm/setup@v2
         with:
-          version: 10.24.0
-          run_install: false
+          install: false
 
       # Why: this scheduled/manual workflow uses the same native install path as
       # PR and E2E CI, which needs pnpm to bypass its bundled gyp_main.py.
diff --git a/.github/workflows/win-crash-survival-e2e.yml b/.github/workflows/win-crash-survival-e2e.yml
index 13fae0c4126..f3d22cc1227 100644
--- a/.github/workflows/win-crash-survival-e2e.yml
+++ b/.github/workflows/win-crash-survival-e2e.yml
@@ -46,10 +46,9 @@ jobs:
       # Why: setup-node can restore pnpm's content-addressed store only after
       # the pnpm binary exists, avoiding repeat dependency downloads per run.
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6
+        uses: pnpm/setup@v2
         with:
-          version: 10.24.0
-          run_install: false
+          install: false
 
       - name: Setup Node.js
         uses: actions/setup-node@v6
diff --git a/.github/workflows/win-update-e2e.yml b/.github/workflows/win-update-e2e.yml
index 604ccd92b14..2a1bde70924 100644
--- a/.github/workflows/win-update-e2e.yml
+++ b/.github/workflows/win-update-e2e.yml
@@ -85,10 +85,9 @@ jobs:
           node-version-file: package.json
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6
+        uses: pnpm/setup@v2
         with:
-          version: 10.24.0
-          run_install: false
+          install: false
 
       # Why: the harness only needs its runtime deps (the Playwright Electron
       # driver); it drives already-built installer artifacts, so no app build.
diff --git a/.github/workflows/win-update-survival-e2e.yml b/.github/workflows/win-update-survival-e2e.yml
index f3d3c21bff7..e7ed41125e9 100644
--- a/.github/workflows/win-update-survival-e2e.yml
+++ b/.github/workflows/win-update-survival-e2e.yml
@@ -58,10 +58,9 @@ jobs:
           node-version-file: package.json
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6
+        uses: pnpm/setup@v2
         with:
-          version: 10.24.0
-          run_install: false
+          install: false
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
diff --git a/.github/workflows/windows-signing-rehearsal.yml b/.github/workflows/windows-signing-rehearsal.yml
index 18aadd7d933..54b751908dc 100644
--- a/.github/workflows/windows-signing-rehearsal.yml
+++ b/.github/workflows/windows-signing-rehearsal.yml
@@ -46,10 +46,9 @@ jobs:
           persist-credentials: false
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6
+        uses: pnpm/setup@v2
         with:
-          version: 10.24.0
-          run_install: false
+          install: false
 
       - name: Setup Node.js
         uses: actions/setup-node@v6
diff --git a/.github/workflows/windows-terminal-restart-e2e.yml b/.github/workflows/windows-terminal-restart-e2e.yml
index 3a5b4a35715..abb8dc89aa8 100644
--- a/.github/workflows/windows-terminal-restart-e2e.yml
+++ b/.github/workflows/windows-terminal-restart-e2e.yml
@@ -32,10 +32,9 @@ jobs:
 
       # Why: pnpm must exist before setup-node resolves its dependency cache.
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6
+        uses: pnpm/setup@v2
         with:
-          version: 10.24.0
-          run_install: false
+          install: false
 
       - name: Setup Node.js
         uses: actions/setup-node@v6
diff --git a/.npmrc b/.npmrc
deleted file mode 100644
index 313e39e8526..00000000000
--- a/.npmrc
+++ /dev/null
@@ -1,2 +0,0 @@
-shamefully-hoist=true
-minimum-release-age=4320
diff --git a/.oxlintrc.json b/.oxlintrc.json
index 97a2b68701a..e0c03a3b045 100644
--- a/.oxlintrc.json
+++ b/.oxlintrc.json
@@ -40,6 +40,18 @@
     "react/no-string-refs": "error",
     "react/no-unescaped-entities": "error",
     "react/require-render-return": "error",
+    "react/error-boundaries": "error",
+    "react/globals": "error",
+    "react/immutability": "off",
+    "react/incompatible-library": "off",
+    "react/preserve-manual-memoization": "off",
+    "react/purity": "off",
+    "react/refs": "off",
+    "react/set-state-in-effect": "off",
+    "react/set-state-in-render": "error",
+    "react/static-components": "off",
+    "react/use-memo": "error",
+    "react/void-use-memo": "error",
     "react/jsx-curly-brace-presence": [
       "error",
       { "props": "never", "children": "never", "propElementValues": "always" }
@@ -62,6 +74,7 @@
     "typescript/consistent-type-definitions": ["error", "type"],
     "typescript/consistent-type-imports": "error",
     "typescript/no-explicit-any": ["error", { "ignoreRestArgs": true }],
+    "typescript/no-confusing-non-null-assertion": "error",
     "typescript/no-import-type-side-effects": "error",
     "typescript/no-unnecessary-boolean-literal-compare": "error",
     "typescript/no-unnecessary-template-expression": "error",
@@ -131,6 +144,7 @@
     {
       "files": ["**/*.test.*", "**/*.spec.*", "**/*-benchmark.*"],
       "rules": {
+        "react/globals": "off",
         "quadratic-buffer-concat/no-loop-carried-concat": "off",
         "renderer-scrollbar-style/require-styled-vertical-scrollbar": "off"
       }
diff --git a/config/docker/headless-pairing/Dockerfile.build b/config/docker/headless-pairing/Dockerfile.build
index 900607a7a5c..19f76290c75 100644
--- a/config/docker/headless-pairing/Dockerfile.build
+++ b/config/docker/headless-pairing/Dockerfile.build
@@ -26,6 +26,7 @@ RUN apt-get update \
   && rm -rf /var/lib/apt/lists/*
 
 RUN corepack enable \
-  && corepack prepare pnpm@10.24.0 --activate
+  && corepack prepare pnpm@12.0.0 --activate \
+  && pnpm --version
 
 WORKDIR /workspace
diff --git a/config/max-lines-baseline.txt b/config/max-lines-baseline.txt
index 75e536a2198..1ec04ed59ba 100644
--- a/config/max-lines-baseline.txt
+++ b/config/max-lines-baseline.txt
@@ -3,72 +3,40 @@
 # split the oversized file instead (AGENTS.md → "Do Not Disable Max Lines").
 # Regenerate/prune: pnpm check:max-lines-ratchet --prune   (removes stale entries only)
 inline src/main/agent-hooks/server.ts
-inline src/main/automations/external-manager.ts
 inline src/main/browser/agent-browser-bridge.ts
 inline src/main/browser/browser-cookie-import.ts
 inline src/main/browser/browser-manager.ts
-inline src/main/browser/cdp-bridge.ts
-inline src/main/claude-accounts/runtime-auth-service.ts
 inline src/main/codex-accounts/runtime-home-service.ts
-inline src/main/codex-accounts/service.ts
-inline src/main/codex/hook-service.ts
-inline src/main/daemon/daemon-init.ts
-inline src/main/git/worktree.ts
-inline src/main/github/project-view.ts
 inline src/main/index.ts
-inline src/main/ipc/filesystem-watcher.ts
 inline src/main/ipc/filesystem.ts
 inline src/main/ipc/worktree-remote.ts
-inline src/main/providers/local-pty-provider.ts
 inline src/main/rate-limits/service.ts
 inline src/main/runtime/orca-runtime-browser.ts
 inline src/main/runtime/orca-runtime-files.ts
 inline src/main/runtime/orca-runtime.test.ts
 inline src/main/runtime/orca-runtime.ts
 inline src/main/runtime/rpc/methods/orchestration.ts
-inline src/main/runtime/runtime-rpc.ts
-inline src/main/source-control/hosted-review-creation.ts
-inline src/main/speech/stt-service.ts
 inline src/main/ssh/ssh-channel-multiplexer.ts
 inline src/main/ssh/ssh-connection.ts
 inline src/main/ssh/ssh-relay-deploy.ts
 inline src/main/ssh/ssh-relay-session.ts
 inline src/main/updater.ts
-inline src/main/window/attach-main-window-services.ts
 inline src/preload/index.ts
-inline src/relay/dispatcher.ts
-inline src/relay/git-handler.ts
 inline src/relay/pty-handler.ts
-inline src/relay/workspace-space-scan.ts
-inline src/renderer/src/components/GitLabItemDialog.tsx
-inline src/renderer/src/components/LinearItemDrawer.tsx
 inline src/renderer/src/components/TaskPage.tsx
 inline src/renderer/src/components/Terminal.tsx
 inline src/renderer/src/components/WorktreeJumpPalette.tsx
-inline src/renderer/src/components/activity/ActivityPrototypePage.tsx
 inline src/renderer/src/components/automations/AutomationsPage.tsx
 inline src/renderer/src/components/editor/CombinedDiffViewer.tsx
 inline src/renderer/src/components/editor/MarkdownPreview.tsx
 inline src/renderer/src/components/floating-terminal/FloatingTerminalPanel.tsx
 inline src/renderer/src/components/new-workspace/SmartWorkspaceNameField.tsx
-inline src/renderer/src/components/right-sidebar/PortsPanel.tsx
-inline src/renderer/src/components/settings/AccountsPane.tsx
-inline src/renderer/src/components/settings/RuntimeEnvironmentsPane.tsx
-inline src/renderer/src/components/settings/Settings.tsx
-inline src/renderer/src/components/status-bar/ResourceUsageStatusSegment.tsx
 inline src/renderer/src/components/status-bar/StatusBar.tsx
 inline src/renderer/src/components/status-bar/WorkspaceSpaceManagerPanel.tsx
 inline src/renderer/src/components/terminal-pane/TerminalPane.tsx
 inline src/renderer/src/components/terminal-pane/remote-runtime-pty-transport.ts
 inline src/renderer/src/components/terminal-pane/use-terminal-pane-lifecycle.ts
-inline src/renderer/src/hooks/useAutomationDispatchEvents.ts
-inline src/renderer/src/hooks/useSettingsNavigationMetadata.ts
-inline src/renderer/src/lib/pane-manager/pane-terminal-output-scheduler.ts
-inline src/renderer/src/lib/pane-manager/pane-tree-ops.ts
-inline src/renderer/src/runtime/remote-runtime-terminal-multiplexer.ts
-inline src/renderer/src/runtime/runtime-file-client.ts
 inline src/renderer/src/runtime/sync-runtime-graph.ts
-inline src/renderer/src/runtime/web-runtime-session.ts
 inline src/renderer/src/runtime/web-session-tabs-sync.ts
 inline src/renderer/src/store/slices/agent-status.ts
 inline src/renderer/src/store/slices/browser.ts
@@ -76,16 +44,11 @@ inline src/renderer/src/store/slices/linear.ts
 inline src/renderer/src/store/slices/tabs.ts
 inline src/renderer/src/store/slices/ui.ts
 inline src/shared/keybindings.ts
-inline src/shared/telemetry-events.ts
 mobile-config app/h/*/files/*.tsx
-mobile-config app/h/*/index.tsx
 mobile-config app/h/*/session/*.tsx
 mobile-config app/h/*/source-control/*.tsx
 mobile-config app/h/*/tasks.tsx
 mobile-config app/index.tsx
-mobile-config app/troubleshoot.tsx
 mobile-config scripts/mock-server.ts
-mobile-config src/browser/MobileBrowserPane.tsx
-mobile-config src/components/NewWorktreeModal.tsx
 mobile-config src/terminal/terminal-webview-html.ts
 mobile-config src/transport/rpc-client.ts
diff --git a/config/patches/@vscode__windows-process-tree@0.8.0.patch b/config/patches/@vscode__windows-process-tree@0.8.0.patch
index 65cf2be5ce4..10780f5288a 100644
--- a/config/patches/@vscode__windows-process-tree@0.8.0.patch
+++ b/config/patches/@vscode__windows-process-tree@0.8.0.patch
@@ -10,7 +10,7 @@ index 855bd4b86f0a3c18c7594212c0e42b6e35bc4001..33774e7ae296f0de39dd94156673c9e7
        ],
        "conditions": [
          ['OS=="win"', {
-@@ -15,14 +14,13 @@
+@@ -15,12 +14,11 @@
              "src/process_commandline.cc"
            ],
 -          "include_dirs": [],
diff --git a/config/patches/@xterm__addon-webgl@0.20.0-beta.286.patch b/config/patches/@xterm__addon-webgl@0.20.0-beta.286.patch
index dece243837f..de8de45664f 100644
--- a/config/patches/@xterm__addon-webgl@0.20.0-beta.286.patch
+++ b/config/patches/@xterm__addon-webgl@0.20.0-beta.286.patch
@@ -1,4 +1,4 @@
-diff -ruN a/lib/addon-webgl.js b/lib/addon-webgl.js
+diff --git a/lib/addon-webgl.js b/lib/addon-webgl.js
 --- a/lib/addon-webgl.js
 +++ b/lib/addon-webgl.js
 @@ -1,2 +1,15 @@
@@ -20,7 +20,7 @@ diff -ruN a/lib/addon-webgl.js b/lib/addon-webgl.js
 +    outColor = texture(u_texture[0], v_texcoord);
 +  } ${e4} else { outColor = vec4(0.0, 0.0, 0.0, 0.0); }
 +}`})(s2.TextureAtlas.maxAtlasPages),this._logService)),this._register((0,a.toDisposable)(()=>h2.deleteProgram(this._program))),this._projectionLocation=(0,n.throwIfFalsy)(h2.getUniformLocation(this._program,"u_projection")),this._resolutionLocation=(0,n.throwIfFalsy)(h2.getUniformLocation(this._program,"u_resolution")),this._textureLocation=(0,n.throwIfFalsy)(h2.getUniformLocation(this._program,"u_texture"));const T2=this._vertexArrayObject=h2.createVertexArray();this._register((0,a.toDisposable)(()=>h2.deleteVertexArray(T2))),h2.bindVertexArray(T2);const l2=new Float32Array([0,0,1,0,0,1,1,1]),d2=h2.createBuffer();this._register((0,a.toDisposable)(()=>h2.deleteBuffer(d2))),h2.bindBuffer(h2.ARRAY_BUFFER,d2),h2.bufferData(h2.ARRAY_BUFFER,l2,h2.STATIC_DRAW),h2.enableVertexAttribArray(0),h2.vertexAttribPointer(0,2,this._gl.FLOAT,false,0,0);const c=new Uint8Array([0,1,2,3]),_=h2.createBuffer();this._register((0,a.toDisposable)(()=>h2.deleteBuffer(_))),h2.bindBuffer(h2.ELEMENT_ARRAY_BUFFER,_),h2.bufferData(h2.ELEMENT_ARRAY_BUFFER,c,h2.STATIC_DRAW),this._attributesBuffer=(0,n.throwIfFalsy)(h2.createBuffer()),this._register((0,a.toDisposable)(()=>h2.deleteBuffer(this._attributesBuffer))),h2.bindBuffer(h2.ARRAY_BUFFER,this._attributesBuffer),h2.enableVertexAttribArray(2),h2.vertexAttribPointer(2,2,h2.FLOAT,false,44,0),h2.vertexAttribDivisor(2,1),h2.enableVertexAttribArray(3),h2.vertexAttribPointer(3,2,h2.FLOAT,false,44,2*Float32Array.BYTES_PER_ELEMENT),h2.vertexAttribDivisor(3,1),h2.enableVertexAttribArray(4),h2.vertexAttribPointer(4,1,h2.FLOAT,false,44,4*Float32Array.BYTES_PER_ELEMENT),h2.vertexAttribDivisor(4,1),h2.enableVertexAttribArray(5),h2.vertexAttribPointer(5,2,h2.FLOAT,false,44,5*Float32Array.BYTES_PER_ELEMENT),h2.vertexAttribDivisor(5,1),h2.enableVertexAttribArray(6),h2.vertexAttribPointer(6,2,h2.FLOAT,false,44,7*Float32Array.BYTES_PER_ELEMENT),h2.vertexAttribDivisor(6,1),h2.enableVertexAttribArray(1),h2.vertexAttribPointer(1,2,h2.FLOAT,false,44,9*Float32Array.BYTES_PER_ELEMENT),h2.vertexAttribDivisor(1,1),h2.useProgram(this._program);const Q=new Int32Array(s2.TextureAtlas.maxAtlasPages);for(let t4=0;t4<s2.TextureAtlas.maxAtlasPages;t4++)Q[t4]=t4;h2.uniform1iv(this._textureLocation,Q),h2.uniformMatrix4fv(this._projectionLocation,false,o.PROJECTION_MATRIX),this._atlasTextures=[];for(let t4=0;t4<s2.TextureAtlas.maxAtlasPages;t4++){const e4=new o.GLTexture((0,n.throwIfFalsy)(h2.createTexture()));this._register((0,a.toDisposable)(()=>h2.deleteTexture(e4.texture))),h2.activeTexture(h2.TEXTURE0+t4),h2.bindTexture(h2.TEXTURE_2D,e4.texture),h2.texParameteri(h2.TEXTURE_2D,h2.TEXTURE_WRAP_S,h2.CLAMP_TO_EDGE),h2.texParameteri(h2.TEXTURE_2D,h2.TEXTURE_WRAP_T,h2.CLAMP_TO_EDGE),h2.texImage2D(h2.TEXTURE_2D,0,h2.RGBA,1,1,0,h2.RGBA,h2.UNSIGNED_BYTE,new Uint8Array([255,0,0,255])),this._atlasTextures[t4]=e4};h2.enable(h2.BLEND),h2.blendFunc(h2.SRC_ALPHA,h2.ONE_MINUS_SRC_ALPHA),this.handleResize()}beginFrame(){if(!this._atlas)return true;const _g=this._atlas._clearModelGeneration||0;return this._lastSeenClearModelGeneration!==_g&&(this._lastSeenClearModelGeneration=_g,true)}updateCell(t3,e3,i3,s3,r2,a2,o2,n2,L2){this._updateCell(this._vertices.attributes,t3,e3,i3,s3,r2,a2,o2,n2,L2)}_updateCell(t3,e3,i3,s3,a2,o2,d2,c,_,Q){;h=11*(i3*this._terminal.cols+e3),s3!==r.NULL_CELL_CODE&&void 0!==s3?this._atlas&&(L=c&&c.length>1?this._atlas.getRasterizedGlyphCombinedChar(c,a2,o2,d2,false,this._terminal.element):this._atlas.getRasterizedGlyph(s3,a2,o2,d2,false,this._terminal.element),T=Math.floor((this._dimensions.device.cell.width-this._dimensions.device.char.width)/2),a2!==Q&&L.offset.x>T?(l=L.offset.x-T,t3[h]=-(L.offset.x-l)+this._dimensions.device.char.left,t3[h+1]=-L.offset.y+this._dimensions.device.char.top,t3[h+2]=(L.size.x-l)/this._dimensions.device.canvas.width,t3[h+3]=L.size.y/this._dimensions.device.canvas.height,t3[h+4]=L.texturePage,t3[h+5]=L.texturePositionClipSpace.x+l/this._atlas.pages[L.texturePage].canvas.width,t3[h+6]=L.texturePositionClipSpace.y,t3[h+7]=L.sizeClipSpace.x-l/this._atlas.pages[L.texturePage].canvas.width,t3[h+8]=L.sizeClipSpace.y):(t3[h]=-L.offset.x+this._dimensions.device.char.left,t3[h+1]=-L.offset.y+this._dimensions.device.char.top,t3[h+2]=L.size.x/this._dimensions.device.canvas.width,t3[h+3]=L.size.y/this._dimensions.device.canvas.height,t3[h+4]=L.texturePage,t3[h+5]=L.texturePositionClipSpace.x,t3[h+6]=L.texturePositionClipSpace.y,t3[h+7]=L.sizeClipSpace.x,t3[h+8]=L.sizeClipSpace.y),this._optionsService.rawOptions.rescaleOverlappingGlyphs&&(0,n.allowRescaling)(s3,_,L.size.x,this._dimensions.device.cell.width)&&(t3[h+2]=(this._dimensions.device.cell.width-1)/this._dimensions.device.canvas.width)):t3.fill(0,h,h+11-1-2)}clear(){const t3=this._terminal,e3=t3.cols*t3.rows*11;this._vertices.count!==e3?this._vertices.attributes=new Float32Array(e3):this._vertices.attributes.fill(0);let i3=0;for(;i3<this._vertices.attributesBuffers.length;i3++)this._vertices.count!==e3?this._vertices.attributesBuffers[i3]=new Float32Array(e3):this._vertices.attributesBuffers[i3].fill(0);this._vertices.count=e3,i3=0;for(let e4=0;e4<t3.rows;e4++)for(let s3=0;s3<t3.cols;s3++)this._vertices.attributes[i3+9]=s3/t3.cols,this._vertices.attributes[i3+10]=e4/t3.rows,i3+=11}handleResize(){const t3=this._gl;t3.useProgram(this._program),t3.viewport(0,0,this._dimensions.device.canvas.width,this._dimensions.device.canvas.height),t3.uniform2f(this._resolutionLocation,this._dimensions.device.canvas.width,this._dimensions.device.canvas.height),this.clear()}render(t3){if(!this._atlas)return;const e3=this._gl;e3.useProgram(this._program),e3.bindVertexArray(this._vertexArrayObject),this._activeBuffer=(this._activeBuffer+1)%2;const i3=this._vertices.attributesBuffers[this._activeBuffer];let s3=0;for(let e4=0;e4<t3.lineLengths.length;e4++){const r2=e4*this._terminal.cols*11,a2=this._vertices.attributes.subarray(r2,r2+11*t3.lineLengths[e4]);i3.set(a2,s3),s3+=a2.length};e3.bindBuffer(e3.ARRAY_BUFFER,this._attributesBuffer),e3.bufferData(e3.ARRAY_BUFFER,i3.subarray(0,s3),e3.STREAM_DRAW);this._atlas.pages.length>this._atlasTextures.length&&!this._pageOverflowWarned&&(this._pageOverflowWarned=true,console.warn("xterm webgl: atlas page count ("+this._atlas.pages.length+") exceeds the renderer texture capacity ("+this._atlasTextures.length+"), some glyphs will not render correctly"));for(let t4=0;t4<Math.min(this._atlas.pages.length,this._atlasTextures.length);t4++)this._atlas.pages[t4].version!==this._atlasTextures[t4].version&&this._bindAtlasPageTexture(e3,this._atlas,t4);e3.drawElementsInstanced(e3.TRIANGLE_STRIP,4,e3.UNSIGNED_BYTE,0,s3/11)}setAtlas(t3){;this._atlas!==t3&&(this._atlas=t3,this._lastSeenClearModelGeneration=-1),this.invalidateAtlasTextures()}invalidateAtlasTextures(){for(const t3 of this._atlasTextures)t3.version=-1}_bindAtlasPageTexture(t3,e3,i3){;t3.activeTexture(t3.TEXTURE0+i3),t3.bindTexture(t3.TEXTURE_2D,this._atlasTextures[i3].texture),t3.texParameteri(t3.TEXTURE_2D,t3.TEXTURE_WRAP_S,t3.CLAMP_TO_EDGE),t3.texParameteri(t3.TEXTURE_2D,t3.TEXTURE_WRAP_T,t3.CLAMP_TO_EDGE),t3.texParameteri(t3.TEXTURE_2D,t3.TEXTURE_MIN_FILTER,t3.LINEAR),t3.texParameteri(t3.TEXTURE_2D,t3.TEXTURE_MAG_FILTER,t3.LINEAR),t3.texImage2D(t3.TEXTURE_2D,0,t3.RGBA,t3.RGBA,t3.UNSIGNED_BYTE,e3.pages[i3].canvas),this._atlasTextures[i3].version=e3.pages[i3].version}setDimensions(t3){this._dimensions=t3}}e2.GlyphRenderer=d},203(t2,e2,i2){;Object.defineProperty(e2,"__esModule",{value:true}),e2.RectangleRenderer=void 0;const s2=i2(426),r=i2(719),a=i2(959),o=8*Float32Array.BYTES_PER_ELEMENT;class n{constructor(){;this.attributes=new Float32Array(160),this.count=0}}let L=0,h=0,T=0,l=0,d=0,c=0,_=0;class Q extends s2.Disposable{constructor(t3,e3,i3,L2,h2){;super(),this._terminal=t3,this._gl=e3,this._dimensions=i3,this._themeService=L2,this._logService=h2,this._vertices=new n,this._verticesCursor=new n;const T2=this._gl;this._program=(0,a.throwIfFalsy)((0,r.createProgram)(T2,"#version 300 es\nlayout (location = 0) in vec2 a_position;\nlayout (location = 1) in vec2 a_size;\nlayout (location = 2) in vec4 a_color;\nlayout (location = 3) in vec2 a_unitquad;\n\nuniform mat4 u_projection;\n\nout vec4 v_color;\n\nvoid main() {\n  vec2 zeroToOne = a_position + (a_unitquad * a_size);\n  gl_Position = u_projection * vec4(zeroToOne, 0.0, 1.0);\n  v_color = a_color;\n}","#version 300 es\nprecision lowp float;\n\nin vec4 v_color;\n\nout vec4 outColor;\n\nvoid main() {\n  outColor = v_color;\n}",this._logService)),this._register((0,s2.toDisposable)(()=>T2.deleteProgram(this._program))),this._projectionLocation=(0,a.throwIfFalsy)(T2.getUniformLocation(this._program,"u_projection"));const l2=this._vertexArrayObject=T2.createVertexArray();this._register((0,s2.toDisposable)(()=>T2.deleteVertexArray(l2))),T2.bindVertexArray(l2);const d2=new Float32Array([0,0,1,0,0,1,1,1]),c2=T2.createBuffer();this._register((0,s2.toDisposable)(()=>T2.deleteBuffer(c2))),T2.bindBuffer(T2.ARRAY_BUFFER,c2),T2.bufferData(T2.ARRAY_BUFFER,d2,T2.STATIC_DRAW),T2.enableVertexAttribArray(3),T2.vertexAttribPointer(3,2,this._gl.FLOAT,false,0,0);const _2=new Uint8Array([0,1,2,3]),Q2=T2.createBuffer();this._register((0,s2.toDisposable)(()=>T2.deleteBuffer(Q2))),T2.bindBuffer(T2.ELEMENT_ARRAY_BUFFER,Q2),T2.bufferData(T2.ELEMENT_ARRAY_BUFFER,_2,T2.STATIC_DRAW),this._attributesBuffer=(0,a.throwIfFalsy)(T2.createBuffer()),this._register((0,s2.toDisposable)(()=>T2.deleteBuffer(this._attributesBuffer))),T2.bindBuffer(T2.ARRAY_BUFFER,this._attributesBuffer),T2.enableVertexAttribArray(0),T2.vertexAttribPointer(0,2,T2.FLOAT,false,o,0),T2.vertexAttribDivisor(0,1),T2.enableVertexAttribArray(1),T2.vertexAttribPointer(1,2,T2.FLOAT,false,o,2*Float32Array.BYTES_PER_ELEMENT),T2.vertexAttribDivisor(1,1),T2.enableVertexAttribArray(2),T2.vertexAttribPointer(2,4,T2.FLOAT,false,o,4*Float32Array.BYTES_PER_ELEMENT),T2.vertexAttribDivisor(2,1),this._updateCachedColors(L2.colors),this._register(this._themeService.onChangeColors(t4=>{;this._updateCachedColors(t4),this._updateViewportRectangle()}))}renderBackgrounds(){this._renderVertices(this._vertices)}renderCursor(){this._renderVertices(this._verticesCursor)}_renderVertices(t3){const e3=this._gl;e3.useProgram(this._program),e3.bindVertexArray(this._vertexArrayObject),e3.uniformMatrix4fv(this._projectionLocation,false,r.PROJECTION_MATRIX),e3.bindBuffer(e3.ARRAY_BUFFER,this._attributesBuffer),e3.bufferData(e3.ARRAY_BUFFER,t3.attributes,e3.DYNAMIC_DRAW),e3.drawElementsInstanced(this._gl.TRIANGLE_STRIP,4,e3.UNSIGNED_BYTE,0,t3.count)}handleResize(){this._updateViewportRectangle()}setDimensions(t3){this._dimensions=t3}_updateCachedColors(t3){;this._bgFloat=this._colorToFloat32Array(t3.background),this._cursorFloat=this._colorToFloat32Array(t3.cursor)}_updateViewportRectangle(){this._addRectangleFloat(this._vertices.attributes,0,0,0,this._terminal.cols*this._dimensions.device.cell.width,this._terminal.rows*this._dimensions.device.cell.height,this._bgFloat)}updateBackgrounds(t3){const e3=this._terminal,i3=this._vertices;let s3,r2,a2,o2,n2,L2,h2,T2,l2,d2,c2,_2=1;for(s3=0;s3<e3.rows;s3++){for(a2=-1,o2=0,n2=0,L2=false,r2=0;r2<e3.cols;r2++)h2=4*(s3*e3.cols+r2),T2=t3.cells[h2+1],l2=t3.cells[h2+2],d2=!!(67108864&l2),(T2!==o2||l2!==n2&&(L2||d2))&&((0!==o2||L2&&0!==n2)&&(c2=8*_2++,this._updateRectangle(i3,c2,n2,o2,a2,r2,s3)),a2=r2,o2=T2,n2=l2,L2=d2);(0!==o2||L2&&0!==n2)&&(c2=8*_2++,this._updateRectangle(i3,c2,n2,o2,a2,e3.cols,s3))}i3.count=_2}updateCursor(t3){const e3=this._verticesCursor,i3=t3.cursor;if(!i3||"block"===i3.style)return void(e3.count=0);let s3,r2=0;"bar"!==i3.style&&"outline"!==i3.style||(s3=8*r2++,this._addRectangleFloat(e3.attributes,s3,i3.x*this._dimensions.device.cell.width,i3.y*this._dimensions.device.cell.height,"bar"===i3.style?i3.dpr*i3.cursorWidth:i3.dpr,this._dimensions.device.cell.height,this._cursorFloat)),"underline"!==i3.style&&"outline"!==i3.style||(s3=8*r2++,this._addRectangleFloat(e3.attributes,s3,i3.x*this._dimensions.device.cell.width,(i3.y+1)*this._dimensions.device.cell.height-i3.dpr,i3.width*this._dimensions.device.cell.width,i3.dpr,this._cursorFloat)),"outline"===i3.style&&(s3=8*r2++,this._addRectangleFloat(e3.attributes,s3,i3.x*this._dimensions.device.cell.width,i3.y*this._dimensions.device.cell.height,i3.width*this._dimensions.device.cell.width,i3.dpr,this._cursorFloat),s3=8*r2++,this._addRectangleFloat(e3.attributes,s3,(i3.x+i3.width)*this._dimensions.device.cell.width-i3.dpr,i3.y*this._dimensions.device.cell.height,i3.dpr,this._dimensions.device.cell.height,this._cursorFloat)),e3.count=r2}_updateRectangle(t3,e3,i3,s3,a2,o2,n2){if(67108864&i3)switch(50331648&i3){case 16777216:case 33554432:L=this._themeService.colors.ansi[255&i3].rgba;break;case 50331648:L=(16777215&i3)<<8;break;default:L=this._themeService.colors.foreground.rgba}else switch(50331648&s3){case 16777216:case 33554432:L=this._themeService.colors.ansi[255&s3].rgba;break;case 50331648:L=(16777215&s3)<<8;break;default:L=this._themeService.colors.background.rgba};t3.attributes.length<e3+8&&(t3.attributes=(0,r.expandFloat32Array)(t3.attributes,8*(this._terminal.rows*this._terminal.cols+1))),h=a2*this._dimensions.device.cell.width,T=n2*this._dimensions.device.cell.height,l=(L>>24&255)/255,d=(L>>16&255)/255,c=(L>>8&255)/255,_=1,this._addRectangle(t3.attributes,e3,h,T,(o2-a2)*this._dimensions.device.cell.width,this._dimensions.device.cell.height,l,d,c,_)}_addRectangle(t3,e3,i3,s3,r2,a2,o2,n2,L2,h2){;t3[e3]=i3/this._dimensions.device.canvas.width,t3[e3+1]=s3/this._dimensions.device.canvas.height,t3[e3+2]=r2/this._dimensions.device.canvas.width,t3[e3+3]=a2/this._dimensions.device.canvas.height,t3[e3+4]=o2,t3[e3+5]=n2,t3[e3+6]=L2,t3[e3+7]=h2}_addRectangleFloat(t3,e3,i3,s3,r2,a2,o2){;t3[e3]=i3/this._dimensions.device.canvas.width,t3[e3+1]=s3/this._dimensions.device.canvas.height,t3[e3+2]=r2/this._dimensions.device.canvas.width,t3[e3+3]=a2/this._dimensions.device.canvas.height,t3[e3+4]=o2[0],t3[e3+5]=o2[1],t3[e3+6]=o2[2],t3[e3+7]=o2[3]}_colorToFloat32Array(t3){return new Float32Array([(t3.rgba>>24&255)/255,(t3.rgba>>16&255)/255,(t3.rgba>>8&255)/255,(255&t3.rgba)/255])}}e2.RectangleRenderer=Q},208(t2,e2,i2){;Object.defineProperty(e2,"__esModule",{value:true}),e2.RenderModel=e2.COMBINED_CHAR_BIT_MASK=void 0;const s2=i2(948);e2.COMBINED_CHAR_BIT_MASK=2147483648,e2.RenderModel=class{constructor(){;this.cells=new Uint32Array(0),this.lineLengths=new Uint32Array(0),this.selection=(0,s2.createSelectionRenderModel)()}resize(t3,e3){const i3=t3*e3*4;i3!==this.cells.length&&(this.cells=new Uint32Array(i3),this.lineLengths=new Uint32Array(e3))}clear(){;this.cells.fill(0,0),this.lineLengths.fill(0,0)}}},115(t2,e2,i2){;Object.defineProperty(e2,"__esModule",{value:true}),e2.TextureAtlas=void 0;const s2=i2(0),r=i2(183),a=i2(959),o=i2(993),n=i2(836),L=i2(930),h=i2(917),T=i2(564),l=i2(414),d={texturePage:0,texturePosition:{x:0,y:0},texturePositionClipSpace:{x:0,y:0},offset:{x:0,y:0},size:{x:0,y:0},sizeClipSpace:{x:0,y:0}};let c;class _{get pages(){return this._pages}constructor(t3,e3,i3,s3){;this._document=t3,this._config=e3,this._unicodeService=i3,this._logService=s3,this._didWarmUp=false,this._cacheMap=new n.FourKeyMap,this._cacheMapCombined=new n.FourKeyMap,this._pages=[],this._activePages=[],this._workBoundingBox={top:0,left:0,bottom:0,right:0},this._workAttributeData=new h.AttributeData,this._textureSize=512,this._onAddTextureAtlasCanvas=new l.Emitter,this.onAddTextureAtlasCanvas=this._onAddTextureAtlasCanvas.event,this._onRemoveTextureAtlasCanvas=new l.Emitter,this.onRemoveTextureAtlasCanvas=this._onRemoveTextureAtlasCanvas.event,this._requestClearModel=false,this._clearModelGeneration=0,this._createNewPage(),this._tmpCanvas=p(t3,4*this._config.deviceCellWidth+4,this._config.deviceCellHeight+4),this._tmpCtx=(0,a.throwIfFalsy)(this._tmpCanvas.getContext("2d",{alpha:this._config.allowTransparency,willReadFrequently:true}))}dispose(){this._tmpCanvas.remove();for(const t3 of this.pages)t3.canvas.remove();this._onAddTextureAtlasCanvas.dispose(),this._onRemoveTextureAtlasCanvas.dispose()}warmUp(){this._didWarmUp||(this._doWarmUp(),this._didWarmUp=true)}_doWarmUp(){const t3=new L.IdleTaskQueue(this._logService);for(let e3=33;e3<126;e3++)t3.enqueue(()=>{if(!this._cacheMap.get(e3,T.DEFAULT_COLOR,T.DEFAULT_COLOR,T.DEFAULT_EXT)){const t4=this._drawToCache(e3,T.DEFAULT_COLOR,T.DEFAULT_COLOR,T.DEFAULT_EXT,false,void 0);this._cacheMap.set(e3,T.DEFAULT_COLOR,T.DEFAULT_COLOR,T.DEFAULT_EXT,t4)}})}beginFrame(){const t3=this._requestClearModel;return this._requestClearModel=false,t3}clearTexture(){if(this._pages.some(t3=>t3._glyphs.length>0||0!==t3.currentRow.x||0!==t3.currentRow.y)){this._evictAllPages();this._createNewPage()}}_evictAllPages(){for(const t3 of this._pages)this._onRemoveTextureAtlasCanvas.fire(t3.canvas),t3.canvas.remove();this._pages.length=0,this._activePages.length=0,this._overflowSizePage=void 0,this._cacheMap.clear(),this._cacheMapCombined.clear(),this._didWarmUp=false,this._requestClearModel=true,this._clearModelGeneration++}_createNewPage(){if(_.maxAtlasPages&&this._pages.length>=_.maxAtlasPages){const t4=this._pages.filter(t5=>2*t5.canvas.width<=(_.maxTextureSize||4096)).sort((t5,e4)=>e4.canvas.width!==t5.canvas.width?e4.canvas.width-t5.canvas.width:e4.percentageUsed-t5.percentageUsed);let e3=-1,i3=0;for(let s4=0;s4<t4.length;s4++)if(t4[s4].canvas.width!==i3)e3=s4,i3=t4[s4].canvas.width;else if(s4-e3===3)break;const s3=t4.slice(e3,e3+4);if(s3.length<4||s3.some(t5=>t5.canvas.width!==s3[0].canvas.width))this._evictAllPages();else{const r2=s3.map(t5=>t5.glyphs[0].texturePage).sort((t5,e4)=>t5-e4),a2=this.pages.length-s3.length,o2=this._mergePages(s3,a2);o2.version=++Q.nextVersion;for(let t5=r2.length-1;t5>=0;t5--)this._deletePage(r2[t5]);this.pages.push(o2),this._requestClearModel=true,this._clearModelGeneration++,this._onAddTextureAtlasCanvas.fire(o2.canvas)}}const t3=new Q(this._document,this._textureSize);return this._pages.push(t3),this._activePages.push(t3),this._onAddTextureAtlasCanvas.fire(t3.canvas),t3}_mergePages(t3,e3){const i3=2*t3[0].canvas.width,s3=new Q(this._document,i3,t3);for(const[r2,a2]of t3.entries()){const t4=r2*a2.canvas.width%i3,o2=Math.floor(r2/2)*a2.canvas.height;s3.ctx.drawImage(a2.canvas,t4,o2);for(const s4 of a2.glyphs)s4.texturePage=e3,s4.sizeClipSpace.x=s4.size.x/i3,s4.sizeClipSpace.y=s4.size.y/i3,s4.texturePosition.x+=t4,s4.texturePosition.y+=o2,s4.texturePositionClipSpace.x=s4.texturePosition.x/i3,s4.texturePositionClipSpace.y=s4.texturePosition.y/i3;this._onRemoveTextureAtlasCanvas.fire(a2.canvas);const n2=this._activePages.indexOf(a2);-1!==n2&&this._activePages.splice(n2,1)}return s3}_deletePage(t3){this._pages.splice(t3,1);for(let e3=t3;e3<this._pages.length;e3++){const t4=this._pages[e3];for(const e4 of t4.glyphs)e4.texturePage--;t4.version=++Q.nextVersion}}getRasterizedGlyphCombinedChar(t3,e3,i3,s3,r2,a2){return this._getFromCacheMap(this._cacheMapCombined,t3,e3,i3,s3,r2,a2)}getRasterizedGlyph(t3,e3,i3,s3,r2,a2){return this._getFromCacheMap(this._cacheMap,t3,e3,i3,s3,r2,a2)}_getFromCacheMap(t3,e3,i3,s3,r2,a2,o2){return c=t3.get(e3,i3,s3,r2),c||(c=this._drawToCache(e3,i3,s3,r2,a2,o2),t3.set(e3,i3,s3,r2,c)),c}_getColorFromAnsiIndex(t3){if(t3>=this._config.colors.ansi.length)throw new Error("No color found for idx "+t3);return this._config.colors.ansi[t3]}_getBackgroundColor(t3,e3,i3,s3){if(this._config.allowTransparency)return o.NULL_COLOR;let r2;switch(t3){case 16777216:case 33554432:r2=this._getColorFromAnsiIndex(e3);break;case 50331648:const t4=h.AttributeData.toColorRGB(e3);r2=o.channels.toColor(t4[0],t4[1],t4[2]);break;default:r2=i3?o.color.opaque(this._config.colors.foreground):this._config.colors.background}return this._config.allowTransparency||(r2=o.color.opaque(r2)),r2}_getForegroundColor(t3,e3,i3,r2,a2,n2,L2,T2,l2,d2){const c2=this._getMinimumContrastColor(t3,e3,i3,r2,a2,n2,L2,l2,T2,d2);if(c2)return c2;let _2;switch(a2){case 16777216:case 33554432:;this._config.drawBoldTextInBrightColors&&l2&&n2<8&&(n2+=8),_2=this._getColorFromAnsiIndex(n2);break;case 50331648:const t4=h.AttributeData.toColorRGB(n2);_2=o.channels.toColor(t4[0],t4[1],t4[2]);break;default:_2=L2?this._config.colors.background:this._config.colors.foreground}return this._config.allowTransparency&&(_2=o.color.opaque(_2)),T2&&(_2=o.color.multiplyOpacity(_2,s2.DIM_OPACITY)),_2}_resolveBackgroundRgba(t3,e3,i3){switch(t3){case 16777216:case 33554432:return this._getColorFromAnsiIndex(e3).rgba;case 50331648:return e3<<8;default:return i3?this._config.colors.foreground.rgba:this._config.colors.background.rgba}}_resolveForegroundRgba(t3,e3,i3,s3){switch(t3){case 16777216:case 33554432:return this._config.drawBoldTextInBrightColors&&s3&&e3<8&&(e3+=8),this._getColorFromAnsiIndex(e3).rgba;case 50331648:return e3<<8;default:return i3?this._config.colors.background.rgba:this._config.colors.foreground.rgba}}_getMinimumContrastColor(t3,e3,i3,s3,r2,a2,n2,L2,h2,T2){if(1===this._config.minimumContrastRatio||T2)return;const l2=this._getContrastCache(h2),d2=l2.getColor(t3,s3);if(void 0!==d2)return d2??void 0;const c2=this._resolveBackgroundRgba(e3,i3,n2),_2=this._resolveForegroundRgba(r2,a2,n2,L2),Q2=o.rgba.ensureContrastRatio(c2,_2,this._config.minimumContrastRatio/(h2?2:1));if(!Q2)return void l2.setColor(t3,s3,null);const u2=o.channels.toColor(Q2>>24&255,Q2>>16&255,Q2>>8&255);return l2.setColor(t3,s3,u2),u2}_getContrastCache(t3){return t3?this._config.colors.halfContrastCache:this._config.colors.contrastCache}_drawToCache(t3,e3,i3,o2,n2,L2){const T2="number"==typeof t3?String.fromCharCode(t3):t3;L2&&this._tmpCanvas.parentElement!==L2&&(this._tmpCanvas.style.display="none",L2.append(this._tmpCanvas));const l2=Math.min(this._config.deviceCellWidth*Math.max(T2.length,2)+4,this._config.deviceMaxTextureSize);this._tmpCanvas.width<l2&&(this._tmpCanvas.width=l2);const c2=Math.min(this._config.deviceCellHeight+8,this._textureSize);if(this._tmpCanvas.height<c2&&(this._tmpCanvas.height=c2),this._tmpCtx.save(),this._workAttributeData.fg=i3,this._workAttributeData.bg=e3,this._workAttributeData.extended.ext=o2,this._workAttributeData.isInvisible())return d;const p2=!!this._workAttributeData.isBold(),g=!!this._workAttributeData.isInverse(),M=!!this._workAttributeData.isDim(),y=!!this._workAttributeData.isItalic(),v=!!this._workAttributeData.isUnderline(),f=!!this._workAttributeData.isStrikethrough(),C=!!this._workAttributeData.isOverline();let m=this._workAttributeData.getFgColor(),w=this._workAttributeData.getFgColorMode(),x=this._workAttributeData.getBgColor(),b=this._workAttributeData.getBgColorMode();if(g){const t4=m;m=x,x=t4;const e4=w;w=b,b=e4}const E=this._getBackgroundColor(b,x,g,M);this._tmpCtx.globalCompositeOperation="copy",this._tmpCtx.fillStyle=E.css,this._tmpCtx.fillRect(0,0,this._tmpCanvas.width,this._tmpCanvas.height),this._tmpCtx.globalCompositeOperation="source-over";const R=p2?this._config.fontWeightBold:this._config.fontWeight,k=y?"italic":"";this._tmpCtx.font=`${k} ${R} ${this._config.fontSize*this._config.devicePixelRatio}px ${this._config.fontFamily}`,(orcaProbeWeight=>{orcaProbeWeight=String(orcaProbeWeight);let orcaActualWeightToken=this._tmpCtx.font.match(/(?:^|\s)(normal|bold|[1-9]\d{0,3})(?=\s+\d+(?:\.\d+)?px(?:\s|$))/)?.[1]??"400",orcaActualWeight=orcaActualWeightToken==="normal"?"400":orcaActualWeightToken==="bold"?"700":orcaActualWeightToken;if(/^(?:[1-8]\d{2}|900)$/.test(orcaProbeWeight)&&orcaActualWeight!==orcaProbeWeight){this.fontProbeMismatchCount=(this.fontProbeMismatchCount||0)+1;this.fontProbeLastMismatch={desired:orcaProbeWeight,actual:this._tmpCtx.font};try{globalThis.__orcaAtlasFontProbe&&globalThis.__orcaAtlasFontProbe(this.fontProbeLastMismatch)}catch(orcaFontProbeError){}}})(R),this._tmpCtx.textBaseline=s2.TEXT_BASELINE;const A=1===T2.length&&(0,a.isPowerlineGlyph)(T2.charCodeAt(0)),Z=1===T2.length&&(0,a.isRestrictedPowerlineGlyph)(T2.charCodeAt(0)),D=this._getForegroundColor(e3,b,x,i3,w,m,g,M,p2,(0,a.treatGlyphAsBackgroundColor)(T2.charCodeAt(0)));this._tmpCtx.fillStyle=D.css;const S=Z?0:4;let O=false;if(false!==this._config.customGlyphs){const t4=this._workAttributeData.getUnderlineVariantOffset();O=(0,r.tryDrawCustomGlyph)(this._tmpCtx,T2,S,S,this._config.deviceCellWidth,this._config.deviceCellHeight,this._config.deviceCharWidth,this._config.deviceCharHeight,this._config.fontSize,this._config.devicePixelRatio,this._logService,E.css,t4)}let I,W=!A;if(I="number"==typeof t3?this._unicodeService.wcwidth(t3):this._unicodeService.getStringCellWidth(t3),v){this._tmpCtx.save();const t4=Math.max(1,Math.floor(this._config.fontSize*this._config.devicePixelRatio/15)),e4=t4%2==1?.5:0;if(this._tmpCtx.lineWidth=t4,this._workAttributeData.isUnderlineColorDefault())this._tmpCtx.strokeStyle=this._tmpCtx.fillStyle;else if(this._workAttributeData.isUnderlineColorRGB())W=false,this._tmpCtx.strokeStyle=`rgb(${h.AttributeData.toColorRGB(this._workAttributeData.getUnderlineColor()).join(",")})`;else{W=false;let t5=this._workAttributeData.getUnderlineColor();this._config.drawBoldTextInBrightColors&&this._workAttributeData.isBold()&&t5<8&&(t5+=8),this._tmpCtx.strokeStyle=this._getColorFromAnsiIndex(t5).css};this._tmpCtx.fillStyle=this._tmpCtx.strokeStyle,this._tmpCtx.beginPath();const i4=S,s3=Math.ceil(S+this._config.deviceCharHeight)-e4-(n2?2*t4:0),r2=s3+2*t4;let o3=this._workAttributeData.getUnderlineVariantOffset(),L3=0,l3=0;for(let e5=0;e5<I;e5++){let n3=false;this._tmpCtx.save(),L3=s3,l3=r2;const h2=i4+e5*this._config.deviceCellWidth,T3=i4+(e5+1)*this._config.deviceCellWidth;switch(this._workAttributeData.extended.underlineStyle){case 2:;this._tmpCtx.moveTo(h2,s3),this._tmpCtx.lineTo(T3,s3),this._tmpCtx.moveTo(h2,r2),this._tmpCtx.lineTo(T3,r2);break;case 3:;L3=this._config.deviceCharHeight+1,l3=L3+3*this._config.devicePixelRatio;const e6=new Path2D;e6.rect(h2,L3,this._config.deviceCellWidth,l3-L3),this._tmpCtx.clip(e6);const i5=this._config.deviceCellWidth/6,d2=(l3-L3)/3,c3=[[0,2,1,3,2.4,3,0,.6],[5.5,0,2.5,3,1.1,3,4.1,0],[4,0,6,2,6,.6,5.4,0]];for(const t5 of c3){this._tmpCtx.beginPath();for(let e7=0;e7<t5.length;e7+=2){const s4=h2+t5[e7]*i5,r3=l3-t5[e7+1]*d2;0===e7?this._tmpCtx.moveTo(s4,r3):this._tmpCtx.lineTo(s4,r3)};this._tmpCtx.closePath(),this._tmpCtx.fill()}n3=true;break;case 4:const _2=0===o3?0:o3>=t4?2*t4-o3:t4-o3;false==!(o3>=t4)||0===_2?(this._tmpCtx.setLineDash([Math.round(t4),Math.round(t4)]),this._tmpCtx.moveTo(h2+_2,s3),this._tmpCtx.lineTo(T3,s3)):(this._tmpCtx.setLineDash([Math.round(t4),Math.round(t4)]),this._tmpCtx.moveTo(h2,s3),this._tmpCtx.lineTo(h2+_2,s3),this._tmpCtx.moveTo(h2+_2+t4,s3),this._tmpCtx.lineTo(T3,s3)),o3=(0,a.computeNextVariantOffset)(T3-h2,t4,o3);break;case 5:const Q2=.6,u2=.3,p3=T3-h2,g2=Math.floor(Q2*p3),M2=Math.floor(u2*p3),y2=p3-g2-M2;this._tmpCtx.setLineDash([g2,M2,y2]),this._tmpCtx.moveTo(h2,s3),this._tmpCtx.lineTo(T3,s3);break;default:;this._tmpCtx.moveTo(h2,s3),this._tmpCtx.lineTo(T3,s3)};n3||this._tmpCtx.stroke(),this._tmpCtx.restore()}if(this._tmpCtx.restore(),!O&&this._config.fontSize>=12&&!this._config.allowTransparency&&" "!==T2){;this._tmpCtx.save(),this._tmpCtx.textBaseline="alphabetic";const e5=this._tmpCtx.measureText(T2);if(this._tmpCtx.restore(),"actualBoundingBoxDescent"in e5&&e5.actualBoundingBoxDescent>0){this._tmpCtx.save();const e6=new Path2D;e6.rect(i4,L3-Math.ceil(t4/2),this._config.deviceCellWidth*I,l3-L3+Math.ceil(t4/2)),this._tmpCtx.clip(e6),this._tmpCtx.lineWidth=3*this._config.devicePixelRatio,this._tmpCtx.strokeStyle=E.css,this._tmpCtx.strokeText(T2,S,S+this._config.deviceCharHeight),this._tmpCtx.restore()}}}if(C){const t4=Math.max(1,Math.floor(this._config.fontSize*this._config.devicePixelRatio/15)),e4=t4%2==1?.5:0;this._tmpCtx.lineWidth=t4,this._tmpCtx.strokeStyle=this._tmpCtx.fillStyle,this._tmpCtx.beginPath(),this._tmpCtx.moveTo(S,S+e4),this._tmpCtx.lineTo(S+this._config.deviceCharWidth*I,S+e4),this._tmpCtx.stroke()}if(O||this._tmpCtx.fillText(T2,S,S+this._config.deviceCharHeight),"_"===T2&&!this._config.allowTransparency){let t4=u(this._tmpCtx.getImageData(S,S,this._config.deviceCellWidth,this._config.deviceCellHeight),E,D,W);if(t4)for(let e4=1;e4<=5&&(this._tmpCtx.save(),this._tmpCtx.fillStyle=E.css,this._tmpCtx.fillRect(0,0,this._tmpCanvas.width,this._tmpCanvas.height),this._tmpCtx.restore(),this._tmpCtx.fillText(T2,S,S+this._config.deviceCharHeight-e4),t4=u(this._tmpCtx.getImageData(S,S,this._config.deviceCellWidth,this._config.deviceCellHeight),E,D,W),t4);e4++);}if(f){const t4=Math.max(1,Math.floor(this._config.fontSize*this._config.devicePixelRatio/10)),e4=this._tmpCtx.lineWidth%2==1?.5:0;this._tmpCtx.lineWidth=t4,this._tmpCtx.strokeStyle=this._tmpCtx.fillStyle,this._tmpCtx.beginPath(),this._tmpCtx.moveTo(S,S+Math.floor(this._config.deviceCharHeight/2)-e4),this._tmpCtx.lineTo(S+this._config.deviceCharWidth*I,S+Math.floor(this._config.deviceCharHeight/2)-e4),this._tmpCtx.stroke()}this._tmpCtx.restore();const N=this._tmpCtx.getImageData(0,0,this._tmpCanvas.width,this._tmpCanvas.height);let P;if(P=this._config.allowTransparency?(function(t4){for(let e4=0;e4<t4.data.length;e4+=4)if(t4.data[e4+3]>0)return false;return true})(N):u(N,E,D,W),P)return d;const B=this._findGlyphBoundingBox(N,this._workBoundingBox,l2,Z,O,S);let $,F;for(;;){if(0===this._activePages.length){const t4=this._createNewPage();$=t4,F=t4.currentRow,F.height=B.size.y;break};$=this._activePages[this._activePages.length-1],F=$.currentRow;for(const t4 of this._activePages)B.size.y<=t4.currentRow.height&&($=t4,F=t4.currentRow);for(let t4=this._activePages.length-1;t4>=0;t4--)for(const e4 of this._activePages[t4].fixedRows)e4.height<=F.height&&B.size.y<=e4.height&&($=this._activePages[t4],F=e4);if(B.size.x>this._textureSize){;this._overflowSizePage||(_.maxAtlasPages&&this._pages.length>=_.maxAtlasPages&&this._evictAllPages(),this._overflowSizePage=new Q(this._document,this._config.deviceMaxTextureSize),this.pages.push(this._overflowSizePage),this._requestClearModel=true,this._clearModelGeneration++,this._onAddTextureAtlasCanvas.fire(this._overflowSizePage.canvas)),$=this._overflowSizePage,F=this._overflowSizePage.currentRow,F.x+B.size.x>=$.canvas.width&&(F.x=0,F.y+=F.height,F.height=0);break}if(F.y+B.size.y>=$.canvas.height||F.height>B.size.y+2){let t4=false;if($.currentRow.y+$.currentRow.height+B.size.y>=$.canvas.height){let e4;for(const t5 of this._activePages)if(t5.currentRow.y+t5.currentRow.height+B.size.y<t5.canvas.height){e4=t5;break}if(e4)$=e4;else if(_.maxAtlasPages&&this._pages.length>=_.maxAtlasPages&&F.y+B.size.y<=$.canvas.height&&F.height>=B.size.y&&F.x+B.size.x<=$.canvas.width)t4=true;else{const e5=this._createNewPage();$=e5,F=e5.currentRow,F.height=B.size.y,t4=true}}t4||($.currentRow.height>0&&$.fixedRows.push($.currentRow),F={x:0,y:$.currentRow.y+$.currentRow.height,height:B.size.y},$.fixedRows.push(F),$.currentRow={x:0,y:F.y+F.height,height:0})}if(F.x+B.size.x<=$.canvas.width)break;F===$.currentRow?(F.x=0,F.y+=F.height,F.height=0):$.fixedRows.splice($.fixedRows.indexOf(F),1)}return B.texturePage=this._pages.indexOf($),B.texturePosition.x=F.x,B.texturePosition.y=F.y,B.texturePositionClipSpace.x=F.x/$.canvas.width,B.texturePositionClipSpace.y=F.y/$.canvas.height,B.sizeClipSpace.x/=$.canvas.width,B.sizeClipSpace.y/=$.canvas.height,F.height=Math.max(F.height,B.size.y),F.x+=B.size.x,$.ctx.putImageData(N,B.texturePosition.x-this._workBoundingBox.left,B.texturePosition.y-this._workBoundingBox.top,this._workBoundingBox.left,this._workBoundingBox.top,B.size.x,B.size.y),$.addGlyph(B),$.version=++Q.nextVersion,B}_findGlyphBoundingBox(t3,e3,i3,s3,r2,a2){e3.top=0;const o2=s3?this._config.deviceCellHeight:this._tmpCanvas.height,n2=s3?this._config.deviceCellWidth:i3;let L2=false;for(let i4=0;i4<o2;i4++){for(let s4=0;s4<n2;s4++){const r3=i4*this._tmpCanvas.width*4+4*s4+3;if(0!==t3.data[r3]){;e3.top=i4,L2=true;break}}if(L2)break};e3.left=0,L2=false;for(let i4=0;i4<a2+n2;i4++){for(let s4=0;s4<o2;s4++){const r3=s4*this._tmpCanvas.width*4+4*i4+3;if(0!==t3.data[r3]){;e3.left=i4,L2=true;break}}if(L2)break};e3.right=n2,L2=false;for(let i4=a2+n2-1;i4>=a2;i4--){for(let s4=0;s4<o2;s4++){const r3=s4*this._tmpCanvas.width*4+4*i4+3;if(0!==t3.data[r3]){;e3.right=i4,L2=true;break}}if(L2)break};e3.bottom=o2,L2=false;for(let i4=o2-1;i4>=0;i4--){for(let s4=0;s4<n2;s4++){const r3=i4*this._tmpCanvas.width*4+4*s4+3;if(0!==t3.data[r3]){;e3.bottom=i4,L2=true;break}}if(L2)break}return{texturePage:0,texturePosition:{x:0,y:0},texturePositionClipSpace:{x:0,y:0},size:{x:e3.right-e3.left+1,y:e3.bottom-e3.top+1},sizeClipSpace:{x:e3.right-e3.left+1,y:e3.bottom-e3.top+1},offset:{x:-e3.left+a2+(s3||r2?Math.floor((this._config.deviceCellWidth-this._config.deviceCharWidth)/2):0),y:-e3.top+a2+(s3||r2?1===this._config.lineHeight?0:Math.round((this._config.deviceCellHeight-this._config.deviceCharHeight)/2):0)}}}}e2.TextureAtlas=_;class Q{get percentageUsed(){return this._usedPixels/(this.canvas.width*this.canvas.height)}get glyphs(){return this._glyphs}addGlyph(t3){;this._glyphs.push(t3),this._usedPixels+=t3.size.x*t3.size.y}constructor(t3,e3,i3){if(this._usedPixels=0,this._glyphs=[],this.version=++Q.nextVersion,this.currentRow={x:0,y:0,height:0},this.fixedRows=[],this.canvas=p(t3,e3,e3),this.ctx=(0,a.throwIfFalsy)(this.canvas.getContext("2d",{alpha:true})),i3)if(4===i3.length)this._glyphs=this._glyphs.concat(i3[0].glyphs,i3[1].glyphs,i3[2].glyphs,i3[3].glyphs),this._usedPixels=i3[0]._usedPixels+i3[1]._usedPixels+i3[2]._usedPixels+i3[3]._usedPixels;else for(let t4=0;t4<i3.length;++t4)this._glyphs=this._glyphs.concat(i3[t4].glyphs),this._usedPixels+=i3[t4]._usedPixels}clear(){;this.ctx.clearRect(0,0,this.canvas.width,this.canvas.height),this.currentRow.x=0,this.currentRow.y=0,this.currentRow.height=0,this.fixedRows.length=0,this.version=++Q.nextVersion}}function u(t3,e3,i3,s3){const r2=e3.rgba>>>24,a2=e3.rgba>>>16&255,o2=e3.rgba>>>8&255,n2=i3.rgba>>>24,L2=i3.rgba>>>16&255,h2=i3.rgba>>>8&255,T2=Math.floor((Math.abs(r2-n2)+Math.abs(a2-L2)+Math.abs(o2-h2))/12);let l2=true;for(let e4=0;e4<t3.data.length;e4+=4)t3.data[e4]===r2&&t3.data[e4+1]===a2&&t3.data[e4+2]===o2||s3&&Math.abs(t3.data[e4]-r2)+Math.abs(t3.data[e4+1]-a2)+Math.abs(t3.data[e4+2]-o2)<T2?t3.data[e4+3]=0:l2=false;return l2}function p(t3,e3,i3){const s3=t3.createElement("canvas");return s3.width=e3,s3.height=i3,s3}Q.nextVersion=0},399(t2,e2,i2){;Object.defineProperty(e2,"__esModule",{value:true}),e2.JoinedCellData=e2.WebglRenderer=void 0;const s2=i2(864),r=i2(670),a=i2(773),o=i2(697),n=i2(917),L=i2(721),h=i2(564),T=i2(536),l=i2(28),d=i2(203),c=i2(208),_=i2(306),Q=i2(414),u=i2(105),p=i2(426),g=i2(959);class M extends p.Disposable{constructor(t3,e3,i3,a2,n2,h2,l2,d2,M2,y2=true,v2){;super(),this._terminal=t3,this._characterJoinerService=e3,this._charSizeService=i3,this._coreBrowserService=a2,this._coreService=n2,this._decorationService=h2,this._logService=l2,this._optionsService=d2,this._themeService=M2,this._customGlyphs=y2,this._cursorBlinkStateManager=this._register(new p.MutableDisposable),this._charAtlasDisposable=this._register(new p.MutableDisposable),this._observerDisposable=this._register(new p.MutableDisposable),this._model=new c.RenderModel,this._rowHasBlinkingCells=[],this._rowHasBlinkingCellsCount=0,this._workCell=new L.CellData,this._rectangleRenderer=this._register(new p.MutableDisposable),this._glyphRenderer=this._register(new p.MutableDisposable),this._onChangeTextureAtlas=this._register(new Q.Emitter),this.onChangeTextureAtlas=this._onChangeTextureAtlas.event,this._onAddTextureAtlasCanvas=this._register(new Q.Emitter),this.onAddTextureAtlasCanvas=this._onAddTextureAtlasCanvas.event,this._onRemoveTextureAtlasCanvas=this._register(new Q.Emitter),this.onRemoveTextureAtlasCanvas=this._onRemoveTextureAtlasCanvas.event,this._onRequestRedraw=this._register(new Q.Emitter),this.onRequestRedraw=this._onRequestRedraw.event,this._onContextLoss=this._register(new Q.Emitter),this.onContextLoss=this._onContextLoss.event,this._canvas=this._coreBrowserService.mainDocument.createElement("canvas");const f={antialias:false,depth:false,preserveDrawingBuffer:v2};if(this._gl=this._canvas.getContext("webgl2",f),!this._gl)throw new Error("WebGL2 not supported "+this._gl);this._register(this._themeService.onChangeColors(()=>this._handleColorChange())),this._cellColorResolver=new s2.CellColorResolver(this._terminal,this._optionsService,this._model.selection,this._decorationService,this._coreBrowserService,this._themeService),this._core=this._terminal._core,this._renderLayers=[new _.LinkRenderLayer(this._core.screenElement,2,this._terminal,this._core.linkifier,this._coreBrowserService,d2,this._themeService)],this.dimensions=(0,g.createRenderDimensions)(),this._devicePixelRatio=this._coreBrowserService.dpr,this._updateDimensions(),this._updateCursorBlink(),this._register(d2.onOptionChange(()=>this._handleOptionsChanged())),this._textBlinkStateManager=this._register(new T.TextBlinkStateManager(()=>this._requestRedrawViewport(),this._coreBrowserService,this._optionsService)),this._resetBlinkingRowState(),this._deviceMaxTextureSize=this._gl.getParameter(this._gl.MAX_TEXTURE_SIZE),this._register((0,u.addDisposableListener)(this._canvas,"webglcontextlost",t4=>{;this._logService.debug("webglcontextlost event received"),t4.preventDefault(),this._contextRestorationTimeout=setTimeout(()=>{;this._contextRestorationTimeout=void 0,this._logService.warn("webgl context not restored; firing onContextLoss"),this._onContextLoss.fire(t4)},3e3)})),this._register((0,u.addDisposableListener)(this._canvas,"webglcontextrestored",t4=>{;this._logService.warn("webglcontextrestored event received"),clearTimeout(this._contextRestorationTimeout),this._contextRestorationTimeout=void 0,(0,r.removeTerminalFromCache)(this._terminal),this._initializeWebGLState(),this._requestRedrawViewport()})),this._observerDisposable.value=(0,o.observeDevicePixelDimensions)(this._canvas,this._coreBrowserService.window,(t4,e4)=>this._setCanvasDevicePixelDimensions(t4,e4)),this._register(this._coreBrowserService.onWindowChange(t4=>{this._observerDisposable.value=(0,o.observeDevicePixelDimensions)(this._canvas,t4,(t5,e4)=>this._setCanvasDevicePixelDimensions(t5,e4))})),this._register((0,u.addDisposableListener)(this._coreBrowserService.mainDocument,"mousedown",()=>this._cursorBlinkStateManager.value?.restartBlinkAnimation())),this._core.screenElement.appendChild(this._canvas),[this._rectangleRenderer.value,this._glyphRenderer.value]=this._initializeWebGLState(),this._isAttached=this._core.screenElement.isConnected,this._register((0,p.toDisposable)(()=>{;clearTimeout(this._contextRestorationTimeout),this._contextRestorationTimeout=void 0;for(const t4 of this._renderLayers)t4.dispose();this._canvas.parentElement?.removeChild(this._canvas),(0,r.removeTerminalFromCache)(this._terminal)}))}get textureAtlas(){return this._charAtlas?.pages[0].canvas}_handleColorChange(){;this._refreshCharAtlas(),this._clearModel(true)}handleDevicePixelRatioChange(){this._devicePixelRatio!==this._coreBrowserService.dpr&&(this._devicePixelRatio=this._coreBrowserService.dpr,this.handleResize(this._terminal.cols,this._terminal.rows))}handleResize(t3,e3){;this._updateDimensions(),this._model.resize(this._terminal.cols,this._terminal.rows),this._resetBlinkingRowState();for(const t4 of this._renderLayers)t4.resize(this._terminal,this.dimensions);this._canvas.width=this.dimensions.device.canvas.width,this._canvas.height=this.dimensions.device.canvas.height,this._canvas.style.width=`${this.dimensions.css.canvas.width}px`,this._canvas.style.height=`${this.dimensions.css.canvas.height}px`,this._core.screenElement.style.width=`${this.dimensions.css.canvas.width}px`,this._core.screenElement.style.height=`${this.dimensions.css.canvas.height}px`,this._rectangleRenderer.value?.setDimensions(this.dimensions),this._rectangleRenderer.value?.handleResize(),this._glyphRenderer.value?.setDimensions(this.dimensions),this._glyphRenderer.value?.handleResize(),this._refreshCharAtlas(),this._clearModel(false),this._onRequestRedraw.fire({start:0,end:this._terminal.rows-1,sync:true})}handleCharSizeChanged(){this.handleResize(this._terminal.cols,this._terminal.rows)}handleBlur(){for(const t3 of this._renderLayers)t3.handleBlur(this._terminal);this._cursorBlinkStateManager.value?.pause(),this._requestRedrawViewport()}handleFocus(){for(const t3 of this._renderLayers)t3.handleFocus(this._terminal);this._cursorBlinkStateManager.value?.resume(),this._requestRedrawViewport()}handleViewportVisibilityChange(t3){this._textBlinkStateManager.setViewportVisible(t3)}handleSelectionChanged(t3,e3,i3){for(const s3 of this._renderLayers)s3.handleSelectionChanged(this._terminal,t3,e3,i3);this._model.selection.update(this._core,t3,e3,i3),this._requestRedrawViewport()}handleCursorMove(){for(const t3 of this._renderLayers)t3.handleCursorMove(this._terminal);this._cursorBlinkStateManager.value?.restartBlinkAnimation()}_handleOptionsChanged(){;this._updateDimensions(),this._refreshCharAtlas(),this._updateCursorBlink()}_initializeWebGLState(){return this._rectangleRenderer.value=new d.RectangleRenderer(this._terminal,this._gl,this.dimensions,this._themeService,this._logService),this._glyphRenderer.value=new l.GlyphRenderer(this._terminal,this._gl,this.dimensions,this._optionsService,this._logService),this.handleCharSizeChanged(),[this._rectangleRenderer.value,this._glyphRenderer.value]}_refreshCharAtlas(){if(this.dimensions.device.char.width<=0&&this.dimensions.device.char.height<=0)return void(this._isAttached=false);const t3=(0,r.acquireTextureAtlas)(this._terminal,this._optionsService.rawOptions,this._themeService.colors,this.dimensions.device.cell.width,this.dimensions.device.cell.height,this.dimensions.device.char.width,this.dimensions.device.char.height,this._coreBrowserService.dpr,this._deviceMaxTextureSize,this._customGlyphs);this._charAtlas!==t3&&(this._onChangeTextureAtlas.fire(t3.pages[0].canvas),this._charAtlasDisposable.value=(0,p.combinedDisposable)(Q.EventUtils.forward(t3.onAddTextureAtlasCanvas,this._onAddTextureAtlasCanvas),Q.EventUtils.forward(t3.onRemoveTextureAtlasCanvas,this._onRemoveTextureAtlasCanvas))),this._charAtlas=t3,this._charAtlas.warmUp(),this._glyphRenderer.value?.setAtlas(this._charAtlas)}_clearModel(t3){;this._model.clear(),t3&&this._glyphRenderer.value?.clear()}clearTextureAtlas(){;this._charAtlas?.clearTexture(),this._clearModel(true),this._requestRedrawViewport()}clear(){this._clearModel(true);for(const t3 of this._renderLayers)t3.reset(this._terminal);this._resetBlinkingRowState(),this._textBlinkStateManager.setNeedsBlinkInViewport(false),this._cursorBlinkStateManager.value?.restartBlinkAnimation(),this._updateCursorBlink()}renderRows(t3,e3){if(!this._isAttached){if(!(this._core.screenElement?.isConnected&&this._charSizeService.width&&this._charSizeService.height))return;this._updateDimensions(),this._refreshCharAtlas(),this._isAttached=true}for(const i4 of this._renderLayers)i4.handleGridChanged(this._terminal,t3,e3);if(!this._glyphRenderer.value||!this._rectangleRenderer.value)return;this._glyphRenderer.value.beginFrame()?(this._clearModel(true),this._updateModel(0,this._terminal.rows-1)):this._updateModel(t3,e3);let i3=false,s3=0;for(;this._charAtlas&&s3++<32&&this._glyphRenderer.value.beginFrame();)i3=true,this._clearModel(true),this._updateModel(0,this._terminal.rows-1);i3&&this._glyphRenderer.value.invalidateAtlasTextures(),this._rectangleRenderer.value.renderBackgrounds(),this._glyphRenderer.value.render(this._model),this._cursorBlinkStateManager.value&&!this._cursorBlinkStateManager.value.isCursorVisible||this._rectangleRenderer.value.renderCursor()}_updateCursorBlink(){;this._coreService.decPrivateModes.cursorBlink??this._terminal.options.cursorBlink?this._cursorBlinkStateManager.value=new a.CursorBlinkStateManager(()=>{this._requestRedrawCursor()},this._coreBrowserService):this._cursorBlinkStateManager.clear(),this._requestRedrawCursor()}_updateModel(t3,e3){const i3=this._core;let s3,r2,a2,o2,n2,L2,T2,l2,d2,_2,Q2,u2,p2,g2,M2,f,C,m=this._workCell;t3=v(t3,i3.rows-1,0),e3=v(e3,i3.rows-1,0);const w=this._coreService.decPrivateModes.cursorStyle??i3.options.cursorStyle??"block",x=this._terminal.buffer.active.baseY+this._terminal.buffer.active.cursorY,b=x-i3.buffer.ydisp,E=Math.min(this._terminal.buffer.active.cursorX,i3.cols-1);let R=-1;const k=this._coreService.isCursorInitialized&&!this._coreService.isCursorHidden&&(!this._cursorBlinkStateManager.value||this._cursorBlinkStateManager.value.isCursorVisible);this._model.cursor=void 0;let A=false;for(r2=t3;r2<=e3;r2++){a2=r2+i3.buffer.ydisp;const t4=i3.buffer.lines.get(a2);if(!t4){for(this._model.lineLengths[r2]=0,f=0;f<i3.cols;f++)C=4*(r2*i3.cols+f),A=true,this._nullModelCell(f,r2,C,0,0,0);this._setRowBlinkState(r2,false);continue}o2=t4;let e4=false;for(this._model.lineLengths[r2]=0,Q2=x===a2,T2=0,n2=this._characterJoinerService.getJoinedCharacters(a2),f=0;f<i3.cols;f++){if(s3=this._cellColorResolver.result.bg,o2.loadCell(f,m),0===f&&(s3=this._cellColorResolver.result.bg),L2=false,l2=f>=T2,d2=f,n2.length>0&&f===n2[0][0]&&l2){_2=n2.shift();const t5=this._model.selection.isCellSelected(this._terminal,_2[0],a2);for(M2=_2[0]+1;M2<_2[1];M2++)l2&&=t5===this._model.selection.isCellSelected(this._terminal,M2,a2);l2&&=!Q2||E<_2[0]||E>=_2[1],l2?(L2=true,m=new y(m,o2.translateToString(true,_2[0],_2[1]),_2[1]-_2[0]),d2=_2[1]-1):T2=_2[1]}if(u2=m.getChars(),p2=m.getCode(),M2=4*(r2*i3.cols+f),!e4&&m.isBlink()&&(e4=true),this._cellColorResolver.resolve(m,f,a2,this.dimensions.device.cell.width,this.dimensions.device.cell.height),k&&a2===x&&(f===E&&(this._model.cursor={x:E,y:b,width:m.getWidth(),style:this._coreBrowserService.isFocused?w:i3.options.cursorInactiveStyle,cursorWidth:i3.options.cursorWidth,dpr:this._devicePixelRatio},R=E+m.getWidth()-1),f>=E&&f<=R&&(this._coreBrowserService.isFocused&&"block"===w||false===this._coreBrowserService.isFocused&&"block"===i3.options.cursorInactiveStyle)&&(this._cellColorResolver.result.fg=50331648|this._themeService.colors.cursorAccent.rgba>>8&16777215,this._cellColorResolver.result.bg=50331648|this._themeService.colors.cursor.rgba>>8&16777215)),this._textBlinkStateManager.isEnabled&&!this._textBlinkStateManager.isBlinkOn&&m.isBlink()&&(this._cellColorResolver.result.fg|=1073741824),p2!==h.NULL_CELL_CODE&&(this._model.lineLengths[r2]=f+1),(this._model.cells[M2]!==p2||this._model.cells[M2+1]!==this._cellColorResolver.result.bg||this._model.cells[M2+2]!==this._cellColorResolver.result.fg||this._model.cells[M2+3]!==this._cellColorResolver.result.ext)&&(A=true,u2.length>1&&(p2|=c.COMBINED_CHAR_BIT_MASK),this._model.cells[M2]=p2,this._model.cells[M2+1]=this._cellColorResolver.result.bg,this._model.cells[M2+2]=this._cellColorResolver.result.fg,this._model.cells[M2+3]=this._cellColorResolver.result.ext,g2=m.getWidth(),this._glyphRenderer.value.updateCell(f,r2,p2,this._cellColorResolver.result.bg,this._cellColorResolver.result.fg,this._cellColorResolver.result.ext,u2,g2,s3),L2)){for(m=this._workCell,f++;f<=d2;f++)C=4*(r2*i3.cols+f),this._nullModelCell(f,r2,C,this._cellColorResolver.result.bg,this._cellColorResolver.result.fg,this._cellColorResolver.result.ext);f--}}this._setRowBlinkState(r2,e4)};A&&this._rectangleRenderer.value.updateBackgrounds(this._model),this._rectangleRenderer.value.updateCursor(this._model),this._updateTextBlinkState()}_nullModelCell(t3,e3,i3,s3,r2,a2){;this._glyphRenderer.value.updateCell(t3,e3,h.NULL_CELL_CODE,s3,r2,a2,h.NULL_CELL_CHAR,0,0),this._model.cells[i3]=h.NULL_CELL_CODE,this._model.cells[i3+1]=s3,this._model.cells[i3+2]=r2,this._model.cells[i3+3]=a2}_resetBlinkingRowState(){;this._rowHasBlinkingCells=new Array(this._terminal.rows).fill(false),this._rowHasBlinkingCellsCount=0}_setRowBlinkState(t3,e3){this._rowHasBlinkingCells[t3]!==e3&&(this._rowHasBlinkingCells[t3]=e3,this._rowHasBlinkingCellsCount+=e3?1:-1)}_updateTextBlinkState(){this._textBlinkStateManager.setNeedsBlinkInViewport(this._rowHasBlinkingCellsCount>0)}_updateDimensions(){this._charSizeService.width&&this._charSizeService.height&&(this.dimensions.device.char.width=Math.floor(this._charSizeService.width*this._devicePixelRatio),this.dimensions.device.char.height=Math.ceil(this._charSizeService.height*this._devicePixelRatio),this.dimensions.device.cell.height=Math.floor(this.dimensions.device.char.height*this._optionsService.rawOptions.lineHeight),this.dimensions.device.char.top=1===this._optionsService.rawOptions.lineHeight?0:Math.round((this.dimensions.device.cell.height-this.dimensions.device.char.height)/2),this.dimensions.device.cell.width=this.dimensions.device.char.width+Math.round(this._optionsService.rawOptions.letterSpacing),this.dimensions.device.char.left=Math.floor(this._optionsService.rawOptions.letterSpacing/2),this.dimensions.device.canvas.height=this._terminal.rows*this.dimensions.device.cell.height,this.dimensions.device.canvas.width=this._terminal.cols*this.dimensions.device.cell.width,this.dimensions.css.canvas.height=Math.round(this.dimensions.device.canvas.height/this._devicePixelRatio),this.dimensions.css.canvas.width=Math.round(this.dimensions.device.canvas.width/this._devicePixelRatio),this.dimensions.css.cell.height=this.dimensions.device.cell.height/this._devicePixelRatio,this.dimensions.css.cell.width=this.dimensions.device.cell.width/this._devicePixelRatio)}_setCanvasDevicePixelDimensions(t3,e3){;this._canvas.width===t3&&this._canvas.height===e3||(this._canvas.width=t3,this._canvas.height=e3,this._onRequestRedraw.fire({start:0,end:this._terminal.rows-1,sync:true}))}_requestRedrawViewport(){this._onRequestRedraw.fire({start:0,end:this._terminal.rows-1})}_requestRedrawCursor(){const t3=this._terminal.buffer.active.cursorY;this._onRequestRedraw.fire({start:t3,end:t3})}}e2.WebglRenderer=M;class y extends n.AttributeData{constructor(t3,e3,i3){;super(),this.content=0,this.combinedData="",this.fg=t3.fg,this.bg=t3.bg,this.combinedData=e3,this._width=i3}isCombined(){return 2097152}getWidth(){return this._width}getChars(){return this.combinedData}getCode(){return 2097151}setFromCharData(t3){throw new Error("not implemented")}getAsCharData(){return[this.fg,this.getChars(),this.getWidth(),this.getCode()]}}function v(t3,e3,i3=0){return Math.max(Math.min(t3,e3),i3)}e2.JoinedCellData=y},719(t2,e2,i2){;Object.defineProperty(e2,"__esModule",{value:true}),e2.GLTexture=e2.PROJECTION_MATRIX=void 0,e2.createProgram=function(t3,e3,i3,a){const o=(0,s2.throwIfFalsy)(t3.createProgram());if(t3.attachShader(o,(0,s2.throwIfFalsy)(r(t3,t3.VERTEX_SHADER,e3,a))),t3.attachShader(o,(0,s2.throwIfFalsy)(r(t3,t3.FRAGMENT_SHADER,i3,a))),t3.linkProgram(o),t3.getProgramParameter(o,t3.LINK_STATUS))return o;a.error(t3.getProgramInfoLog(o)),t3.deleteProgram(o)},e2.createShader=r,e2.expandFloat32Array=function(t3,e3){const i3=Math.min(2*t3.length,e3),s3=new Float32Array(i3);for(let e4=0;e4<t3.length;e4++)s3[e4]=t3[e4];return s3};const s2=i2(959);function r(t3,e3,i3,r2){const a=(0,s2.throwIfFalsy)(t3.createShader(e3));if(t3.shaderSource(a,i3),t3.compileShader(a),t3.getShaderParameter(a,t3.COMPILE_STATUS))return a;r2.error(t3.getShaderInfoLog(a)),t3.deleteShader(a)};e2.PROJECTION_MATRIX=new Float32Array([2,0,0,0,0,-2,0,0,0,0,1,0,-1,1,0,1]),e2.GLTexture=class{constructor(t3){;this.texture=t3,this.version=-1}}},915(t2,e2){var i2;function s2(t3){return{type:2,data:()=>{const e3=[],i3=[3/8,2/8,3/8],s3=[0,3/8,5/8];for(let r2=0;r2<3;r2++){const a=t3>>2*r2&1,o=t3>>2*r2+1&1;a&&o?e3.push(`M0,${s3[r2]} L1,${s3[r2]} L1,${s3[r2]+i3[r2]} L0,${s3[r2]+i3[r2]} Z`):a?e3.push(`M0,${s3[r2]} L0.5,${s3[r2]} L0.5,${s3[r2]+i3[r2]} L0,${s3[r2]+i3[r2]} Z`):o&&e3.push(`M0.5,${s3[r2]} L1,${s3[r2]} L1,${s3[r2]+i3[r2]} L0.5,${s3[r2]+i3[r2]} Z`)}return e3.join(" ")}}}function r(t3){const e3=[],i3=.15,s3=.015,r2=.075,a=.0375,o=.95;if(64&t3){const t4=.175,a2=.2125,n=.25,L=.2+s3,h=o-i3-s3;e3.push(`M${L},${a2} L${L+r2},${t4} L${h-r2},${t4} L${h},${a2} L${h-r2},${n} L${L+r2},${n} Z`)}if(32&t3){const t4=o-i3,s4=.875,r3=o,n=.265,L=.485;e3.push(`M${s4},${n} L${r3},${n+a} L${r3},${L-a} L${s4},${L} L${t4},${L-a} L${t4},${n+a} Z`)}if(16&t3){const t4=o-i3,s4=.875,r3=o,n=.515,L=.735;e3.push(`M${s4},${n} L${r3},${n+a} L${r3},${L-a} L${s4},${L} L${t4},${L-a} L${t4},${n+a} Z`)}if(8&t3){const t4=.75,a2=.7875,n=.825,L=.2+s3,h=o-i3-s3;e3.push(`M${L},${a2} L${L+r2},${t4} L${h-r2},${t4} L${h},${a2} L${h-r2},${n} L${L+r2},${n} Z`)}if(4&t3){const t4=.05,i4=.125,s4=.2,r3=.515,o2=.735;e3.push(`M${i4},${r3} L${s4},${r3+a} L${s4},${o2-a} L${i4},${o2} L${t4},${o2-a} L${t4},${r3+a} Z`)}if(2&t3){const t4=.05,i4=.125,s4=.2,r3=.265,o2=.485;e3.push(`M${i4},${r3} L${s4},${r3+a} L${s4},${o2-a} L${i4},${o2} L${t4},${o2-a} L${t4},${r3+a} Z`)}if(1&t3){const t4=.4625,a2=.5,n=.5375,L=.2+s3,h=o-i3-s3;e3.push(`M${L},${a2} L${L+r2},${t4} L${h-r2},${t4} L${h},${a2} L${h-r2},${n} L${L+r2},${n} Z`)}return e3.join(" ")};Object.defineProperty(e2,"__esModule",{value:true}),e2.blockPatternCodepoints=e2.customGlyphDefinitions=void 0,(function(t3){;t3.LINE_H=Object.freeze({type:2,data:"M0,.5 L1,.5",strokeWidth:1}),t3.LINE_V=Object.freeze({type:2,data:"M.5,0 L.5,1",strokeWidth:1}),t3.FADE_RIGHT=Object.freeze({type:2,data:"M0,.5 L.28,.5 M.32,.5 L.52,.5 M.60,.5 L.72,.5 M.84,.5 L.90,.5",strokeWidth:1}),t3.FADE_LEFT=Object.freeze({type:2,data:"M.10,.5 L.16,.5 M.28,.5 L.40,.5 M.48,.5 L.68,.5 M.72,.5 L1,.5",strokeWidth:1}),t3.FADE_DOWN=Object.freeze({type:2,data:"M.5,0 L.5,.28 M.5,.32 L.5,.52 M.5,.60 L.5,.72 M.5,.84 L.5,.90",strokeWidth:1}),t3.FADE_UP=Object.freeze({type:2,data:"M.5,.10 L.5,.16 M.5,.28 L.5,.40 M.5,.48 L.5,.68 M.5,.72 L.5,1",strokeWidth:1}),t3.CURVE_DOWN_RIGHT=Object.freeze({type:2,data:(t4,e3)=>`M.5,1 L.5,${.5+e3/.15*.5} C.5,${.5+e3/.15*.5},.5,.5,1,.5`,strokeWidth:1}),t3.CURVE_DOWN_LEFT=Object.freeze({type:2,data:(t4,e3)=>`M.5,1 L.5,${.5+e3/.15*.5} C.5,${.5+e3/.15*.5},.5,.5,0,.5`,strokeWidth:1}),t3.CURVE_UP_RIGHT=Object.freeze({type:2,data:(t4,e3)=>`M.5,0 L.5,${.5-e3/.15*.5} C.5,${.5-e3/.15*.5},.5,.5,1,.5`,strokeWidth:1}),t3.CURVE_UP_LEFT=Object.freeze({type:2,data:(t4,e3)=>`M.5,0 L.5,${.5-e3/.15*.5} C.5,${.5-e3/.15*.5},.5,.5,0,.5`,strokeWidth:1}),t3.NODE_FILL=Object.freeze({type:3,data:"M.85,.5 A.35,.175,0,1,1,.15,.5 A.35,.175,0,1,1,.85,.5"}),t3.NODE_STROKE=Object.freeze({type:3,data:"M.85,.5 A.35,.175,0,1,1,.15,.5 A.35,.175,0,1,1,.85,.5",strokeWidth:1}),t3.NODE_LINE_RIGHT=Object.freeze({type:3,data:"M1,.5 L.85,.5",strokeWidth:1}),t3.NODE_LINE_LEFT=Object.freeze({type:3,data:"M0,.5 L.15,.5",strokeWidth:1}),t3.NODE_LINE_DOWN=Object.freeze({type:3,data:"M.5,1 L.5,.7",strokeWidth:1}),t3.NODE_LINE_UP=Object.freeze({type:3,data:"M.5,0 L.5,.3",strokeWidth:1})})(i2||(i2={})),e2.customGlyphDefinitions={"\u2500":{type:2,data:"M0,.5 L1,.5",strokeWidth:1},"\u2501":{type:2,data:"M0,.5 L1,.5",strokeWidth:3},"\u2502":{type:2,data:"M.5,0 L.5,1",strokeWidth:1},"\u2503":{type:2,data:"M.5,0 L.5,1",strokeWidth:3},"\u2504":{type:2,data:"M.0667,.5 L.2667,.5 M.4,.5 L.6,.5 M.7333,.5 L.9333,.5",strokeWidth:1},"\u2505":{type:2,data:"M.0667,.5 L.2667,.5 M.4,.5 L.6,.5 M.7333,.5 L.9333,.5",strokeWidth:3},"\u2506":{type:2,data:"M.5,.0667 L.5,.2667 M.5,.4 L.5,.6 M.5,.7333 L.5,.9333",strokeWidth:1},"\u2507":{type:2,data:"M.5,.0667 L.5,.2667 M.5,.4 L.5,.6 M.5,.7333 L.5,.9333",strokeWidth:3},"\u2508":{type:2,data:"M.05,.5 L.2,.5 M.3,.5 L.45,.5 M.55,.5 L.7,.5 M.8,.5 L.95,.5",strokeWidth:1},"\u2509":{type:2,data:"M.05,.5 L.2,.5 M.3,.5 L.45,.5 M.55,.5 L.7,.5 M.8,.5 L.95,.5",strokeWidth:3},"\u250A":{type:2,data:"M.5,.05 L.5,.2 M.5,.3 L.5,.45 L.5,.55 M.5,.7 L.5,.95",strokeWidth:1},"\u250B":{type:2,data:"M.5,.05 L.5,.2 M.5,.3 L.5,.45 L.5,.55 M.5,.7 L.5,.95",strokeWidth:3},"\u250C":{type:2,data:"M0.5,1 L.5,.5 L1,.5",strokeWidth:1},"\u250D":[{type:2,data:"M.5,.5 L.5,1",strokeWidth:1},{type:2,data:"M.5,.5 L1,.5",strokeWidth:3}],"\u250E":[{type:2,data:"M.5,.5 L1,.5",strokeWidth:1},{type:2,data:"M.5,.5 L.5,1",strokeWidth:3}],"\u250F":{type:2,data:"M0.5,1 L.5,.5 L1,.5",strokeWidth:3},"\u2510":{type:2,data:"M0,.5 L.5,.5 L.5,1",strokeWidth:1},"\u2511":[{type:2,data:"M.5,.5 L.5,1",strokeWidth:1},{type:2,data:"M.5,.5 L0,.5",strokeWidth:3}],"\u2512":[{type:2,data:"M.5,.5 L0,.5",strokeWidth:1},{type:2,data:"M.5,.5 L.5,1",strokeWidth:3}],"\u2513":{type:2,data:"M0,.5 L.5,.5 L.5,1",strokeWidth:3},"\u2514":{type:2,data:"M.5,0 L.5,.5 L1,.5",strokeWidth:1},"\u2515":[{type:2,data:"M.5,.5 L.5,0",strokeWidth:1},{type:2,data:"M.5,.5 L1,.5",strokeWidth:3}],"\u2516":[{type:2,data:"M.5,.5 L1,.5",strokeWidth:1},{type:2,data:"M.5,.5 L.5,0",strokeWidth:3}],"\u2517":{type:2,data:"M.5,0 L.5,.5 L1,.5",strokeWidth:3},"\u2518":{type:2,data:"M.5,0 L.5,.5 L0,.5",strokeWidth:1},"\u2519":[{type:2,data:"M.5,.5 L.5,0",strokeWidth:1},{type:2,data:"M.5,.5 L0,.5",strokeWidth:3}],"\u251A":[{type:2,data:"M.5,.5 L0,.5",strokeWidth:1},{type:2,data:"M.5,.5 L.5,0",strokeWidth:3}],"\u251B":{type:2,data:"M.5,0 L.5,.5 L0,.5",strokeWidth:3},"\u251C":{type:2,data:"M.5,0 L.5,1 M.5,.5 L1,.5",strokeWidth:1},"\u251D":[{type:2,data:"M.5,0 L.5,1",strokeWidth:1},{type:2,data:"M.5,.5 L1,.5",strokeWidth:3}],"\u251E":[{type:2,data:"M0.5,1 L.5,.5 L1,.5",strokeWidth:1},{type:2,data:"M.5,.5 L.5,0",strokeWidth:3}],"\u251F":[{type:2,data:"M.5,0 L.5,.5 L1,.5",strokeWidth:1},{type:2,data:"M.5,.5 L.5,1",strokeWidth:3}],"\u2520":[{type:2,data:"M.5,.5 L1,.5",strokeWidth:1},{type:2,data:"M.5,0 L.5,1",strokeWidth:3}],"\u2521":[{type:2,data:"M.5,.5 L.5,1",strokeWidth:1},{type:2,data:"M.5,0 L.5,.5 L1,.5",strokeWidth:3}],"\u2522":[{type:2,data:"M.5,.5 L.5,0",strokeWidth:1},{type:2,data:"M0.5,1 L.5,.5 L1,.5",strokeWidth:3}],"\u2523":{type:2,data:"M.5,0 L.5,1 M.5,.5 L1,.5",strokeWidth:3},"\u2524":{type:2,data:"M.5,0 L.5,1 M.5,.5 L0,.5",strokeWidth:1},"\u2525":[{type:2,data:"M.5,0 L.5,1",strokeWidth:1},{type:2,data:"M.5,.5 L0,.5",strokeWidth:3}],"\u2526":[{type:2,data:"M0,.5 L.5,.5 L.5,1",strokeWidth:1},{type:2,data:"M.5,.5 L.5,0",strokeWidth:3}],"\u2527":[{type:2,data:"M.5,0 L.5,.5 L0,.5",strokeWidth:1},{type:2,data:"M.5,.5 L.5,1",strokeWidth:3}],"\u2528":[{type:2,data:"M.5,.5 L0,.5",strokeWidth:1},{type:2,data:"M.5,0 L.5,1",strokeWidth:3}],"\u2529":[{type:2,data:"M.5,.5 L.5,1",strokeWidth:1},{type:2,data:"M.5,0 L.5,.5 L0,.5",strokeWidth:3}],"\u252A":[{type:2,data:"M.5,.5 L.5,0",strokeWidth:1},{type:2,data:"M0,.5 L.5,.5 L.5,1",strokeWidth:3}],"\u252B":{type:2,data:"M.5,0 L.5,1 M.5,.5 L0,.5",strokeWidth:3},"\u252C":{type:2,data:"M0,.5 L1,.5 M.5,.5 L.5,1",strokeWidth:1},"\u252D":[{type:2,data:"M0.5,1 L.5,.5 L1,.5",strokeWidth:1},{type:2,data:"M.5,.5 L0,.5",strokeWidth:3}],"\u252E":[{type:2,data:"M0,.5 L.5,.5 L.5,1",strokeWidth:1},{type:2,data:"M.5,.5 L1,.5",strokeWidth:3}],"\u252F":[{type:2,data:"M.5,.5 L.5,1",strokeWidth:1},{type:2,data:"M0,.5 L1,.5",strokeWidth:3}],"\u2530":[{type:2,data:"M0,.5 L1,.5",strokeWidth:1},{type:2,data:"M.5,.5 L.5,1",strokeWidth:3}],"\u2531":[{type:2,data:"M.5,.5 L1,.5",strokeWidth:1},{type:2,data:"M0,.5 L.5,.5 L.5,1",strokeWidth:3}],"\u2532":[{type:2,data:"M.5,.5 L0,.5",strokeWidth:1},{type:2,data:"M0.5,1 L.5,.5 L1,.5",strokeWidth:3}],"\u2533":{type:2,data:"M0,.5 L1,.5 M.5,.5 L.5,1",strokeWidth:3},"\u2534":{type:2,data:"M0,.5 L1,.5 M.5,.5 L.5,0",strokeWidth:1},"\u2535":[{type:2,data:"M.5,0 L.5,.5 L1,.5",strokeWidth:1},{type:2,data:"M.5,.5 L0,.5",strokeWidth:3}],"\u2536":[{type:2,data:"M.5,0 L.5,.5 L0,.5",strokeWidth:1},{type:2,data:"M.5,.5 L1,.5",strokeWidth:3}],"\u2537":[{type:2,data:"M.5,.5 L.5,0",strokeWidth:1},{type:2,data:"M0,.5 L1,.5",strokeWidth:3}],"\u2538":[{type:2,data:"M0,.5 L1,.5",strokeWidth:1},{type:2,data:"M.5,.5 L.5,0",strokeWidth:3}],"\u2539":[{type:2,data:"M.5,.5 L1,.5",strokeWidth:1},{type:2,data:"M.5,0 L.5,.5 L0,.5",strokeWidth:3}],"\u253A":[{type:2,data:"M.5,.5 L0,.5",strokeWidth:1},{type:2,data:"M.5,0 L.5,.5 L1,.5",strokeWidth:3}],"\u253B":{type:2,data:"M0,.5 L1,.5 M.5,.5 L.5,0",strokeWidth:3},"\u253C":{type:2,data:"M0,.5 L1,.5 M.5,0 L.5,1",strokeWidth:1},"\u253D":[{type:2,data:"M.5,0 L.5,1 M.5,.5 L1,.5",strokeWidth:1},{type:2,data:"M.5,.5 L0,.5",strokeWidth:3}],"\u253E":[{type:2,data:"M.5,0 L.5,1 M.5,.5 L0,.5",strokeWidth:1},{type:2,data:"M.5,.5 L1,.5",strokeWidth:3}],"\u253F":[{type:2,data:"M.5,0 L.5,1",strokeWidth:1},{type:2,data:"M0,.5 L1,.5",strokeWidth:3}],"\u2540":[{type:2,data:"M0,.5 L1,.5 M.5,.5 L.5,1",strokeWidth:1},{type:2,data:"M.5,.5 L.5,0",strokeWidth:3}],"\u2541":[{type:2,data:"M.5,.5 L.5,0 M0,.5 L1,.5",strokeWidth:1},{type:2,data:"M.5,.5 L.5,1",strokeWidth:3}],"\u2542":[{type:2,data:"M0,.5 L1,.5",strokeWidth:1},{type:2,data:"M.5,0 L.5,1",strokeWidth:3}],"\u2543":[{type:2,data:"M0.5,1 L.5,.5 L1,.5",strokeWidth:1},{type:2,data:"M.5,0 L.5,.5 L0,.5",strokeWidth:3}],"\u2544":[{type:2,data:"M0,.5 L.5,.5 L.5,1",strokeWidth:1},{type:2,data:"M.5,0 L.5,.5 L1,.5",strokeWidth:3}],"\u2545":[{type:2,data:"M.5,0 L.5,.5 L1,.5",strokeWidth:1},{type:2,data:"M0,.5 L.5,.5 L.5,1",strokeWidth:3}],"\u2546":[{type:2,data:"M.5,0 L.5,.5 L0,.5",strokeWidth:1},{type:2,data:"M0.5,1 L.5,.5 L1,.5",strokeWidth:3}],"\u2547":[{type:2,data:"M.5,.5 L.5,1",strokeWidth:1},{type:2,data:"M.5,.5 L.5,0 M0,.5 L1,.5",strokeWidth:3}],"\u2548":[{type:2,data:"M.5,.5 L.5,0",strokeWidth:1},{type:2,data:"M0,.5 L1,.5 M.5,.5 L.5,1",strokeWidth:3}],"\u2549":[{type:2,data:"M.5,.5 L1,.5",strokeWidth:1},{type:2,data:"M.5,0 L.5,1 M.5,.5 L0,.5",strokeWidth:3}],"\u254A":[{type:2,data:"M.5,.5 L0,.5",strokeWidth:1},{type:2,data:"M.5,0 L.5,1 M.5,.5 L1,.5",strokeWidth:3}],"\u254B":{type:2,data:"M0,.5 L1,.5 M.5,0 L.5,1",strokeWidth:3},"\u254C":{type:2,data:"M.1,.5 L.4,.5 M.6,.5 L.9,.5",strokeWidth:1},"\u254D":{type:2,data:"M.1,.5 L.4,.5 M.6,.5 L.9,.5",strokeWidth:3},"\u254E":{type:2,data:"M.5,.1 L.5,.4 M.5,.6 L.5,.9",strokeWidth:1},"\u254F":{type:2,data:"M.5,.1 L.5,.4 M.5,.6 L.5,.9",strokeWidth:3},"\u2550":{type:2,data:(t3,e3)=>`M0,${.5-e3} L1,${.5-e3} M0,${.5+e3} L1,${.5+e3}`,strokeWidth:1},"\u2551":{type:2,data:(t3,e3)=>`M${.5-t3},0 L${.5-t3},1 M${.5+t3},0 L${.5+t3},1`,strokeWidth:1},"\u2552":{type:2,data:(t3,e3)=>`M.5,1 L.5,${.5-e3} L1,${.5-e3} M.5,${.5+e3} L1,${.5+e3}`,strokeWidth:1},"\u2553":{type:2,data:(t3,e3)=>`M${.5-t3},1 L${.5-t3},.5 L1,.5 M${.5+t3},.5 L${.5+t3},1`,strokeWidth:1},"\u2554":{type:2,data:(t3,e3)=>`M1,${.5-e3} L${.5-t3},${.5-e3} L${.5-t3},1 M1,${.5+e3} L${.5+t3},${.5+e3} L${.5+t3},1`,strokeWidth:1},"\u2555":{type:2,data:(t3,e3)=>`M0,${.5-e3} L.5,${.5-e3} L.5,1 M0,${.5+e3} L.5,${.5+e3}`,strokeWidth:1},"\u2556":{type:2,data:(t3,e3)=>`M${.5+t3},1 L${.5+t3},.5 L0,.5 M${.5-t3},.5 L${.5-t3},1`,strokeWidth:1},"\u2557":{type:2,data:(t3,e3)=>`M0,${.5+e3} L${.5-t3},${.5+e3} L${.5-t3},1 M0,${.5-e3} L${.5+t3},${.5-e3} L${.5+t3},1`,strokeWidth:1},"\u2558":{type:2,data:(t3,e3)=>`M.5,0 L.5,${.5+e3} L1,${.5+e3} M.5,${.5-e3} L1,${.5-e3}`,strokeWidth:1},"\u2559":{type:2,data:(t3,e3)=>`M1,.5 L${.5-t3},.5 L${.5-t3},0 M${.5+t3},.5 L${.5+t3},0`,strokeWidth:1},"\u255A":{type:2,data:(t3,e3)=>`M1,${.5-e3} L${.5+t3},${.5-e3} L${.5+t3},0 M1,${.5+e3} L${.5-t3},${.5+e3} L${.5-t3},0`,strokeWidth:1},"\u255B":{type:2,data:(t3,e3)=>`M0,${.5+e3} L.5,${.5+e3} L.5,0 M0,${.5-e3} L.5,${.5-e3}`,strokeWidth:1},"\u255C":{type:2,data:(t3,e3)=>`M0,.5 L${.5+t3},.5 L${.5+t3},0 M${.5-t3},.5 L${.5-t3},0`,strokeWidth:1},"\u255D":{type:2,data:(t3,e3)=>`M0,${.5-e3} L${.5-t3},${.5-e3} L${.5-t3},0 M0,${.5+e3} L${.5+t3},${.5+e3} L${.5+t3},0`,strokeWidth:1},"\u255E":{type:2,data:(t3,e3)=>`M.5,0 L.5,1 M.5,${.5-e3} L1,${.5-e3} M.5,${.5+e3} L1,${.5+e3}`,strokeWidth:1},"\u255F":{type:2,data:(t3,e3)=>`M${.5-t3},0 L${.5-t3},1 M${.5+t3},0 L${.5+t3},1 M${.5+t3},.5 L1,.5`,strokeWidth:1},"\u2560":{type:2,data:(t3,e3)=>`M${.5-t3},0 L${.5-t3},1 M1,${.5+e3} L${.5+t3},${.5+e3} L${.5+t3},1 M1,${.5-e3} L${.5+t3},${.5-e3} L${.5+t3},0`,strokeWidth:1},"\u2561":{type:2,data:(t3,e3)=>`M.5,0 L.5,1 M0,${.5-e3} L.5,${.5-e3} M0,${.5+e3} L.5,${.5+e3}`,strokeWidth:1},"\u2562":{type:2,data:(t3,e3)=>`M0,.5 L${.5-t3},.5 M${.5-t3},0 L${.5-t3},1 M${.5+t3},0 L${.5+t3},1`,strokeWidth:1},"\u2563":{type:2,data:(t3,e3)=>`M${.5+t3},0 L${.5+t3},1 M0,${.5+e3} L${.5-t3},${.5+e3} L${.5-t3},1 M0,${.5-e3} L${.5-t3},${.5-e3} L${.5-t3},0`,strokeWidth:1},"\u2564":{type:2,data:(t3,e3)=>`M0,${.5-e3} L1,${.5-e3} M0,${.5+e3} L1,${.5+e3} M.5,${.5+e3} L.5,1`,strokeWidth:1},"\u2565":{type:2,data:(t3,e3)=>`M0,.5 L1,.5 M${.5-t3},.5 L${.5-t3},1 M${.5+t3},.5 L${.5+t3},1`,strokeWidth:1},"\u2566":{type:2,data:(t3,e3)=>`M0,${.5-e3} L1,${.5-e3} M0,${.5+e3} L${.5-t3},${.5+e3} L${.5-t3},1 M1,${.5+e3} L${.5+t3},${.5+e3} L${.5+t3},1`,strokeWidth:1},"\u2567":{type:2,data:(t3,e3)=>`M.5,0 L.5,${.5-e3} M0,${.5-e3} L1,${.5-e3} M0,${.5+e3} L1,${.5+e3}`,strokeWidth:1},"\u2568":{type:2,data:(t3,e3)=>`M0,.5 L1,.5 M${.5-t3},.5 L${.5-t3},0 M${.5+t3},.5 L${.5+t3},0`,strokeWidth:1},"\u2569":{type:2,data:(t3,e3)=>`M0,${.5+e3} L1,${.5+e3} M0,${.5-e3} L${.5-t3},${.5-e3} L${.5-t3},0 M1,${.5-e3} L${.5+t3},${.5-e3} L${.5+t3},0`,strokeWidth:1},"\u256A":{type:2,data:(t3,e3)=>`M.5,0 L.5,1 M0,${.5-e3} L1,${.5-e3} M0,${.5+e3} L1,${.5+e3}`,strokeWidth:1},"\u256B":{type:2,data:(t3,e3)=>`M0,.5 L1,.5 M${.5-t3},0 L${.5-t3},1 M${.5+t3},0 L${.5+t3},1`,strokeWidth:1},"\u256C":{type:2,data:(t3,e3)=>`M0,${.5+e3} L${.5-t3},${.5+e3} L${.5-t3},1 M1,${.5+e3} L${.5+t3},${.5+e3} L${.5+t3},1 M0,${.5-e3} L${.5-t3},${.5-e3} L${.5-t3},0 M1,${.5-e3} L${.5+t3},${.5-e3} L${.5+t3},0`,strokeWidth:1},"\u256D":{type:2,data:(t3,e3)=>`M.5,1 L.5,${.5+e3/.15*.5} C.5,${.5+e3/.15*.5},.5,.5,1,.5`,strokeWidth:1},"\u256E":{type:2,data:(t3,e3)=>`M.5,1 L.5,${.5+e3/.15*.5} C.5,${.5+e3/.15*.5},.5,.5,0,.5`,strokeWidth:1},"\u256F":{type:2,data:(t3,e3)=>`M.5,0 L.5,${.5-e3/.15*.5} C.5,${.5-e3/.15*.5},.5,.5,0,.5`,strokeWidth:1},"\u2570":{type:2,data:(t3,e3)=>`M.5,0 L.5,${.5-e3/.15*.5} C.5,${.5-e3/.15*.5},.5,.5,1,.5`,strokeWidth:1},"\u2571":{type:2,data:"M1,0 L0,1",strokeWidth:1},"\u2572":{type:2,data:"M0,0 L1,1",strokeWidth:1},"\u2573":{type:2,data:"M1,0 L0,1 M0,0 L1,1",strokeWidth:1},"\u2574":{type:2,data:"M.5,.5 L0,.5",strokeWidth:1},"\u2575":{type:2,data:"M.5,.5 L.5,0",strokeWidth:1},"\u2576":{type:2,data:"M.5,.5 L1,.5",strokeWidth:1},"\u2577":{type:2,data:"M.5,.5 L.5,1",strokeWidth:1},"\u2578":{type:2,data:"M.5,.5 L0,.5",strokeWidth:3},"\u2579":{type:2,data:"M.5,.5 L.5,0",strokeWidth:3},"\u257A":{type:2,data:"M.5,.5 L1,.5",strokeWidth:3},"\u257B":{type:2,data:"M.5,.5 L.5,1",strokeWidth:3},"\u257C":[{type:2,data:"M.5,.5 L0,.5",strokeWidth:1},{type:2,data:"M.5,.5 L1,.5",strokeWidth:3}],"\u257D":[{type:2,data:"M.5,.5 L.5,0",strokeWidth:1},{type:2,data:"M.5,.5 L.5,1",strokeWidth:3}],"\u257E":[{type:2,data:"M.5,.5 L1,.5",strokeWidth:1},{type:2,data:"M.5,.5 L0,.5",strokeWidth:3}],"\u257F":[{type:2,data:"M.5,.5 L.5,1",strokeWidth:1},{type:2,data:"M.5,.5 L.5,0",strokeWidth:3}],"\u2580":{type:0,data:[{x:0,y:0,w:8,h:4}]},"\u2581":{type:0,data:[{x:0,y:7,w:8,h:1}]},"\u2582":{type:0,data:[{x:0,y:6,w:8,h:2}]},"\u2583":{type:0,data:[{x:0,y:5,w:8,h:3}]},"\u2584":{type:0,data:[{x:0,y:4,w:8,h:4}]},"\u2585":{type:0,data:[{x:0,y:3,w:8,h:5}]},"\u2586":{type:0,data:[{x:0,y:2,w:8,h:6}]},"\u2587":{type:0,data:[{x:0,y:1,w:8,h:7}]},"\u2588":{type:0,data:[{x:0,y:0,w:8,h:8}]},"\u2589":{type:0,data:[{x:0,y:0,w:7,h:8}]},"\u258A":{type:0,data:[{x:0,y:0,w:6,h:8}]},"\u258B":{type:0,data:[{x:0,y:0,w:5,h:8}]},"\u258C":{type:0,data:[{x:0,y:0,w:4,h:8}]},"\u258D":{type:0,data:[{x:0,y:0,w:3,h:8}]},"\u258E":{type:0,data:[{x:0,y:0,w:2,h:8}]},"\u258F":{type:0,data:[{x:0,y:0,w:1,h:8}]},"\u2590":{type:0,data:[{x:4,y:0,w:4,h:8}]},"\u2591":{type:1,data:[[1,0],[0,0]]},"\u2592":{type:1,data:[[1,0],[0,1]]},"\u2593":{type:1,data:[[1,1],[1,0]]},"\u2594":{type:0,data:[{x:0,y:0,w:8,h:1}]},"\u2595":{type:0,data:[{x:7,y:0,w:1,h:8}]},"\u2596":{type:0,data:[{x:0,y:4,w:4,h:4}]},"\u2597":{type:0,data:[{x:4,y:4,w:4,h:4}]},"\u2598":{type:0,data:[{x:0,y:0,w:4,h:4}]},"\u2599":{type:0,data:[{x:0,y:0,w:4,h:8},{x:0,y:4,w:8,h:4}]},"\u259A":{type:0,data:[{x:0,y:0,w:4,h:4},{x:4,y:4,w:4,h:4}]},"\u259B":{type:0,data:[{x:0,y:0,w:4,h:8},{x:4,y:0,w:4,h:4}]},"\u259C":{type:0,data:[{x:0,y:0,w:8,h:4},{x:4,y:0,w:4,h:8}]},"\u259D":{type:0,data:[{x:4,y:0,w:4,h:4}]},"\u259E":{type:0,data:[{x:4,y:0,w:4,h:4},{x:0,y:4,w:4,h:4}]},"\u259F":{type:0,data:[{x:4,y:0,w:4,h:8},{x:0,y:4,w:8,h:4}]},"\uE0A0":{type:5,data:{d:"M.3,1 L.03,1 L.03,.88 C.03,.82,.06,.78,.11,.73 C.15,.7,.2,.68,.28,.65 L.43,.6 C.49,.58,.53,.56,.56,.53 C.59,.5,.6,.47,.6,.43 L.6,.27 L.4,.27 L.69,.1 L.98,.27 L.78,.27 L.78,.46 C.78,.52,.76,.56,.72,.61 C.68,.66,.63,.67,.56,.7 L.48,.72 C.42,.74,.38,.76,.35,.78 C.32,.8,.31,.84,.31,.88 L.31,1 M.3,.5 L.03,.59 L.03,.09 L.3,.09 L.3,.655",type:0}},"\uE0A1":{type:5,data:{d:"M.7,.4 L.7,.47 L.2,.47 L.2,.03 L.355,.03 L.355,.4 L.705,.4 M.7,.5 L.86,.5 L.86,.95 L.69,.95 L.44,.66 L.46,.86 L.46,.95 L.3,.95 L.3,.49 L.46,.49 L.71,.78 L.69,.565 L.69,.5",type:0}},"\uE0A2":{type:5,data:{d:"M.25,.94 C.16,.94,.11,.92,.11,.87 L.11,.53 C.11,.48,.15,.455,.23,.45 L.23,.3 C.23,.25,.26,.22,.31,.19 C.36,.16,.43,.15,.51,.15 C.59,.15,.66,.16,.71,.19 C.77,.22,.79,.26,.79,.3 L.79,.45 C.87,.45,.91,.48,.91,.53 L.91,.87 C.91,.92,.86,.94,.77,.94 L.24,.94 M.53,.2 C.49,.2,.45,.21,.42,.23 C.39,.25,.38,.27,.38,.3 L.38,.45 L.68,.45 L.68,.3 C.68,.27,.67,.25,.64,.23 C.61,.21,.58,.2,.53,.2 M.58,.82 L.58,.66 C.63,.65,.65,.63,.65,.6 C.65,.58,.64,.57,.61,.56 C.58,.55,.56,.54,.52,.54 C.48,.54,.46,.55,.43,.56 C.4,.57,.39,.59,.39,.6 C.39,.63,.41,.64,.46,.66 L.46,.82 L.57,.82",type:0}},"\uE0A3":{type:5,data:{d:"M.7,.4 L.7,.47 L.2,.47 L.2,.03 L.7,.03 L.7,.1 L.355,.1 L.355,.4 L.705,.4 M.7,.5 L.86,.5 L.86,.95 L.69,.95 L.44,.66 L.46,.86 L.46,.95 L.3,.95 L.3,.49 L.46,.49 L.71,.78 L.69,.565 L.69,.5",type:0}},"\uE0B0":{type:5,data:{d:"M0,0 L1,.5 L0,1",type:0,rightPadding:2}},"\uE0B1":{type:5,data:{d:"M-1,-.5 L1,.5 L-1,1.5",type:1,leftPadding:1,rightPadding:1}},"\uE0B2":{type:5,data:{d:"M1,0 L0,.5 L1,1",type:0,leftPadding:2}},"\uE0B3":{type:5,data:{d:"M2,-.5 L0,.5 L2,1.5",type:1,leftPadding:1,rightPadding:1}},"\uE0B4":{type:5,data:{d:"M0,0 L0,1 C0.552,1,1,0.776,1,.5 C1,0.224,0.552,0,0,0",type:0,rightPadding:1}},"\uE0B5":{type:5,data:{d:"M.2,1 C.422,1,.8,.826,.78,.5 C.8,.174,0.422,0,.2,0",type:1,rightPadding:1}},"\uE0B6":{type:5,data:{d:"M1,0 L1,1 C0.448,1,0,0.776,0,.5 C0,0.224,0.448,0,1,0",type:0,leftPadding:1}},"\uE0B7":{type:5,data:{d:"M.8,1 C0.578,1,0.2,.826,.22,.5 C0.2,0.174,0.578,0,0.8,0",type:1,leftPadding:1}},"\uE0B8":{type:5,data:{d:"M-.5,-.5 L1.5,1.5 L-.5,1.5",type:0}},"\uE0B9":{type:5,data:{d:"M-.5,-.5 L1.5,1.5",type:1,leftPadding:1,rightPadding:1}},"\uE0BA":{type:5,data:{d:"M1.5,-.5 L-.5,1.5 L1.5,1.5",type:0}},"\uE0BB":{type:5,data:{d:"M1.5,-.5 L-.5,1.5",type:1,leftPadding:1,rightPadding:1}},"\uE0BC":{type:5,data:{d:"M1.5,-.5 L-.5,1.5 L-.5,-.5",type:0}},"\uE0BD":{type:5,data:{d:"M1.5,-.5 L-.5,1.5",type:1,leftPadding:1,rightPadding:1}},"\uE0BE":{type:5,data:{d:"M-.5,-.5 L1.5,1.5 L1.5,-.5",type:0}},"\uE0BF":{type:5,data:{d:"M-.5,-.5 L1.5,1.5",type:1,leftPadding:1,rightPadding:1}},"\uE0C0":{type:5,data:{d:"M0.8069,0.6075 Q0.7991,0.612,0.7815,0.6218 T0.7542,0.6369 T0.7282,0.6508 T0.7016,0.6644 T0.6778,0.6758 T0.6551,0.6854 T0.637,0.6911 T0.622,0.6936 Q0.6186,0.6936,0.6128,0.6942 T0.6018,0.6952 T0.5894,0.6956 T0.5757,0.6952 T0.561,0.693 T0.5451,0.6879 Q0.5342,0.6834,0.5193,0.6756 T0.4925,0.6614 T0.4673,0.6485 T0.4436,0.6389 T0.4239,0.6363 T0.4089,0.6422 Q0.4045,0.6467,0.3958,0.6554 T0.3843,0.6669 T0.3748,0.6746 T0.3613,0.683 T0.3442,0.6903 L0.3499,0.6956 Q0.3584,0.7042,0.3679,0.7177 T0.3836,0.7403 T0.4019,0.7583 T0.4295,0.7703 Q0.4688,0.7785,0.5203,0.7605 Q0.4902,0.7817,0.449,0.7911 T0.3696,0.8001 Q0.3567,0.7997,0.341,0.7942 T0.3111,0.7813 T0.2805,0.766 T0.2493,0.753 T0.218,0.7472 T0.187,0.754 Q0.1762,0.7589,0.1653,0.7681 T0.1453,0.7895 T0.1308,0.818 T0.1264,0.8507 L0.1264,0.858 Q0.1453,0.8462,0.1607,0.8433 T0.1899,0.8452 T0.2226,0.8625 Q0.2344,0.8707,0.2485,0.8752 T0.2813,0.8831 T0.3089,0.889 Q0.2981,0.8915,0.2846,0.8956 T0.2603,0.9037 T0.2368,0.9115 T0.2129,0.9174 T0.1894,0.9194 T0.1653,0.9155 Q0.1504,0.9115,0.1328,0.9196 T0.0986,0.9421 T0.0655,0.9708 T0.0317,0.9943 T0,1 Q0.001,0.94,0.0017,0.6508 T0.0024,0.2322 Q0.002,0.2109,0.0007,0.1379 T0,0.0249 Q0.0058,0.0253,0.009,0.0257 T0.0156,0.0288 T0.0203,0.0333 T0.0264,0.0422 T0.0349,0.0539 Q0.044,0.0657,0.0542,0.072 T0.0752,0.0789 T0.096,0.0775 T0.1175,0.0694 T0.1379,0.0573 T0.1579,0.0432 Q0.2141,0,0.2673,0.0318 Q0.2588,0.0318,0.2517,0.033 T0.239,0.0361 T0.2276,0.0424 T0.218,0.0504 T0.2085,0.0612 T0.1997,0.0732 T0.1899,0.0875 T0.1795,0.1028 Q0.1748,0.1093,0.1507,0.1234 T0.1186,0.1448 Q0.0999,0.1612,0.1108,0.1783 Q0.1162,0.1877,0.1238,0.1928 T0.1404,0.1979 T0.158,0.1967 T0.1775,0.1895 T0.1963,0.1791 T0.2151,0.1663 T0.2314,0.1534 T0.2458,0.141 T0.2561,0.1322 Q0.2815,0.1106,0.3017,0.101 T0.344,0.0926 T0.3919,0.1077 Q0.4099,0.1175,0.4265,0.1206 T0.4588,0.1202 T0.488,0.1098 T0.5176,0.0914 Q0.5071,0.1032,0.4963,0.1122 T0.4722,0.1285 T0.4497,0.1401 T0.4223,0.1518 T0.3943,0.1636 Q0.374,0.1726,0.3623,0.1863 T0.3482,0.2162 Q0.3445,0.2403,0.3608,0.2605 T0.4072,0.2876 Q0.4194,0.2909,0.4326,0.2899 T0.457,0.2856 T0.4805,0.2764 T0.5032,0.264 T0.5256,0.2497 T0.5478,0.2352 T0.5698,0.2222 T0.5921,0.2118 Q0.6982,0.173,0.81,0.2436 Q0.833,0.2583,0.8496,0.2674 T0.887,0.2846 T0.925,0.294 T0.9617,0.2911 T1,0.2746 Q0.9817,0.2946,0.96,0.3056 T0.9175,0.3191 T0.8731,0.3209 T0.8277,0.3164 T0.7818,0.3109 T0.7359,0.3101 T0.6907,0.3197 T0.647,0.3448 Q0.6443,0.3472,0.6333,0.3562 T0.6194,0.3674 T0.6076,0.3766 T0.594,0.386 T0.5815,0.3931 T0.5661,0.4007 T0.5501,0.4064 L0.5556,0.4121 Q0.5627,0.4198,0.5722,0.4251 T0.5926,0.4337 T0.6131,0.439 T0.6343,0.4431 T0.6521,0.4468 Q0.6762,0.4529,0.7056,0.4463 Q0.6772,0.4623,0.6543,0.471 T0.604,0.4814 Q0.5962,0.4818,0.5815,0.4825 T0.5591,0.4835 T0.5393,0.4857 T0.519,0.4908 T0.5007,0.4996 T0.4812,0.5141 T0.4627,0.5353 L0.4549,0.5451 L0.4661,0.543 Q0.4759,0.541,0.4909,0.55 T0.5315,0.5796 T0.5684,0.6083 Q0.5799,0.6161,0.5915,0.6212 T0.6181,0.6308 L0.6331,0.6353 Q0.6514,0.6418,0.7004,0.633 T0.8069,0.6075 Z",type:0}},"\uE0C1":{type:5,data:{d:"M0.011,0.0469 Q0.0152,0.0412,0.02,0.0361 T0.0292,0.0281 T0.0365,0.0253 Q0.0426,0.0257,0.0461,0.0263 T0.0534,0.03 T0.0582,0.0345 T0.0645,0.0434 T0.0723,0.0546 Q0.0807,0.0653,0.0897,0.0712 T0.1081,0.0775 T0.1255,0.0765 T0.1438,0.0695 T0.1605,0.0593 T0.1772,0.0473 Q0.2388,0,0.2927,0.0326 L0.2614,0.0767 L0.2581,0.0767 Q0.2494,0.0767,0.2444,0.0773 T0.2359,0.0789 T0.2291,0.0842 T0.2233,0.0922 T0.2146,0.1054 T0.2026,0.1236 Q0.1943,0.1354,0.1843,0.1444 T0.1675,0.1574 T0.1526,0.1654 T0.1429,0.1701 Q0.1436,0.1717,0.1446,0.1733 Q0.1504,0.1823,0.1581,0.1866 T0.1733,0.1915 T0.1909,0.1884 T0.2085,0.1809 T0.2265,0.169 T0.2427,0.1564 T0.2575,0.1436 T0.2688,0.1338 Q0.2969,0.1101,0.3195,0.0995 T0.3643,0.0901 T0.4114,0.1048 Q0.4279,0.1138,0.4426,0.1168 T0.4705,0.117 T0.4945,0.1089 T0.5186,0.0942 L0.5211,0.0926 L0.5289,0.0922 Q0.5411,0.095,0.5189,0.1203 Q0.505,0.1358,0.4913,0.1474 T0.4634,0.167 T0.4389,0.1796 T0.4121,0.1909 T0.3866,0.2011 Q0.3782,0.2047,0.3727,0.2092 Q0.3717,0.2117,0.3714,0.2141 Q0.3695,0.2263,0.3751,0.2388 T0.394,0.2616 T0.4253,0.2761 Q0.4398,0.2785,0.4513,0.2779 T0.4756,0.2724 T0.4987,0.2616 T0.5216,0.2476 T0.5453,0.2321 T0.5703,0.217 T0.5976,0.2043 Q0.7015,0.166,0.8099,0.2345 Q0.8361,0.2512,0.8572,0.2616 T0.9006,0.2779 T0.9432,0.281 T0.9819,0.2663 L0.9887,0.2671 Q1,0.272,0.9768,0.2969 Q0.9558,0.3193,0.9319,0.333 T0.8858,0.3513 T0.8391,0.3569 T0.793,0.3546 T0.7485,0.3497 T0.7065,0.3473 T0.6681,0.3522 T0.6344,0.3699 Q0.5963,0.4005,0.5847,0.4082 Q0.595,0.4139,0.6079,0.4174 T0.6367,0.4237 T0.6586,0.4278 Q0.6793,0.4331,0.7044,0.4278 Q0.7057,0.4278,0.707,0.4274 Q0.7067,0.429,0.7062,0.4313 T0.7036,0.4398 T0.6993,0.4513 T0.6931,0.4619 T0.6851,0.4698 Q0.6573,0.4857,0.6336,0.4947 T0.5831,0.5053 Q0.577,0.5057,0.5615,0.5065 T0.5394,0.508 T0.5221,0.51 T0.5042,0.5139 T0.4905,0.5204 Q0.5008,0.5232,0.515,0.5328 T0.549,0.5585 T0.5799,0.5824 Q0.5905,0.5897,0.6013,0.5946 T0.6262,0.6036 T0.6409,0.6081 Q0.6567,0.6134,0.7035,0.605 T0.8028,0.5816 L0.7974,0.5922 T0.7867,0.6134 L0.7812,0.624 Q0.7799,0.6248,0.7786,0.6252 Q0.7709,0.6297,0.7573,0.6372 T0.7346,0.6499 T0.7123,0.6621 T0.6897,0.6741 T0.6686,0.6847 T0.648,0.6941 T0.6297,0.7013 T0.6129,0.7062 T0.5995,0.7076 Q0.5992,0.7076,0.5831,0.7092 T0.5529,0.7092 T0.525,0.7019 Q0.5105,0.6958,0.4824,0.6811 T0.4356,0.6586 T0.4079,0.6533 Q0.3872,0.6741,0.3827,0.6782 Q0.3872,0.6835,0.3934,0.6929 T0.4037,0.7078 T0.4142,0.7198 T0.4284,0.7304 T0.4466,0.7365 Q0.4824,0.7443,0.5292,0.728 L0.5292,0.7294 T0.529,0.7333 T0.5284,0.7392 T0.5266,0.7463 T0.5236,0.7539 T0.5186,0.7612 T0.5111,0.7679 Q0.5086,0.77,0.5056,0.7716 Q0.4466,0.8104,0.3591,0.8091 Q0.344,0.8091,0.3246,0.802 T0.2893,0.7863 T0.2543,0.77 T0.2206,0.76 T0.1894,0.7643 Q0.1804,0.7684,0.1733,0.7753 Q0.1591,0.7892,0.1601,0.8169 Q0.1784,0.8067,0.1938,0.8053 T0.2212,0.8087 T0.2507,0.825 Q0.2614,0.8324,0.2744,0.8365 T0.3053,0.844 T0.332,0.8499 L0.303,0.894 L0.2998,0.8948 Q0.2904,0.8968,0.278,0.9009 T0.2554,0.9086 T0.233,0.9158 T0.2099,0.9213 T0.1868,0.9229 T0.1633,0.9192 Q0.1517,0.916,0.1367,0.9241 T0.1065,0.9462 T0.0753,0.9737 T0.041,0.9955 T0.0061,1 Q0,0.9984,0.0068,0.9845 Q0.009,0.9804,0.0123,0.9755 Q0.0187,0.9666,0.0261,0.9606 T0.0374,0.9555 Q0.0481,0.958,0.0629,0.949 T0.0931,0.9262 T0.1247,0.8987 T0.1597,0.8777 T0.1949,0.8752 Q0.213,0.8805,0.2343,0.8772 Q0.2249,0.8736,0.2172,0.8683 Q0.1914,0.8511,0.1738,0.8497 T0.1349,0.8617 Q0.1304,0.865,0.1273,0.8646 T0.1242,0.8605 L0.1239,0.8536 Q0.1226,0.8295,0.1354,0.8016 T0.1723,0.7496 Q0.1914,0.7308,0.2104,0.7219 Q0.2259,0.7145,0.2425,0.7141 T0.273,0.7182 T0.3022,0.7296 T0.3301,0.7439 T0.3569,0.7571 T0.3821,0.7643 Q0.373,0.7561,0.3598,0.7367 T0.3382,0.7088 L0.3327,0.7035 Q0.3282,0.699,0.3353,0.6884 T0.3517,0.6692 L0.3611,0.6607 Q0.3711,0.657,0.3751,0.6554 T0.3837,0.6507 T0.3898,0.6458 T0.3979,0.637 T0.4111,0.6236 Q0.4172,0.6175,0.4234,0.6138 Q0.4327,0.6081,0.4439,0.6077 T0.4655,0.6105 T0.4884,0.6201 T0.5113,0.633 T0.5347,0.6468 T0.5573,0.6578 Q0.5705,0.6635,0.5833,0.665 T0.6112,0.665 T0.6286,0.6635 Q0.6421,0.6631,0.6718,0.6501 Q0.626,0.6578,0.6089,0.6517 Q0.6063,0.6509,0.6002,0.6491 T0.5884,0.6454 T0.5757,0.6409 T0.561,0.6344 T0.5466,0.6256 Q0.536,0.6183,0.5108,0.5989 T0.4722,0.5712 T0.4527,0.564 L0.4418,0.5661 Q0.4308,0.5681,0.4366,0.5563 Q0.4401,0.5485,0.4476,0.5392 L0.455,0.5298 Q0.4631,0.5188,0.4714,0.51 T0.4866,0.4947 T0.5021,0.4831 T0.516,0.4749 T0.53,0.4694 T0.5428,0.4657 T0.5558,0.4637 T0.5674,0.4629 T0.5795,0.4625 Q0.5489,0.4543,0.534,0.4384 L0.5286,0.4327 Q0.5244,0.4282,0.5318,0.4174 T0.5486,0.398 L0.5579,0.3899 Q0.567,0.387,0.5749,0.3834 T0.5878,0.3772 T0.6012,0.3687 T0.6126,0.3603 T0.6268,0.3487 T0.6421,0.3361 Q0.6567,0.3242,0.6712,0.3159 T0.7009,0.3034 T0.7277,0.2973 T0.7556,0.2961 T0.7809,0.2977 T0.8074,0.301 Q0.8096,0.3014,0.8109,0.3016 T0.8143,0.302 T0.818,0.3026 Q0.8012,0.2936,0.7767,0.2781 Q0.6718,0.2117,0.5744,0.2476 Q0.5637,0.2516,0.5492,0.2604 T0.5218,0.2779 T0.4923,0.2965 T0.461,0.3124 T0.4282,0.3216 T0.394,0.3206 Q0.3637,0.3136,0.3474,0.2936 T0.3353,0.2459 Q0.3385,0.2247,0.355,0.2023 Q0.3646,0.1892,0.3763,0.179 Q0.3898,0.1672,0.4063,0.1595 Q0.3927,0.1562,0.3785,0.1485 Q0.3604,0.1387,0.3453,0.1354 T0.3161,0.1354 T0.2899,0.1458 T0.2627,0.166 Q0.262,0.1664,0.254,0.1733 T0.2414,0.1841 T0.2267,0.196 T0.2094,0.2086 T0.1915,0.2196 T0.1725,0.2288 T0.1546,0.2337 T0.1373,0.2343 T0.1223,0.228 T0.1097,0.2145 Q0.0962,0.1929,0.1258,0.1582 Q0.131,0.1517,0.1371,0.1464 Q0.1462,0.1387,0.156,0.1321 T0.1752,0.1205 T0.1878,0.1134 Q0.1891,0.1117,0.1947,0.103 T0.2035,0.0899 T0.2125,0.0781 T0.2243,0.064 Q0.1949,0.0616,0.1672,0.0828 Q0.153,0.0934,0.1412,0.1009 T0.1146,0.1146 T0.0873,0.1213 T0.0616,0.116 T0.0374,0.0962 Q0.0339,0.0909,0.0295,0.0846 T0.024,0.0767 T0.0202,0.0728 T0.0148,0.0704 T0.0068,0.0697 Q0.0003,0.0693,0.0058,0.0567 Q0.0077,0.0522,0.011,0.0469 Z",type:0}},"\uE0C2":{type:5,data:{d:"M0.1934,0.6075 Q0.2012,0.612,0.2188,0.6218 T0.2459,0.6369 T0.2718,0.6508 T0.2983,0.6644 T0.322,0.6758 T0.3447,0.6854 T0.363,0.6911 T0.3783,0.6936 Q0.3796,0.6936,0.396,0.6952 T0.4265,0.6952 T0.4548,0.6879 Q0.4656,0.6834,0.4805,0.6756 T0.5073,0.6614 T0.5327,0.6485 T0.5564,0.6389 T0.5759,0.6363 T0.5909,0.6422 Q0.5953,0.6467,0.604,0.6554 T0.6155,0.6669 T0.6251,0.6746 T0.6387,0.683 T0.6556,0.6903 L0.6498,0.6956 Q0.6414,0.7042,0.6319,0.7177 T0.6162,0.7403 T0.5979,0.7583 T0.5703,0.7703 Q0.5313,0.7785,0.4799,0.7605 Q0.5097,0.7817,0.5508,0.7911 T0.6302,0.8001 Q0.6431,0.7997,0.659,0.7942 T0.6888,0.7813 T0.7194,0.766 T0.7506,0.753 T0.7819,0.7472 T0.8131,0.754 Q0.8239,0.7589,0.8346,0.7681 T0.8544,0.7895 T0.8689,0.818 T0.8737,0.8507 L0.8733,0.858 Q0.8591,0.849,0.8474,0.845 T0.8242,0.8421 T0.8021,0.8482 T0.7772,0.8625 Q0.7653,0.8707,0.7513,0.8752 T0.7184,0.8831 T0.6908,0.889 Q0.7017,0.8915,0.7152,0.8956 T0.7396,0.9037 T0.7633,0.9115 T0.7872,0.9174 T0.8107,0.9194 T0.8347,0.9155 Q0.8493,0.9115,0.8671,0.9196 T0.9015,0.9421 T0.9345,0.9708 T0.9682,0.9943 T0.9997,1 Q0.999,0.94,0.9983,0.6508 T0.9976,0.2322 Q0.9976,0.2109,0.9992,0.1379 T1,0.0249 Q0.9949,0.0249,0.9917,0.0257 T0.9863,0.0273 T0.9817,0.0308 T0.9776,0.0357 T0.9721,0.0437 T0.9651,0.0539 Q0.956,0.0657,0.9456,0.072 T0.9247,0.0789 T0.904,0.0775 T0.8823,0.0694 T0.862,0.0573 T0.8422,0.0432 Q0.7856,0,0.7328,0.0318 Q0.7392,0.0318,0.7452,0.0324 T0.756,0.0345 T0.7657,0.0386 T0.7741,0.0437 T0.7821,0.0506 T0.7894,0.0588 T0.7966,0.0683 T0.8039,0.0787 T0.8119,0.0904 T0.8202,0.1028 Q0.8249,0.1093,0.849,0.1234 T0.8811,0.1448 Q0.8998,0.1612,0.8893,0.1783 Q0.8835,0.1877,0.8759,0.1928 T0.8593,0.1979 T0.8417,0.1967 T0.8222,0.1895 T0.8034,0.1791 T0.7848,0.1663 T0.7687,0.1534 T0.7543,0.141 T0.744,0.1322 Q0.7186,0.1106,0.6984,0.101 T0.6559,0.0926 T0.6082,0.1077 Q0.5899,0.1175,0.5733,0.1206 T0.5411,0.1202 T0.5122,0.1098 T0.4822,0.0914 Q0.4927,0.1032,0.5036,0.1122 T0.5276,0.1285 T0.5503,0.1401 T0.5777,0.1518 T0.6055,0.1636 Q0.6258,0.1726,0.6375,0.1863 T0.6519,0.2162 Q0.6556,0.2403,0.6392,0.2605 T0.5926,0.2876 Q0.5804,0.2909,0.5672,0.2899 T0.5428,0.2856 T0.5193,0.2764 T0.4966,0.264 T0.4744,0.2497 T0.4523,0.2352 T0.4301,0.2222 T0.4077,0.2118 Q0.3021,0.173,0.1903,0.2436 Q0.1669,0.2583,0.1504,0.2674 T0.1129,0.2846 T0.075,0.294 T0.0384,0.2911 T0,0.2746 Q0.021,0.297,0.0459,0.3082 T0.0953,0.3207 T0.146,0.3193 T0.1988,0.3131 T0.2508,0.3095 T0.3029,0.3176 T0.3529,0.3448 Q0.3566,0.348,0.3652,0.355 T0.3771,0.3645 T0.3877,0.3731 T0.3993,0.3815 T0.4103,0.3884 T0.4226,0.3953 T0.4352,0.4009 T0.4497,0.4064 L0.4443,0.4121 Q0.4372,0.4198,0.4277,0.4251 T0.4072,0.4337 T0.3867,0.439 T0.3656,0.4431 T0.3481,0.4468 Q0.3241,0.4529,0.2943,0.4463 Q0.3227,0.4623,0.3458,0.471 T0.3959,0.4814 Q0.404,0.4818,0.4187,0.4825 T0.4409,0.4835 T0.4605,0.4857 T0.4809,0.4908 T0.4992,0.4996 T0.5186,0.5141 T0.5371,0.5353 L0.5449,0.5451 L0.5337,0.543 Q0.5242,0.541,0.5091,0.55 T0.4683,0.5796 T0.4314,0.6083 Q0.4203,0.6161,0.4086,0.6212 T0.382,0.6308 T0.3667,0.6353 Q0.3485,0.6418,0.2995,0.633 T0.1934,0.6075 Z",type:0}},"\uE0C3":{type:5,data:{d:"M0.989,0.0469 Q0.9829,0.0379,0.9753,0.0316 T0.9635,0.0253 Q0.9574,0.0257,0.9539,0.0263 T0.9466,0.03 T0.9418,0.0345 T0.9355,0.0434 T0.9277,0.0546 Q0.9193,0.0653,0.9103,0.0712 T0.8919,0.0775 T0.8745,0.0765 T0.8564,0.0695 T0.8396,0.0593 T0.8228,0.0473 Q0.7612,0,0.7073,0.0326 L0.7386,0.0767 L0.7419,0.0767 Q0.7506,0.0767,0.7556,0.0773 T0.7641,0.0789 T0.7709,0.0842 T0.7767,0.0922 T0.7854,0.1054 T0.7974,0.1236 Q0.8057,0.1354,0.8157,0.1444 T0.8325,0.1574 T0.8474,0.1654 T0.8571,0.1701 Q0.8564,0.1717,0.8554,0.1733 Q0.8503,0.1815,0.844,0.186 T0.8301,0.1909 T0.8153,0.1903 T0.7993,0.1845 T0.7836,0.1758 T0.768,0.1648 T0.754,0.1535 T0.741,0.1425 T0.7312,0.1338 Q0.7031,0.1101,0.6805,0.0995 T0.6357,0.0901 T0.5886,0.1048 Q0.5721,0.1138,0.5574,0.1168 T0.5295,0.117 T0.5055,0.1089 T0.4814,0.0942 L0.4789,0.0926 L0.4711,0.0922 Q0.4589,0.095,0.4811,0.1203 Q0.495,0.1358,0.5087,0.1474 T0.5366,0.167 T0.5611,0.1796 T0.5879,0.1909 T0.6134,0.2011 Q0.6218,0.2047,0.6273,0.2092 Q0.6283,0.2117,0.6286,0.2141 Q0.6305,0.2263,0.6249,0.2388 T0.606,0.2616 T0.5747,0.2761 Q0.5602,0.2785,0.5487,0.2779 T0.5245,0.2724 T0.5015,0.2616 T0.4784,0.2476 T0.4547,0.2321 T0.4297,0.217 T0.4024,0.2043 Q0.2985,0.166,0.1901,0.2345 Q0.1694,0.248,0.1523,0.2569 T0.1165,0.2726 T0.0818,0.2812 T0.0494,0.2796 T0.0181,0.2663 L0.0116,0.2671 Q0,0.272,0.0232,0.2969 Q0.0468,0.3222,0.0742,0.3365 T0.1278,0.3542 T0.1807,0.3564 T0.233,0.352 T0.2815,0.3473 T0.3269,0.3509 T0.3656,0.3699 Q0.4037,0.4005,0.4153,0.4082 Q0.405,0.4139,0.3921,0.4174 T0.3633,0.4237 T0.3414,0.4278 Q0.3207,0.4331,0.2956,0.4278 Q0.2943,0.4278,0.293,0.4274 Q0.2933,0.429,0.2938,0.4313 T0.2964,0.4398 T0.3007,0.4513 T0.3069,0.4619 T0.3149,0.4698 Q0.3427,0.4857,0.3664,0.4947 T0.4169,0.5053 Q0.423,0.5057,0.4385,0.5065 T0.4606,0.508 T0.4779,0.51 T0.4958,0.5139 T0.5095,0.5204 Q0.4992,0.5232,0.485,0.5328 T0.451,0.5585 T0.4201,0.5824 Q0.4095,0.5897,0.3987,0.5946 T0.3738,0.6036 T0.3591,0.6081 Q0.3433,0.6134,0.2965,0.605 T0.1972,0.5816 L0.2026,0.5922 T0.2133,0.6134 L0.2188,0.624 Q0.2201,0.6248,0.2214,0.6252 Q0.2291,0.6297,0.2486,0.6405 T0.2786,0.657 T0.3066,0.6721 T0.3353,0.6866 T0.3598,0.6972 T0.383,0.7051 T0.4005,0.7076 Q0.4008,0.7076,0.4169,0.7092 T0.4471,0.7092 T0.475,0.7019 Q0.4895,0.6958,0.5176,0.6811 T0.5644,0.6586 T0.5921,0.6533 Q0.6128,0.6741,0.6173,0.6782 Q0.6131,0.6835,0.6068,0.6929 T0.5963,0.7078 T0.5858,0.7198 T0.5716,0.7304 T0.5534,0.7365 Q0.5179,0.7443,0.4708,0.728 L0.4708,0.7294 T0.471,0.7333 T0.4716,0.7392 T0.4734,0.7463 T0.4764,0.7539 T0.4814,0.7612 T0.4889,0.7679 Q0.4914,0.77,0.4944,0.7716 Q0.5534,0.8104,0.6409,0.8091 Q0.6521,0.8091,0.6654,0.8053 T0.6907,0.7959 T0.7157,0.7838 T0.741,0.772 T0.7652,0.7631 T0.7888,0.7594 T0.8106,0.7643 Q0.8196,0.7684,0.8267,0.7753 Q0.8409,0.7892,0.8399,0.8169 Q0.8216,0.8067,0.8062,0.8053 T0.7788,0.8087 T0.7493,0.825 Q0.7386,0.8324,0.7256,0.8365 T0.6947,0.844 T0.668,0.8499 L0.697,0.894 L0.7002,0.8948 Q0.7099,0.8968,0.7222,0.9009 T0.7446,0.9086 T0.767,0.9158 T0.7901,0.9213 T0.8132,0.9229 T0.8367,0.9192 Q0.8483,0.916,0.8633,0.9241 T0.8937,0.9462 T0.9248,0.9737 T0.959,0.9955 T0.9939,1 Q1,0.9984,0.9932,0.9845 Q0.991,0.9804,0.9877,0.9755 Q0.9813,0.9666,0.9739,0.9606 T0.9626,0.9555 Q0.9519,0.958,0.9372,0.949 T0.9071,0.9262 T0.8753,0.8987 T0.8403,0.8777 T0.8051,0.8752 Q0.787,0.8805,0.7657,0.8772 Q0.7751,0.8736,0.7828,0.8683 Q0.8086,0.8511,0.8262,0.8497 T0.8651,0.8617 Q0.8696,0.865,0.8727,0.8646 T0.8758,0.8605 L0.8761,0.8536 Q0.8774,0.8295,0.8646,0.8016 T0.8277,0.7496 Q0.8086,0.7308,0.7896,0.7219 Q0.7741,0.7145,0.7575,0.7141 T0.727,0.7182 T0.6978,0.7296 T0.6699,0.7439 T0.6433,0.7571 T0.6179,0.7643 Q0.627,0.7561,0.6402,0.7367 T0.6618,0.7088 L0.6673,0.7035 Q0.6718,0.699,0.6647,0.6884 T0.6483,0.6692 L0.6389,0.6607 Q0.6289,0.657,0.6249,0.6554 T0.6163,0.6507 T0.6102,0.6458 T0.6021,0.637 T0.5889,0.6236 Q0.5828,0.6175,0.5766,0.6138 Q0.5673,0.6081,0.5561,0.6077 T0.5345,0.6105 T0.5116,0.6201 T0.4887,0.633 T0.4653,0.6468 T0.4427,0.6578 Q0.4295,0.6635,0.4167,0.665 T0.3888,0.665 T0.3714,0.6635 Q0.3579,0.6631,0.3282,0.6501 Q0.374,0.6578,0.3911,0.6517 Q0.3937,0.6509,0.4024,0.6482 T0.4179,0.6434 T0.4348,0.6364 T0.4534,0.6256 Q0.464,0.6183,0.4892,0.5989 T0.5278,0.5712 T0.5476,0.564 L0.5582,0.5661 Q0.5692,0.5681,0.5634,0.5563 Q0.5599,0.5485,0.5524,0.5392 L0.545,0.5298 Q0.5369,0.5188,0.5286,0.51 T0.5134,0.4947 T0.4979,0.4831 T0.484,0.4749 T0.47,0.4694 T0.4572,0.4657 T0.4442,0.4637 T0.4326,0.4629 T0.4205,0.4625 Q0.4511,0.4543,0.466,0.4384 L0.4714,0.4327 Q0.4795,0.4237,0.4469,0.394 L0.4421,0.3899 Q0.433,0.387,0.4251,0.3834 T0.4122,0.3772 T0.3988,0.3687 T0.3874,0.3603 T0.3732,0.3487 T0.3579,0.3361 Q0.3433,0.3242,0.3288,0.3159 T0.2993,0.3034 T0.2725,0.2973 T0.2446,0.2961 T0.2193,0.2977 T0.1926,0.301 Q0.1855,0.3022,0.182,0.3026 Q0.1991,0.2936,0.2233,0.2781 Q0.3282,0.2117,0.4256,0.2476 Q0.4363,0.2516,0.451,0.2604 T0.4784,0.2779 T0.5077,0.2965 T0.539,0.3124 T0.5718,0.3216 T0.606,0.3206 Q0.6363,0.3136,0.6526,0.2936 T0.6647,0.2459 Q0.6615,0.2247,0.645,0.2023 Q0.6354,0.1892,0.6237,0.179 Q0.6102,0.1672,0.5937,0.1595 Q0.6073,0.1562,0.6215,0.1485 Q0.6396,0.1387,0.6547,0.1354 T0.6839,0.1354 T0.7101,0.1458 T0.7373,0.166 Q0.738,0.1664,0.746,0.1733 T0.7586,0.1841 T0.7733,0.196 T0.7907,0.2086 T0.8086,0.2196 T0.8275,0.2288 T0.8454,0.2337 T0.8627,0.2343 T0.8777,0.228 T0.8903,0.2145 Q0.9038,0.1929,0.8742,0.1582 Q0.869,0.1517,0.8629,0.1464 Q0.8538,0.1387,0.844,0.1321 T0.8248,0.1205 T0.8122,0.1134 Q0.8109,0.1117,0.8053,0.103 T0.7965,0.0899 T0.7875,0.0781 T0.7757,0.064 Q0.8051,0.0616,0.8328,0.0828 Q0.847,0.0934,0.8588,0.1009 T0.8854,0.1146 T0.9127,0.1213 T0.9384,0.116 T0.9626,0.0962 Q0.9664,0.0909,0.9706,0.0846 T0.976,0.0767 T0.9798,0.0728 T0.9852,0.0704 T0.9932,0.0697 Q0.9997,0.0693,0.9942,0.0567 Q0.9923,0.0522,0.989,0.0469 Z",type:0}},"\uE0C4":{type:5,data:{d:"M0.4116,0.0126 L0.4116,0.0776 L0.4871,0.0776 L0.4871,0.0126 L0.4116,0.0126 Z M0.4043,0 L0.4944,0 Q0.4973,0,0.4995,0.0021 T0.5017,0.0063 L0.5017,0.0839 Q0.5017,0.0864,0.4993,0.0883 T0.4944,0.0902 L0.4043,0.0902 Q0.4014,0.0902,0.3992,0.0881 T0.397,0.0839 L0.397,0.0063 Q0.397,0.0038,0.3994,0.0019 T0.4043,0 Z M0.4116,0.0126 L0.4116,0.0776 L0.4871,0.0776 L0.4871,0.0126 L0.4116,0.0126 Z M0.4043,0 L0.4944,0 Q0.4973,0,0.4995,0.0021 T0.5017,0.0063 L0.5017,0.0839 Q0.5017,0.0864,0.4993,0.0883 T0.4944,0.0902 L0.4043,0.0902 Q0.4014,0.0902,0.3992,0.0881 T0.397,0.0839 L0.397,0.0063 Q0.397,0.0038,0.3994,0.0019 T0.4043,0 Z M0.4116,0.0126 L0.4116,0.0776 L0.4871,0.0776 L0.4871,0.0126 L0.4116,0.0126 Z M0.4043,0 L0.4944,0 Q0.4973,0,0.4995,0.0021 T0.5017,0.0063 L0.5017,0.0839 Q0.5017,0.0864,0.4993,0.0883 T0.4944,0.0902 L0.4043,0.0902 Q0.4014,0.0902,0.3992,0.0881 T0.397,0.0839 L0.397,0.0063 Q0.397,0.0038,0.3994,0.0019 T0.4043,0 Z M0.9099,0.0084 L0.9099,0.0818 L0.9951,0.0818 L0.9951,0.0084 L0.9099,0.0084 Z M0.9075,0.0042 L0.9976,0.0042 Q1,0.0042,1,0.0063 L1,0.0839 Q1,0.086,0.9976,0.086 L0.9075,0.086 Q0.905,0.086,0.905,0.0839 L0.905,0.0063 Q0.905,0.0042,0.9075,0.0042 Z M0.9099,0.0084 L0.9099,0.0818 L0.9951,0.0818 L0.9951,0.0084 L0.9099,0.0084 Z M0.9075,0.0042 L0.9976,0.0042 Q1,0.0042,1,0.0063 L1,0.0839 Q1,0.086,0.9976,0.086 L0.9075,0.086 Q0.905,0.086,0.905,0.0839 L0.905,0.0063 Q0.905,0.0042,0.9075,0.0042 Z M0.9099,0.0084 L0.9099,0.0818 L0.9951,0.0818 L0.9951,0.0084 L0.9099,0.0084 Z M0.9075,0.0042 L0.9976,0.0042 Q1,0.0042,1,0.0063 L1,0.0839 Q1,0.086,0.9976,0.086 L0.9075,0.086 Q0.905,0.086,0.905,0.0839 L0.905,0.0063 Q0.905,0.0042,0.9075,0.0042 Z M0.66,0.0063 L0.7501,0.0063 L0.7501,0.0839 L0.66,0.0839 L0.66,0.0063 Z M0.66,0.0063 L0.7501,0.0063 L0.7501,0.0839 L0.66,0.0839 L0.66,0.0063 Z M0.66,0.0063 L0.7501,0.0063 L0.7501,0.0839 L0.66,0.0839 L0.66,0.0063 Z M0.5309,0.0063 L0.621,0.0063 L0.621,0.0839 L0.5309,0.0839 L0.5309,0.0063 Z M0.5309,0.0063 L0.621,0.0063 L0.621,0.0839 L0.5309,0.0839 L0.5309,0.0063 Z M0.5309,0.0063 L0.621,0.0063 L0.621,0.0839 L0.5309,0.0839 L0.5309,0.0063 Z M0.2689,0.0063 L0.359,0.0063 L0.359,0.0839 L0.2689,0.0839 L0.2689,0.0063 Z M0.2689,0.0063 L0.359,0.0063 L0.359,0.0839 L0.2689,0.0839 L0.2689,0.0063 Z M0.2689,0.0063 L0.359,0.0063 L0.359,0.0839 L0.2689,0.0839 L0.2689,0.0063 Z M0.1374,0.0063 L0.2275,0.0063 L0.2275,0.0839 L0.1374,0.0839 L0.1374,0.0063 Z M0.1374,0.0063 L0.2275,0.0063 L0.2275,0.0839 L0.1374,0.0839 L0.1374,0.0063 Z M0.1374,0.0063 L0.2275,0.0063 L0.2275,0.0839 L0.1374,0.0839 L0.1374,0.0063 Z M0,0.0063 L0.0901,0.0063 L0.0901,0.0839 L0,0.0839 L0,0.0063 Z M0,0.0063 L0.0901,0.0063 L0.0901,0.0839 L0,0.0839 L0,0.0063 Z M0,0.0063 L0.0901,0.0063 L0.0901,0.0839 L0,0.0839 L0,0.0063 Z M0.4087,0.9224 L0.4087,0.9958 L0.4939,0.9958 L0.4939,0.9224 L0.4087,0.9224 Z M0.4062,0.9182 L0.4963,0.9182 Q0.4988,0.9182,0.4988,0.9203 L0.4988,0.9979 Q0.4988,1,0.4963,1 L0.4062,1 Q0.4038,1,0.4038,0.9979 L0.4038,0.9203 Q0.4038,0.9182,0.4062,0.9182 Z M0.4087,0.9224 L0.4087,0.9958 L0.4939,0.9958 L0.4939,0.9224 L0.4087,0.9224 Z M0.4062,0.9182 L0.4963,0.9182 Q0.4988,0.9182,0.4988,0.9203 L0.4988,0.9979 Q0.4988,1,0.4963,1 L0.4062,1 Q0.4038,1,0.4038,0.9979 L0.4038,0.9203 Q0.4038,0.9182,0.4062,0.9182 Z M0.4087,0.9224 L0.4087,0.9958 L0.4939,0.9958 L0.4939,0.9224 L0.4087,0.9224 Z M0.4062,0.9182 L0.4963,0.9182 Q0.4988,0.9182,0.4988,0.9203 L0.4988,0.9979 Q0.4988,1,0.4963,1 L0.4062,1 Q0.4038,1,0.4038,0.9979 L0.4038,0.9203 Q0.4038,0.9182,0.4062,0.9182 Z M0.1374,0.9203 L0.2275,0.9203 L0.2275,0.9979 L0.1374,0.9979 L0.1374,0.9203 Z M0.1374,0.9203 L0.2275,0.9203 L0.2275,0.9979 L0.1374,0.9979 L0.1374,0.9203 Z M0.1374,0.9203 L0.2275,0.9203 L0.2275,0.9979 L0.1374,0.9979 L0.1374,0.9203 Z M0,0.9203 L0.0901,0.9203 L0.0901,0.9979 L0,0.9979 L0,0.9203 Z M0,0.9203 L0.0901,0.9203 L0.0901,0.9979 L0,0.9979 L0,0.9203 Z M0,0.9203 L0.0901,0.9203 L0.0901,0.9979 L0,0.9979 L0,0.9203 Z M0.9099,0.1158 L0.9099,0.1888 L0.9951,0.1888 L0.9951,0.1158 L0.9099,0.1158 Z M0.9075,0.1116 L0.9976,0.1116 Q1,0.1116,1,0.1137 L1,0.1909 Q1,0.193,0.9976,0.193 L0.9075,0.193 Q0.905,0.193,0.905,0.1909 L0.905,0.1137 Q0.905,0.1116,0.9075,0.1116 Z M0.7852,0.6086 L0.7852,0.682 L0.8704,0.682 L0.8704,0.6086 L0.7852,0.6086 Z M0.7828,0.6044 L0.8729,0.6044 Q0.8753,0.6044,0.8753,0.6065 L0.8753,0.6841 Q0.8753,0.6862,0.8729,0.6862 L0.7828,0.6862 Q0.7803,0.6862,0.7803,0.6841 L0.7803,0.6065 Q0.7803,0.6044,0.7828,0.6044 Z M0.66,0.1137 L0.7501,0.1137 L0.7501,0.1909 L0.66,0.1909 L0.66,0.1137 Z M0.6624,0.4102 L0.6624,0.4836 L0.7477,0.4836 L0.7477,0.4102 L0.6624,0.4102 Z M0.66,0.406 L0.7501,0.406 Q0.7526,0.406,0.7526,0.4081 L0.7526,0.4857 Q0.7526,0.4878,0.7501,0.4878 L0.66,0.4878 Q0.6576,0.4878,0.6576,0.4857 L0.6576,0.4081 Q0.6576,0.406,0.66,0.406 Z M0.6624,0.7131 L0.6624,0.7865 L0.7477,0.7865 L0.7477,0.7131 L0.6624,0.7131 Z M0.66,0.7089 L0.7501,0.7089 Q0.7526,0.7089,0.7526,0.711 L0.7526,0.7886 Q0.7526,0.7907,0.7501,0.7907 L0.66,0.7907 Q0.6576,0.7907,0.6576,0.7886 L0.6576,0.711 Q0.6576,0.7089,0.66,0.7089 Z M0.5407,0.2227 L0.5407,0.2836 L0.6113,0.2836 L0.6113,0.2227 L0.5407,0.2227 Z M0.5309,0.206 L0.621,0.206 Q0.623,0.206,0.6249,0.2068 T0.6281,0.2089 T0.6301,0.2116 T0.6308,0.2143 L0.6308,0.2919 Q0.6308,0.2957,0.6276,0.298 T0.621,0.3003 L0.5309,0.3003 Q0.5265,0.3003,0.5239,0.2976 T0.5212,0.2919 L0.5212,0.2143 Q0.5212,0.211,0.5244,0.2085 T0.5309,0.206 Z M0.5407,0.3184 L0.5407,0.3792 L0.6113,0.3792 L0.6113,0.3184 L0.5407,0.3184 Z M0.5309,0.3016 L0.621,0.3016 Q0.6254,0.3016,0.6281,0.3043 T0.6308,0.31 L0.6308,0.3876 Q0.6308,0.3914,0.6276,0.3937 T0.621,0.396 L0.5309,0.396 Q0.5265,0.396,0.5239,0.3932 T0.5212,0.3876 L0.5212,0.31 Q0.5212,0.3062,0.5244,0.3039 T0.5309,0.3016 Z M0.5309,0.4081 L0.621,0.4081 L0.621,0.4857 L0.5309,0.4857 L0.5309,0.4081 Z M0.5309,0.5059 L0.621,0.5059 L0.621,0.5835 L0.5309,0.5835 L0.5309,0.5059 Z M0.5407,0.6149 L0.5407,0.6758 L0.6113,0.6758 L0.6113,0.6149 L0.5407,0.6149 Z M0.5309,0.5982 L0.621,0.5982 Q0.6254,0.5982,0.6281,0.6009 T0.6308,0.6065 L0.6308,0.6841 Q0.6308,0.6879,0.6276,0.6902 T0.621,0.6925 L0.5309,0.6925 Q0.5265,0.6925,0.5239,0.6898 T0.5212,0.6841 L0.5212,0.6065 Q0.5212,0.6028,0.5244,0.6005 T0.5309,0.5982 Z M0.4062,0.1137 L0.4963,0.1137 L0.4963,0.1909 L0.4062,0.1909 L0.4062,0.1137 Z M0.4062,0.2143 L0.4963,0.2143 L0.4963,0.2919 L0.4062,0.2919 L0.4062,0.2143 Z M0.4184,0.4186 L0.4184,0.4753 L0.4842,0.4753 L0.4842,0.4186 L0.4184,0.4186 Z M0.4062,0.3977 L0.4963,0.3977 Q0.5017,0.3977,0.5051,0.401 T0.5085,0.4081 L0.5085,0.4857 Q0.5085,0.4904,0.5046,0.4933 T0.4963,0.4962 L0.4062,0.4962 Q0.4009,0.4962,0.3975,0.4929 T0.3941,0.4857 L0.3941,0.4081 Q0.3941,0.4035,0.398,0.4006 T0.4062,0.3977 Z M0.4062,0.5059 L0.4963,0.5059 L0.4963,0.5835 L0.4062,0.5835 L0.4062,0.5059 Z M0.4087,0.7131 L0.4087,0.7865 L0.4939,0.7865 L0.4939,0.7131 L0.4087,0.7131 Z M0.4062,0.7089 L0.4963,0.7089 Q0.4988,0.7089,0.4988,0.711 L0.4988,0.7886 Q0.4988,0.7907,0.4963,0.7907 L0.4062,0.7907 Q0.4038,0.7907,0.4038,0.7886 L0.4038,0.711 Q0.4038,0.7089,0.4062,0.7089 Z M0.2689,0.1137 L0.359,0.1137 L0.359,0.1909 L0.2689,0.1909 L0.2689,0.1137 Z M0.2689,0.2143 L0.359,0.2143 L0.359,0.2919 L0.2689,0.2919 L0.2689,0.2143 Z M0.2689,0.8154 L0.359,0.8154 L0.359,0.8926 L0.2689,0.8926 L0.2689,0.8154 Z M0.2689,0.31 L0.359,0.31 L0.359,0.3876 L0.2689,0.3876 L0.2689,0.31 Z M0.2689,0.8154 L0.359,0.8154 L0.359,0.8926 L0.2689,0.8926 L0.2689,0.8154 Z M0.2689,0.4081 L0.359,0.4081 L0.359,0.4857 L0.2689,0.4857 L0.2689,0.4081 Z M0.2689,0.5059 L0.359,0.5059 L0.359,0.5835 L0.2689,0.5835 L0.2689,0.5059 Z M0.2689,0.711 L0.359,0.711 L0.359,0.7886 L0.2689,0.7886 L0.2689,0.711 Z M0.2689,0.8154 L0.359,0.8154 L0.359,0.8926 L0.2689,0.8926 L0.2689,0.8154 Z M0.1374,0.1137 L0.2275,0.1137 L0.2275,0.1909 L0.1374,0.1909 L0.1374,0.1137 Z M0.1374,0.2143 L0.2275,0.2143 L0.2275,0.2919 L0.1374,0.2919 L0.1374,0.2143 Z M0.1374,0.8154 L0.2275,0.8154 L0.2275,0.8926 L0.1374,0.8926 L0.1374,0.8154 Z M0.1374,0.31 L0.2275,0.31 L0.2275,0.3876 L0.1374,0.3876 L0.1374,0.31 Z M0.1374,0.8154 L0.2275,0.8154 L0.2275,0.8926 L0.1374,0.8926 L0.1374,0.8154 Z M0.1374,0.4081 L0.2275,0.4081 L0.2275,0.4857 L0.1374,0.4857 L0.1374,0.4081 Z M0.1374,0.5059 L0.2275,0.5059 L0.2275,0.5835 L0.1374,0.5835 L0.1374,0.5059 Z M0.1374,0.6065 L0.2275,0.6065 L0.2275,0.6841 L0.1374,0.6841 L0.1374,0.6065 Z M0.1374,0.711 L0.2275,0.711 L0.2275,0.7886 L0.1374,0.7886 L0.1374,0.711 Z M0.1374,0.8154 L0.2275,0.8154 L0.2275,0.8926 L0.1374,0.8926 L0.1374,0.8154 Z M0,0.1137 L0.0901,0.1137 L0.0901,0.1909 L0,0.1909 L0,0.1137 Z M0,0.2143 L0.0901,0.2143 L0.0901,0.2919 L0,0.2919 L0,0.2143 Z M0,0.8154 L0.0901,0.8154 L0.0901,0.8926 L0,0.8926 L0,0.8154 Z M0,0.31 L0.0901,0.31 L0.0901,0.3876 L0,0.3876 L0,0.31 Z M0,0.8154 L0.0901,0.8154 L0.0901,0.8926 L0,0.8926 L0,0.8154 Z M0,0.4081 L0.0901,0.4081 L0.0901,0.4857 L0,0.4857 L0,0.4081 Z M0,0.5059 L0.0901,0.5059 L0.0901,0.5835 L0,0.5835 L0,0.5059 Z M0,0.6065 L0.0901,0.6065 L0.0901,0.6841 L0,0.6841 L0,0.6065 Z M0,0.711 L0.0901,0.711 L0.0901,0.7886 L0,0.7886 L0,0.711 Z M0,0.8154 L0.0901,0.8154 L0.0901,0.8926 L0,0.8926 L0,0.8154 Z",type:0}},"\uE0C5":{type:5,data:{d:"M0.5884,0.0126 L0.5884,0.0776 L0.5129,0.0776 L0.5129,0.0126 L0.5884,0.0126 Z M0.5957,0 L0.5056,0 Q0.5027,0,0.5005,0.0021 T0.4983,0.0063 L0.4983,0.0839 Q0.4983,0.0864,0.5007,0.0883 T0.5056,0.0902 L0.5957,0.0902 Q0.5986,0.0902,0.6008,0.0881 T0.603,0.0839 L0.603,0.0063 Q0.603,0.0038,0.6006,0.0019 T0.5957,0 Z M0.5884,0.0126 L0.5884,0.0776 L0.5129,0.0776 L0.5129,0.0126 L0.5884,0.0126 Z M0.5957,0 L0.5056,0 Q0.5027,0,0.5005,0.0021 T0.4983,0.0063 L0.4983,0.0839 Q0.4983,0.0864,0.5007,0.0883 T0.5056,0.0902 L0.5957,0.0902 Q0.5986,0.0902,0.6008,0.0881 T0.603,0.0839 L0.603,0.0063 Q0.603,0.0038,0.6006,0.0019 T0.5957,0 Z M0.5884,0.0126 L0.5884,0.0776 L0.5129,0.0776 L0.5129,0.0126 L0.5884,0.0126 Z M0.5957,0 L0.5056,0 Q0.5027,0,0.5005,0.0021 T0.4983,0.0063 L0.4983,0.0839 Q0.4983,0.0864,0.5007,0.0883 T0.5056,0.0902 L0.5957,0.0902 Q0.5986,0.0902,0.6008,0.0881 T0.603,0.0839 L0.603,0.0063 Q0.603,0.0038,0.6006,0.0019 T0.5957,0 Z M0.0901,0.0084 L0.0901,0.0818 L0.0049,0.0818 L0.0049,0.0084 L0.0901,0.0084 Z M0.0925,0.0042 L0.0024,0.0042 Q0,0.0042,0,0.0063 L0,0.0839 Q0,0.086,0.0024,0.086 L0.0925,0.086 Q0.095,0.086,0.095,0.0839 L0.095,0.0063 Q0.095,0.0042,0.0925,0.0042 Z M0.0901,0.0084 L0.0901,0.0818 L0.0049,0.0818 L0.0049,0.0084 L0.0901,0.0084 Z M0.0925,0.0042 L0.0024,0.0042 Q0,0.0042,0,0.0063 L0,0.0839 Q0,0.086,0.0024,0.086 L0.0925,0.086 Q0.095,0.086,0.095,0.0839 L0.095,0.0063 Q0.095,0.0042,0.0925,0.0042 Z M0.0901,0.0084 L0.0901,0.0818 L0.0049,0.0818 L0.0049,0.0084 L0.0901,0.0084 Z M0.0925,0.0042 L0.0024,0.0042 Q0,0.0042,0,0.0063 L0,0.0839 Q0,0.086,0.0024,0.086 L0.0925,0.086 Q0.095,0.086,0.095,0.0839 L0.095,0.0063 Q0.095,0.0042,0.0925,0.0042 Z M0.34,0.0063 L0.2499,0.0063 L0.2499,0.0839 L0.34,0.0839 L0.34,0.0063 Z M0.34,0.0063 L0.2499,0.0063 L0.2499,0.0839 L0.34,0.0839 L0.34,0.0063 Z M0.34,0.0063 L0.2499,0.0063 L0.2499,0.0839 L0.34,0.0839 L0.34,0.0063 Z M0.4691,0.0063 L0.379,0.0063 L0.379,0.0839 L0.4691,0.0839 L0.4691,0.0063 Z M0.4691,0.0063 L0.379,0.0063 L0.379,0.0839 L0.4691,0.0839 L0.4691,0.0063 Z M0.4691,0.0063 L0.379,0.0063 L0.379,0.0839 L0.4691,0.0839 L0.4691,0.0063 Z M0.7311,0.0063 L0.641,0.0063 L0.641,0.0839 L0.7311,0.0839 L0.7311,0.0063 Z M0.7311,0.0063 L0.641,0.0063 L0.641,0.0839 L0.7311,0.0839 L0.7311,0.0063 Z M0.7311,0.0063 L0.641,0.0063 L0.641,0.0839 L0.7311,0.0839 L0.7311,0.0063 Z M0.8626,0.0063 L0.7725,0.0063 L0.7725,0.0839 L0.8626,0.0839 L0.8626,0.0063 Z M0.8626,0.0063 L0.7725,0.0063 L0.7725,0.0839 L0.8626,0.0839 L0.8626,0.0063 Z M0.8626,0.0063 L0.7725,0.0063 L0.7725,0.0839 L0.8626,0.0839 L0.8626,0.0063 Z M1,0.0063 L0.9099,0.0063 L0.9099,0.0839 L1,0.0839 L1,0.0063 Z M1,0.0063 L0.9099,0.0063 L0.9099,0.0839 L1,0.0839 L1,0.0063 Z M1,0.0063 L0.9099,0.0063 L0.9099,0.0839 L1,0.0839 L1,0.0063 Z M0.5913,0.9224 L0.5913,0.9958 L0.5061,0.9958 L0.5061,0.9224 L0.5913,0.9224 Z M0.5938,0.9182 L0.5037,0.9182 Q0.5012,0.9182,0.5012,0.9203 L0.5012,0.9979 Q0.5012,1,0.5037,1 L0.5938,1 Q0.5962,1,0.5962,0.9979 L0.5962,0.9203 Q0.5962,0.9182,0.5938,0.9182 Z M0.5913,0.9224 L0.5913,0.9958 L0.5061,0.9958 L0.5061,0.9224 L0.5913,0.9224 Z M0.5938,0.9182 L0.5037,0.9182 Q0.5012,0.9182,0.5012,0.9203 L0.5012,0.9979 Q0.5012,1,0.5037,1 L0.5938,1 Q0.5962,1,0.5962,0.9979 L0.5962,0.9203 Q0.5962,0.9182,0.5938,0.9182 Z M0.5913,0.9224 L0.5913,0.9958 L0.5061,0.9958 L0.5061,0.9224 L0.5913,0.9224 Z M0.5938,0.9182 L0.5037,0.9182 Q0.5012,0.9182,0.5012,0.9203 L0.5012,0.9979 Q0.5012,1,0.5037,1 L0.5938,1 Q0.5962,1,0.5962,0.9979 L0.5962,0.9203 Q0.5962,0.9182,0.5938,0.9182 Z M0.8626,0.9203 L0.7725,0.9203 L0.7725,0.9979 L0.8626,0.9979 L0.8626,0.9203 Z M0.8626,0.9203 L0.7725,0.9203 L0.7725,0.9979 L0.8626,0.9979 L0.8626,0.9203 Z M0.8626,0.9203 L0.7725,0.9203 L0.7725,0.9979 L0.8626,0.9979 L0.8626,0.9203 Z M1,0.9203 L0.9099,0.9203 L0.9099,0.9979 L1,0.9979 L1,0.9203 Z M1,0.9203 L0.9099,0.9203 L0.9099,0.9979 L1,0.9979 L1,0.9203 Z M1,0.9203 L0.9099,0.9203 L0.9099,0.9979 L1,0.9979 L1,0.9203 Z M0.0901,0.1158 L0.0901,0.1888 L0.0049,0.1888 L0.0049,0.1158 L0.0901,0.1158 Z M0.0925,0.1116 L0.0024,0.1116 Q0,0.1116,0,0.1137 L0,0.1909 Q0,0.193,0.0024,0.193 L0.0925,0.193 Q0.095,0.193,0.095,0.1909 L0.095,0.1137 Q0.095,0.1116,0.0925,0.1116 Z M0.2148,0.6086 L0.2148,0.682 L0.1296,0.682 L0.1296,0.6086 L0.2148,0.6086 Z M0.2172,0.6044 L0.1271,0.6044 Q0.1247,0.6044,0.1247,0.6065 L0.1247,0.6841 Q0.1247,0.6862,0.1271,0.6862 L0.2172,0.6862 Q0.2197,0.6862,0.2197,0.6841 L0.2197,0.6065 Q0.2197,0.6044,0.2172,0.6044 Z M0.34,0.1137 L0.2499,0.1137 L0.2499,0.1909 L0.34,0.1909 L0.34,0.1137 Z M0.3376,0.4102 L0.3376,0.4836 L0.2523,0.4836 L0.2523,0.4102 L0.3376,0.4102 Z M0.34,0.406 L0.2499,0.406 Q0.2474,0.406,0.2474,0.4081 L0.2474,0.4857 Q0.2474,0.4878,0.2499,0.4878 L0.34,0.4878 Q0.3424,0.4878,0.3424,0.4857 L0.3424,0.4081 Q0.3424,0.406,0.34,0.406 Z M0.3376,0.7131 L0.3376,0.7865 L0.2523,0.7865 L0.2523,0.7131 L0.3376,0.7131 Z M0.34,0.7089 L0.2499,0.7089 Q0.2474,0.7089,0.2474,0.711 L0.2474,0.7886 Q0.2474,0.7907,0.2499,0.7907 L0.34,0.7907 Q0.3424,0.7907,0.3424,0.7886 L0.3424,0.711 Q0.3424,0.7089,0.34,0.7089 Z M0.4593,0.2227 L0.4593,0.2836 L0.3887,0.2836 L0.3887,0.2227 L0.4593,0.2227 Z M0.4691,0.206 L0.379,0.206 Q0.3746,0.206,0.3719,0.2087 T0.3692,0.2143 L0.3692,0.2919 Q0.3692,0.2957,0.3724,0.298 T0.379,0.3003 L0.4691,0.3003 Q0.4735,0.3003,0.4761,0.2976 T0.4788,0.2919 L0.4788,0.2143 Q0.4788,0.211,0.4756,0.2085 T0.4691,0.206 Z M0.4593,0.3184 L0.4593,0.3792 L0.3887,0.3792 L0.3887,0.3184 L0.4593,0.3184 Z M0.4691,0.3016 L0.379,0.3016 Q0.3746,0.3016,0.3719,0.3043 T0.3692,0.31 L0.3692,0.3876 Q0.3692,0.3914,0.3724,0.3937 T0.379,0.396 L0.4691,0.396 Q0.4735,0.396,0.4761,0.3932 T0.4788,0.3876 L0.4788,0.31 Q0.4788,0.3062,0.4756,0.3039 T0.4691,0.3016 Z M0.4691,0.4081 L0.379,0.4081 L0.379,0.4857 L0.4691,0.4857 L0.4691,0.4081 Z M0.4691,0.5059 L0.379,0.5059 L0.379,0.5835 L0.4691,0.5835 L0.4691,0.5059 Z M0.4593,0.6149 L0.4593,0.6758 L0.3887,0.6758 L0.3887,0.6149 L0.4593,0.6149 Z M0.4691,0.5982 L0.379,0.5982 Q0.3746,0.5982,0.3719,0.6009 T0.3692,0.6065 L0.3692,0.6841 Q0.3692,0.6879,0.3724,0.6902 T0.379,0.6925 L0.4691,0.6925 Q0.4735,0.6925,0.4761,0.6898 T0.4788,0.6841 L0.4788,0.6065 Q0.4788,0.6028,0.4756,0.6005 T0.4691,0.5982 Z M0.5938,0.1137 L0.5037,0.1137 L0.5037,0.1909 L0.5938,0.1909 L0.5938,0.1137 Z M0.5938,0.2143 L0.5037,0.2143 L0.5037,0.2919 L0.5938,0.2919 L0.5938,0.2143 Z M0.5816,0.4186 L0.5816,0.4753 L0.5158,0.4753 L0.5158,0.4186 L0.5816,0.4186 Z M0.5938,0.3977 L0.5037,0.3977 Q0.4983,0.3977,0.4949,0.401 T0.4915,0.4081 L0.4915,0.4857 Q0.4915,0.4904,0.4954,0.4933 T0.5037,0.4962 L0.5938,0.4962 Q0.5991,0.4962,0.6025,0.4929 T0.6059,0.4857 L0.6059,0.4081 Q0.6059,0.4035,0.602,0.4006 T0.5938,0.3977 Z M0.5938,0.5059 L0.5037,0.5059 L0.5037,0.5835 L0.5938,0.5835 L0.5938,0.5059 Z M0.5913,0.7131 L0.5913,0.7865 L0.5061,0.7865 L0.5061,0.7131 L0.5913,0.7131 Z M0.5938,0.7089 L0.5037,0.7089 Q0.5012,0.7089,0.5012,0.711 L0.5012,0.7886 Q0.5012,0.7907,0.5037,0.7907 L0.5938,0.7907 Q0.5962,0.7907,0.5962,0.7886 L0.5962,0.711 Q0.5962,0.7089,0.5938,0.7089 Z M0.7311,0.1137 L0.641,0.1137 L0.641,0.1909 L0.7311,0.1909 L0.7311,0.1137 Z M0.7311,0.2143 L0.641,0.2143 L0.641,0.2919 L0.7311,0.2919 L0.7311,0.2143 Z M0.7311,0.8154 L0.641,0.8154 L0.641,0.8926 L0.7311,0.8926 L0.7311,0.8154 Z M0.7311,0.31 L0.641,0.31 L0.641,0.3876 L0.7311,0.3876 L0.7311,0.31 Z M0.7311,0.8154 L0.641,0.8154 L0.641,0.8926 L0.7311,0.8926 L0.7311,0.8154 Z M0.7311,0.4081 L0.641,0.4081 L0.641,0.4857 L0.7311,0.4857 L0.7311,0.4081 Z M0.7311,0.5059 L0.641,0.5059 L0.641,0.5835 L0.7311,0.5835 L0.7311,0.5059 Z M0.7311,0.711 L0.641,0.711 L0.641,0.7886 L0.7311,0.7886 L0.7311,0.711 Z M0.7311,0.8154 L0.641,0.8154 L0.641,0.8926 L0.7311,0.8926 L0.7311,0.8154 Z M0.8626,0.1137 L0.7725,0.1137 L0.7725,0.1909 L0.8626,0.1909 L0.8626,0.1137 Z M0.8626,0.2143 L0.7725,0.2143 L0.7725,0.2919 L0.8626,0.2919 L0.8626,0.2143 Z M0.8626,0.8154 L0.7725,0.8154 L0.7725,0.8926 L0.8626,0.8926 L0.8626,0.8154 Z M0.8626,0.31 L0.7725,0.31 L0.7725,0.3876 L0.8626,0.3876 L0.8626,0.31 Z M0.8626,0.8154 L0.7725,0.8154 L0.7725,0.8926 L0.8626,0.8926 L0.8626,0.8154 Z M0.8626,0.4081 L0.7725,0.4081 L0.7725,0.4857 L0.8626,0.4857 L0.8626,0.4081 Z M0.8626,0.5059 L0.7725,0.5059 L0.7725,0.5835 L0.8626,0.5835 L0.8626,0.5059 Z M0.8626,0.6065 L0.7725,0.6065 L0.7725,0.6841 L0.8626,0.6841 L0.8626,0.6065 Z M0.8626,0.711 L0.7725,0.711 L0.7725,0.7886 L0.8626,0.7886 L0.8626,0.711 Z M0.8626,0.8154 L0.7725,0.8154 L0.7725,0.8926 L0.8626,0.8926 L0.8626,0.8154 Z M1,0.1137 L0.9099,0.1137 L0.9099,0.1909 L1,0.1909 L1,0.1137 Z M1,0.2143 L0.9099,0.2143 L0.9099,0.2919 L1,0.2919 L1,0.2143 Z M1,0.8154 L0.9099,0.8154 L0.9099,0.8926 L1,0.8926 L1,0.8154 Z M1,0.31 L0.9099,0.31 L0.9099,0.3876 L1,0.3876 L1,0.31 Z M1,0.8154 L0.9099,0.8154 L0.9099,0.8926 L1,0.8926 L1,0.8154 Z M1,0.4081 L0.9099,0.4081 L0.9099,0.4857 L1,0.4857 L1,0.4081 Z M1,0.5059 L0.9099,0.5059 L0.9099,0.5835 L1,0.5835 L1,0.5059 Z M1,0.6065 L0.9099,0.6065 L0.9099,0.6841 L1,0.6841 L1,0.6065 Z M1,0.711 L0.9099,0.711 L0.9099,0.7886 L1,0.7886 L1,0.711 Z M1,0.8154 L0.9099,0.8154 L0.9099,0.8926 L1,0.8926 L1,0.8154 Z",type:0}},"\uE0C6":{type:5,data:{d:"M0.6529,0.018 L0.6529,0.112 L0.7724,0.112 L0.7724,0.018 L0.6529,0.018 Z M0.6411,0 L0.7837,0 Q0.7873,0,0.7902,0.0015 T0.7943,0.005 T0.7956,0.0092 L0.7956,0.1208 Q0.7956,0.125,0.7917,0.1275 T0.7837,0.13 L0.6411,0.13 Q0.6359,0.13,0.6326,0.1271 T0.6292,0.1208 L0.6292,0.0092 Q0.6292,0.005,0.6331,0.0025 T0.6411,0 Z M0.6529,0.018 L0.6529,0.112 L0.7724,0.112 L0.7724,0.018 L0.6529,0.018 Z M0.6411,0 L0.7837,0 Q0.7873,0,0.7902,0.0015 T0.7943,0.005 T0.7956,0.0092 L0.7956,0.1208 Q0.7956,0.125,0.7917,0.1275 T0.7837,0.13 L0.6411,0.13 Q0.6359,0.13,0.6326,0.1271 T0.6292,0.1208 L0.6292,0.0092 Q0.6292,0.005,0.6331,0.0025 T0.6411,0 Z M0.6529,0.018 L0.6529,0.112 L0.7724,0.112 L0.7724,0.018 L0.6529,0.018 Z M0.6411,0 L0.7837,0 Q0.7873,0,0.7902,0.0015 T0.7943,0.005 T0.7956,0.0092 L0.7956,0.1208 Q0.7956,0.125,0.7917,0.1275 T0.7837,0.13 L0.6411,0.13 Q0.6359,0.13,0.6326,0.1271 T0.6292,0.1208 L0.6292,0.0092 Q0.6292,0.005,0.6331,0.0025 T0.6411,0 Z M0.4325,0.0143 L0.4325,0.1158 L0.5628,0.1158 L0.5628,0.0143 L0.4325,0.0143 Z M0.4264,0.0042 L0.5695,0.0042 Q0.5721,0.0042,0.5739,0.0057 T0.5757,0.0092 L0.5757,0.1208 Q0.5757,0.1221,0.5752,0.1231 T0.5736,0.1248 T0.5716,0.1256 T0.5695,0.1258 L0.4264,0.1258 Q0.4238,0.1258,0.422,0.1244 T0.4202,0.1208 L0.4202,0.0092 Q0.4202,0.008,0.4207,0.0069 T0.4222,0.0052 T0.4243,0.0044 T0.4264,0.0042 Z M0.4325,0.0143 L0.4325,0.1158 L0.5628,0.1158 L0.5628,0.0143 L0.4325,0.0143 Z M0.4264,0.0042 L0.5695,0.0042 Q0.5721,0.0042,0.5739,0.0057 T0.5757,0.0092 L0.5757,0.1208 Q0.5757,0.1221,0.5752,0.1231 T0.5736,0.1248 T0.5716,0.1256 T0.5695,0.1258 L0.4264,0.1258 Q0.4238,0.1258,0.422,0.1244 T0.4202,0.1208 L0.4202,0.0092 Q0.4202,0.008,0.4207,0.0069 T0.4222,0.0052 T0.4243,0.0044 T0.4264,0.0042 Z M0.4325,0.0143 L0.4325,0.1158 L0.5628,0.1158 L0.5628,0.0143 L0.4325,0.0143 Z M0.4264,0.0042 L0.5695,0.0042 Q0.5721,0.0042,0.5739,0.0057 T0.5757,0.0092 L0.5757,0.1208 Q0.5757,0.1221,0.5752,0.1231 T0.5736,0.1248 T0.5716,0.1256 T0.5695,0.1258 L0.4264,0.1258 Q0.4238,0.1258,0.422,0.1244 T0.4202,0.1208 L0.4202,0.0092 Q0.4202,0.008,0.4207,0.0069 T0.4222,0.0052 T0.4243,0.0044 T0.4264,0.0042 Z M0.2178,0.0092 L0.3605,0.0092 L0.3605,0.1208 L0.2178,0.1208 L0.2178,0.0092 Z M0.2178,0.0092 L0.3605,0.0092 L0.3605,0.1208 L0.2178,0.1208 L0.2178,0.0092 Z M0.2178,0.0092 L0.3605,0.0092 L0.3605,0.1208 L0.2178,0.1208 L0.2178,0.0092 Z M0,0.0092 L0.1432,0.0092 L0.1432,0.1208 L0,0.1208 L0,0.0092 Z M0,0.0092 L0.1432,0.0092 L0.1432,0.1208 L0,0.1208 L0,0.0092 Z M0,0.0092 L0.1432,0.0092 L0.1432,0.1208 L0,0.1208 L0,0.0092 Z M0.8574,0.3217 L0.8574,0.4098 L0.9691,0.4098 L0.9691,0.3217 L0.8574,0.3217 Z M0.8419,0.2978 L0.9846,0.2978 Q0.9892,0.2978,0.9928,0.2997 T0.9982,0.3043 T1,0.31 L1,0.4216 Q1,0.427,0.9951,0.4304 T0.9846,0.4337 L0.8419,0.4337 Q0.8352,0.4337,0.8308,0.4299 T0.8265,0.4216 L0.8265,0.31 Q0.8265,0.3062,0.829,0.3035 T0.835,0.2993 T0.8419,0.2978 Z M0.8574,0.888 L0.8574,0.9757 L0.9691,0.9757 L0.9691,0.888 L0.8574,0.888 Z M0.8419,0.8637 L0.9846,0.8637 Q0.9892,0.8637,0.9928,0.8658 T0.9982,0.8706 T1,0.8758 L1,0.9878 Q1,0.9929,0.9951,0.9964 T0.9846,1 L0.8419,1 Q0.8352,1,0.8308,0.996 T0.8265,0.9878 L0.8265,0.8758 Q0.8265,0.8708,0.8314,0.8672 T0.8419,0.8637 Z M0.6509,0.169 L0.6509,0.2706 L0.7806,0.2706 L0.7806,0.169 L0.6509,0.169 Z M0.6442,0.159 L0.7868,0.159 Q0.7899,0.159,0.7917,0.1604 T0.7935,0.164 L0.7935,0.2756 Q0.7935,0.2781,0.7915,0.2796 T0.7868,0.281 L0.6442,0.281 Q0.6416,0.281,0.6395,0.2794 T0.6375,0.2756 L0.6375,0.164 Q0.6375,0.1619,0.6398,0.1604 T0.6442,0.159 Z M0.6632,0.6044 L0.6632,0.6858 L0.7678,0.6858 L0.7678,0.6044 L0.6632,0.6044 Z M0.6442,0.5742 L0.7868,0.5742 Q0.7951,0.5742,0.8007,0.5791 T0.8064,0.5893 L0.8064,0.7013 Q0.8064,0.7076,0.8002,0.712 T0.7868,0.7164 L0.6442,0.7164 Q0.6359,0.7164,0.6305,0.7114 T0.6251,0.7013 L0.6251,0.5893 Q0.6251,0.5847,0.6282,0.5812 T0.6357,0.5759 T0.6442,0.5742 Z M0.4264,0.164 L0.5695,0.164 L0.5695,0.2756 L0.4264,0.2756 L0.4264,0.164 Z M0.4325,0.315 L0.4325,0.4165 L0.5628,0.4165 L0.5628,0.315 L0.4325,0.315 Z M0.4264,0.3049 L0.5695,0.3049 Q0.5721,0.3049,0.5739,0.3064 T0.5757,0.31 L0.5757,0.4216 Q0.5757,0.4237,0.5736,0.4251 T0.5695,0.4266 L0.4264,0.4266 Q0.4238,0.4266,0.422,0.4251 T0.4202,0.4216 L0.4202,0.31 Q0.4202,0.3087,0.4207,0.3077 T0.4222,0.306 T0.4243,0.3052 T0.4264,0.3049 Z M0.4264,0.4476 L0.5695,0.4476 L0.5695,0.5596 L0.4264,0.5596 L0.4264,0.4476 Z M0.4392,0.7408 L0.4392,0.8326 L0.5561,0.8326 L0.5561,0.7408 L0.4392,0.7408 Z M0.4264,0.7206 L0.5695,0.7206 Q0.5747,0.7206,0.5783,0.724 T0.5819,0.7307 L0.5819,0.8427 Q0.5819,0.8469,0.5778,0.8498 T0.5695,0.8528 L0.4264,0.8528 Q0.4207,0.8528,0.4171,0.8496 T0.4135,0.8427 L0.4135,0.7307 Q0.4135,0.7265,0.4176,0.7236 T0.4264,0.7206 Z M0.2178,0.164 L0.3605,0.164 L0.3605,0.2756 L0.2178,0.2756 L0.2178,0.164 Z M0.2178,0.31 L0.3605,0.31 L0.3605,0.4216 L0.2178,0.4216 L0.2178,0.31 Z M0.2178,0.5893 L0.3605,0.5893 L0.3605,0.7013 L0.2178,0.7013 L0.2178,0.5893 Z M0.2178,0.7307 L0.3605,0.7307 L0.3605,0.8427 L0.2178,0.8427 L0.2178,0.7307 Z M0.2178,0.8758 L0.3605,0.8758 L0.3605,0.9878 L0.2178,0.9878 L0.2178,0.8758 Z M0,0.164 L0.1432,0.164 L0.1432,0.2756 L0,0.2756 L0,0.164 Z M0,0.31 L0.1432,0.31 L0.1432,0.4216 L0,0.4216 L0,0.31 Z M0,0.4476 L0.1432,0.4476 L0.1432,0.5596 L0,0.5596 L0,0.4476 Z M0,0.5893 L0.1432,0.5893 L0.1432,0.7013 L0,0.7013 L0,0.5893 Z M0,0.7307 L0.1432,0.7307 L0.1432,0.8427 L0,0.8427 L0,0.7307 Z M0,0.8758 L0.1432,0.8758 L0.1432,0.9878 L0,0.9878 L0,0.8758 Z",type:0}},"\uE0C7":{type:5,data:{d:"M0.3476,0.018 L0.3476,0.112 L0.2276,0.112 L0.2276,0.018 L0.3476,0.018 Z M0.3594,0 L0.2163,0 Q0.2132,0,0.2104,0.0015 T0.2062,0.005 T0.2049,0.0092 L0.2049,0.1208 Q0.2049,0.1237,0.2067,0.1258 T0.2111,0.129 T0.2163,0.13 L0.3594,0.13 Q0.3641,0.13,0.3674,0.1271 T0.3708,0.1208 L0.3708,0.0092 Q0.3708,0.005,0.3669,0.0025 T0.3594,0 Z M0.3476,0.018 L0.3476,0.112 L0.2276,0.112 L0.2276,0.018 L0.3476,0.018 Z M0.3594,0 L0.2163,0 Q0.2132,0,0.2104,0.0015 T0.2062,0.005 T0.2049,0.0092 L0.2049,0.1208 Q0.2049,0.1237,0.2067,0.1258 T0.2111,0.129 T0.2163,0.13 L0.3594,0.13 Q0.3641,0.13,0.3674,0.1271 T0.3708,0.1208 L0.3708,0.0092 Q0.3708,0.005,0.3669,0.0025 T0.3594,0 Z M0.3476,0.018 L0.3476,0.112 L0.2276,0.112 L0.2276,0.018 L0.3476,0.018 Z M0.3594,0 L0.2163,0 Q0.2132,0,0.2104,0.0015 T0.2062,0.005 T0.2049,0.0092 L0.2049,0.1208 Q0.2049,0.1237,0.2067,0.1258 T0.2111,0.129 T0.2163,0.13 L0.3594,0.13 Q0.3641,0.13,0.3674,0.1271 T0.3708,0.1208 L0.3708,0.0092 Q0.3708,0.005,0.3669,0.0025 T0.3594,0 Z M0.5675,0.0143 L0.5675,0.1158 L0.4377,0.1158 L0.4377,0.0143 L0.5675,0.0143 Z M0.5736,0.0042 L0.431,0.0042 Q0.4284,0.0042,0.4264,0.0057 T0.4243,0.0092 L0.4243,0.1208 Q0.4243,0.1221,0.4251,0.1231 T0.4269,0.1248 T0.4289,0.1256 T0.431,0.1258 L0.5736,0.1258 Q0.5767,0.1258,0.5785,0.1244 T0.5803,0.1208 L0.5803,0.0092 Q0.5803,0.008,0.5798,0.0069 T0.5783,0.0052 T0.5762,0.0044 T0.5736,0.0042 Z M0.5675,0.0143 L0.5675,0.1158 L0.4377,0.1158 L0.4377,0.0143 L0.5675,0.0143 Z M0.5736,0.0042 L0.431,0.0042 Q0.4284,0.0042,0.4264,0.0057 T0.4243,0.0092 L0.4243,0.1208 Q0.4243,0.1221,0.4251,0.1231 T0.4269,0.1248 T0.4289,0.1256 T0.431,0.1258 L0.5736,0.1258 Q0.5767,0.1258,0.5785,0.1244 T0.5803,0.1208 L0.5803,0.0092 Q0.5803,0.008,0.5798,0.0069 T0.5783,0.0052 T0.5762,0.0044 T0.5736,0.0042 Z M0.5675,0.0143 L0.5675,0.1158 L0.4377,0.1158 L0.4377,0.0143 L0.5675,0.0143 Z M0.5736,0.0042 L0.431,0.0042 Q0.4284,0.0042,0.4264,0.0057 T0.4243,0.0092 L0.4243,0.1208 Q0.4243,0.1221,0.4251,0.1231 T0.4269,0.1248 T0.4289,0.1256 T0.431,0.1258 L0.5736,0.1258 Q0.5767,0.1258,0.5785,0.1244 T0.5803,0.1208 L0.5803,0.0092 Q0.5803,0.008,0.5798,0.0069 T0.5783,0.0052 T0.5762,0.0044 T0.5736,0.0042 Z M0.7827,0.0092 L0.6395,0.0092 L0.6395,0.1208 L0.7827,0.1208 L0.7827,0.0092 Z M0.7827,0.0092 L0.6395,0.0092 L0.6395,0.1208 L0.7827,0.1208 L0.7827,0.0092 Z M0.7827,0.0092 L0.6395,0.0092 L0.6395,0.1208 L0.7827,0.1208 L0.7827,0.0092 Z M1,0.0092 L0.8574,0.0092 L0.8574,0.1208 L1,0.1208 L1,0.0092 Z M1,0.0092 L0.8574,0.0092 L0.8574,0.1208 L1,0.1208 L1,0.0092 Z M1,0.0092 L0.8574,0.0092 L0.8574,0.1208 L1,0.1208 L1,0.0092 Z M0.1432,0.3217 L0.1432,0.4098 L0.0309,0.4098 L0.0309,0.3217 L0.1432,0.3217 Z M0.1586,0.2978 L0.0154,0.2978 Q0.0088,0.2978,0.0044,0.3016 T0,0.31 L0,0.4216 Q0,0.427,0.0049,0.4304 T0.0154,0.4337 L0.1586,0.4337 Q0.1648,0.4337,0.1694,0.4299 T0.174,0.4216 L0.174,0.31 Q0.174,0.3062,0.1715,0.3035 T0.1653,0.2993 T0.1586,0.2978 Z M0.1432,0.888 L0.1432,0.9757 L0.0309,0.9757 L0.0309,0.888 L0.1432,0.888 Z M0.1586,0.8637 L0.0154,0.8637 Q0.0108,0.8637,0.0072,0.8658 T0.0018,0.8706 T0,0.8758 L0,0.9878 Q0,0.9929,0.0049,0.9964 T0.0154,1 L0.1586,1 Q0.1648,1,0.1694,0.996 T0.174,0.9878 L0.174,0.8758 Q0.174,0.8725,0.1715,0.8695 T0.1653,0.8651 T0.1586,0.8637 Z M0.3496,0.169 L0.3496,0.2706 L0.2194,0.2706 L0.2194,0.169 L0.3496,0.169 Z M0.3563,0.159 L0.2132,0.159 Q0.2106,0.159,0.2088,0.1604 T0.207,0.164 L0.207,0.2756 Q0.207,0.2781,0.2091,0.2796 T0.2132,0.281 L0.3563,0.281 Q0.3589,0.281,0.3607,0.2794 T0.3625,0.2756 L0.3625,0.164 Q0.3625,0.1619,0.3605,0.1604 T0.3563,0.159 Z M0.3368,0.6044 L0.3368,0.6858 L0.2327,0.6858 L0.2327,0.6044 L0.3368,0.6044 Z M0.3563,0.5742 L0.2132,0.5742 Q0.2049,0.5742,0.1993,0.5791 T0.1936,0.5893 L0.1936,0.7013 Q0.1936,0.7076,0.2001,0.712 T0.2132,0.7164 L0.3563,0.7164 Q0.3641,0.7164,0.3697,0.7114 T0.3754,0.7013 L0.3754,0.5893 Q0.3754,0.5847,0.3723,0.5812 T0.3648,0.5759 T0.3563,0.5742 Z M0.5736,0.164 L0.431,0.164 L0.431,0.2756 L0.5736,0.2756 L0.5736,0.164 Z M0.5675,0.315 L0.5675,0.4165 L0.4377,0.4165 L0.4377,0.315 L0.5675,0.315 Z M0.5736,0.3049 L0.431,0.3049 Q0.4284,0.3049,0.4264,0.3064 T0.4243,0.31 L0.4243,0.4216 Q0.4243,0.4237,0.4266,0.4251 T0.431,0.4266 L0.5736,0.4266 Q0.5767,0.4266,0.5785,0.4251 T0.5803,0.4216 L0.5803,0.31 Q0.5803,0.3087,0.5798,0.3077 T0.5783,0.306 T0.5762,0.3052 T0.5736,0.3049 Z M0.5736,0.4476 L0.431,0.4476 L0.431,0.5596 L0.5736,0.5596 L0.5736,0.4476 Z M0.5613,0.7408 L0.5613,0.8326 L0.4439,0.8326 L0.4439,0.7408 L0.5613,0.7408 Z M0.5736,0.7206 L0.431,0.7206 Q0.4253,0.7206,0.4217,0.724 T0.4181,0.7307 L0.4181,0.8427 Q0.4181,0.8469,0.4222,0.8498 T0.431,0.8528 L0.5736,0.8528 Q0.5778,0.8528,0.5808,0.8511 T0.5855,0.8471 T0.587,0.8427 L0.587,0.7307 Q0.587,0.7265,0.5826,0.7236 T0.5736,0.7206 Z M0.7827,0.164 L0.6395,0.164 L0.6395,0.2756 L0.7827,0.2756 L0.7827,0.164 Z M0.7827,0.31 L0.6395,0.31 L0.6395,0.4216 L0.7827,0.4216 L0.7827,0.31 Z M0.7827,0.5893 L0.6395,0.5893 L0.6395,0.7013 L0.7827,0.7013 L0.7827,0.5893 Z M0.7827,0.7307 L0.6395,0.7307 L0.6395,0.8427 L0.7827,0.8427 L0.7827,0.7307 Z M0.7827,0.8758 L0.6395,0.8758 L0.6395,0.9878 L0.7827,0.9878 L0.7827,0.8758 Z M1,0.164 L0.8574,0.164 L0.8574,0.2756 L1,0.2756 L1,0.164 Z M1,0.31 L0.8574,0.31 L0.8574,0.4216 L1,0.4216 L1,0.31 Z M1,0.4476 L0.8574,0.4476 L0.8574,0.5596 L1,0.5596 L1,0.4476 Z M1,0.5893 L0.8574,0.5893 L0.8574,0.7013 L1,0.7013 L1,0.5893 Z M1,0.7307 L0.8574,0.7307 L0.8574,0.8427 L1,0.8427 L1,0.7307 Z M1,0.8758 L0.8574,0.8758 L0.8574,0.9878 L1,0.9878 L1,0.8758 Z",type:0}},"\uE0C8":{type:5,data:{d:"M0.0008,0.9979 Q0.0008,1,0.0032,1 Q0.0482,1,0.0602,0.9975 Q0.0667,0.9963,0.0847,0.9917 T0.1084,0.9859 Q0.1124,0.9851,0.1221,0.9851 L0.1253,0.9851 L0.1285,0.9851 Q0.1518,0.9851,0.1655,0.9809 Q0.1695,0.9801,0.1731,0.9788 T0.1791,0.9766 T0.1839,0.9747 T0.1888,0.9732 L0.1936,0.972 T0.1988,0.9712 T0.2048,0.971 L0.2096,0.971 Q0.2201,0.9714,0.2233,0.9714 T0.2345,0.9693 Q0.2386,0.9685,0.2502,0.9674 T0.2715,0.966 L0.2811,0.9656 Q0.2916,0.9647,0.2916,0.9573 Q0.2916,0.954,0.2892,0.9515 T0.2819,0.9486 Q0.2755,0.9482,0.2683,0.9482 Q0.2643,0.9482,0.2582,0.9484 T0.2498,0.9486 Q0.2426,0.9486,0.2402,0.9473 Q0.2386,0.9469,0.2317,0.943 T0.2161,0.937 Q0.2104,0.9357,0.1992,0.933 T0.1831,0.9291 Q0.1807,0.9287,0.1783,0.9285 T0.1739,0.928 T0.1703,0.9276 T0.1675,0.9272 T0.1655,0.9266 T0.1639,0.9253 Q0.1598,0.9216,0.1462,0.9216 L0.143,0.9216 L0.1398,0.9216 L0.1365,0.9216 Q0.1197,0.9195,0.1197,0.9154 L0.1197,0.9154 Q0.1205,0.9121,0.1373,0.9088 T0.1703,0.9054 Q0.1791,0.9054,0.1863,0.904 T0.1984,0.9011 T0.2064,0.8992 Q0.2402,0.8967,0.2506,0.8934 Q0.2538,0.8926,0.2602,0.8899 T0.2707,0.8872 Q0.2715,0.8872,0.2731,0.8876 Q0.2795,0.8884,0.2884,0.8884 Q0.3068,0.8884,0.3092,0.8826 L0.3092,0.8797 Q0.3092,0.8772,0.3076,0.8747 T0.3044,0.8706 T0.3028,0.8681 Q0.3076,0.8656,0.3237,0.8656 Q0.3317,0.8656,0.3622,0.8623 Q0.3655,0.8623,0.3867,0.8617 T0.4217,0.8602 Q0.4241,0.8598,0.4289,0.8598 L0.4345,0.8598 L0.441,0.8598 Q0.4578,0.8598,0.4667,0.8586 Q0.4739,0.8573,0.4851,0.8567 T0.5004,0.8552 Q0.5012,0.8552,0.5108,0.855 T0.5269,0.853 T0.5333,0.8461 Q0.5333,0.8445,0.5325,0.8432 T0.5309,0.8409 T0.5289,0.8391 T0.5261,0.8378 L0.5229,0.837 T0.5185,0.8362 T0.5133,0.8355 T0.5076,0.8349 T0.502,0.8341 Q0.4932,0.8324,0.4859,0.8324 Q0.4827,0.8324,0.4787,0.8328 T0.4731,0.8333 Q0.4707,0.8333,0.4683,0.8324 Q0.4482,0.825,0.4394,0.825 Q0.4369,0.825,0.4345,0.8254 Q0.4225,0.827,0.4153,0.827 Q0.4088,0.827,0.4064,0.8258 Q0.3976,0.8204,0.3751,0.8204 Q0.3703,0.8204,0.3667,0.8214 T0.3622,0.8225 Q0.3598,0.8225,0.3558,0.82 Q0.351,0.8175,0.3402,0.8167 T0.3177,0.8156 T0.3028,0.8146 L0.2956,0.8121 T0.2871,0.8094 T0.2771,0.8073 T0.2635,0.8063 Q0.261,0.8063,0.2586,0.8067 Q0.2378,0.8071,0.2273,0.8071 Q0.2072,0.8071,0.2024,0.8051 Q0.1976,0.8034,0.1932,0.8026 T0.1867,0.8013 T0.1847,0.8001 L0.1847,0.7993 Q0.1855,0.7984,0.1855,0.7978 T0.1859,0.7966 T0.1867,0.7959 T0.188,0.7955 T0.1896,0.7951 T0.1916,0.7949 T0.1944,0.7945 T0.1984,0.7941 T0.2032,0.7939 Q0.212,0.7926,0.2325,0.7918 T0.2562,0.7905 Q0.2691,0.7893,0.2787,0.7847 Q0.2835,0.7827,0.2968,0.7791 T0.3149,0.7756 Q0.3189,0.7756,0.3305,0.7733 T0.3446,0.771 L0.3454,0.771 Q0.3462,0.771,0.3498,0.7721 T0.3574,0.774 T0.3655,0.7748 Q0.3703,0.7748,0.3743,0.7731 T0.3823,0.7708 T0.3916,0.77 T0.3992,0.7694 Q0.4008,0.7694,0.4076,0.7688 T0.4205,0.7675 L0.4305,0.7665 Q0.4345,0.7657,0.4402,0.7617 T0.4458,0.7545 Q0.4458,0.7503,0.4353,0.7487 Q0.4297,0.7478,0.4209,0.7462 T0.4044,0.7433 T0.3904,0.7416 L0.3847,0.7416 Q0.3807,0.7416,0.3747,0.7422 T0.3663,0.7428 T0.3606,0.7424 Q0.3582,0.742,0.3562,0.7418 T0.3522,0.7412 T0.3482,0.7406 T0.3446,0.7401 T0.341,0.7397 T0.3373,0.7393 T0.3341,0.7391 L0.3293,0.7391 Q0.3277,0.7395,0.3253,0.7395 Q0.3205,0.7395,0.3052,0.7387 T0.2835,0.7379 Q0.2755,0.7379,0.253,0.7325 Q0.2506,0.7316,0.2462,0.731 T0.2382,0.7296 T0.2305,0.7271 T0.2181,0.7234 T0.2048,0.7196 T0.2,0.7155 Q0.2,0.7142,0.2016,0.713 Q0.208,0.7059,0.2285,0.6978 T0.2618,0.6898 Q0.2739,0.6898,0.2831,0.6848 T0.2956,0.6794 Q0.3028,0.6786,0.3289,0.6765 T0.3566,0.674 Q0.3582,0.674,0.3855,0.6723 T0.4406,0.6688 T0.4755,0.6653 Q0.5004,0.6607,0.5124,0.6599 L0.5165,0.6599 Q0.5213,0.6599,0.5277,0.6605 T0.5373,0.6611 Q0.543,0.6611,0.5494,0.6599 Q0.592,0.6524,0.6,0.6524 Q0.6064,0.6524,0.61,0.6499 T0.6161,0.6474 Q0.6177,0.6474,0.6261,0.6495 T0.6418,0.6516 L0.6482,0.6516 Q0.653,0.6512,0.6651,0.6506 T0.6876,0.6493 T0.7084,0.6477 T0.7229,0.645 Q0.7269,0.6437,0.7333,0.6437 Q0.7373,0.6437,0.7458,0.6443 T0.7574,0.645 Q0.7614,0.645,0.7631,0.6445 T0.7655,0.6441 Q0.7671,0.6441,0.7723,0.6448 T0.7823,0.6454 Q0.788,0.6454,0.7952,0.6445 Q0.8233,0.6408,0.8723,0.6367 Q0.9012,0.6342,0.9092,0.6342 L0.9165,0.6342 L0.9205,0.6342 Q0.9277,0.6342,0.9382,0.6323 T0.9526,0.6304 Q0.9534,0.6304,0.9594,0.6307 T0.9695,0.6309 Q0.9976,0.6309,0.9992,0.6234 Q1,0.6201,1,0.618 Q1,0.6089,0.9775,0.608 Q0.9703,0.6076,0.9582,0.6076 Q0.9518,0.6076,0.9394,0.6078 T0.9213,0.608 Q0.9036,0.608,0.8972,0.6072 Q0.894,0.6068,0.8871,0.6058 T0.8751,0.6039 T0.8627,0.6024 T0.8506,0.6018 L0.8474,0.6018 Q0.841,0.6022,0.8281,0.6041 T0.8112,0.606 Q0.8096,0.606,0.808,0.6056 Q0.7783,0.6002,0.7647,0.6002 Q0.7598,0.6002,0.7454,0.6006 T0.7261,0.601 Q0.7221,0.601,0.7145,0.6022 T0.7036,0.6035 Q0.6996,0.6035,0.6964,0.6022 Q0.6723,0.5902,0.6442,0.5902 Q0.6426,0.5902,0.6386,0.5904 T0.6337,0.5906 Q0.6273,0.5906,0.6249,0.5894 L0.6177,0.5856 T0.6116,0.5838 T0.6016,0.5825 T0.5855,0.5823 Q0.5719,0.5823,0.5574,0.5798 T0.5373,0.5774 L0.5341,0.5774 Q0.5293,0.5778,0.5213,0.5786 T0.51,0.5794 Q0.5036,0.5794,0.4988,0.5769 Q0.4932,0.574,0.4771,0.574 Q0.4723,0.574,0.4631,0.5745 T0.4498,0.5749 Q0.4418,0.5749,0.4394,0.5736 Q0.4353,0.5724,0.4305,0.5715 T0.4225,0.5707 T0.4145,0.5705 T0.4056,0.5699 Q0.4008,0.5691,0.398,0.5689 T0.394,0.5689 T0.3908,0.5686 T0.3855,0.5674 Q0.3831,0.567,0.3811,0.5662 T0.3779,0.5645 T0.3743,0.563 T0.3695,0.5624 Q0.3655,0.5624,0.3594,0.5635 T0.3494,0.5645 T0.3406,0.5635 T0.3325,0.5624 Q0.3309,0.5624,0.3301,0.5628 L0.3141,0.5628 Q0.2635,0.5628,0.2506,0.5612 Q0.2474,0.5608,0.2434,0.5608 Q0.2402,0.5608,0.2349,0.561 T0.2273,0.5612 Q0.2209,0.5612,0.2177,0.5595 Q0.2145,0.557,0.2145,0.5558 Q0.2169,0.5537,0.2345,0.5521 Q0.2876,0.5475,0.3028,0.5425 Q0.3068,0.5413,0.3149,0.5396 T0.3309,0.5367 T0.3478,0.5338 T0.3606,0.5309 Q0.3631,0.5305,0.3755,0.5259 T0.3968,0.5214 Q0.3992,0.5214,0.4024,0.5218 T0.4096,0.5222 Q0.4161,0.5222,0.4213,0.5209 T0.4313,0.5185 T0.4402,0.5172 Q0.4418,0.5168,0.447,0.5168 L0.4558,0.5168 T0.4639,0.5162 T0.4707,0.5141 T0.4731,0.5102 Q0.4731,0.5089,0.4723,0.5081 Q0.4699,0.5019,0.4627,0.4994 T0.4369,0.4965 Q0.4273,0.4961,0.4193,0.4946 T0.4048,0.4915 T0.3952,0.4894 Q0.392,0.4886,0.388,0.4886 Q0.3847,0.4886,0.3775,0.4892 T0.3647,0.4898 Q0.3598,0.4898,0.355,0.4894 Q0.3165,0.4861,0.3141,0.4853 Q0.2779,0.4774,0.2715,0.4774 Q0.2699,0.4774,0.2683,0.4776 T0.2627,0.4778 Q0.2498,0.4778,0.2281,0.4762 Q0.2241,0.4749,0.2233,0.4737 Q0.2249,0.472,0.2321,0.4708 Q0.2402,0.4695,0.2554,0.4695 L0.2675,0.4695 L0.2795,0.4695 Q0.294,0.4695,0.2996,0.4679 Q0.3141,0.4629,0.3373,0.4616 Q0.3414,0.4612,0.3466,0.4606 T0.3582,0.4589 T0.3687,0.4562 T0.3727,0.4525 Q0.3727,0.4509,0.3703,0.4492 Q0.3639,0.4455,0.3474,0.4419 T0.3213,0.4384 L0.3157,0.4384 L0.31,0.4384 Q0.294,0.4384,0.2859,0.4363 Q0.2795,0.4347,0.2691,0.4347 L0.2618,0.4347 L0.2546,0.4347 Q0.2458,0.4347,0.2394,0.4338 Q0.2257,0.4318,0.2193,0.4303 T0.2092,0.4266 T0.2052,0.4224 T0.2024,0.4154 T0.196,0.4052 Q0.1912,0.3994,0.1867,0.3949 T0.1807,0.3884 T0.1791,0.3849 Q0.1791,0.3824,0.1839,0.3745 Q0.1871,0.3687,0.1944,0.3637 T0.2072,0.3561 T0.2221,0.3501 T0.2321,0.3463 Q0.2353,0.3455,0.241,0.3445 T0.2522,0.3428 T0.2639,0.3411 T0.2731,0.3384 T0.2956,0.3351 T0.3197,0.3326 Q0.3213,0.3322,0.3237,0.3322 T0.3325,0.3331 T0.3414,0.3339 Q0.3478,0.3339,0.3518,0.3314 Q0.3606,0.3264,0.3703,0.3264 Q0.3775,0.3264,0.3847,0.3293 Q0.3888,0.331,0.396,0.331 Q0.4024,0.331,0.4116,0.3295 T0.4265,0.3266 T0.4414,0.3227 T0.4514,0.3202 Q0.4578,0.3181,0.4839,0.3152 T0.5112,0.3123 T0.5177,0.3119 T0.5285,0.3111 T0.5398,0.3096 T0.549,0.3065 T0.5526,0.3015 Q0.5526,0.2999,0.5518,0.2982 Q0.547,0.2903,0.5386,0.2883 T0.5165,0.2862 Q0.5116,0.2862,0.5056,0.2866 T0.4972,0.287 Q0.4884,0.287,0.4787,0.2833 Q0.4594,0.2758,0.4265,0.2758 Q0.4169,0.2758,0.4129,0.2766 Q0.4112,0.2771,0.4104,0.2771 Q0.4088,0.2771,0.4056,0.2748 T0.3968,0.2721 Q0.3695,0.2696,0.359,0.2659 Q0.355,0.2646,0.351,0.2646 T0.3426,0.2661 T0.3365,0.2675 T0.3333,0.2659 Q0.3277,0.2605,0.3116,0.2553 T0.2859,0.2501 L0.2843,0.2501 L0.2819,0.2501 Q0.2779,0.2501,0.2723,0.2493 T0.2586,0.2472 T0.2474,0.2455 Q0.1799,0.236,0.1719,0.236 Q0.1663,0.236,0.1606,0.235 T0.1502,0.2316 T0.1454,0.2265 Q0.1454,0.2223,0.1558,0.2173 Q0.1679,0.2115,0.1859,0.2092 T0.2185,0.207 T0.2353,0.2057 Q0.2369,0.2049,0.2502,0.2041 T0.2799,0.2022 T0.302,0.2007 Q0.3084,0.1999,0.3245,0.1954 T0.347,0.1908 Q0.3502,0.1908,0.3534,0.1916 Q0.3663,0.197,0.388,0.197 Q0.404,0.197,0.4088,0.1929 Q0.4096,0.192,0.4108,0.192 T0.4177,0.1945 T0.4277,0.197 T0.4369,0.1949 Q0.4442,0.1908,0.4843,0.1875 Q0.4892,0.1871,0.4968,0.1839 T0.5084,0.1808 L0.5108,0.1808 Q0.5213,0.1825,0.5454,0.1825 Q0.5823,0.1825,0.5992,0.1779 Q0.6096,0.1746,0.6217,0.1746 Q0.6249,0.1746,0.6309,0.1748 T0.6394,0.175 Q0.6434,0.175,0.6466,0.1746 Q0.6474,0.1746,0.6594,0.1738 T0.6787,0.1713 T0.6892,0.1659 Q0.6924,0.1634,0.6924,0.1593 Q0.6924,0.1547,0.6888,0.151 T0.6795,0.1472 Q0.6779,0.1472,0.6763,0.1477 Q0.6699,0.1493,0.6667,0.1493 Q0.661,0.1493,0.6506,0.1456 Q0.6329,0.1394,0.6129,0.1394 Q0.6048,0.1394,0.5992,0.1377 T0.5888,0.136 T0.5803,0.1377 T0.5751,0.1394 Q0.5711,0.1394,0.5639,0.1369 Q0.5365,0.1273,0.5116,0.1273 Q0.4876,0.1273,0.4667,0.1253 Q0.4627,0.1248,0.4542,0.1211 T0.4337,0.1174 L0.4305,0.1174 Q0.4217,0.1178,0.4153,0.119 T0.408,0.1203 Q0.4056,0.1203,0.4,0.117 Q0.3976,0.1153,0.396,0.1136 T0.3932,0.1112 T0.39,0.1099 T0.3847,0.1095 Q0.3799,0.1095,0.3687,0.1103 Q0.355,0.1112,0.3434,0.1141 T0.3301,0.117 Q0.3261,0.117,0.3229,0.1145 Q0.3181,0.1116,0.3052,0.1087 T0.2787,0.1043 T0.2546,0.1029 Q0.2506,0.1029,0.2474,0.1033 Q0.2418,0.1037,0.2349,0.1054 T0.2249,0.107 Q0.2225,0.107,0.2193,0.1066 Q0.2024,0.1024,0.1863,0.1024 Q0.1823,0.1024,0.1562,0.0971 T0.1269,0.0917 T0.1161,0.0896 T0.106,0.0854 Q0.1076,0.0846,0.11,0.0842 Q0.1173,0.0821,0.1261,0.0821 Q0.1301,0.0821,0.1369,0.0825 T0.1462,0.083 Q0.1494,0.083,0.151,0.0825 T0.1831,0.0813 T0.2201,0.0784 T0.243,0.074 T0.2667,0.0718 Q0.2707,0.0718,0.2755,0.0724 T0.2843,0.073 T0.2936,0.0724 T0.3024,0.0705 T0.3072,0.068 T0.3092,0.0657 T0.3108,0.0647 Q0.3116,0.0643,0.3133,0.0643 L0.3157,0.0643 L0.3181,0.0643 Q0.3446,0.0643,0.3446,0.0556 T0.3205,0.0469 L0.3189,0.0469 Q0.3157,0.0469,0.3157,0.0465 Q0.3084,0.0427,0.2835,0.0386 Q0.2739,0.0369,0.2675,0.0342 T0.2538,0.0299 Q0.249,0.029,0.245,0.029 T0.2378,0.0303 T0.2321,0.0315 Q0.2305,0.0315,0.2273,0.0307 Q0.2201,0.0286,0.2004,0.0272 T0.1775,0.0245 Q0.1735,0.0228,0.1663,0.0226 T0.1522,0.0197 T0.1345,0.0145 T0.1124,0.0079 Q0.0996,0.0033,0.0671,0.0044 T0.0297,0.0041 Q0.0169,0,0.0024,0.0017 Q0,0.0021,0,0.0037 Z M0.0064,0.9954 L0.0056,0.0058 Q0.0177,0.005,0.0281,0.0083 Q0.0345,0.01,0.0675,0.0089 T0.1108,0.012 Q0.1221,0.0162,0.1329,0.0187 T0.1498,0.0236 T0.1606,0.0268 T0.1691,0.0274 T0.1759,0.0286 Q0.1807,0.0303,0.2,0.0315 T0.2257,0.0348 Q0.2305,0.0361,0.2337,0.0361 Q0.2361,0.0361,0.2398,0.0348 T0.2466,0.0336 Q0.249,0.0336,0.2522,0.034 Q0.2586,0.0353,0.2655,0.0382 T0.2827,0.0427 Q0.3068,0.0469,0.3124,0.0502 Q0.3157,0.0523,0.3237,0.0523 L0.3277,0.0523 L0.3309,0.0523 Q0.3398,0.0523,0.3398,0.0556 Q0.3398,0.0581,0.3341,0.0587 T0.3205,0.0593 T0.3092,0.0603 T0.3036,0.0643 T0.2932,0.068 Q0.2884,0.0684,0.2843,0.0684 Q0.2811,0.0684,0.2763,0.0678 T0.2667,0.0672 Q0.2586,0.0672,0.2422,0.0697 T0.2177,0.0747 Q0.2137,0.0759,0.1831,0.0767 T0.1494,0.0784 L0.1474,0.0784 T0.1398,0.078 T0.1285,0.0776 Q0.1173,0.0776,0.1084,0.08 Q0.1004,0.0817,0.1004,0.0846 Q0.1004,0.0867,0.104,0.0888 T0.1124,0.0923 T0.1213,0.0948 T0.1269,0.0958 T0.155,0.1014 T0.1863,0.107 Q0.2016,0.107,0.2185,0.1107 Q0.2217,0.1116,0.2257,0.1116 Q0.2289,0.1116,0.2365,0.1099 T0.2482,0.1074 L0.2538,0.1074 Q0.2683,0.1074,0.2912,0.1107 T0.3197,0.1182 Q0.3245,0.1215,0.3301,0.1215 Q0.3333,0.1215,0.3454,0.1184 T0.3687,0.1145 Q0.3735,0.1141,0.3779,0.1139 T0.3843,0.1134 T0.3871,0.1132 Q0.3896,0.1132,0.39,0.1136 T0.392,0.1161 T0.3968,0.1203 Q0.404,0.1248,0.408,0.1248 Q0.4096,0.1248,0.4165,0.1234 T0.4305,0.1215 L0.4337,0.1215 Q0.4442,0.1215,0.4518,0.1251 T0.4659,0.1294 Q0.4876,0.1319,0.5116,0.1319 T0.5622,0.141 Q0.5703,0.1439,0.5751,0.1439 Q0.5791,0.1439,0.5831,0.1423 T0.5888,0.1406 Q0.592,0.1406,0.5944,0.1412 T0.6012,0.1427 T0.6129,0.1435 Q0.6313,0.1435,0.649,0.1497 Q0.6602,0.1535,0.6667,0.1535 Q0.6715,0.1535,0.6779,0.1522 Q0.6787,0.1518,0.6795,0.1518 Q0.6827,0.1518,0.6847,0.1541 T0.6867,0.1593 Q0.6867,0.1618,0.6851,0.1634 Q0.6835,0.1655,0.6775,0.1667 T0.6598,0.169 T0.6458,0.1705 T0.6402,0.1709 Q0.6378,0.1709,0.6321,0.1705 T0.6225,0.1701 Q0.6096,0.1701,0.5968,0.1738 Q0.5823,0.1779,0.5446,0.1779 Q0.5205,0.1779,0.5116,0.1767 Q0.51,0.1763,0.5084,0.1763 Q0.5028,0.1763,0.4944,0.1796 T0.4835,0.1829 L0.4771,0.1833 T0.4659,0.1844 L0.4546,0.1858 T0.443,0.1881 T0.4337,0.1912 Q0.4321,0.1916,0.4305,0.1916 Q0.4273,0.1916,0.4209,0.1895 T0.412,0.1875 Q0.408,0.1875,0.4056,0.19 Q0.4024,0.1925,0.388,0.1925 Q0.3663,0.1925,0.3558,0.1879 Q0.3518,0.1862,0.3462,0.1862 Q0.3373,0.1862,0.3213,0.191 T0.3012,0.1962 Q0.2964,0.1966,0.2799,0.1976 T0.2494,0.1997 T0.2313,0.2024 L0.2313,0.2024 L0.2293,0.2024 L0.2261,0.2024 L0.2217,0.2024 Q0.204,0.2024,0.1851,0.2047 T0.1526,0.2136 Q0.1406,0.2198,0.1406,0.226 Q0.1406,0.2319,0.1518,0.2362 T0.1719,0.2406 Q0.1791,0.2406,0.2466,0.2497 Q0.2498,0.2501,0.2574,0.2516 T0.2711,0.2538 T0.2819,0.2547 L0.2851,0.2547 Q0.2851,0.2543,0.2859,0.2543 Q0.294,0.2543,0.3096,0.2592 T0.3285,0.2684 Q0.3317,0.2721,0.3373,0.2721 Q0.3406,0.2721,0.3462,0.2708 T0.3542,0.2696 Q0.3558,0.2696,0.3574,0.27 Q0.3679,0.2737,0.3968,0.2762 Q0.3984,0.2766,0.4004,0.2779 L0.4044,0.2804 T0.4096,0.2816 Q0.412,0.2816,0.4145,0.2808 Q0.4177,0.2804,0.4249,0.2804 Q0.4586,0.2804,0.4763,0.287 Q0.4867,0.2912,0.4972,0.2912 Q0.5004,0.2912,0.5064,0.2908 T0.5165,0.2903 Q0.5293,0.2903,0.5361,0.2922 T0.547,0.3003 L0.547,0.3011 Q0.547,0.3036,0.5414,0.3049 T0.5249,0.3067 T0.51,0.3082 Q0.5092,0.3082,0.4831,0.3111 T0.4498,0.3161 Q0.408,0.3264,0.3952,0.3264 Q0.3896,0.3264,0.3863,0.3252 Q0.3783,0.3223,0.3703,0.3223 Q0.359,0.3223,0.3494,0.3277 Q0.347,0.3293,0.343,0.3293 Q0.3414,0.3293,0.3353,0.3285 T0.3253,0.3277 T0.3181,0.3285 Q0.3149,0.3289,0.2952,0.3306 T0.2699,0.3347 Q0.2675,0.3364,0.2598,0.3372 T0.2434,0.3395 T0.2297,0.3426 L0.2205,0.3461 T0.2048,0.3523 T0.1908,0.3606 T0.1791,0.3725 Q0.1743,0.3803,0.1743,0.3845 Q0.1743,0.3874,0.1763,0.3901 T0.1827,0.3976 T0.1912,0.4073 T0.198,0.4189 T0.2032,0.4276 T0.2137,0.4326 T0.2386,0.438 Q0.2458,0.4392,0.2562,0.4392 L0.2639,0.4392 L0.2699,0.4392 Q0.2795,0.4392,0.2843,0.4405 Q0.2932,0.443,0.3092,0.443 L0.3157,0.443 L0.3213,0.443 Q0.3293,0.443,0.3458,0.4463 T0.3671,0.4525 Q0.3598,0.4558,0.3373,0.4571 Q0.3124,0.4587,0.298,0.4637 Q0.294,0.465,0.2811,0.465 L0.2703,0.465 L0.2586,0.465 Q0.241,0.465,0.2305,0.4666 Q0.2185,0.4687,0.2185,0.4728 Q0.2185,0.4745,0.2205,0.4764 T0.2241,0.4791 L0.2265,0.4803 L0.2273,0.4803 Q0.2506,0.4824,0.261,0.4824 Q0.2675,0.4824,0.2699,0.482 Q0.2699,0.4815,0.2707,0.4815 Q0.2771,0.4815,0.3124,0.4898 Q0.3173,0.4907,0.3229,0.4913 T0.3386,0.4925 T0.3542,0.4936 T0.3663,0.494 Q0.3711,0.494,0.3787,0.4936 T0.3888,0.4932 Q0.392,0.4932,0.3944,0.4936 T0.4032,0.4959 T0.4181,0.499 T0.4369,0.5006 Q0.449,0.501,0.455,0.5021 T0.4639,0.5048 T0.4675,0.5093 L0.4675,0.5097 Q0.4675,0.5106,0.4663,0.511 T0.4622,0.5116 L0.4566,0.512 T0.4486,0.5124 T0.4402,0.5127 Q0.4345,0.5131,0.4257,0.5153 T0.4096,0.5176 Q0.4064,0.5176,0.4024,0.5172 L0.3968,0.5172 Q0.3863,0.5172,0.3731,0.522 T0.359,0.5268 Q0.355,0.528,0.3317,0.5321 T0.3004,0.5388 Q0.2867,0.5433,0.2337,0.5479 Q0.2096,0.55,0.2096,0.5562 Q0.2096,0.5591,0.2145,0.5628 Q0.2193,0.5662,0.2289,0.5662 Q0.2313,0.5662,0.2373,0.5657 T0.2458,0.5653 L0.2498,0.5653 Q0.2635,0.5674,0.3124,0.5674 Q0.3261,0.5674,0.3301,0.567 L0.3317,0.567 Q0.3341,0.567,0.3394,0.568 T0.3486,0.5691 Q0.3542,0.5691,0.3606,0.5678 T0.3699,0.5666 T0.3759,0.5686 T0.3839,0.5718 T0.3908,0.573 T0.3964,0.5734 T0.4048,0.5742 T0.4165,0.5751 T0.4277,0.5757 T0.4369,0.5778 Q0.4426,0.5794,0.4538,0.5794 Q0.4586,0.5794,0.4679,0.5792 T0.4811,0.579 Q0.4924,0.579,0.4956,0.5807 Q0.502,0.584,0.5108,0.584 L0.5137,0.584 T0.5173,0.5838 L0.5205,0.5834 L0.5237,0.583 L0.5269,0.5825 T0.5305,0.5821 T0.5341,0.5819 L0.5365,0.5819 Q0.5414,0.5819,0.5562,0.5842 T0.5855,0.5865 Q0.5912,0.5865,0.5948,0.5867 T0.6012,0.5869 T0.6064,0.5873 T0.61,0.5877 T0.6133,0.5886 T0.6157,0.5896 L0.6185,0.591 T0.6217,0.5931 Q0.6265,0.5952,0.6369,0.5952 L0.6418,0.5952 L0.6466,0.5952 Q0.6723,0.5952,0.6932,0.606 Q0.698,0.608,0.7044,0.608 Q0.7084,0.608,0.7161,0.6068 T0.7261,0.6056 Q0.7309,0.6056,0.7454,0.6051 T0.7647,0.6047 Q0.7775,0.6047,0.8072,0.6101 Q0.8096,0.6105,0.812,0.6105 Q0.8177,0.6105,0.8297,0.6085 T0.8474,0.606 L0.8506,0.606 Q0.8562,0.606,0.8647,0.607 T0.8831,0.6095 T0.8964,0.6118 Q0.9036,0.6122,0.9221,0.6122 L0.9406,0.6122 L0.959,0.6122 L0.9767,0.6122 Q0.9952,0.613,0.9952,0.6172 Q0.9952,0.6176,0.9944,0.6221 Q0.9936,0.6259,0.9574,0.6259 L0.955,0.6259 L0.9526,0.6259 Q0.9478,0.6259,0.9373,0.628 T0.9205,0.63 L0.9173,0.63 Q0.9133,0.6296,0.9084,0.6296 Q0.9004,0.6296,0.8715,0.6321 Q0.8233,0.6367,0.7944,0.64 Q0.7888,0.6408,0.7839,0.6408 T0.7739,0.6402 T0.7671,0.6396 Q0.7639,0.6396,0.7622,0.64 Q0.7614,0.6404,0.759,0.6404 Q0.7574,0.6404,0.749,0.6398 T0.7357,0.6392 Q0.7261,0.6392,0.7213,0.6412 Q0.7173,0.6425,0.7032,0.6437 T0.6711,0.6458 T0.6474,0.647 Q0.645,0.6474,0.6418,0.6474 Q0.6353,0.6474,0.6277,0.6454 T0.6161,0.6433 Q0.6104,0.6433,0.6072,0.6456 T0.6,0.6479 Q0.5912,0.6479,0.5486,0.6557 Q0.5422,0.657,0.5373,0.657 Q0.5349,0.657,0.5289,0.6564 T0.5173,0.6557 L0.5124,0.6557 Q0.4996,0.6562,0.4739,0.6611 Q0.4675,0.6624,0.4398,0.6645 T0.3851,0.668 T0.3558,0.6698 Q0.355,0.6698,0.3285,0.6721 T0.2948,0.6752 Q0.2892,0.6761,0.2843,0.6786 T0.2747,0.6831 T0.2618,0.6852 Q0.253,0.6852,0.2394,0.6893 T0.2141,0.6993 T0.1968,0.7105 Q0.1944,0.713,0.1944,0.7155 Q0.1944,0.7196,0.2012,0.7229 T0.2177,0.7285 T0.2281,0.7308 Q0.2321,0.7329,0.2365,0.7339 T0.245,0.7356 T0.2514,0.7366 Q0.2522,0.737,0.2554,0.7379 T0.2614,0.7393 T0.2679,0.7406 T0.2755,0.7416 T0.2835,0.742 Q0.29,0.742,0.3048,0.7428 T0.3253,0.7437 L0.3301,0.7437 L0.3333,0.7437 Q0.3341,0.7437,0.3598,0.7466 Q0.3639,0.7474,0.3671,0.7474 T0.3759,0.7466 T0.3855,0.7457 Q0.388,0.7457,0.3904,0.7462 Q0.3984,0.7466,0.4137,0.7495 T0.4349,0.7532 T0.441,0.7557 Q0.441,0.7599,0.4289,0.7619 Q0.4257,0.7628,0.4197,0.7634 T0.4072,0.7644 T0.3984,0.7652 Q0.3968,0.7652,0.3912,0.7655 T0.3811,0.7665 T0.3719,0.7694 Q0.3695,0.7702,0.3655,0.7702 T0.3546,0.7686 T0.3462,0.7665 L0.3446,0.7665 Q0.3406,0.7665,0.3293,0.769 T0.3149,0.7715 Q0.3084,0.7715,0.2952,0.7748 T0.2763,0.781 Q0.2675,0.7847,0.2554,0.7864 Q0.253,0.7864,0.2325,0.7874 T0.2024,0.7893 Q0.2008,0.7893,0.1984,0.7897 T0.1948,0.7901 T0.1916,0.7903 T0.1888,0.7908 T0.1867,0.7914 T0.1847,0.7922 L0.1831,0.793 T0.1819,0.7943 L0.1811,0.7959 T0.1799,0.7976 Q0.1791,0.7993,0.1791,0.8001 Q0.1791,0.8034,0.1831,0.8051 T0.1932,0.8078 T0.2,0.8092 Q0.2072,0.8117,0.2257,0.8117 Q0.2337,0.8117,0.2586,0.8109 L0.2635,0.8109 Q0.2707,0.8109,0.2767,0.8117 T0.2859,0.8136 T0.2936,0.8163 T0.3012,0.8187 Q0.3068,0.82,0.3277,0.8206 T0.3526,0.8237 Q0.3582,0.8266,0.3622,0.8266 Q0.3647,0.8266,0.3687,0.8258 T0.3751,0.825 Q0.396,0.825,0.404,0.8291 Q0.408,0.8316,0.4161,0.8316 Q0.4217,0.8316,0.4353,0.8295 L0.4394,0.8295 Q0.4466,0.8295,0.4659,0.8366 Q0.4699,0.8378,0.4747,0.8378 Q0.4763,0.8378,0.4807,0.8374 T0.4884,0.837 Q0.494,0.837,0.5004,0.8382 Q0.5052,0.8391,0.5124,0.8399 Q0.5221,0.8411,0.5249,0.8422 T0.5277,0.8461 Q0.5277,0.8482,0.5233,0.849 T0.5112,0.8501 T0.4996,0.8511 Q0.4964,0.8519,0.4851,0.8523 T0.4659,0.8544 Q0.4578,0.8557,0.4402,0.8557 L0.4349,0.8557 L0.4297,0.8557 L0.4209,0.8557 Q0.408,0.8565,0.3867,0.8571 T0.3614,0.8582 Q0.3317,0.8611,0.3237,0.8611 L0.3225,0.8611 L0.3213,0.8611 Q0.2972,0.8611,0.2972,0.8681 Q0.2972,0.8714,0.3008,0.8747 T0.3044,0.8805 Q0.3044,0.881,0.3036,0.8814 Q0.3012,0.8839,0.2851,0.8839 Q0.2779,0.8839,0.2739,0.883 Q0.2723,0.8826,0.2699,0.8826 T0.2643,0.8835 T0.259,0.8853 T0.2542,0.8876 T0.249,0.8893 Q0.2386,0.8922,0.2056,0.8946 Q0.2016,0.8951,0.1916,0.898 T0.1703,0.9009 Q0.1518,0.9009,0.1337,0.9044 T0.1149,0.9146 L0.1149,0.9158 Q0.1149,0.9175,0.1157,0.9187 T0.1173,0.921 T0.1201,0.9226 T0.1233,0.9237 T0.1269,0.9245 L0.1305,0.9251 T0.1337,0.9255 L0.1357,0.9258 Q0.139,0.9262,0.1446,0.9262 T0.1542,0.9266 T0.1598,0.9282 Q0.1614,0.9303,0.1647,0.9314 T0.1739,0.9328 T0.1815,0.9336 Q0.1863,0.9345,0.1976,0.9372 T0.2145,0.9415 Q0.2225,0.9432,0.2285,0.9467 T0.2378,0.9515 Q0.2426,0.9531,0.2514,0.9531 Q0.2538,0.9531,0.2602,0.9529 T0.2707,0.9527 Q0.2763,0.9527,0.2815,0.9531 T0.2867,0.9569 T0.2811,0.9614 Q0.2434,0.9627,0.2329,0.9652 Q0.2249,0.9672,0.2241,0.9672 L0.2096,0.9668 L0.2056,0.9668 Q0.2,0.9668,0.196,0.9672 T0.1884,0.9687 T0.1815,0.9708 T0.1731,0.9737 T0.1639,0.9772 Q0.1518,0.9805,0.1285,0.9805 L0.1253,0.9805 Q0.1124,0.9805,0.1076,0.9818 Q0.1012,0.983,0.0831,0.9876 T0.0594,0.9934 Q0.049,0.9954,0.0064,0.9954 Z M0.0032,0.9979 L0.0024,0.0037 Q0.0161,0.0021,0.0289,0.0062 Q0.0337,0.0075,0.0671,0.0066 T0.1116,0.01 T0.1337,0.0166 T0.151,0.022 Q0.1582,0.0249,0.1659,0.0251 T0.1767,0.0265 Q0.1807,0.0278,0.2,0.0292 T0.2265,0.0328 Q0.2305,0.034,0.2329,0.034 T0.239,0.0326 T0.2458,0.0311 T0.253,0.0319 Q0.2578,0.0332,0.2614,0.0342 T0.2667,0.0363 T0.2723,0.0384 T0.2827,0.0406 Q0.3084,0.0448,0.3141,0.0485 Q0.3149,0.0494,0.3225,0.0494 T0.3361,0.0504 T0.3422,0.0554 T0.3357,0.0606 T0.3205,0.0618 T0.31,0.0626 Q0.3092,0.0626,0.3056,0.0659 T0.2932,0.0701 Q0.2884,0.0709,0.2843,0.0709 Q0.2811,0.0709,0.2759,0.0701 T0.2667,0.0693 Q0.2586,0.0693,0.2422,0.0718 T0.2193,0.0763 Q0.2137,0.0784,0.1831,0.079 T0.1502,0.0805 Q0.1494,0.0809,0.147,0.0809 Q0.1454,0.0809,0.1386,0.0803 T0.1277,0.0796 Q0.1173,0.0796,0.1092,0.0821 Q0.1036,0.0834,0.1036,0.0854 Q0.1036,0.0879,0.1129,0.0908 T0.1269,0.0937 Q0.1293,0.0937,0.1558,0.0991 T0.1863,0.1045 Q0.2016,0.1045,0.2193,0.1087 Q0.2225,0.1091,0.2249,0.1091 Q0.2289,0.1091,0.2357,0.1076 T0.2482,0.1054 Q0.2506,0.1049,0.2546,0.1049 Q0.2699,0.1049,0.2924,0.1085 T0.3213,0.1165 Q0.3253,0.119,0.3301,0.119 Q0.3325,0.119,0.3446,0.1161 T0.3687,0.1124 Q0.3831,0.1112,0.3863,0.1112 T0.3908,0.1118 T0.3936,0.1145 T0.3984,0.1186 Q0.4048,0.1228,0.408,0.1228 Q0.4096,0.1228,0.4161,0.1213 T0.4305,0.1195 L0.4337,0.1195 Q0.4426,0.1195,0.4474,0.1211 T0.4566,0.1246 T0.4667,0.1273 Q0.4876,0.1298,0.5116,0.1298 Q0.5365,0.1298,0.5631,0.1389 Q0.5703,0.1414,0.5751,0.1414 Q0.5783,0.1414,0.5819,0.1398 T0.5888,0.1381 Q0.5928,0.1381,0.5984,0.1398 T0.6129,0.1414 Q0.6321,0.1414,0.6498,0.1477 Q0.661,0.1514,0.6667,0.1514 Q0.6707,0.1514,0.6771,0.1501 Q0.6787,0.1497,0.6795,0.1497 Q0.6835,0.1497,0.6863,0.1526 T0.6892,0.1593 Q0.6892,0.1626,0.6876,0.1647 Q0.6851,0.1672,0.6799,0.1686 T0.6695,0.1705 T0.6566,0.1715 T0.6458,0.1725 Q0.6434,0.173,0.6402,0.173 Q0.6378,0.173,0.6317,0.1727 T0.6225,0.1725 Q0.6096,0.1725,0.5984,0.1759 Q0.5823,0.1804,0.5454,0.1804 Q0.5205,0.1804,0.5116,0.1788 L0.5084,0.1788 Q0.5036,0.1788,0.4956,0.1819 T0.4843,0.185 Q0.4434,0.1887,0.4353,0.1929 Q0.4321,0.1945,0.4289,0.1945 T0.4197,0.1922 T0.4112,0.19 T0.4072,0.1912 Q0.4032,0.1949,0.388,0.1949 Q0.3663,0.1949,0.3542,0.19 Q0.351,0.1883,0.3462,0.1883 Q0.3406,0.1883,0.3321,0.1906 T0.3153,0.1954 T0.302,0.1983 Q0.2972,0.1991,0.2859,0.1997 T0.2643,0.201 T0.245,0.2024 T0.2337,0.2041 Q0.2321,0.2045,0.2181,0.2045 T0.1851,0.207 T0.1542,0.2157 Q0.143,0.2211,0.143,0.226 Q0.143,0.2314,0.153,0.2348 T0.1719,0.2381 Q0.1791,0.2381,0.2474,0.2476 Q0.2506,0.248,0.2558,0.2489 T0.2651,0.2505 T0.2739,0.252 T0.2819,0.2526 Q0.2835,0.2526,0.2851,0.2522 L0.2859,0.2522 Q0.2948,0.2522,0.3104,0.2574 T0.3309,0.2671 Q0.3333,0.2696,0.3365,0.2696 Q0.339,0.2696,0.3442,0.2684 T0.3526,0.2671 T0.3582,0.2679 Q0.3687,0.2717,0.3968,0.2742 Q0.4,0.2746,0.4036,0.2771 T0.4096,0.2796 Q0.4112,0.2796,0.4137,0.2787 Q0.4169,0.2779,0.4257,0.2779 Q0.4594,0.2779,0.4779,0.2849 Q0.4876,0.2891,0.4972,0.2891 Q0.4996,0.2891,0.506,0.2887 T0.5165,0.2883 Q0.5253,0.2883,0.5305,0.2889 T0.541,0.292 T0.5494,0.299 L0.5494,0.3015 Q0.5494,0.3036,0.5466,0.3051 T0.5386,0.3073 T0.5285,0.3086 T0.5181,0.3094 T0.5108,0.3102 Q0.5068,0.3107,0.494,0.3121 L0.4683,0.315 T0.4506,0.3181 Q0.449,0.3181,0.4426,0.32 T0.4313,0.3229 T0.4197,0.3256 T0.4064,0.3281 T0.3952,0.3289 Q0.3888,0.3289,0.3855,0.3273 Q0.3783,0.3243,0.3703,0.3243 Q0.3598,0.3243,0.351,0.3297 Q0.3478,0.3314,0.3422,0.3314 Q0.3398,0.3314,0.3337,0.3306 T0.3245,0.3297 T0.3189,0.3306 Q0.3149,0.3314,0.2956,0.3328 T0.2715,0.3368 Q0.2691,0.338,0.2635,0.3391 T0.2522,0.3407 T0.2406,0.3424 T0.2313,0.3447 Q0.2305,0.3447,0.2213,0.348 T0.206,0.354 T0.1924,0.3621 T0.1815,0.3733 Q0.1767,0.3816,0.1767,0.3849 Q0.1767,0.387,0.1783,0.3893 T0.1847,0.3961 T0.1936,0.4063 T0.2004,0.4181 T0.2052,0.4264 T0.2145,0.4309 T0.2386,0.4359 Q0.2458,0.4372,0.2554,0.4372 Q0.2578,0.4372,0.2627,0.437 T0.2699,0.4367 Q0.2795,0.4367,0.2851,0.4384 Q0.294,0.4409,0.3092,0.4409 Q0.3116,0.4409,0.3157,0.4407 T0.3213,0.4405 Q0.3301,0.4405,0.3466,0.444 T0.3687,0.4509 Q0.3703,0.4517,0.3703,0.4525 Q0.3703,0.4575,0.3373,0.4596 Q0.3133,0.4608,0.2988,0.4658 Q0.294,0.4674,0.2803,0.4674 Q0.2763,0.4674,0.2687,0.4672 T0.257,0.467 Q0.2402,0.467,0.2313,0.4687 Q0.2209,0.4708,0.2209,0.4737 Q0.2209,0.4741,0.2213,0.4749 T0.2229,0.4764 L0.2249,0.4774 T0.2265,0.4778 L0.2273,0.4782 Q0.2498,0.4803,0.2618,0.4803 Q0.2667,0.4803,0.2691,0.4799 Q0.2699,0.4795,0.2715,0.4795 Q0.2779,0.4795,0.3133,0.4873 Q0.3181,0.4886,0.3233,0.4892 T0.3386,0.4905 T0.3542,0.4915 T0.3655,0.4919 Q0.3703,0.4919,0.3779,0.4915 T0.3888,0.4911 T0.3952,0.4915 Q0.3976,0.4919,0.4008,0.4927 L0.4072,0.4944 T0.4149,0.4961 T0.4249,0.4975 T0.4369,0.4985 Q0.449,0.499,0.4554,0.5 T0.4651,0.5031 T0.4699,0.5085 Q0.4707,0.5093,0.4707,0.5097 Q0.4707,0.5114,0.4687,0.5124 T0.4631,0.5139 T0.4562,0.5145 T0.4478,0.5147 L0.4402,0.5147 Q0.4353,0.5151,0.4265,0.5174 T0.4096,0.5197 L0.4024,0.5197 Q0.4,0.5193,0.3968,0.5193 Q0.3896,0.5193,0.3831,0.5209 T0.3703,0.5253 T0.3598,0.5288 Q0.3558,0.5301,0.3321,0.5342 T0.302,0.5409 Q0.2876,0.5454,0.2337,0.55 Q0.2112,0.5521,0.2112,0.5558 Q0.2112,0.5574,0.2161,0.5612 Q0.2201,0.5637,0.2281,0.5637 Q0.2305,0.5637,0.2361,0.5633 T0.2442,0.5628 Q0.2474,0.5628,0.2498,0.5633 Q0.2635,0.5653,0.3133,0.5653 Q0.3261,0.5653,0.3301,0.5649 L0.3325,0.5649 Q0.3349,0.5649,0.3402,0.5657 T0.3494,0.5666 Q0.3542,0.5666,0.3598,0.5657 Q0.3663,0.5645,0.3695,0.5645 Q0.3735,0.5645,0.3775,0.5666 T0.3847,0.5695 Q0.3888,0.5707,0.3912,0.5709 T0.3968,0.5711 T0.4048,0.572 Q0.4096,0.5724,0.4165,0.5726 T0.4281,0.5734 T0.4378,0.5757 Q0.4418,0.5774,0.4522,0.5774 Q0.4562,0.5774,0.4655,0.5769 T0.4795,0.5765 Q0.4932,0.5765,0.4972,0.579 Q0.5028,0.5819,0.51,0.5819 Q0.5141,0.5819,0.5221,0.5809 T0.5341,0.5798 L0.5373,0.5798 Q0.5422,0.5798,0.557,0.5821 T0.5855,0.5844 L0.5936,0.5844 L0.5992,0.5844 T0.604,0.5848 T0.6076,0.5852 T0.6108,0.5859 T0.6137,0.5865 T0.6161,0.5873 T0.6181,0.5881 T0.6209,0.5896 L0.6233,0.591 Q0.6265,0.5927,0.6353,0.5927 L0.6402,0.5927 L0.645,0.5927 Q0.6723,0.5927,0.6948,0.6039 Q0.6988,0.606,0.7036,0.606 Q0.7076,0.606,0.7153,0.6045 T0.7261,0.6031 Q0.7309,0.6031,0.7454,0.6027 T0.7647,0.6022 Q0.7783,0.6022,0.808,0.608 L0.812,0.608 Q0.8169,0.608,0.8293,0.6062 T0.8474,0.6039 L0.8506,0.6039 Q0.857,0.6039,0.8655,0.6049 T0.8835,0.6074 T0.8972,0.6093 Q0.9036,0.6101,0.9213,0.6101 L0.9398,0.6101 L0.959,0.6101 L0.9767,0.6101 Q0.9976,0.6109,0.9976,0.6176 Q0.9976,0.6188,0.9968,0.6226 Q0.9952,0.6284,0.9671,0.6284 L0.959,0.6284 L0.9526,0.6284 Q0.9486,0.6284,0.9382,0.6302 T0.9205,0.6321 L0.9173,0.6321 Q0.9133,0.6317,0.9092,0.6317 Q0.9012,0.6317,0.8715,0.6346 Q0.8233,0.6387,0.7944,0.6421 Q0.7888,0.6429,0.7831,0.6429 Q0.7783,0.6429,0.7731,0.6425 T0.7663,0.6421 L0.7622,0.6421 Q0.7614,0.6425,0.7586,0.6425 T0.7474,0.6421 T0.7349,0.6416 Q0.7261,0.6416,0.7221,0.6429 Q0.7173,0.645,0.7032,0.646 T0.6711,0.6479 T0.6482,0.6491 Q0.645,0.6495,0.6418,0.6495 Q0.6353,0.6495,0.6273,0.6474 T0.6161,0.6454 Q0.612,0.6454,0.6088,0.6477 T0.6,0.6499 Q0.5912,0.6499,0.5494,0.6578 Q0.5422,0.6591,0.5373,0.6591 Q0.5341,0.6591,0.5281,0.6584 T0.5173,0.6578 L0.5124,0.6578 Q0.5004,0.6582,0.4747,0.6632 Q0.4675,0.6649,0.4398,0.6667 T0.3851,0.6703 T0.3566,0.6719 Q0.3534,0.6723,0.3406,0.6734 T0.3141,0.6757 T0.2948,0.6773 Q0.2908,0.6781,0.2819,0.6829 T0.2618,0.6877 Q0.2482,0.6877,0.2273,0.6958 T0.1992,0.7117 Q0.1976,0.7138,0.1976,0.7155 Q0.1976,0.7188,0.2032,0.7213 T0.2181,0.7258 T0.2289,0.7292 Q0.2337,0.7308,0.2378,0.7316 L0.2458,0.7333 T0.2522,0.7345 Q0.2747,0.7399,0.2835,0.7399 Q0.29,0.7399,0.3048,0.7408 T0.3253,0.7416 Q0.3277,0.7416,0.3297,0.7414 T0.3341,0.7412 L0.3598,0.7445 Q0.3639,0.7449,0.3663,0.7449 Q0.3695,0.7449,0.3751,0.7443 T0.3855,0.7437 L0.3904,0.7437 Q0.3984,0.7441,0.4141,0.7472 T0.4353,0.7507 Q0.4434,0.752,0.4434,0.7553 Q0.4434,0.7578,0.439,0.7605 T0.4297,0.764 Q0.4257,0.7648,0.4201,0.7655 T0.4076,0.7665 T0.3984,0.7673 Q0.3968,0.7673,0.3912,0.7677 T0.3815,0.7688 T0.3735,0.771 T0.3655,0.7727 Q0.3606,0.7727,0.3534,0.7708 T0.3458,0.769 L0.3446,0.769 Q0.3414,0.769,0.3297,0.7713 T0.3149,0.7735 Q0.3092,0.7735,0.296,0.7771 T0.2771,0.7831 Q0.2683,0.7872,0.2554,0.7885 Q0.253,0.7889,0.2325,0.7897 T0.2032,0.7914 Q0.2008,0.7918,0.198,0.792 T0.194,0.7924 T0.1912,0.7928 T0.1888,0.793 T0.1867,0.7934 T0.1851,0.7943 T0.1843,0.7953 T0.1835,0.7968 T0.1823,0.7984 T0.1815,0.8001 Q0.1815,0.8022,0.1847,0.8032 T0.1932,0.8053 T0.2008,0.8071 Q0.2072,0.8092,0.2265,0.8092 Q0.2361,0.8092,0.2586,0.8088 L0.2635,0.8088 Q0.2731,0.8088,0.2795,0.8098 T0.2928,0.8134 T0.302,0.8167 Q0.306,0.8179,0.3277,0.8183 T0.3542,0.8221 Q0.359,0.8246,0.3622,0.8246 Q0.3639,0.8246,0.3675,0.8237 T0.3751,0.8229 Q0.3968,0.8229,0.4048,0.8275 Q0.4088,0.8291,0.4161,0.8291 Q0.4225,0.8291,0.4353,0.8275 Q0.4369,0.827,0.4394,0.827 Q0.4474,0.827,0.4675,0.8345 Q0.4707,0.8358,0.4739,0.8358 Q0.4755,0.8358,0.4799,0.8353 T0.4876,0.8349 Q0.494,0.8349,0.5012,0.8362 L0.5076,0.837 T0.5133,0.8376 T0.5181,0.8382 T0.5221,0.8391 L0.5253,0.8399 T0.5277,0.8409 L0.5293,0.8422 T0.5301,0.8438 L0.5301,0.8461 Q0.5301,0.8499,0.5249,0.8511 T0.5112,0.8526 T0.5004,0.8532 Q0.4964,0.854,0.4851,0.8546 T0.4667,0.8565 Q0.4578,0.8577,0.441,0.8577 L0.4345,0.8577 L0.4289,0.8577 L0.4209,0.8577 Q0.4153,0.8582,0.4088,0.8586 T0.3968,0.8592 T0.3855,0.8594 T0.3755,0.8596 T0.3675,0.86 T0.3622,0.8602 Q0.3317,0.8635,0.3237,0.8635 Q0.2996,0.8635,0.2996,0.8681 Q0.2996,0.8698,0.3032,0.8733 T0.3068,0.8797 L0.3068,0.8822 Q0.3052,0.8859,0.2859,0.8859 Q0.2787,0.8859,0.2739,0.8851 L0.2699,0.8851 Q0.2659,0.8851,0.259,0.888 T0.2498,0.8913 Q0.2394,0.8946,0.2056,0.8971 Q0.2032,0.8971,0.1928,0.9002 T0.1703,0.9034 Q0.1526,0.9034,0.1353,0.9067 T0.1173,0.915 L0.1173,0.9158 Q0.1173,0.9166,0.1177,0.9175 T0.1189,0.9191 T0.1205,0.9204 T0.1229,0.9212 T0.1257,0.922 T0.1285,0.9226 T0.1309,0.9231 T0.1337,0.9235 T0.1365,0.9237 L0.1446,0.9237 T0.1554,0.9243 T0.1614,0.9268 T0.1659,0.9293 T0.1743,0.9303 T0.1823,0.9316 Q0.1863,0.932,0.1912,0.9332 T0.2028,0.9361 T0.2153,0.939 Q0.2233,0.9411,0.2297,0.9448 T0.2386,0.9494 Q0.2426,0.9506,0.2506,0.9506 Q0.253,0.9506,0.2594,0.9504 T0.2699,0.9502 Q0.2763,0.9502,0.2819,0.9511 Q0.2851,0.9511,0.2871,0.9529 T0.2892,0.9573 Q0.2892,0.9627,0.2811,0.9635 Q0.2434,0.9652,0.2337,0.9672 Q0.2257,0.9693,0.2241,0.9693 Q0.2217,0.9693,0.2096,0.9689 L0.2056,0.9689 Q0.1976,0.9689,0.1924,0.9699 T0.1787,0.9741 L0.1647,0.9793 Q0.1518,0.983,0.1285,0.983 L0.1261,0.983 L0.1237,0.983 Q0.1124,0.983,0.1076,0.9838 Q0.102,0.9851,0.0839,0.9896 T0.0602,0.9954 T0.0406,0.9971 T0.0153,0.9979 L0.0032,0.9979 Z",type:0}},"\uE0CA":{type:5,data:{d:"M0.9992,0.998 Q0.9992,1,0.9968,1 Q0.9521,1,0.9392,0.998 Q0.9335,0.997,0.9152,0.9921 T0.8913,0.9862 Q0.8873,0.9852,0.8783,0.9852 L0.8747,0.9852 L0.871,0.9852 Q0.8483,0.9852,0.8345,0.9812 Q0.8289,0.9792,0.8228,0.9773 T0.8135,0.9743 T0.8054,0.9723 T0.7948,0.9713 L0.7908,0.9713 L0.777,0.9713 T0.7656,0.9693 Q0.7616,0.9683,0.7498,0.9674 T0.7283,0.9664 L0.7186,0.9654 Q0.708,0.9644,0.708,0.9575 Q0.708,0.9545,0.7109,0.952 T0.7178,0.9486 L0.7315,0.9486 L0.7417,0.9486 L0.7502,0.9486 Q0.7575,0.9486,0.7599,0.9476 Q0.7616,0.9466,0.7685,0.9426 T0.7843,0.9377 Q0.7899,0.9357,0.8009,0.9332 T0.8175,0.9298 Q0.82,0.9288,0.8228,0.9283 T0.8277,0.9278 T0.8313,0.9273 T0.8341,0.9263 T0.8362,0.9258 Q0.8402,0.9219,0.854,0.9219 L0.8569,0.9219 L0.8597,0.9219 L0.8637,0.9219 Q0.88,0.9199,0.88,0.9159 L0.88,0.9149 Q0.88,0.913,0.8719,0.911 T0.852,0.9075 T0.8297,0.906 Q0.8224,0.906,0.8167,0.905 T0.8074,0.9031 T0.8001,0.9006 T0.794,0.8991 Q0.7599,0.8971,0.7494,0.8942 Q0.7461,0.8932,0.7397,0.8902 T0.7299,0.8872 L0.7267,0.8872 Q0.721,0.8882,0.7121,0.8882 Q0.6926,0.8882,0.691,0.8833 L0.691,0.8803 Q0.691,0.8773,0.6922,0.8749 T0.6955,0.8704 L0.6975,0.8684 Q0.6926,0.8655,0.6764,0.8655 Q0.6683,0.8655,0.6375,0.8625 Q0.6358,0.8625,0.629,0.862 T0.6148,0.8615 T0.5973,0.861 T0.5791,0.8605 L0.5718,0.8605 L0.5661,0.8605 L0.5596,0.8605 Q0.5426,0.8605,0.5337,0.8586 Q0.5264,0.8576,0.515,0.8571 T0.4996,0.8556 Q0.498,0.8556,0.4947,0.8551 T0.4882,0.8546 T0.4809,0.8541 T0.474,0.8531 T0.4692,0.8506 T0.4672,0.8467 Q0.4672,0.8437,0.468,0.8422 T0.4704,0.8398 T0.4736,0.8383 T0.4781,0.8368 T0.4838,0.8358 T0.4911,0.8353 T0.4988,0.8338 Q0.5069,0.8328,0.5142,0.8328 Q0.5174,0.8328,0.5215,0.8333 T0.5264,0.8338 Q0.5296,0.8338,0.532,0.8328 Q0.5523,0.8249,0.5604,0.8249 L0.5653,0.8249 Q0.5775,0.8269,0.5848,0.8269 Q0.5912,0.8269,0.5937,0.8259 Q0.6026,0.821,0.6253,0.821 Q0.6294,0.821,0.6334,0.822 T0.6383,0.8229 Q0.6399,0.8229,0.644,0.82 Q0.6504,0.817,0.6723,0.816 T0.6975,0.814 Q0.6999,0.814,0.7048,0.8121 T0.7129,0.8091 T0.7226,0.8071 T0.7372,0.8061 L0.7421,0.8061 Q0.7624,0.8071,0.7721,0.8071 Q0.7924,0.8071,0.7981,0.8051 Q0.8021,0.8032,0.807,0.8027 T0.8135,0.8017 T0.8151,0.8002 L0.8151,0.7992 Q0.8143,0.7962,0.8127,0.7957 T0.8045,0.7943 Q0.7997,0.7943,0.7964,0.7933 Q0.7883,0.7933,0.7676,0.7923 T0.7437,0.7903 Q0.7307,0.7893,0.7218,0.7844 Q0.7194,0.7834,0.7141,0.7819 L0.7036,0.7789 T0.693,0.7765 T0.6853,0.7755 Q0.6805,0.7755,0.6691,0.773 T0.6553,0.7705 Q0.6545,0.7705,0.6545,0.7715 Q0.6537,0.7715,0.65,0.7725 T0.6423,0.774 T0.635,0.7745 Q0.6294,0.7745,0.6257,0.773 T0.618,0.771 T0.6083,0.77 T0.601,0.7695 Q0.5985,0.7695,0.5921,0.769 T0.5795,0.7676 T0.5702,0.7666 Q0.5653,0.7656,0.5596,0.7616 T0.5539,0.7547 Q0.5539,0.7498,0.5645,0.7488 Q0.5693,0.7478,0.5852,0.7448 T0.6099,0.7418 L0.6148,0.7418 Q0.6196,0.7418,0.6253,0.7423 T0.6338,0.7428 L0.6399,0.7428 Q0.6431,0.7418,0.6488,0.7409 T0.6586,0.7394 T0.6659,0.7389 L0.6707,0.7389 Q0.6723,0.7399,0.6748,0.7399 Q0.6796,0.7399,0.6946,0.7389 T0.7161,0.7379 Q0.7251,0.7379,0.7478,0.7319 Q0.7494,0.7319,0.7539,0.7315 T0.762,0.73 T0.7697,0.727 T0.7818,0.723 T0.7948,0.7196 T0.7997,0.7151 Q0.7997,0.7141,0.7989,0.7132 Q0.7924,0.7062,0.7717,0.6978 T0.738,0.6894 Q0.7267,0.6894,0.717,0.6845 T0.7048,0.6795 Q0.6975,0.6785,0.6711,0.6766 T0.6431,0.6746 Q0.6415,0.6736,0.6144,0.6721 T0.5596,0.6686 T0.5247,0.6657 Q0.4996,0.6607,0.4874,0.6597 L0.4834,0.6597 Q0.4785,0.6597,0.4724,0.6607 T0.4631,0.6617 Q0.4574,0.6617,0.4501,0.6597 Q0.4088,0.6518,0.4006,0.6518 Q0.3933,0.6518,0.3901,0.6499 T0.3844,0.6479 T0.3739,0.6499 T0.3585,0.6518 L0.352,0.6518 Q0.3471,0.6508,0.335,0.6503 T0.3122,0.6494 T0.2912,0.6479 T0.2766,0.6449 Q0.2733,0.6439,0.2668,0.6439 Q0.2628,0.6439,0.2543,0.6444 T0.2425,0.6449 T0.2368,0.6439 L0.2344,0.6439 Q0.2336,0.6439,0.2283,0.6444 T0.2182,0.6449 Q0.2117,0.6449,0.2052,0.6439 Q0.1768,0.6409,0.1281,0.637 Q0.0989,0.634,0.0916,0.634 L0.0835,0.634 L0.0795,0.634 Q0.0722,0.634,0.0616,0.632 T0.0479,0.6301 Q0.0462,0.6301,0.0406,0.6306 T0.0308,0.6311 Q0.0032,0.6311,0.0008,0.6231 Q0,0.6202,0,0.6182 Q0,0.6083,0.0227,0.6083 Q0.03,0.6073,0.0422,0.6073 Q0.0487,0.6073,0.0608,0.6078 T0.0787,0.6083 Q0.0973,0.6083,0.103,0.6073 Q0.1062,0.6063,0.1131,0.6053 T0.1253,0.6039 T0.1375,0.6024 T0.1492,0.6014 L0.1533,0.6014 Q0.1598,0.6024,0.1723,0.6044 T0.189,0.6063 Q0.1906,0.6063,0.1922,0.6053 Q0.2214,0.6004,0.236,0.6004 Q0.2409,0.6004,0.2551,0.6009 T0.2741,0.6014 Q0.2782,0.6014,0.2859,0.6024 T0.2968,0.6034 Q0.3009,0.6034,0.3041,0.6024 Q0.3277,0.5905,0.356,0.5905 L0.3613,0.5905 L0.3666,0.5905 Q0.3731,0.5905,0.3755,0.5895 Q0.382,0.5856,0.3844,0.5846 T0.3938,0.5831 T0.4144,0.5826 T0.4428,0.5801 T0.4631,0.5776 L0.4663,0.5776 Q0.4704,0.5776,0.4785,0.5786 T0.4899,0.5796 Q0.4964,0.5796,0.5012,0.5767 Q0.5069,0.5737,0.5223,0.5737 Q0.5272,0.5737,0.5369,0.5742 T0.5499,0.5747 Q0.558,0.5747,0.5612,0.5737 Q0.5661,0.5717,0.5714,0.5712 T0.5835,0.5702 T0.5945,0.5692 T0.6018,0.5687 L0.6062,0.5687 T0.6095,0.5682 T0.6148,0.5678 Q0.6172,0.5668,0.6196,0.5653 T0.6245,0.5633 T0.631,0.5628 T0.6407,0.5638 T0.6504,0.5648 T0.6594,0.5638 T0.6675,0.5628 L0.6707,0.5628 L0.6861,0.5628 Q0.7364,0.5628,0.7494,0.5608 L0.7567,0.5608 L0.7652,0.5608 L0.7729,0.5608 Q0.7794,0.5608,0.7818,0.5589 Q0.7851,0.5569,0.7859,0.5559 Q0.7835,0.5539,0.7656,0.5519 Q0.7121,0.547,0.6975,0.543 Q0.6934,0.541,0.6853,0.5396 L0.6691,0.5366 T0.6525,0.5336 T0.6391,0.5312 Q0.6367,0.5302,0.6245,0.5257 T0.6034,0.5213 L0.5977,0.5213 Q0.5945,0.5223,0.5904,0.5223 Q0.5839,0.5223,0.5787,0.5208 T0.5685,0.5183 T0.5596,0.5173 Q0.558,0.5173,0.5552,0.5168 T0.5495,0.5163 L0.5434,0.5163 T0.5373,0.5158 T0.532,0.5148 T0.5284,0.5129 T0.5272,0.5104 L0.5272,0.5074 Q0.5304,0.5015,0.5377,0.499 T0.5629,0.4965 Q0.5734,0.4955,0.5811,0.4946 T0.5953,0.4916 T0.605,0.4896 Q0.6083,0.4886,0.6123,0.4886 Q0.6148,0.4886,0.6225,0.4891 T0.635,0.4896 L0.6456,0.4896 Q0.6837,0.4857,0.6861,0.4857 Q0.7226,0.4768,0.7283,0.4768 Q0.7307,0.4768,0.732,0.4773 T0.7372,0.4777 Q0.7502,0.4777,0.7721,0.4758 Q0.7753,0.4748,0.777,0.4738 Q0.7745,0.4718,0.768,0.4708 Q0.7599,0.4688,0.7445,0.4688 Q0.7405,0.4688,0.7324,0.4693 T0.721,0.4698 Q0.7056,0.4698,0.6999,0.4679 Q0.6861,0.4629,0.6626,0.4619 Q0.6586,0.4609,0.6533,0.4604 T0.6419,0.459 T0.6314,0.456 T0.6269,0.452 Q0.6269,0.451,0.6302,0.4491 Q0.6358,0.4451,0.6525,0.4416 T0.6788,0.4382 L0.6845,0.4382 L0.6902,0.4382 Q0.7064,0.4382,0.7145,0.4362 Q0.7202,0.4342,0.7307,0.4342 L0.7356,0.4342 L0.7409,0.4342 L0.7453,0.4342 Q0.7543,0.4342,0.7607,0.4332 Q0.7778,0.4313,0.7847,0.4288 T0.7932,0.4248 T0.7972,0.4169 T0.8045,0.4045 L0.8094,0.3986 T0.8135,0.3942 L0.8167,0.3912 T0.8191,0.3887 T0.8204,0.3867 T0.8208,0.3848 Q0.8208,0.3818,0.8167,0.3739 Q0.8127,0.3689,0.8054,0.3635 T0.7924,0.3556 T0.7778,0.3497 T0.768,0.3462 Q0.764,0.3442,0.7478,0.3427 T0.7267,0.3383 Q0.7234,0.3363,0.7044,0.3348 T0.6805,0.3323 L0.6764,0.3323 T0.6679,0.3328 T0.6586,0.3333 Q0.6521,0.3333,0.648,0.3314 Q0.6391,0.3264,0.6294,0.3264 Q0.6229,0.3264,0.6156,0.3294 Q0.6115,0.3304,0.6042,0.3304 Q0.5977,0.3304,0.5888,0.3289 T0.5738,0.3264 T0.5584,0.3225 L0.5491,0.3195 Q0.5418,0.3185,0.5162,0.3155 T0.4895,0.3121 T0.4826,0.3116 T0.4716,0.3111 T0.4607,0.3096 T0.4513,0.3066 T0.4477,0.3017 Q0.4477,0.2997,0.4485,0.2977 Q0.4526,0.2898,0.4611,0.2878 T0.4842,0.2859 Q0.4882,0.2859,0.4943,0.2864 T0.5028,0.2868 Q0.5118,0.2868,0.5215,0.2829 Q0.5401,0.276,0.5734,0.276 Q0.5831,0.276,0.5872,0.277 L0.5904,0.277 T0.5949,0.2745 T0.6034,0.272 Q0.631,0.269,0.6407,0.2661 Q0.6448,0.2641,0.6488,0.2641 T0.6573,0.2656 T0.6634,0.2671 Q0.6659,0.2671,0.6675,0.2651 Q0.6723,0.2601,0.6886,0.2552 T0.7137,0.2502 L0.7153,0.2502 L0.7178,0.2502 Q0.7218,0.2502,0.7279,0.2493 T0.7417,0.2468 T0.7526,0.2453 Q0.8208,0.2354,0.8281,0.2354 Q0.8337,0.2354,0.8394,0.2344 T0.8496,0.2315 T0.854,0.2265 Q0.854,0.2216,0.8443,0.2176 Q0.8354,0.2127,0.8216,0.2102 T0.7972,0.2072 T0.777,0.2067 T0.7648,0.2057 Q0.7632,0.2047,0.7498,0.2038 T0.7202,0.2018 T0.6983,0.1998 Q0.6918,0.1998,0.676,0.1949 T0.6537,0.1899 Q0.6496,0.1899,0.6472,0.1919 Q0.6342,0.1968,0.6123,0.1968 Q0.5961,0.1968,0.5912,0.1929 Q0.5904,0.1919,0.5892,0.1919 T0.5823,0.1944 T0.5722,0.1968 T0.5637,0.1949 Q0.5556,0.1909,0.5158,0.1869 Q0.5109,0.1869,0.5032,0.1835 T0.4915,0.18 Q0.4907,0.18,0.4891,0.181 Q0.4793,0.182,0.455,0.182 Q0.4177,0.182,0.4015,0.1771 Q0.3901,0.1741,0.3779,0.1741 Q0.3747,0.1741,0.369,0.1746 T0.3609,0.1751 Q0.3569,0.1751,0.3536,0.1741 Q0.3512,0.1741,0.3459,0.1736 T0.3358,0.1726 T0.3256,0.1716 T0.3167,0.1696 T0.3106,0.1662 Q0.3082,0.1632,0.3082,0.1592 Q0.3082,0.1543,0.3114,0.1508 T0.3204,0.1474 L0.3236,0.1474 Q0.3301,0.1494,0.3333,0.1494 Q0.339,0.1494,0.3496,0.1454 Q0.3674,0.1385,0.3869,0.1385 Q0.395,0.1385,0.4011,0.137 T0.4116,0.1355 T0.4197,0.1375 T0.425,0.1395 Q0.429,0.1395,0.4355,0.1365 Q0.4631,0.1266,0.4882,0.1266 Q0.5126,0.1266,0.5337,0.1246 Q0.5369,0.1246,0.5458,0.1207 T0.5661,0.1167 L0.5693,0.1167 Q0.5791,0.1177,0.5852,0.1187 T0.5921,0.1197 Q0.5945,0.1197,0.6002,0.1167 Q0.6026,0.1147,0.605,0.1123 T0.6091,0.1093 T0.6156,0.1088 T0.6318,0.1098 Q0.6456,0.1108,0.6569,0.1137 T0.6707,0.1167 Q0.674,0.1167,0.6772,0.1147 Q0.6821,0.1108,0.6946,0.1083 T0.721,0.1044 T0.7453,0.1029 L0.7526,0.1029 Q0.7583,0.1039,0.7652,0.1053 T0.7753,0.1068 Q0.7778,0.1068,0.7802,0.1058 Q0.7981,0.1019,0.8143,0.1019 Q0.8175,0.1019,0.8439,0.0964 T0.8735,0.091 Q0.8759,0.091,0.8836,0.089 T0.8938,0.0851 Q0.8929,0.0841,0.8905,0.0841 Q0.8832,0.0821,0.8735,0.0821 Q0.8694,0.0821,0.8629,0.0826 T0.854,0.0831 Q0.8508,0.0831,0.8491,0.0821 Q0.8475,0.0821,0.8171,0.0811 T0.7802,0.0781 T0.7571,0.0737 T0.7332,0.0712 Q0.7299,0.0712,0.7247,0.0717 T0.7161,0.0722 L0.7064,0.0722 Q0.7032,0.0712,0.7003,0.0707 T0.6959,0.0692 T0.693,0.0678 T0.6914,0.0663 T0.6902,0.0648 T0.689,0.0643 L0.6869,0.0643 L0.6845,0.0643 L0.6821,0.0643 Q0.6553,0.0643,0.6553,0.0554 T0.6796,0.0465 L0.6813,0.0465 L0.6845,0.0465 Q0.6918,0.0425,0.717,0.0376 Q0.7226,0.0366,0.7267,0.0356 T0.7324,0.0336 T0.7376,0.0317 T0.747,0.0297 Q0.7518,0.0287,0.7551,0.0287 T0.762,0.0297 T0.768,0.0307 L0.7729,0.0307 Q0.7802,0.0277,0.7997,0.0267 T0.8224,0.0237 Q0.8273,0.0227,0.8341,0.0223 T0.8475,0.0193 T0.8654,0.0143 T0.8873,0.0079 Q0.9002,0.003,0.9331,0.004 T0.97,0.004 Q0.9838,0,0.9976,0.001 Q1,0.001,1,0.003 Z M0.9935,0.996 L0.9951,0.0049 Q0.9822,0.0049,0.9716,0.0079 Q0.9659,0.0099,0.9327,0.0089 T0.8897,0.0119 Q0.8775,0.0158,0.8666,0.0183 T0.85,0.0237 Q0.8418,0.0267,0.8341,0.0272 T0.8248,0.0277 Q0.82,0.0297,0.8001,0.0312 T0.7745,0.0346 Q0.7697,0.0356,0.7664,0.0356 Q0.764,0.0356,0.7603,0.0341 T0.7534,0.0326 Q0.751,0.0326,0.7478,0.0336 Q0.7429,0.0346,0.7397,0.0356 T0.7344,0.0376 T0.7283,0.0401 T0.7178,0.0425 Q0.6926,0.0465,0.6878,0.0495 Q0.6845,0.0514,0.6764,0.0514 L0.6723,0.0514 L0.6691,0.0514 Q0.6602,0.0514,0.6602,0.0554 Q0.6602,0.0574,0.6659,0.0579 T0.6796,0.0589 T0.691,0.0603 T0.6967,0.0643 T0.7072,0.0673 Q0.7121,0.0682,0.7153,0.0682 T0.7238,0.0678 T0.7332,0.0673 Q0.7413,0.0673,0.7579,0.0692 T0.7818,0.0742 Q0.7867,0.0752,0.8171,0.0762 T0.8508,0.0781 L0.852,0.0781 T0.8601,0.0776 T0.8719,0.0772 Q0.8832,0.0772,0.8921,0.0791 Q0.8994,0.0811,0.8994,0.0841 T0.8933,0.0895 T0.8812,0.094 T0.8735,0.0959 T0.8451,0.1014 T0.8143,0.1068 Q0.7989,0.1068,0.7818,0.1098 Q0.7778,0.1108,0.7745,0.1108 T0.768,0.1103 T0.7603,0.1088 T0.7518,0.1068 L0.7461,0.1068 Q0.7315,0.1068,0.7088,0.1103 T0.6805,0.1177 Q0.6756,0.1207,0.6699,0.1207 Q0.6667,0.1207,0.6545,0.1177 T0.631,0.1147 Q0.6269,0.1137,0.6225,0.1133 T0.616,0.1128 L0.6123,0.1128 T0.6103,0.1133 L0.6083,0.1157 T0.6034,0.1197 Q0.5961,0.1246,0.5921,0.1246 Q0.5904,0.1246,0.5835,0.1231 T0.5693,0.1217 L0.5661,0.1217 Q0.558,0.1217,0.5535,0.1231 T0.5446,0.1266 T0.5345,0.1296 Q0.5126,0.1316,0.4882,0.1316 T0.438,0.1405 Q0.4298,0.1434,0.425,0.1434 Q0.4209,0.1434,0.4173,0.1419 T0.4112,0.1405 T0.4027,0.1419 T0.3869,0.1434 Q0.3682,0.1434,0.3512,0.1494 Q0.3398,0.1533,0.3333,0.1533 Q0.3285,0.1533,0.3228,0.1513 L0.3212,0.1513 Q0.3179,0.1513,0.3155,0.1538 T0.3131,0.1592 Q0.3131,0.1612,0.3147,0.1632 Q0.3171,0.1652,0.3232,0.1667 T0.3406,0.1691 T0.3544,0.1701 L0.3601,0.1701 L0.3678,0.1701 L0.3771,0.1701 Q0.3909,0.1701,0.4031,0.1731 Q0.4177,0.178,0.4558,0.178 Q0.4793,0.178,0.4882,0.1761 L0.4915,0.1761 Q0.498,0.1761,0.5061,0.179 T0.5158,0.183 Q0.5166,0.183,0.5231,0.1835 T0.5341,0.1845 T0.545,0.1855 T0.5572,0.1874 T0.5661,0.1909 Q0.5677,0.1919,0.5702,0.1919 T0.5791,0.1894 T0.588,0.1869 Q0.5921,0.1869,0.5945,0.1899 Q0.5977,0.1919,0.6123,0.1919 Q0.6334,0.1919,0.6448,0.1879 Q0.6488,0.186,0.6537,0.186 Q0.6626,0.186,0.6784,0.1909 T0.6983,0.1958 Q0.704,0.1968,0.7206,0.1973 T0.7506,0.1993 T0.7689,0.2018 L0.7705,0.2018 L0.7741,0.2018 L0.7786,0.2018 Q0.8248,0.2018,0.8475,0.2136 Q0.8597,0.2196,0.8597,0.2255 T0.8483,0.2359 T0.8281,0.2404 Q0.8208,0.2404,0.7534,0.2493 Q0.7502,0.2502,0.7425,0.2512 T0.7287,0.2532 T0.7178,0.2542 L0.7153,0.2542 L0.7137,0.2542 Q0.7064,0.2542,0.6906,0.2591 T0.6715,0.2681 T0.6626,0.272 Q0.6594,0.272,0.6541,0.2705 T0.6464,0.269 T0.6431,0.27 Q0.6318,0.273,0.6034,0.276 Q0.6018,0.276,0.5998,0.2774 T0.5957,0.2799 T0.5904,0.2809 L0.5856,0.2809 Q0.5823,0.2799,0.575,0.2799 Q0.541,0.2799,0.5239,0.2868 Q0.5134,0.2908,0.5028,0.2908 Q0.4996,0.2908,0.4935,0.2903 T0.4842,0.2898 Q0.4704,0.2898,0.4635,0.2918 T0.4534,0.2997 L0.4534,0.3007 Q0.4534,0.3037,0.459,0.3046 T0.4753,0.3066 T0.4899,0.3076 Q0.4907,0.3076,0.5166,0.3106 T0.5507,0.3155 Q0.5921,0.3264,0.605,0.3264 Q0.6107,0.3264,0.6131,0.3254 Q0.6212,0.3225,0.6294,0.3225 Q0.6407,0.3225,0.6513,0.3274 Q0.6529,0.3294,0.6569,0.3294 Q0.6594,0.3294,0.665,0.3284 T0.6748,0.3274 T0.6821,0.3284 Q0.6861,0.3294,0.6967,0.3299 T0.7165,0.3314 T0.7299,0.3343 Q0.7324,0.3363,0.7486,0.3383 T0.7697,0.3422 Q0.7713,0.3432,0.7774,0.3452 T0.7887,0.3492 T0.8005,0.3546 T0.8127,0.3625 T0.8208,0.3719 Q0.8256,0.3798,0.8256,0.3848 Q0.8256,0.3877,0.8236,0.3902 T0.8171,0.3976 T0.809,0.4075 T0.8021,0.4189 T0.7968,0.4273 T0.7867,0.4322 T0.7616,0.4382 Q0.7543,0.4392,0.7437,0.4392 L0.7364,0.4392 L0.7299,0.4392 Q0.7202,0.4392,0.7161,0.4402 Q0.7072,0.4431,0.691,0.4431 L0.6845,0.4431 L0.6788,0.4431 Q0.6707,0.4431,0.6545,0.4461 T0.6334,0.452 Q0.6399,0.456,0.6626,0.457 Q0.6878,0.458,0.7024,0.4639 Q0.7064,0.4649,0.7186,0.4649 L0.7295,0.4649 L0.7413,0.4649 Q0.7591,0.4649,0.7697,0.4669 Q0.7818,0.4688,0.7818,0.4728 Q0.7818,0.4748,0.7798,0.4763 T0.7753,0.4787 L0.7737,0.4797 L0.7729,0.4797 Q0.7494,0.4827,0.7388,0.4827 Q0.7332,0.4827,0.7307,0.4817 L0.7291,0.4817 Q0.7226,0.4817,0.6878,0.4896 Q0.6829,0.4906,0.6772,0.4911 T0.6618,0.4921 T0.646,0.4931 T0.6342,0.4936 T0.6212,0.4931 T0.6115,0.4926 Q0.6083,0.4926,0.6058,0.4931 T0.5969,0.4955 T0.5819,0.499 T0.5629,0.5005 Q0.5572,0.5005,0.5527,0.501 T0.545,0.502 T0.5397,0.503 T0.5361,0.5045 T0.5337,0.5064 T0.5328,0.5094 L0.532,0.5094 Q0.532,0.5104,0.5337,0.5109 T0.5381,0.5114 T0.5438,0.5119 T0.5515,0.5124 L0.5604,0.5124 Q0.5661,0.5134,0.5746,0.5153 T0.5912,0.5173 L0.5977,0.5173 L0.6026,0.5173 Q0.6139,0.5173,0.6273,0.5218 T0.6407,0.5272 Q0.6448,0.5282,0.6683,0.5321 T0.6991,0.5381 Q0.7137,0.543,0.7664,0.548 Q0.7908,0.55,0.7908,0.5559 Q0.7908,0.5589,0.7859,0.5628 Q0.781,0.5658,0.7713,0.5658 Q0.7689,0.5658,0.7628,0.5653 T0.7543,0.5648 T0.7502,0.5658 Q0.7364,0.5678,0.6878,0.5678 Q0.674,0.5678,0.6699,0.5668 L0.6683,0.5668 Q0.6659,0.5668,0.6606,0.5678 T0.6513,0.5687 Q0.6464,0.5687,0.6391,0.5678 Q0.6334,0.5668,0.6302,0.5668 T0.6241,0.5687 T0.6164,0.5717 Q0.6123,0.5727,0.6099,0.5727 L0.6062,0.5727 T0.6022,0.5732 T0.5953,0.5737 Q0.5904,0.5747,0.5839,0.5747 T0.5726,0.5752 T0.5629,0.5776 T0.5458,0.5796 Q0.5418,0.5796,0.5324,0.5791 T0.5191,0.5786 Q0.5077,0.5786,0.5045,0.5806 Q0.498,0.5836,0.4899,0.5836 Q0.4858,0.5836,0.4777,0.5826 T0.4655,0.5816 L0.4631,0.5816 Q0.4582,0.5816,0.4436,0.5841 T0.4144,0.5865 L0.4051,0.5865 L0.3986,0.5865 T0.3933,0.587 T0.3897,0.5875 T0.3869,0.5885 T0.3844,0.5895 T0.3812,0.591 T0.3779,0.5925 Q0.3739,0.5955,0.3633,0.5955 L0.3585,0.5955 L0.3536,0.5955 Q0.3277,0.5955,0.3066,0.6053 Q0.3017,0.6083,0.296,0.6083 Q0.2912,0.6083,0.2839,0.6068 T0.2741,0.6053 Q0.2693,0.6053,0.2547,0.6048 T0.236,0.6044 Q0.2222,0.6044,0.193,0.6103 L0.1882,0.6103 Q0.1825,0.6103,0.1703,0.6083 T0.1525,0.6063 L0.15,0.6063 Q0.1436,0.6063,0.135,0.6073 T0.1168,0.6098 T0.1038,0.6113 Q0.0973,0.6123,0.0787,0.6123 L0.06,0.6123 L0.0414,0.6123 L0.0235,0.6123 Q0.0049,0.6133,0.0049,0.6172 L0.0057,0.6222 Q0.0073,0.6261,0.043,0.6261 L0.0454,0.6261 L0.0479,0.6261 Q0.0527,0.6261,0.0633,0.6281 T0.0803,0.6301 L0.0835,0.6301 L0.0916,0.6301 Q0.0998,0.6301,0.129,0.632 Q0.1768,0.636,0.206,0.64 Q0.2117,0.6409,0.2165,0.6409 Q0.2206,0.6409,0.2263,0.6405 T0.2336,0.64 L0.2384,0.64 L0.2409,0.64 T0.251,0.6395 T0.2644,0.639 Q0.2741,0.639,0.279,0.6409 Q0.283,0.6429,0.2972,0.6439 T0.3293,0.6459 T0.3528,0.6469 L0.3577,0.6469 Q0.3642,0.6469,0.3723,0.6449 T0.3844,0.6429 Q0.3901,0.6429,0.3933,0.6454 T0.4006,0.6479 Q0.4088,0.6479,0.4517,0.6558 Q0.4582,0.6568,0.4623,0.6568 Q0.4655,0.6568,0.4716,0.6563 T0.4826,0.6558 L0.4882,0.6558 Q0.5004,0.6558,0.5255,0.6607 Q0.5328,0.6627,0.5604,0.6647 T0.6152,0.6682 T0.644,0.6696 T0.6719,0.6721 T0.7056,0.6756 Q0.7113,0.6756,0.7198,0.6805 T0.738,0.6855 Q0.7453,0.6855,0.7551,0.6879 T0.7741,0.6939 T0.7912,0.7018 T0.8029,0.7102 Q0.8054,0.7132,0.8054,0.7151 Q0.8054,0.7191,0.8009,0.7216 T0.7908,0.7255 T0.779,0.7285 T0.7721,0.731 Q0.7672,0.7329,0.7632,0.7339 T0.7551,0.7354 T0.7486,0.7369 Q0.7478,0.7369,0.7445,0.7379 T0.7388,0.7394 T0.7324,0.7404 L0.7242,0.7413 T0.7161,0.7418 Q0.7105,0.7418,0.6955,0.7428 T0.6748,0.7438 L0.6699,0.7438 L0.6667,0.7438 Q0.6659,0.7438,0.6407,0.7468 Q0.6367,0.7478,0.6334,0.7478 T0.6245,0.7468 T0.6148,0.7458 L0.6099,0.7458 Q0.6018,0.7468,0.5864,0.7498 T0.5653,0.7532 T0.5596,0.7557 Q0.5596,0.7596,0.571,0.7616 Q0.5742,0.7626,0.5803,0.7631 T0.5929,0.7641 T0.6018,0.7656 L0.6087,0.7656 T0.6192,0.7666 T0.6277,0.7695 Q0.631,0.7705,0.6342,0.7705 Q0.6383,0.7705,0.6452,0.7685 T0.6537,0.7666 L0.6553,0.7666 Q0.6602,0.7666,0.6711,0.769 T0.6853,0.7715 Q0.691,0.7715,0.7048,0.775 T0.7242,0.7814 Q0.7324,0.7854,0.7445,0.7864 Q0.7478,0.7864,0.768,0.7873 T0.7972,0.7893 Q0.7989,0.7893,0.8017,0.7898 T0.8054,0.7903 L0.8082,0.7903 T0.811,0.7908 T0.8131,0.7913 T0.8151,0.7918 L0.8167,0.7928 T0.8179,0.7943 T0.8191,0.7957 T0.8204,0.7977 T0.8208,0.8002 Q0.8208,0.8032,0.8171,0.8051 T0.8074,0.8081 T0.7997,0.8091 Q0.7932,0.8121,0.7737,0.8121 Q0.7664,0.8121,0.7413,0.8111 L0.7364,0.8111 Q0.7275,0.8111,0.7214,0.8121 T0.7084,0.8155 T0.6991,0.819 Q0.6934,0.82,0.6723,0.8205 T0.6472,0.8239 Q0.6423,0.8269,0.6375,0.8269 Q0.6358,0.8269,0.6338,0.8264 T0.6294,0.8254 T0.6253,0.8249 Q0.6042,0.8249,0.5961,0.8289 Q0.5921,0.8318,0.5839,0.8318 Q0.5783,0.8318,0.5645,0.8299 L0.5604,0.8299 Q0.5531,0.8299,0.5337,0.8368 Q0.5296,0.8378,0.5255,0.8378 Q0.5239,0.8378,0.5195,0.8373 T0.5118,0.8368 Q0.5061,0.8368,0.4996,0.8388 Q0.4947,0.8388,0.4882,0.8398 Q0.4777,0.8417,0.4753,0.8427 T0.4728,0.8467 Q0.4728,0.8487,0.4769,0.8492 T0.4886,0.8501 T0.5004,0.8516 Q0.5036,0.8516,0.515,0.8521 T0.5345,0.8546 Q0.5426,0.8556,0.5596,0.8556 L0.5649,0.8556 L0.5702,0.8556 L0.5791,0.8556 Q0.5921,0.8566,0.6135,0.8571 T0.6383,0.8586 Q0.6683,0.8615,0.6764,0.8615 L0.6776,0.8615 L0.6788,0.8615 Q0.7032,0.8615,0.7032,0.8684 Q0.7032,0.8714,0.6995,0.8749 T0.6959,0.8803 L0.6959,0.8813 Q0.6991,0.8843,0.7153,0.8843 Q0.7218,0.8843,0.7259,0.8833 L0.7299,0.8833 Q0.7324,0.8833,0.7348,0.8838 T0.7393,0.8848 T0.7433,0.8863 L0.7474,0.8882 T0.751,0.8892 Q0.7616,0.8922,0.7948,0.8952 Q0.7981,0.8952,0.8082,0.8981 T0.8297,0.9011 T0.8528,0.9026 T0.8747,0.907 T0.8856,0.9149 L0.8856,0.9159 Q0.8856,0.9179,0.8848,0.9189 T0.8828,0.9209 T0.88,0.9228 T0.8767,0.9243 T0.8731,0.9248 T0.8698,0.9253 T0.8666,0.9258 L0.8646,0.9258 Q0.8621,0.9258,0.8577,0.9263 T0.85,0.9268 T0.8439,0.9273 T0.8402,0.9278 Q0.8386,0.9298,0.8358,0.9308 T0.8305,0.9322 T0.8244,0.9332 T0.8183,0.9337 Q0.8135,0.9347,0.8025,0.9372 T0.7859,0.9416 Q0.7778,0.9436,0.7717,0.9471 T0.7624,0.9515 Q0.7575,0.9535,0.7486,0.9535 Q0.7461,0.9535,0.7397,0.953 T0.7291,0.9525 Q0.7234,0.9525,0.7186,0.953 T0.7137,0.957 T0.7194,0.9614 Q0.7567,0.9634,0.7664,0.9654 Q0.7745,0.9674,0.7762,0.9674 L0.7908,0.9674 Q0.7924,0.9664,0.7948,0.9664 Q0.8029,0.9664,0.8082,0.9679 T0.8224,0.9723 T0.8362,0.9773 Q0.8483,0.9812,0.871,0.9812 L0.8751,0.9812 Q0.8873,0.9812,0.8929,0.9822 T0.9165,0.9876 T0.9408,0.9931 Q0.9513,0.996,0.9935,0.996 Z M0.9968,0.998 L0.9976,0.003 Q0.9838,0.002,0.9708,0.0059 Q0.9659,0.0069,0.9327,0.0059 T0.8881,0.0099 Q0.8767,0.0138,0.8658,0.0163 T0.8491,0.0218 Q0.8418,0.0247,0.8341,0.0247 T0.8232,0.0257 Q0.8191,0.0277,0.7997,0.0292 T0.7737,0.0326 Q0.7697,0.0336,0.7672,0.0336 T0.7612,0.0321 T0.7543,0.0307 T0.747,0.0317 Q0.7397,0.0326,0.7336,0.0356 T0.717,0.0406 Q0.6918,0.0445,0.6861,0.0475 Q0.6845,0.0485,0.6772,0.0485 T0.6638,0.05 T0.6577,0.0549 T0.6642,0.0598 T0.6796,0.0613 T0.6902,0.0623 Q0.691,0.0623,0.6946,0.0658 T0.7064,0.0702 L0.7161,0.0702 Q0.7194,0.0702,0.7242,0.0697 T0.7332,0.0692 Q0.7413,0.0692,0.7579,0.0717 T0.781,0.0762 Q0.7867,0.0781,0.8171,0.0786 T0.85,0.0801 L0.8532,0.0801 Q0.8548,0.0801,0.8613,0.0796 T0.8727,0.0791 Q0.8832,0.0791,0.8913,0.0811 Q0.897,0.0831,0.897,0.0851 Q0.897,0.088,0.8873,0.0905 T0.8735,0.093 Q0.871,0.093,0.8447,0.0984 T0.8143,0.1039 Q0.7981,0.1039,0.781,0.1078 Q0.7778,0.1088,0.7745,0.1088 T0.7644,0.1073 T0.7518,0.1048 L0.7453,0.1048 Q0.7299,0.1048,0.7076,0.1083 T0.6788,0.1157 Q0.6748,0.1187,0.6699,0.1187 Q0.6675,0.1187,0.6557,0.1157 T0.6318,0.1118 Q0.6164,0.1108,0.6135,0.1108 T0.6095,0.1113 T0.6067,0.1142 T0.6018,0.1187 Q0.5953,0.1227,0.5921,0.1227 Q0.5904,0.1227,0.5839,0.1212 T0.5693,0.1187 L0.5661,0.1187 Q0.558,0.1187,0.5527,0.1207 T0.5434,0.1246 T0.5337,0.1266 Q0.5126,0.1296,0.4882,0.1296 T0.4371,0.1385 Q0.4298,0.1414,0.425,0.1414 Q0.4225,0.1414,0.4189,0.1395 T0.4112,0.1375 Q0.4079,0.1375,0.4019,0.1395 T0.3869,0.1414 Q0.3682,0.1414,0.3504,0.1474 Q0.3398,0.1513,0.3333,0.1513 Q0.3293,0.1513,0.3228,0.1494 L0.3204,0.1494 Q0.3179,0.1494,0.3155,0.1508 T0.3118,0.1543 T0.3106,0.1592 T0.3127,0.1642 T0.32,0.1677 T0.3305,0.1701 T0.3435,0.1716 T0.3544,0.1721 Q0.3569,0.1731,0.3601,0.1731 Q0.3625,0.1731,0.3686,0.1726 T0.3779,0.1721 Q0.3901,0.1721,0.4023,0.1751 Q0.4177,0.18,0.455,0.18 Q0.4793,0.18,0.4882,0.178 L0.4915,0.178 Q0.4964,0.178,0.5045,0.1815 T0.5158,0.185 Q0.5564,0.1889,0.5645,0.1929 Q0.5677,0.1939,0.571,0.1939 Q0.575,0.1939,0.5807,0.1919 T0.5888,0.1899 T0.5929,0.1909 Q0.5969,0.1949,0.6123,0.1949 Q0.6334,0.1949,0.6456,0.1899 Q0.6488,0.1879,0.6537,0.1879 Q0.661,0.1879,0.6772,0.1929 T0.6983,0.1978 Q0.704,0.1988,0.7206,0.1998 T0.7502,0.2018 T0.7664,0.2038 Q0.7672,0.2038,0.7818,0.2043 T0.8151,0.2067 T0.8459,0.2156 Q0.8573,0.2206,0.8573,0.2255 Q0.8573,0.2295,0.8516,0.2324 T0.8394,0.2369 T0.8281,0.2384 Q0.8208,0.2384,0.7526,0.2473 Q0.7494,0.2483,0.7421,0.2493 T0.7287,0.2512 T0.7178,0.2522 L0.7153,0.2522 L0.7137,0.2522 Q0.7056,0.2522,0.6898,0.2572 T0.6691,0.2671 Q0.6667,0.269,0.6634,0.269 Q0.661,0.269,0.6557,0.2681 T0.6472,0.2671 Q0.6448,0.2671,0.6415,0.2681 Q0.631,0.271,0.6034,0.274 Q0.5994,0.274,0.5961,0.2765 T0.5904,0.2789 L0.5864,0.2789 Q0.5831,0.2779,0.5742,0.2779 Q0.541,0.2779,0.5223,0.2849 Q0.5126,0.2888,0.5028,0.2888 Q0.5004,0.2888,0.4943,0.2883 T0.4842,0.2878 Q0.4704,0.2878,0.4627,0.2898 T0.4509,0.2987 Q0.4501,0.2997,0.4501,0.3007 Q0.4501,0.3046,0.4574,0.3066 T0.4765,0.3091 T0.4899,0.3096 Q0.4931,0.3106,0.5061,0.3121 T0.5316,0.315 T0.5499,0.3175 Q0.5507,0.3175,0.5572,0.3195 T0.5685,0.3225 T0.5803,0.3254 T0.5933,0.3279 T0.605,0.3284 T0.6148,0.3274 Q0.6221,0.3244,0.6294,0.3244 Q0.6399,0.3244,0.6496,0.3294 Q0.6529,0.3314,0.6577,0.3314 Q0.6602,0.3314,0.6663,0.3304 T0.6756,0.3294 T0.6813,0.3304 Q0.6837,0.3304,0.6873,0.3309 L0.6946,0.3318 T0.7024,0.3323 T0.7105,0.3328 T0.7178,0.3338 T0.7238,0.3348 T0.7283,0.3363 Q0.7324,0.3383,0.7482,0.3403 T0.7689,0.3442 Q0.7697,0.3442,0.779,0.3477 T0.794,0.3536 T0.8074,0.3615 T0.8183,0.3729 Q0.8232,0.3808,0.8232,0.3848 Q0.8232,0.3867,0.8216,0.3892 T0.8151,0.3961 T0.8062,0.406 T0.7997,0.4179 T0.7952,0.4263 T0.7855,0.4308 T0.7616,0.4362 Q0.7543,0.4372,0.7445,0.4372 L0.7372,0.4372 L0.7307,0.4372 Q0.7202,0.4372,0.7153,0.4382 Q0.7064,0.4402,0.691,0.4402 L0.6845,0.4402 L0.6788,0.4402 Q0.6699,0.4402,0.6533,0.4436 T0.6318,0.451 Q0.6302,0.451,0.6302,0.452 Q0.6302,0.457,0.6626,0.459 Q0.6869,0.4609,0.7015,0.4659 Q0.7064,0.4669,0.7202,0.4669 L0.7311,0.4669 L0.7429,0.4669 Q0.7599,0.4669,0.7689,0.4688 Q0.7794,0.4708,0.7794,0.4738 L0.7786,0.4748 T0.777,0.4763 T0.7749,0.4773 L0.7737,0.4777 L0.7729,0.4777 Q0.7502,0.4797,0.738,0.4797 L0.7315,0.4797 L0.7291,0.4797 Q0.7226,0.4797,0.6869,0.4876 Q0.6821,0.4886,0.6768,0.4891 T0.6614,0.4901 T0.6456,0.4916 L0.6342,0.4916 Q0.6294,0.4916,0.6217,0.4911 T0.6115,0.4906 Q0.6083,0.4906,0.6054,0.4911 T0.5961,0.4936 T0.5815,0.4965 T0.5629,0.4985 Q0.5507,0.4985,0.5442,0.4995 T0.5345,0.5025 T0.5304,0.5084 L0.5296,0.5094 Q0.5296,0.5114,0.5316,0.5124 T0.5373,0.5138 T0.5442,0.5143 L0.5523,0.5143 L0.5604,0.5143 Q0.5637,0.5153,0.5677,0.5158 T0.5742,0.5173 T0.5811,0.5188 T0.5904,0.5193 L0.5977,0.5193 L0.6026,0.5193 Q0.6107,0.5193,0.6168,0.5208 T0.6294,0.5252 T0.6399,0.5292 Q0.6448,0.5302,0.6679,0.5341 T0.6983,0.541 Q0.7129,0.545,0.7664,0.55 Q0.7883,0.5519,0.7883,0.5559 Q0.7883,0.5579,0.7843,0.5608 T0.7721,0.5638 Q0.7697,0.5638,0.764,0.5633 T0.7559,0.5628 L0.7502,0.5628 Q0.7364,0.5648,0.6869,0.5648 L0.6699,0.5648 L0.6675,0.5648 Q0.665,0.5648,0.6602,0.5658 T0.6513,0.5668 Q0.6464,0.5668,0.6399,0.5658 Q0.6342,0.5648,0.6302,0.5648 T0.6225,0.5668 T0.6156,0.5697 Q0.6107,0.5707,0.6087,0.5707 T0.6034,0.5712 T0.5953,0.5717 Q0.5904,0.5727,0.5835,0.5727 T0.5718,0.5732 T0.562,0.5757 Q0.558,0.5767,0.5483,0.5767 L0.5349,0.5767 L0.5207,0.5767 Q0.5069,0.5767,0.5028,0.5786 Q0.4972,0.5816,0.4899,0.5816 Q0.4858,0.5816,0.4781,0.5806 T0.4663,0.5796 L0.4631,0.5796 Q0.4582,0.5796,0.4432,0.5821 T0.4144,0.5846 L0.4071,0.5846 L0.4011,0.5846 T0.3958,0.5851 T0.3921,0.5856 T0.3889,0.5861 T0.3865,0.5865 T0.384,0.5875 L0.382,0.5885 L0.3796,0.5895 L0.3771,0.5905 Q0.3731,0.5925,0.365,0.5925 L0.3601,0.5925 L0.3552,0.5925 Q0.3277,0.5925,0.3049,0.6044 Q0.3017,0.6053,0.296,0.6053 Q0.292,0.6053,0.2847,0.6044 T0.2741,0.6034 Q0.2693,0.6034,0.2547,0.6029 T0.236,0.6024 Q0.2222,0.6024,0.1922,0.6073 Q0.1906,0.6083,0.1882,0.6083 Q0.1833,0.6083,0.1711,0.6063 T0.1533,0.6044 Q0.1517,0.6034,0.1492,0.6034 Q0.1436,0.6034,0.135,0.6048 T0.1168,0.6078 T0.103,0.6093 Q0.0973,0.6103,0.0787,0.6103 L0.0604,0.6103 L0.0414,0.6103 L0.0235,0.6103 Q0.0024,0.6113,0.0024,0.6172 Q0.0024,0.6192,0.0032,0.6231 Q0.0049,0.6281,0.0333,0.6281 L0.0414,0.6281 L0.0479,0.6281 Q0.0519,0.6281,0.0624,0.6301 T0.0803,0.632 L0.0835,0.632 L0.0916,0.632 Q0.0989,0.632,0.1281,0.634 L0.206,0.6419 Q0.2117,0.6429,0.2174,0.6429 Q0.2214,0.6429,0.2271,0.6424 T0.2344,0.6419 L0.2376,0.6419 Q0.2393,0.6429,0.2417,0.6429 T0.2526,0.6419 T0.2652,0.6409 Q0.2741,0.6409,0.2782,0.6429 T0.2968,0.6459 T0.3293,0.6479 T0.352,0.6489 Q0.3552,0.6499,0.3585,0.6499 Q0.365,0.6499,0.3731,0.6474 T0.3844,0.6449 Q0.3885,0.6449,0.3917,0.6474 T0.4006,0.6499 Q0.4088,0.6499,0.4509,0.6578 Q0.4574,0.6588,0.4631,0.6588 Q0.4655,0.6588,0.4716,0.6583 T0.4834,0.6578 L0.4874,0.6578 Q0.5004,0.6588,0.5255,0.6637 Q0.532,0.6647,0.56,0.6667 T0.6148,0.6701 T0.644,0.6716 Q0.6464,0.6726,0.6594,0.6736 T0.6861,0.6756 T0.7048,0.6775 Q0.7097,0.6775,0.7186,0.6825 T0.738,0.6874 Q0.7518,0.6874,0.7729,0.6958 T0.8005,0.7122 Q0.8029,0.7141,0.8029,0.7151 Q0.8029,0.7191,0.7968,0.7216 T0.7818,0.726 T0.7705,0.729 L0.764,0.731 T0.7583,0.7324 T0.753,0.7334 T0.7486,0.7349 Q0.7251,0.7399,0.7161,0.7399 Q0.7097,0.7399,0.6951,0.7409 T0.6748,0.7418 L0.6703,0.7418 L0.6667,0.7418 Q0.6659,0.7418,0.6399,0.7448 L0.6334,0.7448 Q0.631,0.7448,0.6249,0.7443 T0.6148,0.7438 L0.6099,0.7438 Q0.601,0.7448,0.5856,0.7473 T0.5645,0.7507 Q0.5572,0.7517,0.5572,0.7547 T0.5616,0.7606 T0.5702,0.7646 Q0.5734,0.7646,0.5779,0.7651 T0.5864,0.7661 T0.5949,0.7671 T0.6018,0.7676 L0.6071,0.7676 T0.6135,0.7681 T0.62,0.769 T0.6269,0.771 T0.6342,0.7725 Q0.6391,0.7725,0.6464,0.7705 T0.6541,0.7685 L0.6553,0.7685 Q0.6586,0.7685,0.6699,0.771 T0.6853,0.7735 Q0.6902,0.7735,0.704,0.777 T0.7226,0.7834 Q0.7315,0.7873,0.7445,0.7883 Q0.747,0.7883,0.7676,0.7893 T0.7972,0.7913 Q0.7989,0.7913,0.8017,0.7918 T0.8058,0.7923 T0.809,0.7928 T0.8114,0.7933 T0.8131,0.7938 T0.8147,0.7943 T0.8159,0.7953 L0.8171,0.7967 T0.8175,0.7982 Q0.8183,0.7992,0.8183,0.8002 Q0.8183,0.8022,0.8155,0.8032 T0.807,0.8051 T0.7989,0.8071 Q0.7932,0.8091,0.7737,0.8091 L0.7413,0.8091 L0.7372,0.8091 Q0.7275,0.8091,0.721,0.8101 T0.7072,0.8136 T0.6983,0.817 Q0.6942,0.818,0.6825,0.818 T0.6602,0.819 T0.6456,0.822 Q0.6415,0.8249,0.6375,0.8249 Q0.6367,0.8249,0.6326,0.8239 T0.6253,0.8229 Q0.6034,0.8229,0.5953,0.8279 Q0.5912,0.8289,0.5848,0.8289 Q0.5775,0.8289,0.5645,0.8279 Q0.5629,0.8269,0.5604,0.8269 Q0.5523,0.8269,0.5328,0.8348 Q0.5296,0.8358,0.5264,0.8358 Q0.5247,0.8358,0.5203,0.8353 T0.5126,0.8348 Q0.5061,0.8348,0.4988,0.8358 Q0.4947,0.8368,0.4882,0.8378 Q0.4826,0.8388,0.4797,0.8388 T0.474,0.8398 T0.4704,0.8422 T0.4696,0.8462 T0.472,0.8501 T0.4781,0.8521 T0.4854,0.8526 L0.4935,0.8526 T0.4996,0.8536 Q0.5036,0.8536,0.515,0.8546 T0.5337,0.8566 Q0.5426,0.8576,0.5596,0.8576 L0.5657,0.8576 L0.571,0.8576 L0.5791,0.8576 Q0.5921,0.8586,0.6135,0.8591 T0.6383,0.8605 Q0.6683,0.8635,0.6764,0.8635 Q0.6999,0.8635,0.6999,0.8684 Q0.6999,0.8694,0.6967,0.8734 T0.6934,0.8803 L0.6934,0.8823 Q0.6951,0.8863,0.7137,0.8863 Q0.7218,0.8863,0.7267,0.8853 L0.7299,0.8853 Q0.734,0.8853,0.7409,0.8882 T0.7502,0.8912 Q0.7607,0.8942,0.794,0.8971 Q0.7972,0.8971,0.8078,0.9001 T0.8297,0.9031 Q0.8475,0.9031,0.8646,0.9065 T0.8824,0.9149 L0.8824,0.9159 Q0.8824,0.9169,0.882,0.9179 T0.8808,0.9194 L0.8792,0.9204 T0.8767,0.9214 T0.8743,0.9224 T0.8715,0.9228 L0.8686,0.9228 T0.8662,0.9233 T0.8637,0.9238 L0.8556,0.9238 T0.8447,0.9243 T0.8386,0.9268 Q0.837,0.9278,0.835,0.9288 T0.8305,0.9303 T0.8244,0.9308 T0.8175,0.9318 Q0.8127,0.9327,0.8017,0.9352 T0.7851,0.9397 Q0.777,0.9416,0.7705,0.9451 T0.7616,0.9496 Q0.7575,0.9505,0.7494,0.9505 L0.7405,0.9505 L0.7307,0.9505 Q0.7234,0.9505,0.7178,0.9515 Q0.7145,0.9515,0.7125,0.9535 T0.7105,0.9575 Q0.7105,0.9624,0.7194,0.9634 Q0.7567,0.9654,0.7664,0.9674 Q0.7745,0.9693,0.7762,0.9693 L0.7908,0.9693 L0.7948,0.9693 Q0.8005,0.9693,0.8058,0.9698 T0.8143,0.9718 T0.824,0.9753 T0.8354,0.9792 Q0.8483,0.9832,0.871,0.9832 L0.8739,0.9832 L0.8767,0.9832 Q0.8873,0.9832,0.8921,0.9842 Q0.8978,0.9852,0.9157,0.9896 T0.94,0.996 Q0.9424,0.996,0.9469,0.9965 T0.9566,0.997 T0.9676,0.9975 T0.9781,0.998 L0.9874,0.998 L0.9943,0.998 L0.9968,0.998 Z",type:0}},"\uE0CC":{type:5,data:{d:"M1,0.5071 L0.8623,0.7102 L0.5865,0.7102 L0.4489,0.5071 L0.5865,0.3045 L0.8623,0.3045 Z M0.4135,0.7974 L0.2758,1 L0,1 L0,0.5944 L0.2758,0.5944 Z M0.4135,0.2026 L0.2758,0.4056 L0,0.4056 L0,0 L0.2758,0 Z",type:0}},"\uE0CD":{type:5,data:{d:"M0.9726,0.5071 L0.8451,0.3184 L0.59,0.3184 L0.4624,0.5071 L0.59,0.6955 L0.8451,0.6955 Z M1,0.5071 L0.8588,0.716 L0.5768,0.716 L0.4355,0.5071 L0.5768,0.2982 L0.8588,0.2982 Z M0.401,0.7911 L0.2735,0.6028 L0.0236,0.6028 L0.0236,0.9799 L0.2735,0.9799 Z M0.4284,0.7911 L0.2872,1 L0,1 L0,0.5826 L0.2872,0.5826 Z M0.401,0.2089 L0.2735,0.0201 L0.0236,0.0201 L0.0236,0.3972 L0.2735,0.3972 Z M0.4284,0.2089 L0.2872,0.4174 L0,0.4174 L0,0 L0.2872,0 Z",type:0}},"\uE0CE":{type:5,data:{d:"M1,0.4996 Q1,0.5365,0.9924,0.568 T0.9718,0.6177 T0.9433,0.6363 L0.9425,0.6367 Q0.9355,0.6367,0.9285,0.6326 L0.9308,0.6326 Q0.9129,0.6195,0.9013,0.587 T0.8871,0.5164 T0.8943,0.4373 T0.9254,0.3687 L0.9254,0.3691 Q0.9339,0.3628,0.9425,0.3628 Q0.9584,0.3628,0.9716,0.3811 T0.9924,0.431 T1,0.4996 Z M0.9234,0.6321 L0.8776,0.7169 Q0.8791,0.732,0.8791,0.7441 Q0.8791,0.781,0.8716,0.8123 T0.8508,0.862 T0.8224,0.8809 L0.8216,0.8809 Q0.8154,0.8809,0.8092,0.8775 L0.8088,0.8775 Q0.7905,0.8633,0.7792,0.8297 T0.766,0.7571 T0.775,0.6768 T0.8088,0.6086 L0.7431,0.6065 Q0.719,0.6313,0.7072,0.6705 T0.6965,0.7487 T0.7097,0.823 T0.7423,0.8763 L0.7913,0.8775 L0.7314,0.9895 L0.4648,0.5038 L0.7299,0.0176 L0.7882,0.1229 L0.7404,0.1212 Q0.7244,0.138,0.7136,0.1617 T0.6982,0.2108 T0.6943,0.2632 T0.7003,0.3144 T0.7159,0.3586 T0.7396,0.3909 L0.8072,0.3926 Q0.7894,0.3796,0.7777,0.3479 T0.7635,0.2789 T0.7697,0.2011 T0.7987,0.1326 Q0.8092,0.1225,0.8204,0.1225 Q0.8321,0.1225,0.8426,0.1332 T0.8609,0.1623 T0.8731,0.2062 T0.8776,0.2592 Q0.8776,0.268,0.8768,0.2815 L0.9219,0.3628 L0.8644,0.3612 Q0.8403,0.3855,0.8284,0.4247 T0.8177,0.5029 T0.8309,0.5772 T0.8632,0.6305 Z M0.6759,0.6384 Q0.6576,0.625,0.6457,0.5914 T0.6319,0.5185 T0.6407,0.4375 T0.6751,0.3691 L0.609,0.367 Q0.5849,0.3918,0.5731,0.431 T0.5626,0.509 T0.5758,0.5833 T0.6082,0.6367 Z M0.6459,0.0025 L0.391,0.4551 L0.0035,0.4551 L0.246,0 Z M0.6553,1 L0.2421,1 L0,0.5449 L0.3875,0.5449 Z",type:0}},"\uE0CF":{type:5,data:{d:"M0.4996,0 Q0.5562,0,0.5961,0.0166 T0.6364,0.0566 L0.6368,0.0575 Q0.6368,0.0646,0.6324,0.0713 L0.6324,0.0692 Q0.6196,0.0868,0.5872,0.0986 T0.5166,0.1128 T0.4373,0.1057 T0.3689,0.0747 L0.3694,0.0747 Q0.3627,0.0663,0.3627,0.0575 Q0.3627,0.0336,0.4028,0.0168 T0.4996,0 Z M0.6324,0.0768 L0.717,0.1225 Q0.7321,0.1212,0.744,0.1212 Q0.8007,0.1212,0.8406,0.1378 T0.8809,0.1779 L0.8813,0.1783 Q0.8813,0.1846,0.8778,0.1909 Q0.8636,0.2093,0.8299,0.2208 T0.7573,0.2343 T0.6769,0.2253 T0.6089,0.1913 L0.6067,0.2567 Q0.6315,0.281,0.6707,0.2928 T0.7489,0.3035 T0.8231,0.2903 T0.8764,0.258 L0.8778,0.2085 L0.9898,0.2685 L0.504,0.5352 L0.0177,0.2701 L0.1227,0.2118 L0.1213,0.2596 Q0.1457,0.2836,0.1851,0.2955 T0.2635,0.3062 T0.3377,0.293 T0.3911,0.2605 L0.3928,0.193 Q0.38,0.2106,0.3483,0.2221 T0.2792,0.2364 T0.2013,0.2303 T0.1324,0.2013 Q0.1222,0.1909,0.1222,0.1795 Q0.1222,0.156,0.1623,0.1393 T0.2591,0.1225 Q0.2679,0.1225,0.2817,0.1233 L0.3627,0.078 L0.3609,0.1359 Q0.3857,0.1598,0.4249,0.1718 T0.5031,0.1825 T0.5773,0.1693 T0.6306,0.1367 Z M0.6386,0.3242 Q0.6253,0.3427,0.5917,0.3544 T0.5186,0.3683 T0.4376,0.3595 T0.3689,0.3251 L0.3671,0.3909 Q0.3915,0.4148,0.4309,0.4268 T0.5093,0.4375 T0.5835,0.4243 T0.6368,0.3918 Z M0.0027,0.354 L0.4553,0.6091 L0.4553,0.9962 L0,0.7542 Z M1,0.3448 L1,0.7576 L0.5447,1 L0.5447,0.6128 Z",type:0}},"\uE0D0":{type:5,data:{d:"M0,0.7699 Q0,0.7172,0.0277,0.6731 T0.103,0.6032 T0.2066,0.5774 Q0.2487,0.5774,0.2865,0.5922 T0.3526,0.6339 L0.3935,0.6715 Q0.4218,0.6984,0.438,0.7336 T0.4541,0.8075 Q0.4541,0.8602,0.4264,0.9046 T0.3511,0.9745 T0.2475,1 Q0.2054,1,0.1676,0.9852 T0.1016,0.9435 L0.0606,0.9059 Q0.0317,0.879,0.0159,0.8438 T0,0.7699 Z M0.5459,0.7699 Q0.5459,0.7172,0.5736,0.6731 T0.6489,0.6032 T0.7525,0.5774 Q0.7946,0.5774,0.8324,0.5922 T0.8984,0.6339 L0.9394,0.6715 Q0.9579,0.6892,0.9714,0.7105 T0.9925,0.7567 T1,0.8075 Q1,0.8602,0.9723,0.9046 T0.897,0.9745 T0.7934,1 Q0.7513,1,0.7135,0.9852 T0.6474,0.9435 L0.6065,0.9059 Q0.5776,0.879,0.5617,0.8438 T0.5459,0.7699 Z M0,0.1925 Q0,0.1398,0.0277,0.0957 T0.103,0.0258 T0.2066,0 Q0.2487,0,0.2865,0.0148 T0.3526,0.0565 L0.3935,0.0941 Q0.4218,0.121,0.438,0.1562 T0.4541,0.2301 Q0.4541,0.2828,0.4264,0.3269 T0.3511,0.3968 T0.2475,0.4226 Q0.2054,0.4226,0.1676,0.4078 T0.1016,0.3661 L0.0606,0.3285 Q0.0317,0.3016,0.0159,0.2664 T0,0.1925 Z M0.5459,0.1925 Q0.5459,0.1398,0.5736,0.0957 T0.6489,0.0258 T0.7525,0 Q0.7946,0,0.8324,0.0148 T0.8984,0.0565 L0.9394,0.0941 Q0.9677,0.121,0.9838,0.1562 T1,0.2301 Q1,0.2828,0.9723,0.3269 T0.897,0.3968 T0.7934,0.4226 Q0.7513,0.4226,0.7135,0.4078 T0.6474,0.3661 L0.6065,0.3285 Q0.5874,0.3108,0.5741,0.2895 T0.5534,0.2433 T0.5459,0.1925 Z M0.3301,0.6403 Q0.3306,0.6403,0.3312,0.6409 L0.3272,0.6371 L0.3272,0.6371 Z M0.8759,0.6403 Q0.8765,0.6403,0.8771,0.6409 Q0.8748,0.6387,0.8725,0.6371 L0.8731,0.6371 Z M0.3301,0.0629 Q0.3306,0.0629,0.3312,0.0634 L0.3272,0.0597 L0.3272,0.0602 Z M0.8759,0.0629 Q0.8765,0.0629,0.8771,0.0634 Q0.8748,0.0613,0.8725,0.0597 Q0.8731,0.0597,0.8731,0.0602 Z M0.779,0.4113 L0.7501,0.3849 Q0.7046,0.3844,0.6636,0.3661 Q0.7132,0.407,0.779,0.4113 Z M0.7957,0.4118 Q0.8477,0.4113,0.8918,0.3874 T0.9619,0.3223 T0.9885,0.2323 L0.9585,0.2048 Q0.9538,0.2769,0.8987,0.3282 T0.7657,0.3844 Z M0.9879,0.2167 Q0.9827,0.1554,0.9388,0.1097 Q0.9585,0.1478,0.959,0.1898 Z M0.2331,0.4113 L0.2043,0.3849 Q0.1587,0.3844,0.1177,0.3661 Q0.1673,0.407,0.2331,0.4113 Z M0.2499,0.4118 Q0.2885,0.4118,0.324,0.3973 T0.3852,0.3589 T0.4264,0.3019 T0.4426,0.2323 L0.4126,0.2048 Q0.408,0.2769,0.3529,0.3282 T0.2198,0.3844 Z M0.442,0.2167 Q0.4368,0.1554,0.393,0.1097 Q0.4126,0.1478,0.4132,0.1903 Z M0.779,0.9887 L0.7501,0.9624 Q0.7046,0.9618,0.6636,0.9435 Q0.7132,0.9844,0.779,0.9887 Z M0.7957,0.9892 Q0.8477,0.9887,0.8918,0.9648 T0.9619,0.8997 T0.9885,0.8097 L0.9585,0.7823 Q0.9538,0.8543,0.8987,0.9056 T0.7657,0.9618 Z M0.9879,0.7941 Q0.9827,0.7328,0.9388,0.6871 Q0.9585,0.7253,0.959,0.7672 Z M0.2331,0.9887 L0.2043,0.9624 Q0.1587,0.9618,0.1177,0.9435 Q0.1673,0.9844,0.2331,0.9887 Z M0.2499,0.9892 Q0.3018,0.9887,0.3459,0.9648 T0.416,0.8997 T0.4426,0.8102 L0.4126,0.7823 Q0.408,0.8543,0.3529,0.9056 T0.2198,0.9618 Z M0.442,0.7941 Q0.4368,0.7328,0.393,0.6871 Q0.4126,0.7253,0.4132,0.7672 Z M0.3191,0.6452 Q0.2943,0.622,0.2643,0.6091 T0.2066,0.5962 Q0.1795,0.5962,0.1497,0.6091 T0.0949,0.6441 T0.0537,0.6995 T0.0375,0.7699 Q0.0375,0.8419,0.0941,0.8941 Q0.1189,0.9172,0.1489,0.9304 T0.2066,0.9435 Q0.2337,0.9435,0.2634,0.9304 T0.3182,0.8952 T0.3595,0.8398 T0.3756,0.7699 Q0.3756,0.6978,0.3191,0.6452 Z M0.026,0.7731 L0.026,0.7699 Q0.026,0.6935,0.0854,0.6376 Q0.0658,0.6538,0.0514,0.6739 T0.0289,0.718 T0.0202,0.7677 Z M0.0271,0.7892 L0.0208,0.7833 Q0.0254,0.8419,0.0681,0.886 Q0.0664,0.8828,0.0646,0.879 Q0.0329,0.8382,0.0271,0.7892 Z M0.3866,0.7823 Q0.382,0.8511,0.3278,0.9016 Q0.3843,0.8565,0.3918,0.7871 Z M0.3872,0.7677 L0.393,0.7726 L0.393,0.7699 Q0.393,0.7349,0.3791,0.7038 Q0.3739,0.6973,0.3681,0.6914 Q0.3866,0.7274,0.3872,0.7677 Z M0.865,0.6452 Q0.8402,0.622,0.8102,0.6091 T0.7525,0.5962 Q0.7305,0.5962,0.7072,0.6043 T0.6619,0.628 T0.6223,0.6642 T0.5941,0.7124 T0.5834,0.7699 Q0.5834,0.8419,0.6399,0.8941 Q0.6561,0.9097,0.6757,0.9207 T0.7149,0.9376 T0.7525,0.9435 Q0.7796,0.9435,0.8093,0.9304 T0.8641,0.8952 T0.9054,0.8398 T0.9215,0.7699 Q0.9215,0.6978,0.865,0.6452 Z M0.5718,0.7731 L0.5718,0.7699 Q0.5718,0.6935,0.6313,0.6376 Q0.6013,0.6618,0.584,0.6954 T0.5661,0.7677 Z M0.573,0.7892 L0.5666,0.7833 Q0.5713,0.8419,0.614,0.886 Q0.6122,0.8828,0.6105,0.879 Q0.5788,0.8382,0.573,0.7892 Z M0.9325,0.7823 Q0.9279,0.8511,0.8736,0.9016 Q0.9308,0.8565,0.9377,0.7871 Z M0.9331,0.7672 L0.9388,0.7726 L0.9388,0.7699 Q0.9388,0.7349,0.925,0.7038 Q0.9198,0.6973,0.914,0.6914 Q0.9325,0.7274,0.9331,0.7672 Z M0.3191,0.0677 Q0.2943,0.0446,0.2643,0.0317 T0.2066,0.0188 Q0.1795,0.0188,0.1497,0.0317 T0.0949,0.0667 T0.0537,0.122 T0.0375,0.1925 Q0.0375,0.2645,0.0941,0.3167 Q0.1189,0.3398,0.1489,0.353 T0.2066,0.3661 Q0.2337,0.3661,0.2634,0.353 T0.3182,0.3177 T0.3595,0.2624 T0.3756,0.1925 Q0.3756,0.1204,0.3191,0.0677 Z M0.026,0.1957 L0.026,0.1925 Q0.026,0.1161,0.0854,0.0602 Q0.0554,0.0844,0.0381,0.118 T0.0202,0.1903 Z M0.0271,0.2118 L0.0208,0.2059 Q0.0254,0.2645,0.0681,0.3086 Q0.0664,0.3054,0.0646,0.3016 Q0.0329,0.2608,0.0271,0.2118 Z M0.3866,0.2048 Q0.382,0.2737,0.3278,0.3242 Q0.3849,0.279,0.3918,0.2097 Z M0.3872,0.1903 L0.393,0.1952 L0.393,0.1925 Q0.393,0.1581,0.3791,0.1263 Q0.3739,0.1199,0.3681,0.114 Q0.3866,0.15,0.3872,0.1903 Z M0.865,0.0677 Q0.8402,0.0446,0.8102,0.0317 T0.7525,0.0188 Q0.7253,0.0188,0.6956,0.0317 T0.6408,0.0667 T0.5995,0.122 T0.5834,0.1925 Q0.5834,0.2645,0.6399,0.3167 Q0.6647,0.3398,0.6947,0.353 T0.7525,0.3661 Q0.7796,0.3661,0.8093,0.353 T0.8641,0.3177 T0.9054,0.2624 T0.9215,0.1925 Q0.9215,0.1204,0.865,0.0677 Z M0.5718,0.1957 L0.5718,0.1925 Q0.5718,0.1161,0.6313,0.0602 Q0.6013,0.0844,0.584,0.118 T0.5661,0.1903 Z M0.573,0.2118 L0.5666,0.2059 Q0.5713,0.2645,0.614,0.3086 Q0.6122,0.3054,0.6105,0.3016 Q0.5788,0.2608,0.573,0.2118 Z M0.9325,0.2048 Q0.9279,0.2737,0.8736,0.3242 Q0.9308,0.279,0.9377,0.2097 Z M0.9331,0.1898 L0.9388,0.1952 L0.9388,0.1925 Q0.9388,0.1575,0.925,0.1263 Q0.9198,0.1199,0.914,0.114 Q0.9325,0.15,0.9331,0.1898 Z",type:0}},"\uE0D1":{type:5,data:{d:"M0.7639,0.1974 L0.9593,0.1974 L0.9593,0.1443 L0.7639,0.1443 L0.7639,0.1974 Z M0.7586,0.109 L0.9727,0.109 Q0.9839,0.109,0.992,0.1153 T1,0.1291 L1,0.382 Q1,0.3906,0.9912,0.3964 T0.9727,0.4021 L0.7586,0.4021 Q0.7468,0.4021,0.739,0.3956 T0.7313,0.382 L0.7313,0.1291 Q0.7313,0.1246,0.7339,0.1207 T0.7406,0.1143 T0.7495,0.1104 T0.7586,0.109 Z M0.7639,0.6575 L0.9593,0.6575 L0.9593,0.6044 L0.7639,0.6044 L0.7639,0.6575 Z M0.7313,0.8347 L0.7313,0.5843 Q0.7313,0.5757,0.7401,0.5699 T0.7586,0.5641 L0.9706,0.5641 Q0.9818,0.5641,0.9898,0.5705 T0.9979,0.5843 L0.9979,0.8347 Q0.9979,0.8433,0.989,0.8491 T0.9706,0.8549 L0.7586,0.8549 Q0.7468,0.8549,0.739,0.8483 T0.7313,0.8347 Z M0,1 L0,0 L0.7607,0 L0.7607,1 L0,1 Z",type:0}},"\uE0D2":{type:5,data:{d:"M0.9764,0.0029 L0.3179,0.4552 L0,0.4552 L0,0 Z M1,1 L0,1 L0,0.5448 L0.3091,0.5448 Z",type:0}},"\uE0D4":{type:5,data:{d:"M0.0236,0.0029 L0.6824,0.4552 L1,0.4552 L1,0 Z M0,1 L1,1 L1,0.5448 L0.6912,0.5448 Z",type:0}},"\uEE00":{type:3,data:"M0,0 L1,0 L1,.05 L.1,.05 L.1,.95 L1,.95 L1,1 L0,1 Z"},"\uEE01":{type:3,data:"M0,0 L1,0 L1,.05 L0,.05 Z M0,.95 L1,.95 L1,1 L0,1 Z"},"\uEE02":{type:3,data:"M1,0 L0,0 L0,.05 L.9,.05 L.9,.95 L0,.95 L0,1 L1,1 Z"},"\uEE03":{type:3,data:"M0,0 L1,0 L1,.05 L.1,.05 L.1,.95 L1,.95 L1,1 L0,1 Z M.25,.15 L1,.15 L1,.85 L.25,.85 Z"},"\uEE04":{type:3,data:"M0,0 L1,0 L1,.05 L0,.05 Z M0,.95 L1,.95 L1,1 L0,1 Z M0,.15 L1,.15 L1,.85 L0,.85 Z"},"\uEE05":{type:3,data:"M1,0 L0,0 L0,.05 L.9,.05 L.9,.95 L0,.95 L0,1 L1,1 Z M0,.15 L.75,.15 L.75,.85 L0,.85 Z"},"\uEE06":{type:5,data:{d:"M0.6574,0.303 Q0.623,0.291,0.5852,0.285 T0.5082,0.279 T0.4311,0.285 T0.359,0.303 L0.3082,0.248 Q0.3525,0.232,0.4041,0.2235 T0.5082,0.215 T0.6123,0.2235 T0.7082,0.248 Z",type:0},scaleType:1},"\uEE07":{type:5,data:{d:"M0.8557,0.582 L0.7656,0.551 Q0.7852,0.53,0.7951,0.507 T0.8049,0.46 Q0.8049,0.424,0.782,0.3905 T0.718,0.332 T0.6221,0.293 T0.5082,0.279 L0.5082,0.215 Q0.5607,0.215,0.6123,0.2235 T0.709,0.248 T0.7918,0.287 T0.8557,0.3375 T0.8959,0.3965 T0.9098,0.46 T0.8959,0.5235 T0.8557,0.582 Z",type:0},scaleType:1},"\uEE08":{type:5,data:{d:"M0.5082,0.705 Q0.482,0.705,0.4557,0.703 T0.4049,0.697 L0.4311,0.635 Q0.4508,0.638,0.4697,0.6395 T0.5082,0.641 Q0.5672,0.641,0.6221,0.627 T0.718,0.588 T0.782,0.5295 T0.8049,0.46 Q0.8049,0.436,0.7951,0.413 T0.7656,0.369 L0.8557,0.338 Q0.882,0.365,0.8959,0.3965 T0.9098,0.46 T0.8959,0.5235 T0.8557,0.5825 T0.7918,0.633 T0.709,0.672 T0.6123,0.6965 T0.5082,0.705 Z",type:0},scaleType:1},"\uEE09":{type:5,data:{d:"M0.5082,0.705 Q0.4557,0.705,0.4041,0.6965 T0.3074,0.672 T0.2246,0.633 T0.1607,0.5825 T0.1205,0.5235 T0.1066,0.46 L0.2115,0.46 Q0.2115,0.496,0.2344,0.5295 T0.2984,0.588 T0.3943,0.627 T0.5082,0.641 T0.6221,0.627 T0.718,0.588 T0.782,0.5295 T0.8049,0.46 L0.9098,0.46 Q0.9098,0.492,0.8959,0.5235 T0.8557,0.5825 T0.7918,0.633 T0.709,0.672 T0.6123,0.6965 T0.5082,0.705 Z",type:0},scaleType:1},"\uEE0A":{type:5,data:{d:"M0.5082,0.705 Q0.4557,0.705,0.4041,0.6965 T0.3074,0.672 T0.2246,0.633 T0.1607,0.5825 T0.1205,0.5235 T0.1066,0.46 T0.1205,0.3965 T0.1607,0.338 L0.2508,0.369 Q0.2311,0.39,0.2213,0.413 T0.2115,0.46 Q0.2115,0.496,0.2344,0.5295 T0.2984,0.588 T0.3943,0.627 T0.5082,0.641 Q0.5279,0.641,0.5467,0.6395 T0.5852,0.635 L0.6115,0.697 Q0.5869,0.701,0.5607,0.703 T0.5082,0.705 Z",type:0},scaleType:1},"\uEE0B":{type:5,data:{d:"M0.1607,0.582 Q0.1344,0.555,0.1205,0.5235 T0.1066,0.46 T0.1205,0.3965 T0.1607,0.3375 T0.2246,0.287 T0.3074,0.248 T0.4041,0.2235 T0.5082,0.215 L0.5082,0.279 Q0.4492,0.279,0.3943,0.293 T0.2984,0.332 T0.2344,0.3905 T0.2115,0.46 Q0.2115,0.484,0.2213,0.507 T0.2508,0.551 Z",type:0},scaleType:1},"\uF5D0":i2.LINE_H,"\uF5D1":i2.LINE_V,"\uF5D2":i2.FADE_RIGHT,"\uF5D3":i2.FADE_LEFT,"\uF5D4":i2.FADE_DOWN,"\uF5D5":i2.FADE_UP,"\uF5D6":i2.CURVE_DOWN_RIGHT,"\uF5D7":i2.CURVE_DOWN_LEFT,"\uF5D8":i2.CURVE_UP_RIGHT,"\uF5D9":i2.CURVE_UP_LEFT,"\uF5DA":[i2.LINE_V,i2.CURVE_UP_RIGHT],"\uF5DB":[i2.LINE_V,i2.CURVE_DOWN_RIGHT],"\uF5DC":[i2.CURVE_DOWN_RIGHT,i2.CURVE_UP_RIGHT],"\uF5DD":[i2.LINE_V,i2.CURVE_UP_LEFT],"\uF5DE":[i2.LINE_V,i2.CURVE_DOWN_LEFT],"\uF5DF":[i2.CURVE_DOWN_LEFT,i2.CURVE_UP_LEFT],"\uF5E0":[i2.LINE_H,i2.CURVE_DOWN_LEFT],"\uF5E1":[i2.LINE_H,i2.CURVE_DOWN_RIGHT],"\uF5E2":[i2.CURVE_DOWN_LEFT,i2.CURVE_DOWN_RIGHT],"\uF5E3":[i2.LINE_H,i2.CURVE_UP_LEFT],"\uF5E4":[i2.LINE_H,i2.CURVE_UP_RIGHT],"\uF5E5":[i2.CURVE_UP_LEFT,i2.CURVE_UP_RIGHT],"\uF5E6":[i2.LINE_V,i2.CURVE_UP_LEFT,i2.CURVE_UP_RIGHT],"\uF5E7":[i2.LINE_V,i2.CURVE_DOWN_LEFT,i2.CURVE_DOWN_RIGHT],"\uF5E8":[i2.LINE_H,i2.CURVE_DOWN_LEFT,i2.CURVE_UP_LEFT],"\uF5E9":[i2.LINE_H,i2.CURVE_DOWN_RIGHT,i2.CURVE_UP_RIGHT],"\uF5EA":[i2.LINE_V,i2.CURVE_DOWN_RIGHT,i2.CURVE_UP_LEFT],"\uF5EB":[i2.LINE_V,i2.CURVE_DOWN_LEFT,i2.CURVE_UP_RIGHT],"\uF5EC":[i2.LINE_H,i2.CURVE_DOWN_RIGHT,i2.CURVE_UP_LEFT],"\uF5ED":[i2.LINE_H,i2.CURVE_DOWN_LEFT,i2.CURVE_UP_RIGHT],"\uF5EE":[i2.NODE_FILL,i2.NODE_STROKE],"\uF5EF":i2.NODE_STROKE,"\uF5F0":[i2.NODE_FILL,i2.NODE_STROKE,i2.NODE_LINE_RIGHT],"\uF5F1":[i2.NODE_STROKE,i2.NODE_LINE_RIGHT],"\uF5F2":[i2.NODE_FILL,i2.NODE_STROKE,i2.NODE_LINE_LEFT],"\uF5F3":[i2.NODE_STROKE,i2.NODE_LINE_LEFT],"\uF5F4":[i2.NODE_FILL,i2.NODE_STROKE,i2.NODE_LINE_LEFT,i2.NODE_LINE_RIGHT],"\uF5F5":[i2.NODE_STROKE,i2.NODE_LINE_LEFT,i2.NODE_LINE_RIGHT],"\uF5F6":[i2.NODE_FILL,i2.NODE_STROKE,i2.NODE_LINE_DOWN],"\uF5F7":[i2.NODE_STROKE,i2.NODE_LINE_DOWN],"\uF5F8":[i2.NODE_FILL,i2.NODE_STROKE,i2.NODE_LINE_UP],"\uF5F9":[i2.NODE_STROKE,i2.NODE_LINE_UP],"\uF5FA":[i2.NODE_FILL,i2.NODE_STROKE,i2.NODE_LINE_DOWN,i2.NODE_LINE_UP],"\uF5FB":[i2.NODE_STROKE,i2.NODE_LINE_DOWN,i2.NODE_LINE_UP],"\uF5FC":[i2.NODE_FILL,i2.NODE_STROKE,i2.NODE_LINE_DOWN,i2.NODE_LINE_RIGHT],"\uF5FD":[i2.NODE_STROKE,i2.NODE_LINE_DOWN,i2.NODE_LINE_RIGHT],"\uF5FE":[i2.NODE_FILL,i2.NODE_STROKE,i2.NODE_LINE_DOWN,i2.NODE_LINE_LEFT],"\uF5FF":[i2.NODE_STROKE,i2.NODE_LINE_DOWN,i2.NODE_LINE_LEFT],"\uF600":[i2.NODE_FILL,i2.NODE_STROKE,i2.NODE_LINE_UP,i2.NODE_LINE_RIGHT],"\uF601":[i2.NODE_STROKE,i2.NODE_LINE_UP,i2.NODE_LINE_RIGHT],"\uF602":[i2.NODE_FILL,i2.NODE_STROKE,i2.NODE_LINE_UP,i2.NODE_LINE_LEFT],"\uF603":[i2.NODE_STROKE,i2.NODE_LINE_UP,i2.NODE_LINE_LEFT],"\uF604":[i2.NODE_FILL,i2.NODE_STROKE,i2.NODE_LINE_UP,i2.NODE_LINE_DOWN,i2.NODE_LINE_RIGHT],"\uF605":[i2.NODE_STROKE,i2.NODE_LINE_UP,i2.NODE_LINE_DOWN,i2.NODE_LINE_RIGHT],"\uF606":[i2.NODE_FILL,i2.NODE_STROKE,i2.NODE_LINE_UP,i2.NODE_LINE_DOWN,i2.NODE_LINE_LEFT],"\uF607":[i2.NODE_STROKE,i2.NODE_LINE_UP,i2.NODE_LINE_DOWN,i2.NODE_LINE_LEFT],"\uF608":[i2.NODE_FILL,i2.NODE_STROKE,i2.NODE_LINE_DOWN,i2.NODE_LINE_LEFT,i2.NODE_LINE_RIGHT],"\uF609":[i2.NODE_STROKE,i2.NODE_LINE_DOWN,i2.NODE_LINE_LEFT,i2.NODE_LINE_RIGHT],"\uF60A":[i2.NODE_FILL,i2.NODE_STROKE,i2.NODE_LINE_UP,i2.NODE_LINE_LEFT,i2.NODE_LINE_RIGHT],"\uF60B":[i2.NODE_STROKE,i2.NODE_LINE_UP,i2.NODE_LINE_LEFT,i2.NODE_LINE_RIGHT],"\uF60C":[i2.NODE_FILL,i2.NODE_STROKE,i2.NODE_LINE_UP,i2.NODE_LINE_DOWN,i2.NODE_LINE_LEFT,i2.NODE_LINE_RIGHT],"\uF60D":[i2.NODE_STROKE,i2.NODE_LINE_UP,i2.NODE_LINE_DOWN,i2.NODE_LINE_LEFT,i2.NODE_LINE_RIGHT],"\u{1FB00}":s2(1),"\u{1FB01}":s2(2),"\u{1FB02}":s2(3),"\u{1FB03}":s2(4),"\u{1FB04}":s2(5),"\u{1FB05}":s2(6),"\u{1FB06}":s2(7),"\u{1FB07}":s2(8),"\u{1FB08}":s2(9),"\u{1FB09}":s2(10),"\u{1FB0A}":s2(11),"\u{1FB0B}":s2(12),"\u{1FB0C}":s2(13),"\u{1FB0D}":s2(14),"\u{1FB0E}":s2(15),"\u{1FB0F}":s2(16),"\u{1FB10}":s2(17),"\u{1FB11}":s2(18),"\u{1FB12}":s2(19),"\u{1FB13}":s2(20),"\u{1FB14}":s2(22),"\u{1FB15}":s2(23),"\u{1FB16}":s2(24),"\u{1FB17}":s2(25),"\u{1FB18}":s2(26),"\u{1FB19}":s2(27),"\u{1FB1A}":s2(28),"\u{1FB1B}":s2(29),"\u{1FB1C}":s2(30),"\u{1FB1D}":s2(31),"\u{1FB1E}":s2(32),"\u{1FB1F}":s2(33),"\u{1FB20}":s2(34),"\u{1FB21}":s2(35),"\u{1FB22}":s2(36),"\u{1FB23}":s2(37),"\u{1FB24}":s2(38),"\u{1FB25}":s2(39),"\u{1FB26}":s2(40),"\u{1FB27}":s2(41),"\u{1FB28}":s2(43),"\u{1FB29}":s2(44),"\u{1FB2A}":s2(45),"\u{1FB2B}":s2(46),"\u{1FB2C}":s2(47),"\u{1FB2D}":s2(48),"\u{1FB2E}":s2(49),"\u{1FB2F}":s2(50),"\u{1FB30}":s2(51),"\u{1FB31}":s2(52),"\u{1FB32}":s2(53),"\u{1FB33}":s2(54),"\u{1FB34}":s2(55),"\u{1FB35}":s2(56),"\u{1FB36}":s2(57),"\u{1FB37}":s2(58),"\u{1FB38}":s2(59),"\u{1FB39}":s2(60),"\u{1FB3A}":s2(61),"\u{1FB3B}":s2(62),"\u{1FB3C}":{type:3,data:"M0,0.6667 L0,1 L0.5,1 Z"},"\u{1FB3D}":{type:3,data:"M0,0.6667 L0,1 L1,1 Z"},"\u{1FB3E}":{type:3,data:"M0,0.3333 L0,1 L0.5,1 Z"},"\u{1FB3F}":{type:3,data:"M0,0.3333 L0,1 L1,1 Z"},"\u{1FB40}":{type:3,data:"M0,0 L0,1 L0.5,1 Z"},"\u{1FB41}":{type:3,data:"M0,0.3333 L0.5,0 L1,0 L1,1 L0,1 Z"},"\u{1FB42}":{type:3,data:"M0,0.3333 L1,0 L1,1 L0,1 Z"},"\u{1FB43}":{type:3,data:"M0,0.6667 L0.5,0 L1,0 L1,1 L0,1 Z"},"\u{1FB44}":{type:3,data:"M0,0.6667 L1,0 L1,1 L0,1 Z"},"\u{1FB45}":{type:3,data:"M0,1 L0.5,0 L1,0 L1,1 Z"},"\u{1FB46}":{type:3,data:"M0,0.6667 L1,0.3333 L1,1 L0,1 Z"},"\u{1FB47}":{type:3,data:"M0.5,1 L1,0.6667 L1,1 Z"},"\u{1FB48}":{type:3,data:"M0,1 L1,0.6667 L1,1 Z"},"\u{1FB49}":{type:3,data:"M0.5,1 L1,0.3333 L1,1 Z"},"\u{1FB4A}":{type:3,data:"M0,1 L1,0.3333 L1,1 Z"},"\u{1FB4B}":{type:3,data:"M0.5,1 L1,0 L1,1 Z"},"\u{1FB4C}":{type:3,data:"M0.5,0 L0,0 L0,1 L1,1 L1,0.3333 Z"},"\u{1FB4D}":{type:3,data:"M0,0 L0,1 L1,1 L1,0.3333 Z"},"\u{1FB4E}":{type:3,data:"M0.5,0 L0,0 L0,1 L1,1 L1,0.6667 Z"},"\u{1FB4F}":{type:3,data:"M0,0 L0,1 L1,1 L1,0.6667 Z"},"\u{1FB50}":{type:3,data:"M0.5,0 L0,0 L0,1 L1,1 Z"},"\u{1FB51}":{type:3,data:"M0,0.3333 L0,1 L1,1 L1,0.6667 Z"},"\u{1FB52}":{type:3,data:"M0,0.6667 L0.5,1 L1,1 L1,0 L0,0 Z"},"\u{1FB53}":{type:3,data:"M0,0.6667 L1,1 L1,0 L0,0 Z"},"\u{1FB54}":{type:3,data:"M0,0.3333 L0.5,1 L1,1 L1,0 L0,0 Z"},"\u{1FB55}":{type:3,data:"M0,0.3333 L1,1 L1,0 L0,0 Z"},"\u{1FB56}":{type:3,data:"M0,0 L0.5,1 L1,1 L1,0 Z"},"\u{1FB57}":{type:3,data:"M0,0.3333 L0,0 L0.5,0 Z"},"\u{1FB58}":{type:3,data:"M0,0.3333 L0,0 L1,0 Z"},"\u{1FB59}":{type:3,data:"M0,0.6667 L0,0 L0.5,0 Z"},"\u{1FB5A}":{type:3,data:"M0,0.6667 L0,0 L1,0 Z"},"\u{1FB5B}":{type:3,data:"M0,1 L0,0 L0.5,0 Z"},"\u{1FB5C}":{type:3,data:"M0,0.6667 L0,0 L1,0 L1,0.3333 Z"},"\u{1FB5D}":{type:3,data:"M0.5,1 L0,1 L0,0 L1,0 L1,0.6667 Z"},"\u{1FB5E}":{type:3,data:"M0,1 L0,0 L1,0 L1,0.6667 Z"},"\u{1FB5F}":{type:3,data:"M0.5,1 L0,1 L0,0 L1,0 L1,0.3333 Z"},"\u{1FB60}":{type:3,data:"M0,1 L0,0 L1,0 L1,0.3333 Z"},"\u{1FB61}":{type:3,data:"M0.5,1 L0,1 L0,0 L1,0 Z"},"\u{1FB62}":{type:3,data:"M0.5,0 L1,0 L1,0.3333 Z"},"\u{1FB63}":{type:3,data:"M0,0 L1,0 L1,0.3333 Z"},"\u{1FB64}":{type:3,data:"M0.5,0 L1,0 L1,0.6667 Z"},"\u{1FB65}":{type:3,data:"M0,0 L1,0 L1,0.6667 Z"},"\u{1FB66}":{type:3,data:"M0.5,0 L1,0 L1,1 Z"},"\u{1FB67}":{type:3,data:"M0,0.3333 L1,0.6667 L1,0 L0,0 Z"},"\u{1FB68}":{type:3,data:"M0,0 L1,0 L1,1 L0,1 L0.5,0.5 Z"},"\u{1FB69}":{type:3,data:"M0,0 L0.5,0.5 L1,0 L1,1 L0,1 Z"},"\u{1FB6A}":{type:3,data:"M0,0 L1,0 L0.5,0.5 L1,1 L0,1 Z"},"\u{1FB6B}":{type:3,data:"M0,0 L1,0 L1,1 L0.5,0.5 L0,1 Z"},"\u{1FB6C}":{type:3,data:"M0,0 L0.5,0.5 L0,1 Z"},"\u{1FB6D}":{type:3,data:"M0,0 L1,0 L0.5,0.5 Z"},"\u{1FB6E}":{type:3,data:"M1,0 L1,1 L0.5,0.5 Z"},"\u{1FB6F}":{type:3,data:"M0,1 L1,1 L0.5,0.5 Z"},"\u{1FB70}":{type:0,data:[{x:1,y:0,w:1,h:8}]},"\u{1FB71}":{type:0,data:[{x:2,y:0,w:1,h:8}]},"\u{1FB72}":{type:0,data:[{x:3,y:0,w:1,h:8}]},"\u{1FB73}":{type:0,data:[{x:4,y:0,w:1,h:8}]},"\u{1FB74}":{type:0,data:[{x:5,y:0,w:1,h:8}]},"\u{1FB75}":{type:0,data:[{x:6,y:0,w:1,h:8}]},"\u{1FB76}":{type:0,data:[{x:0,y:1,w:8,h:1}]},"\u{1FB77}":{type:0,data:[{x:0,y:2,w:8,h:1}]},"\u{1FB78}":{type:0,data:[{x:0,y:3,w:8,h:1}]},"\u{1FB79}":{type:0,data:[{x:0,y:4,w:8,h:1}]},"\u{1FB7A}":{type:0,data:[{x:0,y:5,w:8,h:1}]},"\u{1FB7B}":{type:0,data:[{x:0,y:6,w:8,h:1}]},"\u{1FB7C}":{type:0,data:[{x:0,y:0,w:1,h:8},{x:0,y:7,w:8,h:1}]},"\u{1FB7D}":{type:0,data:[{x:0,y:0,w:1,h:8},{x:0,y:0,w:8,h:1}]},"\u{1FB7E}":{type:0,data:[{x:7,y:0,w:1,h:8},{x:0,y:0,w:8,h:1}]},"\u{1FB7F}":{type:0,data:[{x:7,y:0,w:1,h:8},{x:0,y:7,w:8,h:1}]},"\u{1FB80}":{type:0,data:[{x:0,y:0,w:8,h:1},{x:0,y:7,w:8,h:1}]},"\u{1FB81}":{type:0,data:[{x:0,y:0,w:8,h:1},{x:0,y:2,w:8,h:1},{x:0,y:4,w:8,h:1},{x:0,y:7,w:8,h:1}]},"\u{1FB82}":{type:0,data:[{x:0,y:0,w:8,h:2}]},"\u{1FB83}":{type:0,data:[{x:0,y:0,w:8,h:3}]},"\u{1FB84}":{type:0,data:[{x:0,y:0,w:8,h:5}]},"\u{1FB85}":{type:0,data:[{x:0,y:0,w:8,h:6}]},"\u{1FB86}":{type:0,data:[{x:0,y:0,w:8,h:7}]},"\u{1FB87}":{type:0,data:[{x:6,y:0,w:2,h:8}]},"\u{1FB88}":{type:0,data:[{x:5,y:0,w:3,h:8}]},"\u{1FB89}":{type:0,data:[{x:3,y:0,w:5,h:8}]},"\u{1FB8A}":{type:0,data:[{x:2,y:0,w:6,h:8}]},"\u{1FB8B}":{type:0,data:[{x:1,y:0,w:7,h:8}]},"\u{1FB8C}":{type:1,data:[[1,0],[0,1]],clipPath:"M0,0 L0.5,0 L0.5,1 L0,1 Z"},"\u{1FB8D}":{type:1,data:[[1,0],[0,1]],clipPath:"M0.5,0 L1,0 L1,1 L0.5,1 Z"},"\u{1FB8E}":{type:1,data:[[1,0],[0,1]],clipPath:"M0,0 L1,0 L1,0.5 L0,0.5 Z"},"\u{1FB8F}":{type:1,data:[[1,0],[0,1]],clipPath:"M0,0.5 L1,0.5 L1,1 L0,1 Z"},"\u{1FB90}":{type:1,data:[[0,1],[1,0]]},"\u{1FB91}":[{type:1,data:[[0,1],[1,0]],clipPath:"M0,0.5 L1,0.5 L1,1 L0,1 Z"},{type:0,data:[{x:0,y:0,w:8,h:4}]}],"\u{1FB92}":[{type:1,data:[[0,1],[1,0]],clipPath:"M0,0 L1,0 L1,0.5 L0,0.5 Z"},{type:0,data:[{x:0,y:4,w:8,h:4}]}],"\u{1FB94}":[{type:1,data:[[0,1],[1,0]],clipPath:"M0,0 L0.5,0 L0.5,1 L0,1 Z"},{type:0,data:[{x:4,y:0,w:4,h:8}]}],"\u{1FB95}":{type:0,data:[{x:0,y:0,w:2,h:2},{x:4,y:0,w:2,h:2},{x:2,y:2,w:2,h:2},{x:6,y:2,w:2,h:2},{x:0,y:4,w:2,h:2},{x:4,y:4,w:2,h:2},{x:2,y:6,w:2,h:2},{x:6,y:6,w:2,h:2}]},"\u{1FB96}":{type:0,data:[{x:2,y:0,w:2,h:2},{x:6,y:0,w:2,h:2},{x:0,y:2,w:2,h:2},{x:4,y:2,w:2,h:2},{x:2,y:4,w:2,h:2},{x:6,y:4,w:2,h:2},{x:0,y:6,w:2,h:2},{x:4,y:6,w:2,h:2}]},"\u{1FB97}":{type:0,data:[{x:0,y:2,w:8,h:2},{x:0,y:6,w:8,h:2}]},"\u{1FB98}":{type:2,data:"M-0.25,-0.25 L1.25,1.25 M-0.25,0 L1,1.25 M-0.25,0.25 L0.75,1.25 M-0.25,0.5 L0.5,1.25 M0,-0.25 L1.25,1 M0.25,-0.25 L1.25,0.75 M0.5,-0.25 L1.25,0.5 M-0.25,0.75 L0.25,1.25 M0.75,-0.25 L1.25,0.25",strokeWidth:1},"\u{1FB99}":{type:2,data:"M-0.25,0.5 L0.5,-0.25 M-0.25,0.75 L0.75,-0.25 M-0.25,1 L1,-0.25 M-0.25,1.25 L1.25,-0.25 M0,1.25 L1.25,0 M0.25,1.25 L1.25,0.25 M0.5,1.25 L1.25,0.5 M-0.25,0.25 L0.25,-0.25 M0.75,1.25 L1.25,0.75",strokeWidth:1},"\u{1FB9A}":{type:5,data:{d:"M0,0 L.5,.5 L0,1 L1,1 L.5,.5 L1,0",type:0}},"\u{1FB9B}":{type:5,data:{d:"M0,0 L.5,.5 L1,0 L1,1 L.5,.5 L0,1",type:0}},"\u{1FB9C}":{type:1,data:[[1,0],[0,1]],clipPath:"M0,0 L1,0 L0,1 Z"},"\u{1FB9D}":{type:1,data:[[1,0],[0,1]],clipPath:"M0,0 L1,0 L1,1 Z"},"\u{1FB9E}":{type:1,data:[[1,0],[0,1]],clipPath:"M1,0 L1,1 L0,1 Z"},"\u{1FB9F}":{type:1,data:[[1,0],[0,1]],clipPath:"M0,0 L1,1 L0,1 Z"},"\u{1FBA0}":{type:2,data:"M.5,0 L0,.5",strokeWidth:1},"\u{1FBA1}":{type:2,data:"M.5,0 L1,.5",strokeWidth:1},"\u{1FBA2}":{type:2,data:"M0,.5 L.5,1",strokeWidth:1},"\u{1FBA3}":{type:2,data:"M1,.5 L.5,1",strokeWidth:1},"\u{1FBA4}":{type:2,data:"M.5,0 L0,.5 L.5,1",strokeWidth:1},"\u{1FBA5}":{type:2,data:"M.5,0 L1,.5 L.5,1",strokeWidth:1},"\u{1FBA6}":{type:2,data:"M0,.5 L.5,1 L1,.5",strokeWidth:1},"\u{1FBA7}":{type:2,data:"M0,.5 L.5,0 L1,.5",strokeWidth:1},"\u{1FBA8}":{type:2,data:"M.5,0 L0,.5 M1,.5 L.5,1",strokeWidth:1},"\u{1FBA9}":{type:2,data:"M.5,0 L1,.5 M0,.5 L.5,1",strokeWidth:1},"\u{1FBAA}":{type:2,data:"M.5,0 L1,.5 L.5,1 L0,.5",strokeWidth:1},"\u{1FBAB}":{type:2,data:"M.5,0 L0,.5 L.5,1 L1,.5",strokeWidth:1},"\u{1FBAC}":{type:2,data:"M0,.5 L.5,0 L1,.5 L.5,1",strokeWidth:1},"\u{1FBAD}":{type:2,data:"M1,.5 L.5,0 L0,.5 L.5,1",strokeWidth:1},"\u{1FBAE}":{type:2,data:"M.5,0 L1,.5 L.5,1 L0,.5 Z",strokeWidth:1},"\u{1FBAF}":{type:2,data:"M0,.5 L1,.5 M.5,.35 L.5,.65",strokeWidth:1},"\u{1FBB0}":{type:3,data:"M0.1,0.2 L0.1,.8 L.4,.6 L.9,0.6 Z",scaleType:1},"\u{1FBB1}":{type:4,data:{d:"M.1,.525 L.35,.675 L.9,.35",type:1},scaleType:1},"\u{1FBB2}":{type:3,data:"M.29,.27 L0.13,.56 L.22,.59 L.35,0.35 L.67,.35 L.57,.57 L.71,.76 L.22,.76 L.42,1 L.53,.98 L.43,.86 L.9,.86 L.71,.6 L1,.6 L1,.52 L.83,.52 L.92,.36 L1,.36 L1,.27Z M.99,.13 A.12,.12,0,1,1,.75,.13 A.12,.12,0,1,1,.99,.13"},"\u{1FBB3}":{type:3,data:"M0,.27 L.3,.27 L.55,.12 L.63,.18 L.33,.36 L0,.36 M0,.52 L.33,.52 L.59,.89 L.73,.89 L.73,.98 L.53,.98 L.28,.6 L0,.6"},"\u{1FBB4}":{type:4,data:{d:"M.15,.55 L.5,.4 L.5,.45 L.65,.45 L.65,.35 L.85,.35 L.85,.625 L.5,.625 L.5,.7 Z",type:0},scaleType:1},"\u{1FBB5}":[{type:5,data:{d:"M0,0 L1,0 L1,.0625 L0,.0625 Z M0,.9375 L1,.9375 L1,1 L0,1 Z",type:0}},{type:5,data:{d:"M.15,.5 L.5,.35 L.5,.425 L.85,.425 L.85,.575 L.5,.575 L.5,.65 Z",type:0},scaleType:1}],"\u{1FBB6}":[{type:5,data:{d:"M0,0 L1,0 L1,.0625 L0,.0625 Z M0,.9375 L1,.9375 L1,1 L0,1 Z",type:0}},{type:5,data:{d:"M.85,.5 L.5,.35 L.5,.425 L.15,.425 L.15,.575 L.5,.575 L.5,.65 Z",type:0},scaleType:1}],"\u{1FBB7}":[{type:5,data:{d:"M.875,0 L1,0 L1,1 L.875,1 Z",type:0}},{type:5,data:{d:"M.5,.675 L.2,.5 L.35,.5 L.35,.325 L.65,.325 L.65,.5 L.8,.5 Z",type:0},scaleType:1}],"\u{1FBB8}":[{type:5,data:{d:"M.875,0 L1,0 L1,1 L.875,1 Z",type:0}},{type:5,data:{d:"M.5,.325 L.2,.5 L.35,.5 L.35,.675 L.65,.675 L.65,.5 L.8,.5 Z",type:0},scaleType:1}],"\u{1FBB9}":{type:5,data:{d:"M1,.89 L.11,.89 L.11,.37 L.36,.12 L.74,.12 L.96,.34 L1,.34 L1,.405 L.92,.405 L.69,.185 L.41,.185 L.21,.42 L.21,.825 L1,.825 Z",type:0}},"\u{1FBBA}":{type:5,data:{d:"M0,.89 L0,.825 L.78,.825 L.78,.53 L.7,.415 L0,.415 L0,.35 L.75,.35 L.88,.48 L.88,.89 Z",type:0}},"\u{1FBBB}":{type:5,data:{d:"M.31,.275 L.44,.275 L.44,.47 L.05,.47 L.05,.405 L.31,.405 Z M.56,.275 L.69,.275 L.69,.405 L.95,.405 L.95,.47 L.56,.47 Z M.05,.53 L.44,.53 L.44,.725 L.31,.725 L.31,.595 L.05,.595 Z M.56,.53 L.95,.53 L.95,.595 L.69,.595 L.69,.725 L.56,.725 Z",type:0},scaleType:1},"\u{1FBBC}":[{type:3,data:"M0,0 L1,0 L1,1 L0,1 L0,.935 L.885,.935 L.885,.065 L0,.065 Z"},{type:3,data:"M.67,.5 A.17,.085,0,1,1,.33,.5 A.17,.085,0,1,1,.67,.5",scaleType:1}],"\u{1FBBD}":{type:4,data:{d:"M0,0 L.5,.5 L1,0 L1,1 L.5,.5 L0,1 Z",type:1}},"\u{1FBBE}":{type:4,data:{d:"M1,.5 L.5,1",type:1}},"\u{1FBBF}":{type:4,data:{d:"M.5,0 L1,.5 L.5,1 L0,.5 Z",type:1}},"\u{1FBC0}":{type:3,data:"M.16,.445 A.02,.01,0,0,1,.39,.33 L.5,.375 L.61,.33 A.02,.01,0,0,1,.84,.445 L.75,.5 L.84,.555 A.02,.01,0,0,1,.61,.67 L.5,.625 L.39,.67 A.02,.01,0,0,1,.16,.555 L.25,.5 Z M.24,.41 L.39,.5 L.24,.59 L.32,.63 L.5,.555 L.68,.63 L.76,.59 L.61,.5 L.76,.41 L.68,.37 L.5,.445 L.32,.37 Z",scaleType:1},"\u{1FBC1}":{type:3,data:"M0.142308,0.924 Q0.130770,0.924,0.120193,0.922 T0.101924,0.916 T0.089424,0.9065 T0.084616,0.895 V0.025 Q0.084616,0.019,0.089424,0.0135 T0.101924,0.004 T0.120193,-0.002 T0.142308,-0.004 Q0.150000,-0.004,0.157693,-0.003 T0.173078,0.000 L0.430770,0.085 Q0.451924,0.059,0.494232,0.041 T0.587501,0.013 T0.692309,-0.0005 T0.800001,-0.004 H1 V0.055 H0.800001 Q0.771155,0.055,0.742309,0.056 T0.685578,0.060 T0.630770,0.0685 T0.580770,0.0825 T0.543270,0.1045 T0.528847,0.133 V0.647 H0.530770 Q0.596155,0.645,0.659616,0.638 T0.782693,0.6165 T0.893270,0.5805 T1,0.531 V0.623 Q0.934616,0.644,0.880770,0.6595 T0.769232,0.685 T0.650963,0.700 T0.528847,0.707 V0.787 Q0.528847,0.802,0.543270,0.8155 T0.580770,0.8375 T0.630770,0.8515 T0.685578,0.860 T0.742309,0.864 T0.800001,0.865 H1 V0.924 H0.800001 Q0.746155,0.924,0.692309,0.9205 T0.587501,0.907 T0.494232,0.879 T0.430770,0.835 L0.173078,0.920 Q0.165386,0.922,0.157693,0.923 T0.142308,0.924 Z M0.2,0.841 L0.415385,0.770 V0.150 L0.2,0.079 V0.841 Z M1,0.698 Q0.973077,0.694,0.969231,0.6885 T0.965385,0.677 Q0.965385,0.672,0.969231,0.6665 T1,0.657 V0.698 Z"},"\u{1FBC2}":{type:3,data:"M0,0.623 V0.531 Q0.044231,0.512,0.0625,0.4905 T0.092308,0.4465 T0.108654,0.4005 T0.113462,0.354 V0.351 Q0.113462,0.345,0.117308,0.3395 T0.129808,0.3305 T0.148846,0.3245 T0.171154,0.323 H0.501923 Q0.532692,0.323,0.563462,0.3185 T0.617308,0.303 T0.651923,0.2765 T0.663462,0.2435 V0.241 Q0.663462,0.219,0.657692,0.197 T0.639423,0.1545 T0.604808,0.115 T0.549615,0.082 T0.475577,0.0615 T0.392308,0.055 H0 V-0.004 H1 V0.055 H0.667308 Q0.694231,0.071,0.713462,0.09 T0.746154,0.129 T0.766346,0.1705 T0.775,0.213 H1 V0.316 Q0.971154,0.305,0.955769,0.2965 T0.920192,0.2825 T0.876923,0.2745 T0.830769,0.272 H0.773077 Q0.767308,0.297,0.743269,0.319 T0.680769,0.355 T0.595192,0.375 T0.501923,0.381 H0.227308 Q0.223462,0.415,0.211,0.4485 T0.172692,0.5135 T0.108269,0.573 T0,0.623 Z M0.611538,0.924 H0 V0.865 H0.611538 Q0.642308,0.865,0.673077,0.8605 T0.727885,0.845 T0.762308,0.8185 T0.773077,0.787 V0.785 Q0.773077,0.769,0.762308,0.7535 T0.727885,0.727 T0.673077,0.7115 T0.611538,0.707 H0.059615 Q0.048077,0.707,0.037115,0.7045 T0,0.694 V0.653 Q0.026923,0.648,0.037115,0.646 T0.059615,0.644 H0.722692 Q0.753462,0.644,0.784231,0.6395 T0.839038,0.624 T0.873846,0.5975 T0.884615,0.566 V0.564 Q0.884615,0.548,0.873846,0.532 T0.839038,0.5055 T0.784231,0.49 T0.722692,0.4855 H0.392308 Q0.380769,0.4855,0.370192,0.483 T0.351923,0.4765 T0.339423,0.467 T0.334615,0.4555 T0.339423,0.444 T0.351923,0.4345 T0.370192,0.428 T0.392308,0.4255 H0.832692 Q0.855769,0.4255,0.878846,0.4235 T0.922115,0.416 T0.957692,0.4015 T1,0.3815 V0.4685 Q0.975,0.4705,0.966346,0.4725 T0.95,0.4765 Q0.961538,0.4835,0.969231,0.4915 T1,0.5075 V0.6205 Q0.965385,0.6455,0.926923,0.665 T0.84,0.6935 Q0.866923,0.7115,0.877596,0.7345 T0.894231,0.7855 V0.787 Q0.894231,0.815,0.876923,0.8425 T0.820192,0.8895 T0.726923,0.916 T0.611538,0.924 Z"},"\u{1FBC3}":{type:3,data:"M0,0.473 V0.386 Q0.025490,0.378,0.028431,0.3695 T0.031373,0.352 V0.35 Q0.031373,0.342,0.028431,0.333 T0,0.316 V0.213 H0.652941 Q0.684314,0.213,0.715686,0.2085 T0.770588,0.193 T0.804902,0.1665 T0.815686,0.135 V0.133 Q0.815686,0.117,0.804902,0.101 T0.770588,0.0745 T0.715686,0.0595 T0.652941,0.055 H0 V-0.004 H0.652941 Q0.707843,-0.004,0.761765,0.004 T0.856863,0.031 T0.915686,0.0775 T0.933333,0.133 V0.135 Q0.933333,0.163,0.915686,0.1905 T0.856863,0.237 T0.761765,0.264 T0.652941,0.272 H0.109804 Q0.131373,0.29,0.140196,0.31 T0.149020,0.35 V0.352 Q0.149020,0.37,0.142157,0.388 T0.118627,0.4225 T0.076471,0.452 T0,0.473 Z M0,0.625 V0.513 Q0.029412,0.526,0.032353,0.54 T0.035294,0.568 V0.57 Q0.035294,0.584,0.032353,0.598 T0,0.625 Z"},"\u{1FBC4}":{type:3,data:"M0.019231,1.085 V-0.165 H0.980769 V1.085 H0.019231 Z M0.446154,0.527 H0.553846 Q0.553846,0.511,0.5625,0.495 T0.591346,0.466 T0.631731,0.4405 T0.666346,0.4135 T0.688462,0.3825 T0.696154,0.35 Q0.696154,0.33,0.682692,0.311 T0.641346,0.2785 T0.575,0.259 T0.498077,0.253 T0.421154,0.259 T0.356731,0.279 T0.315385,0.3125 T0.301923,0.352 V0.357 H0.409615 V0.354 Q0.409615,0.345,0.414423,0.335 T0.431731,0.318 T0.4625,0.3075 T0.498077,0.304 Q0.517308,0.304,0.534615,0.307 T0.564423,0.3165 T0.582692,0.332 T0.588462,0.35 Q0.588462,0.366,0.572115,0.3805 T0.535577,0.4075 T0.496154,0.4335 T0.465385,0.4625 T0.45,0.4945 T0.446154,0.527 Z M0.5,0.667 Q0.519231,0.667,0.5375,0.664 T0.569231,0.654 T0.588462,0.637 T0.594231,0.617 T0.588462,0.5975 T0.569231,0.581 T0.5375,0.571 T0.5,0.568 T0.4625,0.571 T0.430769,0.581 T0.411538,0.5975 T0.405769,0.617 T0.411538,0.637 T0.430769,0.654 T0.4625,0.664 T0.5,0.667 Z",scaleType:1},"\u{1FBC5}":{type:5,data:{d:"M.44,.425 L.44,.51 L.44,.56 L.19,.685 L.26,.72 L.5,.605 L.74,.72 L.81,.685 L.56,.56 L.56,.51 L.56,.425 Z M.17,.46 L.17,.51 L.83,.51 L.83,.46 Z M.67,.35 C.67,.303,.594,.265,.5,.265 C.406,.265,.33,.303,.33,.35 C.33,.397,.406,.435,.5,.435 C.594,.435,.67,.397,.67,.35 Z M.56,.35 C.56,.3665,.533,.38,.5,.38 C.467,.38,.44,.3665,.44,.35 C.44,.3335,.467,.32,.5,.32 C.533,.32,.56,.3335,.56,.35 Z",type:0},scaleType:1},"\u{1FBC6}":{type:5,data:{d:"M.44,.425 L.44,.46 L.23,.385 L.19,.43 L.44,.51 L.44,.56 L.29,.71 L.38,.735 L.5,.605 L.61,.735 L.7,.71 L.56,.56 L.56,.51 L.81,.43 L.77,.385 L.56,.46 L.56,.425 Z M.67,.35 C.67,.303,.594,.265,.5,.265 C.406,.265,.33,.303,.33,.35 C.33,.397,.406,.435,.5,.435 C.594,.435,.67,.397,.67,.35 Z M.56,.35 C.56,.3665,.533,.38,.5,.38 C.467,.38,.44,.3665,.44,.35 C.44,.3335,.467,.32,.5,.32 C.533,.32,.56,.3335,.56,.35 Z",type:0},scaleType:1},"\u{1FBC7}":{type:5,data:{d:"M.44,.425 L.44,.56 L.29,.71 L.38,.735 L.5,.605 L.74,.72 L.81,.685 L.56,.56 L.56,.425 Z M.18,.53 L.23,.575 L.81,.43 L.77,.385 Z M.67,.35 C.67,.303,.594,.265,.5,.265 C.406,.265,.33,.303,.33,.35 C.33,.397,.406,.435,.5,.435 C.594,.435,.67,.397,.67,.35 Z M.56,.35 C.56,.3665,.533,.38,.5,.38 C.467,.38,.44,.3665,.44,.35 C.44,.3335,.467,.32,.5,.32 C.533,.32,.56,.3335,.56,.35 Z",type:0},scaleType:1},"\u{1FBC8}":{type:5,data:{d:"M.44,.425 L.44,.56 L.19,.685 L.26,.72 L.5,.605 L.62,.735 L.71,.71 L.56,.56 L.56,.425 Z M.23,.385 L.18,.43 L.77,.575 L.81,.53 Z M.67,.35 C.67,.303,.594,.265,.5,.265 C.406,.265,.33,.303,.33,.35 C.33,.397,.406,.435,.5,.435 C.594,.435,.67,.397,.67,.35 Z M.56,.35 C.56,.3665,.533,.38,.5,.38 C.467,.38,.44,.3665,.44,.35 C.44,.3335,.467,.32,.5,.32 C.533,.32,.56,.3335,.56,.35 Z",type:0},scaleType:1},"\u{1FBC9}":{type:5,data:{d:"M.44,.425 L.45,.495 L.15,.645 L.34,.645 L.34,.7 L.44,.7 L.44,.645 L.56,.645 L.56,.7 L.66,.7 L.66,.645 L.84,.645 L.54,.495 L.56,.425 Z M.39,.6 L.5,.55 L.60,.6 Z M.17,.46 L.17,.51 L.83,.51 L.83,.46 Z M.67,.35 C.67,.303,.594,.265,.5,.265 C.406,.265,.33,.303,.33,.35 C.33,.397,.406,.435,.5,.435 C.594,.435,.67,.397,.67,.35 Z M.56,.35 C.56,.3665,.533,.38,.5,.38 C.467,.38,.44,.3665,.44,.35 C.44,.3335,.467,.32,.5,.32 C.533,.32,.56,.3335,.56,.35 Z",type:0},scaleType:1},"\u{1FBCA}":{type:5,data:{d:"M.26,.375 L.5,.255 L.74,.375 L.74,.665 L.5,.55 L.26,.665 Z M.37,.395 L.37,.54 L.5,.475 L.63,.54 L.63,.395 L.5,.33 Z",type:0},scaleType:1},"\u{1FBCB}":{type:5,data:{d:"M.09,.41 L.32,.295 L.5,.375 L.68,.295 L.91,.41 L.75,.5 L.91,.59 L.68,.705 L.5,.625 L.32,.705 L.09,.59 L.25,.5 Z M.24,.41 L.39,.5 L.24,.59 L.32,.63 L.5,.555 L.68,.63 L.76,.59 L.61,.5 L.76,.41 L.68,.37 L.5,.445 L.32,.37 Z",type:0},scaleType:1},"\u{1FBCC}":{type:5,data:{d:"M.55,.305 L.88,.305 L.88,.355 L.65,.355 L.65,.47 L.88,.47 L.88,.52 L.55,.52 Z",type:0},scaleType:1},"\u{1FBCD}":{type:5,data:{d:"M.38,.39 L.5,.33 L.62,.39 L.62,.53 L.5,.47 L.38,.53 Z",type:0},scaleType:1},"\u{1FBCE}":{type:3,data:"M0,0 L0.6667,0 L0.6667,1 L0,1 Z"},"\u{1FBCF}":{type:3,data:"M0,0 L0.3333,0 L0.3333,1 L0,1 Z"},"\u{1FBD0}":{type:2,data:"M1,.5 L0,1",strokeWidth:1},"\u{1FBD1}":{type:2,data:"M1,0 L0,.5",strokeWidth:1},"\u{1FBD2}":{type:2,data:"M0,0 L1,.5",strokeWidth:1},"\u{1FBD3}":{type:2,data:"M0,.5 L1,1",strokeWidth:1},"\u{1FBD4}":{type:2,data:"M0,0 L.5,1",strokeWidth:1},"\u{1FBD5}":{type:2,data:"M.5,0 L1,1",strokeWidth:1},"\u{1FBD6}":{type:2,data:"M1,0 L.5,1",strokeWidth:1},"\u{1FBD7}":{type:2,data:"M.5,0 L0,1",strokeWidth:1},"\u{1FBD8}":{type:2,data:"M0,0 L.5,.5 L1,0",strokeWidth:1},"\u{1FBD9}":{type:2,data:"M1,0 L.5,.5 L1,1",strokeWidth:1},"\u{1FBDA}":{type:2,data:"M0,1 L.5,.5 L1,1",strokeWidth:1},"\u{1FBDB}":{type:2,data:"M0,0 L.5,.5 L0,1",strokeWidth:1},"\u{1FBDC}":{type:2,data:"M0,0 L.5,1 L1,0",strokeWidth:1},"\u{1FBDD}":{type:2,data:"M1,0 L0,.5 L1,1",strokeWidth:1},"\u{1FBDE}":{type:2,data:"M0,1 L.5,0 L1,1",strokeWidth:1},"\u{1FBDF}":{type:2,data:"M0,0 L1,.5 L0,1",strokeWidth:1},"\u{1FBE0}":{type:5,data:{d:"M0,0 C0,.276,.224,.5,.5,.5 C.776,.5,1,.276,1,0",type:1}},"\u{1FBE1}":{type:5,data:{d:"M1,0 C.724,0,.5,.224,.5,.5 C.5,.776,.724,1,1,1",type:1}},"\u{1FBE2}":{type:5,data:{d:"M0,1 C0,.724,.224,.5,.5,.5 C.776,.5,1,.724,1,1",type:1}},"\u{1FBE3}":{type:5,data:{d:"M0,0 C.276,0,.5,.224,.5,.5 C.5,.776,.276,1,0,1",type:1}},"\u{1FBE4}":{type:0,data:[{x:2,y:0,w:4,h:4}]},"\u{1FBE5}":{type:0,data:[{x:2,y:4,w:4,h:4}]},"\u{1FBE6}":{type:0,data:[{x:0,y:2,w:4,h:4}]},"\u{1FBE7}":{type:0,data:[{x:4,y:2,w:4,h:4}]},"\u{1FBE8}":{type:5,data:{d:"M0,0 C0,.276,.224,.5,.5,.5 C.776,.5,1,.276,1,0 Z",type:0}},"\u{1FBE9}":{type:5,data:{d:"M1,0 C.724,0,.5,.224,.5,.5 C.5,.776,.724,1,1,1 Z",type:0}},"\u{1FBEA}":{type:5,data:{d:"M0,1 C0,.724,.224,.5,.5,.5 C.776,.5,1,.724,1,1 Z",type:0}},"\u{1FBEB}":{type:5,data:{d:"M0,0 C.276,0,.5,.224,.5,.5 C.5,.776,.276,1,0,1 Z",type:0}},"\u{1FBEC}":{type:5,data:{d:"M1,0 L.5,0 C.5,.276,.724,.5,1,.5 Z",type:0}},"\u{1FBED}":{type:5,data:{d:"M0,1 L.5,1 C.5,.724,.276,.5,0,.5 Z",type:0}},"\u{1FBEE}":{type:5,data:{d:"M1,1 L1,.5 C.724,.5,.5,.724,.5,1 Z",type:0}},"\u{1FBEF}":{type:5,data:{d:"M0,0 L0,.5 C.276,.5,.5,.276,.5,0 Z",type:0}},"\u{1FBF0}":{type:5,data:{d:r(126),type:0},scaleType:1},"\u{1FBF1}":{type:5,data:{d:r(48),type:0},scaleType:1},"\u{1FBF2}":{type:5,data:{d:r(109),type:0},scaleType:1},"\u{1FBF3}":{type:5,data:{d:r(121),type:0},scaleType:1},"\u{1FBF4}":{type:5,data:{d:r(51),type:0},scaleType:1},"\u{1FBF5}":{type:5,data:{d:r(91),type:0},scaleType:1},"\u{1FBF6}":{type:5,data:{d:r(95),type:0},scaleType:1},"\u{1FBF7}":{type:5,data:{d:r(114),type:0},scaleType:1},"\u{1FBF8}":{type:5,data:{d:r(127),type:0},scaleType:1},"\u{1FBF9}":{type:5,data:{d:r(123),type:0},scaleType:1},"\u{1FBFA}":{type:5,data:{d:"M.5,.175 C.2,.175,.15,.305,.15,.435 L.05,.63 L.35,.63 C.35,.682,.42,.76,.5,.76 C.58,.76,.65,.682,.65,.63 L.95,.63 L.85,.435 C.85,.305,.8,.175,.5,.175 Z",type:0},scaleType:1},...Object.fromEntries(Array.from({length:256},(t3,e3)=>[String.fromCodePoint(10240+e3),{type:6,data:e3}]))},e2.blockPatternCodepoints=new Set([9617,9618,9619,129932,129933,129934,129935,129936,129937,129938,129940,129948,129949,129950,129951])},183(t2,e2,i2){;Object.defineProperty(e2,"__esModule",{value:true}),e2.tryDrawCustomGlyph=function(t3,e3,i3,s3,o2,n2,L2,h2,T2,l2,d,c,_=0){const Q=r.customGlyphDefinitions[e3];if(Q){const e4=Array.isArray(Q)?Q:[Q];for(const r2 of e4)a(t3,r2,i3,s3,o2,n2,L2,h2,T2,l2,d,c,_);return true}return false};const s2=i2(959),r=i2(915);function a(t3,e3,i3,r2,a2,h2,d,c,_,Q,u,p,g=0){let M=a2,y=h2,v=i3,f=r2;switch(1===e3.scaleType&&(M=d,y=c,v=i3+(a2-d)/2,f=r2+(h2-c)/2),e3.clipPath&&(t3.save(),(function(t4,e4,i4,s3,r3,a3){t4.beginPath();for(const o2 of e4.split(" ")){const e5=o2[0];if("Z"===e5){t4.closePath();continue}const n2=o2.substring(1).split(",");if(!n2[0]||!n2[1])continue;const L2=i4+parseFloat(n2[0])*r3,h3=s3+parseFloat(n2[1])*a3;"M"===e5?t4.moveTo(L2,h3):"L"===e5&&t4.lineTo(L2,h3)}t4.clip()})(t3,e3.clipPath,v,f,M,y)),e3.type){case 0:!(function(t4,e4,i4,s3,r3,a3){for(let o2=0;o2<e4.length;o2++){const n2=e4[o2],L2=r3/8,h3=a3/8;t4.fillRect(i4+n2.x*L2,s3+n2.y*h3,n2.w*L2,n2.h*h3)}})(t3,e3.data,v,f,M,y);break;case 1:!(function(t4,e4,i4,r3,a3,o2,n2=0){let h3=L.get(e4);h3||(h3=new Map,L.set(e4,h3));const T2=t4.fillStyle;if("string"!=typeof T2)throw new Error(`Unexpected fillStyle type "${T2}"`);let l2=h3.get(T2);if(!l2){const i5=e4[0].length,r4=e4.length,a4=t4.canvas.ownerDocument.createElement("canvas");a4.width=i5,a4.height=r4;const o3=(0,s2.throwIfFalsy)(a4.getContext("2d")),n3=new ImageData(i5,r4);let L2,d3,c3,_2;if(T2.startsWith("#"))L2=parseInt(T2.slice(1,3),16),d3=parseInt(T2.slice(3,5),16),c3=parseInt(T2.slice(5,7),16),_2=T2.length>7&&parseInt(T2.slice(7,9),16)||1;else{if(!T2.startsWith("rgba"))throw new Error(`Unexpected fillStyle color format "${T2}" when drawing pattern glyph`);[L2,d3,c3,_2]=T2.substring(5,T2.length-1).split(",").map(t5=>parseFloat(t5))}for(let t5=0;t5<r4;t5++)for(let s3=0;s3<i5;s3++)n3.data[4*(t5*i5+s3)]=L2,n3.data[4*(t5*i5+s3)+1]=d3,n3.data[4*(t5*i5+s3)+2]=c3,n3.data[4*(t5*i5+s3)+3]=e4[t5][s3]*(255*_2);o3.putImageData(n3,0,0),l2=(0,s2.throwIfFalsy)(t4.createPattern(a4,null)),h3.set(T2,l2)}const d2=n2>>1&1,c2=1&n2;0!==d2||0!==c2?l2.setTransform(new DOMMatrix().translateSelf(-d2,-c2)):l2.setTransform(new DOMMatrix),t4.fillStyle=l2,t4.fillRect(i4,r3,a3,o2)})(t3,e3.data,v,f,M,y,g);break;case 2:!(function(t4,e4,i4,s3,r3,a3,o2,n2,L2){let h3;t4.save(),t4.beginPath(),t4.rect(i4,s3,r3,a3),t4.clip(),t4.beginPath(),h3="function"==typeof e4?e4(.15,.15/a3*r3):e4;const d2={currentX:0,currentY:0,lastControlX:0,lastControlY:0,lastCommand:""};for(const e5 of h3.split(" ")){const L3=e5[0];if("Z"===L3){;t4.closePath(),d2.lastCommand=L3;continue}const h4=T[L3];if(!h4){n2.error(`Could not find drawing instructions for "${L3}"`);continue}const c2=e5.substring(1).split(",");c2[0]&&c2[1]&&(h4(t4,l(c2,r3,a3,i4,s3,true,o2,0,0,false),d2),d2.lastCommand=L3)};void 0!==L2?(t4.strokeStyle=t4.fillStyle,t4.lineWidth=o2*L2,t4.stroke()):t4.fill(),t4.closePath(),t4.restore()})(t3,e3.data,v,f,M,y,Q,u,e3.strokeWidth);break;case 3:!(function(t4,e4,i4,s3,r3,a3,o2,L2){const h3="string"==typeof e4?e4:e4(0,0);t4.beginPath();let T2=0,l2=0,d2=0,c2=0,_2="";for(const e5 of h3.split(" ")){const o3=e5[0],L3=e5.substring(1).split(",");if("Z"===o3){;t4.closePath(),_2=o3;continue}if("V"===o3){const e6=s3+parseFloat(L3[0])*a3;t4.lineTo(T2,e6),l2=e6,d2=T2,c2=l2,_2=o3;continue}if("H"===o3){const e6=i4+parseFloat(L3[0])*r3;t4.lineTo(e6,l2),T2=e6,d2=T2,c2=l2,_2=o3;continue}if(!L3[0]||!L3[1])continue;if("A"===o3){const e6=parseFloat(L3[0])*r3,o4=parseFloat(L3[1])*a3,h5=parseFloat(L3[2])*Math.PI/180,d3=parseInt(L3[3],10),c3=parseInt(L3[4],10),_3=i4+parseFloat(L3[5])*r3,Q2=s3+parseFloat(L3[6])*a3;n(t4,T2,l2,e6,o4,h5,d3,c3,_3,Q2),T2=_3,l2=Q2;continue}const h4=L3.map((t5,e6)=>{const o4=parseFloat(t5);return e6%2==0?i4+o4*r3:s3+o4*a3});if("M"===o3)t4.moveTo(h4[0],h4[1]),T2=h4[0],l2=h4[1],d2=T2,c2=l2;else if("L"===o3)t4.lineTo(h4[0],h4[1]),T2=h4[0],l2=h4[1],d2=T2,c2=l2;else if("Q"===o3)t4.quadraticCurveTo(h4[0],h4[1],h4[2],h4[3]),d2=h4[0],c2=h4[1],T2=h4[2],l2=h4[3];else if("T"===o3){let e6,i5;"Q"===_2||"T"===_2?(e6=2*T2-d2,i5=2*l2-c2):(e6=T2,i5=l2),t4.quadraticCurveTo(e6,i5,h4[0],h4[1]),d2=e6,c2=i5,T2=h4[0],l2=h4[1]}else"C"===o3&&(t4.bezierCurveTo(h4[0],h4[1],h4[2],h4[3],h4[4],h4[5]),d2=h4[2],c2=h4[3],T2=h4[4],l2=h4[5]);_2=o3}void 0!==L2?(t4.strokeStyle=t4.fillStyle,t4.lineWidth=o2*L2,t4.stroke()):t4.fill()})(t3,e3.data,v,f,M,y,Q,e3.strokeWidth);break;case 4:!(function(t4,e4,i4,s3,r3,a3,o2,n2){;t4.save(),t4.fillRect(i4,s3,r3,a3),n2&&(t4.fillStyle=n2,t4.strokeStyle=n2),t4.lineWidth=o2,t4.lineCap="square",t4.beginPath();for(const o3 of e4.d.split(" ")){const e5=o3[0],n3=o3.substring(1).split(",");if(!n3[0]||!n3[1]){"Z"===e5&&t4.closePath();continue}const L2=n3.map((t5,e6)=>{const o4=parseFloat(t5);return e6%2==0?i4+o4*r3:s3+o4*a3});"M"===e5?t4.moveTo(L2[0],L2[1]):"L"===e5&&t4.lineTo(L2[0],L2[1])};1===e4.type?t4.stroke():t4.fill(),t4.restore()})(t3,e3.data,v,f,M,y,Q,p);break;case 5:!(function(t4,e4,i4,s3,r3,a3,o2,n2,L2){const h3=new Path2D;h3.rect(i4,s3,r3,a3),t4.clip(h3),t4.beginPath();const d2=o2/12;t4.lineWidth=n2*d2;const c2={currentX:0,currentY:0,lastControlX:0,lastControlY:0,lastCommand:""};for(const o3 of e4.d.split(" ")){const h4=o3[0];if("Z"===h4){;t4.closePath(),c2.lastCommand=h4;continue}const _2=T[h4];if(!_2){L2.error(`Could not find drawing instructions for "${h4}"`);continue}const Q2=o3.substring(1).split(",");Q2[0]&&Q2[1]&&(_2(t4,l(Q2,r3,a3,i4,s3,false,n2,(e4.leftPadding??0)*(d2/2),(e4.rightPadding??0)*(d2/2)),c2),c2.lastCommand=h4)};1===e4.type?(t4.strokeStyle=t4.fillStyle,t4.stroke()):t4.fill(),t4.closePath()})(t3,e3.data,v,f,M,y,_,Q,u);break;case 6:!(function(t4,e4,i4,s3,r3,a3){const n2=r3/8,L2=.1*a3,h3=.8*a3/8,T2=Math.min(n2,h3);for(let r4=0;r4<8;r4++)if(e4&1<<r4){const e5=i4+(o[2*r4]+1)*n2,a4=s3+L2+(o[2*r4+1]+1)*h3;t4.beginPath(),t4.arc(e5,a4,T2,0,2*Math.PI),t4.fill()}})(t3,e3.data,v,f,M,y)}e3.clipPath&&t3.restore()}const o=new Uint8Array([1,0,1,2,1,4,5,0,5,2,5,4,1,6,5,6]);function n(t3,e3,i3,s3,r2,a2,o2,n2,L2,h2){if(0===s3||0===r2)return void t3.lineTo(L2,h2);s3=Math.abs(s3),r2=Math.abs(r2);const T2=Math.cos(a2),l2=Math.sin(a2),d=(e3-L2)/2,c=(i3-h2)/2,_=T2*d+l2*c,Q=-l2*d+T2*c;let u=s3*s3,p=r2*r2;const g=_*_,M=Q*Q,y=g/u+M/p;if(y>1){const t4=Math.sqrt(y);u=(s3*=t4)*s3,p=(r2*=t4)*r2}let v=(u*p-u*M-p*g)/(u*M+p*g);v<0&&(v=0);const f=(o2===n2?-1:1)*Math.sqrt(v),C=f*(s3*Q/r2),m=f*(-r2*_/s3),w=T2*C-l2*m+(e3+L2)/2,x=l2*C+T2*m+(i3+h2)/2,b=(_-C)/s3,E=(Q-m)/r2,R=(-_-C)/s3,k=(-Q-m)/r2,A=Math.atan2(E,b);let Z=Math.atan2(k,R)-A;0===n2&&Z>0?Z-=2*Math.PI:1===n2&&Z<0&&(Z+=2*Math.PI);const D=A+Z;t3.ellipse(w,x,s3,r2,a2,A,D,0===n2)}const L=new Map;function h(t3,e3,i3=0){return Math.max(Math.min(t3,e3),i3)}const T={C:(t3,e3,i3)=>{;t3.bezierCurveTo(e3[0],e3[1],e3[2],e3[3],e3[4],e3[5]),i3.lastControlX=e3[2],i3.lastControlY=e3[3],i3.currentX=e3[4],i3.currentY=e3[5]},L:(t3,e3,i3)=>{;t3.lineTo(e3[0],e3[1]),i3.lastControlX=i3.currentX=e3[0],i3.lastControlY=i3.currentY=e3[1]},M:(t3,e3,i3)=>{;t3.moveTo(e3[0],e3[1]),i3.lastControlX=i3.currentX=e3[0],i3.lastControlY=i3.currentY=e3[1]},Q:(t3,e3,i3)=>{;t3.quadraticCurveTo(e3[0],e3[1],e3[2],e3[3]),i3.lastControlX=e3[0],i3.lastControlY=e3[1],i3.currentX=e3[2],i3.currentY=e3[3]},T:(t3,e3,i3)=>{let s3,r2;"Q"===i3.lastCommand||"T"===i3.lastCommand?(s3=2*i3.currentX-i3.lastControlX,r2=2*i3.currentY-i3.lastControlY):(s3=i3.currentX,r2=i3.currentY),t3.quadraticCurveTo(s3,r2,e3[0],e3[1]),i3.lastControlX=s3,i3.lastControlY=r2,i3.currentX=e3[0],i3.currentY=e3[1]}};function l(t3,e3,i3,s3,r2,a2,o2,n2=0,L2=0,T2=true){const l2=t3.map(t4=>parseFloat(t4)||parseInt(t4));if(l2.length<2)throw new Error("Too few arguments for instruction");for(let t4=0;t4<l2.length;t4+=2){if(l2[t4]*=e3-n2*o2-L2*o2,a2&&0!==l2[t4]){const i4=Math.round(l2[t4]+.5)-.5;l2[t4]=T2?h(i4,e3,0):i4}l2[t4]+=s3+n2*o2}for(let t4=1;t4<l2.length;t4+=2){if(l2[t4]*=i3,a2&&0!==l2[t4]){const e4=Math.round(l2[t4]+.5)-.5;l2[t4]=T2?h(e4,i3,0):e4}l2[t4]+=r2}return l2}},133(t2,e2,i2){;Object.defineProperty(e2,"__esModule",{value:true}),e2.BaseRenderLayer=void 0;const s2=i2(670),r=i2(426),a=i2(959),o=i2(0);class n extends r.Disposable{constructor(t3,e3,i3,s3,a2,o2,n2,L){;super(),this._container=e3,this._alpha=a2,this._coreBrowserService=o2,this._optionsService=n2,this._themeService=L,this._deviceCharWidth=0,this._deviceCharHeight=0,this._deviceCellWidth=0,this._deviceCellHeight=0,this._deviceCharLeft=0,this._deviceCharTop=0,this._canvas=this._coreBrowserService.mainDocument.createElement("canvas"),this._canvas.classList.add(`xterm-${i3}-layer`),this._canvas.style.zIndex=s3.toString(),this._initCanvas(),this._container.appendChild(this._canvas),this._register(this._themeService.onChangeColors(e4=>{;this._refreshCharAtlas(t3,e4),this.reset(t3)})),this._register((0,r.toDisposable)(()=>{this._canvas.remove()}))}_initCanvas(){;this._ctx=(0,a.throwIfFalsy)(this._canvas.getContext("2d",{alpha:this._alpha})),this._alpha||this._clearAll()}handleBlur(t3){}handleFocus(t3){}handleCursorMove(t3){}handleGridChanged(t3,e3,i3){}handleSelectionChanged(t3,e3,i3,s3=false){}_setTransparency(t3,e3){if(e3===this._alpha)return;const i3=this._canvas;this._alpha=e3,this._canvas=this._canvas.cloneNode(),this._initCanvas(),this._container.replaceChild(this._canvas,i3),this._refreshCharAtlas(t3,this._themeService.colors),this.handleGridChanged(t3,0,t3.rows-1)}_refreshCharAtlas(t3,e3){;this._deviceCharWidth<=0&&this._deviceCharHeight<=0||(this._charAtlas=(0,s2.acquireTextureAtlas)(t3,this._optionsService.rawOptions,e3,this._deviceCellWidth,this._deviceCellHeight,this._deviceCharWidth,this._deviceCharHeight,this._coreBrowserService.dpr,2048),this._charAtlas.warmUp())}resize(t3,e3){;this._deviceCellWidth=e3.device.cell.width,this._deviceCellHeight=e3.device.cell.height,this._deviceCharWidth=e3.device.char.width,this._deviceCharHeight=e3.device.char.height,this._deviceCharLeft=e3.device.char.left,this._deviceCharTop=e3.device.char.top,this._canvas.width=e3.device.canvas.width,this._canvas.height=e3.device.canvas.height,this._canvas.style.width=`${e3.css.canvas.width}px`,this._canvas.style.height=`${e3.css.canvas.height}px`,this._alpha||this._clearAll(),this._refreshCharAtlas(t3,this._themeService.colors)}_fillBottomLineAtCells(t3,e3,i3=1){this._ctx.fillRect(t3*this._deviceCellWidth,(e3+1)*this._deviceCellHeight-this._coreBrowserService.dpr-1,i3*this._deviceCellWidth,this._coreBrowserService.dpr)}_clearAll(){this._alpha?this._ctx.clearRect(0,0,this._canvas.width,this._canvas.height):(this._ctx.fillStyle=this._themeService.colors.background.css,this._ctx.fillRect(0,0,this._canvas.width,this._canvas.height))}_clearCells(t3,e3,i3,s3){this._alpha?this._ctx.clearRect(t3*this._deviceCellWidth,e3*this._deviceCellHeight,i3*this._deviceCellWidth,s3*this._deviceCellHeight):(this._ctx.fillStyle=this._themeService.colors.background.css,this._ctx.fillRect(t3*this._deviceCellWidth,e3*this._deviceCellHeight,i3*this._deviceCellWidth,s3*this._deviceCellHeight))}_fillCharTrueColor(t3,e3,i3,s3){;this._ctx.font=this._getFont(t3,false,false),this._ctx.textBaseline=o.TEXT_BASELINE,this._clipCell(i3,s3,e3.getWidth()),this._ctx.fillText(e3.getChars(),i3*this._deviceCellWidth+this._deviceCharLeft,s3*this._deviceCellHeight+this._deviceCharTop+this._deviceCharHeight)}_clipCell(t3,e3,i3){;this._ctx.beginPath(),this._ctx.rect(t3*this._deviceCellWidth,e3*this._deviceCellHeight,i3*this._deviceCellWidth,this._deviceCellHeight),this._ctx.clip()}_getFont(t3,e3,i3){return`${i3?"italic":""} ${e3?t3.options.fontWeightBold:t3.options.fontWeight} ${t3.options.fontSize*this._coreBrowserService.dpr}px ${t3.options.fontFamily}`}}e2.BaseRenderLayer=n},306(t2,e2,i2){;Object.defineProperty(e2,"__esModule",{value:true}),e2.LinkRenderLayer=void 0;const s2=i2(657),r=i2(814),a=i2(133);class o extends a.BaseRenderLayer{constructor(t3,e3,i3,s3,r2,a2,o2){;super(i3,t3,"link",e3,true,r2,a2,o2),this._register(s3.onShowLinkUnderline(t4=>this._handleShowLinkUnderline(t4))),this._register(s3.onHideLinkUnderline(t4=>this._handleHideLinkUnderline(t4)))}resize(t3,e3){;super.resize(t3,e3),this._state=void 0}reset(t3){this._clearCurrentLink()}_clearCurrentLink(){if(this._state){this._clearCells(this._state.x1,this._state.y1,this._state.cols-this._state.x1,1);const t3=this._state.y2-this._state.y1-1;t3>0&&this._clearCells(0,this._state.y1+1,this._state.cols,t3),this._clearCells(0,this._state.y2,this._state.x2,1),this._state=void 0}}_handleShowLinkUnderline(t3){if(t3.fg===r.INVERTED_DEFAULT_COLOR?this._ctx.fillStyle=this._themeService.colors.background.css:void 0!==t3.fg&&(0,s2.is256Color)(t3.fg)?this._ctx.fillStyle=this._themeService.colors.ansi[t3.fg].css:this._ctx.fillStyle=this._themeService.colors.foreground.css,t3.y1===t3.y2)this._fillBottomLineAtCells(t3.x1,t3.y1,t3.x2-t3.x1);else{this._fillBottomLineAtCells(t3.x1,t3.y1,t3.cols-t3.x1);for(let e3=t3.y1+1;e3<t3.y2;e3++)this._fillBottomLineAtCells(0,e3,t3.cols);this._fillBottomLineAtCells(0,t3.y2,t3.x2)}this._state=t3}_handleHideLinkUnderline(t3){this._clearCurrentLink()}}e2.LinkRenderLayer=o}},e={};function i(s2){var r=e[s2];if(void 0!==r)return r.exports;var a=e[s2]={exports:{}};return t[s2](a,a.exports,i),a.exports}var s={};return(()=>{var t2=s;Object.defineProperty(t2,"__esModule",{value:true}),t2.WebglAddon=void 0;const e2=i(426),r=i(95),a=i(399),o=i(414);class n extends e2.Disposable{constructor(t3){if(r.isSafari&&(0,r.getSafariVersion)()<16){const t4={antialias:false,depth:false,preserveDrawingBuffer:true};if(!document.createElement("canvas").getContext("webgl2",t4))throw new Error("WebGL2 is only supported on Safari 16 and above")};super(),this._onChangeTextureAtlas=this._register(new o.Emitter),this.onChangeTextureAtlas=this._onChangeTextureAtlas.event,this._onAddTextureAtlasCanvas=this._register(new o.Emitter),this.onAddTextureAtlasCanvas=this._onAddTextureAtlasCanvas.event,this._onRemoveTextureAtlasCanvas=this._register(new o.Emitter),this.onRemoveTextureAtlasCanvas=this._onRemoveTextureAtlasCanvas.event,this._onContextLoss=this._register(new o.Emitter),this.onContextLoss=this._onContextLoss.event,this._customGlyphs=t3?.customGlyphs??true,this._preserveDrawingBuffer=t3?.preserveDrawingBuffer}activate(t3){const i2=t3._core;if(!t3.element)return void this._register(i2.onWillOpen(()=>this.activate(t3)));this._terminal=t3;const s2=i2.coreService,r2=i2.optionsService,n2=i2,L=n2._renderService,h=n2._characterJoinerService,T=n2._charSizeService,l=n2._coreBrowserService,d=n2._decorationService,c=n2._logService,_=n2._themeService;this._renderer=this._register(new a.WebglRenderer(t3,h,T,l,s2,d,c,r2,_,this._customGlyphs,this._preserveDrawingBuffer)),this._register(o.EventUtils.forward(this._renderer.onContextLoss,this._onContextLoss)),this._register(o.EventUtils.forward(this._renderer.onChangeTextureAtlas,this._onChangeTextureAtlas)),this._register(o.EventUtils.forward(this._renderer.onAddTextureAtlasCanvas,this._onAddTextureAtlasCanvas)),this._register(o.EventUtils.forward(this._renderer.onRemoveTextureAtlasCanvas,this._onRemoveTextureAtlasCanvas)),L.setRenderer(this._renderer),this._register((0,e2.toDisposable)(()=>{if(this._terminal._core._store._isDisposed)return;const e3=this._terminal._core._renderService;e3.setRenderer(this._terminal._core._createRenderer()),e3.handleResize(t3.cols,t3.rows)}))}get textureAtlas(){return this._renderer?.textureAtlas}clearTextureAtlas(){this._renderer?.clearTextureAtlas()}}t2.WebglAddon=n})(),s})());
-diff -ruN a/lib/addon-webgl.mjs b/lib/addon-webgl.mjs
+diff --git a/lib/addon-webgl.mjs b/lib/addon-webgl.mjs
 --- a/lib/addon-webgl.mjs
 +++ b/lib/addon-webgl.mjs
 @@ -9,12 +9,7 @@
@@ -70,7 +70,7 @@ diff -ruN a/lib/addon-webgl.mjs b/lib/addon-webgl.mjs
 -}`,l0=8,Me=l0*Float32Array.BYTES_PER_ELEMENT,e1=20*l0,ne=class{constructor(){this.attributes=new Float32Array(e1),this.count=0}},p0=0,Lt=0,ht=0,dt=0,_t=0,ct=0,ut=0,ae=class extends W{constructor(t,r,s,a,o){super();this._terminal=t;this._gl=r;this._dimensions=s;this._themeService=a;this._logService=o;this._vertices=new ne;this._verticesCursor=new ne;let n=this._gl;this._program=g(ie(n,jt,Jt,this._logService)),this._register(M(()=>n.deleteProgram(this._program))),this._projectionLocation=g(n.getUniformLocation(this._program,"u_projection"));let L=this._vertexArrayObject=n.createVertexArray();this._register(M(()=>n.deleteVertexArray(L))),n.bindVertexArray(L);let T=new Float32Array([0,0,1,0,0,1,1,1]),h=n.createBuffer();this._register(M(()=>n.deleteBuffer(h))),n.bindBuffer(n.ARRAY_BUFFER,h),n.bufferData(n.ARRAY_BUFFER,T,n.STATIC_DRAW),n.enableVertexAttribArray(3),n.vertexAttribPointer(3,2,this._gl.FLOAT,!1,0,0);let d=new Uint8Array([0,1,2,3]),_=n.createBuffer();this._register(M(()=>n.deleteBuffer(_))),n.bindBuffer(n.ELEMENT_ARRAY_BUFFER,_),n.bufferData(n.ELEMENT_ARRAY_BUFFER,d,n.STATIC_DRAW),this._attributesBuffer=g(n.createBuffer()),this._register(M(()=>n.deleteBuffer(this._attributesBuffer))),n.bindBuffer(n.ARRAY_BUFFER,this._attributesBuffer),n.enableVertexAttribArray(0),n.vertexAttribPointer(0,2,n.FLOAT,!1,Me,0),n.vertexAttribDivisor(0,1),n.enableVertexAttribArray(1),n.vertexAttribPointer(1,2,n.FLOAT,!1,Me,2*Float32Array.BYTES_PER_ELEMENT),n.vertexAttribDivisor(1,1),n.enableVertexAttribArray(2),n.vertexAttribPointer(2,4,n.FLOAT,!1,Me,4*Float32Array.BYTES_PER_ELEMENT),n.vertexAttribDivisor(2,1),this._updateCachedColors(a.colors),this._register(this._themeService.onChangeColors(p=>{this._updateCachedColors(p),this._updateViewportRectangle()}))}renderBackgrounds(){this._renderVertices(this._vertices)}renderCursor(){this._renderVertices(this._verticesCursor)}_renderVertices(t){let r=this._gl;r.useProgram(this._program),r.bindVertexArray(this._vertexArrayObject),r.uniformMatrix4fv(this._projectionLocation,!1,te),r.bindBuffer(r.ARRAY_BUFFER,this._attributesBuffer),r.bufferData(r.ARRAY_BUFFER,t.attributes,r.DYNAMIC_DRAW),r.drawElementsInstanced(this._gl.TRIANGLE_STRIP,4,r.UNSIGNED_BYTE,0,t.count)}handleResize(){this._updateViewportRectangle()}setDimensions(t){this._dimensions=t}_updateCachedColors(t){this._bgFloat=this._colorToFloat32Array(t.background),this._cursorFloat=this._colorToFloat32Array(t.cursor)}_updateViewportRectangle(){this._addRectangleFloat(this._vertices.attributes,0,0,0,this._terminal.cols*this._dimensions.device.cell.width,this._terminal.rows*this._dimensions.device.cell.height,this._bgFloat)}updateBackgrounds(t){let r=this._terminal,s=this._vertices,a=1,o,n,L,T,h,d,_,p,c,u,C;for(o=0;o<r.rows;o++){for(L=-1,T=0,h=0,d=!1,n=0;n<r.cols;n++)_=(o*r.cols+n)*4,p=t.cells[_+1],c=t.cells[_+2],u=!!(c&67108864),(p!==T||c!==h&&(d||u))&&((T!==0||d&&h!==0)&&(C=a++*l0,this._updateRectangle(s,C,h,T,L,n,o)),L=n,T=p,h=c,d=u);(T!==0||d&&h!==0)&&(C=a++*l0,this._updateRectangle(s,C,h,T,L,r.cols,o))}s.count=a}updateCursor(t){let r=this._verticesCursor,s=t.cursor;if(!s||s.style==="block"){r.count=0;return}let a,o=0;(s.style==="bar"||s.style==="outline")&&(a=o++*l0,this._addRectangleFloat(r.attributes,a,s.x*this._dimensions.device.cell.width,s.y*this._dimensions.device.cell.height,s.style==="bar"?s.dpr*s.cursorWidth:s.dpr,this._dimensions.device.cell.height,this._cursorFloat)),(s.style==="underline"||s.style==="outline")&&(a=o++*l0,this._addRectangleFloat(r.attributes,a,s.x*this._dimensions.device.cell.width,(s.y+1)*this._dimensions.device.cell.height-s.dpr,s.width*this._dimensions.device.cell.width,s.dpr,this._cursorFloat)),s.style==="outline"&&(a=o++*l0,this._addRectangleFloat(r.attributes,a,s.x*this._dimensions.device.cell.width,s.y*this._dimensions.device.cell.height,s.width*this._dimensions.device.cell.width,s.dpr,this._cursorFloat),a=o++*l0,this._addRectangleFloat(r.attributes,a,(s.x+s.width)*this._dimensions.device.cell.width-s.dpr,s.y*this._dimensions.device.cell.height,s.dpr,this._dimensions.device.cell.height,this._cursorFloat)),r.count=o}_updateRectangle(t,r,s,a,o,n,L){if(s&67108864)switch(s&50331648){case 16777216:case 33554432:p0=this._themeService.colors.ansi[s&255].rgba;break;case 50331648:p0=(s&16777215)<<8;break;case 0:default:p0=this._themeService.colors.foreground.rgba}else switch(a&50331648){case 16777216:case 33554432:p0=this._themeService.colors.ansi[a&255].rgba;break;case 50331648:p0=(a&16777215)<<8;break;case 0:default:p0=this._themeService.colors.background.rgba}t.attributes.length<r+l0&&(t.attributes=ot(t.attributes,(this._terminal.rows*this._terminal.cols+1)*l0)),Lt=o*this._dimensions.device.cell.width,ht=L*this._dimensions.device.cell.height,dt=(p0>>24&255)/255,_t=(p0>>16&255)/255,ct=(p0>>8&255)/255,ut=1,this._addRectangle(t.attributes,r,Lt,ht,(n-o)*this._dimensions.device.cell.width,this._dimensions.device.cell.height,dt,_t,ct,ut)}_addRectangle(t,r,s,a,o,n,L,T,h,d){t[r]=s/this._dimensions.device.canvas.width,t[r+1]=a/this._dimensions.device.canvas.height,t[r+2]=o/this._dimensions.device.canvas.width,t[r+3]=n/this._dimensions.device.canvas.height,t[r+4]=L,t[r+5]=T,t[r+6]=h,t[r+7]=d}_addRectangleFloat(t,r,s,a,o,n,L){t[r]=s/this._dimensions.device.canvas.width,t[r+1]=a/this._dimensions.device.canvas.height,t[r+2]=o/this._dimensions.device.canvas.width,t[r+3]=n/this._dimensions.device.canvas.height,t[r+4]=L[0],t[r+5]=L[1],t[r+6]=L[2],t[r+7]=L[3]}_colorToFloat32Array(t){return new Float32Array([(t.rgba>>24&255)/255,(t.rgba>>16&255)/255,(t.rgba>>8&255)/255,(t.rgba&255)/255])}};var oe=class extends W{constructor(t,r,s,a,o,n,L,T){super();this._container=r;this._alpha=o;this._coreBrowserService=n;this._optionsService=L;this._themeService=T;this._deviceCharWidth=0;this._deviceCharHeight=0;this._deviceCellWidth=0;this._deviceCellHeight=0;this._deviceCharLeft=0;this._deviceCharTop=0;this._canvas=this._coreBrowserService.mainDocument.createElement("canvas"),this._canvas.classList.add(`xterm-${s}-layer`),this._canvas.style.zIndex=a.toString(),this._initCanvas(),this._container.appendChild(this._canvas),this._register(this._themeService.onChangeColors(h=>{this._refreshCharAtlas(t,h),this.reset(t)})),this._register(M(()=>{this._canvas.remove()}))}_initCanvas(){this._ctx=g(this._canvas.getContext("2d",{alpha:this._alpha})),this._alpha||this._clearAll()}handleBlur(t){}handleFocus(t){}handleCursorMove(t){}handleGridChanged(t,r,s){}handleSelectionChanged(t,r,s,a=!1){}_setTransparency(t,r){if(r===this._alpha)return;let s=this._canvas;this._alpha=r,this._canvas=this._canvas.cloneNode(),this._initCanvas(),this._container.replaceChild(this._canvas,s),this._refreshCharAtlas(t,this._themeService.colors),this.handleGridChanged(t,0,t.rows-1)}_refreshCharAtlas(t,r){this._deviceCharWidth<=0&&this._deviceCharHeight<=0||(this._charAtlas=Y0(t,this._optionsService.rawOptions,r,this._deviceCellWidth,this._deviceCellHeight,this._deviceCharWidth,this._deviceCharHeight,this._coreBrowserService.dpr,2048),this._charAtlas.warmUp())}resize(t,r){this._deviceCellWidth=r.device.cell.width,this._deviceCellHeight=r.device.cell.height,this._deviceCharWidth=r.device.char.width,this._deviceCharHeight=r.device.char.height,this._deviceCharLeft=r.device.char.left,this._deviceCharTop=r.device.char.top,this._canvas.width=r.device.canvas.width,this._canvas.height=r.device.canvas.height,this._canvas.style.width=`${r.css.canvas.width}px`,this._canvas.style.height=`${r.css.canvas.height}px`,this._alpha||this._clearAll(),this._refreshCharAtlas(t,this._themeService.colors)}_fillBottomLineAtCells(t,r,s=1){this._ctx.fillRect(t*this._deviceCellWidth,(r+1)*this._deviceCellHeight-this._coreBrowserService.dpr-1,s*this._deviceCellWidth,this._coreBrowserService.dpr)}_clearAll(){this._alpha?this._ctx.clearRect(0,0,this._canvas.width,this._canvas.height):(this._ctx.fillStyle=this._themeService.colors.background.css,this._ctx.fillRect(0,0,this._canvas.width,this._canvas.height))}_clearCells(t,r,s,a){this._alpha?this._ctx.clearRect(t*this._deviceCellWidth,r*this._deviceCellHeight,s*this._deviceCellWidth,a*this._deviceCellHeight):(this._ctx.fillStyle=this._themeService.colors.background.css,this._ctx.fillRect(t*this._deviceCellWidth,r*this._deviceCellHeight,s*this._deviceCellWidth,a*this._deviceCellHeight))}_fillCharTrueColor(t,r,s,a){this._ctx.font=this._getFont(t,!1,!1),this._ctx.textBaseline=K0,this._clipCell(s,a,r.getWidth()),this._ctx.fillText(r.getChars(),s*this._deviceCellWidth+this._deviceCharLeft,a*this._deviceCellHeight+this._deviceCharTop+this._deviceCharHeight)}_clipCell(t,r,s){this._ctx.beginPath(),this._ctx.rect(t*this._deviceCellWidth,r*this._deviceCellHeight,s*this._deviceCellWidth,this._deviceCellHeight),this._ctx.clip()}_getFont(t,r,s){let a=r?t.options.fontWeightBold:t.options.fontWeight;return`${s?"italic":""} ${a} ${t.options.fontSize*this._coreBrowserService.dpr}px ${t.options.fontFamily}`}};var Te=class extends oe{constructor(e,t,r,s,a,o,n){super(r,e,"link",t,!0,a,o,n),this._register(s.onShowLinkUnderline(L=>this._handleShowLinkUnderline(L))),this._register(s.onHideLinkUnderline(L=>this._handleHideLinkUnderline(L)))}resize(e,t){super.resize(e,t),this._state=void 0}reset(e){this._clearCurrentLink()}_clearCurrentLink(){if(this._state){this._clearCells(this._state.x1,this._state.y1,this._state.cols-this._state.x1,1);let e=this._state.y2-this._state.y1-1;e>0&&this._clearCells(0,this._state.y1+1,this._state.cols,e),this._clearCells(0,this._state.y2,this._state.x2,1),this._state=void 0}}_handleShowLinkUnderline(e){if(e.fg===257?this._ctx.fillStyle=this._themeService.colors.background.css:e.fg!==void 0&&st(e.fg)?this._ctx.fillStyle=this._themeService.colors.ansi[e.fg].css:this._ctx.fillStyle=this._themeService.colors.foreground.css,e.y1===e.y2)this._fillBottomLineAtCells(e.x1,e.y1,e.x2-e.x1);else{this._fillBottomLineAtCells(e.x1,e.y1,e.cols-e.x1);for(let t=e.y1+1;t<e.y2;t++)this._fillBottomLineAtCells(0,t,e.cols);this._fillBottomLineAtCells(0,e.y2,e.x2)}this._state=e}_handleHideLinkUnderline(e){this._clearCurrentLink()}};var Ae=class{constructor(e,t,r,s){this._node=e,this._type=t,this._handler=r,this._options=s,e.addEventListener(t,r,s)}dispose(){!this._node||!this._handler||(this._node.removeEventListener(this._type,this._handler,this._options),this._node=null,this._handler=null)}};function le(i,e,t,r){return new Ae(i,e,t,r)}var Le=class extends W{constructor(t,r,s,a,o,n,L,T,h,d=!0,_){super();this._terminal=t;this._characterJoinerService=r;this._charSizeService=s;this._coreBrowserService=a;this._coreService=o;this._decorationService=n;this._logService=L;this._optionsService=T;this._themeService=h;this._customGlyphs=d;this._cursorBlinkStateManager=this._register(new m0);this._charAtlasDisposable=this._register(new m0);this._observerDisposable=this._register(new m0);this._model=new se;this._rowHasBlinkingCells=[];this._rowHasBlinkingCellsCount=0;this._workCell=new j0;this._rectangleRenderer=this._register(new m0);this._glyphRenderer=this._register(new m0);this._onChangeTextureAtlas=this._register(new U);this.onChangeTextureAtlas=this._onChangeTextureAtlas.event;this._onAddTextureAtlasCanvas=this._register(new U);this.onAddTextureAtlasCanvas=this._onAddTextureAtlasCanvas.event;this._onRemoveTextureAtlasCanvas=this._register(new U);this.onRemoveTextureAtlasCanvas=this._onRemoveTextureAtlasCanvas.event;this._onRequestRedraw=this._register(new U);this.onRequestRedraw=this._onRequestRedraw.event;this._onContextLoss=this._register(new U);this.onContextLoss=this._onContextLoss.event;this._canvas=this._coreBrowserService.mainDocument.createElement("canvas");let p={antialias:!1,depth:!1,preserveDrawingBuffer:_};if(this._gl=this._canvas.getContext("webgl2",p),!this._gl)throw new Error("WebGL2 not supported "+this._gl);this._register(this._themeService.onChangeColors(()=>this._handleColorChange())),this._cellColorResolver=new G0(this._terminal,this._optionsService,this._model.selection,this._decorationService,this._coreBrowserService,this._themeService),this._core=this._terminal._core,this._renderLayers=[new Te(this._core.screenElement,2,this._terminal,this._core.linkifier,this._coreBrowserService,T,this._themeService)],this.dimensions=Ue(),this._devicePixelRatio=this._coreBrowserService.dpr,this._updateDimensions(),this._updateCursorBlink(),this._register(T.onOptionChange(()=>this._handleOptionsChanged())),this._textBlinkStateManager=this._register(new J0(()=>this._requestRedrawViewport(),this._coreBrowserService,this._optionsService)),this._resetBlinkingRowState(),this._deviceMaxTextureSize=this._gl.getParameter(this._gl.MAX_TEXTURE_SIZE),this._register(le(this._canvas,"webglcontextlost",c=>{this._logService.debug("webglcontextlost event received"),c.preventDefault(),this._contextRestorationTimeout=setTimeout(()=>{this._contextRestorationTimeout=void 0,this._logService.warn("webgl context not restored; firing onContextLoss"),this._onContextLoss.fire(c)},3e3)})),this._register(le(this._canvas,"webglcontextrestored",c=>{this._logService.warn("webglcontextrestored event received"),clearTimeout(this._contextRestorationTimeout),this._contextRestorationTimeout=void 0,be(this._terminal),this._initializeWebGLState(),this._requestRedrawViewport()})),this._observerDisposable.value=ve(this._canvas,this._coreBrowserService.window,(c,u)=>this._setCanvasDevicePixelDimensions(c,u)),this._register(this._coreBrowserService.onWindowChange(c=>{this._observerDisposable.value=ve(this._canvas,c,(u,C)=>this._setCanvasDevicePixelDimensions(u,C))})),this._register(le(this._coreBrowserService.mainDocument,"mousedown",()=>this._cursorBlinkStateManager.value?.restartBlinkAnimation())),this._core.screenElement.appendChild(this._canvas),[this._rectangleRenderer.value,this._glyphRenderer.value]=this._initializeWebGLState(),this._isAttached=this._core.screenElement.isConnected,this._register(M(()=>{clearTimeout(this._contextRestorationTimeout),this._contextRestorationTimeout=void 0;for(let c of this._renderLayers)c.dispose();this._canvas.parentElement?.removeChild(this._canvas),be(this._terminal)}))}get textureAtlas(){return this._charAtlas?.pages[0].canvas}_handleColorChange(){this._refreshCharAtlas(),this._clearModel(!0)}handleDevicePixelRatioChange(){this._devicePixelRatio!==this._coreBrowserService.dpr&&(this._devicePixelRatio=this._coreBrowserService.dpr,this.handleResize(this._terminal.cols,this._terminal.rows))}handleResize(t,r){this._updateDimensions(),this._model.resize(this._terminal.cols,this._terminal.rows),this._resetBlinkingRowState();for(let s of this._renderLayers)s.resize(this._terminal,this.dimensions);this._canvas.width=this.dimensions.device.canvas.width,this._canvas.height=this.dimensions.device.canvas.height,this._canvas.style.width=`${this.dimensions.css.canvas.width}px`,this._canvas.style.height=`${this.dimensions.css.canvas.height}px`,this._core.screenElement.style.width=`${this.dimensions.css.canvas.width}px`,this._core.screenElement.style.height=`${this.dimensions.css.canvas.height}px`,this._rectangleRenderer.value?.setDimensions(this.dimensions),this._rectangleRenderer.value?.handleResize(),this._glyphRenderer.value?.setDimensions(this.dimensions),this._glyphRenderer.value?.handleResize(),this._refreshCharAtlas(),this._clearModel(!1),this._onRequestRedraw.fire({start:0,end:this._terminal.rows-1,sync:!0})}handleCharSizeChanged(){this.handleResize(this._terminal.cols,this._terminal.rows)}handleBlur(){for(let t of this._renderLayers)t.handleBlur(this._terminal);this._cursorBlinkStateManager.value?.pause(),this._requestRedrawViewport()}handleFocus(){for(let t of this._renderLayers)t.handleFocus(this._terminal);this._cursorBlinkStateManager.value?.resume(),this._requestRedrawViewport()}handleViewportVisibilityChange(t){this._textBlinkStateManager.setViewportVisible(t)}handleSelectionChanged(t,r,s){for(let a of this._renderLayers)a.handleSelectionChanged(this._terminal,t,r,s);this._model.selection.update(this._core,t,r,s),this._requestRedrawViewport()}handleCursorMove(){for(let t of this._renderLayers)t.handleCursorMove(this._terminal);this._cursorBlinkStateManager.value?.restartBlinkAnimation()}_handleOptionsChanged(){this._updateDimensions(),this._refreshCharAtlas(),this._updateCursorBlink()}_initializeWebGLState(){return this._rectangleRenderer.value=new ae(this._terminal,this._gl,this.dimensions,this._themeService,this._logService),this._glyphRenderer.value=new re(this._terminal,this._gl,this.dimensions,this._optionsService,this._logService),this.handleCharSizeChanged(),[this._rectangleRenderer.value,this._glyphRenderer.value]}_refreshCharAtlas(){if(this.dimensions.device.char.width<=0&&this.dimensions.device.char.height<=0){this._isAttached=!1;return}let t=Y0(this._terminal,this._optionsService.rawOptions,this._themeService.colors,this.dimensions.device.cell.width,this.dimensions.device.cell.height,this.dimensions.device.char.width,this.dimensions.device.char.height,this._coreBrowserService.dpr,this._deviceMaxTextureSize,this._customGlyphs);this._charAtlas!==t&&(this._onChangeTextureAtlas.fire(t.pages[0].canvas),this._charAtlasDisposable.value=De(c0.forward(t.onAddTextureAtlasCanvas,this._onAddTextureAtlasCanvas),c0.forward(t.onRemoveTextureAtlasCanvas,this._onRemoveTextureAtlasCanvas))),this._charAtlas=t,this._charAtlas.warmUp(),this._glyphRenderer.value?.setAtlas(this._charAtlas)}_clearModel(t){this._model.clear(),t&&this._glyphRenderer.value?.clear()}clearTextureAtlas(){this._charAtlas?.clearTexture(),this._clearModel(!0),this._requestRedrawViewport()}clear(){this._clearModel(!0);for(let t of this._renderLayers)t.reset(this._terminal);this._resetBlinkingRowState(),this._textBlinkStateManager.setNeedsBlinkInViewport(!1),this._cursorBlinkStateManager.value?.restartBlinkAnimation(),this._updateCursorBlink()}renderRows(t,r){if(!this._isAttached)if(this._core.screenElement?.isConnected&&this._charSizeService.width&&this._charSizeService.height)this._updateDimensions(),this._refreshCharAtlas(),this._isAttached=!0;else return;for(let o of this._renderLayers)o.handleGridChanged(this._terminal,t,r);if(!this._glyphRenderer.value||!this._rectangleRenderer.value)return;this._glyphRenderer.value.beginFrame()?(this._clearModel(!0),this._updateModel(0,this._terminal.rows-1)):this._updateModel(t,r);let s=!1,a=0;for(;this._charAtlas&&this._glyphRenderer.value.beginFrame()&&a++<32;)s=!0,this._clearModel(!0),this._updateModel(0,this._terminal.rows-1);s&&this._glyphRenderer.value.invalidateAtlasTextures(),this._rectangleRenderer.value.renderBackgrounds(),this._glyphRenderer.value.render(this._model),(!this._cursorBlinkStateManager.value||this._cursorBlinkStateManager.value.isCursorVisible)&&this._rectangleRenderer.value.renderCursor()}_updateCursorBlink(){this._coreService.decPrivateModes.cursorBlink??this._terminal.options.cursorBlink?this._cursorBlinkStateManager.value=new q0(()=>{this._requestRedrawCursor()},this._coreBrowserService):this._cursorBlinkStateManager.clear(),this._requestRedrawCursor()}_updateModel(t,r){let s=this._core,a=this._workCell,o,n,L,T,h,d,_,p,c,u,C,Q,m,R,F,E,y;t=pt(t,s.rows-1,0),r=pt(r,s.rows-1,0);let Y=this._coreService.decPrivateModes.cursorStyle??s.options.cursorStyle??"block",X=this._terminal.buffer.active.baseY+this._terminal.buffer.active.cursorY,A0=X-s.buffer.ydisp,t0=Math.min(this._terminal.buffer.active.cursorX,s.cols-1),L0=-1,A=this._coreService.isCursorInitialized&&!this._coreService.isCursorHidden&&(!this._cursorBlinkStateManager.value||this._cursorBlinkStateManager.value.isCursorVisible);this._model.cursor=void 0;let n0=!1;for(n=t;n<=r;n++){L=n+s.buffer.ydisp;let a0=s.buffer.lines.get(L);if(!a0){for(this._model.lineLengths[n]=0,E=0;E<s.cols;E++)y=(n*s.cols+E)*4,n0=!0,this._nullModelCell(E,n,y,0,0,0);this._setRowBlinkState(n,!1);continue}T=a0;let $=!1;for(this._model.lineLengths[n]=0,C=X===L,_=0,h=this._characterJoinerService.getJoinedCharacters(L),E=0;E<s.cols;E++){if(o=this._cellColorResolver.result.bg,T.loadCell(E,a),E===0&&(o=this._cellColorResolver.result.bg),d=!1,p=E>=_,c=E,h.length>0&&E===h[0][0]&&p){u=h.shift();let q=this._model.selection.isCellSelected(this._terminal,u[0],L);for(F=u[0]+1;F<u[1];F++)p&&=q===this._model.selection.isCellSelected(this._terminal,F,L);p&&=!C||t0<u[0]||t0>=u[1],p?(d=!0,a=new ge(a,T.translateToString(!0,u[0],u[1]),u[1]-u[0]),c=u[1]-1):_=u[1]}if(Q=a.getChars(),m=a.getCode(),F=(n*s.cols+E)*4,!$&&a.isBlink()&&($=!0),this._cellColorResolver.resolve(a,E,L,this.dimensions.device.cell.width,this.dimensions.device.cell.height),A&&L===X&&(E===t0&&(this._model.cursor={x:t0,y:A0,width:a.getWidth(),style:this._coreBrowserService.isFocused?Y:s.options.cursorInactiveStyle,cursorWidth:s.options.cursorWidth,dpr:this._devicePixelRatio},L0=t0+a.getWidth()-1),E>=t0&&E<=L0&&(this._coreBrowserService.isFocused&&Y==="block"||this._coreBrowserService.isFocused===!1&&s.options.cursorInactiveStyle==="block")&&(this._cellColorResolver.result.fg=50331648|this._themeService.colors.cursorAccent.rgba>>8&16777215,this._cellColorResolver.result.bg=50331648|this._themeService.colors.cursor.rgba>>8&16777215)),this._textBlinkStateManager.isEnabled&&!this._textBlinkStateManager.isBlinkOn&&a.isBlink()&&(this._cellColorResolver.result.fg|=1073741824),m!==0&&(this._model.lineLengths[n]=E+1),!(this._model.cells[F]===m&&this._model.cells[F+1]===this._cellColorResolver.result.bg&&this._model.cells[F+2]===this._cellColorResolver.result.fg&&this._model.cells[F+3]===this._cellColorResolver.result.ext)&&(n0=!0,Q.length>1&&(m|=lt),this._model.cells[F]=m,this._model.cells[F+1]=this._cellColorResolver.result.bg,this._model.cells[F+2]=this._cellColorResolver.result.fg,this._model.cells[F+3]=this._cellColorResolver.result.ext,R=a.getWidth(),this._glyphRenderer.value.updateCell(E,n,m,this._cellColorResolver.result.bg,this._cellColorResolver.result.fg,this._cellColorResolver.result.ext,Q,R,o),d)){for(a=this._workCell,E++;E<=c;E++)y=(n*s.cols+E)*4,this._nullModelCell(E,n,y,this._cellColorResolver.result.bg,this._cellColorResolver.result.fg,this._cellColorResolver.result.ext);E--}}this._setRowBlinkState(n,$)}n0&&this._rectangleRenderer.value.updateBackgrounds(this._model),this._rectangleRenderer.value.updateCursor(this._model),this._updateTextBlinkState()}_nullModelCell(t,r,s,a,o,n){this._glyphRenderer.value.updateCell(t,r,0,a,o,n,"",0,0),this._model.cells[s]=0,this._model.cells[s+1]=a,this._model.cells[s+2]=o,this._model.cells[s+3]=n}_resetBlinkingRowState(){this._rowHasBlinkingCells=new Array(this._terminal.rows).fill(!1),this._rowHasBlinkingCellsCount=0}_setRowBlinkState(t,r){this._rowHasBlinkingCells[t]!==r&&(this._rowHasBlinkingCells[t]=r,this._rowHasBlinkingCellsCount+=r?1:-1)}_updateTextBlinkState(){this._textBlinkStateManager.setNeedsBlinkInViewport(this._rowHasBlinkingCellsCount>0)}_updateDimensions(){!this._charSizeService.width||!this._charSizeService.height||(this.dimensions.device.char.width=Math.floor(this._charSizeService.width*this._devicePixelRatio),this.dimensions.device.char.height=Math.ceil(this._charSizeService.height*this._devicePixelRatio),this.dimensions.device.cell.height=Math.floor(this.dimensions.device.char.height*this._optionsService.rawOptions.lineHeight),this.dimensions.device.char.top=this._optionsService.rawOptions.lineHeight===1?0:Math.round((this.dimensions.device.cell.height-this.dimensions.device.char.height)/2),this.dimensions.device.cell.width=this.dimensions.device.char.width+Math.round(this._optionsService.rawOptions.letterSpacing),this.dimensions.device.char.left=Math.floor(this._optionsService.rawOptions.letterSpacing/2),this.dimensions.device.canvas.height=this._terminal.rows*this.dimensions.device.cell.height,this.dimensions.device.canvas.width=this._terminal.cols*this.dimensions.device.cell.width,this.dimensions.css.canvas.height=Math.round(this.dimensions.device.canvas.height/this._devicePixelRatio),this.dimensions.css.canvas.width=Math.round(this.dimensions.device.canvas.width/this._devicePixelRatio),this.dimensions.css.cell.height=this.dimensions.device.cell.height/this._devicePixelRatio,this.dimensions.css.cell.width=this.dimensions.device.cell.width/this._devicePixelRatio)}_setCanvasDevicePixelDimensions(t,r){this._canvas.width===t&&this._canvas.height===r||(this._canvas.width=t,this._canvas.height=r,this._onRequestRedraw.fire({start:0,end:this._terminal.rows-1,sync:!0}))}_requestRedrawViewport(){this._onRequestRedraw.fire({start:0,end:this._terminal.rows-1})}_requestRedrawCursor(){let t=this._terminal.buffer.active.cursorY;this._onRequestRedraw.fire({start:t,end:t})}},ge=class extends s0{constructor(t,r,s){super();this.content=0;this.combinedData="";this.fg=t.fg,this.bg=t.bg,this.combinedData=r,this._width=s}isCombined(){return 2097152}getWidth(){return this._width}getChars(){return this.combinedData}getCode(){return 2097151}setFromCharData(t){throw new Error("not implemented")}getAsCharData(){return[this.fg,this.getChars(),this.getWidth(),this.getCode()]}};function pt(i,e,t=0){return Math.max(Math.min(i,e),t)}var Ct=class extends W{constructor(t){if(ue&&He()<16){let r={antialias:!1,depth:!1,preserveDrawingBuffer:!0};if(!document.createElement("canvas").getContext("webgl2",r))throw new Error("WebGL2 is only supported on Safari 16 and above")}super();this._onChangeTextureAtlas=this._register(new U);this.onChangeTextureAtlas=this._onChangeTextureAtlas.event;this._onAddTextureAtlasCanvas=this._register(new U);this.onAddTextureAtlasCanvas=this._onAddTextureAtlasCanvas.event;this._onRemoveTextureAtlasCanvas=this._register(new U);this.onRemoveTextureAtlasCanvas=this._onRemoveTextureAtlasCanvas.event;this._onContextLoss=this._register(new U);this.onContextLoss=this._onContextLoss.event;this._customGlyphs=t?.customGlyphs??!0,this._preserveDrawingBuffer=t?.preserveDrawingBuffer}activate(t){let r=t._core;if(!t.element){this._register(r.onWillOpen(()=>this.activate(t)));return}this._terminal=t;let s=r.coreService,a=r.optionsService,o=r,n=o._renderService,L=o._characterJoinerService,T=o._charSizeService,h=o._coreBrowserService,d=o._decorationService,_=o._logService,p=o._themeService;this._renderer=this._register(new Le(t,L,T,h,s,d,_,a,p,this._customGlyphs,this._preserveDrawingBuffer)),this._register(c0.forward(this._renderer.onContextLoss,this._onContextLoss)),this._register(c0.forward(this._renderer.onChangeTextureAtlas,this._onChangeTextureAtlas)),this._register(c0.forward(this._renderer.onAddTextureAtlasCanvas,this._onAddTextureAtlasCanvas)),this._register(c0.forward(this._renderer.onRemoveTextureAtlasCanvas,this._onRemoveTextureAtlasCanvas)),n.setRenderer(this._renderer),this._register(M(()=>{if(this._terminal._core._store._isDisposed)return;let c=this._terminal._core._renderService;c.setRenderer(this._terminal._core._createRenderer()),c.handleResize(t.cols,t.rows)}))}get textureAtlas(){return this._renderer?.textureAtlas}clearTextureAtlas(){this._renderer?.clearTextureAtlas()}};export{Ct as WebglAddon};
 -//# sourceMappingURL=addon-webgl.mjs.map
 +}`,l0=8,Me=l0*Float32Array.BYTES_PER_ELEMENT,e1=20*l0,ne=class{constructor(){;this.attributes=new Float32Array(e1),this.count=0}},p0=0,Lt=0,ht=0,dt=0,_t=0,ct=0,ut=0,ae=class extends W{constructor(t,r,s,a,o){super();this._terminal=t;this._gl=r;this._dimensions=s;this._themeService=a;this._logService=o;this._vertices=new ne;this._verticesCursor=new ne;let n=this._gl;this._program=g(ie(n,jt,Jt,this._logService)),this._register(M(()=>n.deleteProgram(this._program))),this._projectionLocation=g(n.getUniformLocation(this._program,"u_projection"));let L=this._vertexArrayObject=n.createVertexArray();this._register(M(()=>n.deleteVertexArray(L))),n.bindVertexArray(L);let T=new Float32Array([0,0,1,0,0,1,1,1]),h=n.createBuffer();this._register(M(()=>n.deleteBuffer(h))),n.bindBuffer(n.ARRAY_BUFFER,h),n.bufferData(n.ARRAY_BUFFER,T,n.STATIC_DRAW),n.enableVertexAttribArray(3),n.vertexAttribPointer(3,2,this._gl.FLOAT,false,0,0);let d=new Uint8Array([0,1,2,3]),_=n.createBuffer();this._register(M(()=>n.deleteBuffer(_))),n.bindBuffer(n.ELEMENT_ARRAY_BUFFER,_),n.bufferData(n.ELEMENT_ARRAY_BUFFER,d,n.STATIC_DRAW),this._attributesBuffer=g(n.createBuffer()),this._register(M(()=>n.deleteBuffer(this._attributesBuffer))),n.bindBuffer(n.ARRAY_BUFFER,this._attributesBuffer),n.enableVertexAttribArray(0),n.vertexAttribPointer(0,2,n.FLOAT,false,Me,0),n.vertexAttribDivisor(0,1),n.enableVertexAttribArray(1),n.vertexAttribPointer(1,2,n.FLOAT,false,Me,2*Float32Array.BYTES_PER_ELEMENT),n.vertexAttribDivisor(1,1),n.enableVertexAttribArray(2),n.vertexAttribPointer(2,4,n.FLOAT,false,Me,4*Float32Array.BYTES_PER_ELEMENT),n.vertexAttribDivisor(2,1),this._updateCachedColors(a.colors),this._register(this._themeService.onChangeColors(p=>{;this._updateCachedColors(p),this._updateViewportRectangle()}))}renderBackgrounds(){this._renderVertices(this._vertices)}renderCursor(){this._renderVertices(this._verticesCursor)}_renderVertices(t){let r=this._gl;r.useProgram(this._program),r.bindVertexArray(this._vertexArrayObject),r.uniformMatrix4fv(this._projectionLocation,false,te),r.bindBuffer(r.ARRAY_BUFFER,this._attributesBuffer),r.bufferData(r.ARRAY_BUFFER,t.attributes,r.DYNAMIC_DRAW),r.drawElementsInstanced(this._gl.TRIANGLE_STRIP,4,r.UNSIGNED_BYTE,0,t.count)}handleResize(){this._updateViewportRectangle()}setDimensions(t){this._dimensions=t}_updateCachedColors(t){;this._bgFloat=this._colorToFloat32Array(t.background),this._cursorFloat=this._colorToFloat32Array(t.cursor)}_updateViewportRectangle(){this._addRectangleFloat(this._vertices.attributes,0,0,0,this._terminal.cols*this._dimensions.device.cell.width,this._terminal.rows*this._dimensions.device.cell.height,this._bgFloat)}updateBackgrounds(t){let r=this._terminal,s=this._vertices,a=1,o,n,L,T,h,d,_,p,c,u,C;for(o=0;o<r.rows;o++){for(L=-1,T=0,h=0,d=false,n=0;n<r.cols;n++)_=(o*r.cols+n)*4,p=t.cells[_+1],c=t.cells[_+2],u=!!(c&67108864),(p!==T||c!==h&&(d||u))&&((T!==0||d&&h!==0)&&(C=a++*l0,this._updateRectangle(s,C,h,T,L,n,o)),L=n,T=p,h=c,d=u);(T!==0||d&&h!==0)&&(C=a++*l0,this._updateRectangle(s,C,h,T,L,r.cols,o))}s.count=a}updateCursor(t){let r=this._verticesCursor,s=t.cursor;if(!s||s.style==="block"){r.count=0;return}let a,o=0;(s.style==="bar"||s.style==="outline")&&(a=o++*l0,this._addRectangleFloat(r.attributes,a,s.x*this._dimensions.device.cell.width,s.y*this._dimensions.device.cell.height,s.style==="bar"?s.dpr*s.cursorWidth:s.dpr,this._dimensions.device.cell.height,this._cursorFloat)),(s.style==="underline"||s.style==="outline")&&(a=o++*l0,this._addRectangleFloat(r.attributes,a,s.x*this._dimensions.device.cell.width,(s.y+1)*this._dimensions.device.cell.height-s.dpr,s.width*this._dimensions.device.cell.width,s.dpr,this._cursorFloat)),s.style==="outline"&&(a=o++*l0,this._addRectangleFloat(r.attributes,a,s.x*this._dimensions.device.cell.width,s.y*this._dimensions.device.cell.height,s.width*this._dimensions.device.cell.width,s.dpr,this._cursorFloat),a=o++*l0,this._addRectangleFloat(r.attributes,a,(s.x+s.width)*this._dimensions.device.cell.width-s.dpr,s.y*this._dimensions.device.cell.height,s.dpr,this._dimensions.device.cell.height,this._cursorFloat)),r.count=o}_updateRectangle(t,r,s,a,o,n,L){if(s&67108864)switch(s&50331648){case 16777216:case 33554432:p0=this._themeService.colors.ansi[s&255].rgba;break;case 50331648:p0=(s&16777215)<<8;break;case 0:default:p0=this._themeService.colors.foreground.rgba}else switch(a&50331648){case 16777216:case 33554432:p0=this._themeService.colors.ansi[a&255].rgba;break;case 50331648:p0=(a&16777215)<<8;break;case 0:default:p0=this._themeService.colors.background.rgba};t.attributes.length<r+l0&&(t.attributes=ot(t.attributes,(this._terminal.rows*this._terminal.cols+1)*l0)),Lt=o*this._dimensions.device.cell.width,ht=L*this._dimensions.device.cell.height,dt=(p0>>24&255)/255,_t=(p0>>16&255)/255,ct=(p0>>8&255)/255,ut=1,this._addRectangle(t.attributes,r,Lt,ht,(n-o)*this._dimensions.device.cell.width,this._dimensions.device.cell.height,dt,_t,ct,ut)}_addRectangle(t,r,s,a,o,n,L,T,h,d){;t[r]=s/this._dimensions.device.canvas.width,t[r+1]=a/this._dimensions.device.canvas.height,t[r+2]=o/this._dimensions.device.canvas.width,t[r+3]=n/this._dimensions.device.canvas.height,t[r+4]=L,t[r+5]=T,t[r+6]=h,t[r+7]=d}_addRectangleFloat(t,r,s,a,o,n,L){;t[r]=s/this._dimensions.device.canvas.width,t[r+1]=a/this._dimensions.device.canvas.height,t[r+2]=o/this._dimensions.device.canvas.width,t[r+3]=n/this._dimensions.device.canvas.height,t[r+4]=L[0],t[r+5]=L[1],t[r+6]=L[2],t[r+7]=L[3]}_colorToFloat32Array(t){return new Float32Array([(t.rgba>>24&255)/255,(t.rgba>>16&255)/255,(t.rgba>>8&255)/255,(t.rgba&255)/255])}};var oe=class extends W{constructor(t,r,s,a,o,n,L,T){super();this._container=r;this._alpha=o;this._coreBrowserService=n;this._optionsService=L;this._themeService=T;this._deviceCharWidth=0;this._deviceCharHeight=0;this._deviceCellWidth=0;this._deviceCellHeight=0;this._deviceCharLeft=0;this._deviceCharTop=0;this._canvas=this._coreBrowserService.mainDocument.createElement("canvas"),this._canvas.classList.add(`xterm-${s}-layer`),this._canvas.style.zIndex=a.toString(),this._initCanvas(),this._container.appendChild(this._canvas),this._register(this._themeService.onChangeColors(h=>{;this._refreshCharAtlas(t,h),this.reset(t)})),this._register(M(()=>{this._canvas.remove()}))}_initCanvas(){;this._ctx=g(this._canvas.getContext("2d",{alpha:this._alpha})),this._alpha||this._clearAll()}handleBlur(t){}handleFocus(t){}handleCursorMove(t){}handleGridChanged(t,r,s){}handleSelectionChanged(t,r,s,a=false){}_setTransparency(t,r){if(r===this._alpha)return;let s=this._canvas;this._alpha=r,this._canvas=this._canvas.cloneNode(),this._initCanvas(),this._container.replaceChild(this._canvas,s),this._refreshCharAtlas(t,this._themeService.colors),this.handleGridChanged(t,0,t.rows-1)}_refreshCharAtlas(t,r){;this._deviceCharWidth<=0&&this._deviceCharHeight<=0||(this._charAtlas=Y0(t,this._optionsService.rawOptions,r,this._deviceCellWidth,this._deviceCellHeight,this._deviceCharWidth,this._deviceCharHeight,this._coreBrowserService.dpr,2048),this._charAtlas.warmUp())}resize(t,r){;this._deviceCellWidth=r.device.cell.width,this._deviceCellHeight=r.device.cell.height,this._deviceCharWidth=r.device.char.width,this._deviceCharHeight=r.device.char.height,this._deviceCharLeft=r.device.char.left,this._deviceCharTop=r.device.char.top,this._canvas.width=r.device.canvas.width,this._canvas.height=r.device.canvas.height,this._canvas.style.width=`${r.css.canvas.width}px`,this._canvas.style.height=`${r.css.canvas.height}px`,this._alpha||this._clearAll(),this._refreshCharAtlas(t,this._themeService.colors)}_fillBottomLineAtCells(t,r,s=1){this._ctx.fillRect(t*this._deviceCellWidth,(r+1)*this._deviceCellHeight-this._coreBrowserService.dpr-1,s*this._deviceCellWidth,this._coreBrowserService.dpr)}_clearAll(){this._alpha?this._ctx.clearRect(0,0,this._canvas.width,this._canvas.height):(this._ctx.fillStyle=this._themeService.colors.background.css,this._ctx.fillRect(0,0,this._canvas.width,this._canvas.height))}_clearCells(t,r,s,a){this._alpha?this._ctx.clearRect(t*this._deviceCellWidth,r*this._deviceCellHeight,s*this._deviceCellWidth,a*this._deviceCellHeight):(this._ctx.fillStyle=this._themeService.colors.background.css,this._ctx.fillRect(t*this._deviceCellWidth,r*this._deviceCellHeight,s*this._deviceCellWidth,a*this._deviceCellHeight))}_fillCharTrueColor(t,r,s,a){;this._ctx.font=this._getFont(t,false,false),this._ctx.textBaseline=K0,this._clipCell(s,a,r.getWidth()),this._ctx.fillText(r.getChars(),s*this._deviceCellWidth+this._deviceCharLeft,a*this._deviceCellHeight+this._deviceCharTop+this._deviceCharHeight)}_clipCell(t,r,s){;this._ctx.beginPath(),this._ctx.rect(t*this._deviceCellWidth,r*this._deviceCellHeight,s*this._deviceCellWidth,this._deviceCellHeight),this._ctx.clip()}_getFont(t,r,s){let a=r?t.options.fontWeightBold:t.options.fontWeight;return`${s?"italic":""} ${a} ${t.options.fontSize*this._coreBrowserService.dpr}px ${t.options.fontFamily}`}};var Te=class extends oe{constructor(e,t,r,s,a,o,n){;super(r,e,"link",t,true,a,o,n),this._register(s.onShowLinkUnderline(L=>this._handleShowLinkUnderline(L))),this._register(s.onHideLinkUnderline(L=>this._handleHideLinkUnderline(L)))}resize(e,t){;super.resize(e,t),this._state=void 0}reset(e){this._clearCurrentLink()}_clearCurrentLink(){if(this._state){this._clearCells(this._state.x1,this._state.y1,this._state.cols-this._state.x1,1);let e=this._state.y2-this._state.y1-1;e>0&&this._clearCells(0,this._state.y1+1,this._state.cols,e),this._clearCells(0,this._state.y2,this._state.x2,1),this._state=void 0}}_handleShowLinkUnderline(e){if(e.fg===257?this._ctx.fillStyle=this._themeService.colors.background.css:e.fg!==void 0&&st(e.fg)?this._ctx.fillStyle=this._themeService.colors.ansi[e.fg].css:this._ctx.fillStyle=this._themeService.colors.foreground.css,e.y1===e.y2)this._fillBottomLineAtCells(e.x1,e.y1,e.x2-e.x1);else{this._fillBottomLineAtCells(e.x1,e.y1,e.cols-e.x1);for(let t=e.y1+1;t<e.y2;t++)this._fillBottomLineAtCells(0,t,e.cols);this._fillBottomLineAtCells(0,e.y2,e.x2)}this._state=e}_handleHideLinkUnderline(e){this._clearCurrentLink()}};var Ae=class{constructor(e,t,r,s){;this._node=e,this._type=t,this._handler=r,this._options=s,e.addEventListener(t,r,s)}dispose(){!this._node||!this._handler||(this._node.removeEventListener(this._type,this._handler,this._options),this._node=null,this._handler=null)}};function le(i5,e,t,r){return new Ae(i5,e,t,r)}var Le=class extends W{constructor(t,r,s,a,o,n,L,T,h,d=true,_){super();this._terminal=t;this._characterJoinerService=r;this._charSizeService=s;this._coreBrowserService=a;this._coreService=o;this._decorationService=n;this._logService=L;this._optionsService=T;this._themeService=h;this._customGlyphs=d;this._cursorBlinkStateManager=this._register(new m0);this._charAtlasDisposable=this._register(new m0);this._observerDisposable=this._register(new m0);this._model=new se;this._rowHasBlinkingCells=[];this._rowHasBlinkingCellsCount=0;this._workCell=new j0;this._rectangleRenderer=this._register(new m0);this._glyphRenderer=this._register(new m0);this._onChangeTextureAtlas=this._register(new U);this.onChangeTextureAtlas=this._onChangeTextureAtlas.event;this._onAddTextureAtlasCanvas=this._register(new U);this.onAddTextureAtlasCanvas=this._onAddTextureAtlasCanvas.event;this._onRemoveTextureAtlasCanvas=this._register(new U);this.onRemoveTextureAtlasCanvas=this._onRemoveTextureAtlasCanvas.event;this._onRequestRedraw=this._register(new U);this.onRequestRedraw=this._onRequestRedraw.event;this._onContextLoss=this._register(new U);this.onContextLoss=this._onContextLoss.event;this._canvas=this._coreBrowserService.mainDocument.createElement("canvas");let p={antialias:false,depth:false,preserveDrawingBuffer:_};if(this._gl=this._canvas.getContext("webgl2",p),!this._gl)throw new Error("WebGL2 not supported "+this._gl);this._register(this._themeService.onChangeColors(()=>this._handleColorChange())),this._cellColorResolver=new G0(this._terminal,this._optionsService,this._model.selection,this._decorationService,this._coreBrowserService,this._themeService),this._core=this._terminal._core,this._renderLayers=[new Te(this._core.screenElement,2,this._terminal,this._core.linkifier,this._coreBrowserService,T,this._themeService)],this.dimensions=Ue(),this._devicePixelRatio=this._coreBrowserService.dpr,this._updateDimensions(),this._updateCursorBlink(),this._register(T.onOptionChange(()=>this._handleOptionsChanged())),this._textBlinkStateManager=this._register(new J0(()=>this._requestRedrawViewport(),this._coreBrowserService,this._optionsService)),this._resetBlinkingRowState(),this._deviceMaxTextureSize=this._gl.getParameter(this._gl.MAX_TEXTURE_SIZE),this._register(le(this._canvas,"webglcontextlost",c=>{;this._logService.debug("webglcontextlost event received"),c.preventDefault(),this._contextRestorationTimeout=setTimeout(()=>{;this._contextRestorationTimeout=void 0,this._logService.warn("webgl context not restored; firing onContextLoss"),this._onContextLoss.fire(c)},3e3)})),this._register(le(this._canvas,"webglcontextrestored",c=>{;this._logService.warn("webglcontextrestored event received"),clearTimeout(this._contextRestorationTimeout),this._contextRestorationTimeout=void 0,be(this._terminal),this._initializeWebGLState(),this._requestRedrawViewport()})),this._observerDisposable.value=ve(this._canvas,this._coreBrowserService.window,(c,u)=>this._setCanvasDevicePixelDimensions(c,u)),this._register(this._coreBrowserService.onWindowChange(c=>{this._observerDisposable.value=ve(this._canvas,c,(u,C)=>this._setCanvasDevicePixelDimensions(u,C))})),this._register(le(this._coreBrowserService.mainDocument,"mousedown",()=>this._cursorBlinkStateManager.value?.restartBlinkAnimation())),this._core.screenElement.appendChild(this._canvas),[this._rectangleRenderer.value,this._glyphRenderer.value]=this._initializeWebGLState(),this._isAttached=this._core.screenElement.isConnected,this._register(M(()=>{;clearTimeout(this._contextRestorationTimeout),this._contextRestorationTimeout=void 0;for(let c of this._renderLayers)c.dispose();this._canvas.parentElement?.removeChild(this._canvas),be(this._terminal)}))}get textureAtlas(){return this._charAtlas?.pages[0].canvas}_handleColorChange(){;this._refreshCharAtlas(),this._clearModel(true)}handleDevicePixelRatioChange(){this._devicePixelRatio!==this._coreBrowserService.dpr&&(this._devicePixelRatio=this._coreBrowserService.dpr,this.handleResize(this._terminal.cols,this._terminal.rows))}handleResize(t,r){;this._updateDimensions(),this._model.resize(this._terminal.cols,this._terminal.rows),this._resetBlinkingRowState();for(let s of this._renderLayers)s.resize(this._terminal,this.dimensions);this._canvas.width=this.dimensions.device.canvas.width,this._canvas.height=this.dimensions.device.canvas.height,this._canvas.style.width=`${this.dimensions.css.canvas.width}px`,this._canvas.style.height=`${this.dimensions.css.canvas.height}px`,this._core.screenElement.style.width=`${this.dimensions.css.canvas.width}px`,this._core.screenElement.style.height=`${this.dimensions.css.canvas.height}px`,this._rectangleRenderer.value?.setDimensions(this.dimensions),this._rectangleRenderer.value?.handleResize(),this._glyphRenderer.value?.setDimensions(this.dimensions),this._glyphRenderer.value?.handleResize(),this._refreshCharAtlas(),this._clearModel(false),this._onRequestRedraw.fire({start:0,end:this._terminal.rows-1,sync:true})}handleCharSizeChanged(){this.handleResize(this._terminal.cols,this._terminal.rows)}handleBlur(){for(let t of this._renderLayers)t.handleBlur(this._terminal);this._cursorBlinkStateManager.value?.pause(),this._requestRedrawViewport()}handleFocus(){for(let t of this._renderLayers)t.handleFocus(this._terminal);this._cursorBlinkStateManager.value?.resume(),this._requestRedrawViewport()}handleViewportVisibilityChange(t){this._textBlinkStateManager.setViewportVisible(t)}handleSelectionChanged(t,r,s){for(let a of this._renderLayers)a.handleSelectionChanged(this._terminal,t,r,s);this._model.selection.update(this._core,t,r,s),this._requestRedrawViewport()}handleCursorMove(){for(let t of this._renderLayers)t.handleCursorMove(this._terminal);this._cursorBlinkStateManager.value?.restartBlinkAnimation()}_handleOptionsChanged(){;this._updateDimensions(),this._refreshCharAtlas(),this._updateCursorBlink()}_initializeWebGLState(){return this._rectangleRenderer.value=new ae(this._terminal,this._gl,this.dimensions,this._themeService,this._logService),this._glyphRenderer.value=new re(this._terminal,this._gl,this.dimensions,this._optionsService,this._logService),this.handleCharSizeChanged(),[this._rectangleRenderer.value,this._glyphRenderer.value]}_refreshCharAtlas(){if(this.dimensions.device.char.width<=0&&this.dimensions.device.char.height<=0){this._isAttached=false;return}let t=Y0(this._terminal,this._optionsService.rawOptions,this._themeService.colors,this.dimensions.device.cell.width,this.dimensions.device.cell.height,this.dimensions.device.char.width,this.dimensions.device.char.height,this._coreBrowserService.dpr,this._deviceMaxTextureSize,this._customGlyphs);this._charAtlas!==t&&(this._onChangeTextureAtlas.fire(t.pages[0].canvas),this._charAtlasDisposable.value=De(c0.forward(t.onAddTextureAtlasCanvas,this._onAddTextureAtlasCanvas),c0.forward(t.onRemoveTextureAtlasCanvas,this._onRemoveTextureAtlasCanvas))),this._charAtlas=t,this._charAtlas.warmUp(),this._glyphRenderer.value?.setAtlas(this._charAtlas)}_clearModel(t){;this._model.clear(),t&&this._glyphRenderer.value?.clear()}clearTextureAtlas(){;this._charAtlas?.clearTexture(),this._clearModel(true),this._requestRedrawViewport()}clear(){this._clearModel(true);for(let t of this._renderLayers)t.reset(this._terminal);this._resetBlinkingRowState(),this._textBlinkStateManager.setNeedsBlinkInViewport(false),this._cursorBlinkStateManager.value?.restartBlinkAnimation(),this._updateCursorBlink()}renderRows(t,r){if(!this._isAttached)if(this._core.screenElement?.isConnected&&this._charSizeService.width&&this._charSizeService.height)this._updateDimensions(),this._refreshCharAtlas(),this._isAttached=true;else return;for(let o of this._renderLayers)o.handleGridChanged(this._terminal,t,r);if(!this._glyphRenderer.value||!this._rectangleRenderer.value)return;this._glyphRenderer.value.beginFrame()?(this._clearModel(true),this._updateModel(0,this._terminal.rows-1)):this._updateModel(t,r);let s=false,a=0;for(;this._charAtlas&&a++<32&&this._glyphRenderer.value.beginFrame();)s=true,this._clearModel(true),this._updateModel(0,this._terminal.rows-1);s&&this._glyphRenderer.value.invalidateAtlasTextures(),this._rectangleRenderer.value.renderBackgrounds(),this._glyphRenderer.value.render(this._model),(!this._cursorBlinkStateManager.value||this._cursorBlinkStateManager.value.isCursorVisible)&&this._rectangleRenderer.value.renderCursor()}_updateCursorBlink(){;this._coreService.decPrivateModes.cursorBlink??this._terminal.options.cursorBlink?this._cursorBlinkStateManager.value=new q0(()=>{this._requestRedrawCursor()},this._coreBrowserService):this._cursorBlinkStateManager.clear(),this._requestRedrawCursor()}_updateModel(t,r){let s=this._core,a=this._workCell,o,n,L,T,h,d,_,p,c,u,C,Q,m,R,F,E,y;t=pt(t,s.rows-1,0),r=pt(r,s.rows-1,0);let Y=this._coreService.decPrivateModes.cursorStyle??s.options.cursorStyle??"block",X=this._terminal.buffer.active.baseY+this._terminal.buffer.active.cursorY,A0=X-s.buffer.ydisp,t0=Math.min(this._terminal.buffer.active.cursorX,s.cols-1),L0=-1,A=this._coreService.isCursorInitialized&&!this._coreService.isCursorHidden&&(!this._cursorBlinkStateManager.value||this._cursorBlinkStateManager.value.isCursorVisible);this._model.cursor=void 0;let n0=false;for(n=t;n<=r;n++){L=n+s.buffer.ydisp;let a0=s.buffer.lines.get(L);if(!a0){for(this._model.lineLengths[n]=0,E=0;E<s.cols;E++)y=(n*s.cols+E)*4,n0=true,this._nullModelCell(E,n,y,0,0,0);this._setRowBlinkState(n,false);continue}T=a0;let $=false;for(this._model.lineLengths[n]=0,C=X===L,_=0,h=this._characterJoinerService.getJoinedCharacters(L),E=0;E<s.cols;E++){if(o=this._cellColorResolver.result.bg,T.loadCell(E,a),E===0&&(o=this._cellColorResolver.result.bg),d=false,p=E>=_,c=E,h.length>0&&E===h[0][0]&&p){u=h.shift();let q=this._model.selection.isCellSelected(this._terminal,u[0],L);for(F=u[0]+1;F<u[1];F++)p&&=q===this._model.selection.isCellSelected(this._terminal,F,L);p&&=!C||t0<u[0]||t0>=u[1],p?(d=true,a=new ge(a,T.translateToString(true,u[0],u[1]),u[1]-u[0]),c=u[1]-1):_=u[1]}if(Q=a.getChars(),m=a.getCode(),F=(n*s.cols+E)*4,!$&&a.isBlink()&&($=true),this._cellColorResolver.resolve(a,E,L,this.dimensions.device.cell.width,this.dimensions.device.cell.height),A&&L===X&&(E===t0&&(this._model.cursor={x:t0,y:A0,width:a.getWidth(),style:this._coreBrowserService.isFocused?Y:s.options.cursorInactiveStyle,cursorWidth:s.options.cursorWidth,dpr:this._devicePixelRatio},L0=t0+a.getWidth()-1),E>=t0&&E<=L0&&(this._coreBrowserService.isFocused&&Y==="block"||this._coreBrowserService.isFocused===false&&s.options.cursorInactiveStyle==="block")&&(this._cellColorResolver.result.fg=50331648|this._themeService.colors.cursorAccent.rgba>>8&16777215,this._cellColorResolver.result.bg=50331648|this._themeService.colors.cursor.rgba>>8&16777215)),this._textBlinkStateManager.isEnabled&&!this._textBlinkStateManager.isBlinkOn&&a.isBlink()&&(this._cellColorResolver.result.fg|=1073741824),m!==0&&(this._model.lineLengths[n]=E+1),!(this._model.cells[F]===m&&this._model.cells[F+1]===this._cellColorResolver.result.bg&&this._model.cells[F+2]===this._cellColorResolver.result.fg&&this._model.cells[F+3]===this._cellColorResolver.result.ext)&&(n0=true,Q.length>1&&(m|=lt),this._model.cells[F]=m,this._model.cells[F+1]=this._cellColorResolver.result.bg,this._model.cells[F+2]=this._cellColorResolver.result.fg,this._model.cells[F+3]=this._cellColorResolver.result.ext,R=a.getWidth(),this._glyphRenderer.value.updateCell(E,n,m,this._cellColorResolver.result.bg,this._cellColorResolver.result.fg,this._cellColorResolver.result.ext,Q,R,o),d)){for(a=this._workCell,E++;E<=c;E++)y=(n*s.cols+E)*4,this._nullModelCell(E,n,y,this._cellColorResolver.result.bg,this._cellColorResolver.result.fg,this._cellColorResolver.result.ext);E--}}this._setRowBlinkState(n,$)};n0&&this._rectangleRenderer.value.updateBackgrounds(this._model),this._rectangleRenderer.value.updateCursor(this._model),this._updateTextBlinkState()}_nullModelCell(t,r,s,a,o,n){;this._glyphRenderer.value.updateCell(t,r,0,a,o,n,"",0,0),this._model.cells[s]=0,this._model.cells[s+1]=a,this._model.cells[s+2]=o,this._model.cells[s+3]=n}_resetBlinkingRowState(){;this._rowHasBlinkingCells=new Array(this._terminal.rows).fill(false),this._rowHasBlinkingCellsCount=0}_setRowBlinkState(t,r){this._rowHasBlinkingCells[t]!==r&&(this._rowHasBlinkingCells[t]=r,this._rowHasBlinkingCellsCount+=r?1:-1)}_updateTextBlinkState(){this._textBlinkStateManager.setNeedsBlinkInViewport(this._rowHasBlinkingCellsCount>0)}_updateDimensions(){!this._charSizeService.width||!this._charSizeService.height||(this.dimensions.device.char.width=Math.floor(this._charSizeService.width*this._devicePixelRatio),this.dimensions.device.char.height=Math.ceil(this._charSizeService.height*this._devicePixelRatio),this.dimensions.device.cell.height=Math.floor(this.dimensions.device.char.height*this._optionsService.rawOptions.lineHeight),this.dimensions.device.char.top=this._optionsService.rawOptions.lineHeight===1?0:Math.round((this.dimensions.device.cell.height-this.dimensions.device.char.height)/2),this.dimensions.device.cell.width=this.dimensions.device.char.width+Math.round(this._optionsService.rawOptions.letterSpacing),this.dimensions.device.char.left=Math.floor(this._optionsService.rawOptions.letterSpacing/2),this.dimensions.device.canvas.height=this._terminal.rows*this.dimensions.device.cell.height,this.dimensions.device.canvas.width=this._terminal.cols*this.dimensions.device.cell.width,this.dimensions.css.canvas.height=Math.round(this.dimensions.device.canvas.height/this._devicePixelRatio),this.dimensions.css.canvas.width=Math.round(this.dimensions.device.canvas.width/this._devicePixelRatio),this.dimensions.css.cell.height=this.dimensions.device.cell.height/this._devicePixelRatio,this.dimensions.css.cell.width=this.dimensions.device.cell.width/this._devicePixelRatio)}_setCanvasDevicePixelDimensions(t,r){;this._canvas.width===t&&this._canvas.height===r||(this._canvas.width=t,this._canvas.height=r,this._onRequestRedraw.fire({start:0,end:this._terminal.rows-1,sync:true}))}_requestRedrawViewport(){this._onRequestRedraw.fire({start:0,end:this._terminal.rows-1})}_requestRedrawCursor(){let t=this._terminal.buffer.active.cursorY;this._onRequestRedraw.fire({start:t,end:t})}},ge=class extends s0{constructor(t,r,s){super();this.content=0;this.combinedData="";this.fg=t.fg,this.bg=t.bg,this.combinedData=r,this._width=s}isCombined(){return 2097152}getWidth(){return this._width}getChars(){return this.combinedData}getCode(){return 2097151}setFromCharData(t){throw new Error("not implemented")}getAsCharData(){return[this.fg,this.getChars(),this.getWidth(),this.getCode()]}};function pt(i5,e,t=0){return Math.max(Math.min(i5,e),t)}var Ct=class extends W{constructor(t){if(ue&&He()<16){let r={antialias:false,depth:false,preserveDrawingBuffer:true};if(!document.createElement("canvas").getContext("webgl2",r))throw new Error("WebGL2 is only supported on Safari 16 and above")}super();this._onChangeTextureAtlas=this._register(new U);this.onChangeTextureAtlas=this._onChangeTextureAtlas.event;this._onAddTextureAtlasCanvas=this._register(new U);this.onAddTextureAtlasCanvas=this._onAddTextureAtlasCanvas.event;this._onRemoveTextureAtlasCanvas=this._register(new U);this.onRemoveTextureAtlasCanvas=this._onRemoveTextureAtlasCanvas.event;this._onContextLoss=this._register(new U);this.onContextLoss=this._onContextLoss.event;this._customGlyphs=t?.customGlyphs??true,this._preserveDrawingBuffer=t?.preserveDrawingBuffer}activate(t){let r=t._core;if(!t.element){this._register(r.onWillOpen(()=>this.activate(t)));return}this._terminal=t;let s=r.coreService,a=r.optionsService,o=r,n=o._renderService,L=o._characterJoinerService,T=o._charSizeService,h=o._coreBrowserService,d=o._decorationService,_=o._logService,p=o._themeService;this._renderer=this._register(new Le(t,L,T,h,s,d,_,a,p,this._customGlyphs,this._preserveDrawingBuffer)),this._register(c0.forward(this._renderer.onContextLoss,this._onContextLoss)),this._register(c0.forward(this._renderer.onChangeTextureAtlas,this._onChangeTextureAtlas)),this._register(c0.forward(this._renderer.onAddTextureAtlasCanvas,this._onAddTextureAtlasCanvas)),this._register(c0.forward(this._renderer.onRemoveTextureAtlasCanvas,this._onRemoveTextureAtlasCanvas)),n.setRenderer(this._renderer),this._register(M(()=>{if(this._terminal._core._store._isDisposed)return;let c=this._terminal._core._renderService;c.setRenderer(this._terminal._core._createRenderer()),c.handleResize(t.cols,t.rows)}))}get textureAtlas(){return this._renderer?.textureAtlas}clearTextureAtlas(){this._renderer?.clearTextureAtlas()}};export{Ct as WebglAddon};
-diff -ruN a/src/GlyphRenderer.ts b/src/GlyphRenderer.ts
+diff --git a/src/GlyphRenderer.ts b/src/GlyphRenderer.ts
 --- a/src/GlyphRenderer.ts
 +++ b/src/GlyphRenderer.ts
 @@ -74,7 +74,11 @@
@@ -142,7 +142,7 @@ diff -ruN a/src/GlyphRenderer.ts b/src/GlyphRenderer.ts
      this.invalidateAtlasTextures();
    }
  
-diff -ruN a/src/TextureAtlas.ts b/src/TextureAtlas.ts
+diff --git a/src/TextureAtlas.ts b/src/TextureAtlas.ts
 --- a/src/TextureAtlas.ts
 +++ b/src/TextureAtlas.ts
 @@ -133,6 +133,7 @@
@@ -299,7 +299,7 @@ diff -ruN a/src/TextureAtlas.ts b/src/TextureAtlas.ts
            this._onAddTextureAtlasCanvas.fire(this._overflowSizePage.canvas);
          }
          activePage = this._overflowSizePage;
-diff -ruN a/src/Types.ts b/src/Types.ts
+diff --git a/src/Types.ts b/src/Types.ts
 --- a/src/Types.ts
 +++ b/src/Types.ts
 @@ -59,6 +59,9 @@
@@ -312,7 +312,7 @@ diff -ruN a/src/Types.ts b/src/Types.ts
    onAddTextureAtlasCanvas: IEvent<HTMLCanvasElement>;
    onRemoveTextureAtlasCanvas: IEvent<HTMLCanvasElement>;
  
-diff -ruN a/src/WebglRenderer.ts b/src/WebglRenderer.ts
+diff --git a/src/WebglRenderer.ts b/src/WebglRenderer.ts
 --- a/src/WebglRenderer.ts
 +++ b/src/WebglRenderer.ts
 @@ -386,7 +386,10 @@
diff --git a/config/reliability-gates.jsonc b/config/reliability-gates.jsonc
index 10143d9019c..4dea7b1e3e2 100644
--- a/config/reliability-gates.jsonc
+++ b/config/reliability-gates.jsonc
@@ -6345,8 +6345,8 @@
         "https://github.com/stablyai/orca/issues/16457",
         "https://github.com/stablyai/orca/pull/17128"
       ],
-      "invariant": "A fresh local renderer terminal spawn may recover from a saved startup cwd whose directory no longer exists only by spawning at the selected workspace root and printing a generic in-terminal notice; existing directories — including ones outside the worktree (#7685) — spawn as requested, and reattach, SSH, remote-runtime, runtime/API, and mobile callers keep exact cwd semantics. A long-lived POSIX shell whose cwd inode was deleted and replaced may run an extension-enabled OMP launch from the live path named by its logical PWD only in a subshell; the parent shell cwd, OMP argv, status extension, and exit status remain unchanged, while a genuinely unavailable path fails visibly without invoking OMP. A usable current directory remains authoritative when PWD is unset instead of being remapped to a workspace fallback.",
-      "oracle": "The shared resolver falls back to the workspace root only when the injected existence probe reports the resolved cwd missing and the workspace root present, and never probes floating terminals or a cwd equal to the root. The renderer sends cwdFallback only for fresh local IPC spawns, main honors it only when connectionId and sessionId are absent, WSL UNC paths never engage the probe-based fallback, main returns fallback metadata only after an actual fallback, the IPC transport preserves that metadata, and the connection layer writes a generic notice that omits the missing path. In real interactive Bash and Zsh PTYs, unset PWD in a usable nested directory and require OMP to stay there rather than remap to ORCA_WORKTREE_PATH; then delete and recreate the active project path, require OMP to observe the replacement inode with byte-exact extension argv and its nonzero status preserved, require the parent shell to remain on the stale inode, and finally delete the replacement and require an actionable failure before the fake OMP binary runs again.",
+      "invariant": "A fresh local renderer terminal spawn may recover from a saved startup cwd whose directory no longer exists only by spawning at the selected workspace root and printing a generic in-terminal notice; existing directories — including ones outside the worktree (#7685) — spawn as requested, and reattach, SSH, remote-runtime, runtime/API, and mobile callers keep exact cwd semantics. A long-lived POSIX shell whose cwd inode was deleted and replaced may run a wrapped OMP command from the live path named by its logical PWD only in a subshell; the parent shell cwd, OMP argv, status extension, and exit status remain unchanged, while a genuinely unavailable path fails visibly without invoking OMP. A usable physical cwd remains authoritative when PWD is unset or names a removed logical symlink instead of being remapped to a workspace fallback.",
+      "oracle": "The shared resolver falls back to the workspace root only when the injected existence probe reports the resolved cwd missing and the workspace root present, and never probes floating terminals or a cwd equal to the root. The renderer sends cwdFallback only for fresh local IPC spawns, main honors it only when connectionId and sessionId are absent, WSL UNC paths never engage the probe-based fallback, main returns fallback metadata only after an actual fallback, the IPC transport preserves that metadata, and the connection layer writes a generic notice that omits the missing path. In real interactive Bash and Zsh PTYs, unset PWD and remove a logical symlink while the physical cwd stays usable, requiring OMP to remain there; then delete and recreate the active project path, require extension-enabled and extension-skipping invocations to observe the replacement inode with byte-exact argv and nonzero status preserved, require the parent shell to remain on the stale inode, unset PWD and require recovery through ORCA_WORKTREE_PATH, clear every logical fallback and require an actionable failure without invoking OMP, and finally delete the replacement and require the same for the missing PWD path.",
       "commands": [
         "pnpm exec vitest run --config config/vitest.config.ts src/shared/terminal-startup-cwd.test.ts",
         "pnpm exec vitest run --config config/vitest.config.ts src/main/ipc/pty-spawn-cwd-fallback.test.ts src/main/ipc/pty-wsl-cwd-validation.test.ts",
@@ -6410,6 +6410,10 @@
           "assertions": [
             "real Bash and Zsh PTYs rebind OMP to a recreated cwd inode without changing the parent shell",
             "an unset PWD with a usable cwd stays unset and does not remap OMP to ORCA_WORKTREE_PATH",
+            "a removed logical symlink does not invalidate its still-usable physical cwd",
+            "extension-skipping commands such as omp --version still recover the cwd without gaining extension argv",
+            "an unset PWD on a stale inode recovers through ORCA_WORKTREE_PATH",
+            "an unset PWD on a stale inode without a logical fallback fails visibly before invoking OMP",
             "extension argv and a nonzero OMP exit status survive the recovery subshell",
             "a subsequently missing logical cwd prints an actionable error and does not invoke OMP again"
           ]
@@ -6465,7 +6469,7 @@
           "command": "pnpm exec vitest run --config config/vitest.config.ts src/main/pty/omp-shell-wrapper.node-pty.test.ts src/main/pty/omp-shell-wrapper-alias-safety.test.ts src/main/shell-wrapper-generated-file-snapshot.test.ts",
           "result": "passed",
           "durationSeconds": 3,
-          "summary": "3 test files passed; real Bash and Zsh PTYs covered unset-PWD authority, stale-inode recovery, parent-shell isolation, extension argv, exit status, missing-path visibility, alias safety, and generated local/daemon/relay parity."
+          "summary": "3 test files passed; real Bash and Zsh PTYs covered usable physical cwd authority, stale-inode recovery with set and unset PWD, extension-enabled and extension-skipping argv, parent-shell isolation, exit status, missing-path visibility, alias safety, and generated local/daemon/relay parity."
         }
       ],
       "runtimeBudget": {
@@ -6482,7 +6486,7 @@
       },
       "performanceBudget": {
         "required": true,
-        "evidence": "The spawn recovery adds at most two statSync probes on the fresh-local spawn path (the provider already stats the same paths during validation) and one bounded terminal write only when fallback actually occurs. Each extension-enabled OMP launch adds a constant number of shell filesystem predicates; only a detected stale/unusable cwd creates one short recovery subshell. No polling, retry, provider listing, hidden-pane work, startup awaits, extra OMP subprocesses, or render-loop work was added."
+        "evidence": "The spawn recovery adds at most two statSync probes on the fresh-local spawn path (the provider already stats the same paths during validation) and one bounded terminal write only when fallback actually occurs. Each wrapped OMP launch adds a constant number of shell filesystem predicates; only a detected stale/unusable cwd creates one short recovery subshell. No polling, retry, provider listing, hidden-pane work, startup awaits, extra OMP subprocesses, or render-loop work was added."
       },
       "promotionCriteria": [
         "Attach CI evidence for all declared test files.",
diff --git a/config/scripts/build-native-for-platform.mjs b/config/scripts/build-native-for-platform.mjs
index c90ecfd4146..d6294f4b5c7 100755
--- a/config/scripts/build-native-for-platform.mjs
+++ b/config/scripts/build-native-for-platform.mjs
@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 
 import { spawnSync } from 'node:child_process'
+import { resolvePnpmCliInvocation } from './pnpm-cli-invocation.mjs'
 
 if (process.platform === 'win32') {
   runNodeScript('config/scripts/build-windows-cli-launcher.mjs')
@@ -18,14 +19,8 @@ runPnpmScript('build:notification-status-macos')
 process.exit(0)
 
 function runPnpmScript(scriptName) {
-  const npmExecPath = process.env.npm_execpath
-  const command = npmExecPath
-    ? process.execPath
-    : process.platform === 'win32'
-      ? 'pnpm.cmd'
-      : 'pnpm'
-  const args = npmExecPath ? [npmExecPath, 'run', scriptName] : ['run', scriptName]
-  const result = spawnSync(command, args, { stdio: 'inherit' })
+  const { command, prefixArgs, shell } = resolvePnpmCliInvocation()
+  const result = spawnSync(command, [...prefixArgs, 'run', scriptName], { stdio: 'inherit', shell })
 
   if (result.signal) {
     process.kill(process.pid, result.signal)
diff --git a/config/scripts/build-windows-process-tree-relay-addon.mjs b/config/scripts/build-windows-process-tree-relay-addon.mjs
index 364335e537c..d3b9db939cd 100644
--- a/config/scripts/build-windows-process-tree-relay-addon.mjs
+++ b/config/scripts/build-windows-process-tree-relay-addon.mjs
@@ -29,11 +29,11 @@ import {
   readSync,
   writeFileSync
 } from 'node:fs'
-import { createRequire } from 'node:module'
-import { dirname, join, resolve } from 'node:path'
+import { join, resolve } from 'node:path'
 import { RELAY_WINDOWS_PROCESS_TREE_FILENAME } from '../../src/shared/relay-artifacts.ts'
 import {
   nodeGypRebuildInvocation,
+  stageWindowsProcessTreeNodeAddonApiHeaders,
   WINDOWS_PROCESS_TREE_PACKAGE_DIR as PACKAGE_DIR
 } from './windows-process-tree-gyp-rebuild.mjs'
 
@@ -96,10 +96,6 @@ function assertPatchApplied() {
 function applyWindowsProcessTreeBuildFixes() {
   const bindingPath = join(PACKAGE_DIR, 'binding.gyp')
   const processPath = join(PACKAGE_DIR, 'src', 'process.cc')
-  const nodeAddonApiDir = dirname(
-    createRequire(join(PACKAGE_DIR, 'package.json')).resolve('node-addon-api/package.json')
-  )
-  const stagedHeaderDir = join(PACKAGE_DIR, 'deps', 'node-addon-api')
   let bindingGyp = readFileSync(bindingPath, 'utf8')
   let processCc = readFileSync(processPath, 'utf8')
   const originalBinding = bindingGyp
@@ -134,10 +130,7 @@ function applyWindowsProcessTreeBuildFixes() {
   if (processCc !== originalProcess) {
     writeFileSync(processPath, processCc)
   }
-  mkdirSync(stagedHeaderDir, { recursive: true })
-  for (const header of ['napi.h', 'napi-inl.h', 'napi-inl.deprecated.h']) {
-    copyFileSync(join(nodeAddonApiDir, header), join(stagedHeaderDir, header))
-  }
+  stageWindowsProcessTreeNodeAddonApiHeaders(PACKAGE_DIR)
   if (bindingGyp !== originalBinding || processCc !== originalProcess) {
     console.warn('[windows-process-tree] Repaired un-applied pnpm patch hunks before build.')
   }
diff --git a/config/scripts/computer-e2e-workflow.test.mjs b/config/scripts/computer-e2e-workflow.test.mjs
index 36a5d701f5e..8e7d9a70197 100644
--- a/config/scripts/computer-e2e-workflow.test.mjs
+++ b/config/scripts/computer-e2e-workflow.test.mjs
@@ -171,7 +171,7 @@ describe('computer-use e2e workflow', () => {
       expect(checkout.with['persist-credentials'], jobName).toBe(false)
       expect(install.with['native-runtime'], jobName).toBe('electron')
       expect(
-        job.steps.some((step) => step.uses === 'pnpm/action-setup@v6'),
+        job.steps.some((step) => step.uses === 'pnpm/setup@v2'),
         jobName
       ).toBe(false)
       expect(
diff --git a/config/scripts/ensure-native-runtime.mjs b/config/scripts/ensure-native-runtime.mjs
index 424b671b11e..a4cc6db8843 100644
--- a/config/scripts/ensure-native-runtime.mjs
+++ b/config/scripts/ensure-native-runtime.mjs
@@ -377,7 +377,8 @@ function rebuildNodeRuntimeModules(moduleNames) {
 }
 
 function runPnpm(args, { cwd = projectDir } = {}) {
-  const command = process.platform === 'win32' ? 'pnpm.cmd' : 'pnpm'
+  // cmd.exe resolves both Corepack's pnpm.cmd and pnpm 12's native pnpm.exe.
+  const command = 'pnpm'
   const env =
     process.platform === 'linux' && args.includes('node-gyp')
       ? { ...process.env, CXXFLAGS: `${process.env.CXXFLAGS ?? ''} -std=gnu++2a`.trim() }
diff --git a/config/scripts/install-node-dependencies-action.test.mjs b/config/scripts/install-node-dependencies-action.test.mjs
index a90747513a1..3b20a0eb07e 100644
--- a/config/scripts/install-node-dependencies-action.test.mjs
+++ b/config/scripts/install-node-dependencies-action.test.mjs
@@ -24,10 +24,15 @@ function createFixture() {
   for (const directory of [workspace, detachedCwd]) {
     writeFileSync(join(directory, 'package.json'), '{"name":"fixture"}\n')
     writeFileSync(join(directory, 'pnpm-lock.yaml'), 'lockfileVersion: 9\n')
+    writeFileSync(join(directory, 'pnpm-workspace.yaml'), 'packages: []\n')
   }
 
   expect(run('git', ['init', '-q'], { cwd: workspace }).status).toBe(0)
-  expect(run('git', ['add', 'package.json', 'pnpm-lock.yaml'], { cwd: workspace }).status).toBe(0)
+  expect(
+    run('git', ['add', 'package.json', 'pnpm-lock.yaml', 'pnpm-workspace.yaml'], {
+      cwd: workspace
+    }).status
+  ).toBe(0)
 
   const pnpm = join(bin, 'pnpm')
   writeFileSync(pnpm, '#!/bin/sh\nexit 0\n')
@@ -76,7 +81,8 @@ describe('install-node-dependencies action', () => {
 
   it.each([
     ['package.json', '{"name":"changed"}\n'],
-    ['pnpm-lock.yaml', 'lockfileVersion: 9\nchanged: true\n']
+    ['pnpm-lock.yaml', 'lockfileVersion: 9\nchanged: true\n'],
+    ['pnpm-workspace.yaml', 'packages: []\nchanged: true\n']
   ])('rejects a changed %s when the composite step cwd is detached', (file, contents) => {
     const fixture = createFixture()
     try {
diff --git a/config/scripts/package-electron-runtime-contract.test.mjs b/config/scripts/package-electron-runtime-contract.test.mjs
index 64b2f96505a..05ad5bd47d7 100644
--- a/config/scripts/package-electron-runtime-contract.test.mjs
+++ b/config/scripts/package-electron-runtime-contract.test.mjs
@@ -8,14 +8,13 @@ import { relayArtifactFilenames } from '../../src/shared/relay-artifacts.ts'
 const projectDir = resolve(import.meta.dirname, '../..')
 const require = createRequire(import.meta.url)
 const { createPackagedRuntimeNodeModuleResources } = require('../packaged-runtime-node-modules.cjs')
-const packageJson = JSON.parse(readFileSync(join(projectDir, 'package.json'), 'utf8'))
+const readProject = (file) => readFileSync(join(projectDir, file), 'utf8')
+const packageJson = JSON.parse(readProject('package.json'))
+const pnpmWorkspace = parse(readProject('pnpm-workspace.yaml'))
 
 describe('Electron runtime package contract', () => {
   it('keeps shared WebGL atlas invalidation reproducible from vendored source', () => {
-    const patch = readFileSync(
-      join(projectDir, 'config/patches/@xterm__addon-webgl@0.20.0-beta.286.patch'),
-      'utf8'
-    )
+    const patch = readProject('config/patches/@xterm__addon-webgl@0.20.0-beta.286.patch')
 
     expect(patch).toContain('readonly clearModelGeneration: number')
     expect(patch).toContain('const generation = this._atlas.clearModelGeneration')
@@ -26,7 +25,7 @@ describe('Electron runtime package contract', () => {
 
   it('keeps root postinstall as the single Electron binary install owner', () => {
     expect(packageJson.scripts.postinstall).toBe('node config/scripts/rebuild-native-deps.mjs')
-    expect(packageJson.pnpm.onlyBuiltDependencies).not.toContain('electron')
+    expect(pnpmWorkspace.allowBuilds).not.toHaveProperty('electron')
   })
 
   it('keeps the native Windows registry addon optional and platform-gated', () => {
@@ -41,7 +40,7 @@ describe('Electron runtime package contract', () => {
     expect(packageJson.optionalDependencies['windows-native-registry']).toBe('3.2.2')
     // Why: pnpm installs optional target architectures on every host; the root
     // Windows-only rebuild owns this addon so macOS/Linux never run node-gyp for it.
-    expect(packageJson.pnpm.onlyBuiltDependencies).not.toContain('windows-native-registry')
+    expect(pnpmWorkspace.allowBuilds['windows-native-registry']).toBe(false)
     // Why assert the guard and the member separately: the list now carries more
     // than one addon, so pinning the whole literal only tested its formatting.
     expect(rebuildScript).toContain("rebuildPlatform === 'win32'")
@@ -80,14 +79,14 @@ describe('Electron runtime package contract', () => {
     expect(packageJson.optionalDependencies['@vscode/windows-process-tree']).toBe('0.8.0')
     // Why: same rule as the registry addon -- pnpm installs optional deps on
     // every host, so macOS/Linux must never run node-gyp for a Windows addon.
-    expect(packageJson.pnpm.onlyBuiltDependencies).not.toContain('@vscode/windows-process-tree')
+    expect(pnpmWorkspace.allowBuilds['@vscode/windows-process-tree']).toBe(false)
     expect(rebuildScript).toContain("'@vscode/windows-process-tree'")
     expect(ensureScript).toContain("'@vscode/windows-process-tree'")
     // Why pin the patch: the upstream binding.gyp requires Spectre-mitigated
     // libraries our build agents do not carry, and the enumeration stops after
     // 1024 processes -- on a busy host that silently hides the very descendants
     // teardown is looking for.
-    expect(packageJson.pnpm.patchedDependencies['@vscode/windows-process-tree@0.8.0']).toBe(
+    expect(pnpmWorkspace.patchedDependencies['@vscode/windows-process-tree@0.8.0']).toBe(
       'config/patches/@vscode__windows-process-tree@0.8.0.patch'
     )
     const packageTargets = {
diff --git a/config/scripts/pnpm-cli-invocation.mjs b/config/scripts/pnpm-cli-invocation.mjs
new file mode 100644
index 00000000000..8378efd7f37
--- /dev/null
+++ b/config/scripts/pnpm-cli-invocation.mjs
@@ -0,0 +1,26 @@
+// pnpm 12's npm_execpath is a native binary; feeding it to node broke hourly/adhoc macOS builds.
+
+const JS_CLI_EXTENSION = /\.[cm]?js$/i
+
+export function resolvePnpmCliInvocation({
+  npmExecPath = process.env.npm_execpath,
+  nodeExecPath = process.execPath,
+  platform = process.platform
+} = {}) {
+  if (typeof npmExecPath === 'string' && npmExecPath.length > 0) {
+    if (JS_CLI_EXTENSION.test(npmExecPath)) {
+      return { command: nodeExecPath, prefixArgs: [npmExecPath], shell: false }
+    }
+    return {
+      command: npmExecPath,
+      prefixArgs: [],
+      shell: platform === 'win32' && /\.(cmd|bat)$/i.test(npmExecPath)
+    }
+  }
+
+  return {
+    command: platform === 'win32' ? 'pnpm.cmd' : 'pnpm',
+    prefixArgs: [],
+    shell: platform === 'win32'
+  }
+}
diff --git a/config/scripts/pnpm-cli-invocation.test.mjs b/config/scripts/pnpm-cli-invocation.test.mjs
new file mode 100644
index 00000000000..191599e166d
--- /dev/null
+++ b/config/scripts/pnpm-cli-invocation.test.mjs
@@ -0,0 +1,100 @@
+import { readFileSync } from 'node:fs'
+import { describe, expect, it } from 'vitest'
+import { resolvePnpmCliInvocation } from './pnpm-cli-invocation.mjs'
+
+const nodeExecPath = '/usr/local/bin/node'
+
+describe('resolvePnpmCliInvocation', () => {
+  it('runs a JS CLI through node so older pnpm.cjs still works', () => {
+    expect(
+      resolvePnpmCliInvocation({
+        npmExecPath: '/Users/runner/setup-pnpm/node_modules/pnpm/bin/pnpm.cjs',
+        nodeExecPath,
+        platform: 'darwin'
+      })
+    ).toEqual({
+      command: nodeExecPath,
+      prefixArgs: ['/Users/runner/setup-pnpm/node_modules/pnpm/bin/pnpm.cjs'],
+      shell: false
+    })
+  })
+
+  it('executes pnpm 12 native binaries directly instead of through node', () => {
+    expect(
+      resolvePnpmCliInvocation({
+        npmExecPath: '/Users/runner/setup-pnpm/pnpm',
+        nodeExecPath,
+        platform: 'darwin'
+      })
+    ).toEqual({
+      command: '/Users/runner/setup-pnpm/pnpm',
+      prefixArgs: [],
+      shell: false
+    })
+  })
+
+  it('does not wrap a Windows native pnpm.exe in node', () => {
+    expect(
+      resolvePnpmCliInvocation({
+        npmExecPath: 'C:\\hostedtoolcache\\pnpm.exe',
+        nodeExecPath: 'C:\\Program Files\\nodejs\\node.exe',
+        platform: 'win32'
+      })
+    ).toEqual({
+      command: 'C:\\hostedtoolcache\\pnpm.exe',
+      prefixArgs: [],
+      shell: false
+    })
+  })
+
+  it('shells out for a Windows .cmd wrapper', () => {
+    expect(
+      resolvePnpmCliInvocation({
+        npmExecPath: 'C:\\Users\\runner\\pnpm.cmd',
+        nodeExecPath: 'C:\\Program Files\\nodejs\\node.exe',
+        platform: 'win32'
+      })
+    ).toEqual({
+      command: 'C:\\Users\\runner\\pnpm.cmd',
+      prefixArgs: [],
+      shell: true
+    })
+  })
+
+  it('treats .js and .mjs CLIs the same as .cjs', () => {
+    for (const npmExecPath of ['/opt/pnpm.js', '/opt/pnpm.mjs']) {
+      expect(resolvePnpmCliInvocation({ npmExecPath, nodeExecPath, platform: 'linux' })).toEqual({
+        command: nodeExecPath,
+        prefixArgs: [npmExecPath],
+        shell: false
+      })
+    }
+  })
+
+  it('falls back to PATH pnpm when npm_execpath is unset', () => {
+    expect(
+      resolvePnpmCliInvocation({ npmExecPath: undefined, nodeExecPath, platform: 'darwin' })
+    ).toEqual({ command: 'pnpm', prefixArgs: [], shell: false })
+    expect(resolvePnpmCliInvocation({ npmExecPath: '', nodeExecPath, platform: 'linux' })).toEqual({
+      command: 'pnpm',
+      prefixArgs: [],
+      shell: false
+    })
+    expect(
+      resolvePnpmCliInvocation({ npmExecPath: undefined, nodeExecPath, platform: 'win32' })
+    ).toEqual({ command: 'pnpm.cmd', prefixArgs: [], shell: true })
+  })
+})
+
+describe('pnpm 12 native-cli callers', () => {
+  it('reinvokes pnpm through the helper rather than `node $npm_execpath`', () => {
+    for (const file of [
+      './build-native-for-platform.mjs',
+      './run-ssh-docker-bulk-open-freeze-e2e.mjs'
+    ]) {
+      const source = readFileSync(new URL(file, import.meta.url), 'utf8')
+      expect(source).toContain("from './pnpm-cli-invocation.mjs'")
+      expect(source).not.toMatch(/process\.execPath,\s*\[\s*(?:pnpmEntry|npmExecPath)/)
+    }
+  })
+})
diff --git a/config/scripts/pr-workflow-parallelism.test.mjs b/config/scripts/pr-workflow-parallelism.test.mjs
index f67abe5ee6d..40c110fc8d9 100644
--- a/config/scripts/pr-workflow-parallelism.test.mjs
+++ b/config/scripts/pr-workflow-parallelism.test.mjs
@@ -9,6 +9,7 @@ const dependencyAction = parse(
   readFileSync('.github/actions/install-node-dependencies/action.yml', 'utf8')
 )
 const packageJson = JSON.parse(readFileSync('package.json', 'utf8'))
+const pnpmWorkspace = parse(readFileSync('pnpm-workspace.yaml', 'utf8'))
 const shellContractFiles = [
   'src/main/daemon/repro-13767-shell-ready-marker-lost-to-exec.test.ts',
   'src/main/daemon/shell-ready.test.ts',
@@ -224,7 +225,10 @@ describe('PR workflow parallelism', () => {
     expect(pnpmIndex).toBeLessThan(nodeIndex)
     expect(pnpmIndex).toBeLessThan(requestedNodeIndex)
     const packageManagerVersion = /^pnpm@([^+]+)/.exec(packageJson.packageManager)?.[1]
-    expect(steps[pnpmIndex].with.version).toBe(packageManagerVersion)
+    expect(packageManagerVersion).toBe('12.0.0')
+    expect(steps[pnpmIndex].uses).toBe('pnpm/setup@v2')
+    expect(steps[pnpmIndex].with.version).toBeUndefined()
+    expect(steps[pnpmIndex].with.install).toBe(false)
     expect(steps[nodeIndex].with.cache).toBe('pnpm')
     expect(steps[nodeIndex].if).toBe("inputs.node-version == ''")
     expect(steps[requestedNodeIndex].if).toBe("inputs.node-version != ''")
@@ -232,20 +236,20 @@ describe('PR workflow parallelism', () => {
     expect(steps[requestedNodeIndex].with.cache).toBe('pnpm')
   })
 
-  it('pins every direct pnpm setup to the repository package-manager version', () => {
-    const packageManagerVersion = /^pnpm@([^+]+)/.exec(packageJson.packageManager)?.[1]
+  it('uses the repository package-manager version for every direct pnpm setup', () => {
     const directSetups = globSync('.github/workflows/*.yml').flatMap((workflowPath) => {
       const parsed = parse(readFileSync(workflowPath, 'utf8'))
       return Object.values(parsed.jobs ?? {}).flatMap((job) =>
         (job.steps ?? [])
-          .filter((step) => step.uses === 'pnpm/action-setup@v6')
+          .filter((step) => step.uses === 'pnpm/setup@v2')
           .map((step) => ({ workflowPath, step }))
       )
     })
 
     expect(directSetups.length).toBeGreaterThan(0)
     for (const { workflowPath, step } of directSetups) {
-      expect(step.with?.version, workflowPath).toBe(packageManagerVersion)
+      expect(step.with?.version, workflowPath).toBeUndefined()
+      expect(step.with?.install, workflowPath).toBe(false)
     }
   })
 
@@ -293,15 +297,15 @@ describe('PR workflow parallelism', () => {
     expect(dependencyInstall.run).toContain('--frozen-lockfile')
     expect(dependencyInstall.run).not.toContain('--no-frozen-lockfile')
     expect(dependencyInstall.run).toContain(
-      'git -C "$GITHUB_WORKSPACE" diff --exit-code -- package.json pnpm-lock.yaml'
+      'git -C "$GITHUB_WORKSPACE" diff --exit-code -- package.json pnpm-lock.yaml pnpm-workspace.yaml'
     )
     expect(dependencyInstall.run).toContain('--ignore-scripts')
     expect(dependencyInstall.run).not.toContain('--os=')
     expect(dependencyInstall.run).not.toContain('--cpu=')
-    expect(packageJson.pnpm.supportedArchitectures.os).toEqual(
+    expect(pnpmWorkspace.supportedArchitectures.os).toEqual(
       expect.arrayContaining(['current', 'win32'])
     )
-    expect(packageJson.pnpm.supportedArchitectures.cpu).toContain('current')
+    expect(pnpmWorkspace.supportedArchitectures.cpu).toContain('current')
     const prepareRuntime = dependencyAction.runs.steps.find(
       (step) => step.name === 'Prepare native runtime'
     )
diff --git a/config/scripts/rebuild-native-deps.mjs b/config/scripts/rebuild-native-deps.mjs
index 4eca4bac33a..9bf61b679ed 100644
--- a/config/scripts/rebuild-native-deps.mjs
+++ b/config/scripts/rebuild-native-deps.mjs
@@ -20,6 +20,7 @@
 
 import { rebuild } from '@electron/rebuild'
 import { execFileSync, spawnSync } from 'node:child_process'
+import { stageWindowsProcessTreeNodeAddonApiHeaders } from './windows-process-tree-gyp-rebuild.mjs'
 import {
   copyFileSync,
   existsSync,
@@ -132,6 +133,14 @@ if (!ignoreModules.includes('cpu-features')) {
   }
 }
 
+if (
+  rebuildPlatform === 'win32' &&
+  modulesToRebuild.includes('@vscode/windows-process-tree') &&
+  existsSync(join(projectDir, 'node_modules', '@vscode', 'windows-process-tree', 'package.json'))
+) {
+  stageWindowsProcessTreeNodeAddonApiHeaders()
+}
+
 try {
   await rebuild({
     buildPath: projectDir,
diff --git a/config/scripts/rebuild-native-deps.test.mjs b/config/scripts/rebuild-native-deps.test.mjs
index 5ebc39dfcaa..31676b92e55 100644
--- a/config/scripts/rebuild-native-deps.test.mjs
+++ b/config/scripts/rebuild-native-deps.test.mjs
@@ -21,6 +21,9 @@ const sourceInstallScriptPath = fileURLToPath(
 const sourceNodePtyJobOwnershipPath = fileURLToPath(
   new URL('./node-pty-job-ownership.cjs', import.meta.url)
 )
+const sourceWindowsProcessTreeGypRebuildPath = fileURLToPath(
+  new URL('./windows-process-tree-gyp-rebuild.mjs', import.meta.url)
+)
 
 describe('rebuild-native-deps Electron install fallback', () => {
   it('continues non-strict postinstall when Electron retry download fails', () => {
@@ -159,6 +162,41 @@ describe('rebuild-native-deps patched node-pty rebuild', () => {
     }
   )
 
+  it('stages windows-process-tree node-addon-api headers before a Windows rebuild', () => {
+    const projectDir = mkTempProject()
+
+    try {
+      writeFakeUsableElectronPackage(projectDir, { platform: 'win32' })
+      writeFakeElectronRebuild(projectDir)
+      writeFakeNodePtyConptyPayload(projectDir, 'x64')
+      writeFakeWindowsProcessTreeWithNodeAddonApi(projectDir)
+
+      const result = runRebuildScript(
+        projectDir,
+        { npm_config_platform: 'win32', npm_config_arch: 'x64' },
+        ['--platform=win32', '--arch=x64', '--force']
+      )
+
+      expect(result.status, result.stderr).toBe(0)
+      expect(
+        readFileSync(
+          join(
+            projectDir,
+            'node_modules',
+            '@vscode',
+            'windows-process-tree',
+            'deps',
+            'node-addon-api',
+            'napi.h'
+          ),
+          'utf8'
+        )
+      ).toBe('// napi.h\n')
+    } finally {
+      rmSync(projectDir, { recursive: true, force: true })
+    }
+  })
+
   it('restores the ConPTY runtime payload after a Windows Electron rebuild', () => {
     const projectDir = mkTempProject()
 
@@ -344,6 +382,10 @@ function mkTempProject() {
     sourceNodePtyJobOwnershipPath,
     join(projectDir, 'config', 'scripts', 'node-pty-job-ownership.cjs')
   )
+  copyFileSync(
+    sourceWindowsProcessTreeGypRebuildPath,
+    join(projectDir, 'config', 'scripts', 'windows-process-tree-gyp-rebuild.mjs')
+  )
   return projectDir
 }
 
@@ -578,6 +620,18 @@ function writeFakeWindowsProcessTree(projectDir) {
   writeFileSync(join(processTreeDir, 'index.js'), 'module.exports = {}\n')
 }
 
+function writeFakeWindowsProcessTreeWithNodeAddonApi(projectDir) {
+  const processTreeDir = join(projectDir, 'node_modules', '@vscode', 'windows-process-tree')
+  const nodeAddonApiDir = join(processTreeDir, 'node_modules', 'node-addon-api')
+  mkdirSync(nodeAddonApiDir, { recursive: true })
+  writeFileSync(join(processTreeDir, 'package.json'), '{"dependencies":{"node-addon-api":"*"}}\n')
+  writeFileSync(join(processTreeDir, 'index.js'), 'module.exports = {}\n')
+  writeFileSync(join(nodeAddonApiDir, 'package.json'), '{"name":"node-addon-api"}\n')
+  writeFileSync(join(nodeAddonApiDir, 'napi.h'), '// napi.h\n')
+  writeFileSync(join(nodeAddonApiDir, 'napi-inl.h'), '// napi-inl.h\n')
+  writeFileSync(join(nodeAddonApiDir, 'napi-inl.deprecated.h'), '// napi-inl.deprecated.h\n')
+}
+
 function writeNodePtyPatchFile(projectDir) {
   mkdirSync(join(projectDir, 'config', 'patches'), { recursive: true })
   writeFileSync(join(projectDir, 'config', 'patches', 'node-pty@1.1.0.patch'), 'patch marker\n')
diff --git a/config/scripts/regenerate-xterm-patches.mjs b/config/scripts/regenerate-xterm-patches.mjs
index 160d075aee2..a2da6d9da2d 100644
--- a/config/scripts/regenerate-xterm-patches.mjs
+++ b/config/scripts/regenerate-xterm-patches.mjs
@@ -22,13 +22,15 @@ const DEFAULT_REPO_ROOT = path.resolve(import.meta.dirname, '..', '..')
 const MANIFEST_RELATIVE_PATH = path.join('config', 'patches', 'xterm-upstream.json')
 
 /**
- * Flags pnpm@10 passes to `git diff` in its own `diffFolders()`. A patch built
+ * Flags pnpm@12 passes to `git diff` in its own `diff_folders()`. A patch built
  * with anything else is a patch pnpm may re-diff differently on the next
  * `pnpm patch-commit`, so the byte-comparison gate would never settle.
  */
 export const PNPM_DIFF_FLAGS = [
   '-c',
   'core.safecrlf=false',
+  '-c',
+  'core.quotePath=false',
   'diff',
   '--src-prefix=a/',
   '--dst-prefix=b/',
@@ -38,7 +40,8 @@ export const PNPM_DIFF_FLAGS = [
   '--no-index',
   '--text',
   '--no-ext-diff',
-  '--no-color'
+  '--no-color',
+  '--'
 ]
 
 /**
@@ -47,14 +50,12 @@ export const PNPM_DIFF_FLAGS = [
  */
 export const CHECKOUT_DIFF_FLAGS = PNPM_DIFF_FLAGS.filter((flag) => flag !== '--no-index')
 
-/** Blanks the vars pnpm blanks so user and system git config cannot reach the diff. */
+/** Applies pnpm's git config isolation so local machine settings cannot change the patch. */
 export function pnpmDiffEnvironment(baseEnvironment = process.env) {
   return {
     ...baseEnvironment,
     GIT_CONFIG_NOSYSTEM: '1',
-    HOME: '',
-    XDG_CONFIG_HOME: '',
-    USERPROFILE: ''
+    GIT_CONFIG_GLOBAL: '/dev/null'
   }
 }
 
@@ -216,7 +217,7 @@ export function patchHash(patchText) {
 
 function lockfilePatchHashPattern(packageKey) {
   // Unscoped keys such as `node-pty@1.1.0` are emitted unquoted.
-  return new RegExp(`(^  '?${escapeRegExp(packageKey)}'?:\\n    hash: )([0-9a-f]{64})$`, 'm')
+  return new RegExp(`(^  '?${escapeRegExp(packageKey)}'?: )([0-9a-f]{64})$`, 'm')
 }
 
 export function readLockfilePatchHash(lockfileText, packageKey) {
@@ -507,7 +508,7 @@ function diffFolders(folderA, folderB) {
 
 /** The source of truth for the hand-written half: what the checkout itself holds. */
 function diffCheckoutSource(packageRoot) {
-  return run('git', [...CHECKOUT_DIFF_FLAGS, '--', 'src/'], {
+  return run('git', [...CHECKOUT_DIFF_FLAGS, 'src/'], {
     cwd: packageRoot,
     env: pnpmDiffEnvironment(),
     maxBuffer: 64 * 1024 * 1024
diff --git a/config/scripts/regenerate-xterm-patches.test.mjs b/config/scripts/regenerate-xterm-patches.test.mjs
index ac9f9a7ca52..2c4a34dc501 100644
--- a/config/scripts/regenerate-xterm-patches.test.mjs
+++ b/config/scripts/regenerate-xterm-patches.test.mjs
@@ -98,6 +98,8 @@ describe('pnpm diff format', () => {
     expect(PNPM_DIFF_FLAGS).toEqual([
       '-c',
       'core.safecrlf=false',
+      '-c',
+      'core.quotePath=false',
       'diff',
       '--src-prefix=a/',
       '--dst-prefix=b/',
@@ -107,18 +109,18 @@ describe('pnpm diff format', () => {
       '--no-index',
       '--text',
       '--no-ext-diff',
-      '--no-color'
+      '--no-color',
+      '--'
     ])
   })
 
-  it('blanks the config-bearing environment variables', () => {
+  it('matches pnpm git config isolation', () => {
     const environment = pnpmDiffEnvironment({ PATH: '/usr/bin', HOME: '/Users/someone' })
     expect(environment).toMatchObject({
       PATH: '/usr/bin',
       GIT_CONFIG_NOSYSTEM: '1',
-      HOME: '',
-      XDG_CONFIG_HOME: '',
-      USERPROFILE: ''
+      GIT_CONFIG_GLOBAL: '/dev/null',
+      HOME: '/Users/someone'
     })
   })
 
@@ -350,12 +352,8 @@ describe('manifest guards', () => {
 describe('lockfile coupling', () => {
   const lockfile = [
     'patchedDependencies:',
-    "  '@xterm/xterm@6.1.0-beta.287':",
-    `    hash: ${'0'.repeat(64)}`,
-    '    path: config/patches/@xterm__xterm@6.1.0-beta.287.patch',
-    '  node-pty@1.1.0:',
-    `    hash: ${'1'.repeat(64)}`,
-    '    path: config/patches/node-pty@1.1.0.patch',
+    `  '@xterm/xterm@6.1.0-beta.287': ${'0'.repeat(64)}`,
+    `  node-pty@1.1.0: ${'1'.repeat(64)}`,
     'snapshots:',
     `  '@xterm/addon-fit@0.12.0-beta.287(@xterm/xterm@6.1.0-beta.287(patch_hash=${'0'.repeat(64)}))':`,
     `      '@xterm/xterm': 6.1.0-beta.287(patch_hash=${'0'.repeat(64)})`,
@@ -396,7 +394,10 @@ describe('lockfile coupling', () => {
 
   it('reports a lockfile stale in its resolution keys alone', () => {
     const key = '@xterm/xterm@6.1.0-beta.287'
-    const halfUpdated = lockfile.replace(`hash: ${'0'.repeat(64)}`, `hash: ${'a'.repeat(64)}`)
+    const halfUpdated = lockfile.replace(
+      `'@xterm/xterm@6.1.0-beta.287': ${'0'.repeat(64)}`,
+      `'@xterm/xterm@6.1.0-beta.287': ${'a'.repeat(64)}`
+    )
 
     expect(readLockfilePatchHash(halfUpdated, key)).toBe('a'.repeat(64))
     expect(lockfilePatchHashIsStale(halfUpdated, key, 'a'.repeat(64))).toBe(true)
diff --git a/config/scripts/release-cut-token-permissions.test.mjs b/config/scripts/release-cut-token-permissions.test.mjs
index 24f138723c9..2478087ba8a 100644
--- a/config/scripts/release-cut-token-permissions.test.mjs
+++ b/config/scripts/release-cut-token-permissions.test.mjs
@@ -8,6 +8,7 @@ const EXPECTED_MATRIX = {
   '.github/workflows/e2e.yml#build': { contents: 'read' },
   '.github/workflows/e2e.yml#changed-e2e': { contents: 'read' },
   '.github/workflows/e2e.yml#e2e': { contents: 'read' },
+  '.github/workflows/e2e.yml#prepare-native-cache': { contents: 'read' },
   '.github/workflows/e2e.yml#ssh-docker-watcher-isolation': { contents: 'read' },
   '.github/workflows/homebrew-bump.yml#bump-cask': { contents: 'read' },
   '.github/workflows/release-mac-build.yml#build-mac': { contents: 'write' },
diff --git a/config/scripts/release-e2e-dispatch-contract.test.mjs b/config/scripts/release-e2e-dispatch-contract.test.mjs
index d48c7b3fa30..5fd4503d4e3 100644
--- a/config/scripts/release-e2e-dispatch-contract.test.mjs
+++ b/config/scripts/release-e2e-dispatch-contract.test.mjs
@@ -46,6 +46,28 @@ describe('release E2E dispatch contract', () => {
     expect(refInput.required).toBe(false)
   })
 
+  it('overlaps the relay bundle with the Electron build', () => {
+    const buildStep = e2eWorkflow.jobs.build.steps.find((step) => step.name === 'Build E2E outputs')
+
+    expect(buildStep.run).toContain('pnpm run build:relay &')
+    expect(buildStep.run).toContain('relay_pid=$!')
+    expect(buildStep.run).toContain('wait "$relay_pid"')
+    expect(buildStep.run).toContain('pnpm run build:web-from-renderer')
+  })
+
+  it('primes the Electron native cache before every E2E consumer', () => {
+    const primer = e2eWorkflow.jobs['prepare-native-cache']
+    expect(primer.steps).toBeDefined()
+    expect(
+      primer.steps.find((step) => step.uses === './.github/actions/install-node-dependencies').with
+    ).toEqual({
+      'native-runtime': 'electron'
+    })
+    for (const jobName of ['e2e', 'changed-e2e', 'ssh-docker-watcher-isolation']) {
+      expect(e2eWorkflow.jobs[jobName].needs, jobName).toEqual(['build', 'prepare-native-cache'])
+    }
+  })
+
   it('includes the paired-runtime web client in the shared E2E build artifact', () => {
     const buildStep = e2eWorkflow.jobs.build.steps.find((step) => step.name === 'Build E2E outputs')
 
@@ -71,7 +93,7 @@ describe('release E2E dispatch contract', () => {
       const downloadStep = job.steps.find((step) => step.name === 'Download E2E build output')
       const runStep = job.steps.find((step) => step.name === runStepName)
 
-      expect(job.needs).toBe('build')
+      expect(job.needs).toEqual(['build', 'prepare-native-cache'])
       expect(downloadStep.with.name).toBe('e2e-build-out')
       expect(downloadStep.with.path).toBe('out/')
       expect(runStep.run).toContain('ORCA_RELAY_PATH="$GITHUB_WORKSPACE/out/relay"')
diff --git a/config/scripts/run-ssh-docker-bulk-open-freeze-e2e.mjs b/config/scripts/run-ssh-docker-bulk-open-freeze-e2e.mjs
index 36fbbf91500..153f3fb5bc6 100644
--- a/config/scripts/run-ssh-docker-bulk-open-freeze-e2e.mjs
+++ b/config/scripts/run-ssh-docker-bulk-open-freeze-e2e.mjs
@@ -1,18 +1,17 @@
 import { spawnSync } from 'node:child_process'
+import { resolvePnpmCliInvocation } from './pnpm-cli-invocation.mjs'
 
 const extraArgs = process.argv.slice(2)
-const pnpmEntry = process.env.npm_execpath
-if (!pnpmEntry) {
-  throw new Error('npm_execpath is required; run this harness through pnpm')
-}
+const { command: pnpm, prefixArgs: pnpmPrefix, shell } = resolvePnpmCliInvocation()
 const env = {
   ...process.env,
   ORCA_E2E_SSH_DOCKER: '1'
 }
 
-const runtime = spawnSync(process.execPath, [pnpmEntry, 'run', 'ensure:electron-runtime'], {
+const runtime = spawnSync(pnpm, [...pnpmPrefix, 'run', 'ensure:electron-runtime'], {
   stdio: 'inherit',
-  env
+  env,
+  shell
 })
 
 if (runtime.status !== 0) {
@@ -20,9 +19,9 @@ if (runtime.status !== 0) {
 }
 
 const result = spawnSync(
-  process.execPath,
+  pnpm,
   [
-    pnpmEntry,
+    ...pnpmPrefix,
     'exec',
     'playwright',
     'test',
@@ -36,7 +35,8 @@ const result = spawnSync(
   ],
   {
     stdio: 'inherit',
-    env
+    env,
+    shell
   }
 )
 
diff --git a/config/scripts/verify-telemetry-constants.mjs b/config/scripts/verify-telemetry-constants.mjs
index 6b90c89279c..3bdcd8b3ec6 100644
--- a/config/scripts/verify-telemetry-constants.mjs
+++ b/config/scripts/verify-telemetry-constants.mjs
@@ -34,7 +34,7 @@ import { existsSync, readdirSync, readFileSync, statSync } from 'node:fs'
 import { join, resolve } from 'node:path'
 // Why @electron/asar: canonical replacement for the deprecated `asar` package.
 // It's transitively available via electron-builder (and pnpm's
-// `shamefully-hoist=true` in `.npmrc` flattens it into the root
+// `shamefullyHoist: true` in `pnpm-workspace.yaml` flattens it into the root
 // `node_modules`). If electron-builder ever drops it, promote this to a
 // direct devDependency in package.json.
 import { extractFile, listPackage } from '@electron/asar'
diff --git a/config/scripts/windows-process-tree-gyp-path.test.mjs b/config/scripts/windows-process-tree-gyp-path.test.mjs
index e2e650384ec..30770500f42 100644
--- a/config/scripts/windows-process-tree-gyp-path.test.mjs
+++ b/config/scripts/windows-process-tree-gyp-path.test.mjs
@@ -20,15 +20,22 @@ describe('windows-process-tree node-addon-api gyp path', () => {
       join(projectDir, 'config/scripts/build-windows-process-tree-relay-addon.mjs'),
       'utf8'
     )
-    expect(buildScript).toContain(
-      "for (const header of ['napi.h', 'napi-inl.h', 'napi-inl.deprecated.h'])"
-    )
-    expect(buildScript).toContain("import { createRequire } from 'node:module'")
-    expect(buildScript).toContain("import { dirname, join, resolve } from 'node:path'")
-    expect(buildScript).toContain(
-      "createRequire(join(PACKAGE_DIR, 'package.json')).resolve('node-addon-api/package.json')"
-    )
+    expect(buildScript).toContain('stageWindowsProcessTreeNodeAddonApiHeaders(PACKAGE_DIR)')
     expect(buildScript).toContain('Repaired un-applied pnpm patch hunks before build.')
+    const rebuildHelper = readFileSync(
+      join(projectDir, 'config/scripts/windows-process-tree-gyp-rebuild.mjs'),
+      'utf8'
+    )
+    expect(rebuildHelper).toContain("createRequire(join(packageDir, 'package.json'))")
+    expect(rebuildHelper).toContain("resolve('node-addon-api/package.json')")
+    expect(rebuildHelper).toContain("'napi.h'")
+    expect(rebuildHelper).toContain("'napi-inl.h'")
+    expect(rebuildHelper).toContain("'napi-inl.deprecated.h'")
+    const rebuildScript = readFileSync(
+      join(projectDir, 'config/scripts/rebuild-native-deps.mjs'),
+      'utf8'
+    )
+    expect(rebuildScript).toContain('stageWindowsProcessTreeNodeAddonApiHeaders()')
   })
 
   it('resolves node_addon_api.gyp to a real file from the package directory', () => {
diff --git a/config/scripts/windows-process-tree-gyp-rebuild.mjs b/config/scripts/windows-process-tree-gyp-rebuild.mjs
index 06ffcb3dfb1..c815407d6d0 100644
--- a/config/scripts/windows-process-tree-gyp-rebuild.mjs
+++ b/config/scripts/windows-process-tree-gyp-rebuild.mjs
@@ -9,8 +9,9 @@
  * hop escapes the store and configure fails with "node_addon_api.gyp not
  * found" (run 32999886072).
  */
-import { realpathSync } from 'node:fs'
-import { join, resolve } from 'node:path'
+import { copyFileSync, mkdirSync, realpathSync } from 'node:fs'
+import { createRequire } from 'node:module'
+import { dirname, join, resolve } from 'node:path'
 
 const ROOT = resolve(import.meta.dirname, '..', '..')
 
@@ -21,6 +22,12 @@ export const WINDOWS_PROCESS_TREE_PACKAGE_DIR = join(
   'windows-process-tree'
 )
 
+export const WINDOWS_PROCESS_TREE_NODE_ADDON_API_HEADERS = [
+  'napi.h',
+  'napi-inl.h',
+  'napi-inl.deprecated.h'
+]
+
 export function nodeGypRebuildInvocation(arch, packageDir = WINDOWS_PROCESS_TREE_PACKAGE_DIR) {
   return {
     args: [
@@ -31,3 +38,18 @@ export function nodeGypRebuildInvocation(arch, packageDir = WINDOWS_PROCESS_TREE
     cwd: realpathSync(packageDir)
   }
 }
+
+// Patched binding.gyp includes deps/node-addon-api; the tarball does not ship those headers.
+export function stageWindowsProcessTreeNodeAddonApiHeaders(
+  packageDir = WINDOWS_PROCESS_TREE_PACKAGE_DIR
+) {
+  const nodeAddonApiDir = dirname(
+    createRequire(join(packageDir, 'package.json')).resolve('node-addon-api/package.json')
+  )
+  const stagedHeaderDir = join(packageDir, 'deps', 'node-addon-api')
+  mkdirSync(stagedHeaderDir, { recursive: true })
+  for (const header of WINDOWS_PROCESS_TREE_NODE_ADDON_API_HEADERS) {
+    copyFileSync(join(nodeAddonApiDir, header), join(stagedHeaderDir, header))
+  }
+  return stagedHeaderDir
+}
diff --git a/config/scripts/windows-process-tree-gyp-rebuild.test.mjs b/config/scripts/windows-process-tree-gyp-rebuild.test.mjs
index a90a92f42bf..f4820e9430a 100644
--- a/config/scripts/windows-process-tree-gyp-rebuild.test.mjs
+++ b/config/scripts/windows-process-tree-gyp-rebuild.test.mjs
@@ -1,9 +1,20 @@
 import { execFileSync } from 'node:child_process'
-import { existsSync, realpathSync } from 'node:fs'
-import { resolve } from 'node:path'
+import {
+  existsSync,
+  mkdirSync,
+  mkdtempSync,
+  readFileSync,
+  realpathSync,
+  rmSync,
+  writeFileSync
+} from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join, resolve } from 'node:path'
 import { describe, expect, it } from 'vitest'
 import {
   nodeGypRebuildInvocation,
+  stageWindowsProcessTreeNodeAddonApiHeaders,
+  WINDOWS_PROCESS_TREE_NODE_ADDON_API_HEADERS,
   WINDOWS_PROCESS_TREE_PACKAGE_DIR
 } from './windows-process-tree-gyp-rebuild.mjs'
 
@@ -26,4 +37,25 @@ describe('windows-process-tree node-gyp rebuild', () => {
     expect(args).toContain('rebuild')
     expect(args).toContain('--arch=arm64')
   })
+
+  it('copies node-addon-api headers into the patched include dir', () => {
+    const packageDir = mkdtempSync(join(tmpdir(), 'orca-windows-process-tree-headers-'))
+    try {
+      const nodeAddonApiDir = join(packageDir, 'node_modules', 'node-addon-api')
+      mkdirSync(nodeAddonApiDir, { recursive: true })
+      writeFileSync(join(packageDir, 'package.json'), '{"dependencies":{"node-addon-api":"*"}}\n')
+      writeFileSync(join(nodeAddonApiDir, 'package.json'), '{"name":"node-addon-api"}\n')
+      for (const header of WINDOWS_PROCESS_TREE_NODE_ADDON_API_HEADERS) {
+        writeFileSync(join(nodeAddonApiDir, header), `// ${header}\n`)
+      }
+
+      const stagedDir = stageWindowsProcessTreeNodeAddonApiHeaders(packageDir)
+      expect(stagedDir).toBe(join(packageDir, 'deps', 'node-addon-api'))
+      for (const header of WINDOWS_PROCESS_TREE_NODE_ADDON_API_HEADERS) {
+        expect(readFileSync(join(stagedDir, header), 'utf8')).toBe(`// ${header}\n`)
+      }
+    } finally {
+      rmSync(packageDir, { recursive: true, force: true })
+    }
+  })
 })
diff --git a/config/scripts/windows-process-tree-patch-contract.test.mjs b/config/scripts/windows-process-tree-patch-contract.test.mjs
index f9c1c90c91a..03b66a9c976 100644
--- a/config/scripts/windows-process-tree-patch-contract.test.mjs
+++ b/config/scripts/windows-process-tree-patch-contract.test.mjs
@@ -1,6 +1,7 @@
 import { createHash } from 'node:crypto'
 import { readFileSync } from 'node:fs'
 import { join, resolve } from 'node:path'
+import { parseAllDocuments } from 'yaml'
 import { describe, expect, it } from 'vitest'
 
 const projectDir = resolve(import.meta.dirname, '../..')
@@ -16,7 +17,9 @@ describe('Windows process-tree patch contract', () => {
     const patchHash = createHash('sha256')
       .update(patchBytes.toString('utf8').replaceAll('\r\n', '\n'))
       .digest('hex')
-    const lockfile = readFileSync(join(projectDir, 'pnpm-lock.yaml'), 'utf8')
-    expect(lockfile).toContain(`hash: ${patchHash}`)
+    const lockfile = parseAllDocuments(readFileSync(join(projectDir, 'pnpm-lock.yaml'), 'utf8'))
+      .map((document) => document.toJS())
+      .find((document) => document.patchedDependencies)
+    expect(lockfile.patchedDependencies['@vscode/windows-process-tree@0.8.0']).toBe(patchHash)
   })
 })
diff --git a/config/tsconfig.cli.json b/config/tsconfig.cli.json
index cec4e80cff5..439a465dc3e 100644
--- a/config/tsconfig.cli.json
+++ b/config/tsconfig.cli.json
@@ -38,11 +38,24 @@
     "../src/main/codex/codex-config-settings-removal.ts",
     "../src/main/codex/codex-config-settings-upsert.ts",
     "../src/main/codex/codex-home-paths.ts",
+    "../src/main/codex/codex-hook-definition.ts",
     "../src/main/codex/codex-managed-home-resource-copy-marker.ts",
     "../src/main/codex/codex-managed-trust-grant-plan.ts",
     "../src/main/codex/codex-path-observation.ts",
     "../src/main/codex/codex-hook-identity.ts",
+    "../src/main/codex/codex-hook-legacy-cleanup.ts",
+    "../src/main/codex/codex-hook-local-install.ts",
+    "../src/main/codex/codex-hook-local-maintenance.ts",
+    "../src/main/codex/codex-hook-remote-install.ts",
+    "../src/main/codex/codex-hook-script.ts",
+    "../src/main/codex/codex-hook-service-implementation.ts",
+    "../src/main/codex/codex-hook-status.ts",
+    "../src/main/codex/codex-hook-system-trust.ts",
+    "../src/main/codex/codex-hook-trust-cleanup.ts",
     "../src/main/codex/codex-hook-trust-grant.ts",
+    "../src/main/codex/codex-hook-trust-queue.ts",
+    "../src/main/codex/codex-hook-user-mirroring.ts",
+    "../src/main/codex/codex-hook-wsl-runtime.ts",
     "../src/main/codex/codex-managed-trust-reconciliation.ts",
     "../src/main/codex/codex-process-exit-deadline.ts",
     "../src/main/codex/codex-state-db.ts",
diff --git a/docs/assets/readme-downloads.svg b/docs/assets/readme-downloads.svg
index 17c8d9e6926..90293d0a7ea 100644
--- a/docs/assets/readme-downloads.svg
+++ b/docs/assets/readme-downloads.svg
@@ -1,5 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="106" height="20" role="img" aria-label="downloads: 32m">
-  <title>downloads: 32m</title>
+<svg xmlns="http://www.w3.org/2000/svg" width="106" height="20" role="img" aria-label="downloads: 33m">
+  <title>downloads: 33m</title>
   <linearGradient id="s" x2="0" y2="100%">
     <stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
     <stop offset="1" stop-opacity=".1"/>
@@ -15,7 +15,7 @@
   <g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="11">
     <text x="37" y="15" fill="#010101" fill-opacity=".3">downloads</text>
     <text x="37" y="14">downloads</text>
-    <text x="90" y="15" fill="#010101" fill-opacity=".3">32m</text>
-    <text x="90" y="14">32m</text>
+    <text x="90" y="15" fill="#010101" fill-opacity=".3">33m</text>
+    <text x="90" y="14">33m</text>
   </g>
 </svg>
diff --git a/docs/reference/remote-wire-compatibility.md b/docs/reference/remote-wire-compatibility.md
index 423149950ce..1fceb67d5d5 100644
--- a/docs/reference/remote-wire-compatibility.md
+++ b/docs/reference/remote-wire-compatibility.md
@@ -95,16 +95,51 @@ negotiated capabilities differ from the contract. Adding an optional field keeps
 green (Rule 1); making a client depend on that field turns the new-client/old-host
 pairing red.
 
+### Never write down what the old side has
+
+The baseline is whichever release tag is newest, so it moves on every cut. An
+expectation of the form "the old side does not have X" — a `not.toHaveProperty`, a
+`not.toContain`, a hard-coded field list — stops being true the first time a release
+ships X. The suite then reddens on whatever pull request is in flight, with no code
+change anywhere, and the job trains people to ignore it. That is worse than no test,
+because a rolling baseline eventually contains every additive field the wire has, and
+adding one is the sanctioned way to evolve it.
+
+Derive the expectation from the baseline that was actually checked out:
+
+- for a published frame, pair each build against a client of its own version and
+  compare the skewed pairing against that same-version reference, so the expectation
+  is whatever that build publishes today (`publishedFieldNames` in
+  `tests/e2e/cross-version-wire/published-field-shape.ts`);
+- for a negotiated surface, read the old build's advertised capabilities and
+  registered method names from its checkout, and assert they agree with each other
+  rather than asserting the old build lacks them;
+- for a "client too old to know X", derive that client's advertised list by removing
+  X from the baseline's own list, so the gate stays exercised after X ships.
+
+Name the direction in the assertion. `new client against old server` and `old client
+against new server` fail for different reasons, and the host is the only side that
+authors a published frame — the terminal `terminalOwner` false positive on 2026-08-29
+was misread as a new client sending an unknown field when the old server was
+publishing it. Two things are still safe to state literally: the current build's own
+contract, and an invariant that holds for every version.
+
+Pinning a legacy ref is the fallback when a contract genuinely needs a release from
+before a feature shipped, as `cross-version-browser-placement.unit.test.ts` does with
+`LEGACY_BROWSER_PLACEMENT_RELEASE_REF`. It does not rot on a cut, but it is
+hand-maintained, so prefer deriving.
+
 `tests/e2e/cross-version-wire/cross-version-agent-session-wire.unit.test.ts` pairs the
 same two builds over the structured `agentSession.*` surface. Because a released build
 cannot name a capability string its own source never contains, the old side's advertised
 list and registered method names are read from the extracted checkout rather than
 hand-written. It covers the three skews that surface can fail on:
 
-- an old client — advertising only what the baseline build defines — is told the whole
-  surface does not exist and reaches no host method;
-- a new client against the old dispatcher gets `method_not_found` on every method, and
-  can see the absence during negotiation instead of by calling;
+- an old client — advertising the baseline's list minus this capability — is told the
+  whole surface does not exist and reaches no host method;
+- a new client against the old dispatcher always gets an answer rather than silence,
+  and `method_not_found` for every method that release does not register, so the
+  absence is visible during negotiation instead of by calling;
 - a cursor survives a host restart: the client's fence is refused as stale with the live
   one attached, and resuming from the held cursor replays only what it missed.
 
diff --git a/docs/reference/windows-process-enumeration.md b/docs/reference/windows-process-enumeration.md
index 4b8acd87aae..ef1faf5237c 100644
--- a/docs/reference/windows-process-enumeration.md
+++ b/docs/reference/windows-process-enumeration.md
@@ -206,7 +206,7 @@ The addon is Windows-only, so it follows the same contract as
 `config/scripts/package-electron-runtime-contract.test.mjs`):
 
 - an `optionalDependency`, so a macOS/Linux install tolerates its absence;
-- **not** in `pnpm.onlyBuiltDependencies` — pnpm installs optional dependencies
+- **not** enabled in `allowBuilds` in `pnpm-workspace.yaml` — pnpm installs optional dependencies
   on every host, and macOS/Linux must never run `node-gyp` for it;
 - listed in the win32 branch of `rebuild-native-deps.mjs` and
   `ensure-native-runtime.mjs`;
diff --git a/mobile/.npmrc b/mobile/.npmrc
deleted file mode 100644
index d7913f44df7..00000000000
--- a/mobile/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-minimum-release-age=4320
diff --git a/mobile/.oxlintrc.json b/mobile/.oxlintrc.json
index f3338fc3616..703a9dfda62 100644
--- a/mobile/.oxlintrc.json
+++ b/mobile/.oxlintrc.json
@@ -45,30 +45,12 @@
         "max-lines": ["error", { "max": 2152, "skipBlankLines": true, "skipComments": true }]
       }
     },
-    {
-      "files": ["app/h/*/index.tsx"],
-      "rules": {
-        "max-lines": ["error", { "max": 1603, "skipBlankLines": true, "skipComments": true }]
-      }
-    },
-    {
-      "files": ["src/browser/MobileBrowserPane.tsx"],
-      "rules": {
-        "max-lines": ["error", { "max": 1594, "skipBlankLines": true, "skipComments": true }]
-      }
-    },
     {
       "files": ["app/index.tsx"],
       "rules": {
         "max-lines": ["error", { "max": 1422, "skipBlankLines": true, "skipComments": true }]
       }
     },
-    {
-      "files": ["src/components/NewWorktreeModal.tsx"],
-      "rules": {
-        "max-lines": ["error", { "max": 1263, "skipBlankLines": true, "skipComments": true }]
-      }
-    },
     {
       "files": ["src/transport/rpc-client.ts"],
       "rules": {
@@ -81,12 +63,6 @@
         "max-lines": ["error", { "max": 407, "skipBlankLines": true, "skipComments": true }]
       }
     },
-    {
-      "files": ["app/troubleshoot.tsx"],
-      "rules": {
-        "max-lines": ["error", { "max": 436, "skipBlankLines": true, "skipComments": true }]
-      }
-    },
     {
       "files": ["app/h/*/files/*.tsx"],
       "rules": {
diff --git a/mobile/app/h/[hostId]/index.tsx b/mobile/app/h/[hostId]/index.tsx
index ed26d3dd5cd..7563f7c50dc 100644
--- a/mobile/app/h/[hostId]/index.tsx
+++ b/mobile/app/h/[hostId]/index.tsx
@@ -1,1410 +1,14 @@
-import { useState, useEffect, useCallback, useMemo, useRef } from 'react'
-import { View, Text, SectionList, Pressable, Alert, RefreshControl } from 'react-native'
-import { SafeAreaView, useSafeAreaInsets } from 'react-native-safe-area-context'
-import { useFocusEffect, useLocalSearchParams, usePathname, useRouter } from 'expo-router'
-import {
-  Search,
-  X,
-  Pin,
-  List,
-  SlidersHorizontal,
-  Layers,
-  ChevronDown,
-  ChevronRight,
-  ChevronLeft,
-  Plus,
-  Moon,
-  Filter,
-  Check,
-  UserCircle,
-  PanelLeftClose,
-  SquareTerminal
-} from 'lucide-react-native'
-import type { RpcClient } from '../../../src/transport/rpc-client'
-import { loadHosts, updateLastConnected } from '../../../src/transport/host-store'
-import { removeHostAndCloseClient } from '../../../src/transport/host-removal-lifecycle'
-import {
-  useHostClient,
-  useForgetHostClient,
-  useForceReconnect
-} from '../../../src/transport/client-context'
-import { useWorktreeResync } from '../../../src/transport/use-worktree-resync'
-import { startHostWorktreeRefresh } from '../../../src/worktree/host-worktree-refresh'
-import {
-  applyWorktreeRowDisplayState,
-  clearConfirmedActiveWorktreeIdentity,
-  getWorktreeRowIdentity,
-  removeWorktreeRow,
-  retainLiveSleptWorktreeIdentities
-} from '../../../src/worktree/worktree-host-row-identity'
-import {
-  useLastConnectedAt,
-  useRelayRecoveryStatus,
-  useReconnectAttempt
-} from '../../../src/transport/client-context-connection-metrics'
-import {
-  classifyConnection,
-  type ConnectionVerdict
-} from '../../../src/transport/connection-health'
-import type { RpcSuccess } from '../../../src/transport/types'
-import { StatusDot } from '../../../src/components/StatusDot'
-import { NewWorktreeModalController } from '../../../src/components/NewWorktreeModalController'
-import { NewWorkspaceFab, FAB_SIZE } from '../../../src/components/NewWorkspaceFab'
-import { MobileRepoIcon } from '../../../src/components/MobileRepoIcon'
-import { WorktreeListRow } from '../../../src/components/WorktreeListRow'
-import { useNow } from '../../../src/hooks/use-now'
-import { useActiveWorktreeScroll } from '../../../src/hooks/use-active-worktree-scroll'
-import type { RepoIcon } from '../../../../src/shared/repo-icon'
-import { PickerModal } from '../../../src/components/PickerModal'
-import { ActionSheetContent } from '../../../src/components/ActionSheetModal'
-import { buildWorktreeNavigationActions } from '../../../src/agent-history/worktree-navigation-actions'
-import { floatingWorkspaceSessionPath } from '../../../src/session/floating-workspace'
-import { ConfirmModal } from '../../../src/components/ConfirmModal'
-import { BottomDrawer } from '../../../src/components/BottomDrawer'
-import { useHostProtocolGates } from '../../../src/components/HostProtocolGate'
-import { AuthFailedBanner } from '../../../src/components/AuthFailedBanner'
-import { HostDiagnosticsLink } from '../../../src/components/HostDiagnosticsLink'
-import { HostRouteNoticeBanner } from '../../../src/components/HostRouteNoticeBanner'
-import { visibleHostRouteNotice } from '../../../src/host-route-notice'
-import { MobileSearchField } from '../../../src/components/MobileSearchField'
 import { WorkspaceDetailPlaceholder } from '../../../src/components/WorkspaceDetailPlaceholder'
-import { getCachedWorktrees, setCachedWorktrees } from '../../../src/cache/worktree-cache'
-import { setCachedRepos } from '../../../src/cache/repo-cache'
-import { colors, spacing } from '../../../src/theme/mobile-theme'
+import { HostScreenView } from '../../../src/host-screen/host-screen-view'
+import {
+  type HostScreenProps,
+  useHostScreenController
+} from '../../../src/host-screen/use-host-screen-controller'
 import { useResponsiveLayout } from '../../../src/layout/responsive-layout'
-import { hostScreenStyles as styles } from '../../../src/host-screen/host-screen-styles'
-import { leaveHostRoute } from '../../../src/host-route-exit'
-import { loadPinnedIds, savePinnedIds } from '../../../src/storage/preferences'
-import {
-  createInitialHostRouteActionState,
-  hostNewWorktreeSessionRoute,
-  resolveHostRouteActionState,
-  setHostRouteNewWorktreeVisible
-} from '../../../src/host-route-action-state'
-import {
-  applyDesktopViewSettings,
-  buildWorkspaceViewSettingsUpdate,
-  type MobileGroupMode,
-  type MobileSortMode,
-  type MobileViewState,
-  type WorkspaceViewSettings
-} from '../../../src/worktree/workspace-view-settings'
-import {
-  getWorktreeStatus,
-  isWorktreePinned,
-  type FilterState,
-  type Worktree
-} from '../../../src/worktree/workspace-list-sections'
-import { useWorkspaceSections } from '../../../src/worktree/use-workspace-sections'
-import { getMobileWorkspaceLineageGroupKey } from '../../../src/worktree/mobile-workspace-lineage'
-import { areWorktreeListsEqual } from '../../../src/worktree/worktree-list-snapshot'
-import { WorktreeCatalogSnapshotClient } from '../../../src/worktree/worktree-catalog-snapshot-client'
-import { HostWorkspaceListStates } from '../../../src/worktree/host-workspace-list-states'
-import { repoColor } from '../../../src/worktree/repo-color'
-import {
-  WORKSPACE_GROUP_OPTIONS as GROUP_OPTIONS,
-  WORKSPACE_SORT_OPTIONS as SORT_OPTIONS
-} from '../../../src/worktree/workspace-list-picker-options'
-import type { RepoSummary } from '../../../src/worktree/host-worktree-rpc-types'
-import type { WorkspaceStatusDefinition } from '../../../../src/shared/worktree/types'
-import { DEFAULT_MOBILE_WORKSPACE_STATUSES } from '../../../src/worktree/mobile-workspace-statuses'
 
-function isErrorVerdict(v: ConnectionVerdict): boolean {
-  return v.kind === 'warning' || v.kind === 'unreachable' || v.kind === 'auth-failed'
-}
-
-const REPO_METADATA_REFRESH_MS = 60_000
-
-type HostScreenProps = {
-  // When true, rendered as the persistent tablet sidebar by the host layout, not as its own routed screen.
-  embedded?: boolean
-  // Route params aren't in scope when rendered from the layout, so the caller passes these explicitly.
-  hostId?: string
-  action?: string
-  onHideSidebar?: () => void
-}
-
-export function HostScreen({
-  embedded = false,
-  hostId: hostIdProp,
-  action: actionProp,
-  onHideSidebar
-}: HostScreenProps = {}) {
-  const params = useLocalSearchParams<{ hostId: string; action?: string; notice?: string }>()
-  const hostId = hostIdProp ?? params.hostId
-  const action = actionProp ?? params.action
-  const [dismissedNotice, setDismissedNotice] = useState<string | null>(null)
-  const noticeParam = params.notice?.trim()
-  const routeNotice = visibleHostRouteNotice(embedded, noticeParam, dismissedNotice)
-  const router = useRouter()
-  const pathname = usePathname()
-  const insets = useSafeAreaInsets()
-  // Why: cap and center the list on wide/tablet canvases; on phones isWideLayout is false so it stays edge-to-edge.
-  const { isWideLayout, contentMaxWidth } = useResponsiveLayout()
-  const [initialCache] = useState(() =>
-    hostId ? (getCachedWorktrees(hostId) as Worktree[] | null) : null
-  )
-  // Shared client per host owned by RpcClientProvider. See docs/mobile-shared-client-per-host.md.
-  const { client, state: connState } = useHostClient(hostId)
-  const reconnectAttempts = useReconnectAttempt(hostId)
-  const lastConnectedAt = useLastConnectedAt(hostId)
-  const relayRecovery = useRelayRecoveryStatus(hostId)
-  const clientRef = useRef<RpcClient | null>(null)
-  const fetchWorktreesInFlightRef = useRef(false)
-  // Why: useRef, not useMemo — React may discard memoized values, which would silently
-  // reset the snapshot token this object exists to own.
-  const worktreeCatalogRef = useRef(new WorktreeCatalogSnapshotClient())
-  const fetchRepoMetadataInFlightRef = useRef(new WeakSet<RpcClient>())
-  const fetchRepoMetadataPendingRef = useRef(new WeakSet<RpcClient>())
-  const repoMetadataFetchedAtRef = useRef(0)
-  const newWorktreeModalRef = useRef<{ open: () => void }>(null)
-  const newWorktreeModalVisibleRef = useRef(false)
-  const forgetHostClient = useForgetHostClient()
-  const forceReconnectHost = useForceReconnect()
-  const [worktrees, setWorktrees] = useState<Worktree[]>(initialCache ?? [])
-  const [worktreesLoaded, setWorktreesLoaded] = useState(initialCache != null)
-  // Why (STA-3123): error code of the last failed worktree.ps, so a broken catalog
-  // path renders as a failure instead of an empty host. Cleared on the next success.
-  const [catalogError, setCatalogError] = useState<string | null>(null)
-  // Why: track the locally-opened worktree so the active-row highlight moves instantly instead of waiting for the next poll.
-  const [optimisticActiveWorktreeIdentity, setOptimisticActiveWorktreeIdentity] = useState<
-    string | null
-  >(null)
-  // One tick drives every visible agent row's relative timestamp.
-  const now = useNow(30_000)
-  const [repoColorsByName, setRepoColorsByName] = useState<Map<string, string>>(new Map())
-  const [repoIconsByName, setRepoIconsByName] = useState<Map<string, RepoIcon>>(new Map())
-  const [hostName, setHostName] = useState('')
-  const [error, setError] = useState('')
-  const [lastKnownWorktrees, setLastKnownWorktrees] = useState<Worktree[]>(initialCache ?? [])
-  const [search, setSearch] = useState('')
-  const [showSearch, setShowSearch] = useState(false)
-  const [sortMode, setSortMode] = useState<MobileSortMode>('recent')
-  const [filters, setFilters] = useState<FilterState>({
-    filterRepoIds: new Set(),
-    hideSleeping: false,
-    hideDefaultBranch: false,
-    alwaysShowDefaultBranch: true
-  })
-  const [groupMode, setGroupMode] = useState<MobileGroupMode>('repo')
-  const [workspaceStatuses, setWorkspaceStatuses] = useState<readonly WorkspaceStatusDefinition[]>(
-    DEFAULT_MOBILE_WORKSPACE_STATUSES
-  )
-  // displayName → repo id: filters key on repo id, but section headers/rows key on displayName, so bridge the two.
-  const [repoIdsByName, setRepoIdsByName] = useState<Map<string, string>>(new Map())
-  const [showSortPicker, setShowSortPicker] = useState(false)
-  const [showGroupPicker, setShowGroupPicker] = useState(false)
-  const [showFilterModal, setShowFilterModal] = useState(false)
-  const [actionTarget, setActionTarget] = useState<Worktree | null>(null)
-  const { hostCapabilities, floatingWorkspaceEnabled } = useHostProtocolGates()
-  const [confirmDelete, setConfirmDelete] = useState<Worktree | null>(null)
-  const [confirmRemoveHost, setConfirmRemoveHost] = useState(false)
-  const [routeActionState, setRouteActionState] = useState(() =>
-    createInitialHostRouteActionState(action)
-  )
-  const [sleptIds, setSleptIds] = useState<Set<string>>(new Set())
-
-  const leaveHost = useCallback(() => {
-    leaveHostRoute(router)
-  }, [router])
-  const [pinnedIds, setPinnedIds] = useState<Set<string>>(new Set())
-  const [collapsedGroups, setCollapsedGroups] = useState<Set<string>>(new Set())
-  // Why: ref so the ui.get merge and ui.set writes read the latest values without re-creating callbacks on every state change.
-  const viewStateRef = useRef<MobileViewState>({
-    groupMode: 'repo',
-    sortMode: 'recent',
-    hideSleeping: false,
-    hideDefaultBranch: false,
-    alwaysShowDefaultBranch: true,
-    filterRepoIds: [],
-    collapsedGroups: [],
-    workspaceStatuses: DEFAULT_MOBILE_WORKSPACE_STATUSES
-  })
-
-  useEffect(() => {
-    viewStateRef.current = {
-      groupMode,
-      sortMode,
-      hideSleeping: filters.hideSleeping,
-      hideDefaultBranch: filters.hideDefaultBranch,
-      alwaysShowDefaultBranch: filters.alwaysShowDefaultBranch !== false,
-      filterRepoIds: [...filters.filterRepoIds],
-      collapsedGroups: [...collapsedGroups],
-      workspaceStatuses
-    }
-  }, [groupMode, sortMode, filters, collapsedGroups, workspaceStatuses])
-
-  // Apply a MobileViewState onto the individual states and the snapshot ref in one shot.
-  const applyViewState = useCallback((next: MobileViewState) => {
-    viewStateRef.current = next
-    setGroupMode(next.groupMode)
-    setSortMode(next.sortMode)
-    setWorkspaceStatuses(next.workspaceStatuses)
-    setCollapsedGroups(new Set(next.collapsedGroups))
-    setFilters({
-      filterRepoIds: new Set(next.filterRepoIds),
-      hideSleeping: next.hideSleeping,
-      hideDefaultBranch: next.hideDefaultBranch,
-      alwaysShowDefaultBranch: next.alwaysShowDefaultBranch
-    })
-  }, [])
-
-  // Apply the change locally, then patch the desktop's shared store (ui.set) so both apps stay in sync.
-  const persistViewSettings = useCallback(
-    (patch: Partial<MobileViewState>) => {
-      const next: MobileViewState = { ...viewStateRef.current, ...patch }
-      applyViewState(next)
-      if (!client) {
-        return
-      }
-      // Send only the touched fields: the host merges partial updates, so a stale
-      // mirror can no longer revert sibling settings another client just changed
-      // (STA-5781; supersedes the #8873 whole-payload special case).
-      const payload: WorkspaceViewSettings = buildWorkspaceViewSettingsUpdate(patch, next)
-      if (Object.keys(payload).length === 0) {
-        return
-      }
-      void client.sendRequest('ui.set', payload).catch(() => {
-        // Best-effort: view settings are a convenience preference.
-      })
-    },
-    [client, applyViewState]
-  )
-
-  const openNewWorktreeModal = useCallback(() => {
-    const modal = newWorktreeModalRef.current
-    if (!modal) {
-      return
-    }
-    newWorktreeModalVisibleRef.current = true
-    modal.open()
-  }, [])
-
-  const resolvedRouteActionState = resolveHostRouteActionState(routeActionState, action)
-  // Why: resolve `action=newWorktree` before commit, but don't reopen after the user closes while the URL persists.
-  if (resolvedRouteActionState !== routeActionState) {
-    setRouteActionState(resolvedRouteActionState)
-  }
-  const showNewWorktree = resolvedRouteActionState.showNewWorktree
-  const setShowNewWorktreeVisible = useCallback((visible: boolean) => {
-    setRouteActionState((current) => setHostRouteNewWorktreeVisible(current, visible))
-  }, [])
-
-  // Load persisted pins from local cache; view settings are no longer local (they sync via ui.get).
-  useEffect(() => {
-    if (!hostId) {
-      return
-    }
-    let stale = false
-    void (async () => {
-      const pins = await loadPinnedIds(hostId)
-      if (stale) {
-        return
-      }
-      setPinnedIds(pins)
-    })()
-    return () => {
-      stale = true
-    }
-  }, [hostId])
-
-  // Merge the desktop's shared view settings (PersistedUIState) onto local state so desktop changes appear here.
-  const syncViewSettingsFromDesktop = useCallback(async () => {
-    if (!client || connState !== 'connected') {
-      return
-    }
-    const requestClient = client
-    const requestHostId = hostId
-    try {
-      const response = await requestClient.sendRequest('ui.get')
-      if (clientRef.current !== requestClient || hostId !== requestHostId || !response.ok) {
-        return
-      }
-      const ui = ((response as RpcSuccess).result as { ui?: WorkspaceViewSettings }).ui
-      if (!ui) {
-        return
-      }
-      applyViewState(applyDesktopViewSettings(viewStateRef.current, ui))
-    } catch {
-      // Transient transport failure; retry on the next focus/connect.
-    }
-  }, [client, connState, hostId, applyViewState])
-
-  // Why: mirror client into a ref so imperative call sites read it without re-subscribing.
-  useEffect(() => {
-    clientRef.current = client
-  }, [client])
-
-  useEffect(() => {
-    setHostName('')
-    setError('')
-    setRepoColorsByName(new Map())
-    setRepoIconsByName(new Map())
-    repoMetadataFetchedAtRef.current = 0
-    // Why: useState initializer runs only on first mount, so re-seed the cache when Expo Router reuses this screen for a new hostId.
-    const freshCache = hostId ? (getCachedWorktrees(hostId) as Worktree[] | null) : null
-    setCatalogError(null)
-    if (freshCache) {
-      setWorktrees(freshCache)
-      setLastKnownWorktrees(freshCache)
-      setWorktreesLoaded(true)
-    } else {
-      setWorktreesLoaded(false)
-      setWorktrees([])
-      setLastKnownWorktrees([])
-    }
-    if (!hostId) {
-      return
-    }
-    let stale = false
-    void loadHosts().then((hosts) => {
-      if (stale) {
-        return
-      }
-      const host = hosts.find((h) => h.id === hostId)
-      if (!host) {
-        setError('Host not found')
-        return
-      }
-      setHostName(host.name)
-      void updateLastConnected(host.id)
-    })
-    return () => {
-      stale = true
-    }
-  }, [hostId])
-
-  const fetchRepoMetadata = useCallback(
-    async (options: { force?: boolean; queueIfInFlight?: boolean } = {}) => {
-      if (!client || connState !== 'connected' || !hostId) {
-        return
-      }
-      if (fetchRepoMetadataInFlightRef.current.has(client)) {
-        if (options.queueIfInFlight) {
-          fetchRepoMetadataPendingRef.current.add(client)
-        }
-        return
-      }
-      const now = Date.now()
-      if (!options.force && now - repoMetadataFetchedAtRef.current < REPO_METADATA_REFRESH_MS) {
-        return
-      }
-      fetchRepoMetadataInFlightRef.current.add(client)
-      const requestClient = client,
-        requestHostId = hostId
-      try {
-        do {
-          fetchRepoMetadataPendingRef.current.delete(requestClient)
-          const repoResponse = await requestClient.sendRequest('repo.list')
-          if (clientRef.current !== requestClient || hostId !== requestHostId || !repoResponse.ok) {
-            return
-          }
-          const repoResult = (repoResponse as RpcSuccess).result as { repos: RepoSummary[] }
-          repoMetadataFetchedAtRef.current = Date.now()
-          setCachedRepos(requestHostId, repoResult.repos)
-          setRepoColorsByName(
-            new Map(
-              repoResult.repos.map((repo) => [
-                repo.displayName,
-                repo.badgeColor || repoColor(repo.displayName)
-              ])
-            )
-          )
-          setRepoIconsByName(
-            new Map(
-              repoResult.repos.flatMap((repo) =>
-                repo.repoIcon ? [[repo.displayName, repo.repoIcon] as const] : []
-              )
-            )
-          )
-          setRepoIdsByName(new Map(repoResult.repos.map((repo) => [repo.displayName, repo.id])))
-        } while (fetchRepoMetadataPendingRef.current.has(requestClient))
-      } catch {
-        // Repo metadata is decorative; the next refresh can retry.
-      } finally {
-        fetchRepoMetadataInFlightRef.current.delete(requestClient)
-      }
-    },
-    [client, connState, hostId]
-  )
-
-  const fetchWorktrees = useCallback(
-    async (options: { allowDuringModal?: boolean } = {}) => {
-      if (!client || connState !== 'connected') {
-        return
-      }
-      if (!options.allowDuringModal && newWorktreeModalVisibleRef.current) {
-        return
-      }
-      // Why: prevent slow remote hosts from stacking overlapping worktree.ps requests during polling.
-      if (fetchWorktreesInFlightRef.current) {
-        return
-      }
-      fetchWorktreesInFlightRef.current = true
-      const requestClient = client
-      const requestHostId = hostId
-
-      try {
-        const fetched = await worktreeCatalogRef.current.fetch(requestClient, requestHostId)
-        if (clientRef.current !== requestClient || hostId !== requestHostId) {
-          return
-        }
-        if (!options.allowDuringModal && newWorktreeModalVisibleRef.current) {
-          return
-        }
-        // Why (STA-3123): a failed catalog request must not pass for "0 worktrees";
-        // surface it so a broken remote host is diagnosable instead of looking empty.
-        if (fetched.kind === 'request_failed') {
-          setCatalogError(fetched.code)
-          return
-        }
-        if (fetched.pending.admission.kind === 'invalid') {
-          setCatalogError('invalid_response')
-        }
-        // Why: unchanged responses still yield the confirmed rows, so every poll reasserts
-        // host truth over optimistic local edits regardless of payload size.
-        const confirmed = worktreeCatalogRef.current.admit(fetched.pending)
-        if (confirmed) {
-          setCatalogError(null)
-          // Why: reuse the existing array on identical snapshots to keep SectionList/sort rebuilds off the tap path.
-          setWorktrees((current) =>
-            areWorktreeListsEqual(current, confirmed) ? current : confirmed
-          )
-          setLastKnownWorktrees((current) =>
-            areWorktreeListsEqual(current, confirmed) ? current : confirmed
-          )
-          setWorktreesLoaded(true)
-          // Why (#8498): overwrite the home-written cache with the confirmed snapshot so a reconnect/remount can't serve a stale list.
-          if (hostId) {
-            setCachedWorktrees(hostId, confirmed, { proven: true })
-          }
-          // Drop the optimistic active override once the host reports it active, so later desktop changes win.
-          setOptimisticActiveWorktreeIdentity((pending) =>
-            clearConfirmedActiveWorktreeIdentity(pending, confirmed)
-          )
-
-          // Clear optimistic sleep overrides once the server confirms inactive (liveTerminalCount === 0).
-          setSleptIds((prev) => retainLiveSleptWorktreeIdentities(prev, confirmed))
-
-          // Sync pin state from server so desktop-initiated pins reflect without relying on stale AsyncStorage.
-          const serverPinned = new Set(confirmed.filter((w) => w.isPinned).map((w) => w.worktreeId))
-          setPinnedIds((prev) => {
-            if (serverPinned.size === prev.size && [...serverPinned].every((id) => prev.has(id))) {
-              return prev
-            }
-            if (hostId) {
-              void savePinnedIds(hostId, serverPinned)
-            }
-            return serverPinned
-          })
-        }
-      } catch {
-        // Will retry on reconnect
-        if (clientRef.current === requestClient && hostId === requestHostId) {
-          setCatalogError('network_error')
-        }
-      } finally {
-        fetchWorktreesInFlightRef.current = false
-      }
-    },
-    [client, connState, hostId]
-  )
-
-  useFocusEffect(
-    useCallback(() => {
-      // Why: focus nudges reconnect and probes a possibly half-open socket; empty deps fire per focus, not per state flip (which defeats backoff).
-      // 'focus' keeps a healthy relay green — probe, never suspend (S2 grey blink).
-      clientRef.current?.notifyForeground('focus')
-    }, [])
-  )
-
-  const startWorktreeRefresh = useCallback(() => {
-    if (!client || connState !== 'connected') {
-      return
-    }
-    void syncViewSettingsFromDesktop()
-    return startHostWorktreeRefresh({ client, fetchWorktrees, fetchRepoMetadata })
-  }, [client, connState, fetchWorktrees, fetchRepoMetadata, syncViewSettingsFromDesktop])
-
-  useFocusEffect(
-    useCallback(() => {
-      // The embedded sidebar isn't a routed screen (focus never fires); it refreshes via the mount effect below.
-      if (!embedded) {
-        return startWorktreeRefresh()
-      }
-    }, [embedded, startWorktreeRefresh])
-  )
-
-  // Why: the embedded sidebar is never the focused route, so wire its refresh lifecycle from a mount effect.
-  useEffect(() => {
-    if (embedded) {
-      return startWorktreeRefresh()
-    }
-  }, [embedded, startWorktreeRefresh])
-
-  // Why (#8498): steady-state polls miss the transition INTO 'connected' after background/sleep, when the cache is stalest.
-  const { refreshing, onRefresh } = useWorktreeResync({
-    client,
-    connState,
-    fetchWorktrees,
-    fetchRepoMetadata
-  })
-
-  const updateLocalPins = useCallback(
-    (worktreeId: string, pinned: boolean) => {
-      setPinnedIds((prev) => {
-        const next = new Set(prev)
-        if (pinned) {
-          next.add(worktreeId)
-        } else {
-          next.delete(worktreeId)
-        }
-        if (hostId) {
-          void savePinnedIds(hostId, next)
-        }
-        return next
-      })
-    },
-    [hostId]
-  )
-
-  const togglePin = useCallback(
-    (worktreeId: string) => {
-      const worktree = worktrees.find((w) => w.worktreeId === worktreeId)
-      const currentlyPinned = worktree
-        ? isWorktreePinned(worktree, pinnedIds)
-        : pinnedIds.has(worktreeId)
-      const newPinned = !currentlyPinned
-
-      setWorktrees((prev) =>
-        prev.map((w) => (w.worktreeId === worktreeId ? { ...w, isPinned: newPinned } : w))
-      )
-      setLastKnownWorktrees((prev) =>
-        prev.map((w) => (w.worktreeId === worktreeId ? { ...w, isPinned: newPinned } : w))
-      )
-
-      updateLocalPins(worktreeId, newPinned)
-
-      if (client) {
-        client
-          .sendRequest('worktree.set', {
-            worktree: `id:${worktreeId}`,
-            isPinned: newPinned
-          })
-          .catch(() => {})
-      }
-    },
-    [client, worktrees, pinnedIds, updateLocalPins]
-  )
-
-  const handleDeleteWorktree = useCallback(
-    async (item: Worktree) => {
-      if (!client) {
-        return
-      }
-
-      const removeFromList = (list: Worktree[]) => removeWorktreeRow(list, item)
-      setWorktrees(removeFromList)
-      setLastKnownWorktrees(removeFromList)
-
-      try {
-        const response = await client.sendRequest('worktree.rm', {
-          worktree: `id:${item.worktreeId}`,
-          force: true
-        })
-        if (!response.ok) {
-          setWorktrees((prev) => [...prev, item])
-          setLastKnownWorktrees((prev) => [...prev, item])
-        }
-        void fetchWorktrees()
-      } catch {
-        setWorktrees((prev) => [...prev, item])
-        setLastKnownWorktrees((prev) => [...prev, item])
-      }
-    },
-    [client, fetchWorktrees]
-  )
-
-  const handleRemoveHost = useCallback(async () => {
-    if (!hostId) {
-      return
-    }
-    try {
-      await removeHostAndCloseClient(hostId, forgetHostClient)
-      leaveHost()
-    } catch {
-      // Why: removal can fail while still paired; re-open confirm (ConfirmModal closes on confirm).
-      setConfirmRemoveHost(true)
-      Alert.alert('Could not remove host', 'Please try again.')
-    }
-  }, [hostId, leaveHost, forgetHostClient])
-
-  const navigateFromHostList = useCallback(
-    (target: string) => {
-      if (!embedded) {
-        router.push(target)
-        return
-      }
-      if (pathname === (target.split('?')[0] ?? target)) {
-        return
-      }
-      if (pathname === `/h/${hostId}`) {
-        router.push(target)
-        return
-      }
-      router.replace(target)
-    },
-    [embedded, hostId, pathname, router]
-  )
-
-  const openWorktreeSession = useCallback(
-    (item: Worktree) => {
-      setOptimisticActiveWorktreeIdentity(getWorktreeRowIdentity(item))
-      if (client && connState === 'connected') {
-        void client
-          .sendRequest('worktree.activate', {
-            worktree: `id:${item.worktreeId}`,
-            notifyClients: false,
-            navigation: 'caller'
-          })
-          .catch(() => null)
-      }
-      const target = `/h/${hostId}/session/${encodeURIComponent(item.worktreeId)}?name=${encodeURIComponent(item.displayName || item.repo)}`
-      navigateFromHostList(target)
-    },
-    [client, connState, hostId, navigateFromHostList]
-  )
-
-  const openFloatingWorkspace = useCallback(() => {
-    // Why: no worktree.activate here — the floating sentinel has no worktree
-    // record; session.tabs.list hydrates its host-owned tabs on open.
-    navigateFromHostList(floatingWorkspaceSessionPath(hostId))
-  }, [hostId, navigateFromHostList])
-
-  const handleSortChange = useCallback(
-    (value: MobileSortMode) => {
-      persistViewSettings({ sortMode: value })
-    },
-    [persistViewSettings]
-  )
-
-  const toggleHideSleeping = useCallback(() => {
-    persistViewSettings({ hideSleeping: !viewStateRef.current.hideSleeping })
-  }, [persistViewSettings])
-
-  const toggleHideDefaultBranch = useCallback(() => {
-    persistViewSettings({ hideDefaultBranch: !viewStateRef.current.hideDefaultBranch })
-  }, [persistViewSettings])
-
-  const toggleRepoFilter = useCallback(
-    (repoId: string) => {
-      const next = new Set(viewStateRef.current.filterRepoIds)
-      if (next.has(repoId)) {
-        next.delete(repoId)
-      } else {
-        next.add(repoId)
-      }
-      persistViewSettings({ filterRepoIds: [...next] })
-    },
-    [persistViewSettings]
-  )
-
-  const clearFilters = useCallback(() => {
-    persistViewSettings({ hideSleeping: false, hideDefaultBranch: false, filterRepoIds: [] })
-  }, [persistViewSettings])
-
-  const activeFilterCount = useMemo(() => {
-    let count = 0
-    if (filters.hideSleeping) {
-      count++
-    }
-    if (filters.hideDefaultBranch) {
-      count++
-    }
-    count += filters.filterRepoIds.size
-    return count
-  }, [filters])
-  const selectedSortLabel =
-    SORT_OPTIONS.find((option) => option.value === sortMode)?.label ?? 'Recent'
-
-  const handleGroupChange = useCallback(
-    (value: MobileGroupMode) => {
-      persistViewSettings({ groupMode: value })
-    },
-    [persistViewSettings]
-  )
-
-  const displayWorktrees = useMemo(() => {
-    // Why: live `worktrees` is authoritative only while connected; under the amber
-    // mount default, connecting/handshaking must keep the pre-reconnect list too.
-    const base = connState === 'connected' ? worktrees : lastKnownWorktrees
-    return applyWorktreeRowDisplayState(base, sleptIds, optimisticActiveWorktreeIdentity)
-  }, [connState, worktrees, lastKnownWorktrees, sleptIds, optimisticActiveWorktreeIdentity])
-
-  const toggleCollapsed = useCallback(
-    (key: string) => {
-      const next = new Set(viewStateRef.current.collapsedGroups)
-      if (!next.delete(key)) {
-        next.add(key)
-      }
-      persistViewSettings({ collapsedGroups: [...next] })
-    },
-    [persistViewSettings]
-  )
-  const toggleWorktreeLineage = useCallback(
-    (item: Worktree) => toggleCollapsed(getMobileWorkspaceLineageGroupKey(item)),
-    [toggleCollapsed]
-  )
-  const { sections, rawSections, uniqueRepos, uniqueRepoColors } = useWorkspaceSections({
-    displayWorktrees,
-    sortMode,
-    filters,
-    search,
-    groupMode,
-    pinnedIds,
-    repoIdsByName,
-    repoColorsByName,
-    collapsedGroups,
-    workspaceStatuses
-  })
-  const existingWorktreePaths = useMemo(() => worktrees.map((w) => w.path), [worktrees])
-
-  const { sectionListRef, onScrollToIndexFailed } = useActiveWorktreeScroll(sections)
-
-  const isReadOnly = connState === 'auth-failed'
-
-  if (error) {
-    return (
-      <View style={styles.centered}>
-        <Text style={styles.errorText}>{error}</Text>
-      </View>
-    )
-  }
-
-  return (
-    <SafeAreaView style={styles.container} edges={['top']}>
-      <View style={styles.topChrome}>
-        <View style={styles.statusBar}>
-          <Pressable
-            style={styles.backButton}
-            onPress={leaveHost}
-            accessibilityRole="button"
-            accessibilityLabel="Back to hosts"
-            hitSlop={8}
-          >
-            <ChevronLeft size={22} color={colors.textPrimary} />
-          </Pressable>
-          {(() => {
-            const headerVerdict = classifyConnection({
-              state: connState,
-              reconnectAttempts,
-              lastConnectedAt,
-              ...relayRecovery
-            })
-            return (
-              <>
-                <View style={styles.hostIdentity}>
-                  <StatusDot state={connState} verdict={headerVerdict} />
-                  <Text style={styles.hostNameText} numberOfLines={1}>
-                    {hostName || 'Host'}
-                  </Text>
-                </View>
-                {connState !== 'connected' &&
-                  (() => {
-                    // Why: auth-failed has its own banner, so suppress the Reconnect button for that verdict.
-                    const verdict = headerVerdict
-                    const isError = isErrorVerdict(verdict)
-                    const showReconnectButton = isError && hostId && verdict.kind !== 'auth-failed'
-                    if (!showReconnectButton) {
-                      return null
-                    }
-                    return (
-                      <Pressable
-                        style={styles.reconnectButton}
-                        onPress={() => void forceReconnectHost(hostId!)}
-                        hitSlop={8}
-                      >
-                        <Text style={styles.reconnectButtonText}>Reconnect</Text>
-                      </Pressable>
-                    )
-                  })()}
-              </>
-            )
-          })()}
-          {!embedded && floatingWorkspaceEnabled ? (
-            <Pressable
-              style={[
-                styles.floatingWorkspaceHeaderButton,
-                connState !== 'connected' && styles.toolbarIconDisabled
-              ]}
-              onPress={openFloatingWorkspace}
-              disabled={connState !== 'connected'}
-              accessibilityRole="button"
-              accessibilityLabel="Floating Workspace"
-              hitSlop={8}
-            >
-              <SquareTerminal
-                size={18}
-                color={connState === 'connected' ? colors.textPrimary : colors.textMuted}
-              />
-            </Pressable>
-          ) : null}
-          {embedded && onHideSidebar ? (
-            <Pressable
-              style={styles.sidebarCollapseButton}
-              onPress={onHideSidebar}
-              accessibilityRole="button"
-              accessibilityLabel="Hide sidebar"
-              hitSlop={8}
-            >
-              <PanelLeftClose size={14} color={colors.textSecondary} />
-            </Pressable>
-          ) : null}
-        </View>
-
-        {/* Filter/sort/group toolbar */}
-        {embedded ? (
-          <View style={styles.embeddedToolbar}>
-            <View style={styles.embeddedToolbarRow}>
-              <Pressable
-                style={[
-                  styles.filterChip,
-                  styles.embeddedFilterChip,
-                  activeFilterCount > 0 && styles.filterChipActive
-                ]}
-                onPress={() => setShowFilterModal(true)}
-                accessibilityRole="button"
-                accessibilityLabel={`Filter workspaces${activeFilterCount > 0 ? `, ${activeFilterCount} active` : ''}`}
-              >
-                <Filter
-                  size={12}
-                  color={activeFilterCount > 0 ? colors.textPrimary : colors.textSecondary}
-                />
-                <Text
-                  style={[
-                    styles.filterChipText,
-                    activeFilterCount > 0 && styles.filterChipTextActive
-                  ]}
-                  numberOfLines={1}
-                >
-                  Filter{activeFilterCount > 0 ? ` ${activeFilterCount}` : ''}
-                </Text>
-              </Pressable>
-
-              <Pressable
-                style={[styles.modeButton, styles.embeddedModeButton]}
-                onPress={() => setShowSortPicker(true)}
-                accessibilityRole="button"
-                accessibilityLabel={`Sort by ${selectedSortLabel}`}
-              >
-                <SlidersHorizontal size={14} color={colors.textSecondary} />
-                <Text style={styles.sortLabel} numberOfLines={1}>
-                  {selectedSortLabel}
-                </Text>
-              </Pressable>
-
-              <Pressable
-                style={[styles.modeButton, styles.embeddedModeButton]}
-                onPress={() => setShowGroupPicker(true)}
-                accessibilityRole="button"
-                accessibilityLabel="Group workspaces"
-              >
-                <Layers size={14} color={colors.textSecondary} />
-                <Text style={styles.sortLabel} numberOfLines={1}>
-                  {groupMode === 'none'
-                    ? 'Group'
-                    : groupMode === 'workspaceStatus'
-                      ? 'Status'
-                      : groupMode === 'repo'
-                        ? 'Repo'
-                        : 'PR'}
-                </Text>
-              </Pressable>
-            </View>
-
-            <View style={styles.embeddedToolbarRow}>
-              <Pressable
-                style={[
-                  styles.embeddedToolbarIconButton,
-                  connState !== 'connected' && styles.toolbarIconDisabled
-                ]}
-                onPress={() => navigateFromHostList(`/h/${hostId}/accounts`)}
-                disabled={connState !== 'connected'}
-                accessibilityRole="button"
-                accessibilityLabel="Accounts"
-              >
-                <UserCircle
-                  size={16}
-                  color={connState === 'connected' ? colors.textSecondary : colors.textMuted}
-                />
-              </Pressable>
-
-              <Pressable
-                style={[
-                  styles.embeddedToolbarIconButton,
-                  connState !== 'connected' && styles.toolbarIconDisabled
-                ]}
-                onPress={() => navigateFromHostList(`/h/${hostId}/tasks`)}
-                disabled={connState !== 'connected'}
-                accessibilityRole="button"
-                accessibilityLabel="Tasks"
-              >
-                <List
-                  size={16}
-                  color={connState === 'connected' ? colors.textSecondary : colors.textMuted}
-                />
-              </Pressable>
-
-              {floatingWorkspaceEnabled ? (
-                <Pressable
-                  style={[
-                    styles.embeddedToolbarIconButton,
-                    connState !== 'connected' && styles.toolbarIconDisabled
-                  ]}
-                  onPress={openFloatingWorkspace}
-                  disabled={connState !== 'connected'}
-                  accessibilityRole="button"
-                  accessibilityLabel="Floating Workspace"
-                >
-                  <SquareTerminal
-                    size={18}
-                    color={connState === 'connected' ? colors.textSecondary : colors.textMuted}
-                  />
-                </Pressable>
-              ) : null}
-
-              <Pressable
-                style={[
-                  styles.embeddedToolbarIconButton,
-                  connState !== 'connected' && styles.toolbarIconDisabled
-                ]}
-                onPress={openNewWorktreeModal}
-                disabled={connState !== 'connected'}
-                accessibilityRole="button"
-                accessibilityLabel="New workspace"
-              >
-                <Plus
-                  size={16}
-                  color={connState === 'connected' ? colors.textPrimary : colors.textMuted}
-                />
-              </Pressable>
-
-              <Pressable
-                style={styles.embeddedToolbarIconButton}
-                onPress={() => setShowSearch((s) => !s)}
-                accessibilityRole="button"
-                accessibilityLabel={showSearch ? 'Close search' : 'Search workspaces'}
-              >
-                {showSearch ? (
-                  <X size={16} color={colors.textSecondary} />
-                ) : (
-                  <Search size={16} color={colors.textSecondary} />
-                )}
-              </Pressable>
-            </View>
-          </View>
-        ) : (
-          <View style={styles.toolbar}>
-            <Pressable
-              style={[styles.filterChip, activeFilterCount > 0 && styles.filterChipActive]}
-              onPress={() => setShowFilterModal(true)}
-            >
-              <Filter
-                size={12}
-                color={activeFilterCount > 0 ? colors.textPrimary : colors.textSecondary}
-              />
-              <Text
-                style={[
-                  styles.filterChipText,
-                  activeFilterCount > 0 && styles.filterChipTextActive
-                ]}
-              >
-                Filter{activeFilterCount > 0 ? ` (${activeFilterCount})` : ''}
-              </Text>
-            </Pressable>
-
-            <Pressable style={styles.modeButton} onPress={() => setShowSortPicker(true)}>
-              <SlidersHorizontal size={14} color={colors.textSecondary} />
-              <Text style={styles.sortLabel} numberOfLines={1}>
-                {selectedSortLabel}
-              </Text>
-            </Pressable>
-
-            <Pressable style={styles.modeButton} onPress={() => setShowGroupPicker(true)}>
-              <Layers size={14} color={colors.textSecondary} />
-              <Text style={styles.sortLabel} numberOfLines={1}>
-                {groupMode === 'none'
-                  ? 'Group'
-                  : groupMode === 'workspaceStatus'
-                    ? 'Status'
-                    : groupMode === 'repo'
-                      ? 'Repo'
-                      : 'PR'}
-              </Text>
-            </Pressable>
-
-            <View style={styles.toolbarSpacer} />
-
-            <Pressable
-              style={styles.searchToggle}
-              onPress={() => navigateFromHostList(`/h/${hostId}/accounts`)}
-              disabled={connState !== 'connected'}
-            >
-              <UserCircle
-                size={16}
-                color={connState === 'connected' ? colors.textSecondary : colors.textMuted}
-              />
-            </Pressable>
-
-            <Pressable
-              style={styles.searchToggle}
-              onPress={() => navigateFromHostList(`/h/${hostId}/tasks`)}
-              disabled={connState !== 'connected'}
-            >
-              <List
-                size={16}
-                color={connState === 'connected' ? colors.textSecondary : colors.textMuted}
-              />
-            </Pressable>
-
-            <Pressable style={styles.searchToggle} onPress={() => setShowSearch((s) => !s)}>
-              {showSearch ? (
-                <X size={16} color={colors.textSecondary} />
-              ) : (
-                <Search size={16} color={colors.textSecondary} />
-              )}
-            </Pressable>
-          </View>
-        )}
-      </View>
-
-      {/* Auth failed: a latched relay rejection must reach the same re-pair affordance. */}
-      {(connState === 'auth-failed' || relayRecovery.pairingRejected) && (
-        <AuthFailedBanner
-          canRetry={!!hostId}
-          onRetry={() => hostId && void forceReconnectHost(hostId)}
-          onRepair={() => router.push('/pair-scan')}
-          onRemove={() => setConfirmRemoveHost(true)}
-        />
-      )}
-
-      {connState !== 'connected' &&
-      !relayRecovery.pairingRejected &&
-      reconnectAttempts >= 3 &&
-      hostId ? (
-        <HostDiagnosticsLink
-          onPress={() =>
-            router.push({ pathname: '/connection-log', params: { hostId: String(hostId) } })
-          }
-        />
-      ) : null}
-
-      {/* Why a bounced route landed here (e.g. the workspace was deleted on the desktop). */}
-      {routeNotice && (
-        <HostRouteNoticeBanner
-          message={routeNotice}
-          onDismiss={() => setDismissedNotice(noticeParam ?? null)}
-        />
-      )}
-
-      {/* Search bar */}
-      {showSearch && (
-        <View style={styles.searchBar}>
-          <MobileSearchField
-            value={search}
-            onChangeText={setSearch}
-            placeholder="Search worktrees…"
-            autoFocus
-            // Why: new key per open remounts the focus effect across rapid toggles so the keyboard reappears.
-            focusKey={showSearch}
-            accessibilityLabel="Search worktrees"
-          />
-        </View>
-      )}
-
-      <HostWorkspaceListStates
-        connState={connState}
-        worktreesLoaded={worktreesLoaded}
-        displayCount={displayWorktrees.length}
-        sectionCount={sections.length}
-        catalogError={catalogError}
-        search={search}
-        activeFilterCount={activeFilterCount}
-      />
-
-      {sections.length > 0 && (
-        <SectionList
-          ref={sectionListRef}
-          sections={sections}
-          keyExtractor={(w) => w.sectionListKey ?? getWorktreeRowIdentity(w)}
-          stickySectionHeadersEnabled={false}
-          // Why: keep the search IME up while tapping clear / scrolling results.
-          keyboardShouldPersistTaps="handled"
-          keyboardDismissMode="on-drag"
-          onScrollToIndexFailed={onScrollToIndexFailed}
-          // Why: edge-to-edge under the system nav bar; insets.bottom keeps the last row above it.
-          contentContainerStyle={[
-            styles.list,
-            // Reserve room so the last row stays tappable above the phone's floating "+" (embedded uses the toolbar +).
-            { paddingBottom: (embedded ? spacing.lg : FAB_SIZE + spacing.xl) + insets.bottom },
-            isWideLayout &&
-              !embedded && { maxWidth: contentMaxWidth, width: '100%', alignSelf: 'center' }
-          ]}
-          renderSectionHeader={({ section }) => {
-            if (!section.title) {
-              return null
-            }
-            const isCollapsed = collapsedGroups.has(section.key)
-            const rawSection = rawSections.find((s) => s.key === section.key)
-            const count = rawSection?.data.length ?? 0
-            const repoSectionColor =
-              groupMode === 'repo' ? uniqueRepoColors.get(section.title) : null
-            const repoSectionIcon = groupMode === 'repo' ? repoIconsByName.get(section.title) : null
-            return (
-              <Pressable style={styles.sectionHeader} onPress={() => toggleCollapsed(section.key)}>
-                {isCollapsed ? (
-                  <ChevronRight size={12} color={colors.textMuted} style={styles.sectionIcon} />
-                ) : (
-                  <ChevronDown size={12} color={colors.textMuted} style={styles.sectionIcon} />
-                )}
-                {section.icon === 'pin' && (
-                  <Pin size={12} color={colors.textMuted} style={styles.sectionIcon} />
-                )}
-                {groupMode === 'repo' ? (
-                  <View style={styles.sectionRepoIcon}>
-                    <MobileRepoIcon
-                      repoIcon={repoSectionIcon}
-                      size={14}
-                      color={repoSectionColor ?? colors.textSecondary}
-                    />
-                  </View>
-                ) : null}
-                <Text style={styles.sectionTitle}>{section.title}</Text>
-                <Text style={styles.sectionCount}>{count}</Text>
-              </Pressable>
-            )
-          }}
-          ItemSeparatorComponent={ListSeparator}
-          // Why (#8498): manual pull-to-refresh forces a fresh snapshot after a stale-cache reconnect.
-          refreshControl={
-            <RefreshControl
-              refreshing={refreshing}
-              onRefresh={onRefresh}
-              tintColor={colors.textSecondary}
-              colors={[colors.textSecondary]}
-            />
-          }
-          renderItem={({ item }) => (
-            <WorktreeListRow
-              item={item}
-              isReadOnly={isReadOnly}
-              now={now}
-              status={getWorktreeStatus(item)}
-              repoColor={uniqueRepoColors.get(item.repo) ?? repoColor(item.repo)}
-              repoIcon={repoIconsByName.get(item.repo) ?? null}
-              hideRepo={groupMode === 'repo'}
-              onPress={openWorktreeSession}
-              onLongPress={item.workspaceKind === 'folder-workspace' ? undefined : setActionTarget}
-              onToggleLineage={toggleWorktreeLineage}
-            />
-          )}
-        />
-      )}
-
-      {/* Floating "new workspace" button — phone only; embedded sidebars keep the toolbar +. */}
-      {!embedded && (
-        <NewWorkspaceFab onPress={openNewWorktreeModal} disabled={connState !== 'connected'} />
-      )}
-
-      <PickerModal
-        visible={showSortPicker}
-        title="Sort By"
-        options={SORT_OPTIONS}
-        selected={sortMode}
-        onSelect={handleSortChange}
-        onClose={() => setShowSortPicker(false)}
-      />
-
-      <PickerModal
-        visible={showGroupPicker}
-        title="Group By"
-        options={GROUP_OPTIONS}
-        selected={groupMode}
-        onSelect={handleGroupChange}
-        onClose={() => setShowGroupPicker(false)}
-      />
-
-      <BottomDrawer visible={showFilterModal} onClose={() => setShowFilterModal(false)}>
-        <View style={styles.filterModalHeader}>
-          <Text style={styles.filterModalTitle}>Filter</Text>
-          {activeFilterCount > 0 && (
-            <Pressable onPress={clearFilters}>
-              <Text style={styles.clearFiltersText}>Clear filters</Text>
-            </Pressable>
-          )}
-        </View>
-
-        <Text style={styles.filterSectionLabel}>Workspaces</Text>
-        <View style={styles.filterGroup}>
-          <Pressable style={styles.filterRow} onPress={toggleHideSleeping}>
-            <Text style={styles.filterRowText}>Hide sleeping</Text>
-            {filters.hideSleeping && <Check size={14} color={colors.textPrimary} />}
-          </Pressable>
-          <View style={styles.filterSeparator} />
-          <Pressable style={styles.filterRow} onPress={toggleHideDefaultBranch}>
-            <Text style={styles.filterRowText}>Hide default branch</Text>
-            {filters.hideDefaultBranch && <Check size={14} color={colors.textPrimary} />}
-          </Pressable>
-        </View>
-
-        {uniqueRepos.length > 1 && (
-          <>
-            <Text style={styles.filterSectionLabel}>Repositories</Text>
-            <View style={styles.filterGroup}>
-              {uniqueRepos.map((repo, i) => (
-                <View key={repo.id}>
-                  {i > 0 && <View style={styles.filterSeparator} />}
-                  <Pressable style={styles.filterRow} onPress={() => toggleRepoFilter(repo.id)}>
-                    <View style={[styles.filterRepoDot, { backgroundColor: repo.color }]} />
-                    <Text style={styles.filterRowText} numberOfLines={1}>
-                      {repo.name}
-                    </Text>
-                    {filters.filterRepoIds.has(repo.id) && (
-                      <Check size={14} color={colors.textPrimary} />
-                    )}
-                  </Pressable>
-                </View>
-              ))}
-            </View>
-          </>
-        )}
-      </BottomDrawer>
-
-      {/* Worktree long-press action sheet (inline confirm to avoid double-Modal lag) */}
-      <BottomDrawer
-        visible={actionTarget != null}
-        onClose={() => {
-          setConfirmDelete(null)
-          setActionTarget(null)
-        }}
-      >
-        {confirmDelete ? (
-          <View>
-            <View style={styles.confirmContent}>
-              <Text style={styles.confirmTitle}>Delete Worktree</Text>
-              <Text style={styles.confirmMessage}>
-                Delete "{confirmDelete.displayName || confirmDelete.repo}" ({confirmDelete.branch})?
-              </Text>
-            </View>
-            <View style={styles.confirmButtons}>
-              <Pressable
-                style={({ pressed }) => [
-                  styles.confirmBtn,
-                  styles.confirmBtnCancel,
-                  pressed && styles.confirmBtnPressed
-                ]}
-                onPress={() => setConfirmDelete(null)}
-              >
-                <Text style={styles.confirmBtnCancelText}>Cancel</Text>
-              </Pressable>
-              <Pressable
-                style={({ pressed }) => [
-                  styles.confirmBtn,
-                  styles.confirmBtnDestructive,
-                  pressed && styles.confirmBtnPressed
-                ]}
-                onPress={() => {
-                  if (confirmDelete) {
-                    void handleDeleteWorktree(confirmDelete)
-                  }
-                  setConfirmDelete(null)
-                  setActionTarget(null)
-                }}
-              >
-                <Text style={styles.confirmBtnDestructiveText}>Delete</Text>
-              </Pressable>
-            </View>
-          </View>
-        ) : (
-          <ActionSheetContent
-            title={actionTarget ? actionTarget.displayName || actionTarget.repo : undefined}
-            message={actionTarget?.branch}
-            actions={
-              actionTarget
-                ? [
-                    ...buildWorktreeNavigationActions({
-                      hostId,
-                      worktreeId: actionTarget.worktreeId,
-                      worktreeName: actionTarget.displayName || actionTarget.repo,
-                      hostCapabilities,
-                      navigate: navigateFromHostList,
-                      onDone: () => setActionTarget(null)
-                    }),
-                    {
-                      label: 'Sleep',
-                      icon: Moon,
-                      onPress: () => {
-                        if (client) {
-                          setSleptIds((prev) =>
-                            new Set(prev).add(getWorktreeRowIdentity(actionTarget))
-                          )
-                          void client
-                            .sendRequest('worktree.sleep', {
-                              worktree: `id:${actionTarget.worktreeId}`
-                            })
-                            .catch(() => null)
-                        }
-                        setActionTarget(null)
-                      }
-                    },
-                    {
-                      label: isWorktreePinned(actionTarget, pinnedIds) ? 'Unpin' : 'Pin',
-                      onPress: () => {
-                        togglePin(actionTarget.worktreeId)
-                        setActionTarget(null)
-                      }
-                    },
-                    {
-                      label: 'Delete',
-                      destructive: true,
-                      onPress: () => setConfirmDelete(actionTarget)
-                    }
-                  ]
-                : []
-            }
-          />
-        )}
-      </BottomDrawer>
-
-      {/* Host remove confirmation */}
-      <ConfirmModal
-        visible={confirmRemoveHost}
-        title="Remove Host"
-        message={`Remove "${hostName}"? You can re-pair later.`}
-        confirmLabel="Remove"
-        destructive
-        onConfirm={() => void handleRemoveHost()}
-        onCancel={() => setConfirmRemoveHost(false)}
-      />
-
-      <NewWorktreeModalController
-        ref={newWorktreeModalRef}
-        routeVisible={showNewWorktree}
-        client={client}
-        hostId={hostId}
-        existingWorktreePaths={existingWorktreePaths}
-        existingWorktrees={worktrees}
-        onVisibleChange={(visible) => {
-          newWorktreeModalVisibleRef.current = visible
-        }}
-        onCreated={(worktreeId, worktreeName) => {
-          void fetchWorktrees({ allowDuringModal: true })
-          navigateFromHostList(hostNewWorktreeSessionRoute(hostId, worktreeId, worktreeName))
-        }}
-        onRouteVisibleChange={setShowNewWorktreeVisible}
-      />
-    </SafeAreaView>
-  )
+export function HostScreen(props: HostScreenProps = {}) {
+  const controller = useHostScreenController(props)
+  return <HostScreenView controller={controller} />
 }
 
 // On wide layouts the sidebar hosts the list, so this route is just the empty detail pane.
@@ -1415,7 +19,3 @@ export default function HostWorktreeRoute() {
   }
   return <HostScreen />
 }
-
-function ListSeparator() {
-  return <View style={styles.separator} />
-}
diff --git a/mobile/app/h/[hostId]/session/[worktreeId].tsx b/mobile/app/h/[hostId]/session/[worktreeId].tsx
index 0d36fa96020..5978bae2353 100644
--- a/mobile/app/h/[hostId]/session/[worktreeId].tsx
+++ b/mobile/app/h/[hostId]/session/[worktreeId].tsx
@@ -182,6 +182,7 @@ import {
 } from '../../../../src/session/mobile-file-syntax'
 import {
   getTerminalRecordsFromSessionTabs,
+  hasConnectedTerminalAbsentFromSessionTabs,
   mergeTerminalListWithKnownRecords,
   mergeTerminalRecordsByCurrentOrder,
   mobileSessionTabsEqual,
@@ -245,6 +246,11 @@ import {
 } from '../../../../src/session/mobile-terminal-prune-decision'
 import { useMobileNativeChatTerminalStream } from '../../../../src/session/use-mobile-native-chat-terminal-stream'
 import { subscribeMobileTerminalSafely } from '../../../../src/session/mobile-terminal-stream-subscribe'
+import { MobileTerminalInventoryRequest } from '../../../../src/session/mobile-terminal-inventory-request'
+import {
+  useMobileTerminalInventoryRecoveryBridge,
+  type MobileTerminalInventoryRefreshOptions
+} from '../../../../src/session/use-mobile-terminal-inventory-recovery'
 import {
   TerminalViewportResubscribeBudget,
   readTerminalViewportDims,
@@ -1277,6 +1283,9 @@ export default function SessionScreen() {
   )
   const unsubscribeTerminalRef = useRef(unsubscribeTerminal)
   unsubscribeTerminalRef.current = unsubscribeTerminal
+  const terminalInventoryRecoveryScope = JSON.stringify([hostId, worktreeId])
+  const { registerTerminalInventoryRecoveryAction, signalTerminalInventoryRecovery } =
+    useMobileTerminalInventoryRecoveryBridge(terminalInventoryRecoveryScope)
 
   const clearTerminalCache = useCallback(() => {
     terminalUnsubsRef.current.forEach((unsub) => unsub())
@@ -1379,6 +1388,7 @@ export default function SessionScreen() {
           diagnostics.firstStreamEvent(handle, seq, data.type)
           if (data.type === 'end' || data.type === 'error') {
             unsubscribeTerminalRef.current(handle)
+            signalTerminalInventoryRecovery()
             return
           }
           if (data.type === 'subscribed') {
@@ -1522,7 +1532,10 @@ export default function SessionScreen() {
             scheduleDelayedAction(() => getTerminalRef(handle)?.resetZoom(), 200)
           }
         },
-        () => unsubscribeTerminalRef.current(handle)
+        () => {
+          unsubscribeTerminalRef.current(handle)
+          signalTerminalInventoryRecovery()
+        }
       )
 
       if (subscribeSeqRef.current.get(handle) === seq) {
@@ -1532,7 +1545,14 @@ export default function SessionScreen() {
       }
       subscribingHandlesRef.current.delete(handle)
     },
-    [client, getTerminalRef, markNativeChatInputLeaseReady, scheduleDelayedAction, showToast]
+    [
+      client,
+      getTerminalRef,
+      markNativeChatInputLeaseReady,
+      scheduleDelayedAction,
+      showToast,
+      signalTerminalInventoryRecovery
+    ]
   )
 
   const nativeChatStream = useMobileNativeChatTerminalStream({
@@ -1586,93 +1606,105 @@ export default function SessionScreen() {
   )
 
   const lastKnownTerminalCountRef = useRef(0)
-  const fetchTerminalsInFlightRef = useRef(false)
+  const terminalInventoryRequest = useMemo(
+    () => new MobileTerminalInventoryRequest(),
+    [client, hostId, worktreeId]
+  )
+  useEffect(() => {
+    lastKnownTerminalCountRef.current = 0
+    return terminalInventoryRequest.activate()
+  }, [terminalInventoryRequest])
 
   const fetchTerminals = useCallback(
-    async (opts: { allowEmptyLoaded?: boolean } = {}) => {
+    (opts: MobileTerminalInventoryRefreshOptions = {}): Promise<boolean> => {
       if (!client) {
-        return
+        return Promise.resolve(false)
       }
-      if (fetchTerminalsInFlightRef.current) {
-        return
-      }
-      fetchTerminalsInFlightRef.current = true
       const allowEmptyLoaded = opts.allowEmptyLoaded ?? true
-
-      try {
-        const response = await client.sendRequest('terminal.list', {
-          worktree: `id:${worktreeId}`,
-          includeVisualLayouts: false
-        })
-        if (response.ok) {
-          const result = (response as RpcSuccess).result as { terminals: Terminal[] }
-          if (result.terminals.length === 0 && !allowEmptyLoaded) {
-            return
-          }
-          // Why: require two consecutive empties before trusting 0, so transient empty responses don't flash the UI empty.
-          if (result.terminals.length === 0 && lastKnownTerminalCountRef.current > 0) {
-            lastKnownTerminalCountRef.current = 0
-            return
-          }
-
-          const liveHandles = new Set(result.terminals.map((terminal) => terminal.handle))
-          const pruneContext = {
-            liveHandles,
-            showNativeChat: showNativeChatRef.current,
-            activeHandle: activeHandleRef.current
-          }
-          // Why: terminal.list is the lifetime signal; lagging tab snapshots must not erase a user's buffered-mode opt-out.
-          // Sweep against the retained set, not the raw list: a chat-covered handle
-          // keeps its subscription across a graph reload, so erasing its live-input
-          // preference on the same refresh is the erasure this guard exists to stop.
-          pruneTerminalHandlesFromLiveInput(resolveRetainedTerminalHandles(pruneContext))
-          defaultTerminalHandlesToLiveInput([...liveHandles])
-          const shouldPrune = createTerminalPrunePredicate(pruneContext)
-          for (const handle of Array.from(terminalUnsubsRef.current.keys())) {
-            if (!shouldPrune(handle)) {
-              continue
-            }
-            unsubscribeTerminal(handle)
-            terminalRefs.current.delete(handle)
-            initializedHandlesRef.current.delete(handle)
-            viewportResubscribeBudgetRef.current.forget(handle)
-            clearTerminalLiveInputDefault(handle)
-          }
-          setTerminalKeyboardMetrics((prev) => pruneTerminalKeyboardMetrics(prev, shouldPrune))
-          // Why: a chat-covered handle the host reports again refills its rearm budget,
-          // so an exhausted rearm can't lock the composer until leave-chat.
-          nativeChatStream.notifyListedHandles(liveHandles)
-          // Why: same absence-gated refill for the viewport-fit budget — a handle that
-          // left the list and returned may converge now, so it earns fresh attempts.
-          viewportResubscribeBudgetRef.current.notifyListedHandles(liveHandles)
-          lastKnownTerminalCountRef.current = result.terminals.length
-          // Why: dedupe duplicate handles (rename/split race) to avoid a React duplicate-key throw; keep first for tab-strip order.
-          const seen = new Set<string>()
-          const deduped = result.terminals.filter((t) => {
-            if (seen.has(t.handle)) {
+      return terminalInventoryRequest.run(
+        allowEmptyLoaded,
+        async (allowsEmpty, isCurrent) => {
+          try {
+            const response = await client.sendRequest('terminal.list', {
+              worktree: `id:${worktreeId}`,
+              includeVisualLayouts: false
+            })
+            if (!isCurrent()) {
               return false
             }
-            seen.add(t.handle)
+            if (!response.ok) {
+              return false
+            }
+            const result = (response as RpcSuccess).result as { terminals: Terminal[] }
+            if (result.terminals.length === 0 && !allowsEmpty()) {
+              return true
+            }
+            // Why: require two consecutive empties before trusting 0, so transient empty responses don't flash the UI empty.
+            if (result.terminals.length === 0 && lastKnownTerminalCountRef.current > 0) {
+              lastKnownTerminalCountRef.current = 0
+              return true
+            }
+
+            const liveHandles = new Set(result.terminals.map((terminal) => terminal.handle))
+            const pruneContext = {
+              liveHandles,
+              showNativeChat: showNativeChatRef.current,
+              activeHandle: activeHandleRef.current
+            }
+            // Why: terminal.list is the lifetime signal; lagging tab snapshots must not erase a user's buffered-mode opt-out.
+            // Sweep against the retained set, not the raw list: a chat-covered handle
+            // keeps its subscription across a graph reload, so erasing its live-input
+            // preference on the same refresh is the erasure this guard exists to stop.
+            pruneTerminalHandlesFromLiveInput(resolveRetainedTerminalHandles(pruneContext))
+            defaultTerminalHandlesToLiveInput([...liveHandles])
+            const shouldPrune = createTerminalPrunePredicate(pruneContext)
+            for (const handle of Array.from(terminalUnsubsRef.current.keys())) {
+              if (!shouldPrune(handle)) {
+                continue
+              }
+              unsubscribeTerminal(handle)
+              terminalRefs.current.delete(handle)
+              initializedHandlesRef.current.delete(handle)
+              viewportResubscribeBudgetRef.current.forget(handle)
+              clearTerminalLiveInputDefault(handle)
+            }
+            setTerminalKeyboardMetrics((prev) => pruneTerminalKeyboardMetrics(prev, shouldPrune))
+            // Why: a chat-covered handle the host reports again refills its rearm budget,
+            // so an exhausted rearm can't lock the composer until leave-chat.
+            nativeChatStream.notifyListedHandles(liveHandles)
+            // Why: same absence-gated refill for the viewport-fit budget — a handle that
+            // left the list and returned may converge now, so it earns fresh attempts.
+            viewportResubscribeBudgetRef.current.notifyListedHandles(liveHandles)
+            lastKnownTerminalCountRef.current = result.terminals.length
+            // Why: dedupe duplicate handles (rename/split race) to avoid a React duplicate-key throw; keep first for tab-strip order.
+            const seen = new Set<string>()
+            const deduped = result.terminals.filter((t) => {
+              if (seen.has(t.handle)) {
+                return false
+              }
+              seen.add(t.handle)
+              return true
+            })
+
+            const mergedTerminals = mergeTerminalListWithKnownRecords(
+              deduped,
+              terminalsRef.current,
+              sessionTabsRef.current
+            )
+            setTerminals((prev) =>
+              terminalRecordsEqual(prev, mergedTerminals) ? prev : mergedTerminals
+            )
+            terminalsRef.current = mergedTerminals
+
+            // Session tabs are the UI authority; terminal.list only refreshes per-handle metadata for existing terminal surfaces.
             return true
-          })
-
-          const mergedTerminals = mergeTerminalListWithKnownRecords(
-            deduped,
-            terminalsRef.current,
-            sessionTabsRef.current
-          )
-          setTerminals((prev) =>
-            terminalRecordsEqual(prev, mergedTerminals) ? prev : mergedTerminals
-          )
-          terminalsRef.current = mergedTerminals
-
-          // Session tabs are the UI authority; terminal.list only refreshes per-handle metadata for existing terminal surfaces.
-        }
-      } catch {
-        // Failed to list terminals
-      } finally {
-        fetchTerminalsInFlightRef.current = false
-      }
+          } catch {
+            // Failed to list terminals
+            return false
+          }
+        },
+        opts.onPhysicalRequestStarted
+      )
     },
     [
       client,
@@ -1682,6 +1714,7 @@ export default function SessionScreen() {
       nativeChatStream,
       pruneTerminalHandlesFromLiveInput,
       subscribeToTerminal,
+      terminalInventoryRequest,
       unsubscribeTerminal
     ]
   )
@@ -2302,6 +2335,9 @@ export default function SessionScreen() {
     () =>
       closedTabTombstonesRef.current.size > 0 ||
       pendingBrowserFocusPageIdRef.current !== null ||
+      // Why: tabs dropped a connected handle we still hold. `terminal.list` is the only
+      // remover, so keep the fast cadence until that sweep confirms or restores it.
+      hasConnectedTerminalAbsentFromSessionTabs(terminalsRef.current, sessionTabsRef.current) ||
       // Why: a chat-covered handle that ran out of rearms and left `terminal.list`
       // was reminted by a desktop graph reload. Only a fresh tab snapshot carries
       // the replacement handle, so force one instead of holding the composer locked.
@@ -2333,7 +2369,8 @@ export default function SessionScreen() {
     fetchSessionTabs,
     ensureSessionTabs,
     fetchPendingBrowserSessionTabs,
-    retryPendingTerminalRecovery
+    retryPendingTerminalRecovery,
+    requestTerminalInventoryRecovery
   } = useMobileSessionTabsReconciliation<SessionTabsResult, MobileSessionTab>({
     client,
     connState,
@@ -2341,6 +2378,7 @@ export default function SessionScreen() {
     applySessionTabs,
     consumeAcceptedSessionTabs,
     fetchTerminals,
+    terminalInventoryRecoveryScopeKey: terminalInventoryRecoveryScope,
     hasRecoveryNeed: hasSessionTabsRecoveryNeed,
     pendingTerminalRecoveryContextKey,
     getPendingTerminalRecoveryContextKey,
@@ -2349,6 +2387,11 @@ export default function SessionScreen() {
     ...sessionTabsFetchReporting
   })
 
+  useEffect(
+    () => registerTerminalInventoryRecoveryAction(requestTerminalInventoryRecovery),
+    [registerTerminalInventoryRecoveryAction, requestTerminalInventoryRecovery]
+  )
+
   useEffect(() => {
     if (connState === 'connected') {
       return
diff --git a/mobile/app/troubleshoot.tsx b/mobile/app/troubleshoot.tsx
index c4313e88fcc..63fc0ddd477 100644
--- a/mobile/app/troubleshoot.tsx
+++ b/mobile/app/troubleshoot.tsx
@@ -1,13 +1,5 @@
 import { useState, useCallback, useRef } from 'react'
-import {
-  View,
-  Text,
-  StyleSheet,
-  Pressable,
-  ScrollView,
-  ActivityIndicator,
-  Platform
-} from 'react-native'
+import { View, Text, Pressable, ScrollView, ActivityIndicator, Platform } from 'react-native'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
 import { useRouter } from 'expo-router'
 import {
@@ -20,7 +12,7 @@ import {
   XCircle,
   AlertTriangle
 } from 'lucide-react-native'
-import { colors, spacing, typography } from '../src/theme/mobile-theme'
+import { colors, spacing } from '../src/theme/mobile-theme'
 import { loadHosts } from '../src/transport/host-store'
 import {
   startDiagnosticFetchTimeout,
@@ -32,6 +24,7 @@ import {
   unreachableHostDetail
 } from '../src/diagnostics/host-reachability'
 import { troubleshootCommonIssues } from '../src/diagnostics/troubleshoot-common-issues'
+import { troubleshootScreenStyles as styles } from '../src/diagnostics/troubleshoot-screen-styles'
 
 type DiagnosticStatus = 'idle' | 'running' | 'done'
 
@@ -281,135 +274,3 @@ export default function TroubleshootScreen() {
     </View>
   )
 }
-
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    backgroundColor: colors.bgBase,
-    padding: spacing.lg
-  },
-  topRow: {
-    flexDirection: 'row',
-    alignItems: 'center',
-    marginBottom: spacing.lg
-  },
-  backButton: {
-    width: 36,
-    height: 36,
-    borderRadius: 18,
-    alignItems: 'center',
-    justifyContent: 'center',
-    marginRight: spacing.sm
-  },
-  heading: {
-    fontSize: 20,
-    fontWeight: '700',
-    color: colors.textPrimary
-  },
-  scroll: {
-    flex: 1
-  },
-  scrollContent: {
-    paddingBottom: spacing.xl
-  },
-  diagnosticButton: {
-    flexDirection: 'row',
-    alignItems: 'center',
-    justifyContent: 'center',
-    gap: spacing.sm,
-    backgroundColor: colors.bgRaised,
-    borderRadius: 10,
-    paddingVertical: spacing.md,
-    paddingHorizontal: spacing.lg,
-    marginBottom: spacing.lg
-  },
-  diagnosticButtonPressed: {
-    opacity: 0.7
-  },
-  diagnosticButtonDisabled: {
-    opacity: 0.5
-  },
-  diagnosticButtonLabel: {
-    fontSize: typography.bodySize,
-    fontWeight: '600',
-    color: colors.textPrimary
-  },
-  checkRow: {
-    flexDirection: 'row',
-    alignItems: 'center',
-    gap: spacing.sm,
-    paddingVertical: spacing.sm + 2,
-    paddingHorizontal: spacing.md + 2
-  },
-  checkLabel: {
-    fontSize: typography.bodySize,
-    fontWeight: '500',
-    color: colors.textPrimary
-  },
-  checkDetail: {
-    flex: 1,
-    textAlign: 'right',
-    fontSize: typography.metaSize,
-    color: colors.textMuted
-  },
-  checkDetailFail: {
-    color: colors.statusRed
-  },
-  sectionHeading: {
-    fontSize: typography.metaSize,
-    fontWeight: '600',
-    color: colors.textMuted,
-    textTransform: 'uppercase',
-    letterSpacing: 0.5,
-    marginBottom: spacing.sm,
-    marginTop: spacing.sm,
-    paddingHorizontal: spacing.xs
-  },
-  section: {
-    backgroundColor: colors.bgPanel,
-    borderRadius: 12,
-    overflow: 'hidden',
-    marginBottom: spacing.lg
-  },
-  separator: {
-    height: StyleSheet.hairlineWidth,
-    backgroundColor: colors.borderSubtle,
-    marginHorizontal: spacing.md
-  },
-  rowPressed: {
-    backgroundColor: colors.bgRaised
-  },
-  accordionHeader: {
-    flexDirection: 'row',
-    alignItems: 'center',
-    gap: spacing.sm + 2,
-    paddingVertical: spacing.md,
-    paddingHorizontal: spacing.md + 2
-  },
-  accordionTitle: {
-    flex: 1,
-    fontSize: typography.bodySize,
-    fontWeight: '500',
-    color: colors.textPrimary
-  },
-  accordionBody: {
-    paddingHorizontal: spacing.md + 2,
-    paddingBottom: spacing.md,
-    gap: spacing.xs + 2
-  },
-  stepRow: {
-    flexDirection: 'row',
-    gap: spacing.sm
-  },
-  bullet: {
-    fontSize: typography.metaSize,
-    color: colors.textMuted,
-    lineHeight: 18
-  },
-  stepText: {
-    flex: 1,
-    fontSize: typography.metaSize,
-    color: colors.textMuted,
-    lineHeight: 18
-  }
-})
diff --git a/mobile/package.json b/mobile/package.json
index 75db0998903..9c3c4d4c0d0 100644
--- a/mobile/package.json
+++ b/mobile/package.json
@@ -25,43 +25,43 @@
     "@xterm/addon-webgl": "0.20.0-beta.284",
     "@xterm/xterm": "6.1.0-beta.285",
     "buffer": "^6.0.3",
-    "expo": "^55.0.27",
-    "expo-build-properties": "^55.0.13",
-    "expo-camera": "^55.0.18",
-    "expo-clipboard": "^55.0.13",
-    "expo-constants": "^55.0.16",
-    "expo-crypto": "^55.0.14",
-    "expo-dev-client": "~55.0.35",
-    "expo-document-picker": "^55.0.13",
-    "expo-file-system": "55.0.19",
-    "expo-haptics": "^55.0.14",
-    "expo-image-manipulator": "^55.0.17",
-    "expo-image-picker": "^55.0.20",
+    "expo": "^55.0.30",
+    "expo-build-properties": "^55.0.18",
+    "expo-camera": "^55.0.23",
+    "expo-clipboard": "^55.0.17",
+    "expo-constants": "^55.0.17",
+    "expo-crypto": "^55.0.19",
+    "expo-dev-client": "~55.0.39",
+    "expo-document-picker": "^55.0.17",
+    "expo-file-system": "55.0.26",
+    "expo-haptics": "^55.0.18",
+    "expo-image-manipulator": "^55.0.21",
+    "expo-image-picker": "^55.0.24",
     "expo-keep-awake": "~55.0.8",
-    "expo-linking": "^55.0.15",
+    "expo-linking": "^55.0.17",
     "expo-modules-core": "~55.0.25",
-    "expo-network": "~55.0.14",
-    "expo-notifications": "^55.0.22",
-    "expo-router": "^55.0.14",
-    "expo-secure-store": "^55.0.13",
-    "expo-splash-screen": "^55.0.20",
+    "expo-network": "~55.0.18",
+    "expo-notifications": "^55.0.27",
+    "expo-router": "^55.0.18",
+    "expo-secure-store": "^55.0.18",
+    "expo-splash-screen": "^55.0.25",
     "expo-status-bar": "^55.0.6",
     "lowlight": "^3.3.0",
     "lucide-react-native": "^1.14.0",
-    "mermaid": "11.16.1",
-    "react": "^19.2.6",
-    "react-dom": "19.2.6",
-    "react-native": "^0.83.9",
+    "mermaid": "11.17.2",
+    "react": "^19.2.8",
+    "react-dom": "19.2.8",
+    "react-native": "^0.83.10",
     "react-native-gesture-handler": "^2.31.2",
-    "react-native-reanimated": "^4.3.0",
+    "react-native-reanimated": "4.3.4",
     "react-native-safe-area-context": "^5.7.0",
     "react-native-screens": "^4.24.0",
     "react-native-svg": "^15.15.4",
     "react-native-web": "^0.21.2",
-    "react-native-webview": "^13.16.1",
+    "react-native-webview": "13.16.2",
     "react-native-worklets": "^0.8.3",
     "tweetnacl": "^1.0.3",
-    "ws": "^8.21.0",
+    "ws": "^8.21.3",
     "zod": "~4.4.3",
     "zustand": "^5.0.13"
   },
@@ -73,21 +73,13 @@
     "acorn": "8.15.0",
     "esbuild": "0.25.4",
     "expo-module-scripts": "^55.0.2",
-    "happy-dom": "^20.9.0",
-    "oxfmt": "^0.52.0",
-    "oxlint": "^1.71.0",
-    "react-test-renderer": "19.2.6",
+    "happy-dom": "^20.11.8",
+    "oxfmt": "^0.65.0",
+    "oxlint": "^1.80.0",
+    "react-test-renderer": "19.2.8",
     "tsx": "^4.22.4",
     "typescript": "6.0.3",
     "vite": "^8.0.16",
-    "vitest": "^4.1.9"
-  },
-  "pnpm": {
-    "overrides": {
-      "xcode>uuid": "11.1.1"
-    },
-    "patchedDependencies": {
-      "react-native@0.83.9": "patches/react-native@0.83.9.patch"
-    }
+    "vitest": "^4.1.11"
   }
 }
diff --git a/mobile/patches/react-native-webview@13.16.2.patch b/mobile/patches/react-native-webview@13.16.2.patch
new file mode 100644
index 00000000000..963f8884f38
--- /dev/null
+++ b/mobile/patches/react-native-webview@13.16.2.patch
@@ -0,0 +1,13 @@
+diff --git a/index.d.ts b/index.d.ts
+index 10b9c145b920a6a2ba1fb09bd72150328fafe211..626a67a3d6aca587ee9e74a52b799a2c50b4c52b 100644
+--- a/index.d.ts
++++ b/index.d.ts
+@@ -5,7 +5,7 @@ export { FileDownload, WebViewMessageEvent, WebViewNavigation } from './lib/WebV
+ 
+ export type WebViewProps = IOSWebViewProps & AndroidWebViewProps & WindowsWebViewProps;
+ 
+-declare class WebView<P = undefined> extends Component<WebViewProps & P> {
++declare class WebView<P = {}> extends Component<WebViewProps & P> {
+   /**
+    * Go back one page in the webview's history.
+    */
diff --git a/mobile/patches/react-native@0.83.9.patch b/mobile/patches/react-native@0.83.10.patch
similarity index 100%
rename from mobile/patches/react-native@0.83.9.patch
rename to mobile/patches/react-native@0.83.10.patch
diff --git a/mobile/pnpm-lock.yaml b/mobile/pnpm-lock.yaml
index 01092f2acc9..72eb460a856 100644
--- a/mobile/pnpm-lock.yaml
+++ b/mobile/pnpm-lock.yaml
@@ -8,9 +8,12 @@ overrides:
   xcode>uuid: 11.1.1
 
 patchedDependencies:
-  react-native@0.83.9:
+  react-native-webview@13.16.2:
+    hash: de6761dfa76a5491a23e49f1262566a8831cab26736a336fdffc5d4e7d05ff27
+    path: patches/react-native-webview@13.16.2.patch
+  react-native@0.83.10:
     hash: 44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d
-    path: patches/react-native@0.83.9.patch
+    path: patches/react-native@0.83.10.patch
 
 importers:
 
@@ -21,10 +24,10 @@ importers:
         version: 1.8.0
       '@orca/expo-two-way-audio':
         specifier: file:./packages/expo-two-way-audio
-        version: file:packages/expo-two-way-audio(expo@55.0.27)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
+        version: file:packages/expo-two-way-audio(expo@55.0.30)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
       '@react-native-async-storage/async-storage':
         specifier: ^2.2.0
-        version: 2.2.0(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))
+        version: 2.2.0(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))
       '@xterm/addon-unicode11':
         specifier: 0.10.0-beta.285
         version: 0.10.0-beta.285(@xterm/xterm@6.1.0-beta.285)
@@ -38,129 +41,129 @@ importers:
         specifier: ^6.0.3
         version: 6.0.3
       expo:
-        specifier: ^55.0.27
-        version: 55.0.27(@babel/core@7.29.7)(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-router@55.0.14)(react-dom@19.2.6(react@19.2.6))(react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
+        specifier: ^55.0.30
+        version: 55.0.30(10e8e71dd92768dd7f344108f3edbbe3)
       expo-build-properties:
-        specifier: ^55.0.13
-        version: 55.0.13(expo@55.0.27)
-      expo-camera:
         specifier: ^55.0.18
-        version: 55.0.18(@types/emscripten@1.41.5)(expo@55.0.27)(react-native-web@0.21.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
+        version: 55.0.18(expo@55.0.30)
+      expo-camera:
+        specifier: ^55.0.23
+        version: 55.0.23(@types/emscripten@1.41.5)(expo@55.0.30)(react-native-web@0.21.2(react-dom@19.2.8(react@19.2.8))(react@19.2.8))(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
       expo-clipboard:
-        specifier: ^55.0.13
-        version: 55.0.13(expo@55.0.27)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
-      expo-constants:
-        specifier: ^55.0.16
-        version: 55.0.16(expo@55.0.27)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))
-      expo-crypto:
-        specifier: ^55.0.14
-        version: 55.0.14(expo@55.0.27)
-      expo-dev-client:
-        specifier: ~55.0.35
-        version: 55.0.35(expo@55.0.27)
-      expo-document-picker:
-        specifier: ^55.0.13
-        version: 55.0.13(expo@55.0.27)
-      expo-file-system:
-        specifier: 55.0.19
-        version: 55.0.19(expo@55.0.27)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))
-      expo-haptics:
-        specifier: ^55.0.14
-        version: 55.0.14(expo@55.0.27)
-      expo-image-manipulator:
         specifier: ^55.0.17
-        version: 55.0.17(expo@55.0.27)
+        version: 55.0.17(expo@55.0.30)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
+      expo-constants:
+        specifier: ^55.0.17
+        version: 55.0.17(expo@55.0.30)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))
+      expo-crypto:
+        specifier: ^55.0.19
+        version: 55.0.19(expo@55.0.30)
+      expo-dev-client:
+        specifier: ~55.0.39
+        version: 55.0.39(expo@55.0.30)
+      expo-document-picker:
+        specifier: ^55.0.17
+        version: 55.0.17(expo@55.0.30)
+      expo-file-system:
+        specifier: 55.0.26
+        version: 55.0.26(expo@55.0.30)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))
+      expo-haptics:
+        specifier: ^55.0.18
+        version: 55.0.18(expo@55.0.30)
+      expo-image-manipulator:
+        specifier: ^55.0.21
+        version: 55.0.21(expo@55.0.30)
       expo-image-picker:
-        specifier: ^55.0.20
-        version: 55.0.20(expo@55.0.27)
+        specifier: ^55.0.24
+        version: 55.0.24(expo@55.0.30)
       expo-keep-awake:
         specifier: ~55.0.8
-        version: 55.0.8(expo@55.0.27)(react@19.2.6)
+        version: 55.0.8(expo@55.0.30)(react@19.2.8)
       expo-linking:
-        specifier: ^55.0.15
-        version: 55.0.15(expo@55.0.27)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
+        specifier: ^55.0.17
+        version: 55.0.17(expo@55.0.30)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
       expo-modules-core:
         specifier: ~55.0.25
-        version: 55.0.25(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
+        version: 55.0.25(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8))(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
       expo-network:
-        specifier: ~55.0.14
-        version: 55.0.14(expo@55.0.27)(react@19.2.6)
+        specifier: ~55.0.18
+        version: 55.0.18(expo@55.0.30)(react@19.2.8)
       expo-notifications:
-        specifier: ^55.0.22
-        version: 55.0.22(expo@55.0.27)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
+        specifier: ^55.0.27
+        version: 55.0.27(expo@55.0.30)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)(typescript@6.0.3)
       expo-router:
-        specifier: ^55.0.14
-        version: 55.0.14(50649306d987d6f4e510b7a8e94ea6ba)
+        specifier: ^55.0.18
+        version: 55.0.18(2f99795f9796def5cdb1516a493dc117)
       expo-secure-store:
-        specifier: ^55.0.13
-        version: 55.0.13(expo@55.0.27)
+        specifier: ^55.0.18
+        version: 55.0.18(expo@55.0.30)
       expo-splash-screen:
-        specifier: ^55.0.20
-        version: 55.0.20(expo@55.0.27)(typescript@6.0.3)
+        specifier: ^55.0.25
+        version: 55.0.25(expo@55.0.30)(typescript@6.0.3)
       expo-status-bar:
         specifier: ^55.0.6
-        version: 55.0.6(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
+        version: 55.0.6(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
       lowlight:
         specifier: ^3.3.0
         version: 3.3.0
       lucide-react-native:
         specifier: ^1.14.0
-        version: 1.14.0(react-native-svg@15.15.4(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
+        version: 1.14.0(react-native-svg@15.15.4(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8))(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
       mermaid:
-        specifier: 11.16.1
-        version: 11.16.1
+        specifier: 11.17.2
+        version: 11.17.2
       react:
-        specifier: ^19.2.6
-        version: 19.2.6
+        specifier: ^19.2.8
+        version: 19.2.8
       react-dom:
-        specifier: 19.2.6
-        version: 19.2.6(react@19.2.6)
+        specifier: 19.2.8
+        version: 19.2.8(react@19.2.8)
       react-native:
-        specifier: ^0.83.9
-        version: 0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)
+        specifier: ^0.83.10
+        version: 0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)
       react-native-gesture-handler:
         specifier: ^2.31.2
-        version: 2.31.2(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
+        version: 2.31.2(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
       react-native-reanimated:
-        specifier: ^4.3.0
-        version: 4.3.0(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
+        specifier: 4.3.4
+        version: 4.3.4(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8))(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
       react-native-safe-area-context:
         specifier: ^5.7.0
-        version: 5.7.0(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
+        version: 5.7.0(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
       react-native-screens:
         specifier: ^4.24.0
-        version: 4.24.0(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
+        version: 4.24.0(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
       react-native-svg:
         specifier: ^15.15.4
-        version: 15.15.4(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
+        version: 15.15.4(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
       react-native-web:
         specifier: ^0.21.2
-        version: 0.21.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+        version: 0.21.2(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       react-native-webview:
-        specifier: ^13.16.1
-        version: 13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
+        specifier: 13.16.2
+        version: 13.16.2(patch_hash=de6761dfa76a5491a23e49f1262566a8831cab26736a336fdffc5d4e7d05ff27)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
       react-native-worklets:
         specifier: ^0.8.3
-        version: 0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
+        version: 0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
       tweetnacl:
         specifier: ^1.0.3
         version: 1.0.3
       ws:
-        specifier: ^8.21.0
-        version: 8.21.0
+        specifier: ^8.21.3
+        version: 8.21.3
       zod:
         specifier: ~4.4.3
         version: 4.4.3
       zustand:
         specifier: ^5.0.13
-        version: 5.0.13(@types/react@19.2.14)(react@19.2.6)(use-sync-external-store@1.6.0(react@19.2.6))
+        version: 5.0.13(@types/react@19.2.14)(react@19.2.8)(use-sync-external-store@1.6.0(react@19.2.8))
     devDependencies:
       '@types/react':
         specifier: ^19.2.14
         version: 19.2.14
       '@types/react-native':
         specifier: ^0.73.0
-        version: 0.73.0(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)
+        version: 0.73.0(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)
       '@types/react-test-renderer':
         specifier: 19.1.0
         version: 19.1.0
@@ -175,19 +178,19 @@ importers:
         version: 0.25.4
       expo-module-scripts:
         specifier: ^55.0.2
-        version: 55.0.2(@babel/core@7.29.7)(@babel/runtime@7.29.7)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.29.7))(esbuild@0.25.4)(eslint@9.39.4)(expo@55.0.27)(jest@29.7.0(@types/node@26.1.2))(prettier@2.8.8)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react-refresh@0.14.2)(react-test-renderer@19.2.6(react@19.2.6))(react@19.2.6)
+        version: 55.0.2(@babel/core@7.29.7)(@babel/runtime@7.29.7)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.29.7))(esbuild@0.25.4)(eslint@9.39.4)(expo@55.0.30)(jest@29.7.0(@types/node@26.1.2))(prettier@2.8.8)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react-refresh@0.14.2)(react-test-renderer@19.2.8(react@19.2.8))(react@19.2.8)
       happy-dom:
-        specifier: ^20.9.0
-        version: 20.11.1
+        specifier: ^20.11.8
+        version: 20.11.8
       oxfmt:
-        specifier: ^0.52.0
-        version: 0.52.0
+        specifier: ^0.65.0
+        version: 0.65.0
       oxlint:
-        specifier: ^1.71.0
-        version: 1.71.0
+        specifier: ^1.80.0
+        version: 1.80.0
       react-test-renderer:
-        specifier: 19.2.6
-        version: 19.2.6(react@19.2.6)
+        specifier: 19.2.8
+        version: 19.2.8(react@19.2.8)
       tsx:
         specifier: ^4.22.4
         version: 4.22.4
@@ -198,8 +201,8 @@ importers:
         specifier: ^8.0.16
         version: 8.1.0(@types/node@26.1.2)(esbuild@0.25.4)(terser@5.49.1)(tsx@4.22.4)(yaml@2.9.0)
       vitest:
-        specifier: ^4.1.9
-        version: 4.1.9(@types/node@26.1.2)(happy-dom@20.11.1)(jsdom@20.0.3)(vite@8.1.0(@types/node@26.1.2)(esbuild@0.25.4)(terser@5.49.1)(tsx@4.22.4)(yaml@2.9.0))
+        specifier: ^4.1.11
+        version: 4.1.11(@types/node@26.1.2)(happy-dom@20.11.8)(jsdom@20.0.3)(vite@8.1.0(@types/node@26.1.2)(esbuild@0.25.4)(terser@5.49.1)(tsx@4.22.4)(yaml@2.9.0))
 
 packages:
 
@@ -1578,8 +1581,8 @@ packages:
   '@expo-google-fonts/material-symbols@0.4.34':
     resolution: {integrity: sha512-PdwETUhvu1gHF1e8eIyEHnBJLq/dRNoTrT5yhsGUfGyRxH5pbm54dF3+QPknxwMKj0M1trN7PSelYz+yzlt3lA==}
 
-  '@expo/cli@55.0.33':
-    resolution: {integrity: sha512-mCpv91YrgiQUCXEHbNOQNPeStO4NKvYaXgKuzzLjklrCUPf3f+u0oYcS5rl3KoFvTEifhOiuA0VkLDR8U0GGPg==}
+  '@expo/cli@55.0.36':
+    resolution: {integrity: sha512-jVMEXmxeUKXAzJdRWQer7fyogjPMYiTbrGOrlioJlwMuFqKfao3FeFInmATMNGLhNN01aBs/s6pnJKqiAdlUQg==}
     hasBin: true
     peerDependencies:
       expo: '*'
@@ -1594,8 +1597,8 @@ packages:
   '@expo/code-signing-certificates@0.0.6':
     resolution: {integrity: sha512-iNe0puxwBNEcuua9gmTGzq+SuMDa0iATai1FlFTMHJ/vUmKvN/V//drXoLJkVb5i5H3iE/n/qIJxyoBnXouD0w==}
 
-  '@expo/config-plugins@55.0.10':
-    resolution: {integrity: sha512-1txnRnMLIO5lM/Of/VyvDkCwZap0YFvCyfSTIlUQamhwhx6Rh7r8TXfcIstaDYUQ7X6GTMkNxLXWbcYS6ZAFDw==}
+  '@expo/config-plugins@55.0.11':
+    resolution: {integrity: sha512-85ZSmIK8rMfvYbG/2IHtwnykVdb6LI0ZavduM3ZwUMThyyVegYjVsO5Zek2ec8xzPhCmYX0ar5onnFEcwUDUlw==}
 
   '@expo/config-plugins@55.0.8':
     resolution: {integrity: sha512-8WfWTRntTCcowfOS+tHdB0z98gKetTwktg4G5TWkCkXVa8Jt1NUnvzaaU4UHk2vbR2U4N84RyZJFizSwfF6C9g==}
@@ -1603,11 +1606,14 @@ packages:
   '@expo/config-types@55.0.5':
     resolution: {integrity: sha512-sCmSUZG4mZ/ySXvfyyBdhjivz8Q539X1NondwDdYG7s3SBsk+wsgPJzYsqgAG/P9+l0xWjUD2F+kQ1cAJ6NNLg==}
 
+  '@expo/config-types@55.0.6':
+    resolution: {integrity: sha512-S+GJKYoIjnWlert/9vXuTohaTsMbyOLSVxdIgPgoq3P4N1p4CWrfyZLnz6qRug8wYSO5fcYcS9mFleyEP8wRLg==}
+
   '@expo/config@55.0.16':
     resolution: {integrity: sha512-H5dpQv5TfyZDNheZAWO3SmP10diGWZwN5QOUsArkDJih0QKNtahQBOmrV2xbhgln/nrUGoy41U/ZIY/MEx63Ug==}
 
-  '@expo/config@55.0.18':
-    resolution: {integrity: sha512-yezuyUk1VvVuwVyvKQrMHGosoC0WTh7HFAycpISMyeinSUHDjEBGvHUSQxtQ/71MR4g9lPJkEhFKeRjGx7I/Yg==}
+  '@expo/config@55.0.21':
+    resolution: {integrity: sha512-yHmSSnBrm2ecB1DNsCrZZrScVnvXrtg3+PAMwI3ocxEtD9YK8yX5xV2xi2pmor9TYitAO+udFWxo+XDEGibznw==}
 
   '@expo/devcert@1.2.1':
     resolution: {integrity: sha512-qC4eaxmKMTmJC2ahwyui6ud8f3W60Ss7pMkpBq40Hu3zyiAaugPXnZ24145U7K36qO9UHdZUVxsCvIpz2RYYCA==}
@@ -1630,16 +1636,20 @@ packages:
       react: '*'
       react-native: '*'
 
-  '@expo/env@2.1.2':
-    resolution: {integrity: sha512-RJtGFfj/ygO/6zcVbV3cckHf4THcEkv5IZft1GjCB3dfT6axvzvIwXE9EiQqQYmGHcQ+ZrvC8xZcIhiHba0pYg==}
+  '@expo/env@2.1.3':
+    resolution: {integrity: sha512-Rhu/lJ1kOhqzJvLwW0iB4WKUzB1nFa8WBwXFL44qkSTNwibjrbI8lA46Ix6W2MMTdlUqL1m85Gdyx0T7nGpREg==}
     engines: {node: '>=20.12.0'}
 
-  '@expo/fingerprint@0.16.7':
-    resolution: {integrity: sha512-BH8sicYOqZ1iBMwCVEGIz6uTTfylosjc49FoMmCYIzKOiYdiVehsfoYBwyfxwWIiya1VMhm1gv0cgOP8fxHpDw==}
+  '@expo/env@2.4.2':
+    resolution: {integrity: sha512-28pqaEqwnmLduZ00Pq9HkSzE5wbj1MTwp5/n8nm8rD8MCjR9eUnVOwmNksPI3Be2ReAPO/DbPn1puy0mvoocsQ==}
+    engines: {node: '>=20.12.0'}
+
+  '@expo/fingerprint@0.16.8':
+    resolution: {integrity: sha512-RaLOikl+alkvG9ZrBQFGi3kVXJdG5GQXY1H3V1ZFCwFyhFikwuBozVrl4KL7U+N0Tm8Bf1qDmpTEIx8JOyrQog==}
     hasBin: true
 
-  '@expo/image-utils@0.8.14':
-    resolution: {integrity: sha512-5Sn+jG4Cw+shC2wDMXoqSAJnvERbiwzHn05FpWtD5IBflfTIs5gUmjzwiGVyjOdlMSQhgRrw/AymPbmO9h9mpQ==}
+  '@expo/image-utils@0.8.17':
+    resolution: {integrity: sha512-1eVrX6FFkPNl9DJNiw3Gjsf6PtG7HttbapEVvcROVrA9PCMikujOJWWHDYKGptmKoVIIVajFZE8UHGHUb3mPug==}
 
   '@expo/json-file@10.0.14':
     resolution: {integrity: sha512-yWwBFywFv+SxkJp/pIzzA416JVYflNUh7pqQzgaA6nXDqRyK7KfrqVzk8PdUfDnqbBcaZZxpzNssfQZzp5KHrA==}
@@ -1653,8 +1663,8 @@ packages:
   '@expo/json-file@11.0.0':
     resolution: {integrity: sha512-pHJCETqFL5x5BzNV6cEPwjwuECgGmnl0bNmfHIJ6LM1tlh2eVXi5HEdit3zby/JO/B8Otk5cgcqtJXgvvUat3A==}
 
-  '@expo/local-build-cache-provider@55.0.14':
-    resolution: {integrity: sha512-Itv/Wm8wBuq2QoJeda7N0Ys2ciq3ZQW+JLL8XijWMYOO/llieKeZue95FsuaREp3Ijdo0pSw0/cu+EkrwmU0vA==}
+  '@expo/local-build-cache-provider@55.0.16':
+    resolution: {integrity: sha512-/m2kb/+G2ryZ60FPZcuiLXzXp55p/X8QPXuU5CV/il0sSJcY0sQFICfM9ApokzHtzNQ0nDQOBUoQY3weilgP2g==}
 
   '@expo/log-box@55.0.11':
     resolution: {integrity: sha512-JQHFLWkskIbJi6cxYMjErx8lQqfFJilDQLKmdTO3m3YkdmN9GE/CrzjOfVlCG0DGEGZJ90br0pGKvGPdXNsHKw==}
@@ -1664,16 +1674,16 @@ packages:
       react: '*'
       react-native: '*'
 
-  '@expo/log-box@55.0.12':
-    resolution: {integrity: sha512-f9ARS8J60cq3LLNdIqmUjYwyerBzVS5Ecp7KjIf3GOIPjW0571rkcwLz4/U18l/1DeSkSzIkYsNl2TC9oTdWaQ==}
+  '@expo/log-box@55.0.13':
+    resolution: {integrity: sha512-pV623uwyKjw/L1HVWOpwWOu/ISLH1+c+ESVv30alQMbEaE3cLcwcQ+UnHiAGayMBNMQwK57eckOgH40RBXHfCA==}
     peerDependencies:
       '@expo/dom-webview': ^55.0.6
       expo: '*'
       react: '*'
       react-native: '*'
 
-  '@expo/metro-config@55.0.24':
-    resolution: {integrity: sha512-GQ8vernAY3BClpntFj+DDm4rmTpuFZYKxZ/82Q0XTZAOHnum68WIgRbgG2aRpAyVVs1wRBToKlLiSFCkpSS41w==}
+  '@expo/metro-config@55.0.27':
+    resolution: {integrity: sha512-oikn1NPFpQgNqL/HTqA6oAG2Af/BwldIezlecTidc8D+fkFgLFKkZHUq1Hh1g/vuCPGTQNWDlHla13dAgYwRvg==}
     peerDependencies:
       expo: '*'
     peerDependenciesMeta:
@@ -1691,8 +1701,8 @@ packages:
       react-dom:
         optional: true
 
-  '@expo/metro@55.1.1':
-    resolution: {integrity: sha512-/wfXo5hTuAVpVLG/4hzlmD9NBGJkzkmBEMm/4VICajYRbj7y8OmqqPWbbymzHiBiHB6tI9BnsyXpQM6zVZEECg==}
+  '@expo/metro@55.1.2':
+    resolution: {integrity: sha512-EOBoqqX4jD7JvHBHKDoek8SmWyAFPuJePyDSqIAhIjOCPAM67fVxd4+pCXJ6SDK1P9so55v2iTFBwCoeCmEj4Q==}
 
   '@expo/npm-proofread@1.0.1':
     resolution: {integrity: sha512-yDyBlNIgg+rKoKCOVM9ZyAtgqRx6gHw+JtmZTrYYW4auAfwS6kE/iInmCpVXPqRy0OhJHgXj6q5PCgWELLVMeg==}
@@ -1711,13 +1721,8 @@ packages:
   '@expo/plist@0.5.4':
     resolution: {integrity: sha512-Jqppj0FULNq6Zp5JtQrFICl8TtpMjwwUbxEcEC2T3z7m+TOrTQEHZXz3D3Ay7vhbmvD+VMgfWJ4ARclJXeN8Eg==}
 
-  '@expo/prebuild-config@55.0.17':
-    resolution: {integrity: sha512-Mcs+dg4Ripu0yCtzf66KZr18PehI1O8HxzJw+G5SUF8VWX+ic99aci1PltvmydWepLwTQL6ykmpXicAUA31IqA==}
-    peerDependencies:
-      expo: '*'
-
-  '@expo/prebuild-config@55.0.19':
-    resolution: {integrity: sha512-rLGjUXW0EUoxu/PJUOC0Lz5PEs27DmBA9Es3t2xV2ftI3kGZJK6oNt1vVq5D/Rn6MhZ5SFxqd3kziyP8ELoN6g==}
+  '@expo/prebuild-config@55.0.22':
+    resolution: {integrity: sha512-2p1lE2hOCy9HUV9qxbEqmetxUgcBnVY8jR+j/SYRXgaBeHalyQ5d09Ol5XL36/HO2fViK8VmSnTbS7C3t8eFGg==}
     peerDependencies:
       expo: '*'
 
@@ -1729,15 +1734,23 @@ packages:
       typescript:
         optional: true
 
-  '@expo/router-server@55.0.18':
-    resolution: {integrity: sha512-W0VsvIiR48OvdlAOUlag4qspGYT/DV4srfYowlbYxwZh5Qw0MjiZAID4Zt7F0qynGZZxx8OZPpFhIX7XsqtRmg==}
+  '@expo/require-utils@55.0.8':
+    resolution: {integrity: sha512-DDS5R67iz2SJwncbpcUMHtnsq31dSfllhaEncKxGlK0/ewgc2CaXUCkDA2AumfT7ubnSXiPkU9Gn8v2xCrvj+A==}
     peerDependencies:
-      '@expo/metro-runtime': ^55.0.11
+      typescript: ^5.0.0 || ^5.0.0-0
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@expo/router-server@55.0.19':
+    resolution: {integrity: sha512-bm2CFp9eI9biqZXz7Vkske0LXHZaLyonWV6sTEWUaR8zJ0NdVnUxb1Vd0iCdhW8GtweOUfMK4z7gojd0kydxjA==}
+    peerDependencies:
+      '@expo/metro-runtime': ^55.0.12
       expo: '*'
-      expo-constants: ^55.0.16
+      expo-constants: ^55.0.17
       expo-font: ^55.0.8
       expo-router: '*'
-      expo-server: ^55.0.11
+      expo-server: ^55.0.12
       react: '*'
       react-dom: '*'
       react-server-dom-webpack: ~19.0.1 || ~19.1.2 || ~19.2.1
@@ -1751,8 +1764,8 @@ packages:
       react-server-dom-webpack:
         optional: true
 
-  '@expo/schema-utils@55.0.4':
-    resolution: {integrity: sha512-65IdeeE8dAZR3n3J5Eq7LYiQ8BFGeEYCWPBCzycvafL7PkskbCyIclTQarRwf/HXFoRvezKCjaLwy/8v9Prk6g==}
+  '@expo/schema-utils@55.0.5':
+    resolution: {integrity: sha512-wdV4SzWJ/l+6y/r9vDaqPqXGyfxUD1igbX8rRbRBfkVXenAUY2qenq6HF4S0iJ0pjpVDNTANn5aQY7VV55hhsA==}
 
   '@expo/sdk-runtime-versions@1.0.0':
     resolution: {integrity: sha512-Doz2bfiPndXYFPMRwPyGa1k5QaKDVpY806UJj570epIiMzWaYyCtobasyfC++qfIXVb5Ocy7r3tP9d62hAQ7IQ==}
@@ -1921,8 +1934,8 @@ packages:
   '@jridgewell/trace-mapping@0.3.31':
     resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==}
 
-  '@mermaid-js/parser@1.2.0':
-    resolution: {integrity: sha512-oYPyv8A4As1yH5Bx+04iQEQxXuIQDe0GKCNSRgao6z8AM9jixXIfP0vsppRLvGf+nKIOb9/LdpWA4YuJiVvESA==}
+  '@mermaid-js/parser@1.2.1':
+    resolution: {integrity: sha512-n12NohV3mrUyUL2o93IgG/ifeW9FTyeJn3zDxkhwa8MJ9Fxg3HQMlA3RiGmD/3UnJvheztkjjQAjA2T4LmUcpw==}
 
   '@napi-rs/wasm-runtime@1.1.6':
     resolution: {integrity: sha512-ZLv/JdUfkvOy9eCnnBaGfiO+XimbjebAeO+MRQqD/B+FR1tnRN0tpKSJHRbE8sFfS6aqsXZ67TQjfwfsxULVbg==}
@@ -1947,246 +1960,246 @@ packages:
   '@oxc-project/types@0.137.0':
     resolution: {integrity: sha512-WT+Gb24i8hmvo85AIv2oEYouEXkRlKAlT9WaCa3TfLgNCN+GhrJOGZuIlMouAh38Qe4QOx26eUOVsq70qXrywA==}
 
-  '@oxfmt/binding-android-arm-eabi@0.52.0':
-    resolution: {integrity: sha512-17EMSJnQ9g+upVHrAUYDMfH5lvRKQ9Nvg8WtEoH72oDr1VpWz+7/o3tD97U1EToen2YAQ/68JmtDYkQUi20dfQ==}
+  '@oxfmt/binding-android-arm-eabi@0.65.0':
+    resolution: {integrity: sha512-M10Gs1SSpTNI6ahGx3M/OlIdUF4hkaP6OgUb+MS79t/Pgflk3r1nW5gPFqsZGUAXg0H1AfANT9AvLdBSTIhZKg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [android]
 
-  '@oxfmt/binding-android-arm64@0.52.0':
-    resolution: {integrity: sha512-A2G1IdwGEW2lLJkIxcvuirRH1CzSl/e0NX11zTlW1gvxJThfwbI/BEoaKrTNpm7M2FchvIf6guvIQU7d5iz+OQ==}
+  '@oxfmt/binding-android-arm64@0.65.0':
+    resolution: {integrity: sha512-6DXH5sftNlaHpWJG50hFMF+Qxtq5D2TmahvcDPxWNcGIf8qrC9Y0YgHYcYZ2hlWzaccKXh/f3GcssH8vtkl4JA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [android]
 
-  '@oxfmt/binding-darwin-arm64@0.52.0':
-    resolution: {integrity: sha512-f9+bLvOYxy7NttCLFTvQ7afmqDOWY4wIP9xdvfj5trQ1qj6f2UFAGwZESlfsMjvJNTyRpXfIlOanCI9FOvoeQA==}
+  '@oxfmt/binding-darwin-arm64@0.65.0':
+    resolution: {integrity: sha512-K9m7lr53pcOLETNsC88sWes/GWHUGjZyHx95UhYcSXy0r30haLdeXlSufSenEAtoLaW753WN8/l4M7GYcRt6cg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [darwin]
 
-  '@oxfmt/binding-darwin-x64@0.52.0':
-    resolution: {integrity: sha512-YSTB9sJ5nnQd/Q0ddHkgof0ZCHPAnWZT1IW2SJ8omz7CP7KluJhO1fNHrpqdxCtpztJwSs4hY1uAee35wKxxaw==}
+  '@oxfmt/binding-darwin-x64@0.65.0':
+    resolution: {integrity: sha512-sTNwIx1gre3MyiHOPLu7IGW4UyMScYL4DTmJT01p4vzB0En+OJUQz6KuH8t0PpsClRSaMuY3b0QmtoPItfO8Lg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [darwin]
 
-  '@oxfmt/binding-freebsd-x64@0.52.0':
-    resolution: {integrity: sha512-NIrRNTTPCs4UbmVs0bxLSCDlLCtIRMJIXklNKaXa5Oj2/K1UIMBvgE8+uPVo01Io3N9HF0+GAX+aAHjUgZS7vA==}
+  '@oxfmt/binding-freebsd-x64@0.65.0':
+    resolution: {integrity: sha512-lYZMVIiIpnjGu5hJb2jxA8NYQ/e0OTGuaiAf4dqlGPNnPmUTu23FZRMltmjro/KkQm1uE4NT4n5yJ2zWmKcpfA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [freebsd]
 
-  '@oxfmt/binding-linux-arm-gnueabihf@0.52.0':
-    resolution: {integrity: sha512-JXUCde8mn3GpgQouz2PXUokgy/uT1QrRJBL2s983VWcSQp62wTFYiNXgTKdeo1Jgbr0IgUnKKvzIk/YBlj/nVQ==}
+  '@oxfmt/binding-linux-arm-gnueabihf@0.65.0':
+    resolution: {integrity: sha512-gIdXFAt/bURnjxuoedDEWdZ0PEWEmdDcm8qdpoFYYvW3QMk/5D4vUaH4mlMeRpeTdST4izUgHVO6RawQ4QulJw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [linux]
 
-  '@oxfmt/binding-linux-arm-musleabihf@0.52.0':
-    resolution: {integrity: sha512-psbUXaRZ+V8DaXz10Qf7LSHtdtdKAmC8fxXgeU608jjzrmWK4quamZMOpl6sf+dikoFHA85uE93Q0BqxrCdQrQ==}
+  '@oxfmt/binding-linux-arm-musleabihf@0.65.0':
+    resolution: {integrity: sha512-jJVyADto7gA2AaX5qAjAexrxx9PJQaKWOe8PICE7yKMbjBRyOHcmj9TtVJ+MZYDUQ3hodU0AcoTj0jFQ1W4C6Q==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [linux]
 
-  '@oxfmt/binding-linux-arm64-gnu@0.52.0':
-    resolution: {integrity: sha512-Jw7MgWUU9lcLCcy82updISP3EthTlfvAwR6gWNxPzqly7+fLvOi2gHQE9xXQjpqaVLm/8P+gOzlv9ODuoVlaaw==}
+  '@oxfmt/binding-linux-arm64-gnu@0.65.0':
+    resolution: {integrity: sha512-p3RFkB+u7u+8up99b/NEcI1hdpLDiGgJYNwDorB60n7eH+eKposAKuMBxx+NqB3b+sJP4CZmYDh9G7X62tUsKg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@oxfmt/binding-linux-arm64-musl@0.52.0':
-    resolution: {integrity: sha512-wZg6bLjDvh2KibyI3QFUYo8GTXneIFsd0JvehtvJiUmQ8WRPERgxd/VM4ctWb86U5FT1FkqgS8/wZKVB+AZScg==}
+  '@oxfmt/binding-linux-arm64-musl@0.65.0':
+    resolution: {integrity: sha512-5Prb0uFzJHr+OUD/qS/TmU526wD+PaHDsm3KoRiUXbMIDpTSErjeQYkK3OQeshAvD/PuLa9WGEi9WPajjdOZJg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@oxfmt/binding-linux-ppc64-gnu@0.52.0':
-    resolution: {integrity: sha512-IngE8uxhNvxcMrLjZNDo9xNLY7rEK33AKnaMd2B46he1e/mz2CfcW6If/U1wUjdRZddm1QzQaciqZkuMkdh1FA==}
+  '@oxfmt/binding-linux-ppc64-gnu@0.65.0':
+    resolution: {integrity: sha512-S8svxTp81obnF3admN9yd+u2rOYXtyzThLGBTg1PY6TPtGcC09BaaXLQD+TBSMa7yvqhCDZ8DFri+S/yG60qCg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [ppc64]
     os: [linux]
     libc: [glibc]
 
-  '@oxfmt/binding-linux-riscv64-gnu@0.52.0':
-    resolution: {integrity: sha512-H3+DdFMv/efN3Efmhsv18jDrpiWWqKG7wsfAlQBqAt6z/E2Bx+TwEj2Nowe51CPOWB8/mFBC2dAMSgVFLvvowA==}
+  '@oxfmt/binding-linux-riscv64-gnu@0.65.0':
+    resolution: {integrity: sha512-WtXBr75G/h2qOHy8SiGtC1R6aS3jt4mE52v1D8AtwMXIgoOmSNP9lKvbSaTRoL0e5wsMPoi6T72QWDYPu+S+nA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [riscv64]
     os: [linux]
     libc: [glibc]
 
-  '@oxfmt/binding-linux-riscv64-musl@0.52.0':
-    resolution: {integrity: sha512-zji+1kb7lJKohSDjzC1IsS+K/cKRs1hdVf0ZH0VbdbiakmtLvN9twBoXo/k8VdjFax7kfo+DyPxS7vv52br1aw==}
+  '@oxfmt/binding-linux-riscv64-musl@0.65.0':
+    resolution: {integrity: sha512-YwSLVvpaz4o/nv/miiPEBJz+eJ+VmbgNIrao6RccK9ce+L5EA8wP+ZD0uFeq6wKOza6zoWv/dR0sj6lip6R3EA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [riscv64]
     os: [linux]
     libc: [musl]
 
-  '@oxfmt/binding-linux-s390x-gnu@0.52.0':
-    resolution: {integrity: sha512-hcLBYedpCy7ToUvvBidWk7+11Yhg1oAZ4+6hKPic/mQI6NaqXJSXMps5nFlwUuX2ewhtLZZDPg63TI042qGKBg==}
+  '@oxfmt/binding-linux-s390x-gnu@0.65.0':
+    resolution: {integrity: sha512-XQTPqgvyrgkKcFq+Tp2eK6JS7sqqJ+nRmy2Fav4j3I+i4dJoPJm7YwEdoeSDX9xkqj9jZ/lWfF3bXUWztIrn6A==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [s390x]
     os: [linux]
     libc: [glibc]
 
-  '@oxfmt/binding-linux-x64-gnu@0.52.0':
-    resolution: {integrity: sha512-IDO2loXK2OtTOhSPchU9MW25mWL2QCDGdJbjN8MXKZVS80qXe5gMTwQWu/gMJ3juoBHbkuUZNB2N1LHzNT7DoA==}
+  '@oxfmt/binding-linux-x64-gnu@0.65.0':
+    resolution: {integrity: sha512-cjZlx6S/VkeCNWCbwZriTnLnZeTcV3DEyeRGSw/2wwLP9viq+C0bJ4bC1k/ZLkFxDcB1lUgSasPkYGP1bdraOg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@oxfmt/binding-linux-x64-musl@0.52.0':
-    resolution: {integrity: sha512-mAV2Hjn0SatJ+KoAzKUC3eJhdJ8wv+3m1KyuS0dTsbF0c5weq+QrCt/DRZZM+uj/XiKzCDEUKYsBF30e2qkcyw==}
+  '@oxfmt/binding-linux-x64-musl@0.65.0':
+    resolution: {integrity: sha512-2azCjxdLtK4zCcIOU1dlXlU0xxfbPi6EjwWx7Ac7teWPidIIDOcIhudup83xNCKYhtqeVd/gaVDOxbUq4syXWA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@oxfmt/binding-openharmony-arm64@0.52.0':
-    resolution: {integrity: sha512-vd4npaUIwChxp7XzkqmepBWTT9YMcSe/NBApVGPC30/lLyOVaV3dvma1SKo03t8O73BPRAG7EyJzGlN5cJM5hQ==}
+  '@oxfmt/binding-openharmony-arm64@0.65.0':
+    resolution: {integrity: sha512-KXQ7xi1e/voP0IQaw6fG6XY4Z5+Llf1XmRSZS1t7pVFCecFJ0iXaboKmVwjFtp5MLlT5iWQrJ2U1C3GJdZ2u+Q==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [openharmony]
 
-  '@oxfmt/binding-win32-arm64-msvc@0.52.0':
-    resolution: {integrity: sha512-k2sz6gWQdMfh5HPpIS+Bw/0UEV/kaK2xuqJRrWL233sEHx9WLlsmvlPFM4HUNThkYbSN0U0vPW7LVKZWDS8hPQ==}
+  '@oxfmt/binding-win32-arm64-msvc@0.65.0':
+    resolution: {integrity: sha512-2FbbjG5jEqLSLKVJwBap84uJfpn5Y5A53KEO0aUNr+zeiRB9nyPUIFMcSbZVMFLitfBytFWRNngozXYjb6Rsbw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [win32]
 
-  '@oxfmt/binding-win32-ia32-msvc@0.52.0':
-    resolution: {integrity: sha512-rhke69GTcArodLHpjMTfNnvjTEBryDeZcUCKK/VjXDMtfTULl6QRh0ymX5/hbCUv2WjYm9h/QbW++q2vE15gWQ==}
+  '@oxfmt/binding-win32-ia32-msvc@0.65.0':
+    resolution: {integrity: sha512-LJ+ZacAPSjegDOnSLyA1TMWAhdDrsK4el3REdr1oL2UtVBCMhO2II/Sb3cEW6mF2MfLhl8hDNCSvc7KSbgk3LQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [ia32]
     os: [win32]
 
-  '@oxfmt/binding-win32-x64-msvc@0.52.0':
-    resolution: {integrity: sha512-q5xL7oeXkZdEtNZWBdvehJcmt+GRu9l2bK40yJs1jJXlqq+r0Hygb1rTjq+FM2o/2xyt4cufH6KRplHp3Jjsvw==}
+  '@oxfmt/binding-win32-x64-msvc@0.65.0':
+    resolution: {integrity: sha512-higu9cWEO6XXFzATD1jf0mCK34rNfN2H9JrJie7QB1IhleVpTh0QlLH9Ip2C1H/Nd5n0v5pvRtC+5R0uE4HpVg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [win32]
 
-  '@oxlint/binding-android-arm-eabi@1.71.0':
-    resolution: {integrity: sha512-ImGmd1njEg4FEJH03jhRnveEegtO3czCtfptvaHivKAZQIYATbVFBrrzbaYMYv0oJioTnxZAZVSyV+oL7W8S2g==}
+  '@oxlint/binding-android-arm-eabi@1.80.0':
+    resolution: {integrity: sha512-RM3Plj+biQpxa5d1GOOX6ciDlcUROmm4OZ/pLTpitkQt2mJv4jhtY4cbgaetOm5UKWZe05/TGQ6o1Vl8EOHkrA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [android]
 
-  '@oxlint/binding-android-arm64@1.71.0':
-    resolution: {integrity: sha512-4A5BEexBrwY1YFF8Kiq/lp/wQPRG79G3BWIE1FuWaM5MvmpYSd+7ZySVcKkHdwo0UDzdQGddp6pD9mpctMqLnw==}
+  '@oxlint/binding-android-arm64@1.80.0':
+    resolution: {integrity: sha512-YlO5JEf0Yr2bUUlu8O8daVcUxtcGGbcSmyV7E7nSbJbfAdxTE0PFPwgnIlw7wXJaTYjb+qs5hI5q3jxUkI7cAw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [android]
 
-  '@oxlint/binding-darwin-arm64@1.71.0':
-    resolution: {integrity: sha512-9wJA9GJulLwS2usU3CEisI/ESDO1n1z9eyTCvApMDrAkbJ1ve0mORgTMjcWWsKxkzkeZ2N/Gpra5IQE7x8tYgQ==}
+  '@oxlint/binding-darwin-arm64@1.80.0':
+    resolution: {integrity: sha512-BULDOyO3AhsmdWfQeIUCykDt3dd7XZBGLhp1eIh56skRv01O+cNjNPwXMIbeW1x4+pxcln5if72wcRgViVo7PA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [darwin]
 
-  '@oxlint/binding-darwin-x64@1.71.0':
-    resolution: {integrity: sha512-PlLCjS06V0PeJMAJwzjrExw1sYNW9Gch3JtNlcwwZDXGlTYDuwHNN89zYH8LTXFfgkVtsYvs2nv0FqrzyuFDzg==}
+  '@oxlint/binding-darwin-x64@1.80.0':
+    resolution: {integrity: sha512-YJ4JzLw7N5TDSQFlA0hAQGHvnDZgyypm1yunObVWcWiF9KM7eGCJKYKLgTC2Fi/57OdnBhbj4OkzPGdFQJ6HyA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [darwin]
 
-  '@oxlint/binding-freebsd-x64@1.71.0':
-    resolution: {integrity: sha512-Lhil7bWre0ncxbUoDoxfS0JzpTz17BRQKW7iwoAUY8GJ66+WwJEfYPCFJ1P0WgVZR5/O/b3Q2pENlHOjeXLOGQ==}
+  '@oxlint/binding-freebsd-x64@1.80.0':
+    resolution: {integrity: sha512-AYUIk5QnL0s8oWAYsREZwkRYy1SupJTXALo93J1TgzHywxQtdM99FecRMQ87MXEdPQ0j1TmEpeeq3fGNkpvMqg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [freebsd]
 
-  '@oxlint/binding-linux-arm-gnueabihf@1.71.0':
-    resolution: {integrity: sha512-Oo9/L58PYD3RC0x05d2upAPLllHytTjHQGsnC06P6Ynn7jKkp5mdImQxXdJ3+FnBaKspNpGogzgVsi6g872LiA==}
+  '@oxlint/binding-linux-arm-gnueabihf@1.80.0':
+    resolution: {integrity: sha512-9hBZVANupQ89W9dXyE0n8doCyaW5pDyGn3y6XlIMPZ+rIKuyqkr3SNUXmVJIhuvUq0NBU3RBiSXXE69l4XI6KA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [linux]
 
-  '@oxlint/binding-linux-arm-musleabihf@1.71.0':
-    resolution: {integrity: sha512-mSHfyfgJrEbyIR29ejaeS50BdPk+GoNPlC1dckpDiUZbJAIel68sjSMdOt4WY0/gva+ECC7FNITQkxMJU+vSBw==}
+  '@oxlint/binding-linux-arm-musleabihf@1.80.0':
+    resolution: {integrity: sha512-SvS2uKqzY+pbfuvAHzH4338R6Zwo805GAwrIMVvK1KxoOWCIjZUdfzTCvilD7z6JK91v011+zYMryabhDo2AsQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [linux]
 
-  '@oxlint/binding-linux-arm64-gnu@1.71.0':
-    resolution: {integrity: sha512-n9yY4M2tiy3aij4AqtlnspzpfdpeT5JQfK2/w2d8oyp5W0FRwOb1dIeX99nORNcxGr08iD9bH8N5XFz3I2iy8w==}
+  '@oxlint/binding-linux-arm64-gnu@1.80.0':
+    resolution: {integrity: sha512-tCLadyqRVL3pQTRPNg7cjXKvcvS4fbyXeQHhKk5BTJ1oftQln5/yIIWbu/Xom/DX41zv2P9QGt6+D/TtQVtY3A==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@oxlint/binding-linux-arm64-musl@1.71.0':
-    resolution: {integrity: sha512-fJZrs5sDZtTaPIOiemRQQmo82Ezy+vOGXemPc4Ok7iVVsYsFa7SlW6Z5XN819VfsqBHRm3NJ3rTdnR8+bJYJdQ==}
+  '@oxlint/binding-linux-arm64-musl@1.80.0':
+    resolution: {integrity: sha512-XfpCNRlOPcLlJl4Bn/FUhjqlR6BVavEykERBf/MV7YA9VZDa5g5znVqYhyviMafcxS9Pe/i/kPvHNO0U6svEHQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@oxlint/binding-linux-ppc64-gnu@1.71.0':
-    resolution: {integrity: sha512-cwl7VKGERIy9p+G+AvZdfy/06q0aHXaTt/mMRReC751iuNYJgqKjB7NydXSS30nBT9vtr2tunciOtrR4fD6FUA==}
+  '@oxlint/binding-linux-ppc64-gnu@1.80.0':
+    resolution: {integrity: sha512-3I4yMwcFG9NeO8ioY6JBBuKsIm5GL/x7MATt1S4tVWaxPu5HcJ+XnLUbcVBTxG8q2Wu56HSj+NmXQiVYb1lp6A==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [ppc64]
     os: [linux]
     libc: [glibc]
 
-  '@oxlint/binding-linux-riscv64-gnu@1.71.0':
-    resolution: {integrity: sha512-eZ8ieVXvzGi8jr7+ybQGPK2STw3mldfxZlgA2738iflfB/rzA69sE6m5rDRpQaxC7dpm745Enlh1Tod0QAk9Gg==}
+  '@oxlint/binding-linux-riscv64-gnu@1.80.0':
+    resolution: {integrity: sha512-E1wAKymkpe1/E8helzBKdm81OBOF+ezxRyXRMEuik3ZpWDER5CPOKZwF66RsdwW98uwZv8UTFremUQtC1CzdJA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [riscv64]
     os: [linux]
     libc: [glibc]
 
-  '@oxlint/binding-linux-riscv64-musl@1.71.0':
-    resolution: {integrity: sha512-puMDbQYe6+NXwfMusojoA7CXGn2b3utukmd23PQqc1E3XhVCwyZ+FueSMzDYeNgDV2dUfIVXAAKZBcFDeCL6sA==}
+  '@oxlint/binding-linux-riscv64-musl@1.80.0':
+    resolution: {integrity: sha512-+gLRGD4sIo3+VA++iham5UxD9tKSoJ/VOrROCEXIcknrYtQg6iIQgvjN0cpiRF7N6UYC7pJbvHJlDnMge5LRpQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [riscv64]
     os: [linux]
     libc: [musl]
 
-  '@oxlint/binding-linux-s390x-gnu@1.71.0':
-    resolution: {integrity: sha512-4NJLxBs1ujISCt3L/1FcywLs73PWtJuw+piD6feK2V6h6OS6P7xu9/sWt1DTRLibe6QCzmfZzmM/2HPORoV/Lg==}
+  '@oxlint/binding-linux-s390x-gnu@1.80.0':
+    resolution: {integrity: sha512-aR0PrzHj9leW3NmzBAAP4EzdoBNoJcs9sjnIQPIwyRnBGYrRbXUIpEB5Q39AqK3PLY5JK5uEhDQDiUa1QSAstw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [s390x]
     os: [linux]
     libc: [glibc]
 
-  '@oxlint/binding-linux-x64-gnu@1.71.0':
-    resolution: {integrity: sha512-cFDaiR8L3430qp88tfZnvFlt3KotFhR/DlbIL0nHOMMYiG/9Wy4l+6f7t8G8pTa9bd8Lt8+M0y/qjRQ/xcB74g==}
+  '@oxlint/binding-linux-x64-gnu@1.80.0':
+    resolution: {integrity: sha512-vSVh5cSo3Xxs6ghBCcFJlpbkbENzDog1qXtoXLa/HC3aCrR4XO76GZbXmQoCPHnu99nQpdCeC3H9tdNICfDh7A==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@oxlint/binding-linux-x64-musl@1.71.0':
-    resolution: {integrity: sha512-orfixdt76KlpNly9z0PkWBBNfwjKz+JFVLP/7wnVchlKNU9Dpt9InU/ZggeSej6fC7qwHmHNOGlhLnQXcYoGuA==}
+  '@oxlint/binding-linux-x64-musl@1.80.0':
+    resolution: {integrity: sha512-FfzBXpNQ8u7/ZI/p8bl73MeZ508Ax3hxWp3SiJpEFiC+BB9XcXy5FAZHTLKDPSzrUpxQZSZJAVdDmuJp/+HDBQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@oxlint/binding-openharmony-arm64@1.71.0':
-    resolution: {integrity: sha512-9emQu2lAp6yhPB3XuI+++vR+l/o6JR1X+EpxwcumPdQXBWXEPAsquPGL7l158EqU8SebQMXTUa/S5zN98juyHw==}
+  '@oxlint/binding-openharmony-arm64@1.80.0':
+    resolution: {integrity: sha512-zMzbkumtmprCgRwoYNzcB3iC39fXdJIMLMU33KdCjEGLlJGOEt1+LwQ4LF8ndLzAEKVz4BR0y3V6Xrkk3Nm3yA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [openharmony]
 
-  '@oxlint/binding-win32-arm64-msvc@1.71.0':
-    resolution: {integrity: sha512-bd5kI8spYwTm3BILDtGhi73zoup5dw8MlPQNT8YB3BD5UIsjNe3K9/4ctrzQMX4SZMoK5HgzVLkLJzacEXB7fA==}
+  '@oxlint/binding-win32-arm64-msvc@1.80.0':
+    resolution: {integrity: sha512-ib6iRcrXsk4t1fm3iKcwksyWh1ZkZXC/2mEzakl0ai2+6HZunf1WWMZ/xP9EJAvw9g9K4UVTC3NF/+G2qLrbTQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [win32]
 
-  '@oxlint/binding-win32-ia32-msvc@1.71.0':
-    resolution: {integrity: sha512-W4HvOHGzVLHcrmFu+bMrJlho+/yrlX5ZNdJZqGe8MEldkQG+RHYhxxad9P4jvWAYFmIqUA5i9DQ8QsJqSU9GIw==}
+  '@oxlint/binding-win32-ia32-msvc@1.80.0':
+    resolution: {integrity: sha512-xhRWBMpLxZvgKAH6+DJZmpP+W8Y8UdQOSU1JfxSWNXsaBaRGW77j+1hCuNHlzj7OH4SPN8fYd1q0o2qrDtoVyw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [ia32]
     os: [win32]
 
-  '@oxlint/binding-win32-x64-msvc@1.71.0':
-    resolution: {integrity: sha512-D2kyEIPHk/G/wiZLnwTVC/sVst+T/lKldVOjAFpgTIBUAOlry72e5OiapDbDBF4LfJLkN5ypJb/8Eu6yJzkveQ==}
+  '@oxlint/binding-win32-x64-msvc@1.80.0':
+    resolution: {integrity: sha512-yAnO7lwBYQnz2pcfBPIGQQZWIX5zd5R/1aAKIF3oE+TVj7IhoHcROjOkz3sRDngzqhfPKfFaXqug5j5rE5dn6Q==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [win32]
@@ -2428,8 +2441,12 @@ packages:
     peerDependencies:
       react-native: ^0.0.0-0 || >=0.65 <1.0
 
-  '@react-native/assets-registry@0.83.9':
-    resolution: {integrity: sha512-9MrShFZWvHybyjN8nj/rKW53hLpPOXMdEF8FOdDXRNu8oQ396BLknCMFeSCFhAHiCDVqQfah5iIV8S1wqXnxFA==}
+  '@react-native/assets-registry@0.83.10':
+    resolution: {integrity: sha512-AcVfyQ+8HsWCecXEnSaRffP71KqaWrhNB8bLulYCpKO7i5h/lmwgF191uafU/WiS0LbEMTGlXwWBshPto1phyA==}
+    engines: {node: '>= 20.19.4'}
+
+  '@react-native/babel-plugin-codegen@0.83.10':
+    resolution: {integrity: sha512-iRfhxsOePloy12TUzpL9dCwnxLi3eurg8+JurSozAmWh4HtmKu0IJHNjbEKk9htI5n4RlFom8LQ9vVcvgWOTbw==}
     engines: {node: '>= 20.19.4'}
 
   '@react-native/babel-plugin-codegen@0.83.6':
@@ -2440,6 +2457,12 @@ packages:
     resolution: {integrity: sha512-5Dqn08kRTUIxPLYju9hExI0cR1ESX+P5tEv5yv0q0UZcisRTw0VB8iUWDIph2LdY1i5Dc8PIvuaWMRNCw3vnKg==}
     engines: {node: ^20.19.4 || ^22.13.0 || ^24.3.0 || >= 25.0.0}
 
+  '@react-native/babel-preset@0.83.10':
+    resolution: {integrity: sha512-wTZWvs5cUQqr2qBAoJNKUy6IBH7wqPAJdxTC834S/7vBqtXypYHxDAFzYXkIh8pRTC86IBYxyc2IrBYHnB8O2g==}
+    engines: {node: '>= 20.19.4'}
+    peerDependencies:
+      '@babel/core': '*'
+
   '@react-native/babel-preset@0.83.6':
     resolution: {integrity: sha512-4/fXFDUvGOObETZq4+SUFkafld6OGgQWut5cQiqVghlhCB5z/p2lVhPgEUr/aTxTzeS3AmN+ztC+GpYPQ7tsTw==}
     engines: {node: '>= 20.19.4'}
@@ -2452,14 +2475,14 @@ packages:
     peerDependencies:
       '@babel/core': '*'
 
-  '@react-native/codegen@0.83.6':
-    resolution: {integrity: sha512-doB/Pq6Cf6IjF3wlQXTIiZOnsX9X8mEEk+CdGfyuCwZjWrf7IB8KaZEXXckJmfUcIwvJ9u/a72ZoTTCIoxAc9A==}
+  '@react-native/codegen@0.83.10':
+    resolution: {integrity: sha512-rTcuuwRDPLrBmhXc9vAr2gispQFCEqd2WVPh2+N5eV80p8tf9mHy7CoFnmPy8A8csK6HGlANaD9SMPvccQjh4g==}
     engines: {node: '>= 20.19.4'}
     peerDependencies:
       '@babel/core': '*'
 
-  '@react-native/codegen@0.83.9':
-    resolution: {integrity: sha512-fUliGYOD1D/hS4pZMK+YyGb01DxQQNUTjL+i2iL6elt2AncXoYMWNxLT/AMT38jImxI4FbKyH4JO+mL2+t5yuA==}
+  '@react-native/codegen@0.83.6':
+    resolution: {integrity: sha512-doB/Pq6Cf6IjF3wlQXTIiZOnsX9X8mEEk+CdGfyuCwZjWrf7IB8KaZEXXckJmfUcIwvJ9u/a72ZoTTCIoxAc9A==}
     engines: {node: '>= 20.19.4'}
     peerDependencies:
       '@babel/core': '*'
@@ -2470,8 +2493,8 @@ packages:
     peerDependencies:
       '@babel/core': '*'
 
-  '@react-native/community-cli-plugin@0.83.9':
-    resolution: {integrity: sha512-i8WhXYSEIB7kq99n6ZROI1lCckVEwz+Ti/oAT34UUU494MuSvZfd0UWEQ5cFpglPpIKq11KETPwmznHYF6xURg==}
+  '@react-native/community-cli-plugin@0.83.10':
+    resolution: {integrity: sha512-7QmZ7FLAIJbYjgxILBUE1k71lQB6atXZSLRczKE6Iti+BO3XHNiDSCZxuxUkYUJI0V/0kCbO/M8/a5zqHNu+Rw==}
     engines: {node: '>= 20.19.4'}
     peerDependencies:
       '@react-native-community/cli': '*'
@@ -2482,36 +2505,24 @@ packages:
       '@react-native/metro-config':
         optional: true
 
-  '@react-native/debugger-frontend@0.83.6':
-    resolution: {integrity: sha512-TyWXEpAjVundrc87fPWg91piOUg75+X9iutcfDe7cO3NrAEYCsl7Z09rKHuiAGkxfG9/rFD13dPsYIixUFkSFA==}
+  '@react-native/debugger-frontend@0.83.10':
+    resolution: {integrity: sha512-AlSOMdXoaSXi4O82f3APvw14e+EfrEvwPerfH2AI3JUrD/yQjFtbIxeyRPd89/MlKIbZU4cwyVFqj96bj39J5g==}
     engines: {node: '>= 20.19.4'}
 
-  '@react-native/debugger-frontend@0.83.9':
-    resolution: {integrity: sha512-LEOJrHvVWnjHC+emTyybeHkrInrJBnchk3VEhW5qGMWhW3vSM421CrZSCKAvzy+fDg/viufwBfIJvwTdk066CA==}
+  '@react-native/debugger-shell@0.83.10':
+    resolution: {integrity: sha512-hk9xFI9H412XSX1lpVuKrnxUQe3zIPKxFceYPUwx2L5aZQQ/yjypWkLs+LLldV6eh93B2sBnZbns1oFSE3LQNw==}
     engines: {node: '>= 20.19.4'}
 
-  '@react-native/debugger-shell@0.83.6':
-    resolution: {integrity: sha512-684TJMBCU0l0ZjJWzrnK0HH+ERaM9KLyxyArE1k7BrP+gVl4X9GO0Pi94RoInOxvW/nyV65sOU6Ip1F3ygS0cg==}
+  '@react-native/dev-middleware@0.83.10':
+    resolution: {integrity: sha512-V39TcESd9LGzDBs7PYVsx5oE1oGv1dLC0GIyJyEyehZjmOYk5sJ4C0m1ATKPeDE7JhiY8s/p6pNOBNp+NF4FGQ==}
     engines: {node: '>= 20.19.4'}
 
-  '@react-native/debugger-shell@0.83.9':
-    resolution: {integrity: sha512-vAqDG7+3HOz4VOSfccSNe06C1+evcp2AbMjoYOmOyeJtt5dCdmGUp0FICsnU7iuctsNXWnHqyhks9M0wn7zEzA==}
+  '@react-native/gradle-plugin@0.83.10':
+    resolution: {integrity: sha512-DpWzrcmxAEgD/tvy4r4WH10PYJPdfDCvtctVZ2Ez0sHlNYgWI6STfqxeAcZhU84hMhNsTec3IHDxNJ2cG8xPjQ==}
     engines: {node: '>= 20.19.4'}
 
-  '@react-native/dev-middleware@0.83.6':
-    resolution: {integrity: sha512-22xoddLTelpcVnF385SNH2hdP7X2av5pu7yRl/WnM5jBznbcl0+M9Ce94cj+WVeomsoUF/vlfuB0Ooy+RMlRiA==}
-    engines: {node: '>= 20.19.4'}
-
-  '@react-native/dev-middleware@0.83.9':
-    resolution: {integrity: sha512-4rW8KGkfqmZ5x1CTr+GrPBTdLG58UNkkJNQ8Dd9xdiVrZ/94sYKHm4HOo+UKTyOP0SNbZpZejDrf/2JNiqNL4Q==}
-    engines: {node: '>= 20.19.4'}
-
-  '@react-native/gradle-plugin@0.83.9':
-    resolution: {integrity: sha512-v+iag7ft+fBRP54GthOiR70qrp0azgvW8PhNg0KFYw52xin09LoC0rk96CY+Hj5M1oGoQovrk0bdji7ipH2pGg==}
-    engines: {node: '>= 20.19.4'}
-
-  '@react-native/js-polyfills@0.83.9':
-    resolution: {integrity: sha512-6+OdNC3GSgNI3L31zo730AxdI3eXjwD74k0M11gpvXKTOX/NQuXe3On+K4yLFokD2BFr8bL6XaqxCniCUQ3Q+Q==}
+  '@react-native/js-polyfills@0.83.10':
+    resolution: {integrity: sha512-q28LKHga5lf2ZX4u1T8Bj5RXqyzOBRWSXVjCCdczj/oacAVZPUrandGC1E9fR35fujyb3ZCqZbIQCvs8MhsTNA==}
     engines: {node: '>= 20.19.4'}
 
   '@react-native/js-polyfills@0.85.2':
@@ -2531,14 +2542,11 @@ packages:
   '@react-native/normalize-colors@0.74.89':
     resolution: {integrity: sha512-qoMMXddVKVhZ8PA1AbUCk83trpd6N+1nF2A6k1i6LsQObyS92fELuk8kU/lQs6M7BsMHwqyLCpQJ1uFgNvIQXg==}
 
-  '@react-native/normalize-colors@0.83.6':
-    resolution: {integrity: sha512-bTM24b5v4qN3h52oflnv+OujFORn/kVi06WaWhnQQw14/ycilPqIsqsa+DpIBqdBrXxvLa9fXtCRrQtGATZCEw==}
+  '@react-native/normalize-colors@0.83.10':
+    resolution: {integrity: sha512-dWgqcxaBy27oLx9tndcTF0917vbLOOstyNjYD58J6Z7YxkEZSaKG6+A+3I1KV6O1Xg2D69QThp4t6ezoC3NiGA==}
 
-  '@react-native/normalize-colors@0.83.9':
-    resolution: {integrity: sha512-GSXSvH+siDF2z+XtoF3Kk6zRFMWhGIpfq9nalBd4DSV97g5yNRQ5Htm2fpq7vBYNN+hVgvGZf7rRqnjn8bvfHg==}
-
-  '@react-native/virtualized-lists@0.83.9':
-    resolution: {integrity: sha512-fZ84faVUANrBU7GfL1wPSkGkn5cnCPVXxAwutKit1S5i8hlfwCnt0gE9Fu/0fpAIeuGxHVed00w2xxDVXyLxKQ==}
+  '@react-native/virtualized-lists@0.83.10':
+    resolution: {integrity: sha512-KNX6jCYcCnOKfoJyGMcgDrAVaQXOuNymBi2UC9sf2msEmgkrGgoWa+eKiATqaCgN44UFKlJIuNj4wUPTCWzZ0Q==}
     engines: {node: '>= 20.19.4'}
     peerDependencies:
       '@types/react': ^19.2.0
@@ -2982,17 +2990,64 @@ packages:
     resolution: {integrity: sha512-NwjLUnGy8/Zfx23fl50tRC8rYaYnM52xNRYFAXvmiil9yh1+K6aRVQMnzW6gQB/1DLgWt977lYQn7C+wtgXZiA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
+  '@typescript/native-preview-darwin-arm64@7.0.0-dev.20260707.2':
+    resolution: {integrity: sha512-wny2pgKjGbiZtnOIHVa3tXC1UfDqxNEFzyPGmiqybedG8hipG2Nfp0l5UxbaKCjkLacUpH/W5bP2hBOMVhCOzg==}
+    engines: {node: '>=16.20.0'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@typescript/native-preview-darwin-x64@7.0.0-dev.20260707.2':
+    resolution: {integrity: sha512-Afc7M5zOwo+GpfcYwz5Z8HMB2tPVsui7nNIqEuuFB73MPdVqNn/Wmpe4tP4MRri0AtJnJknoHBaTJ/VDAp/Jhw==}
+    engines: {node: '>=16.20.0'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@typescript/native-preview-linux-arm64@7.0.0-dev.20260707.2':
+    resolution: {integrity: sha512-iITBa2WjjTI5N9t5l7Z4KoOSI+2zBlhbvFzsD/f8qX8QoKjz/Y4DPyBDgezYi8nkqjjksbgSOJ3/ykzhwrB9cg==}
+    engines: {node: '>=16.20.0'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@typescript/native-preview-linux-arm@7.0.0-dev.20260707.2':
+    resolution: {integrity: sha512-hJm/UOqZTr9FHmR7uNm8VGX4oKtfWk0Jem0zPeJFNC8ckGUfSBueyiEYMZB+XmRc1aG4x1E46y3CplP4CLHvGQ==}
+    engines: {node: '>=16.20.0'}
+    cpu: [arm]
+    os: [linux]
+
+  '@typescript/native-preview-linux-x64@7.0.0-dev.20260707.2':
+    resolution: {integrity: sha512-du0dzi6y97Po5vDNdPJTyyijHCpaS22JLRnKZEJXBDaO9gCIymOv/5QQokFRuOlQm0bWl3i9PF4OVdGP6uAOQA==}
+    engines: {node: '>=16.20.0'}
+    cpu: [x64]
+    os: [linux]
+
+  '@typescript/native-preview-win32-arm64@7.0.0-dev.20260707.2':
+    resolution: {integrity: sha512-SsAwfhyHJ1akgBc+99z4+hwdbHsdWaKB8EwCNIMA6JfSLMeUjffrYvxu+vfMyxVtOVOz7RrRXRoiDiu4a2sCtg==}
+    engines: {node: '>=16.20.0'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@typescript/native-preview-win32-x64@7.0.0-dev.20260707.2':
+    resolution: {integrity: sha512-DL4u27stv0fo71sVhOzHSwE+YMZsbBijVI+kg5dLDLilSH79WFTJ8RSQ46vJrCMt+Gjlv/JOZP1PuLJDfioYeQ==}
+    engines: {node: '>=16.20.0'}
+    cpu: [x64]
+    os: [win32]
+
+  '@typescript/native-preview@7.0.0-dev.20260707.2':
+    resolution: {integrity: sha512-oUGp+Rep/hqMhPunyinsALUwSlzHINSxitifPiSaeqoKOKD2OlR9NE3TaPqwsl4NlGslsOSUXI1JotWQzpYCPg==}
+    engines: {node: '>=16.20.0'}
+    hasBin: true
+
   '@ungap/structured-clone@1.3.1':
     resolution: {integrity: sha512-mUFwbeTqrVgDQxFveS+df2yfap6iuP20NAKAsBt5jDEoOTDew+zwLAOilHCeQJOVSvmgCX4ogqIrA0mnyr08yQ==}
 
   '@upsetjs/venn.js@2.0.0':
     resolution: {integrity: sha512-WbBhLrooyePuQ1VZxrJjtLvTc4NVfpOyKx0sKqioq9bX1C1m7Jgykkn8gLrtwumBioXIqam8DLxp88Adbue6Hw==}
 
-  '@vitest/expect@4.1.9':
-    resolution: {integrity: sha512-vl/rYsUKcBr3SnQn166+XR5ZQcgMx3DQhFWdfli/cWpLnLUmbxZvyrJZotLFUryib+LtArYMSTJ5RbQ57ZqrlA==}
+  '@vitest/expect@4.1.11':
+    resolution: {integrity: sha512-VX2x5vNJXET47KAFzwERI+KRMtTTCSWTfSMKsW7JsUsXV4psq++e3DvZpuTDOpHcxytiDs6p2nhVb2tVDiiUYw==}
 
-  '@vitest/mocker@4.1.9':
-    resolution: {integrity: sha512-EVkXzBjrPGM+cK8/ANWgBrkUCfJfb38/EfTSO8h7pWvKkyPkpWxvR7BkD2MyItMF62C97zAEoqdpUixwR/e+Rw==}
+  '@vitest/mocker@4.1.11':
+    resolution: {integrity: sha512-2XJVD55d1o5AZous5CCGKS74g/riOj9odEt2bQpCVZeblHyHdnMeFl4jl0XjU21stf4mbjUkew2eXQZt65g5CQ==}
     peerDependencies:
       msw: ^2.4.9
       vite: ^6.0.0 || ^7.0.0 || ^8.0.0
@@ -3002,20 +3057,20 @@ packages:
       vite:
         optional: true
 
-  '@vitest/pretty-format@4.1.9':
-    resolution: {integrity: sha512-s0iufns3iIFitdgm+YR7g1whCAaGtXz459VS9/PqyKDEEFgYIhsHOQmXgIgDuYCt7DeQmiZT0Qe2OA2p4ZPu5A==}
+  '@vitest/pretty-format@4.1.11':
+    resolution: {integrity: sha512-yiZzPbGTS9Sr/JpFl8zHrcIkAofNbFV6k21vIgQN/cY/oxZeXhJv5sc/MBJ5jFKWmWs+oJHw0UXLZjmf931+Vw==}
 
-  '@vitest/runner@4.1.9':
-    resolution: {integrity: sha512-KXLMDtc7oe70+3mJfGrPUWPesswH+3sTxAMAMl8DG7I8IUQT4XW718dY5ID3vPUcmlu27CcKfY4P3h3I29SLJg==}
+  '@vitest/runner@4.1.11':
+    resolution: {integrity: sha512-LztvUgdwMNJMIkj3hQnnxiC2Xy1zNxq928W/xhjCLaNCzqTZOudjwbQf6v9IntZGPw132i2Lq2rgTRZHD3JHNw==}
 
-  '@vitest/snapshot@4.1.9':
-    resolution: {integrity: sha512-Jc7RKGNBo8Z28WYIm0Niej4xdSPByRf6mU58VpHQkd6Zh05rlnA+twjbK5HyeIGHxrzsc3mJgS43uM0CZKzaIA==}
+  '@vitest/snapshot@4.1.11':
+    resolution: {integrity: sha512-pN7ikn1ON7h8ee4gIAp4AzyK+zBtJPzVbqOgu5LCEh4VaJVbPQcgYQYJIMGQPXVeJJq1fnfazis7a5pFNPahog==}
 
-  '@vitest/spy@4.1.9':
-    resolution: {integrity: sha512-fHpsS6mIi+PiEW+vcRVOMkX1oSaPKne3VOclSFICPcGOmfKgXPU5iAah+wcNcj2xPrCCmfq99IDGf+EojhhvhA==}
+  '@vitest/spy@4.1.11':
+    resolution: {integrity: sha512-apNa/prQy2qCeywhnixOHPRCgGNhvg7T4Dapfl1GahLp/R+uhBm5cPyFoNVyqsNd2h1nJxL6BqqdIjiABL60YA==}
 
-  '@vitest/utils@4.1.9':
-    resolution: {integrity: sha512-A51o8ymO5PpqlWNnBP9ZHPXDIpuMtTLlGSjN7la4US+LJzoUMyhwjA5QXlm39JexgwHKW4Xjs8Z2d3dLCXOeuA==}
+  '@vitest/utils@4.1.11':
+    resolution: {integrity: sha512-zTCVGpyFsGWBhllOyKlTw/vnr6D9qxsfSDyfbyZmTyjHw5N/VuvzHpHoQjm2ZJzn4RJgx5w4r7V0er69CmLgPQ==}
 
   '@xmldom/xmldom@0.8.13':
     resolution: {integrity: sha512-KRYzxepc14G/CEpEGc3Yn+JKaAeT63smlDr+vjB8jRfgTBBI9wRj/nkQEO+ucV8p8I9bfKLWp37uHgFrbntPvw==}
@@ -3079,6 +3134,11 @@ packages:
     resolution: {integrity: sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==}
     engines: {node: '>= 14'}
 
+  agent-cli-detector@0.1.7:
+    resolution: {integrity: sha512-d8OWDVdZMgjhLUT9ZPgSv/BdFFF9pVuscC0JdUSz3bjwE15gcp6u/o0/JooM2yyAWC49KThFhXlgTXRa9B7yng==}
+    engines: {node: '>=18.18'}
+    hasBin: true
+
   ajv@6.15.0:
     resolution: {integrity: sha512-fgFx7Hfoq60ytK2c7DhnF8jIvzYgOMxfugjLOSMHjLIPgenqa7S7oaagATUq99mV6IYvN2tRmC0wnTYX6iPbMw==}
 
@@ -3259,8 +3319,8 @@ packages:
       expo-widgets:
         optional: true
 
-  babel-preset-expo@55.0.23:
-    resolution: {integrity: sha512-oY+UFcXRLtidYp0JcttzxV5Qxx7KBjBJIShalb+hk4TQoLYafJr4ubpYajLwt7BBgAIVwBdxltKeYeNYXYf02A==}
+  babel-preset-expo@55.0.25:
+    resolution: {integrity: sha512-P/CaG4kvSzd8Pb1CiS8m6C9XCwuLptaaw+F/GfDNGUkuF3/DlYCkdj4Ogq1mJ5OJ80qdlaY9TzxB28CrL/dIqg==}
     peerDependencies:
       '@babel/runtime': ^7.20.0
       expo: '*'
@@ -4125,6 +4185,7 @@ packages:
   eslint@9.39.4:
     resolution: {integrity: sha512-XoMjdBOwe/esVgEvLmNsD3IRHkm7fbKIUGvrleloJXUZgDHig2IPWNniv+GwjyJXzuNqVjlr5+4yVUZjycJwfQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    deprecated: This version is no longer supported. Please see https://eslint.org/version-support for other options.
     hasBin: true
     peerDependencies:
       jiti: '*'
@@ -4184,25 +4245,25 @@ packages:
     resolution: {integrity: sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
 
-  expo-application@55.0.14:
-    resolution: {integrity: sha512-NgqDIt3eCf4aVLp1L6AcEanCYoyJeuBsGrgGSzOIvxAsOvp5X3SYKW3ROgpKUnLQEKMWlzwETpjsUGszcqkk8g==}
+  expo-application@55.0.19:
+    resolution: {integrity: sha512-RFer4T46/OaIkNQEweA9PQj6xlXKor71IPNydWxlupx/XG05Yv/269HJJ3Q9zejdY9M7R3jTeTlAYYmXwbLBgA==}
     peerDependencies:
       expo: '*'
 
-  expo-asset@55.0.17:
-    resolution: {integrity: sha512-pK9HHJuFqjE8kDUcbMFsZj3Cz8WdXpvZHZmYl7ouFQp59P83BvHln6VnqPDGlO+/4929G0Lm8ZUzbONuNRhi9w==}
+  expo-asset@55.0.20:
+    resolution: {integrity: sha512-BpybBESZj8WxW/WXuQhiY8D1azkJtxLuteIfprokJw0uU5r/g7cD+vzrzKJSlE4hhUlKeUGsoKzSK0nSJJ2sMQ==}
     peerDependencies:
       expo: '*'
       react: '*'
       react-native: '*'
 
-  expo-build-properties@55.0.13:
-    resolution: {integrity: sha512-UYZhUKyh7YQhbJdkBvo68WUQ7fOtZeSV7F8kfYkjEiN/ADRHG0WfEIiddvGfi9cH/5iwpptv/+Lu5cx6uvfegA==}
+  expo-build-properties@55.0.18:
+    resolution: {integrity: sha512-LLTuab2S4Gv9dYjolBF/noRAUosa9Fu1o374yoQ7WD+NLWP8rn3fUd5ciKlx7f702JqO7tDJB2+BUjTwtgciCg==}
     peerDependencies:
       expo: '*'
 
-  expo-camera@55.0.18:
-    resolution: {integrity: sha512-Us/7JV6O1lHpLBGKJnK2s8gzmPcmMVJSV5586DBeO7x7AXzmvvVGtH+0nJRVIBE3MNzGzGWyfgievjr8QlE7dA==}
+  expo-camera@55.0.23:
+    resolution: {integrity: sha512-Qra5QIZv0BOXLLXNfQlOW8NLUx3gLiWKCfpLeguiOwXY6XPj9xIE3AfbrxGa27/KohgrtHy1sgsnLeJB76OGjA==}
     peerDependencies:
       expo: '*'
       react: '*'
@@ -4212,31 +4273,31 @@ packages:
       react-native-web:
         optional: true
 
-  expo-clipboard@55.0.13:
-    resolution: {integrity: sha512-PrOmmuVsGW4bAkNQmGKtxMXj3invsfN+jfIKmQxHwE/dn7ODqwFWviUTa+PMUjP3XZmYCDLyu/i0GLeu7HF9Ew==}
+  expo-clipboard@55.0.17:
+    resolution: {integrity: sha512-wVWLvBfsFE3W3MBBSYAjwybkV40XowK65R9PDqfiuU2F9h7grKVjCjWD6FE7I4goZo0hFM8MfZNP+7XOdJMYiQ==}
     peerDependencies:
       expo: '*'
       react: '*'
       react-native: '*'
 
-  expo-constants@55.0.16:
-    resolution: {integrity: sha512-Z15/No94UHoogD+pulxjudGAeOHTEIWZgb/vnX48Wx5D+apWTeCbnKxQZZtGQlosvduYL5kaic2/W8U+NHfBQQ==}
+  expo-constants@55.0.17:
+    resolution: {integrity: sha512-t0SNWmXTjXPCHzjNsv1Okjaj8SpXQcUjDPtYDqvofDS+BhAsvlKNmwaaWXvduBjjmmmJWNH8q1/x9IWQ+upg8g==}
     peerDependencies:
       expo: '*'
       react-native: '*'
 
-  expo-crypto@55.0.14:
-    resolution: {integrity: sha512-TfAADBGZNNv9OOmdKFJCz54wDj87ufxtzQNSY+Roycpm8e5tuCnDIL7EjqUOmNTGH99Jj8ftPGFt4KGG2Ii2fg==}
+  expo-crypto@55.0.19:
+    resolution: {integrity: sha512-Ip1jQ5GphvrC4Ls5osAmIapi+JZXOqRJYaaMxTFWpkhssNUq88oP45pWGv2uU2K/Ci6j7iLDJzU8eN3v+B7jrA==}
     peerDependencies:
       expo: '*'
 
-  expo-dev-client@55.0.35:
-    resolution: {integrity: sha512-DN50x9gqWYAfnJpxgiJm3zK2bFvDhxJ5JjFq0wFot7o4knZ7H3BVwiL6zZMHG29g6gfxdgpzGG69WPiSR/Ipgg==}
+  expo-dev-client@55.0.39:
+    resolution: {integrity: sha512-/AesdrrjyaGPALr7jGRZcHlijzF2pNiFBBwiaCZYTlJsWLlmgw90SHjcZ81DXVb/UaM5tO1903T1lPBY+dUdcA==}
     peerDependencies:
       expo: '*'
 
-  expo-dev-launcher@55.0.36:
-    resolution: {integrity: sha512-Dn2om4J71aavWqi1jLzK3QlGZjDiFv7nIBZkQyzy2zW62IOD9kLwOOvHHj07Ra/6n9cqFEpNYzwpPkR7KHuYZA==}
+  expo-dev-launcher@55.0.40:
+    resolution: {integrity: sha512-tzv3D1xotXroTSiu6EHVldZ2rr/LEW82VYZXZbqNeR15GufHm+Jed6gc3o2V6WV5UMeBonj1d3KhF/Zs2YdvNQ==}
     peerDependencies:
       expo: '*'
 
@@ -4245,24 +4306,18 @@ packages:
     peerDependencies:
       expo: '*'
 
-  expo-dev-menu@55.0.30:
-    resolution: {integrity: sha512-uwDI4cEPzpRemf06Ts5O41azJcz8BBcE6QOkNaTX8JlzdJ05eq9jWxmbA1WhoSoE5C+NFo8njHSvmHqUqTpOng==}
+  expo-dev-menu@55.0.34:
+    resolution: {integrity: sha512-FowMkhG32iw1qpKSWJI5wl/27DaaJbbMEtK6MQFMGcEgbk7UV42jWDd1AUuUUaf4Euxpgn36KWpG+blh/2gaHA==}
     peerDependencies:
       expo: '*'
 
-  expo-document-picker@55.0.13:
-    resolution: {integrity: sha512-IhswJElhdzs3fKDEKW8KXYRoFkWGEsXRMYAZT46Yo56zqqy8yQXrczo33RSwD2hFzNQBdLT97SJL9N311UyS3g==}
+  expo-document-picker@55.0.17:
+    resolution: {integrity: sha512-tyrPB+k3lTI03umNP8cc912yZF7tgyo9v/+rEeW9h/u0fmMJAvegyaQl/YNW2MeKpjYa4+WwiLBGXVj54XHDog==}
     peerDependencies:
       expo: '*'
 
-  expo-file-system@55.0.19:
-    resolution: {integrity: sha512-c4smCbMqELLI3YQrGpw21MwZIREXM2e53vQD/+KWQcae1q+hgw8J2TroEqcQ/jVOtFpZYVvyVfgu4HDKNEKmNw==}
-    peerDependencies:
-      expo: '*'
-      react-native: '*'
-
-  expo-file-system@55.0.23:
-    resolution: {integrity: sha512-XNV/NaPc7Tvd2JIsWkPW8s2vfJUI/Oe4UMX9TmOGpc6cn5BckDw/nn2Qre9lq4btT4FWHJw4SAOHmATShLC0og==}
+  expo-file-system@55.0.26:
+    resolution: {integrity: sha512-KBOQWqxumCxJBN29Lu13QpccwAhcjsgDYCJSVVjfGydaK/UbEkH/1rT/WZmdfoZ4G8mUJlfRbWfnJtfHUXxsdw==}
     peerDependencies:
       expo: '*'
       react-native: '*'
@@ -4281,8 +4336,8 @@ packages:
       react: '*'
       react-native: '*'
 
-  expo-haptics@55.0.14:
-    resolution: {integrity: sha512-KjDItBsA9mi1f5nRwf8g1wOdfEcLHwvEdt5Jl1sMCDETR/homcGOl+F3QIiPOl/PRlbGVieQsjTtF4DGtHOj6g==}
+  expo-haptics@55.0.18:
+    resolution: {integrity: sha512-bEH0bf5bBGn7U2eTZVdiXBUk4vTfNGbfv9/9PCYLg3gL7L/WE2g8WKs2vYg1B4/BDSucyO8prZofH3IgvLJojQ==}
     peerDependencies:
       expo: '*'
 
@@ -4291,18 +4346,18 @@ packages:
     peerDependencies:
       expo: '*'
 
-  expo-image-manipulator@55.0.17:
-    resolution: {integrity: sha512-lTYhmXejHnMp+vjFID0Q/jD+Qic3U9OP4qw3tCVHCVp4TTmx9hbifTIN0hmw02ak7LsBkxuYnP+uglvUKgJAzA==}
+  expo-image-manipulator@55.0.21:
+    resolution: {integrity: sha512-BlVl692hVDKuWzOCnbUsfp1u0XqujOABm/Kv3ISMg0qRMchvD6vUSJ/XOIj80+6B9CCm1hNgklgeJ0SIEHiCVQ==}
     peerDependencies:
       expo: '*'
 
-  expo-image-picker@55.0.20:
-    resolution: {integrity: sha512-lfWt/0rPWdKz8AdDEGmGHZIJSNlVc720Dlx5bfou10FU16ZV5wAbTU63nm2jkXd8hbXke4a/2Ha1dzxCVA+LQQ==}
+  expo-image-picker@55.0.24:
+    resolution: {integrity: sha512-scbtvQIgiqiOxQx/lFEocJkWPzYANHjwFLnzfKjdZNWh3RJjjMmtHaEoeu7lM9RzqE3EwF+JQecgy+FATXNfiQ==}
     peerDependencies:
       expo: '*'
 
-  expo-image@55.0.10:
-    resolution: {integrity: sha512-We+vq/Z8jy8zmGxcOP8vrhiWkkwyXFdSks8cSlPi0bpu6D0Ei6l9Nj2xHWCD+yoENh92aCEe1+QRujAwXbogGA==}
+  expo-image@55.0.11:
+    resolution: {integrity: sha512-PVIBYQJW/h1f6Zb9xnoWlgfqyOPVm2yb6eo6ZogaKbvMrhb/Q/fiERbagi4oqmR6IPljWPEpkXXQyFBUh7TjpQ==}
     peerDependencies:
       expo: '*'
       react: '*'
@@ -4321,14 +4376,14 @@ packages:
       expo: '*'
       react: '*'
 
-  expo-linking@55.0.15:
-    resolution: {integrity: sha512-/RQh2vkNqV8Bim9Owm/evVqn2fqTvCDYHkpYPoSKbLAdydSGdHC2xZNw7Odl4wu1i1/3L4Xz//LKd3NsPWYWBQ==}
+  expo-linking@55.0.17:
+    resolution: {integrity: sha512-rc41rUbFYdJ4IdPxWQiTDtkOlEbtYQkvsCASzW1pqskfRShAd4tYyyAw1BTez3Cq1IgWkK3wcGR+HbFdzZ7ImQ==}
     peerDependencies:
       react: '*'
       react-native: '*'
 
-  expo-manifests@55.0.17:
-    resolution: {integrity: sha512-vKZvFivX3usVJKfBODKQcFHso0g38zlGbRGqGAppz+il0zKvG6umpJ47OZbzLod7iJpjd+ZDD2AGuOxacixonA==}
+  expo-manifests@55.0.21:
+    resolution: {integrity: sha512-Eu27Ia6v2Ev4i7AoswypTcqhWTKmyjd8t8cwznK3HkDQqhfHsAQIeBxSwiLmErS25iD5NsQ4C3+w/2TZdLABhQ==}
     peerDependencies:
       expo: '*'
 
@@ -4336,8 +4391,8 @@ packages:
     resolution: {integrity: sha512-gtFQzs6wduZxYo4/1udcVLANDvQbVUVFjK1xJjgtZuUBlbJ+xFjQg5wOsQaffUDO3kqrG+DRXt1ihSxK72Wqkg==}
     hasBin: true
 
-  expo-modules-autolinking@55.0.24:
-    resolution: {integrity: sha512-A0OyMbTPZqibYrwqj98HFYTNSvl4NSS4Zt+R5A8qiAx3nM0mc81e6Iqw7Wl4J8M/t36lJ+cT3WuVTz5Oszj6Hw==}
+  expo-modules-autolinking@55.0.27:
+    resolution: {integrity: sha512-gBRONXQT41PwfsQgeZfFlaeK+zrYMYjRMgxocecnQuSXEm7wCTqD8SsTJmWAf3SDayMQGDZFBlMODeVEnv8FmA==}
     hasBin: true
 
   expo-modules-core@55.0.25:
@@ -4350,29 +4405,29 @@ packages:
       react-native-worklets:
         optional: true
 
-  expo-network@55.0.14:
-    resolution: {integrity: sha512-Sy544zTPjVh+tbOLUOU8fBX87oRSrNQqUZY6TLO0w0WF/QTNb7yxlwRh6v6wfKKRg9xpZypTIIEtdG/s6q8ZQA==}
+  expo-network@55.0.18:
+    resolution: {integrity: sha512-zHKgRbTbPAN/TYbnV4r2DGlTvq5DG26n/N0S/MF41i3S/kcU6fad/YNgdkixmXt2JFNOCfT3OnouV2q7OyYAWg==}
     peerDependencies:
       expo: '*'
       react: '*'
 
-  expo-notifications@55.0.22:
-    resolution: {integrity: sha512-Rwvsp/lAEXfDYBxkQZpaLF9ZB25cJ/yfHhD/ESclbPesN0nbQBZ/5rGb1xS/saANtkStbEGfDlA80uHh2zEpsA==}
+  expo-notifications@55.0.27:
+    resolution: {integrity: sha512-Qquo8zytHPR4Rj819KwghUqvdf2RJG8+S8Y3DQ+4wUZgRFdWqNnh8IX9IhcdITTGr/Ei0I9LzI0BKG4qyO9ubw==}
     peerDependencies:
       expo: '*'
       react: '*'
       react-native: '*'
 
-  expo-router@55.0.14:
-    resolution: {integrity: sha512-rOn/wosp2hAPM+O2o41hnarbP5Zqv9UkHWa31KoSoiOme1tpmZd2yc93XtRAtzP0P5E5xzqq7a2rbEAarpP5XA==}
+  expo-router@55.0.18:
+    resolution: {integrity: sha512-KfGkHUgPsstqYD5kEyUtCKIMzPsKeuS+4C+xZ8sj8lEmL1Liy4JYuDoDSEhBVXWoQN82rYAqbBKgr9n+G1mk+g==}
     peerDependencies:
-      '@expo/log-box': 55.0.12
-      '@expo/metro-runtime': ^55.0.11
+      '@expo/log-box': 55.0.13
+      '@expo/metro-runtime': ^55.0.12
       '@react-navigation/drawer': ^7.9.4
       '@testing-library/react-native': '>= 13.2.0'
       expo: '*'
-      expo-constants: ^55.0.16
-      expo-linking: ^55.0.15
+      expo-constants: ^55.0.17
+      expo-linking: ^55.0.17
       react: '*'
       react-dom: '*'
       react-native: '*'
@@ -4398,21 +4453,17 @@ packages:
       react-server-dom-webpack:
         optional: true
 
-  expo-secure-store@55.0.13:
-    resolution: {integrity: sha512-I6r0JNO1Fd4o0Gu7Ixiic7s89lqgdUHq17uBH9y1f/AntoyKn71TdtYJH82RgfsBbu5qNVzrwImmvlANyOlITQ==}
+  expo-secure-store@55.0.18:
+    resolution: {integrity: sha512-shKZYQf7/KA45Z3oEIXUkXdrfRNFxsc+fJC182bbpuKqS4nLPZslsJUqruQ937Zkkbev126N/QJv+zmd6FpZjA==}
     peerDependencies:
       expo: '*'
 
-  expo-server@55.0.11:
-    resolution: {integrity: sha512-AxRdHqcv0H1g4s923vu+5n1Nrhne23bjXbP+Vl7+Lwfpe7MG9PuU1IS95IJK6a+7BVV1mRN6QlZvs8Yv7EEXNQ==}
+  expo-server@55.0.12:
+    resolution: {integrity: sha512-yuNHbxobUKCXWn9Z/H+lgYk6heXEFub6q1h8Yo9kCLxgL2afluWZ/YylbtxgHgmFwDVUmi6milQYfL+wwQMlzw==}
     engines: {node: '>=20.16.0'}
 
-  expo-server@55.0.9:
-    resolution: {integrity: sha512-N5Ipn1NwqaJzEm+G97o0Jbe4g/th3R/16N1DabnYryXKCiZwDkK13/w3VfGkQN9LOOaBP+JIRxGf4M8lQKPzyA==}
-    engines: {node: '>=20.16.0'}
-
-  expo-splash-screen@55.0.20:
-    resolution: {integrity: sha512-WI5T0dutiZhxsqlF+jhEP4JRpQNILLlP8IpmKehsnV53Cncv6AQrKE7y1sOWwDyC2m2GBufZ/Vwam1RMt2EfmA==}
+  expo-splash-screen@55.0.25:
+    resolution: {integrity: sha512-Jl3VPbNqbgGjXlkH93hi4Y4p6GB5DasLNbpL2Gb4kl8grujKaIGi4rXL25qYbYxIzefSlt96NqG9czanxxooPg==}
     peerDependencies:
       expo: '*'
 
@@ -4422,8 +4473,8 @@ packages:
       react: '*'
       react-native: '*'
 
-  expo-symbols@55.0.8:
-    resolution: {integrity: sha512-Dg6BTu+fCWukdlh+3XYIr6NbqJWmK4aAQ6i6BInKnWU0ALuzVUJcMDq8Lk9bHok2hOh3OhzJqlCqEoBXPInIVQ==}
+  expo-symbols@55.0.9:
+    resolution: {integrity: sha512-F85C/8ExQjd2gYjasLVKMT8wPj+1+19TVTqg4jAeVjVZklqiQtLO72io9Ji1xAjYNgmDeUI0diVHlFMMTC4Ekg==}
     peerDependencies:
       expo: '*'
       expo-font: '*'
@@ -4435,8 +4486,8 @@ packages:
     peerDependencies:
       expo: '*'
 
-  expo@55.0.27:
-    resolution: {integrity: sha512-uB8fbowkb/Xel2/x4b+cFfg76GGb2lhgaPVdm/ago+QL/852VJP+bUU6LzQVszQFmCTMHCJyrQ4l8enThCnfxw==}
+  expo@55.0.30:
+    resolution: {integrity: sha512-BgarG0CY16G25wMjCHw+0FuY3RfsJ8Yn8T/aENKKhnomrHOlG0cOcwJqia7WQDCpf620CJJ8XMOBBizOGDkLfw==}
     hasBin: true
     peerDependencies:
       '@expo/dom-webview': '*'
@@ -4467,6 +4518,9 @@ packages:
   fast-levenshtein@2.0.6:
     resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
 
+  fastdom@1.0.12:
+    resolution: {integrity: sha512-LB+xjSTEbjHE1cWsxu+tN2Xqr1kpi+V9aADI7sVM5ZMaXyYGPHULQMzpJMYqOTULK/73pUkWVzzObFRBkPr+hg==}
+
   fb-dotslash@0.5.8:
     resolution: {integrity: sha512-XHYLKk9J4BupDxi9bSEhkfss0m+Vr9ChTrjhf9l2iw3jB5C7BnY4GVPoMcqbrTutsKJso6yj2nAB6BI/F2oZaA==}
     engines: {node: '>=20'}
@@ -4651,8 +4705,8 @@ packages:
   hachure-fill@0.5.2:
     resolution: {integrity: sha512-3GKBOn+m2LX9iq+JC1064cSFprJY4jL1jCXTcpnfER5HYE2l/4EfWSGzkPa/ZDBmYI0ZOEj5VHV/eKnPGkHuOg==}
 
-  happy-dom@20.11.1:
-    resolution: {integrity: sha512-XSt8tMzbW9ymE7687xztkO1ckR7qJNQ3LywY9vlYGhGi3zXrGBHuUo2Cl1ztZaICW+1eAGdkLbj6iwVqDT33kg==}
+  happy-dom@20.11.8:
+    resolution: {integrity: sha512-TeAoM8pTDKNVcP5z3MptRTb7UH9q126GrjTFOgormgA19tmT30JTiIxb1CVXs7xljpItypUp/yHSPFD4QRHMsQ==}
     engines: {node: '>=20.0.0'}
 
   has-bigints@1.1.0:
@@ -5427,13 +5481,17 @@ packages:
   merge-stream@2.0.0:
     resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
 
-  mermaid@11.16.1:
-    resolution: {integrity: sha512-TQsq6u22fAn3rek5VOubrhKPo1g5hwC3FXUN9hiyupTckcYiGuuKGkNQrKYwGJkXUxZdojwRG46gsSCFZMDp4g==}
+  mermaid@11.17.2:
+    resolution: {integrity: sha512-V6K3C8EBdEsPFZXSKMJe6ppQOENxuHARr9GvHX4hh47lAbhMRD9qf4oEK7LoaRQxULMa80/qt5gHO73aCleBBg==}
 
   metro-babel-transformer@0.83.7:
     resolution: {integrity: sha512-sBqBkt6kNut/88bv+Ucvm4yqdPetbvAEsHzi3MAgJEifOSYYzX5Z5Kgw3TFOrwf/mHJTOBG2ONlaMHoyfP15TA==}
     engines: {node: '>=20.19.4'}
 
+  metro-babel-transformer@0.83.8:
+    resolution: {integrity: sha512-tnn0J5wzgTgTx2OJy3Cwr1y79bJz4eNgFQd+2HENOs5Vz6QOMnt05z7J+BedIo9wIbpEa0iN9U1nerxyvMRE9g==}
+    engines: {node: '>=20.19.4'}
+
   metro-babel-transformer@0.84.4:
     resolution: {integrity: sha512-rvCfz8snl9h20VcvpOHxZuHP1SlAkv4HXbzw7nyyVwu6Eqo5PRerbakQ9XmUCOsRy70spJ37O+G1TK8oMzo48g==}
     engines: {node: ^20.19.4 || ^22.13.0 || ^24.3.0 || >= 25.0.0}
@@ -5442,6 +5500,10 @@ packages:
     resolution: {integrity: sha512-W1c2Nmx8MiJTJt+eWhMO08z9VKi3kZOaz99IYGdqeqDgY9j+yZjXl62rUav4Di0heZfh4/n2s722PqRL1OODeg==}
     engines: {node: '>=20.19.4'}
 
+  metro-cache-key@0.83.8:
+    resolution: {integrity: sha512-I38PtcjT4crS5HY9UQ8i6z8S7tJ2WewtPGr/OwS6FcLKfy5T/1hlTaFw+wozUZkEtNpR6Gc0oJuvuKCbSoSN5A==}
+    engines: {node: '>=20.19.4'}
+
   metro-cache-key@0.84.4:
     resolution: {integrity: sha512-wVO79aGrkYImpnaVS4+d5RrRBRPX31QtvKB3wKGBuiNSznduZTQHzsrJZRroFJSwnygrzdsGUtDQPuqqFjFdvw==}
     engines: {node: ^20.19.4 || ^22.13.0 || ^24.3.0 || >= 25.0.0}
@@ -5450,6 +5512,10 @@ packages:
     resolution: {integrity: sha512-E9SRePXQ1Zvlj79VcOk57q7VC7rMHMFQ+jhmPHBiq+dJ0bJB5BL87lWZF6oh5X76Cci5tpDuQNaDwwuSCToEeg==}
     engines: {node: '>=20.19.4'}
 
+  metro-cache@0.83.8:
+    resolution: {integrity: sha512-aogMG5WbKzW5000otNjYrS9hIoORzkCI1faPJK+vxQLaf2BorJKBBFe/jl2Tfsi1mZUglS2EBuBt8B3JB7MYDQ==}
+    engines: {node: '>=20.19.4'}
+
   metro-cache@0.84.4:
     resolution: {integrity: sha512-gpcFQdSLUwUCk71saKoE64jLFbx2nwTfVCcPSULMNT8QYq0p1eZZE29Jvd0HtT/UlhC3ZOutLxJME5xqD2JUZg==}
     engines: {node: ^20.19.4 || ^22.13.0 || ^24.3.0 || >= 25.0.0}
@@ -5458,6 +5524,10 @@ packages:
     resolution: {integrity: sha512-83mjWFbFOt2GeJ6pFIum5mSnc1uTsZJAtD8o4ej0s4NVsYsA7fB+pHvTfHhFrpeMONaobu2riKavkPei05Er/Q==}
     engines: {node: '>=20.19.4'}
 
+  metro-config@0.83.8:
+    resolution: {integrity: sha512-crNbNy+/B4tCne2+HjUshwvC57gNBQj+V9fFSy3lHH2RlKcLHib3Mil/SfTX8Pfh2fCY5pPuSu2OKa7YiadB+Q==}
+    engines: {node: '>=20.19.4'}
+
   metro-config@0.84.4:
     resolution: {integrity: sha512-PMotGDjXcXLWo2TMRH+VR99phFNgYTwqh4OoieIKK3yTJa1Jmkl+fZJxDO0jfBvNF+WESHciHvpNuBtXaF3B0Q==}
     engines: {node: ^20.19.4 || ^22.13.0 || ^24.3.0 || >= 25.0.0}
@@ -5466,6 +5536,10 @@ packages:
     resolution: {integrity: sha512-6yn3w1wnltT6RQl7p7YES2l95ArC+mWrOssEiH8p5/DDrJS65/szf9LsC9JrBv8c5DdvSY3V3f0GRYg0Ox7hCg==}
     engines: {node: '>=20.19.4'}
 
+  metro-core@0.83.8:
+    resolution: {integrity: sha512-NTyOUOQaQKvQgJG9VI2ymN6KTM7gHEqkVFhkPc9bK4BsHSTz/EaXuFBXtC+wtwINLeH9tbusL/jfsSmdEmuU7A==}
+    engines: {node: '>=20.19.4'}
+
   metro-core@0.84.4:
     resolution: {integrity: sha512-HONpWC5LGXZn3ffkd4Hu6AIrfE7j4Z0g0wMo/goV24WOB3lhuFZ40KgvaDiSw8iyQHloMYay5N/wPX+z8oN/PQ==}
     engines: {node: ^20.19.4 || ^22.13.0 || ^24.3.0 || >= 25.0.0}
@@ -5474,6 +5548,10 @@ packages:
     resolution: {integrity: sha512-+j0F1m+FQYVAQ6syf+mwhIPV5GoFQrkInX8bppuc50IzNsZbMrp8R5H/Sx/K2daQ3YEa9F/XwkeZT8gzJfgeCw==}
     engines: {node: '>=20.19.4'}
 
+  metro-file-map@0.83.8:
+    resolution: {integrity: sha512-+W++EUuzEXIfWQEFTWQMVThzhWbnJL4gRNJ9WSHzIAM5pT7gsprUxo9+2hrfirURm/TLvrKwhq37oCECJcDSyQ==}
+    engines: {node: '>=20.19.4'}
+
   metro-file-map@0.84.4:
     resolution: {integrity: sha512-KSVDi/u60hKPx++NLu3MTIvyjzNoJnFAF8PQFxaj1jiSka/wjw+Ua6sNuJ0TDHQv+7AAoFQxeMgaRAe8Yic5wQ==}
     engines: {node: ^20.19.4 || ^22.13.0 || ^24.3.0 || >= 25.0.0}
@@ -5482,6 +5560,10 @@ packages:
     resolution: {integrity: sha512-MfJar2IS4tBRuLb9svwb0Gu5l9BsH+pcRm8eGcEi/wy8MzZinfinh5dFLt2nWkocnulIgtGB5NkFDdbXqMXKhQ==}
     engines: {node: '>=20.19.4'}
 
+  metro-minify-terser@0.83.8:
+    resolution: {integrity: sha512-7tU0J5/c7LZaZJwTlOb1xq0NepTFvGzRxigDhZOq4jSE6g0BRHmBqe7XvLH3WcRiJNGy+eshcZr34RpMjb6mmg==}
+    engines: {node: '>=20.19.4'}
+
   metro-minify-terser@0.84.4:
     resolution: {integrity: sha512-5qpbaVOMC7CPitIpuewzVeGw7E+C3ykbv2mqTjQLl85Z3annSVGlSCTcsZjqXZzjupfK4Ztj3dDc4kc44NZwtQ==}
     engines: {node: ^20.19.4 || ^22.13.0 || ^24.3.0 || >= 25.0.0}
@@ -5490,6 +5572,10 @@ packages:
     resolution: {integrity: sha512-WSJIENlMcoSsuz66IfBHOkgfp3KJt2UW2TnEHPf1b8pIG2eEXNOVmo2+03A0H17WY2XGXWgxL0CG7FAopqgB1A==}
     engines: {node: '>=20.19.4'}
 
+  metro-resolver@0.83.8:
+    resolution: {integrity: sha512-piU0NVTI9i37YztDVF5rtn9uxP3NebVT0xZM9NKJ9z0jbigrctUQksi3NoYIeJMvL6Wn2dgAehpcmmnfn+gUwA==}
+    engines: {node: '>=20.19.4'}
+
   metro-resolver@0.84.4:
     resolution: {integrity: sha512-1qLgbxQ5ZGhhutuPot1Yp348ofDsATL2WkrHF65TobqTT9K3P9qJXw38bomk7ncp5B7OYMfWwtyBZo1lCV792A==}
     engines: {node: ^20.19.4 || ^22.13.0 || ^24.3.0 || >= 25.0.0}
@@ -5498,6 +5584,10 @@ packages:
     resolution: {integrity: sha512-9GKkJURaB2iyYoEExKnedzAHzxmKtSi+k0tsZUvMoU27tBZJElchYt7JH/Ai/XzYAI9lCAaV7u5HZSI8J5Z+wQ==}
     engines: {node: '>=20.19.4'}
 
+  metro-runtime@0.83.8:
+    resolution: {integrity: sha512-f7FfeM0pamq8vrvs8aO9KvIUabbUKe0WkHFpLt6Q9yIIIsORqNFwlgJeHGraOFPU7Cxqj5yLXkJu5bT1uwDXvw==}
+    engines: {node: '>=20.19.4'}
+
   metro-runtime@0.84.4:
     resolution: {integrity: sha512-Jibypds4g7AhzdRKY+kDoj51s5EXMwgyp5ddtlreDAsWefMdOx+agWqgm0H2XSZ/ueanHHVM89fnf5OJnlxa8Q==}
     engines: {node: ^20.19.4 || ^22.13.0 || ^24.3.0 || >= 25.0.0}
@@ -5506,6 +5596,10 @@ packages:
     resolution: {integrity: sha512-JgA1h7oc1a1jydBe1GhVFsUoMYo3wLPk7oRA32rjlDsq+sP2JLt9x2p2lWbNSxTm/u8NV4VRid3hvEJgcX8tKw==}
     engines: {node: '>=20.19.4'}
 
+  metro-source-map@0.83.8:
+    resolution: {integrity: sha512-60Uor7bM+KsVewLkLCcZfkPFCbqjPDdoSmeBuT3+ye+ac80BuLWbbR8DpyxWpUqQeZPdaAT5ZqFgDIs8BNEcVA==}
+    engines: {node: '>=20.19.4'}
+
   metro-source-map@0.84.4:
     resolution: {integrity: sha512-jbWkPxIesVuo1IWkvezmMJld6iu8nD62GsrZiV6jP37AOdbo4OBq1FJ+qkOg8sV05wAHB//jAbziuW0SlJfW4g==}
     engines: {node: ^20.19.4 || ^22.13.0 || ^24.3.0 || >= 25.0.0}
@@ -5515,6 +5609,11 @@ packages:
     engines: {node: '>=20.19.4'}
     hasBin: true
 
+  metro-symbolicate@0.83.8:
+    resolution: {integrity: sha512-ZLrbqOqQ+m+Mpv7zo65XEXkNqVYvgUbY7tIsb9e1zSSmU/4C3D6DjaJvRHqcAdl0mkg8TI/csKooAEa5xcZNwg==}
+    engines: {node: '>=20.19.4'}
+    hasBin: true
+
   metro-symbolicate@0.84.4:
     resolution: {integrity: sha512-OnfpacxUqGPZQ27t8qK9mFa7uqHIlVWeqRqkCbvMvreEBiamEeOn8krKtcwgP5M4cYDPwuSmCTopHMVthqG4zA==}
     engines: {node: ^20.19.4 || ^22.13.0 || ^24.3.0 || >= 25.0.0}
@@ -5524,6 +5623,10 @@ packages:
     resolution: {integrity: sha512-Ss0FpBiZDjX2kwhukMDl5sNdYK8T/06IPqxNE4H6PTlRlfs9q11cef13c/xESY/Pm4VCkp1yJUZO3kXzvMxQFA==}
     engines: {node: '>=20.19.4'}
 
+  metro-transform-plugins@0.83.8:
+    resolution: {integrity: sha512-9JRPkvi+m0QH2Y/w5RjCF9mHqOUNFpMFLDDLhKUjhcKESh8Wm3HKDdHXHVldTN1lTToCIabv81nF0zyJzKEJ5g==}
+    engines: {node: '>=20.19.4'}
+
   metro-transform-plugins@0.84.4:
     resolution: {integrity: sha512-kehr6HbAecqD0/a3xLXobELdPaAmRAl8bel0qagPF4vhZtux93nS8S4eq2kgKt6J2GnQpVjSoW1PXdst04mwow==}
     engines: {node: ^20.19.4 || ^22.13.0 || ^24.3.0 || >= 25.0.0}
@@ -5532,6 +5635,10 @@ packages:
     resolution: {integrity: sha512-UegCo7ygB2fT64mRK2nbAjQVJ1zSwIIHy8d96jJv2nKZFDaViYBiughEdu5HM/Ceq0WN3LZrZk3zhl9aoiLYFw==}
     engines: {node: '>=20.19.4'}
 
+  metro-transform-worker@0.83.8:
+    resolution: {integrity: sha512-Pa2hOfhUmWpI/dmkhsLq8uGyFHK2opoEK7j/YCiRtqNSe0YzzxYguXTNgg8AMiuZfc9LPcB1AhGENS10O5wcIw==}
+    engines: {node: '>=20.19.4'}
+
   metro-transform-worker@0.84.4:
     resolution: {integrity: sha512-W1IYMvvXTu4MxYr7d9h7CeG2vpIr3bmLLIavkPY4O1ilzDrvS8z/NEe6y+pC44Ff7raMXQgYSfdqDUwN/i39gg==}
     engines: {node: ^20.19.4 || ^22.13.0 || ^24.3.0 || >= 25.0.0}
@@ -5541,6 +5648,11 @@ packages:
     engines: {node: '>=20.19.4'}
     hasBin: true
 
+  metro@0.83.8:
+    resolution: {integrity: sha512-ZbJDJCDlvv0O3QHVbhZkyP2/DtebfEoDZ3wVyYHgu6Uoy6DmmE/bis6lIDBYh+kWPuaueJDegyutPjkIBLtZDQ==}
+    engines: {node: '>=20.19.4'}
+    hasBin: true
+
   metro@0.84.4:
     resolution: {integrity: sha512-8ETTubqfD6ornDy2zYDvRcKnVDOXdFJsjetYDBsY4oAsb6NJkiwFR+FaMESyGppFmQUyBQA4H4sFGxzcQSGtFA==}
     engines: {node: ^20.19.4 || ^22.13.0 || ^24.3.0 || >= 25.0.0}
@@ -5608,8 +5720,8 @@ packages:
   ms@2.1.3:
     resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
 
-  multitars@1.0.0:
-    resolution: {integrity: sha512-H/J4fMLedtudftaYMOg7ajzLYgT3/rwbWVJbqr/iUgB8DQztn38ys5HOqI1CzSxx8QhXXwOOnnBvd4v3jG5+Mg==}
+  multitars@1.0.2:
+    resolution: {integrity: sha512-6GwVw5eLi9sThdtlS4PKwC7yRLaf45pYhIEzKBHdKxi+YOXGKFX8acIniH+Uh/+k9mS2lQOupTccjoe5r0/1IQ==}
 
   nanoid@3.3.18:
     resolution: {integrity: sha512-DTg4MJbGMWkfi6VZFdNt2/caMbQy4Ou+Op/hJQvGEWcnVfoA1QA+xzRKAzw9jD6+GVOOeYr/mIcuDSdug6F6+w==}
@@ -5679,6 +5791,10 @@ packages:
     resolution: {integrity: sha512-9M5kpuOLyTPogMtZiQUIxdAZxl7Dxs6tVBbJErSumsqGMuhVSoUbkfeZ3XNPpLpwBBtqY5QDUzGwggLHX3slQg==}
     engines: {node: '>=20.19.4'}
 
+  ob1@0.83.8:
+    resolution: {integrity: sha512-pk7el+eTOzfSKMAY4QBiiwKzegXn633JQj13y+pW5E5IdS+yV2CfDJ9Hf20K/LKy8nCrP9dAmd7XOk52OJxifA==}
+    engines: {node: '>=20.19.4'}
+
   ob1@0.84.4:
     resolution: {integrity: sha512-eJXMpz4aQHXF/YBB9ddqZDIS+ooO91hObo9FoW/xBkr54/zCwYYCDqT/O54vNo8kOkWs5Ou/y28NgdrV0edQNA==}
     engines: {node: ^20.19.4 || ^22.13.0 || ^24.3.0 || >= 25.0.0}
@@ -5761,8 +5877,8 @@ packages:
     resolution: {integrity: sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==}
     engines: {node: '>= 0.4'}
 
-  oxfmt@0.52.0:
-    resolution: {integrity: sha512-nJlYM35F64zTDMecCNhoHNkf+D/eHv7xcjj9XDSj+bFAVtN93m7v8DQMdHd6nDG6Akf/kEYYHmDUBs2Dz27Sug==}
+  oxfmt@0.65.0:
+    resolution: {integrity: sha512-SgS5VgnP42T0zl3zWD+xoH8FCqg1SAFnSRoOT/qeoa6gxcYIqrDMOmcXIg/EWSN92Du4ogB4riuKhKd6Y4CGhw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
     peerDependencies:
@@ -5774,12 +5890,12 @@ packages:
       vite-plus:
         optional: true
 
-  oxlint@1.71.0:
-    resolution: {integrity: sha512-U1m1X+C0vDj7DC1e13IoZULzEcPczE7UOMTs8VlZGHUEIUaSTZKo5qkPsQEfzpgnQ29Pea/w3Xntk62UCecxZw==}
+  oxlint@1.80.0:
+    resolution: {integrity: sha512-5nTiSps4qdbCWLbxzuO00alHkEO2exR9YMN/ig6QXWrLsYSG0KaObOAM+l6oU2LcKPWoSAGYbkZIGEu1ViiWKA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
     peerDependencies:
-      oxlint-tsgolint: '>=0.22.1'
+      oxlint-tsgolint: '>=7.0.2001'
       vite-plus: '*'
     peerDependenciesMeta:
       oxlint-tsgolint:
@@ -5971,10 +6087,10 @@ packages:
   react-devtools-core@6.1.5:
     resolution: {integrity: sha512-ePrwPfxAnB+7hgnEr8vpKxL9cmnp7F322t8oqcPshbIQQhDKgFDW4tjhF2wjVbdXF9O/nyuy3sQWd9JGpiLPvA==}
 
-  react-dom@19.2.6:
-    resolution: {integrity: sha512-0prMI+hvBbPjsWnxDLxlCGyM8PN6UuWjEUCYmZhO67xIV9Xasa/r/vDnq+Xyq4Lo27g8QSbO5YzARu0D1Sps3g==}
+  react-dom@19.2.8:
+    resolution: {integrity: sha512-rVprimfGBG3DR+Tq0IQG2DT5PxKth1WIGDmj5yPmlzr4YBe7uyE+Du4oVqTDXZSHGGGXRtTJEGSSePyQCMBglQ==}
     peerDependencies:
-      react: ^19.2.6
+      react: ^19.2.8
 
   react-fast-compare@3.2.2:
     resolution: {integrity: sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ==}
@@ -5994,6 +6110,9 @@ packages:
   react-is@19.2.6:
     resolution: {integrity: sha512-XjBR15BhXuylgWGuslhDKqlSayuqvqBX91BP8pauG8kd1zY8kotkNWbXksTCNRarse4kuGbe2kIY05ARtwNIvw==}
 
+  react-is@19.2.8:
+    resolution: {integrity: sha512-s5un28nYxKJw5gvUHyW5PCC28CvBqLu9r3cWgzHT4Vo/5fqqkFcdRYsGcKf50WMPpjjFZS5d76fn3YCo2njKwQ==}
+
   react-native-gesture-handler@2.31.2:
     resolution: {integrity: sha512-rw5q74i2AfS7YGYdbxQDhOU7xqgY6WRM1132/CCm3erqjblhECZDZFHIm0tteHoC9ih24wogVBVVzcTBQtZ+5A==}
     peerDependencies:
@@ -6006,8 +6125,8 @@ packages:
       react: '*'
       react-native: '*'
 
-  react-native-reanimated@4.3.0:
-    resolution: {integrity: sha512-HOTTPdKtddXTOsmQxDASXEwLS3lqEHrKERD3XOgzSqWJ7L3x81Pnx7mTcKx1FKdkgomMug/XSmm1C6Z7GIowxA==}
+  react-native-reanimated@4.3.4:
+    resolution: {integrity: sha512-kQJMiDROed3eO+asdXfodDxgsDDIGM/ifnHFAiPsKWxmrcPu+Bz4vO0fg79eyuEmKCeQuDczmn4tkTb4RbSVYA==}
     peerDependencies:
       react: '*'
       react-native: 0.81 - 0.85
@@ -6037,8 +6156,8 @@ packages:
       react: ^18.0.0 || ^19.0.0
       react-dom: ^18.0.0 || ^19.0.0
 
-  react-native-webview@13.16.1:
-    resolution: {integrity: sha512-If0eHhoEdOYDcHsX+xBFwHMbWBGK1BvGDQDQdVkwtSIXiq1uiqjkpWVP2uQ1as94J0CzvFE9PUNDuhiX0Z6ubw==}
+  react-native-webview@13.16.2:
+    resolution: {integrity: sha512-4H3ypsaXjxHRFSHX348IdED4kJ5cQGN5DLAaIAasiHENb10xlYx0XTlEFwPJa9PbkzU1IHeiTfvAoisZzGg1gA==}
     peerDependencies:
       react: '*'
       react-native: '*'
@@ -6051,8 +6170,8 @@ packages:
       react: '*'
       react-native: 0.81 - 0.85
 
-  react-native@0.83.9:
-    resolution: {integrity: sha512-bTQpaSJBbxOizI8SMNiCR/5aIvfO3ZlXAcWYxg6FmdbfJYCZ0zdUCK9mSZ4patureITGHNU94RXhxDAJhqsO7w==}
+  react-native@0.83.10:
+    resolution: {integrity: sha512-4gbmtAyfC0F4jU2hl/l/HZbRIfRl0d5RdHNpJLf7sT/0zhYDEhiFcFk7ii2utl7O8BIHRUmGe/anfWP3DNPTZw==}
     engines: {node: '>= 20.19.4'}
     hasBin: true
     peerDependencies:
@@ -6101,13 +6220,13 @@ packages:
     peerDependencies:
       react: ^19.2.0
 
-  react-test-renderer@19.2.6:
-    resolution: {integrity: sha512-GbS6V23YduFTPiWJ5xICbKEjRcqx1Z90js/V5miqhz7qp/d6xSe9Dd6NjSQODFRdzdsqRMPW82E/sFpPRbY5Mw==}
+  react-test-renderer@19.2.8:
+    resolution: {integrity: sha512-GHKPaDRaNYU24PHTLG8Bx8VMY9t+qNfxQbt/Yjp7aMWBkKU6766SR0n6TnYu7P5I1MfEuAMUadqiyDHyI4Yy9Q==}
     peerDependencies:
-      react: ^19.2.6
+      react: ^19.2.8
 
-  react@19.2.6:
-    resolution: {integrity: sha512-sfWGGfavi0xr8Pg0sVsyHMAOziVYKgPLNrS7ig+ivMNb3wbCBw3KxtflsGBAwD3gYQlE/AEZsTLgToRrSCjb0Q==}
+  react@19.2.8:
+    resolution: {integrity: sha512-PWaYA1L/q9u2u7xYQi+Y3L3Yfnie7XyLeaJICV1MGD6LprsBxcAqGjYyr0eY3p+QdsA+x/Irkt4Qif8D63+Sbw==}
     engines: {node: '>=0.10.0'}
 
   readdirp@3.6.0:
@@ -6260,11 +6379,6 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
 
-  semver@7.8.4:
-    resolution: {integrity: sha512-rUCObTnP32Q08R2uuIrt7r9PlEonuTmtuXYcW6s5kjdlj3xbnwe+21yXptAUYcMAABLkYYTtnmzb3w3EDZfueA==}
-    engines: {node: '>=10'}
-    hasBin: true
-
   semver@7.8.5:
     resolution: {integrity: sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==}
     engines: {node: '>=10'}
@@ -6444,6 +6558,9 @@ packages:
     resolution: {integrity: sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ==}
     engines: {node: '>=4'}
 
+  strictdom@1.0.1:
+    resolution: {integrity: sha512-cEmp9QeXXRmjj/rVp9oyiqcvyocWab/HaoN4+bwFeZ7QzykJD6L3yD4v12K1x0tHpqRqVpJevN3gW7kyM39Bqg==}
+
   string-length@4.0.2:
     resolution: {integrity: sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==}
     engines: {node: '>=10'}
@@ -6555,11 +6672,6 @@ packages:
     resolution: {integrity: sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==}
     engines: {node: '>=8'}
 
-  terser@5.46.2:
-    resolution: {integrity: sha512-uxfo9fPcSgLDYob/w1FuL0c99MWiJDnv+5qXSQc5+Ki5NjVNsYi66INnMFBjf6uFz6OnX12piJQPF4IpjJTNTw==}
-    engines: {node: '>=10'}
-    hasBin: true
-
   terser@5.49.1:
     resolution: {integrity: sha512-7A2xlQ5EnGT8KPA92dUh6RbRYTVw8hEaEN9L1K68l4UOXFuV511NnAqObGoRqGOQofQcMypisu1s3xawCEHrvA==}
     engines: {node: '>=10'}
@@ -6861,20 +6973,20 @@ packages:
       yaml:
         optional: true
 
-  vitest@4.1.9:
-    resolution: {integrity: sha512-nE3/LEyc0z87uHYLZebqCUOaJr2hdtuPp7BQ4BosVFnfltxgAvMG08NyrSGlPpOUWvR27c5flSmYFTNr78L9GQ==}
+  vitest@4.1.11:
+    resolution: {integrity: sha512-fhACrNXUidIbGSBr5FlbuBkO7VWC1ZyLl0DO4CU2DrQoAPxX84Ysxs+HeGQpii5lZWV1Q4gBZTTu49mF+A6Edw==}
     engines: {node: ^20.0.0 || ^22.0.0 || >=24.0.0}
     hasBin: true
     peerDependencies:
       '@edge-runtime/vm': '*'
       '@opentelemetry/api': ^1.9.0
       '@types/node': ^20.0.0 || ^22.0.0 || >=24.0.0
-      '@vitest/browser-playwright': 4.1.9
-      '@vitest/browser-preview': 4.1.9
-      '@vitest/browser-webdriverio': 4.1.9
-      '@vitest/coverage-istanbul': 4.1.9
-      '@vitest/coverage-v8': 4.1.9
-      '@vitest/ui': 4.1.9
+      '@vitest/browser-playwright': 4.1.11
+      '@vitest/browser-preview': 4.1.11
+      '@vitest/browser-webdriverio': 4.1.11
+      '@vitest/coverage-istanbul': 4.1.11
+      '@vitest/coverage-v8': 4.1.11
+      '@vitest/ui': 4.1.11
       happy-dom: '*'
       jsdom: '*'
       vite: ^6.0.0 || ^7.0.0 || ^8.0.0
@@ -6988,18 +7100,6 @@ packages:
     resolution: {integrity: sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==}
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
 
-  ws@7.5.11:
-    resolution: {integrity: sha512-zS54Oen9bITtp7kp2XM3AydrCIq1D+HwJOuH+c+e4LfpL/lotP5osijd+UoMnxwAam1GN8R4KtLAyIrIcBNpiA==}
-    engines: {node: '>=8.3.0'}
-    peerDependencies:
-      bufferutil: ^4.0.1
-      utf-8-validate: ^5.0.2
-    peerDependenciesMeta:
-      bufferutil:
-        optional: true
-      utf-8-validate:
-        optional: true
-
   ws@7.5.13:
     resolution: {integrity: sha512-rsKI6xDBFVf4r/x8XyChGK04QR/XHroxs/jUcoWvtEZM8TPU/X/uIY9B1CsSzYws9ZJb/6bbBu7dPhFW00CAoA==}
     engines: {node: '>=8.3.0'}
@@ -7012,8 +7112,8 @@ packages:
       utf-8-validate:
         optional: true
 
-  ws@8.21.0:
-    resolution: {integrity: sha512-Vsp28b7DRcimFQvrqu2Wek3z1iYxDCWqHYB8Qsnk/S4RfaCQzPGPyBNuVjJV3cd6UiKtUtp6sNM77gWvzcCH+g==}
+  ws@8.21.3:
+    resolution: {integrity: sha512-201TZ/kPWxoPr/OKWjquZR1SWKXcvxdH+e1xrx89b3YbmzLMFCLfnaG1HFIgWzJOEWZ7MvpK++odZufgYR50Rw==}
     engines: {node: '>=10.0.0'}
     peerDependencies:
       bufferutil: ^4.0.1
@@ -7054,11 +7154,6 @@ packages:
   yallist@3.1.1:
     resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==}
 
-  yaml@2.8.4:
-    resolution: {integrity: sha512-ml/JPOj9fOQK8RNnWojA67GbZ0ApXAUlN2UQclwv2eVgTgn7O9gg9o7paZWKMp4g0H3nTLtS9LVzhkpOFIKzog==}
-    engines: {node: '>= 14.6'}
-    hasBin: true
-
   yaml@2.9.0:
     resolution: {integrity: sha512-2AvhNX3mb8zd6Zy7INTtSpl1F15HW6Wnqj0srWlkKLcpYl/gMIMJiyuGq2KeI2YFxUPjdlB+3Lc10seMLtL4cA==}
     engines: {node: '>= 14.6'}
@@ -7200,7 +7295,7 @@ snapshots:
 
   '@babel/helper-annotate-as-pure@7.29.7':
     dependencies:
-      '@babel/types': 7.29.7
+      '@babel/types': 7.29.8
 
   '@babel/helper-compilation-targets@7.28.6':
     dependencies:
@@ -7239,7 +7334,7 @@ snapshots:
       '@babel/helper-optimise-call-expression': 7.29.7
       '@babel/helper-replace-supers': 7.29.7(@babel/core@7.29.7)
       '@babel/helper-skip-transparent-expression-wrappers': 7.29.7
-      '@babel/traverse': 7.29.7
+      '@babel/traverse': 7.29.8
       semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
@@ -7282,8 +7377,8 @@ snapshots:
 
   '@babel/helper-member-expression-to-functions@7.29.7':
     dependencies:
-      '@babel/traverse': 7.29.7
-      '@babel/types': 7.29.7
+      '@babel/traverse': 7.29.8
+      '@babel/types': 7.29.8
     transitivePeerDependencies:
       - supports-color
 
@@ -7296,8 +7391,8 @@ snapshots:
 
   '@babel/helper-module-imports@7.29.7':
     dependencies:
-      '@babel/traverse': 7.29.7
-      '@babel/types': 7.29.7
+      '@babel/traverse': 7.29.8
+      '@babel/types': 7.29.8
     transitivePeerDependencies:
       - supports-color
 
@@ -7325,7 +7420,7 @@ snapshots:
 
   '@babel/helper-optimise-call-expression@7.29.7':
     dependencies:
-      '@babel/types': 7.29.7
+      '@babel/types': 7.29.8
 
   '@babel/helper-plugin-utils@7.28.6': {}
 
@@ -7363,7 +7458,7 @@ snapshots:
       '@babel/core': 7.29.7
       '@babel/helper-member-expression-to-functions': 7.29.7
       '@babel/helper-optimise-call-expression': 7.29.7
-      '@babel/traverse': 7.29.7
+      '@babel/traverse': 7.29.8
     transitivePeerDependencies:
       - supports-color
 
@@ -7376,8 +7471,8 @@ snapshots:
 
   '@babel/helper-skip-transparent-expression-wrappers@7.29.7':
     dependencies:
-      '@babel/traverse': 7.29.7
-      '@babel/types': 7.29.7
+      '@babel/traverse': 7.29.8
+      '@babel/types': 7.29.8
     transitivePeerDependencies:
       - supports-color
 
@@ -8616,30 +8711,31 @@ snapshots:
 
   '@expo-google-fonts/material-symbols@0.4.34': {}
 
-  '@expo/cli@55.0.33(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-constants@55.0.16)(expo-font@55.0.8)(expo-router@55.0.14)(expo@55.0.27)(react-dom@19.2.6(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)':
+  '@expo/cli@55.0.36(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-constants@55.0.17)(expo-font@55.0.8)(expo-router@55.0.18)(expo@55.0.30)(react-dom@19.2.8(react@19.2.8))(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)(typescript@6.0.3)':
     dependencies:
       '@expo/code-signing-certificates': 0.0.6
-      '@expo/config': 55.0.18(typescript@6.0.3)
-      '@expo/config-plugins': 55.0.10
+      '@expo/config': 55.0.21(typescript@6.0.3)
+      '@expo/config-plugins': 55.0.11
       '@expo/devcert': 1.2.1
-      '@expo/env': 2.1.2
-      '@expo/image-utils': 0.8.14(typescript@6.0.3)
+      '@expo/env': 2.1.3
+      '@expo/image-utils': 0.8.17(typescript@6.0.3)
       '@expo/json-file': 10.2.0
-      '@expo/log-box': 55.0.12(@expo/dom-webview@55.0.5)(expo@55.0.27)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
-      '@expo/metro': 55.1.1
-      '@expo/metro-config': 55.0.24(expo@55.0.27)(typescript@6.0.3)
+      '@expo/log-box': 55.0.13(@expo/dom-webview@55.0.5)(expo@55.0.30)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
+      '@expo/metro': 55.1.2
+      '@expo/metro-config': 55.0.27(expo@55.0.30)(typescript@6.0.3)
       '@expo/osascript': 2.7.0
       '@expo/package-manager': 1.13.0
       '@expo/plist': 0.5.4
-      '@expo/prebuild-config': 55.0.19(expo@55.0.27)(typescript@6.0.3)
-      '@expo/require-utils': 55.0.5(typescript@6.0.3)
-      '@expo/router-server': 55.0.18(@expo/metro-runtime@55.0.10)(expo-constants@55.0.16)(expo-font@55.0.8)(expo-router@55.0.14)(expo-server@55.0.11)(expo@55.0.27)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
-      '@expo/schema-utils': 55.0.4
-      '@expo/spawn-async': 1.7.2
+      '@expo/prebuild-config': 55.0.22(expo@55.0.30)(typescript@6.0.3)
+      '@expo/require-utils': 55.0.8(typescript@6.0.3)
+      '@expo/router-server': 55.0.19(@expo/metro-runtime@55.0.10)(expo-constants@55.0.17)(expo-font@55.0.8)(expo-router@55.0.18)(expo-server@55.0.12)(expo@55.0.30)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@expo/schema-utils': 55.0.5
+      '@expo/spawn-async': 1.8.0
       '@expo/ws-tunnel': 1.0.6
       '@expo/xcpretty': 4.4.4
-      '@react-native/dev-middleware': 0.83.6
+      '@react-native/dev-middleware': 0.83.10
       accepts: 1.3.8
+      agent-cli-detector: 0.1.7
       arg: 5.0.2
       better-opn: 3.0.2
       bplist-creator: 0.1.0
@@ -8650,13 +8746,13 @@ snapshots:
       connect: 3.7.0
       debug: 4.4.3
       dnssd-advertise: 1.1.6
-      expo: 55.0.27(@babel/core@7.29.7)(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-router@55.0.14)(react-dom@19.2.6(react@19.2.6))(react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
-      expo-server: 55.0.11
+      expo: 55.0.30(10e8e71dd92768dd7f344108f3edbbe3)
+      expo-server: 55.0.12
       fetch-nodeshim: 0.4.10
       getenv: 2.0.0
       glob: 13.0.6
       lan-network: 0.2.1
-      multitars: 1.0.0
+      multitars: 1.0.2
       node-forge: 1.4.0
       npm-package-arg: 11.0.3
       ora: 3.4.0
@@ -8665,7 +8761,7 @@ snapshots:
       progress: 2.0.3
       prompts: 2.4.2
       resolve-from: 5.0.0
-      semver: 7.8.4
+      semver: 7.8.5
       send: 0.19.2
       slugify: 1.6.9
       source-map-support: 0.5.21
@@ -8674,11 +8770,11 @@ snapshots:
       terminal-link: 2.1.1
       toqr: 0.1.1
       wrap-ansi: 7.0.0
-      ws: 8.21.0
+      ws: 8.21.3
       zod: 3.25.76
     optionalDependencies:
-      expo-router: 55.0.14(50649306d987d6f4e510b7a8e94ea6ba)
-      react-native: 0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)
+      expo-router: 55.0.18(2f99795f9796def5cdb1516a493dc117)
+      react-native: 0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)
     transitivePeerDependencies:
       - '@expo/dom-webview'
       - '@expo/metro-runtime'
@@ -8696,9 +8792,9 @@ snapshots:
     dependencies:
       node-forge: 1.4.0
 
-  '@expo/config-plugins@55.0.10':
+  '@expo/config-plugins@55.0.11':
     dependencies:
-      '@expo/config-types': 55.0.5
+      '@expo/config-types': 55.0.6
       '@expo/json-file': 10.0.16
       '@expo/plist': 0.5.4
       '@expo/sdk-runtime-versions': 1.0.0
@@ -8707,7 +8803,7 @@ snapshots:
       getenv: 2.0.0
       glob: 13.0.6
       resolve-from: 5.0.0
-      semver: 7.8.4
+      semver: 7.8.5
       slugify: 1.6.9
       xcode: 3.0.1
       xml2js: 0.6.0
@@ -8725,7 +8821,7 @@ snapshots:
       getenv: 2.0.0
       glob: 13.0.6
       resolve-from: 5.0.0
-      semver: 7.7.4
+      semver: 7.8.5
       slugify: 1.6.9
       xcode: 3.0.1
       xml2js: 0.6.0
@@ -8734,6 +8830,8 @@ snapshots:
 
   '@expo/config-types@55.0.5': {}
 
+  '@expo/config-types@55.0.6': {}
+
   '@expo/config@55.0.16(typescript@5.9.3)':
     dependencies:
       '@expo/config-plugins': 55.0.8
@@ -8744,39 +8842,23 @@ snapshots:
       getenv: 2.0.0
       glob: 13.0.6
       resolve-workspace-root: 2.0.1
-      semver: 7.7.4
+      semver: 7.8.5
       slugify: 1.6.9
     transitivePeerDependencies:
       - supports-color
       - typescript
 
-  '@expo/config@55.0.16(typescript@6.0.3)':
+  '@expo/config@55.0.21(typescript@6.0.3)':
     dependencies:
-      '@expo/config-plugins': 55.0.8
-      '@expo/config-types': 55.0.5
-      '@expo/json-file': 10.0.14
-      '@expo/require-utils': 55.0.5(typescript@6.0.3)
-      deepmerge: 4.3.1
-      getenv: 2.0.0
-      glob: 13.0.6
-      resolve-workspace-root: 2.0.1
-      semver: 7.7.4
-      slugify: 1.6.9
-    transitivePeerDependencies:
-      - supports-color
-      - typescript
-
-  '@expo/config@55.0.18(typescript@6.0.3)':
-    dependencies:
-      '@expo/config-plugins': 55.0.10
-      '@expo/config-types': 55.0.5
+      '@expo/config-plugins': 55.0.11
+      '@expo/config-types': 55.0.6
       '@expo/json-file': 10.2.0
-      '@expo/require-utils': 55.0.5(typescript@6.0.3)
+      '@expo/require-utils': 55.0.8(typescript@6.0.3)
       deepmerge: 4.3.1
       getenv: 2.0.0
       glob: 13.0.6
       resolve-workspace-root: 2.0.1
-      semver: 7.8.4
+      semver: 7.8.5
       slugify: 1.6.9
     transitivePeerDependencies:
       - supports-color
@@ -8789,20 +8871,20 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@expo/devtools@55.0.3(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)':
+  '@expo/devtools@55.0.3(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)':
     dependencies:
       chalk: 4.1.2
     optionalDependencies:
-      react: 19.2.6
-      react-native: 0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)
+      react: 19.2.8
+      react-native: 0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)
 
-  '@expo/dom-webview@55.0.5(expo@55.0.27)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)':
+  '@expo/dom-webview@55.0.5(expo@55.0.30)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)':
     dependencies:
-      expo: 55.0.27(@babel/core@7.29.7)(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-router@55.0.14)(react-dom@19.2.6(react@19.2.6))(react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
-      react: 19.2.6
-      react-native: 0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)
+      expo: 55.0.30(10e8e71dd92768dd7f344108f3edbbe3)
+      react: 19.2.8
+      react-native: 0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)
 
-  '@expo/env@2.1.2':
+  '@expo/env@2.1.3':
     dependencies:
       chalk: 4.1.2
       debug: 4.4.3
@@ -8810,10 +8892,18 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@expo/fingerprint@0.16.7':
+  '@expo/env@2.4.2':
     dependencies:
-      '@expo/env': 2.1.2
-      '@expo/spawn-async': 1.7.2
+      chalk: 4.1.2
+      debug: 4.4.3
+      getenv: 2.0.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@expo/fingerprint@0.16.8':
+    dependencies:
+      '@expo/env': 2.4.2
+      '@expo/spawn-async': 1.8.0
       arg: 5.0.2
       chalk: 4.1.2
       debug: 4.4.3
@@ -8822,19 +8912,19 @@ snapshots:
       ignore: 5.3.2
       minimatch: 10.2.5
       resolve-from: 5.0.0
-      semver: 7.8.4
+      semver: 7.8.5
     transitivePeerDependencies:
       - supports-color
 
-  '@expo/image-utils@0.8.14(typescript@6.0.3)':
+  '@expo/image-utils@0.8.17(typescript@6.0.3)':
     dependencies:
-      '@expo/require-utils': 55.0.5(typescript@6.0.3)
-      '@expo/spawn-async': 1.7.2
+      '@expo/require-utils': 55.0.8(typescript@6.0.3)
+      '@expo/spawn-async': 1.8.0
       chalk: 4.1.2
       getenv: 2.0.0
       jimp-compact: 0.16.1
       parse-png: 2.1.0
-      semver: 7.7.4
+      semver: 7.8.5
     transitivePeerDependencies:
       - supports-color
       - typescript
@@ -8859,42 +8949,42 @@ snapshots:
       '@babel/code-frame': 7.29.7
       json5: 2.2.3
 
-  '@expo/local-build-cache-provider@55.0.14(typescript@6.0.3)':
+  '@expo/local-build-cache-provider@55.0.16(typescript@6.0.3)':
     dependencies:
-      '@expo/config': 55.0.18(typescript@6.0.3)
+      '@expo/config': 55.0.21(typescript@6.0.3)
       chalk: 4.1.2
     transitivePeerDependencies:
       - supports-color
       - typescript
 
-  '@expo/log-box@55.0.11(@expo/dom-webview@55.0.5)(expo@55.0.27)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)':
+  '@expo/log-box@55.0.11(@expo/dom-webview@55.0.5)(expo@55.0.30)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@expo/dom-webview': 55.0.5(expo@55.0.27)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
+      '@expo/dom-webview': 55.0.5(expo@55.0.30)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
       anser: 1.4.10
-      expo: 55.0.27(@babel/core@7.29.7)(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-router@55.0.14)(react-dom@19.2.6(react@19.2.6))(react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
-      react: 19.2.6
-      react-native: 0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)
+      expo: 55.0.30(10e8e71dd92768dd7f344108f3edbbe3)
+      react: 19.2.8
+      react-native: 0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)
       stacktrace-parser: 0.1.11
 
-  '@expo/log-box@55.0.12(@expo/dom-webview@55.0.5)(expo@55.0.27)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)':
+  '@expo/log-box@55.0.13(@expo/dom-webview@55.0.5)(expo@55.0.30)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@expo/dom-webview': 55.0.5(expo@55.0.27)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
+      '@expo/dom-webview': 55.0.5(expo@55.0.30)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
       anser: 1.4.10
-      expo: 55.0.27(@babel/core@7.29.7)(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-router@55.0.14)(react-dom@19.2.6(react@19.2.6))(react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
-      react: 19.2.6
-      react-native: 0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)
+      expo: 55.0.30(10e8e71dd92768dd7f344108f3edbbe3)
+      react: 19.2.8
+      react-native: 0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)
       stacktrace-parser: 0.1.11
 
-  '@expo/metro-config@55.0.24(expo@55.0.27)(typescript@6.0.3)':
+  '@expo/metro-config@55.0.27(expo@55.0.30)(typescript@6.0.3)':
     dependencies:
       '@babel/code-frame': 7.29.7
       '@babel/core': 7.29.7
-      '@babel/generator': 7.29.7
-      '@expo/config': 55.0.18(typescript@6.0.3)
-      '@expo/env': 2.1.2
+      '@babel/generator': 7.29.8
+      '@expo/config': 55.0.21(typescript@6.0.3)
+      '@expo/env': 2.1.3
       '@expo/json-file': 10.0.16
-      '@expo/metro': 55.1.1
-      '@expo/spawn-async': 1.7.2
+      '@expo/metro': 55.1.2
+      '@expo/spawn-async': 1.8.0
       browserslist: 4.28.2
       chalk: 4.1.2
       debug: 4.4.3
@@ -8907,44 +8997,44 @@ snapshots:
       postcss: 8.5.25
       resolve-from: 5.0.0
     optionalDependencies:
-      expo: 55.0.27(@babel/core@7.29.7)(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-router@55.0.14)(react-dom@19.2.6(react@19.2.6))(react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
+      expo: 55.0.30(10e8e71dd92768dd7f344108f3edbbe3)
     transitivePeerDependencies:
       - bufferutil
       - supports-color
       - typescript
       - utf-8-validate
 
-  '@expo/metro-runtime@55.0.10(@expo/dom-webview@55.0.5)(expo@55.0.27)(react-dom@19.2.6(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)':
+  '@expo/metro-runtime@55.0.10(@expo/dom-webview@55.0.5)(expo@55.0.30)(react-dom@19.2.8(react@19.2.8))(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@expo/log-box': 55.0.11(@expo/dom-webview@55.0.5)(expo@55.0.27)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
+      '@expo/log-box': 55.0.11(@expo/dom-webview@55.0.5)(expo@55.0.30)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
       anser: 1.4.10
-      expo: 55.0.27(@babel/core@7.29.7)(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-router@55.0.14)(react-dom@19.2.6(react@19.2.6))(react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
+      expo: 55.0.30(10e8e71dd92768dd7f344108f3edbbe3)
       pretty-format: 29.7.0
-      react: 19.2.6
-      react-native: 0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)
+      react: 19.2.8
+      react-native: 0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)
       stacktrace-parser: 0.1.11
       whatwg-fetch: 3.6.20
     optionalDependencies:
-      react-dom: 19.2.6(react@19.2.6)
+      react-dom: 19.2.8(react@19.2.8)
     transitivePeerDependencies:
       - '@expo/dom-webview'
 
-  '@expo/metro@55.1.1':
+  '@expo/metro@55.1.2':
     dependencies:
-      metro: 0.83.7
-      metro-babel-transformer: 0.83.7
-      metro-cache: 0.83.7
-      metro-cache-key: 0.83.7
-      metro-config: 0.83.7
-      metro-core: 0.83.7
-      metro-file-map: 0.83.7
-      metro-minify-terser: 0.83.7
-      metro-resolver: 0.83.7
-      metro-runtime: 0.83.7
-      metro-source-map: 0.83.7
-      metro-symbolicate: 0.83.7
-      metro-transform-plugins: 0.83.7
-      metro-transform-worker: 0.83.7
+      metro: 0.83.8
+      metro-babel-transformer: 0.83.8
+      metro-cache: 0.83.8
+      metro-cache-key: 0.83.8
+      metro-config: 0.83.8
+      metro-core: 0.83.8
+      metro-file-map: 0.83.8
+      metro-minify-terser: 0.83.8
+      metro-resolver: 0.83.8
+      metro-runtime: 0.83.8
+      metro-source-map: 0.83.8
+      metro-symbolicate: 0.83.8
+      metro-transform-plugins: 0.83.8
+      metro-transform-worker: 0.83.8
     transitivePeerDependencies:
       - bufferutil
       - supports-color
@@ -8979,35 +9069,18 @@ snapshots:
       base64-js: 1.5.1
       xmlbuilder: 15.1.1
 
-  '@expo/prebuild-config@55.0.17(expo@55.0.27)(typescript@6.0.3)':
+  '@expo/prebuild-config@55.0.22(expo@55.0.30)(typescript@6.0.3)':
     dependencies:
-      '@expo/config': 55.0.16(typescript@6.0.3)
-      '@expo/config-plugins': 55.0.8
-      '@expo/config-types': 55.0.5
-      '@expo/image-utils': 0.8.14(typescript@6.0.3)
-      '@expo/json-file': 10.0.14
-      '@react-native/normalize-colors': 0.83.6
-      debug: 4.4.3
-      expo: 55.0.27(@babel/core@7.29.7)(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-router@55.0.14)(react-dom@19.2.6(react@19.2.6))(react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
-      resolve-from: 5.0.0
-      semver: 7.7.4
-      xml2js: 0.6.0
-    transitivePeerDependencies:
-      - supports-color
-      - typescript
-
-  '@expo/prebuild-config@55.0.19(expo@55.0.27)(typescript@6.0.3)':
-    dependencies:
-      '@expo/config': 55.0.18(typescript@6.0.3)
-      '@expo/config-plugins': 55.0.10
-      '@expo/config-types': 55.0.5
-      '@expo/image-utils': 0.8.14(typescript@6.0.3)
+      '@expo/config': 55.0.21(typescript@6.0.3)
+      '@expo/config-plugins': 55.0.11
+      '@expo/config-types': 55.0.6
+      '@expo/image-utils': 0.8.17(typescript@6.0.3)
       '@expo/json-file': 10.2.0
-      '@react-native/normalize-colors': 0.83.6
+      '@react-native/normalize-colors': 0.83.10
       debug: 4.4.3
-      expo: 55.0.27(@babel/core@7.29.7)(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-router@55.0.14)(react-dom@19.2.6(react@19.2.6))(react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
+      expo: 55.0.30(10e8e71dd92768dd7f344108f3edbbe3)
       resolve-from: 5.0.0
-      semver: 7.8.4
+      semver: 7.8.5
       xml2js: 0.6.0
     transitivePeerDependencies:
       - supports-color
@@ -9023,32 +9096,32 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@expo/require-utils@55.0.5(typescript@6.0.3)':
+  '@expo/require-utils@55.0.8(typescript@6.0.3)':
     dependencies:
-      '@babel/code-frame': 7.29.0
+      '@babel/code-frame': 7.29.7
       '@babel/core': 7.29.7
-      '@babel/plugin-transform-modules-commonjs': 7.28.6(@babel/core@7.29.7)
+      '@babel/plugin-transform-modules-commonjs': 7.29.7(@babel/core@7.29.7)
     optionalDependencies:
       typescript: 6.0.3
     transitivePeerDependencies:
       - supports-color
 
-  '@expo/router-server@55.0.18(@expo/metro-runtime@55.0.10)(expo-constants@55.0.16)(expo-font@55.0.8)(expo-router@55.0.14)(expo-server@55.0.11)(expo@55.0.27)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
+  '@expo/router-server@55.0.19(@expo/metro-runtime@55.0.10)(expo-constants@55.0.17)(expo-font@55.0.8)(expo-router@55.0.18)(expo-server@55.0.12)(expo@55.0.30)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       debug: 4.4.3
-      expo: 55.0.27(@babel/core@7.29.7)(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-router@55.0.14)(react-dom@19.2.6(react@19.2.6))(react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
-      expo-constants: 55.0.16(expo@55.0.27)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))
-      expo-font: 55.0.8(expo@55.0.27)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
-      expo-server: 55.0.11
-      react: 19.2.6
+      expo: 55.0.30(10e8e71dd92768dd7f344108f3edbbe3)
+      expo-constants: 55.0.17(expo@55.0.30)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))
+      expo-font: 55.0.8(expo@55.0.30)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
+      expo-server: 55.0.12
+      react: 19.2.8
     optionalDependencies:
-      '@expo/metro-runtime': 55.0.10(@expo/dom-webview@55.0.5)(expo@55.0.27)(react-dom@19.2.6(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
-      expo-router: 55.0.14(50649306d987d6f4e510b7a8e94ea6ba)
-      react-dom: 19.2.6(react@19.2.6)
+      '@expo/metro-runtime': 55.0.10(@expo/dom-webview@55.0.5)(expo@55.0.30)(react-dom@19.2.8(react@19.2.8))(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
+      expo-router: 55.0.18(2f99795f9796def5cdb1516a493dc117)
+      react-dom: 19.2.8(react@19.2.8)
     transitivePeerDependencies:
       - supports-color
 
-  '@expo/schema-utils@55.0.4': {}
+  '@expo/schema-utils@55.0.5': {}
 
   '@expo/sdk-runtime-versions@1.0.0': {}
 
@@ -9062,11 +9135,11 @@ snapshots:
 
   '@expo/sudo-prompt@9.3.2': {}
 
-  '@expo/vector-icons@15.1.1(expo-font@55.0.8)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)':
+  '@expo/vector-icons@15.1.1(expo-font@55.0.8)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)':
     dependencies:
-      expo-font: 55.0.8(expo@55.0.27)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
-      react: 19.2.6
-      react-native: 0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)
+      expo-font: 55.0.8(expo@55.0.30)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
+      react: 19.2.8
+      react-native: 0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)
 
   '@expo/ws-tunnel@1.0.6': {}
 
@@ -9310,7 +9383,7 @@ snapshots:
       '@jridgewell/resolve-uri': 3.1.2
       '@jridgewell/sourcemap-codec': 1.5.5
 
-  '@mermaid-js/parser@1.2.0':
+  '@mermaid-js/parser@1.2.1':
     dependencies:
       '@chevrotain/types': 11.1.2
 
@@ -9326,328 +9399,336 @@ snapshots:
 
   '@noble/hashes@1.8.0': {}
 
-  '@orca/expo-two-way-audio@file:packages/expo-two-way-audio(expo@55.0.27)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)':
+  '@orca/expo-two-way-audio@file:packages/expo-two-way-audio(expo@55.0.30)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)':
     dependencies:
-      expo: 55.0.27(@babel/core@7.29.7)(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-router@55.0.14)(react-dom@19.2.6(react@19.2.6))(react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
-      react: 19.2.6
-      react-native: 0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)
+      expo: 55.0.30(10e8e71dd92768dd7f344108f3edbbe3)
+      react: 19.2.8
+      react-native: 0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)
 
   '@oxc-project/types@0.137.0': {}
 
-  '@oxfmt/binding-android-arm-eabi@0.52.0':
+  '@oxfmt/binding-android-arm-eabi@0.65.0':
     optional: true
 
-  '@oxfmt/binding-android-arm64@0.52.0':
+  '@oxfmt/binding-android-arm64@0.65.0':
     optional: true
 
-  '@oxfmt/binding-darwin-arm64@0.52.0':
+  '@oxfmt/binding-darwin-arm64@0.65.0':
     optional: true
 
-  '@oxfmt/binding-darwin-x64@0.52.0':
+  '@oxfmt/binding-darwin-x64@0.65.0':
     optional: true
 
-  '@oxfmt/binding-freebsd-x64@0.52.0':
+  '@oxfmt/binding-freebsd-x64@0.65.0':
     optional: true
 
-  '@oxfmt/binding-linux-arm-gnueabihf@0.52.0':
+  '@oxfmt/binding-linux-arm-gnueabihf@0.65.0':
     optional: true
 
-  '@oxfmt/binding-linux-arm-musleabihf@0.52.0':
+  '@oxfmt/binding-linux-arm-musleabihf@0.65.0':
     optional: true
 
-  '@oxfmt/binding-linux-arm64-gnu@0.52.0':
+  '@oxfmt/binding-linux-arm64-gnu@0.65.0':
     optional: true
 
-  '@oxfmt/binding-linux-arm64-musl@0.52.0':
+  '@oxfmt/binding-linux-arm64-musl@0.65.0':
     optional: true
 
-  '@oxfmt/binding-linux-ppc64-gnu@0.52.0':
+  '@oxfmt/binding-linux-ppc64-gnu@0.65.0':
     optional: true
 
-  '@oxfmt/binding-linux-riscv64-gnu@0.52.0':
+  '@oxfmt/binding-linux-riscv64-gnu@0.65.0':
     optional: true
 
-  '@oxfmt/binding-linux-riscv64-musl@0.52.0':
+  '@oxfmt/binding-linux-riscv64-musl@0.65.0':
     optional: true
 
-  '@oxfmt/binding-linux-s390x-gnu@0.52.0':
+  '@oxfmt/binding-linux-s390x-gnu@0.65.0':
     optional: true
 
-  '@oxfmt/binding-linux-x64-gnu@0.52.0':
+  '@oxfmt/binding-linux-x64-gnu@0.65.0':
     optional: true
 
-  '@oxfmt/binding-linux-x64-musl@0.52.0':
+  '@oxfmt/binding-linux-x64-musl@0.65.0':
     optional: true
 
-  '@oxfmt/binding-openharmony-arm64@0.52.0':
+  '@oxfmt/binding-openharmony-arm64@0.65.0':
     optional: true
 
-  '@oxfmt/binding-win32-arm64-msvc@0.52.0':
+  '@oxfmt/binding-win32-arm64-msvc@0.65.0':
     optional: true
 
-  '@oxfmt/binding-win32-ia32-msvc@0.52.0':
+  '@oxfmt/binding-win32-ia32-msvc@0.65.0':
     optional: true
 
-  '@oxfmt/binding-win32-x64-msvc@0.52.0':
+  '@oxfmt/binding-win32-x64-msvc@0.65.0':
     optional: true
 
-  '@oxlint/binding-android-arm-eabi@1.71.0':
+  '@oxlint/binding-android-arm-eabi@1.80.0':
     optional: true
 
-  '@oxlint/binding-android-arm64@1.71.0':
+  '@oxlint/binding-android-arm64@1.80.0':
     optional: true
 
-  '@oxlint/binding-darwin-arm64@1.71.0':
+  '@oxlint/binding-darwin-arm64@1.80.0':
     optional: true
 
-  '@oxlint/binding-darwin-x64@1.71.0':
+  '@oxlint/binding-darwin-x64@1.80.0':
     optional: true
 
-  '@oxlint/binding-freebsd-x64@1.71.0':
+  '@oxlint/binding-freebsd-x64@1.80.0':
     optional: true
 
-  '@oxlint/binding-linux-arm-gnueabihf@1.71.0':
+  '@oxlint/binding-linux-arm-gnueabihf@1.80.0':
     optional: true
 
-  '@oxlint/binding-linux-arm-musleabihf@1.71.0':
+  '@oxlint/binding-linux-arm-musleabihf@1.80.0':
     optional: true
 
-  '@oxlint/binding-linux-arm64-gnu@1.71.0':
+  '@oxlint/binding-linux-arm64-gnu@1.80.0':
     optional: true
 
-  '@oxlint/binding-linux-arm64-musl@1.71.0':
+  '@oxlint/binding-linux-arm64-musl@1.80.0':
     optional: true
 
-  '@oxlint/binding-linux-ppc64-gnu@1.71.0':
+  '@oxlint/binding-linux-ppc64-gnu@1.80.0':
     optional: true
 
-  '@oxlint/binding-linux-riscv64-gnu@1.71.0':
+  '@oxlint/binding-linux-riscv64-gnu@1.80.0':
     optional: true
 
-  '@oxlint/binding-linux-riscv64-musl@1.71.0':
+  '@oxlint/binding-linux-riscv64-musl@1.80.0':
     optional: true
 
-  '@oxlint/binding-linux-s390x-gnu@1.71.0':
+  '@oxlint/binding-linux-s390x-gnu@1.80.0':
     optional: true
 
-  '@oxlint/binding-linux-x64-gnu@1.71.0':
+  '@oxlint/binding-linux-x64-gnu@1.80.0':
     optional: true
 
-  '@oxlint/binding-linux-x64-musl@1.71.0':
+  '@oxlint/binding-linux-x64-musl@1.80.0':
     optional: true
 
-  '@oxlint/binding-openharmony-arm64@1.71.0':
+  '@oxlint/binding-openharmony-arm64@1.80.0':
     optional: true
 
-  '@oxlint/binding-win32-arm64-msvc@1.71.0':
+  '@oxlint/binding-win32-arm64-msvc@1.80.0':
     optional: true
 
-  '@oxlint/binding-win32-ia32-msvc@1.71.0':
+  '@oxlint/binding-win32-ia32-msvc@1.80.0':
     optional: true
 
-  '@oxlint/binding-win32-x64-msvc@1.71.0':
+  '@oxlint/binding-win32-x64-msvc@1.80.0':
     optional: true
 
   '@pkgr/core@0.2.9': {}
 
   '@radix-ui/primitive@1.1.3': {}
 
-  '@radix-ui/react-collection@1.1.7(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
+  '@radix-ui/react-collection@1.1.7(@types/react@19.2.14)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.6)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.14)(react@19.2.6)
-      '@radix-ui/react-primitive': 2.1.3(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
-      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.14)(react@19.2.6)
-      react: 19.2.6
-      react-dom: 19.2.6(react@19.2.6)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.8)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.14)(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.3(@types/react@19.2.14)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.14)(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.14
 
-  '@radix-ui/react-compose-refs@1.1.2(@types/react@19.2.14)(react@19.2.6)':
+  '@radix-ui/react-compose-refs@1.1.2(@types/react@19.2.14)(react@19.2.8)':
     dependencies:
-      react: 19.2.6
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.14
 
-  '@radix-ui/react-context@1.1.2(@types/react@19.2.14)(react@19.2.6)':
+  '@radix-ui/react-context@1.1.2(@types/react@19.2.14)(react@19.2.8)':
     dependencies:
-      react: 19.2.6
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.14
 
-  '@radix-ui/react-dialog@1.1.15(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
+  '@radix-ui/react-dialog@1.1.15(@types/react@19.2.14)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.6)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.14)(react@19.2.6)
-      '@radix-ui/react-dismissable-layer': 1.1.11(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
-      '@radix-ui/react-focus-guards': 1.1.3(@types/react@19.2.14)(react@19.2.6)
-      '@radix-ui/react-focus-scope': 1.1.7(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
-      '@radix-ui/react-id': 1.1.1(@types/react@19.2.14)(react@19.2.6)
-      '@radix-ui/react-portal': 1.1.9(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
-      '@radix-ui/react-presence': 1.1.5(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
-      '@radix-ui/react-primitive': 2.1.3(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
-      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.14)(react@19.2.6)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.14)(react@19.2.6)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.8)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.14)(react@19.2.8)
+      '@radix-ui/react-dismissable-layer': 1.1.11(@types/react@19.2.14)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-focus-guards': 1.1.3(@types/react@19.2.14)(react@19.2.8)
+      '@radix-ui/react-focus-scope': 1.1.7(@types/react@19.2.14)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-id': 1.1.1(@types/react@19.2.14)(react@19.2.8)
+      '@radix-ui/react-portal': 1.1.9(@types/react@19.2.14)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-presence': 1.1.5(@types/react@19.2.14)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.3(@types/react@19.2.14)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.14)(react@19.2.8)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.14)(react@19.2.8)
       aria-hidden: 1.2.6
-      react: 19.2.6
-      react-dom: 19.2.6(react@19.2.6)
-      react-remove-scroll: 2.7.2(@types/react@19.2.14)(react@19.2.6)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
+      react-remove-scroll: 2.7.2(@types/react@19.2.14)(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.14
 
-  '@radix-ui/react-direction@1.1.1(@types/react@19.2.14)(react@19.2.6)':
+  '@radix-ui/react-direction@1.1.1(@types/react@19.2.14)(react@19.2.8)':
     dependencies:
-      react: 19.2.6
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.14
 
-  '@radix-ui/react-dismissable-layer@1.1.11(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
+  '@radix-ui/react-dismissable-layer@1.1.11(@types/react@19.2.14)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.6)
-      '@radix-ui/react-primitive': 2.1.3(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.14)(react@19.2.6)
-      '@radix-ui/react-use-escape-keydown': 1.1.1(@types/react@19.2.14)(react@19.2.6)
-      react: 19.2.6
-      react-dom: 19.2.6(react@19.2.6)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.3(@types/react@19.2.14)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.14)(react@19.2.8)
+      '@radix-ui/react-use-escape-keydown': 1.1.1(@types/react@19.2.14)(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.14
 
-  '@radix-ui/react-focus-guards@1.1.3(@types/react@19.2.14)(react@19.2.6)':
+  '@radix-ui/react-focus-guards@1.1.3(@types/react@19.2.14)(react@19.2.8)':
     dependencies:
-      react: 19.2.6
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.14
 
-  '@radix-ui/react-focus-scope@1.1.7(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
+  '@radix-ui/react-focus-scope@1.1.7(@types/react@19.2.14)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.6)
-      '@radix-ui/react-primitive': 2.1.3(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.14)(react@19.2.6)
-      react: 19.2.6
-      react-dom: 19.2.6(react@19.2.6)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.3(@types/react@19.2.14)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.14)(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.14
 
-  '@radix-ui/react-id@1.1.1(@types/react@19.2.14)(react@19.2.6)':
+  '@radix-ui/react-id@1.1.1(@types/react@19.2.14)(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.6)
-      react: 19.2.6
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.8)
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.14
 
-  '@radix-ui/react-portal@1.1.9(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
+  '@radix-ui/react-portal@1.1.9(@types/react@19.2.14)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-primitive': 2.1.3(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.6)
-      react: 19.2.6
-      react-dom: 19.2.6(react@19.2.6)
+      '@radix-ui/react-primitive': 2.1.3(@types/react@19.2.14)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.14
 
-  '@radix-ui/react-presence@1.1.5(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
+  '@radix-ui/react-presence@1.1.5(@types/react@19.2.14)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.6)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.6)
-      react: 19.2.6
-      react-dom: 19.2.6(react@19.2.6)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.8)
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.14
 
-  '@radix-ui/react-primitive@2.1.3(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
+  '@radix-ui/react-primitive@2.1.3(@types/react@19.2.14)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.14)(react@19.2.6)
-      react: 19.2.6
-      react-dom: 19.2.6(react@19.2.6)
+      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.14)(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.14
 
-  '@radix-ui/react-roving-focus@1.1.11(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
+  '@radix-ui/react-roving-focus@1.1.11(@types/react@19.2.14)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-collection': 1.1.7(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.6)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.14)(react@19.2.6)
-      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.14)(react@19.2.6)
-      '@radix-ui/react-id': 1.1.1(@types/react@19.2.14)(react@19.2.6)
-      '@radix-ui/react-primitive': 2.1.3(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.14)(react@19.2.6)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.14)(react@19.2.6)
-      react: 19.2.6
-      react-dom: 19.2.6(react@19.2.6)
+      '@radix-ui/react-collection': 1.1.7(@types/react@19.2.14)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.8)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.14)(react@19.2.8)
+      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.14)(react@19.2.8)
+      '@radix-ui/react-id': 1.1.1(@types/react@19.2.14)(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.3(@types/react@19.2.14)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.14)(react@19.2.8)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.14)(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.14
 
-  '@radix-ui/react-slot@1.2.3(@types/react@19.2.14)(react@19.2.6)':
+  '@radix-ui/react-slot@1.2.3(@types/react@19.2.14)(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.6)
-      react: 19.2.6
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.8)
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.14
 
-  '@radix-ui/react-slot@1.2.4(@types/react@19.2.14)(react@19.2.6)':
+  '@radix-ui/react-slot@1.2.4(@types/react@19.2.14)(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.6)
-      react: 19.2.6
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.8)
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.14
 
-  '@radix-ui/react-tabs@1.1.13(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
+  '@radix-ui/react-tabs@1.1.13(@types/react@19.2.14)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.14)(react@19.2.6)
-      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.14)(react@19.2.6)
-      '@radix-ui/react-id': 1.1.1(@types/react@19.2.14)(react@19.2.6)
-      '@radix-ui/react-presence': 1.1.5(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
-      '@radix-ui/react-primitive': 2.1.3(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
-      '@radix-ui/react-roving-focus': 1.1.11(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.14)(react@19.2.6)
-      react: 19.2.6
-      react-dom: 19.2.6(react@19.2.6)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.14)(react@19.2.8)
+      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.14)(react@19.2.8)
+      '@radix-ui/react-id': 1.1.1(@types/react@19.2.14)(react@19.2.8)
+      '@radix-ui/react-presence': 1.1.5(@types/react@19.2.14)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.3(@types/react@19.2.14)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-roving-focus': 1.1.11(@types/react@19.2.14)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.14)(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.14
 
-  '@radix-ui/react-use-callback-ref@1.1.1(@types/react@19.2.14)(react@19.2.6)':
+  '@radix-ui/react-use-callback-ref@1.1.1(@types/react@19.2.14)(react@19.2.8)':
     dependencies:
-      react: 19.2.6
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.14
 
-  '@radix-ui/react-use-controllable-state@1.2.2(@types/react@19.2.14)(react@19.2.6)':
+  '@radix-ui/react-use-controllable-state@1.2.2(@types/react@19.2.14)(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-use-effect-event': 0.0.2(@types/react@19.2.14)(react@19.2.6)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.6)
-      react: 19.2.6
+      '@radix-ui/react-use-effect-event': 0.0.2(@types/react@19.2.14)(react@19.2.8)
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.8)
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.14
 
-  '@radix-ui/react-use-effect-event@0.0.2(@types/react@19.2.14)(react@19.2.6)':
+  '@radix-ui/react-use-effect-event@0.0.2(@types/react@19.2.14)(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.6)
-      react: 19.2.6
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.8)
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.14
 
-  '@radix-ui/react-use-escape-keydown@1.1.1(@types/react@19.2.14)(react@19.2.6)':
+  '@radix-ui/react-use-escape-keydown@1.1.1(@types/react@19.2.14)(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.14)(react@19.2.6)
-      react: 19.2.6
+      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.14)(react@19.2.8)
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.14
 
-  '@radix-ui/react-use-layout-effect@1.1.1(@types/react@19.2.14)(react@19.2.6)':
+  '@radix-ui/react-use-layout-effect@1.1.1(@types/react@19.2.14)(react@19.2.8)':
     dependencies:
-      react: 19.2.6
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.14
 
-  '@react-native-async-storage/async-storage@2.2.0(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))':
+  '@react-native-async-storage/async-storage@2.2.0(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))':
     dependencies:
       merge-options: 3.0.4
-      react-native: 0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)
+      react-native: 0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)
 
-  '@react-native/assets-registry@0.83.9': {}
+  '@react-native/assets-registry@0.83.10': {}
+
+  '@react-native/babel-plugin-codegen@0.83.10(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/traverse': 7.29.8
+      '@react-native/codegen': 0.83.10(@babel/core@7.29.7)
+    transitivePeerDependencies:
+      - '@babel/core'
+      - supports-color
 
   '@react-native/babel-plugin-codegen@0.83.6(@babel/core@7.29.7)':
     dependencies:
@@ -9665,6 +9746,56 @@ snapshots:
       - '@babel/core'
       - supports-color
 
+  '@react-native/babel-preset@0.83.10(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/plugin-proposal-export-default-from': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.29.7)
+      '@babel/plugin-syntax-export-default-from': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.29.7)
+      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.29.7)
+      '@babel/plugin-transform-arrow-functions': 7.27.1(@babel/core@7.29.7)
+      '@babel/plugin-transform-async-generator-functions': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-async-to-generator': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-block-scoping': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-class-properties': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-classes': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-computed-properties': 7.28.6(@babel/core@7.29.7)
+      '@babel/plugin-transform-destructuring': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-flow-strip-types': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-for-of': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-function-name': 7.27.1(@babel/core@7.29.7)
+      '@babel/plugin-transform-literals': 7.27.1(@babel/core@7.29.7)
+      '@babel/plugin-transform-logical-assignment-operators': 7.28.6(@babel/core@7.29.7)
+      '@babel/plugin-transform-modules-commonjs': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-named-capturing-groups-regex': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-nullish-coalescing-operator': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-numeric-separator': 7.28.6(@babel/core@7.29.7)
+      '@babel/plugin-transform-object-rest-spread': 7.28.6(@babel/core@7.29.7)
+      '@babel/plugin-transform-optional-catch-binding': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-optional-chaining': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-parameters': 7.27.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-private-methods': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-private-property-in-object': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-react-display-name': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-react-jsx': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-react-jsx-self': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-react-jsx-source': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-regenerator': 7.29.8(@babel/core@7.29.7)
+      '@babel/plugin-transform-runtime': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-shorthand-properties': 7.27.1(@babel/core@7.29.7)
+      '@babel/plugin-transform-spread': 7.28.6(@babel/core@7.29.7)
+      '@babel/plugin-transform-sticky-regex': 7.27.1(@babel/core@7.29.7)
+      '@babel/plugin-transform-typescript': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-unicode-regex': 7.29.7(@babel/core@7.29.7)
+      '@babel/template': 7.29.7
+      '@react-native/babel-plugin-codegen': 0.83.10(@babel/core@7.29.7)
+      babel-plugin-syntax-hermes-parser: 0.32.0
+      babel-plugin-transform-flow-enums: 0.0.2(@babel/core@7.29.7)
+      react-refresh: 0.14.2
+    transitivePeerDependencies:
+      - supports-color
+
   '@react-native/babel-preset@0.83.6(@babel/core@7.29.7)':
     dependencies:
       '@babel/core': 7.29.7
@@ -9753,20 +9884,20 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@react-native/codegen@0.83.6(@babel/core@7.29.7)':
+  '@react-native/codegen@0.83.10(@babel/core@7.29.7)':
     dependencies:
       '@babel/core': 7.29.7
-      '@babel/parser': 7.29.7
+      '@babel/parser': 7.29.8
       glob: 7.2.3
       hermes-parser: 0.32.0
       invariant: 2.2.4
       nullthrows: 1.1.1
-      yargs: 17.7.2
+      yargs: 17.7.3
 
-  '@react-native/codegen@0.83.9(@babel/core@7.29.7)':
+  '@react-native/codegen@0.83.6(@babel/core@7.29.7)':
     dependencies:
       '@babel/core': 7.29.7
-      '@babel/parser': 7.29.3
+      '@babel/parser': 7.29.7
       glob: 7.2.3
       hermes-parser: 0.32.0
       invariant: 2.2.4
@@ -9783,15 +9914,15 @@ snapshots:
       tinyglobby: 0.2.17
       yargs: 17.7.3
 
-  '@react-native/community-cli-plugin@0.83.9(@react-native/metro-config@0.85.2(@babel/core@7.29.7))':
+  '@react-native/community-cli-plugin@0.83.10(@react-native/metro-config@0.85.2(@babel/core@7.29.7))':
     dependencies:
-      '@react-native/dev-middleware': 0.83.9
+      '@react-native/dev-middleware': 0.83.10
       debug: 4.4.3
       invariant: 2.2.4
       metro: 0.83.7
       metro-config: 0.83.7
       metro-core: 0.83.7
-      semver: 7.7.4
+      semver: 7.8.5
     optionalDependencies:
       '@react-native/metro-config': 0.85.2(@babel/core@7.29.7)
     transitivePeerDependencies:
@@ -9799,25 +9930,18 @@ snapshots:
       - supports-color
       - utf-8-validate
 
-  '@react-native/debugger-frontend@0.83.6': {}
+  '@react-native/debugger-frontend@0.83.10': {}
 
-  '@react-native/debugger-frontend@0.83.9': {}
-
-  '@react-native/debugger-shell@0.83.6':
+  '@react-native/debugger-shell@0.83.10':
     dependencies:
       cross-spawn: 7.0.6
       fb-dotslash: 0.5.8
 
-  '@react-native/debugger-shell@0.83.9':
-    dependencies:
-      cross-spawn: 7.0.6
-      fb-dotslash: 0.5.8
-
-  '@react-native/dev-middleware@0.83.6':
+  '@react-native/dev-middleware@0.83.10':
     dependencies:
       '@isaacs/ttlcache': 1.4.1
-      '@react-native/debugger-frontend': 0.83.6
-      '@react-native/debugger-shell': 0.83.6
+      '@react-native/debugger-frontend': 0.83.10
+      '@react-native/debugger-shell': 0.83.10
       chrome-launcher: 0.15.2
       chromium-edge-launcher: 0.2.0
       connect: 3.7.0
@@ -9826,34 +9950,15 @@ snapshots:
       nullthrows: 1.1.1
       open: 7.4.2
       serve-static: 1.16.3
-      ws: 7.5.11
+      ws: 7.5.13
     transitivePeerDependencies:
       - bufferutil
       - supports-color
       - utf-8-validate
 
-  '@react-native/dev-middleware@0.83.9':
-    dependencies:
-      '@isaacs/ttlcache': 1.4.1
-      '@react-native/debugger-frontend': 0.83.9
-      '@react-native/debugger-shell': 0.83.9
-      chrome-launcher: 0.15.2
-      chromium-edge-launcher: 0.2.0
-      connect: 3.7.0
-      debug: 4.4.3
-      invariant: 2.2.4
-      nullthrows: 1.1.1
-      open: 7.4.2
-      serve-static: 1.16.3
-      ws: 7.5.11
-    transitivePeerDependencies:
-      - bufferutil
-      - supports-color
-      - utf-8-validate
+  '@react-native/gradle-plugin@0.83.10': {}
 
-  '@react-native/gradle-plugin@0.83.9': {}
-
-  '@react-native/js-polyfills@0.83.9': {}
+  '@react-native/js-polyfills@0.83.10': {}
 
   '@react-native/js-polyfills@0.85.2': {}
 
@@ -9880,77 +9985,75 @@ snapshots:
 
   '@react-native/normalize-colors@0.74.89': {}
 
-  '@react-native/normalize-colors@0.83.6': {}
+  '@react-native/normalize-colors@0.83.10': {}
 
-  '@react-native/normalize-colors@0.83.9': {}
-
-  '@react-native/virtualized-lists@0.83.9(@types/react@19.2.14)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)':
+  '@react-native/virtualized-lists@0.83.10(@types/react@19.2.14)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)':
     dependencies:
       invariant: 2.2.4
       nullthrows: 1.1.1
-      react: 19.2.6
-      react-native: 0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)
+      react: 19.2.8
+      react-native: 0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.14
 
-  '@react-navigation/bottom-tabs@7.15.11(@react-navigation/native@7.2.2(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-safe-area-context@5.7.0(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-screens@4.24.0(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)':
-    dependencies:
-      '@react-navigation/elements': 2.9.15(@react-navigation/native@7.2.2(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-safe-area-context@5.7.0(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
-      '@react-navigation/native': 7.2.2(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
+  ? '@react-navigation/bottom-tabs@7.15.11(@react-navigation/native@7.2.2(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8))(react-native-safe-area-context@5.7.0(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8))(react-native-screens@4.24.0(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8))(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)'
+  : dependencies:
+      '@react-navigation/elements': 2.9.15(@react-navigation/native@7.2.2(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8))(react-native-safe-area-context@5.7.0(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8))(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
+      '@react-navigation/native': 7.2.2(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
       color: 4.2.3
-      react: 19.2.6
-      react-native: 0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)
-      react-native-safe-area-context: 5.7.0(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
-      react-native-screens: 4.24.0(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
+      react: 19.2.8
+      react-native: 0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)
+      react-native-safe-area-context: 5.7.0(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
+      react-native-screens: 4.24.0(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
       sf-symbols-typescript: 2.2.0
     transitivePeerDependencies:
       - '@react-native-masked-view/masked-view'
 
-  '@react-navigation/core@7.17.2(react@19.2.6)':
+  '@react-navigation/core@7.17.2(react@19.2.8)':
     dependencies:
       '@react-navigation/routers': 7.5.3
       escape-string-regexp: 4.0.0
       fast-deep-equal: 3.1.3
       nanoid: 3.3.18
       query-string: 7.1.3
-      react: 19.2.6
+      react: 19.2.8
       react-is: 19.2.6
-      use-latest-callback: 0.2.6(react@19.2.6)
-      use-sync-external-store: 1.6.0(react@19.2.6)
+      use-latest-callback: 0.2.6(react@19.2.8)
+      use-sync-external-store: 1.6.0(react@19.2.8)
 
-  '@react-navigation/elements@2.9.15(@react-navigation/native@7.2.2(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-safe-area-context@5.7.0(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)':
+  '@react-navigation/elements@2.9.15(@react-navigation/native@7.2.2(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8))(react-native-safe-area-context@5.7.0(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8))(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@react-navigation/native': 7.2.2(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
+      '@react-navigation/native': 7.2.2(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
       color: 4.2.3
-      react: 19.2.6
-      react-native: 0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)
-      react-native-safe-area-context: 5.7.0(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
-      use-latest-callback: 0.2.6(react@19.2.6)
-      use-sync-external-store: 1.6.0(react@19.2.6)
+      react: 19.2.8
+      react-native: 0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)
+      react-native-safe-area-context: 5.7.0(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
+      use-latest-callback: 0.2.6(react@19.2.8)
+      use-sync-external-store: 1.6.0(react@19.2.8)
 
-  '@react-navigation/native-stack@7.14.12(@react-navigation/native@7.2.2(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-safe-area-context@5.7.0(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-screens@4.24.0(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)':
-    dependencies:
-      '@react-navigation/elements': 2.9.15(@react-navigation/native@7.2.2(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-safe-area-context@5.7.0(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
-      '@react-navigation/native': 7.2.2(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
+  ? '@react-navigation/native-stack@7.14.12(@react-navigation/native@7.2.2(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8))(react-native-safe-area-context@5.7.0(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8))(react-native-screens@4.24.0(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8))(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)'
+  : dependencies:
+      '@react-navigation/elements': 2.9.15(@react-navigation/native@7.2.2(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8))(react-native-safe-area-context@5.7.0(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8))(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
+      '@react-navigation/native': 7.2.2(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
       color: 4.2.3
-      react: 19.2.6
-      react-native: 0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)
-      react-native-safe-area-context: 5.7.0(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
-      react-native-screens: 4.24.0(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
+      react: 19.2.8
+      react-native: 0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)
+      react-native-safe-area-context: 5.7.0(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
+      react-native-screens: 4.24.0(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
       sf-symbols-typescript: 2.2.0
       warn-once: 0.1.1
     transitivePeerDependencies:
       - '@react-native-masked-view/masked-view'
 
-  '@react-navigation/native@7.2.2(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)':
+  '@react-navigation/native@7.2.2(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@react-navigation/core': 7.17.2(react@19.2.6)
+      '@react-navigation/core': 7.17.2(react@19.2.8)
       escape-string-regexp: 4.0.0
       fast-deep-equal: 3.1.3
       nanoid: 3.3.18
-      react: 19.2.6
-      react-native: 0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)
-      use-latest-callback: 0.2.6(react@19.2.6)
+      react: 19.2.8
+      react-native: 0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)
+      use-latest-callback: 0.2.6(react@19.2.8)
 
   '@react-navigation/routers@7.5.3':
     dependencies:
@@ -10023,14 +10126,14 @@ snapshots:
 
   '@standard-schema/spec@1.1.0': {}
 
-  '@testing-library/react-native@13.3.3(jest@29.7.0(@types/node@26.1.2))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react-test-renderer@19.2.6(react@19.2.6))(react@19.2.6)':
+  '@testing-library/react-native@13.3.3(jest@29.7.0(@types/node@26.1.2))(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react-test-renderer@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       jest-matcher-utils: 30.3.0
       picocolors: 1.1.1
       pretty-format: 30.3.0
-      react: 19.2.6
-      react-native: 0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)
-      react-test-renderer: 19.2.6(react@19.2.6)
+      react: 19.2.8
+      react-native: 0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)
+      react-test-renderer: 19.2.8(react@19.2.8)
       redent: 3.0.0
     optionalDependencies:
       jest: 29.7.0(@types/node@26.1.2)
@@ -10242,9 +10345,9 @@ snapshots:
     dependencies:
       undici-types: 8.3.0
 
-  '@types/react-native@0.73.0(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)':
+  '@types/react-native@0.73.0(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)':
     dependencies:
-      react-native: 0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)
+      react-native: 0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)
     transitivePeerDependencies:
       - '@babel/core'
       - '@react-native-community/cli'
@@ -10284,7 +10387,7 @@ snapshots:
     dependencies:
       '@types/yargs-parser': 21.0.3
 
-  '@typescript-eslint/eslint-plugin@8.59.2(@typescript-eslint/parser@8.59.2(eslint@9.39.4)(typescript@6.0.3))(eslint@9.39.4)(typescript@5.9.3)':
+  '@typescript-eslint/eslint-plugin@8.59.2(@typescript-eslint/parser@8.59.2(eslint@9.39.4)(typescript@5.9.3))(eslint@9.39.4)(typescript@5.9.3)':
     dependencies:
       '@eslint-community/regexpp': 4.12.2
       '@typescript-eslint/parser': 8.59.2(eslint@9.39.4)(typescript@6.0.3)
@@ -10304,7 +10407,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/scope-manager': 8.59.2
       '@typescript-eslint/types': 8.59.2
-      '@typescript-eslint/typescript-estree': 8.59.2(typescript@6.0.3)
+      '@typescript-eslint/typescript-estree': 8.59.2(typescript@5.9.3)
       '@typescript-eslint/visitor-keys': 8.59.2
       debug: 4.4.3
       eslint: 9.39.4
@@ -10321,15 +10424,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/project-service@8.59.2(typescript@6.0.3)':
-    dependencies:
-      '@typescript-eslint/tsconfig-utils': 8.59.2(typescript@6.0.3)
-      '@typescript-eslint/types': 8.59.2
-      debug: 4.4.3
-      typescript: 6.0.3
-    transitivePeerDependencies:
-      - supports-color
-
   '@typescript-eslint/scope-manager@8.59.2':
     dependencies:
       '@typescript-eslint/types': 8.59.2
@@ -10339,10 +10433,6 @@ snapshots:
     dependencies:
       typescript: 5.9.3
 
-  '@typescript-eslint/tsconfig-utils@8.59.2(typescript@6.0.3)':
-    dependencies:
-      typescript: 6.0.3
-
   '@typescript-eslint/type-utils@8.59.2(eslint@9.39.4)(typescript@5.9.3)':
     dependencies:
       '@typescript-eslint/types': 8.59.2
@@ -10365,28 +10455,13 @@ snapshots:
       '@typescript-eslint/visitor-keys': 8.59.2
       debug: 4.4.3
       minimatch: 10.2.5
-      semver: 7.7.4
+      semver: 7.8.5
       tinyglobby: 0.2.17
       ts-api-utils: 2.5.0(typescript@5.9.3)
       typescript: 5.9.3
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/typescript-estree@8.59.2(typescript@6.0.3)':
-    dependencies:
-      '@typescript-eslint/project-service': 8.59.2(typescript@6.0.3)
-      '@typescript-eslint/tsconfig-utils': 8.59.2(typescript@6.0.3)
-      '@typescript-eslint/types': 8.59.2
-      '@typescript-eslint/visitor-keys': 8.59.2
-      debug: 4.4.3
-      minimatch: 10.2.5
-      semver: 7.7.4
-      tinyglobby: 0.2.17
-      ts-api-utils: 2.5.0(typescript@6.0.3)
-      typescript: 6.0.3
-    transitivePeerDependencies:
-      - supports-color
-
   '@typescript-eslint/utils@8.59.2(eslint@9.39.4)(typescript@5.9.3)':
     dependencies:
       '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.4)
@@ -10403,6 +10478,37 @@ snapshots:
       '@typescript-eslint/types': 8.59.2
       eslint-visitor-keys: 5.0.1
 
+  '@typescript/native-preview-darwin-arm64@7.0.0-dev.20260707.2':
+    optional: true
+
+  '@typescript/native-preview-darwin-x64@7.0.0-dev.20260707.2':
+    optional: true
+
+  '@typescript/native-preview-linux-arm64@7.0.0-dev.20260707.2':
+    optional: true
+
+  '@typescript/native-preview-linux-arm@7.0.0-dev.20260707.2':
+    optional: true
+
+  '@typescript/native-preview-linux-x64@7.0.0-dev.20260707.2':
+    optional: true
+
+  '@typescript/native-preview-win32-arm64@7.0.0-dev.20260707.2':
+    optional: true
+
+  '@typescript/native-preview-win32-x64@7.0.0-dev.20260707.2':
+    optional: true
+
+  '@typescript/native-preview@7.0.0-dev.20260707.2':
+    optionalDependencies:
+      '@typescript/native-preview-darwin-arm64': 7.0.0-dev.20260707.2
+      '@typescript/native-preview-darwin-x64': 7.0.0-dev.20260707.2
+      '@typescript/native-preview-linux-arm': 7.0.0-dev.20260707.2
+      '@typescript/native-preview-linux-arm64': 7.0.0-dev.20260707.2
+      '@typescript/native-preview-linux-x64': 7.0.0-dev.20260707.2
+      '@typescript/native-preview-win32-arm64': 7.0.0-dev.20260707.2
+      '@typescript/native-preview-win32-x64': 7.0.0-dev.20260707.2
+
   '@ungap/structured-clone@1.3.1': {}
 
   '@upsetjs/venn.js@2.0.0':
@@ -10410,44 +10516,44 @@ snapshots:
       d3-selection: 3.0.0
       d3-transition: 3.0.1(d3-selection@3.0.0)
 
-  '@vitest/expect@4.1.9':
+  '@vitest/expect@4.1.11':
     dependencies:
       '@standard-schema/spec': 1.1.0
       '@types/chai': 5.2.3
-      '@vitest/spy': 4.1.9
-      '@vitest/utils': 4.1.9
+      '@vitest/spy': 4.1.11
+      '@vitest/utils': 4.1.11
       chai: 6.2.2
       tinyrainbow: 3.1.0
 
-  '@vitest/mocker@4.1.9(vite@8.1.0(@types/node@26.1.2)(esbuild@0.25.4)(terser@5.49.1)(tsx@4.22.4)(yaml@2.9.0))':
+  '@vitest/mocker@4.1.11(vite@8.1.0(@types/node@26.1.2)(esbuild@0.25.4)(terser@5.49.1)(tsx@4.22.4)(yaml@2.9.0))':
     dependencies:
-      '@vitest/spy': 4.1.9
+      '@vitest/spy': 4.1.11
       estree-walker: 3.0.3
       magic-string: 0.30.21
     optionalDependencies:
       vite: 8.1.0(@types/node@26.1.2)(esbuild@0.25.4)(terser@5.49.1)(tsx@4.22.4)(yaml@2.9.0)
 
-  '@vitest/pretty-format@4.1.9':
+  '@vitest/pretty-format@4.1.11':
     dependencies:
       tinyrainbow: 3.1.0
 
-  '@vitest/runner@4.1.9':
+  '@vitest/runner@4.1.11':
     dependencies:
-      '@vitest/utils': 4.1.9
+      '@vitest/utils': 4.1.11
       pathe: 2.0.3
 
-  '@vitest/snapshot@4.1.9':
+  '@vitest/snapshot@4.1.11':
     dependencies:
-      '@vitest/pretty-format': 4.1.9
-      '@vitest/utils': 4.1.9
+      '@vitest/pretty-format': 4.1.11
+      '@vitest/utils': 4.1.11
       magic-string: 0.30.21
       pathe: 2.0.3
 
-  '@vitest/spy@4.1.9': {}
+  '@vitest/spy@4.1.11': {}
 
-  '@vitest/utils@4.1.9':
+  '@vitest/utils@4.1.11':
     dependencies:
-      '@vitest/pretty-format': 4.1.9
+      '@vitest/pretty-format': 4.1.11
       convert-source-map: 2.0.0
       tinyrainbow: 3.1.0
 
@@ -10504,6 +10610,8 @@ snapshots:
 
   agent-base@7.1.4: {}
 
+  agent-cli-detector@0.1.7: {}
+
   ajv@6.15.0:
     dependencies:
       fast-deep-equal: 3.1.3
@@ -10740,7 +10848,7 @@ snapshots:
       '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.29.7)
       '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.29.7)
 
-  babel-preset-expo@55.0.21(@babel/core@7.29.7)(@babel/runtime@7.29.7)(expo@55.0.27)(react-refresh@0.14.2):
+  babel-preset-expo@55.0.21(@babel/core@7.29.7)(@babel/runtime@7.29.7)(expo@55.0.30)(react-refresh@0.14.2):
     dependencies:
       '@babel/generator': 7.29.1
       '@babel/helper-module-imports': 7.28.6
@@ -10768,14 +10876,14 @@ snapshots:
       resolve-from: 5.0.0
     optionalDependencies:
       '@babel/runtime': 7.29.7
-      expo: 55.0.27(@babel/core@7.29.7)(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-router@55.0.14)(react-dom@19.2.6(react@19.2.6))(react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
+      expo: 55.0.30(10e8e71dd92768dd7f344108f3edbbe3)
     transitivePeerDependencies:
       - '@babel/core'
       - supports-color
 
-  babel-preset-expo@55.0.23(@babel/core@7.29.7)(@babel/runtime@7.29.7)(expo@55.0.27)(react-refresh@0.14.2):
+  babel-preset-expo@55.0.25(@babel/core@7.29.7)(@babel/runtime@7.29.7)(expo@55.0.30)(react-refresh@0.14.2):
     dependencies:
-      '@babel/generator': 7.29.7
+      '@babel/generator': 7.29.8
       '@babel/helper-module-imports': 7.29.7
       '@babel/plugin-proposal-decorators': 7.29.0(@babel/core@7.29.7)
       '@babel/plugin-proposal-export-default-from': 7.29.7(@babel/core@7.29.7)
@@ -10791,7 +10899,7 @@ snapshots:
       '@babel/plugin-transform-runtime': 7.29.7(@babel/core@7.29.7)
       '@babel/preset-react': 7.28.5(@babel/core@7.29.7)
       '@babel/preset-typescript': 7.28.5(@babel/core@7.29.7)
-      '@react-native/babel-preset': 0.83.6(@babel/core@7.29.7)
+      '@react-native/babel-preset': 0.83.10(@babel/core@7.29.7)
       babel-plugin-react-compiler: 1.0.0
       babel-plugin-react-native-web: 0.21.2
       babel-plugin-syntax-hermes-parser: 0.32.1
@@ -10801,7 +10909,7 @@ snapshots:
       resolve-from: 5.0.0
     optionalDependencies:
       '@babel/runtime': 7.29.7
-      expo: 55.0.27(@babel/core@7.29.7)(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-router@55.0.14)(react-dom@19.2.6(react@19.2.6))(react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
+      expo: 55.0.30(10e8e71dd92768dd7f344108f3edbbe3)
     transitivePeerDependencies:
       - '@babel/core'
       - supports-color
@@ -10884,7 +10992,7 @@ snapshots:
 
   buffer-image-size@0.6.4:
     dependencies:
-      '@types/node': 26.1.1
+      '@types/node': 26.1.2
 
   buffer@6.0.3:
     dependencies:
@@ -10955,7 +11063,7 @@ snapshots:
 
   chrome-launcher@0.15.2:
     dependencies:
-      '@types/node': 26.1.1
+      '@types/node': 26.1.2
       escape-string-regexp: 4.0.0
       is-wsl: 2.2.0
       lighthouse-logger: 1.4.2
@@ -10964,7 +11072,7 @@ snapshots:
 
   chromium-edge-launcher@0.2.0:
     dependencies:
-      '@types/node': 26.1.1
+      '@types/node': 26.1.2
       escape-string-regexp: 4.0.0
       is-wsl: 2.2.0
       lighthouse-logger: 1.4.2
@@ -11658,7 +11766,7 @@ snapshots:
   eslint-compat-utils@0.5.1(eslint@9.39.4):
     dependencies:
       eslint: 9.39.4
-      semver: 7.7.4
+      semver: 7.8.5
 
   eslint-config-prettier@9.1.2(eslint@9.39.4):
     dependencies:
@@ -11666,11 +11774,11 @@ snapshots:
 
   eslint-config-universe@15.0.4(eslint@9.39.4)(prettier@2.8.8)(typescript@5.9.3):
     dependencies:
-      '@typescript-eslint/eslint-plugin': 8.59.2(@typescript-eslint/parser@8.59.2(eslint@9.39.4)(typescript@6.0.3))(eslint@9.39.4)(typescript@5.9.3)
+      '@typescript-eslint/eslint-plugin': 8.59.2(@typescript-eslint/parser@8.59.2(eslint@9.39.4)(typescript@5.9.3))(eslint@9.39.4)(typescript@5.9.3)
       '@typescript-eslint/parser': 8.59.2(eslint@9.39.4)(typescript@6.0.3)
       eslint: 9.39.4
       eslint-config-prettier: 9.1.2(eslint@9.39.4)
-      eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.59.2(eslint@9.39.4)(typescript@6.0.3))(eslint@9.39.4)
+      eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.59.2(eslint@9.39.4)(typescript@5.9.3))(eslint@9.39.4)
       eslint-plugin-n: 17.24.0(eslint@9.39.4)(typescript@5.9.3)
       eslint-plugin-node: 11.1.0(eslint@9.39.4)
       eslint-plugin-prettier: 5.5.5(eslint-config-prettier@9.1.2(eslint@9.39.4))(eslint@9.39.4)(prettier@2.8.8)
@@ -11694,7 +11802,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  eslint-module-utils@2.12.1(@typescript-eslint/parser@8.59.2(eslint@9.39.4)(typescript@6.0.3))(eslint-import-resolver-node@0.3.10)(eslint@9.39.4):
+  eslint-module-utils@2.12.1(@typescript-eslint/parser@8.59.2(eslint@9.39.4)(typescript@5.9.3))(eslint-import-resolver-node@0.3.10)(eslint@9.39.4):
     dependencies:
       debug: 3.2.7
     optionalDependencies:
@@ -11717,7 +11825,7 @@ snapshots:
       eslint-utils: 2.1.0
       regexpp: 3.2.0
 
-  eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.59.2(eslint@9.39.4)(typescript@6.0.3))(eslint@9.39.4):
+  eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.59.2(eslint@9.39.4)(typescript@5.9.3))(eslint@9.39.4):
     dependencies:
       '@rtsao/scc': 1.1.0
       array-includes: 3.1.9
@@ -11728,7 +11836,7 @@ snapshots:
       doctrine: 2.1.0
       eslint: 9.39.4
       eslint-import-resolver-node: 0.3.10
-      eslint-module-utils: 2.12.1(@typescript-eslint/parser@8.59.2(eslint@9.39.4)(typescript@6.0.3))(eslint-import-resolver-node@0.3.10)(eslint@9.39.4)
+      eslint-module-utils: 2.12.1(@typescript-eslint/parser@8.59.2(eslint@9.39.4)(typescript@5.9.3))(eslint-import-resolver-node@0.3.10)(eslint@9.39.4)
       hasown: 2.0.3
       is-core-module: 2.16.2
       is-glob: 4.0.3
@@ -11756,7 +11864,7 @@ snapshots:
       globals: 15.15.0
       globrex: 0.1.2
       ignore: 5.3.2
-      semver: 7.7.4
+      semver: 7.8.5
       ts-declaration-location: 1.0.7(typescript@5.9.3)
     transitivePeerDependencies:
       - typescript
@@ -11914,159 +12022,154 @@ snapshots:
       jest-message-util: 29.7.0
       jest-util: 29.7.0
 
-  expo-application@55.0.14(expo@55.0.27):
+  expo-application@55.0.19(expo@55.0.30):
     dependencies:
-      expo: 55.0.27(@babel/core@7.29.7)(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-router@55.0.14)(react-dom@19.2.6(react@19.2.6))(react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
+      expo: 55.0.30(10e8e71dd92768dd7f344108f3edbbe3)
 
-  expo-asset@55.0.17(expo@55.0.27)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3):
+  expo-asset@55.0.20(expo@55.0.30)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)(typescript@6.0.3):
     dependencies:
-      '@expo/image-utils': 0.8.14(typescript@6.0.3)
-      expo: 55.0.27(@babel/core@7.29.7)(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-router@55.0.14)(react-dom@19.2.6(react@19.2.6))(react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
-      expo-constants: 55.0.16(expo@55.0.27)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))
-      react: 19.2.6
-      react-native: 0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)
+      '@expo/image-utils': 0.8.17(typescript@6.0.3)
+      expo: 55.0.30(10e8e71dd92768dd7f344108f3edbbe3)
+      expo-constants: 55.0.17(expo@55.0.30)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))
+      react: 19.2.8
+      react-native: 0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)
     transitivePeerDependencies:
       - supports-color
       - typescript
 
-  expo-build-properties@55.0.13(expo@55.0.27):
+  expo-build-properties@55.0.18(expo@55.0.30):
     dependencies:
-      '@expo/schema-utils': 55.0.4
-      expo: 55.0.27(@babel/core@7.29.7)(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-router@55.0.14)(react-dom@19.2.6(react@19.2.6))(react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
+      '@expo/schema-utils': 55.0.5
+      expo: 55.0.30(10e8e71dd92768dd7f344108f3edbbe3)
       resolve-from: 5.0.0
-      semver: 7.7.4
+      semver: 7.8.5
 
-  expo-camera@55.0.18(@types/emscripten@1.41.5)(expo@55.0.27)(react-native-web@0.21.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6):
+  expo-camera@55.0.23(@types/emscripten@1.41.5)(expo@55.0.30)(react-native-web@0.21.2(react-dom@19.2.8(react@19.2.8))(react@19.2.8))(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8):
     dependencies:
       barcode-detector: 3.1.3(@types/emscripten@1.41.5)
-      expo: 55.0.27(@babel/core@7.29.7)(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-router@55.0.14)(react-dom@19.2.6(react@19.2.6))(react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
-      react: 19.2.6
-      react-native: 0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)
+      expo: 55.0.30(10e8e71dd92768dd7f344108f3edbbe3)
+      react: 19.2.8
+      react-native: 0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)
     optionalDependencies:
-      react-native-web: 0.21.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      react-native-web: 0.21.2(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
     transitivePeerDependencies:
       - '@types/emscripten'
 
-  expo-clipboard@55.0.13(expo@55.0.27)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6):
+  expo-clipboard@55.0.17(expo@55.0.30)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8):
     dependencies:
-      expo: 55.0.27(@babel/core@7.29.7)(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-router@55.0.14)(react-dom@19.2.6(react@19.2.6))(react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
-      react: 19.2.6
-      react-native: 0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)
+      expo: 55.0.30(10e8e71dd92768dd7f344108f3edbbe3)
+      react: 19.2.8
+      react-native: 0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)
 
-  expo-constants@55.0.16(expo@55.0.27)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)):
+  expo-constants@55.0.17(expo@55.0.30)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)):
     dependencies:
-      '@expo/env': 2.1.2
-      expo: 55.0.27(@babel/core@7.29.7)(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-router@55.0.14)(react-dom@19.2.6(react@19.2.6))(react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
-      react-native: 0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)
+      '@expo/env': 2.1.3
+      expo: 55.0.30(10e8e71dd92768dd7f344108f3edbbe3)
+      react-native: 0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)
     transitivePeerDependencies:
       - supports-color
 
-  expo-crypto@55.0.14(expo@55.0.27):
+  expo-crypto@55.0.19(expo@55.0.30):
     dependencies:
-      expo: 55.0.27(@babel/core@7.29.7)(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-router@55.0.14)(react-dom@19.2.6(react@19.2.6))(react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
+      expo: 55.0.30(10e8e71dd92768dd7f344108f3edbbe3)
 
-  expo-dev-client@55.0.35(expo@55.0.27):
+  expo-dev-client@55.0.39(expo@55.0.30):
     dependencies:
-      expo: 55.0.27(@babel/core@7.29.7)(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-router@55.0.14)(react-dom@19.2.6(react@19.2.6))(react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
-      expo-dev-launcher: 55.0.36(expo@55.0.27)
-      expo-dev-menu: 55.0.30(expo@55.0.27)
-      expo-dev-menu-interface: 55.0.2(expo@55.0.27)
-      expo-manifests: 55.0.17(expo@55.0.27)
-      expo-updates-interface: 55.1.6(expo@55.0.27)
+      expo: 55.0.30(10e8e71dd92768dd7f344108f3edbbe3)
+      expo-dev-launcher: 55.0.40(expo@55.0.30)
+      expo-dev-menu: 55.0.34(expo@55.0.30)
+      expo-dev-menu-interface: 55.0.2(expo@55.0.30)
+      expo-manifests: 55.0.21(expo@55.0.30)
+      expo-updates-interface: 55.1.6(expo@55.0.30)
 
-  expo-dev-launcher@55.0.36(expo@55.0.27):
+  expo-dev-launcher@55.0.40(expo@55.0.30):
     dependencies:
-      '@expo/schema-utils': 55.0.4
-      expo: 55.0.27(@babel/core@7.29.7)(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-router@55.0.14)(react-dom@19.2.6(react@19.2.6))(react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
-      expo-dev-menu: 55.0.30(expo@55.0.27)
-      expo-manifests: 55.0.17(expo@55.0.27)
+      '@expo/schema-utils': 55.0.5
+      expo: 55.0.30(10e8e71dd92768dd7f344108f3edbbe3)
+      expo-dev-menu: 55.0.34(expo@55.0.30)
+      expo-manifests: 55.0.21(expo@55.0.30)
 
-  expo-dev-menu-interface@55.0.2(expo@55.0.27):
+  expo-dev-menu-interface@55.0.2(expo@55.0.30):
     dependencies:
-      expo: 55.0.27(@babel/core@7.29.7)(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-router@55.0.14)(react-dom@19.2.6(react@19.2.6))(react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
+      expo: 55.0.30(10e8e71dd92768dd7f344108f3edbbe3)
 
-  expo-dev-menu@55.0.30(expo@55.0.27):
+  expo-dev-menu@55.0.34(expo@55.0.30):
     dependencies:
-      expo: 55.0.27(@babel/core@7.29.7)(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-router@55.0.14)(react-dom@19.2.6(react@19.2.6))(react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
-      expo-dev-menu-interface: 55.0.2(expo@55.0.27)
+      expo: 55.0.30(10e8e71dd92768dd7f344108f3edbbe3)
+      expo-dev-menu-interface: 55.0.2(expo@55.0.30)
 
-  expo-document-picker@55.0.13(expo@55.0.27):
+  expo-document-picker@55.0.17(expo@55.0.30):
     dependencies:
-      expo: 55.0.27(@babel/core@7.29.7)(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-router@55.0.14)(react-dom@19.2.6(react@19.2.6))(react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
+      expo: 55.0.30(10e8e71dd92768dd7f344108f3edbbe3)
 
-  expo-file-system@55.0.19(expo@55.0.27)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)):
+  expo-file-system@55.0.26(expo@55.0.30)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)):
     dependencies:
-      expo: 55.0.27(@babel/core@7.29.7)(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-router@55.0.14)(react-dom@19.2.6(react@19.2.6))(react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
-      react-native: 0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)
+      expo: 55.0.30(10e8e71dd92768dd7f344108f3edbbe3)
+      react-native: 0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)
 
-  expo-file-system@55.0.23(expo@55.0.27)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)):
+  expo-font@55.0.8(expo@55.0.30)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8):
     dependencies:
-      expo: 55.0.27(@babel/core@7.29.7)(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-router@55.0.14)(react-dom@19.2.6(react@19.2.6))(react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
-      react-native: 0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)
-
-  expo-font@55.0.8(expo@55.0.27)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6):
-    dependencies:
-      expo: 55.0.27(@babel/core@7.29.7)(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-router@55.0.14)(react-dom@19.2.6(react@19.2.6))(react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
+      expo: 55.0.30(10e8e71dd92768dd7f344108f3edbbe3)
       fontfaceobserver: 2.3.0
-      react: 19.2.6
-      react-native: 0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)
+      react: 19.2.8
+      react-native: 0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)
 
-  expo-glass-effect@55.0.11(expo@55.0.27)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6):
+  expo-glass-effect@55.0.11(expo@55.0.30)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8):
     dependencies:
-      expo: 55.0.27(@babel/core@7.29.7)(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-router@55.0.14)(react-dom@19.2.6(react@19.2.6))(react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
-      react: 19.2.6
-      react-native: 0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)
+      expo: 55.0.30(10e8e71dd92768dd7f344108f3edbbe3)
+      react: 19.2.8
+      react-native: 0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)
 
-  expo-haptics@55.0.14(expo@55.0.27):
+  expo-haptics@55.0.18(expo@55.0.30):
     dependencies:
-      expo: 55.0.27(@babel/core@7.29.7)(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-router@55.0.14)(react-dom@19.2.6(react@19.2.6))(react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
+      expo: 55.0.30(10e8e71dd92768dd7f344108f3edbbe3)
 
-  expo-image-loader@55.0.1(expo@55.0.27):
+  expo-image-loader@55.0.1(expo@55.0.30):
     dependencies:
-      expo: 55.0.27(@babel/core@7.29.7)(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-router@55.0.14)(react-dom@19.2.6(react@19.2.6))(react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
+      expo: 55.0.30(10e8e71dd92768dd7f344108f3edbbe3)
 
-  expo-image-manipulator@55.0.17(expo@55.0.27):
+  expo-image-manipulator@55.0.21(expo@55.0.30):
     dependencies:
-      expo: 55.0.27(@babel/core@7.29.7)(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-router@55.0.14)(react-dom@19.2.6(react@19.2.6))(react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
-      expo-image-loader: 55.0.1(expo@55.0.27)
+      expo: 55.0.30(10e8e71dd92768dd7f344108f3edbbe3)
+      expo-image-loader: 55.0.1(expo@55.0.30)
 
-  expo-image-picker@55.0.20(expo@55.0.27):
+  expo-image-picker@55.0.24(expo@55.0.30):
     dependencies:
-      expo: 55.0.27(@babel/core@7.29.7)(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-router@55.0.14)(react-dom@19.2.6(react@19.2.6))(react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
-      expo-image-loader: 55.0.1(expo@55.0.27)
+      expo: 55.0.30(10e8e71dd92768dd7f344108f3edbbe3)
+      expo-image-loader: 55.0.1(expo@55.0.30)
 
-  expo-image@55.0.10(expo@55.0.27)(react-native-web@0.21.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6):
+  expo-image@55.0.11(expo@55.0.30)(react-native-web@0.21.2(react-dom@19.2.8(react@19.2.8))(react@19.2.8))(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8):
     dependencies:
-      expo: 55.0.27(@babel/core@7.29.7)(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-router@55.0.14)(react-dom@19.2.6(react@19.2.6))(react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
-      react: 19.2.6
-      react-native: 0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)
+      expo: 55.0.30(10e8e71dd92768dd7f344108f3edbbe3)
+      react: 19.2.8
+      react-native: 0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)
       sf-symbols-typescript: 2.2.0
     optionalDependencies:
-      react-native-web: 0.21.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      react-native-web: 0.21.2(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
 
   expo-json-utils@55.0.2: {}
 
-  expo-keep-awake@55.0.8(expo@55.0.27)(react@19.2.6):
+  expo-keep-awake@55.0.8(expo@55.0.30)(react@19.2.8):
     dependencies:
-      expo: 55.0.27(@babel/core@7.29.7)(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-router@55.0.14)(react-dom@19.2.6(react@19.2.6))(react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
-      react: 19.2.6
+      expo: 55.0.30(10e8e71dd92768dd7f344108f3edbbe3)
+      react: 19.2.8
 
-  expo-linking@55.0.15(expo@55.0.27)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6):
+  expo-linking@55.0.17(expo@55.0.30)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8):
     dependencies:
-      expo-constants: 55.0.16(expo@55.0.27)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))
+      expo-constants: 55.0.17(expo@55.0.30)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))
       invariant: 2.2.4
-      react: 19.2.6
-      react-native: 0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)
+      react: 19.2.8
+      react-native: 0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)
     transitivePeerDependencies:
       - expo
       - supports-color
 
-  expo-manifests@55.0.17(expo@55.0.27):
+  expo-manifests@55.0.21(expo@55.0.30):
     dependencies:
-      expo: 55.0.27(@babel/core@7.29.7)(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-router@55.0.14)(react-dom@19.2.6(react@19.2.6))(react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
+      expo: 55.0.30(10e8e71dd92768dd7f344108f3edbbe3)
       expo-json-utils: 55.0.2
 
-  expo-module-scripts@55.0.2(@babel/core@7.29.7)(@babel/runtime@7.29.7)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.29.7))(esbuild@0.25.4)(eslint@9.39.4)(expo@55.0.27)(jest@29.7.0(@types/node@26.1.2))(prettier@2.8.8)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react-refresh@0.14.2)(react-test-renderer@19.2.6(react@19.2.6))(react@19.2.6):
+  expo-module-scripts@55.0.2(@babel/core@7.29.7)(@babel/runtime@7.29.7)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.29.7))(esbuild@0.25.4)(eslint@9.39.4)(expo@55.0.30)(jest@29.7.0(@types/node@26.1.2))(prettier@2.8.8)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react-refresh@0.14.2)(react-test-renderer@19.2.8(react@19.2.8))(react@19.2.8):
     dependencies:
       '@babel/cli': 7.28.6(@babel/core@7.29.7)
       '@babel/plugin-transform-export-namespace-from': 7.27.1(@babel/core@7.29.7)
@@ -12074,15 +12177,15 @@ snapshots:
       '@babel/preset-typescript': 7.28.5(@babel/core@7.29.7)
       '@expo/npm-proofread': 1.0.1
       '@expo/spawn-async': 1.7.2
-      '@testing-library/react-native': 13.3.3(jest@29.7.0(@types/node@26.1.2))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react-test-renderer@19.2.6(react@19.2.6))(react@19.2.6)
+      '@testing-library/react-native': 13.3.3(jest@29.7.0(@types/node@26.1.2))(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react-test-renderer@19.2.8(react@19.2.8))(react@19.2.8)
       '@tsconfig/node18': 18.2.6
       '@types/jest': 29.5.14
       babel-plugin-dynamic-import-node: 2.3.3
-      babel-preset-expo: 55.0.21(@babel/core@7.29.7)(@babel/runtime@7.29.7)(expo@55.0.27)(react-refresh@0.14.2)
+      babel-preset-expo: 55.0.21(@babel/core@7.29.7)(@babel/runtime@7.29.7)(expo@55.0.30)(react-refresh@0.14.2)
       commander: 12.1.0
       eslint-config-universe: 15.0.4(eslint@9.39.4)(prettier@2.8.8)(typescript@5.9.3)
       glob: 13.0.6
-      jest-expo: 55.0.17(@babel/core@7.29.7)(expo@55.0.27)(jest@29.7.0(@types/node@26.1.2))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@5.9.3)
+      jest-expo: 55.0.17(@babel/core@7.29.7)(expo@55.0.30)(jest@29.7.0(@types/node@26.1.2))(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)(typescript@5.9.3)
       jest-snapshot-prettier: prettier@2.8.8
       jest-watch-typeahead: 2.2.1(jest@29.7.0(@types/node@26.1.2))
       resolve-workspace-root: 2.0.1
@@ -12112,85 +12215,85 @@ snapshots:
       - supports-color
       - utf-8-validate
 
-  expo-modules-autolinking@55.0.24(typescript@6.0.3):
+  expo-modules-autolinking@55.0.27(typescript@6.0.3):
     dependencies:
-      '@expo/require-utils': 55.0.5(typescript@6.0.3)
-      '@expo/spawn-async': 1.7.2
+      '@expo/require-utils': 55.0.8(typescript@6.0.3)
+      '@expo/spawn-async': 1.8.0
       chalk: 4.1.2
       commander: 7.2.0
     transitivePeerDependencies:
       - supports-color
       - typescript
 
-  expo-modules-core@55.0.25(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6):
+  expo-modules-core@55.0.25(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8))(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8):
     dependencies:
       invariant: 2.2.4
-      react: 19.2.6
-      react-native: 0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)
+      react: 19.2.8
+      react-native: 0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)
     optionalDependencies:
-      react-native-worklets: 0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
+      react-native-worklets: 0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
 
-  expo-network@55.0.14(expo@55.0.27)(react@19.2.6):
+  expo-network@55.0.18(expo@55.0.30)(react@19.2.8):
     dependencies:
-      expo: 55.0.27(@babel/core@7.29.7)(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-router@55.0.14)(react-dom@19.2.6(react@19.2.6))(react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
-      react: 19.2.6
+      expo: 55.0.30(10e8e71dd92768dd7f344108f3edbbe3)
+      react: 19.2.8
 
-  expo-notifications@55.0.22(expo@55.0.27)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3):
+  expo-notifications@55.0.27(expo@55.0.30)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)(typescript@6.0.3):
     dependencies:
-      '@expo/image-utils': 0.8.14(typescript@6.0.3)
+      '@expo/image-utils': 0.8.17(typescript@6.0.3)
       abort-controller: 3.0.0
       badgin: 1.2.3
-      expo: 55.0.27(@babel/core@7.29.7)(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-router@55.0.14)(react-dom@19.2.6(react@19.2.6))(react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
-      expo-application: 55.0.14(expo@55.0.27)
-      expo-constants: 55.0.16(expo@55.0.27)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))
-      react: 19.2.6
-      react-native: 0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)
+      expo: 55.0.30(10e8e71dd92768dd7f344108f3edbbe3)
+      expo-application: 55.0.19(expo@55.0.30)
+      expo-constants: 55.0.17(expo@55.0.30)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))
+      react: 19.2.8
+      react-native: 0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)
     transitivePeerDependencies:
       - supports-color
       - typescript
 
-  expo-router@55.0.14(50649306d987d6f4e510b7a8e94ea6ba):
+  expo-router@55.0.18(2f99795f9796def5cdb1516a493dc117):
     dependencies:
-      '@expo/log-box': 55.0.12(@expo/dom-webview@55.0.5)(expo@55.0.27)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
-      '@expo/metro-runtime': 55.0.10(@expo/dom-webview@55.0.5)(expo@55.0.27)(react-dom@19.2.6(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
-      '@expo/schema-utils': 55.0.4
-      '@radix-ui/react-slot': 1.2.4(@types/react@19.2.14)(react@19.2.6)
-      '@radix-ui/react-tabs': 1.1.13(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
-      '@react-navigation/bottom-tabs': 7.15.11(@react-navigation/native@7.2.2(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-safe-area-context@5.7.0(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-screens@4.24.0(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
-      '@react-navigation/native': 7.2.2(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
-      '@react-navigation/native-stack': 7.14.12(@react-navigation/native@7.2.2(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-safe-area-context@5.7.0(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-screens@4.24.0(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
+      '@expo/log-box': 55.0.13(@expo/dom-webview@55.0.5)(expo@55.0.30)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
+      '@expo/metro-runtime': 55.0.10(@expo/dom-webview@55.0.5)(expo@55.0.30)(react-dom@19.2.8(react@19.2.8))(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
+      '@expo/schema-utils': 55.0.5
+      '@radix-ui/react-slot': 1.2.4(@types/react@19.2.14)(react@19.2.8)
+      '@radix-ui/react-tabs': 1.1.13(@types/react@19.2.14)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@react-navigation/bottom-tabs': 7.15.11(@react-navigation/native@7.2.2(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8))(react-native-safe-area-context@5.7.0(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8))(react-native-screens@4.24.0(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8))(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
+      '@react-navigation/native': 7.2.2(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
+      '@react-navigation/native-stack': 7.14.12(@react-navigation/native@7.2.2(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8))(react-native-safe-area-context@5.7.0(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8))(react-native-screens@4.24.0(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8))(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
       client-only: 0.0.1
       debug: 4.4.3
       escape-string-regexp: 4.0.0
-      expo: 55.0.27(@babel/core@7.29.7)(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-router@55.0.14)(react-dom@19.2.6(react@19.2.6))(react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
-      expo-constants: 55.0.16(expo@55.0.27)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))
-      expo-glass-effect: 55.0.11(expo@55.0.27)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
-      expo-image: 55.0.10(expo@55.0.27)(react-native-web@0.21.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
-      expo-linking: 55.0.15(expo@55.0.27)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
-      expo-server: 55.0.9
-      expo-symbols: 55.0.8(expo-font@55.0.8)(expo@55.0.27)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
+      expo: 55.0.30(10e8e71dd92768dd7f344108f3edbbe3)
+      expo-constants: 55.0.17(expo@55.0.30)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))
+      expo-glass-effect: 55.0.11(expo@55.0.30)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
+      expo-image: 55.0.11(expo@55.0.30)(react-native-web@0.21.2(react-dom@19.2.8(react@19.2.8))(react@19.2.8))(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
+      expo-linking: 55.0.17(expo@55.0.30)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
+      expo-server: 55.0.12
+      expo-symbols: 55.0.9(expo-font@55.0.8)(expo@55.0.30)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
       fast-deep-equal: 3.1.3
       invariant: 2.2.4
       nanoid: 3.3.18
       query-string: 7.1.3
-      react: 19.2.6
+      react: 19.2.8
       react-fast-compare: 3.2.2
-      react-native: 0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)
-      react-native-is-edge-to-edge: 1.3.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
-      react-native-safe-area-context: 5.7.0(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
-      react-native-screens: 4.24.0(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
+      react-native: 0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)
+      react-native-is-edge-to-edge: 1.3.1(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
+      react-native-safe-area-context: 5.7.0(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
+      react-native-screens: 4.24.0(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
       semver: 7.6.3
       server-only: 0.0.1
       sf-symbols-typescript: 2.2.0
       shallowequal: 1.1.0
-      use-latest-callback: 0.2.6(react@19.2.6)
-      vaul: 1.1.2(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      use-latest-callback: 0.2.6(react@19.2.8)
+      vaul: 1.1.2(@types/react@19.2.14)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
     optionalDependencies:
-      '@testing-library/react-native': 13.3.3(jest@29.7.0(@types/node@26.1.2))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react-test-renderer@19.2.6(react@19.2.6))(react@19.2.6)
-      react-dom: 19.2.6(react@19.2.6)
-      react-native-gesture-handler: 2.31.2(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
-      react-native-reanimated: 4.3.0(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
-      react-native-web: 0.21.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@testing-library/react-native': 13.3.3(jest@29.7.0(@types/node@26.1.2))(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react-test-renderer@19.2.8(react@19.2.8))(react@19.2.8)
+      react-dom: 19.2.8(react@19.2.8)
+      react-native-gesture-handler: 2.31.2(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
+      react-native-reanimated: 4.3.4(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8))(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
+      react-native-web: 0.21.2(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
     transitivePeerDependencies:
       - '@react-native-masked-view/masked-view'
       - '@types/react'
@@ -12198,72 +12301,70 @@ snapshots:
       - expo-font
       - supports-color
 
-  expo-secure-store@55.0.13(expo@55.0.27):
+  expo-secure-store@55.0.18(expo@55.0.30):
     dependencies:
-      expo: 55.0.27(@babel/core@7.29.7)(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-router@55.0.14)(react-dom@19.2.6(react@19.2.6))(react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
+      expo: 55.0.30(10e8e71dd92768dd7f344108f3edbbe3)
 
-  expo-server@55.0.11: {}
+  expo-server@55.0.12: {}
 
-  expo-server@55.0.9: {}
-
-  expo-splash-screen@55.0.20(expo@55.0.27)(typescript@6.0.3):
+  expo-splash-screen@55.0.25(expo@55.0.30)(typescript@6.0.3):
     dependencies:
-      '@expo/prebuild-config': 55.0.17(expo@55.0.27)(typescript@6.0.3)
-      expo: 55.0.27(@babel/core@7.29.7)(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-router@55.0.14)(react-dom@19.2.6(react@19.2.6))(react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
+      '@expo/prebuild-config': 55.0.22(expo@55.0.30)(typescript@6.0.3)
+      expo: 55.0.30(10e8e71dd92768dd7f344108f3edbbe3)
     transitivePeerDependencies:
       - supports-color
       - typescript
 
-  expo-status-bar@55.0.6(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6):
+  expo-status-bar@55.0.6(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8):
     dependencies:
-      react: 19.2.6
-      react-native: 0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)
-      react-native-is-edge-to-edge: 1.3.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
+      react: 19.2.8
+      react-native: 0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)
+      react-native-is-edge-to-edge: 1.3.1(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
 
-  expo-symbols@55.0.8(expo-font@55.0.8)(expo@55.0.27)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6):
+  expo-symbols@55.0.9(expo-font@55.0.8)(expo@55.0.30)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8):
     dependencies:
       '@expo-google-fonts/material-symbols': 0.4.34
-      expo: 55.0.27(@babel/core@7.29.7)(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-router@55.0.14)(react-dom@19.2.6(react@19.2.6))(react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
-      expo-font: 55.0.8(expo@55.0.27)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
-      react: 19.2.6
-      react-native: 0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)
+      expo: 55.0.30(10e8e71dd92768dd7f344108f3edbbe3)
+      expo-font: 55.0.8(expo@55.0.30)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
+      react: 19.2.8
+      react-native: 0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)
       sf-symbols-typescript: 2.2.0
 
-  expo-updates-interface@55.1.6(expo@55.0.27):
+  expo-updates-interface@55.1.6(expo@55.0.30):
     dependencies:
-      expo: 55.0.27(@babel/core@7.29.7)(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-router@55.0.14)(react-dom@19.2.6(react@19.2.6))(react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
+      expo: 55.0.30(10e8e71dd92768dd7f344108f3edbbe3)
 
-  expo@55.0.27(@babel/core@7.29.7)(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-router@55.0.14)(react-dom@19.2.6(react@19.2.6))(react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3):
+  expo@55.0.30(10e8e71dd92768dd7f344108f3edbbe3):
     dependencies:
       '@babel/runtime': 7.29.7
-      '@expo/cli': 55.0.33(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-constants@55.0.16)(expo-font@55.0.8)(expo-router@55.0.14)(expo@55.0.27)(react-dom@19.2.6(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
-      '@expo/config': 55.0.18(typescript@6.0.3)
-      '@expo/config-plugins': 55.0.10
-      '@expo/devtools': 55.0.3(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
-      '@expo/fingerprint': 0.16.7
-      '@expo/local-build-cache-provider': 55.0.14(typescript@6.0.3)
-      '@expo/log-box': 55.0.12(@expo/dom-webview@55.0.5)(expo@55.0.27)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
-      '@expo/metro': 55.1.1
-      '@expo/metro-config': 55.0.24(expo@55.0.27)(typescript@6.0.3)
-      '@expo/vector-icons': 15.1.1(expo-font@55.0.8)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
+      '@expo/cli': 55.0.36(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-constants@55.0.17)(expo-font@55.0.8)(expo-router@55.0.18)(expo@55.0.30)(react-dom@19.2.8(react@19.2.8))(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)(typescript@6.0.3)
+      '@expo/config': 55.0.21(typescript@6.0.3)
+      '@expo/config-plugins': 55.0.11
+      '@expo/devtools': 55.0.3(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
+      '@expo/fingerprint': 0.16.8
+      '@expo/local-build-cache-provider': 55.0.16(typescript@6.0.3)
+      '@expo/log-box': 55.0.13(@expo/dom-webview@55.0.5)(expo@55.0.30)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
+      '@expo/metro': 55.1.2
+      '@expo/metro-config': 55.0.27(expo@55.0.30)(typescript@6.0.3)
+      '@expo/vector-icons': 15.1.1(expo-font@55.0.8)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
       '@ungap/structured-clone': 1.3.1
-      babel-preset-expo: 55.0.23(@babel/core@7.29.7)(@babel/runtime@7.29.7)(expo@55.0.27)(react-refresh@0.14.2)
-      expo-asset: 55.0.17(expo@55.0.27)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
-      expo-constants: 55.0.16(expo@55.0.27)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))
-      expo-file-system: 55.0.23(expo@55.0.27)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))
-      expo-font: 55.0.8(expo@55.0.27)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
-      expo-keep-awake: 55.0.8(expo@55.0.27)(react@19.2.6)
-      expo-modules-autolinking: 55.0.24(typescript@6.0.3)
-      expo-modules-core: 55.0.25(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
+      babel-preset-expo: 55.0.25(@babel/core@7.29.7)(@babel/runtime@7.29.7)(expo@55.0.30)(react-refresh@0.14.2)
+      expo-asset: 55.0.20(expo@55.0.30)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)(typescript@6.0.3)
+      expo-constants: 55.0.17(expo@55.0.30)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))
+      expo-file-system: 55.0.26(expo@55.0.30)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))
+      expo-font: 55.0.8(expo@55.0.30)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
+      expo-keep-awake: 55.0.8(expo@55.0.30)(react@19.2.8)
+      expo-modules-autolinking: 55.0.27(typescript@6.0.3)
+      expo-modules-core: 55.0.25(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8))(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
       pretty-format: 29.7.0
-      react: 19.2.6
-      react-native: 0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)
+      react: 19.2.8
+      react-native: 0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)
       react-refresh: 0.14.2
       whatwg-url-minimum: 0.1.2
     optionalDependencies:
-      '@expo/dom-webview': 55.0.5(expo@55.0.27)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
-      '@expo/metro-runtime': 55.0.10(@expo/dom-webview@55.0.5)(expo@55.0.27)(react-dom@19.2.6(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
-      react-native-webview: 13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
+      '@expo/dom-webview': 55.0.5(expo@55.0.30)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
+      '@expo/metro-runtime': 55.0.10(@expo/dom-webview@55.0.5)(expo@55.0.30)(react-dom@19.2.8(react@19.2.8))(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
+      react-native-webview: 13.16.2(patch_hash=de6761dfa76a5491a23e49f1262566a8831cab26736a336fdffc5d4e7d05ff27)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
     transitivePeerDependencies:
       - '@babel/core'
       - bufferutil
@@ -12286,6 +12387,10 @@ snapshots:
 
   fast-levenshtein@2.0.6: {}
 
+  fastdom@1.0.12:
+    dependencies:
+      strictdom: 1.0.1
+
   fb-dotslash@0.5.8: {}
 
   fb-watchman@2.0.2:
@@ -12474,15 +12579,15 @@ snapshots:
 
   hachure-fill@0.5.2: {}
 
-  happy-dom@20.11.1:
+  happy-dom@20.11.8:
     dependencies:
-      '@types/node': 26.1.1
+      '@types/node': 26.1.2
       '@types/whatwg-mimetype': 3.0.2
       '@types/ws': 8.18.1
       buffer-image-size: 0.6.4
       entities: 7.0.1
       whatwg-mimetype: 3.0.0
-      ws: 8.21.0
+      ws: 8.21.3
     transitivePeerDependencies:
       - bufferutil
       - utf-8-validate
@@ -12960,26 +13065,26 @@ snapshots:
       '@jest/environment': 29.7.0
       '@jest/fake-timers': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 25.6.0
+      '@types/node': 26.1.2
       jest-mock: 29.7.0
       jest-util: 29.7.0
 
-  jest-expo@55.0.17(@babel/core@7.29.7)(expo@55.0.27)(jest@29.7.0(@types/node@26.1.2))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@5.9.3):
+  jest-expo@55.0.17(@babel/core@7.29.7)(expo@55.0.30)(jest@29.7.0(@types/node@26.1.2))(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)(typescript@5.9.3):
     dependencies:
       '@expo/config': 55.0.16(typescript@5.9.3)
       '@expo/json-file': 10.0.14
       '@jest/create-cache-key-function': 29.7.0
       '@jest/globals': 29.7.0
       babel-jest: 29.7.0(@babel/core@7.29.7)
-      expo: 55.0.27(@babel/core@7.29.7)(@expo/dom-webview@55.0.5)(@expo/metro-runtime@55.0.10)(expo-router@55.0.14)(react-dom@19.2.6(react@19.2.6))(react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
+      expo: 55.0.30(10e8e71dd92768dd7f344108f3edbbe3)
       jest-environment-jsdom: 29.7.0
       jest-snapshot: 29.7.0
       jest-watch-select-projects: 2.0.0
       jest-watch-typeahead: 2.2.1(jest@29.7.0(@types/node@26.1.2))
       json5: 2.2.3
       lodash: 4.18.1
-      react-native: 0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)
-      react-test-renderer: 19.2.0(react@19.2.6)
+      react-native: 0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)
+      react-test-renderer: 19.2.0(react@19.2.8)
       server-only: 0.0.1
       stacktrace-js: 2.0.2
     transitivePeerDependencies:
@@ -13146,7 +13251,7 @@ snapshots:
       jest-util: 29.7.0
       natural-compare: 1.4.0
       pretty-format: 29.7.0
-      semver: 7.7.4
+      semver: 7.8.5
     transitivePeerDependencies:
       - supports-color
 
@@ -13256,7 +13361,7 @@ snapshots:
       whatwg-encoding: 2.0.0
       whatwg-mimetype: 3.0.0
       whatwg-url: 11.0.0
-      ws: 8.21.0
+      ws: 8.21.3
       xml-name-validator: 4.0.0
     transitivePeerDependencies:
       - bufferutil
@@ -13411,11 +13516,11 @@ snapshots:
     dependencies:
       yallist: 3.1.1
 
-  lucide-react-native@1.14.0(react-native-svg@15.15.4(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6):
+  lucide-react-native@1.14.0(react-native-svg@15.15.4(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8))(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8):
     dependencies:
-      react: 19.2.6
-      react-native: 0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)
-      react-native-svg: 15.15.4(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
+      react: 19.2.8
+      react-native: 0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)
+      react-native-svg: 15.15.4(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
 
   magic-string@0.30.21:
     dependencies:
@@ -13454,11 +13559,11 @@ snapshots:
 
   merge-stream@2.0.0: {}
 
-  mermaid@11.16.1:
+  mermaid@11.17.2:
     dependencies:
       '@braintree/sanitize-url': 7.1.2
       '@iconify/utils': 3.1.4
-      '@mermaid-js/parser': 1.2.0
+      '@mermaid-js/parser': 1.2.1
       '@types/d3': 7.4.3
       '@upsetjs/venn.js': 2.0.0
       cytoscape: 3.34.0
@@ -13470,6 +13575,7 @@ snapshots:
       dayjs: 1.11.21
       dompurify: 3.4.13
       es-toolkit: 1.50.0
+      fastdom: 1.0.12
       katex: 0.16.47
       khroma: 2.1.0
       marked: 16.4.2
@@ -13488,6 +13594,16 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  metro-babel-transformer@0.83.8:
+    dependencies:
+      '@babel/core': 7.29.7
+      flow-enums-runtime: 0.0.6
+      hermes-parser: 0.35.0
+      metro-cache-key: 0.83.8
+      nullthrows: 1.1.1
+    transitivePeerDependencies:
+      - supports-color
+
   metro-babel-transformer@0.84.4:
     dependencies:
       '@babel/core': 7.29.7
@@ -13502,6 +13618,10 @@ snapshots:
     dependencies:
       flow-enums-runtime: 0.0.6
 
+  metro-cache-key@0.83.8:
+    dependencies:
+      flow-enums-runtime: 0.0.6
+
   metro-cache-key@0.84.4:
     dependencies:
       flow-enums-runtime: 0.0.6
@@ -13515,6 +13635,15 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  metro-cache@0.83.8:
+    dependencies:
+      exponential-backoff: 3.1.3
+      flow-enums-runtime: 0.0.6
+      https-proxy-agent: 7.0.6
+      metro-core: 0.83.8
+    transitivePeerDependencies:
+      - supports-color
+
   metro-cache@0.84.4:
     dependencies:
       exponential-backoff: 3.1.3
@@ -13533,7 +13662,22 @@ snapshots:
       metro-cache: 0.83.7
       metro-core: 0.83.7
       metro-runtime: 0.83.7
-      yaml: 2.8.4
+      yaml: 2.9.0
+    transitivePeerDependencies:
+      - bufferutil
+      - supports-color
+      - utf-8-validate
+
+  metro-config@0.83.8:
+    dependencies:
+      connect: 3.7.0
+      flow-enums-runtime: 0.0.6
+      jest-validate: 29.7.0
+      metro: 0.83.8
+      metro-cache: 0.83.8
+      metro-core: 0.83.8
+      metro-runtime: 0.83.8
+      yaml: 2.9.0
     transitivePeerDependencies:
       - bufferutil
       - supports-color
@@ -13560,6 +13704,12 @@ snapshots:
       lodash.throttle: 4.1.1
       metro-resolver: 0.83.7
 
+  metro-core@0.83.8:
+    dependencies:
+      flow-enums-runtime: 0.0.6
+      lodash.throttle: 4.1.1
+      metro-resolver: 0.83.8
+
   metro-core@0.84.4:
     dependencies:
       flow-enums-runtime: 0.0.6
@@ -13580,6 +13730,20 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  metro-file-map@0.83.8:
+    dependencies:
+      debug: 4.4.3
+      fb-watchman: 2.0.2
+      flow-enums-runtime: 0.0.6
+      graceful-fs: 4.2.11
+      invariant: 2.2.4
+      jest-worker: 29.7.0
+      micromatch: 4.0.8
+      nullthrows: 1.1.1
+      walker: 1.0.8
+    transitivePeerDependencies:
+      - supports-color
+
   metro-file-map@0.84.4:
     dependencies:
       debug: 4.4.3
@@ -13597,7 +13761,12 @@ snapshots:
   metro-minify-terser@0.83.7:
     dependencies:
       flow-enums-runtime: 0.0.6
-      terser: 5.46.2
+      terser: 5.49.1
+
+  metro-minify-terser@0.83.8:
+    dependencies:
+      flow-enums-runtime: 0.0.6
+      terser: 5.49.1
 
   metro-minify-terser@0.84.4:
     dependencies:
@@ -13608,13 +13777,22 @@ snapshots:
     dependencies:
       flow-enums-runtime: 0.0.6
 
+  metro-resolver@0.83.8:
+    dependencies:
+      flow-enums-runtime: 0.0.6
+
   metro-resolver@0.84.4:
     dependencies:
       flow-enums-runtime: 0.0.6
 
   metro-runtime@0.83.7:
     dependencies:
-      '@babel/runtime': 7.29.2
+      '@babel/runtime': 7.29.7
+      flow-enums-runtime: 0.0.6
+
+  metro-runtime@0.83.8:
+    dependencies:
+      '@babel/runtime': 7.29.7
       flow-enums-runtime: 0.0.6
 
   metro-runtime@0.84.4:
@@ -13624,8 +13802,8 @@ snapshots:
 
   metro-source-map@0.83.7:
     dependencies:
-      '@babel/traverse': 7.29.0
-      '@babel/types': 7.29.0
+      '@babel/traverse': 7.29.8
+      '@babel/types': 7.29.8
       flow-enums-runtime: 0.0.6
       invariant: 2.2.4
       metro-symbolicate: 0.83.7
@@ -13636,6 +13814,20 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  metro-source-map@0.83.8:
+    dependencies:
+      '@babel/traverse': 7.29.8
+      '@babel/types': 7.29.8
+      flow-enums-runtime: 0.0.6
+      invariant: 2.2.4
+      metro-symbolicate: 0.83.8
+      nullthrows: 1.1.1
+      ob1: 0.83.8
+      source-map: 0.5.7
+      vlq: 1.0.1
+    transitivePeerDependencies:
+      - supports-color
+
   metro-source-map@0.84.4:
     dependencies:
       '@babel/traverse': 7.29.8
@@ -13661,6 +13853,17 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  metro-symbolicate@0.83.8:
+    dependencies:
+      flow-enums-runtime: 0.0.6
+      invariant: 2.2.4
+      metro-source-map: 0.83.8
+      nullthrows: 1.1.1
+      source-map: 0.5.7
+      vlq: 1.0.1
+    transitivePeerDependencies:
+      - supports-color
+
   metro-symbolicate@0.84.4:
     dependencies:
       flow-enums-runtime: 0.0.6
@@ -13675,9 +13878,20 @@ snapshots:
   metro-transform-plugins@0.83.7:
     dependencies:
       '@babel/core': 7.29.7
-      '@babel/generator': 7.29.1
-      '@babel/template': 7.28.6
-      '@babel/traverse': 7.29.0
+      '@babel/generator': 7.29.8
+      '@babel/template': 7.29.7
+      '@babel/traverse': 7.29.8
+      flow-enums-runtime: 0.0.6
+      nullthrows: 1.1.1
+    transitivePeerDependencies:
+      - supports-color
+
+  metro-transform-plugins@0.83.8:
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/generator': 7.29.8
+      '@babel/template': 7.29.7
+      '@babel/traverse': 7.29.8
       flow-enums-runtime: 0.0.6
       nullthrows: 1.1.1
     transitivePeerDependencies:
@@ -13697,9 +13911,9 @@ snapshots:
   metro-transform-worker@0.83.7:
     dependencies:
       '@babel/core': 7.29.7
-      '@babel/generator': 7.29.1
-      '@babel/parser': 7.29.3
-      '@babel/types': 7.29.0
+      '@babel/generator': 7.29.8
+      '@babel/parser': 7.29.8
+      '@babel/types': 7.29.8
       flow-enums-runtime: 0.0.6
       metro: 0.83.7
       metro-babel-transformer: 0.83.7
@@ -13714,6 +13928,26 @@ snapshots:
       - supports-color
       - utf-8-validate
 
+  metro-transform-worker@0.83.8:
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/generator': 7.29.8
+      '@babel/parser': 7.29.8
+      '@babel/types': 7.29.8
+      flow-enums-runtime: 0.0.6
+      metro: 0.83.8
+      metro-babel-transformer: 0.83.8
+      metro-cache: 0.83.8
+      metro-cache-key: 0.83.8
+      metro-minify-terser: 0.83.8
+      metro-source-map: 0.83.8
+      metro-transform-plugins: 0.83.8
+      nullthrows: 1.1.1
+    transitivePeerDependencies:
+      - bufferutil
+      - supports-color
+      - utf-8-validate
+
   metro-transform-worker@0.84.4:
     dependencies:
       '@babel/core': 7.29.7
@@ -13736,13 +13970,13 @@ snapshots:
 
   metro@0.83.7:
     dependencies:
-      '@babel/code-frame': 7.29.0
+      '@babel/code-frame': 7.29.7
       '@babel/core': 7.29.7
-      '@babel/generator': 7.29.1
-      '@babel/parser': 7.29.3
-      '@babel/template': 7.28.6
-      '@babel/traverse': 7.29.0
-      '@babel/types': 7.29.0
+      '@babel/generator': 7.29.8
+      '@babel/parser': 7.29.8
+      '@babel/template': 7.29.7
+      '@babel/traverse': 7.29.8
+      '@babel/types': 7.29.8
       accepts: 2.0.0
       ci-info: 2.0.0
       connect: 3.7.0
@@ -13773,8 +14007,53 @@ snapshots:
       serialize-error: 2.1.0
       source-map: 0.5.7
       throat: 5.0.0
-      ws: 7.5.11
-      yargs: 17.7.2
+      ws: 7.5.13
+      yargs: 17.7.3
+    transitivePeerDependencies:
+      - bufferutil
+      - supports-color
+      - utf-8-validate
+
+  metro@0.83.8:
+    dependencies:
+      '@babel/code-frame': 7.29.7
+      '@babel/core': 7.29.7
+      '@babel/generator': 7.29.8
+      '@babel/parser': 7.29.8
+      '@babel/template': 7.29.7
+      '@babel/traverse': 7.29.8
+      '@babel/types': 7.29.8
+      accepts: 2.0.0
+      ci-info: 2.0.0
+      connect: 3.7.0
+      debug: 4.4.3
+      error-stack-parser: 2.1.4
+      flow-enums-runtime: 0.0.6
+      graceful-fs: 4.2.11
+      hermes-parser: 0.35.0
+      invariant: 2.2.4
+      jest-worker: 29.7.0
+      jsc-safe-url: 0.2.4
+      lodash.throttle: 4.1.1
+      metro-babel-transformer: 0.83.8
+      metro-cache: 0.83.8
+      metro-cache-key: 0.83.8
+      metro-config: 0.83.8
+      metro-core: 0.83.8
+      metro-file-map: 0.83.8
+      metro-resolver: 0.83.8
+      metro-runtime: 0.83.8
+      metro-source-map: 0.83.8
+      metro-symbolicate: 0.83.8
+      metro-transform-plugins: 0.83.8
+      metro-transform-worker: 0.83.8
+      mime-types: 3.0.2
+      nullthrows: 1.1.1
+      serialize-error: 2.1.0
+      source-map: 0.5.7
+      throat: 5.0.0
+      ws: 7.5.13
+      yargs: 17.7.3
     transitivePeerDependencies:
       - bufferutil
       - supports-color
@@ -13869,7 +14148,7 @@ snapshots:
 
   ms@2.1.3: {}
 
-  multitars@1.0.0: {}
+  multitars@1.0.2: {}
 
   nanoid@3.3.18: {}
 
@@ -13904,7 +14183,7 @@ snapshots:
     dependencies:
       hosted-git-info: 7.0.2
       proc-log: 4.2.0
-      semver: 7.8.4
+      semver: 7.8.5
       validate-npm-package-name: 5.0.1
 
   npm-run-path@4.0.1:
@@ -13923,6 +14202,10 @@ snapshots:
     dependencies:
       flow-enums-runtime: 0.0.6
 
+  ob1@0.83.8:
+    dependencies:
+      flow-enums-runtime: 0.0.6
+
   ob1@0.84.4:
     dependencies:
       flow-enums-runtime: 0.0.6
@@ -14028,51 +14311,51 @@ snapshots:
       object-keys: 1.1.1
       safe-push-apply: 1.0.0
 
-  oxfmt@0.52.0:
+  oxfmt@0.65.0:
     dependencies:
       tinypool: 2.1.0
     optionalDependencies:
-      '@oxfmt/binding-android-arm-eabi': 0.52.0
-      '@oxfmt/binding-android-arm64': 0.52.0
-      '@oxfmt/binding-darwin-arm64': 0.52.0
-      '@oxfmt/binding-darwin-x64': 0.52.0
-      '@oxfmt/binding-freebsd-x64': 0.52.0
-      '@oxfmt/binding-linux-arm-gnueabihf': 0.52.0
-      '@oxfmt/binding-linux-arm-musleabihf': 0.52.0
-      '@oxfmt/binding-linux-arm64-gnu': 0.52.0
-      '@oxfmt/binding-linux-arm64-musl': 0.52.0
-      '@oxfmt/binding-linux-ppc64-gnu': 0.52.0
-      '@oxfmt/binding-linux-riscv64-gnu': 0.52.0
-      '@oxfmt/binding-linux-riscv64-musl': 0.52.0
-      '@oxfmt/binding-linux-s390x-gnu': 0.52.0
-      '@oxfmt/binding-linux-x64-gnu': 0.52.0
-      '@oxfmt/binding-linux-x64-musl': 0.52.0
-      '@oxfmt/binding-openharmony-arm64': 0.52.0
-      '@oxfmt/binding-win32-arm64-msvc': 0.52.0
-      '@oxfmt/binding-win32-ia32-msvc': 0.52.0
-      '@oxfmt/binding-win32-x64-msvc': 0.52.0
+      '@oxfmt/binding-android-arm-eabi': 0.65.0
+      '@oxfmt/binding-android-arm64': 0.65.0
+      '@oxfmt/binding-darwin-arm64': 0.65.0
+      '@oxfmt/binding-darwin-x64': 0.65.0
+      '@oxfmt/binding-freebsd-x64': 0.65.0
+      '@oxfmt/binding-linux-arm-gnueabihf': 0.65.0
+      '@oxfmt/binding-linux-arm-musleabihf': 0.65.0
+      '@oxfmt/binding-linux-arm64-gnu': 0.65.0
+      '@oxfmt/binding-linux-arm64-musl': 0.65.0
+      '@oxfmt/binding-linux-ppc64-gnu': 0.65.0
+      '@oxfmt/binding-linux-riscv64-gnu': 0.65.0
+      '@oxfmt/binding-linux-riscv64-musl': 0.65.0
+      '@oxfmt/binding-linux-s390x-gnu': 0.65.0
+      '@oxfmt/binding-linux-x64-gnu': 0.65.0
+      '@oxfmt/binding-linux-x64-musl': 0.65.0
+      '@oxfmt/binding-openharmony-arm64': 0.65.0
+      '@oxfmt/binding-win32-arm64-msvc': 0.65.0
+      '@oxfmt/binding-win32-ia32-msvc': 0.65.0
+      '@oxfmt/binding-win32-x64-msvc': 0.65.0
 
-  oxlint@1.71.0:
+  oxlint@1.80.0:
     optionalDependencies:
-      '@oxlint/binding-android-arm-eabi': 1.71.0
-      '@oxlint/binding-android-arm64': 1.71.0
-      '@oxlint/binding-darwin-arm64': 1.71.0
-      '@oxlint/binding-darwin-x64': 1.71.0
-      '@oxlint/binding-freebsd-x64': 1.71.0
-      '@oxlint/binding-linux-arm-gnueabihf': 1.71.0
-      '@oxlint/binding-linux-arm-musleabihf': 1.71.0
-      '@oxlint/binding-linux-arm64-gnu': 1.71.0
-      '@oxlint/binding-linux-arm64-musl': 1.71.0
-      '@oxlint/binding-linux-ppc64-gnu': 1.71.0
-      '@oxlint/binding-linux-riscv64-gnu': 1.71.0
-      '@oxlint/binding-linux-riscv64-musl': 1.71.0
-      '@oxlint/binding-linux-s390x-gnu': 1.71.0
-      '@oxlint/binding-linux-x64-gnu': 1.71.0
-      '@oxlint/binding-linux-x64-musl': 1.71.0
-      '@oxlint/binding-openharmony-arm64': 1.71.0
-      '@oxlint/binding-win32-arm64-msvc': 1.71.0
-      '@oxlint/binding-win32-ia32-msvc': 1.71.0
-      '@oxlint/binding-win32-x64-msvc': 1.71.0
+      '@oxlint/binding-android-arm-eabi': 1.80.0
+      '@oxlint/binding-android-arm64': 1.80.0
+      '@oxlint/binding-darwin-arm64': 1.80.0
+      '@oxlint/binding-darwin-x64': 1.80.0
+      '@oxlint/binding-freebsd-x64': 1.80.0
+      '@oxlint/binding-linux-arm-gnueabihf': 1.80.0
+      '@oxlint/binding-linux-arm-musleabihf': 1.80.0
+      '@oxlint/binding-linux-arm64-gnu': 1.80.0
+      '@oxlint/binding-linux-arm64-musl': 1.80.0
+      '@oxlint/binding-linux-ppc64-gnu': 1.80.0
+      '@oxlint/binding-linux-riscv64-gnu': 1.80.0
+      '@oxlint/binding-linux-riscv64-musl': 1.80.0
+      '@oxlint/binding-linux-s390x-gnu': 1.80.0
+      '@oxlint/binding-linux-x64-gnu': 1.80.0
+      '@oxlint/binding-linux-x64-musl': 1.80.0
+      '@oxlint/binding-openharmony-arm64': 1.80.0
+      '@oxlint/binding-win32-arm64-msvc': 1.80.0
+      '@oxlint/binding-win32-ia32-msvc': 1.80.0
+      '@oxlint/binding-win32-x64-msvc': 1.80.0
 
   p-limit@2.3.0:
     dependencies:
@@ -14240,21 +14523,21 @@ snapshots:
   react-devtools-core@6.1.5:
     dependencies:
       shell-quote: 1.10.0
-      ws: 7.5.11
+      ws: 7.5.13
     transitivePeerDependencies:
       - bufferutil
       - utf-8-validate
 
-  react-dom@19.2.6(react@19.2.6):
+  react-dom@19.2.8(react@19.2.8):
     dependencies:
-      react: 19.2.6
+      react: 19.2.8
       scheduler: 0.27.0
 
   react-fast-compare@3.2.2: {}
 
-  react-freeze@1.0.4(react@19.2.6):
+  react-freeze@1.0.4(react@19.2.8):
     dependencies:
-      react: 19.2.6
+      react: 19.2.8
 
   react-is@16.13.1: {}
 
@@ -14262,49 +14545,51 @@ snapshots:
 
   react-is@19.2.6: {}
 
-  react-native-gesture-handler@2.31.2(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6):
+  react-is@19.2.8: {}
+
+  react-native-gesture-handler@2.31.2(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8):
     dependencies:
       '@egjs/hammerjs': 2.0.17
       '@types/react-test-renderer': 19.1.0
       hoist-non-react-statics: 3.3.2
       invariant: 2.2.4
-      react: 19.2.6
-      react-native: 0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)
+      react: 19.2.8
+      react-native: 0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)
 
-  react-native-is-edge-to-edge@1.3.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6):
+  react-native-is-edge-to-edge@1.3.1(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8):
     dependencies:
-      react: 19.2.6
-      react-native: 0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)
+      react: 19.2.8
+      react-native: 0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)
 
-  react-native-reanimated@4.3.0(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6):
+  react-native-reanimated@4.3.4(react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8))(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8):
     dependencies:
-      react: 19.2.6
-      react-native: 0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)
-      react-native-is-edge-to-edge: 1.3.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
-      react-native-worklets: 0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
-      semver: 7.7.4
+      react: 19.2.8
+      react-native: 0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)
+      react-native-is-edge-to-edge: 1.3.1(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
+      react-native-worklets: 0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
+      semver: 7.8.5
 
-  react-native-safe-area-context@5.7.0(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6):
+  react-native-safe-area-context@5.7.0(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8):
     dependencies:
-      react: 19.2.6
-      react-native: 0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)
+      react: 19.2.8
+      react-native: 0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)
 
-  react-native-screens@4.24.0(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6):
+  react-native-screens@4.24.0(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8):
     dependencies:
-      react: 19.2.6
-      react-freeze: 1.0.4(react@19.2.6)
-      react-native: 0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)
+      react: 19.2.8
+      react-freeze: 1.0.4(react@19.2.8)
+      react-native: 0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)
       warn-once: 0.1.1
 
-  react-native-svg@15.15.4(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6):
+  react-native-svg@15.15.4(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8):
     dependencies:
       css-select: 5.2.2
       css-tree: 1.1.3
-      react: 19.2.6
-      react-native: 0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)
+      react: 19.2.8
+      react-native: 0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)
       warn-once: 0.1.1
 
-  react-native-web@0.21.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6):
+  react-native-web@0.21.2(react-dom@19.2.8(react@19.2.8))(react@19.2.8):
     dependencies:
       '@babel/runtime': 7.29.2
       '@react-native/normalize-colors': 0.74.89
@@ -14313,20 +14598,21 @@ snapshots:
       memoize-one: 6.0.0
       nullthrows: 1.1.1
       postcss-value-parser: 4.2.0
-      react: 19.2.6
-      react-dom: 19.2.6(react@19.2.6)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
       styleq: 0.1.3
     transitivePeerDependencies:
       - encoding
 
-  react-native-webview@13.16.1(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6):
+  react-native-webview@13.16.2(patch_hash=de6761dfa76a5491a23e49f1262566a8831cab26736a336fdffc5d4e7d05ff27)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8):
     dependencies:
+      '@typescript/native-preview': 7.0.0-dev.20260707.2
       escape-string-regexp: 4.0.0
       invariant: 2.2.4
-      react: 19.2.6
-      react-native: 0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)
+      react: 19.2.8
+      react-native: 0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)
 
-  react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6):
+  react-native-worklets@0.8.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8):
     dependencies:
       '@babel/core': 7.29.7
       '@babel/plugin-transform-arrow-functions': 7.27.1(@babel/core@7.29.7)
@@ -14340,22 +14626,22 @@ snapshots:
       '@babel/preset-typescript': 7.28.5(@babel/core@7.29.7)
       '@react-native/metro-config': 0.85.2(@babel/core@7.29.7)
       convert-source-map: 2.0.0
-      react: 19.2.6
-      react-native: 0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6)
+      react: 19.2.8
+      react-native: 0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8)
       semver: 7.7.4
     transitivePeerDependencies:
       - supports-color
 
-  react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6):
+  react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8):
     dependencies:
       '@jest/create-cache-key-function': 29.7.0
-      '@react-native/assets-registry': 0.83.9
-      '@react-native/codegen': 0.83.9(@babel/core@7.29.7)
-      '@react-native/community-cli-plugin': 0.83.9(@react-native/metro-config@0.85.2(@babel/core@7.29.7))
-      '@react-native/gradle-plugin': 0.83.9
-      '@react-native/js-polyfills': 0.83.9
-      '@react-native/normalize-colors': 0.83.9
-      '@react-native/virtualized-lists': 0.83.9(@types/react@19.2.14)(react-native@0.83.9(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
+      '@react-native/assets-registry': 0.83.10
+      '@react-native/codegen': 0.83.10(@babel/core@7.29.7)
+      '@react-native/community-cli-plugin': 0.83.10(@react-native/metro-config@0.85.2(@babel/core@7.29.7))
+      '@react-native/gradle-plugin': 0.83.10
+      '@react-native/js-polyfills': 0.83.10
+      '@react-native/normalize-colors': 0.83.10
+      '@react-native/virtualized-lists': 0.83.10(@types/react@19.2.14)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7)(@react-native/metro-config@0.85.2(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.8))(react@19.2.8)
       abort-controller: 3.0.0
       anser: 1.4.10
       ansi-regex: 5.0.1
@@ -14374,16 +14660,16 @@ snapshots:
       nullthrows: 1.1.1
       pretty-format: 29.7.0
       promise: 8.3.0
-      react: 19.2.6
+      react: 19.2.8
       react-devtools-core: 6.1.5
       react-refresh: 0.14.2
       regenerator-runtime: 0.13.11
       scheduler: 0.27.0
-      semver: 7.7.4
+      semver: 7.8.5
       stacktrace-parser: 0.1.11
       whatwg-fetch: 3.6.20
-      ws: 7.5.11
-      yargs: 17.7.2
+      ws: 7.5.13
+      yargs: 17.7.3
     optionalDependencies:
       '@types/react': 19.2.14
     transitivePeerDependencies:
@@ -14396,46 +14682,46 @@ snapshots:
 
   react-refresh@0.14.2: {}
 
-  react-remove-scroll-bar@2.3.8(@types/react@19.2.14)(react@19.2.6):
+  react-remove-scroll-bar@2.3.8(@types/react@19.2.14)(react@19.2.8):
     dependencies:
-      react: 19.2.6
-      react-style-singleton: 2.2.3(@types/react@19.2.14)(react@19.2.6)
+      react: 19.2.8
+      react-style-singleton: 2.2.3(@types/react@19.2.14)(react@19.2.8)
       tslib: 2.8.1
     optionalDependencies:
       '@types/react': 19.2.14
 
-  react-remove-scroll@2.7.2(@types/react@19.2.14)(react@19.2.6):
+  react-remove-scroll@2.7.2(@types/react@19.2.14)(react@19.2.8):
     dependencies:
-      react: 19.2.6
-      react-remove-scroll-bar: 2.3.8(@types/react@19.2.14)(react@19.2.6)
-      react-style-singleton: 2.2.3(@types/react@19.2.14)(react@19.2.6)
+      react: 19.2.8
+      react-remove-scroll-bar: 2.3.8(@types/react@19.2.14)(react@19.2.8)
+      react-style-singleton: 2.2.3(@types/react@19.2.14)(react@19.2.8)
       tslib: 2.8.1
-      use-callback-ref: 1.3.3(@types/react@19.2.14)(react@19.2.6)
-      use-sidecar: 1.1.3(@types/react@19.2.14)(react@19.2.6)
+      use-callback-ref: 1.3.3(@types/react@19.2.14)(react@19.2.8)
+      use-sidecar: 1.1.3(@types/react@19.2.14)(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.14
 
-  react-style-singleton@2.2.3(@types/react@19.2.14)(react@19.2.6):
+  react-style-singleton@2.2.3(@types/react@19.2.14)(react@19.2.8):
     dependencies:
       get-nonce: 1.0.1
-      react: 19.2.6
+      react: 19.2.8
       tslib: 2.8.1
     optionalDependencies:
       '@types/react': 19.2.14
 
-  react-test-renderer@19.2.0(react@19.2.6):
+  react-test-renderer@19.2.0(react@19.2.8):
     dependencies:
-      react: 19.2.6
+      react: 19.2.8
       react-is: 19.2.6
       scheduler: 0.27.0
 
-  react-test-renderer@19.2.6(react@19.2.6):
+  react-test-renderer@19.2.8(react@19.2.8):
     dependencies:
-      react: 19.2.6
-      react-is: 19.2.6
+      react: 19.2.8
+      react-is: 19.2.8
       scheduler: 0.27.0
 
-  react@19.2.6: {}
+  react@19.2.8: {}
 
   readdirp@3.6.0:
     dependencies:
@@ -14606,8 +14892,6 @@ snapshots:
 
   semver@7.7.4: {}
 
-  semver@7.8.4: {}
-
   semver@7.8.5: {}
 
   send@0.19.2:
@@ -14795,6 +15079,8 @@ snapshots:
 
   strict-uri-encode@2.0.0: {}
 
+  strictdom@1.0.1: {}
+
   string-length@4.0.2:
     dependencies:
       char-regex: 1.0.2
@@ -14919,13 +15205,6 @@ snapshots:
       ansi-escapes: 4.3.2
       supports-hyperlinks: 2.3.0
 
-  terser@5.46.2:
-    dependencies:
-      '@jridgewell/source-map': 0.3.11
-      acorn: 8.15.0
-      commander: 2.20.3
-      source-map-support: 0.5.21
-
   terser@5.49.1:
     dependencies:
       '@jridgewell/source-map': 0.3.11
@@ -14981,10 +15260,6 @@ snapshots:
     dependencies:
       typescript: 5.9.3
 
-  ts-api-utils@2.5.0(typescript@6.0.3):
-    dependencies:
-      typescript: 6.0.3
-
   ts-declaration-location@1.0.7(typescript@5.9.3):
     dependencies:
       picomatch: 4.0.4
@@ -15121,28 +15396,28 @@ snapshots:
       querystringify: 2.2.0
       requires-port: 1.0.0
 
-  use-callback-ref@1.3.3(@types/react@19.2.14)(react@19.2.6):
+  use-callback-ref@1.3.3(@types/react@19.2.14)(react@19.2.8):
     dependencies:
-      react: 19.2.6
+      react: 19.2.8
       tslib: 2.8.1
     optionalDependencies:
       '@types/react': 19.2.14
 
-  use-latest-callback@0.2.6(react@19.2.6):
+  use-latest-callback@0.2.6(react@19.2.8):
     dependencies:
-      react: 19.2.6
+      react: 19.2.8
 
-  use-sidecar@1.1.3(@types/react@19.2.14)(react@19.2.6):
+  use-sidecar@1.1.3(@types/react@19.2.14)(react@19.2.8):
     dependencies:
       detect-node-es: 1.1.0
-      react: 19.2.6
+      react: 19.2.8
       tslib: 2.8.1
     optionalDependencies:
       '@types/react': 19.2.14
 
-  use-sync-external-store@1.6.0(react@19.2.6):
+  use-sync-external-store@1.6.0(react@19.2.8):
     dependencies:
-      react: 19.2.6
+      react: 19.2.8
 
   utils-merge@1.0.1: {}
 
@@ -15158,11 +15433,11 @@ snapshots:
 
   vary@1.1.2: {}
 
-  vaul@1.1.2(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6):
+  vaul@1.1.2(@types/react@19.2.14)(react-dom@19.2.8(react@19.2.8))(react@19.2.8):
     dependencies:
-      '@radix-ui/react-dialog': 1.1.15(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
-      react: 19.2.6
-      react-dom: 19.2.6(react@19.2.6)
+      '@radix-ui/react-dialog': 1.1.15(@types/react@19.2.14)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     transitivePeerDependencies:
       - '@types/react'
       - '@types/react-dom'
@@ -15182,15 +15457,15 @@ snapshots:
       tsx: 4.22.4
       yaml: 2.9.0
 
-  vitest@4.1.9(@types/node@26.1.2)(happy-dom@20.11.1)(jsdom@20.0.3)(vite@8.1.0(@types/node@26.1.2)(esbuild@0.25.4)(terser@5.49.1)(tsx@4.22.4)(yaml@2.9.0)):
+  vitest@4.1.11(@types/node@26.1.2)(happy-dom@20.11.8)(jsdom@20.0.3)(vite@8.1.0(@types/node@26.1.2)(esbuild@0.25.4)(terser@5.49.1)(tsx@4.22.4)(yaml@2.9.0)):
     dependencies:
-      '@vitest/expect': 4.1.9
-      '@vitest/mocker': 4.1.9(vite@8.1.0(@types/node@26.1.2)(esbuild@0.25.4)(terser@5.49.1)(tsx@4.22.4)(yaml@2.9.0))
-      '@vitest/pretty-format': 4.1.9
-      '@vitest/runner': 4.1.9
-      '@vitest/snapshot': 4.1.9
-      '@vitest/spy': 4.1.9
-      '@vitest/utils': 4.1.9
+      '@vitest/expect': 4.1.11
+      '@vitest/mocker': 4.1.11(vite@8.1.0(@types/node@26.1.2)(esbuild@0.25.4)(terser@5.49.1)(tsx@4.22.4)(yaml@2.9.0))
+      '@vitest/pretty-format': 4.1.11
+      '@vitest/runner': 4.1.11
+      '@vitest/snapshot': 4.1.11
+      '@vitest/spy': 4.1.11
+      '@vitest/utils': 4.1.11
       es-module-lexer: 2.1.0
       expect-type: 1.3.0
       magic-string: 0.30.21
@@ -15206,7 +15481,7 @@ snapshots:
       why-is-node-running: 2.3.0
     optionalDependencies:
       '@types/node': 26.1.2
-      happy-dom: 20.11.1
+      happy-dom: 20.11.8
       jsdom: 20.0.3
     transitivePeerDependencies:
       - msw
@@ -15316,11 +15591,9 @@ snapshots:
       imurmurhash: 0.1.4
       signal-exit: 3.0.7
 
-  ws@7.5.11: {}
-
   ws@7.5.13: {}
 
-  ws@8.21.0: {}
+  ws@8.21.3: {}
 
   xcode@3.0.1:
     dependencies:
@@ -15344,8 +15617,6 @@ snapshots:
 
   yallist@3.1.1: {}
 
-  yaml@2.8.4: {}
-
   yaml@2.9.0: {}
 
   yargs-parser@21.1.1: {}
@@ -15376,11 +15647,11 @@ snapshots:
 
   zod@4.4.3: {}
 
-  zustand@5.0.13(@types/react@19.2.14)(react@19.2.6)(use-sync-external-store@1.6.0(react@19.2.6)):
+  zustand@5.0.13(@types/react@19.2.14)(react@19.2.8)(use-sync-external-store@1.6.0(react@19.2.8)):
     optionalDependencies:
       '@types/react': 19.2.14
-      react: 19.2.6
-      use-sync-external-store: 1.6.0(react@19.2.6)
+      react: 19.2.8
+      use-sync-external-store: 1.6.0(react@19.2.8)
 
   zxing-wasm@3.0.3(@types/emscripten@1.41.5):
     dependencies:
diff --git a/mobile/pnpm-workspace.yaml b/mobile/pnpm-workspace.yaml
index 35f983a345a..8f29993b7b4 100644
--- a/mobile/pnpm-workspace.yaml
+++ b/mobile/pnpm-workspace.yaml
@@ -1,5 +1,11 @@
 allowBuilds:
   esbuild: true
 
+minimumReleaseAge: 4320
+
 overrides:
   xcode>uuid: 11.1.1
+
+patchedDependencies:
+  react-native-webview@13.16.2: patches/react-native-webview@13.16.2.patch
+  react-native@0.83.10: patches/react-native@0.83.10.patch
diff --git a/mobile/src/browser/MobileBrowserPane.tsx b/mobile/src/browser/MobileBrowserPane.tsx
index f823f309630..2922d2005a4 100644
--- a/mobile/src/browser/MobileBrowserPane.tsx
+++ b/mobile/src/browser/MobileBrowserPane.tsx
@@ -1,77 +1,31 @@
 /* oxlint-disable react-doctor/no-adjust-state-on-prop-change -- Why: mobile browser state mirrors a remote desktop screencast session and CDP dialogs, which are external systems that cannot be derived during render. */
-import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react'
-import {
-  ActivityIndicator,
-  AppState,
-  Image,
-  PanResponder,
-  PixelRatio,
-  Pressable,
-  Text,
-  TextInput,
-  View,
-  type GestureResponderEvent,
-  type PanResponderGestureState
-} from 'react-native'
-import { ArrowUp, ChevronLeft, ChevronRight, RefreshCw } from 'lucide-react-native'
+import { useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react'
+import { AppState, type Image, type View } from 'react-native'
 import type { RpcClient } from '../transport/rpc-client'
-import type { RpcFailure, RpcSuccess } from '../transport/types'
 import type {
   BrowserScreencastFrame,
   BrowserScreencastFrameMetadata
 } from '../transport/browser-screencast-protocol'
-import { colors } from '../theme/mobile-theme'
-import {
-  MOBILE_BROWSER_FRAME_MIN_INTERVAL_MS,
-  buildMobileBrowserScreencastRequest,
-  type MobileBrowserViewMode
-} from './browser-screencast-request'
-import {
-  MobileBrowserPointerModifiers,
-  type BrowserPointerModifier
-} from './MobileBrowserPointerModifiers'
-import { MobileBrowserKeyRow } from './MobileBrowserKeyRow'
-import { MobileBrowserToolbarIconButton } from './MobileBrowserToolbarIconButton'
-import { MobileBrowserViewModeSwitch } from './MobileBrowserViewModeSwitch'
+import type { MobileBrowserViewMode } from './browser-screencast-request'
+import type { BrowserPointerModifier } from './MobileBrowserPointerModifiers'
 import {
   getInitialMobileBrowserViewMode,
   saveMobileBrowserViewMode
 } from './mobile-browser-view-mode-state'
+import type { BrowserTouchLayout, BrowserZoomState } from './browser-touch-geometry'
 import {
-  clampBrowserZoomState,
-  computeBrowserFrameGeometry,
-  computeBrowserTouchClickRadiusCss,
-  mapScreenToBrowserPoint,
-  readLocalTouchPoint,
-  type BrowserPoint,
-  type BrowserTouchLayout,
-  type BrowserZoomState
-} from './browser-touch-geometry'
-import {
-  MAX_ZOOM,
-  MIN_ZOOM,
-  assertRpcOk,
-  browserErrorMessage,
-  browserFrameMetadataEqual,
-  buttonColor,
-  cacheBrowserFrame,
   clearCachedBrowserFramesForWorktree,
-  createBrowserFrameDataUri,
-  createPinchGesture,
-  getCachedBrowserFrame,
   makeBrowserFrameCacheKey,
   peekCachedBrowserFrame,
-  shouldSurfaceBrowserError,
-  updateBrowserImageSource,
-  updateBrowserLayerVisibility,
-  updatePinchZoom,
   type FrameLayer,
   type PinchGesture
 } from './mobile-browser-frame-state'
-import { mobileBrowserPaneStyles as styles } from './mobile-browser-pane-styles'
 import { displayBrowserUrl, normalizeBrowserUrl } from './browser-url'
-import { MobileBrowserAddressField } from './MobileBrowserAddressField'
 import { resolveMobileBrowserAddressSync } from './mobile-browser-address-sync'
+import { MobileBrowserPaneView } from './MobileBrowserPaneView'
+import { useMobileBrowserInteractions } from './use-mobile-browser-interactions'
+import { useMobileBrowserPaneLayers } from './use-mobile-browser-pane-layers'
+import { useMobileBrowserStream } from './use-mobile-browser-stream'
 
 export type MobileBrowserTab = {
   type: 'browser'
@@ -108,26 +62,8 @@ type BrowserDialogState = {
   message: string
 }
 
-const TAP_SLOP = 16
-const SCROLL_START_SLOP = 22
-const LONG_PRESS_MS = 550
-const WHEEL_INTERVAL_MS = 70
-const TOUCH_CLICK_RADIUS_DIP = 14
 const DEFAULT_ZOOM: BrowserZoomState = { scale: 1, offsetX: 0, offsetY: 0 }
 
-type BrowserPageParams = {
-  worktree: string
-  page: string
-}
-
-type PendingWheelCommand = {
-  base: BrowserPageParams
-  point: BrowserPoint
-  gestureId: number
-  dx: number
-  dy: number
-}
-
 export function MobileBrowserPane({
   client,
   worktreeId,
@@ -180,17 +116,12 @@ export function MobileBrowserPane({
   const frameThrottleTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null)
   const dialogRef = useRef<BrowserDialogState | null>(null)
   const lastStreamCacheKeyRef = useRef<string | null>(cacheKey)
-  const startPointRef = useRef<{ x: number; y: number; t: number } | null>(null)
   const longPressTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null)
-  const rightClickSentRef = useRef(false)
-  const lastWheelRef = useRef<{ dx: number; dy: number; at: number }>({ dx: 0, dy: 0, at: 0 })
-  const wheelGestureIdRef = useRef(0)
-  const pendingWheelCommandRef = useRef<PendingWheelCommand | null>(null)
-  const wheelCommandInFlightRef = useRef(false)
+  const startPointRef = useRef<{ x: number; y: number; t: number } | null>(null)
+  const scrollingRef = useRef(false)
   const zoomRef = useRef<BrowserZoomState>(DEFAULT_ZOOM)
   const pinchRef = useRef<PinchGesture | null>(null)
   const panRef = useRef<PanGesture | null>(null)
-  const scrollingRef = useRef(false)
   const lastZoomResetUrlRef = useRef(tab.url || 'about:blank')
 
   const clearLongPressTimer = useCallback(() => {
@@ -265,313 +196,40 @@ export function MobileBrowserPane({
     setBrowserViewMode(getInitialMobileBrowserViewMode(worktreeId, tab.browserPageId, tab.url))
   }, [tab.browserPageId, tab.url, worktreeId])
 
-  const pageParams = useCallback(() => {
-    if (!tab.browserPageId) {
-      return null
-    }
-    return {
-      worktree: `id:${worktreeId}`,
-      page: tab.browserPageId
-    }
-  }, [tab.browserPageId, worktreeId])
-
-  const applyFrame = useCallback((frame: BrowserScreencastFrame, frameCacheKey: string): void => {
-    if (!browserFrameMetadataEqual(frameMetadataRef.current, frame.metadata)) {
-      frameMetadataRef.current = frame.metadata
-      setFrameMetadata(frame.metadata)
-    }
-    const nextFrameUri = createBrowserFrameDataUri(frame)
-    cacheBrowserFrame(frameCacheKey, { uri: nextFrameUri, metadata: frame.metadata })
-    if (!frameMountedRef.current) {
-      frameUriRef.current = nextFrameUri
-      frameMountedRef.current = true
-      setFrameUri(nextFrameUri)
-      updateBrowserImageSource(browserImageRefs.current[0], nextFrameUri)
-    } else if (pendingFrameLayerRef.current === null) {
-      // Why: decode the next frame offscreen and keep the previous layer visible
-      // until onLoad; replacing the visible Image directly flashes black.
-      const nextLayer: FrameLayer = visibleFrameLayerRef.current === 0 ? 1 : 0
-      frameUriRef.current = nextFrameUri
-      pendingFrameLayerRef.current = nextLayer
-      updateBrowserImageSource(browserImageRefs.current[nextLayer], nextFrameUri)
-    } else {
-      // Why: popovers/menus can settle in one final frame while the previous
-      // offscreen frame is still decoding. Keep the hidden layer pointed at
-      // the newest frame instead of dropping the final static state.
-      frameUriRef.current = nextFrameUri
-      updateBrowserImageSource(browserImageRefs.current[pendingFrameLayerRef.current], nextFrameUri)
-    }
-    if (busyRef.current) {
-      busyRef.current = false
-      setBusy(false)
-    }
-  }, [])
-
-  const clearFrameThrottle = useCallback(() => {
-    pendingThrottledFrameRef.current = null
-    if (frameThrottleTimerRef.current) {
-      clearTimeout(frameThrottleTimerRef.current)
-      frameThrottleTimerRef.current = null
-    }
-  }, [])
-
-  const applyFrameThrottled = useCallback(
-    (frame: BrowserScreencastFrame, frameCacheKey: string): void => {
-      const now = Date.now()
-      const elapsed = now - lastAppliedFrameAtRef.current
-      if (lastAppliedFrameAtRef.current === 0 || elapsed >= MOBILE_BROWSER_FRAME_MIN_INTERVAL_MS) {
-        clearFrameThrottle()
-        lastAppliedFrameAtRef.current = now
-        applyFrame(frame, frameCacheKey)
-        return
-      }
-
-      // Why: static UI changes can be the last frame Chromium emits. Coalesce
-      // throttled frames so the final visible state is applied after the delay.
-      pendingThrottledFrameRef.current = { frame, cacheKey: frameCacheKey }
-      if (frameThrottleTimerRef.current) {
-        return
-      }
-      frameThrottleTimerRef.current = setTimeout(
-        () => {
-          frameThrottleTimerRef.current = null
-          const pending = pendingThrottledFrameRef.current
-          pendingThrottledFrameRef.current = null
-          if (!pending) {
-            return
-          }
-          lastAppliedFrameAtRef.current = Date.now()
-          applyFrame(pending.frame, pending.cacheKey)
-        },
-        Math.max(0, MOBILE_BROWSER_FRAME_MIN_INTERVAL_MS - elapsed)
-      )
-    },
-    [applyFrame, clearFrameThrottle]
-  )
-
-  const streamRequest = useMemo(
-    () => buildMobileBrowserScreencastRequest(layout, PixelRatio.get(), browserViewMode),
-    [browserViewMode, layout]
-  )
-
-  const frameGeometry = useMemo(
-    () => computeBrowserFrameGeometry(layout, frameMetadata),
-    [frameMetadata, layout]
-  )
-
-  useEffect(() => {
-    if (!frameGeometry) {
-      return
-    }
-    setZoom((current) => {
-      const next = clampBrowserZoomState(current, frameGeometry, MIN_ZOOM, MAX_ZOOM)
-      if (
-        next.scale === current.scale &&
-        next.offsetX === current.offsetX &&
-        next.offsetY === current.offsetY
-      ) {
-        return current
-      }
-      // Why: rotation/layout changes can shrink the legal pan range while the
-      // current zoom state still points at the previous viewport geometry.
-      zoomRef.current = next
-      return next
-    })
-  }, [frameGeometry])
-
-  useEffect(() => {
-    streamGenerationRef.current += 1
-    const generation = streamGenerationRef.current
-    const sameStream = Boolean(cacheKey) && lastStreamCacheKeyRef.current === cacheKey
-    lastStreamCacheKeyRef.current = cacheKey
-    if (!sameStream || !frameUriRef.current) {
-      const cachedFrame = getCachedBrowserFrame(cacheKey)
-      if (cachedFrame) {
-        frameUriRef.current = cachedFrame.uri
-        frameMountedRef.current = true
-        frameMetadataRef.current = cachedFrame.metadata
-        setFrameUri(cachedFrame.uri)
-        setFrameMetadata(cachedFrame.metadata)
-      } else {
-        frameUriRef.current = null
-        frameMountedRef.current = false
-        setFrameUri(null)
-        setFrameMetadata(null)
-        frameMetadataRef.current = null
-      }
-    } else {
-      frameMountedRef.current = true
-    }
-    pendingFrameLayerRef.current = null
-    if (!sameStream || !frameUriRef.current) {
-      visibleFrameLayerRef.current = 0
-    }
-    updateBrowserLayerVisibility(browserLayerRefs.current, visibleFrameLayerRef.current)
-    lastAppliedFrameAtRef.current = 0
-    clearFrameThrottle()
-    busyRef.current = false
-    setDialog(null)
-    setError(null)
-    if (
-      !client ||
-      screencastSupported !== true ||
-      !tab.browserPageId ||
-      !appActive ||
-      !streamRequest
-    ) {
-      busyRef.current = false
-      setBusy(false)
-      if (screencastSupported === false) {
-        setError('Update desktop Orca to stream browser tabs on mobile.')
-      } else if (screencastSupported === null) {
-        setError('Checking desktop browser streaming support.')
-      } else if (!tab.browserPageId) {
-        setError('Browser page is not available yet.')
-      }
-      return
-    }
-    busyRef.current = true
-    setBusy(true)
-    let startupTimer: ReturnType<typeof setTimeout> | null = setTimeout(() => {
-      if (streamGenerationRef.current !== generation) {
-        return
-      }
-      busyRef.current = false
-      setBusy(false)
-      setError('Browser stream timed out.')
-    }, 15_000)
-    const clearStartupTimer = (): void => {
-      if (startupTimer) {
-        clearTimeout(startupTimer)
-        startupTimer = null
-      }
-    }
-    const unsubscribe = client.subscribe(
-      'browser.screencast',
-      {
-        worktree: `id:${worktreeId}`,
-        page: tab.browserPageId,
-        ...streamRequest
-      },
-      (payload) => {
-        if (streamGenerationRef.current !== generation) {
-          return
-        }
-        const event = payload as {
-          type?: string
-          message?: string
-          error?: { message?: string }
-          dialogType?: string
-          tab?: { url?: string; title?: string; canGoBack?: boolean; canGoForward?: boolean }
-        }
-        if (event.type === 'ready') {
-          clearStartupTimer()
-          if (busyRef.current) {
-            busyRef.current = false
-            setBusy(false)
-          }
-          if (typeof event.tab?.url === 'string') {
-            setAddressValue(displayBrowserUrl(event.tab.url))
-            if (event.tab.url !== lastZoomResetUrlRef.current) {
-              lastZoomResetUrlRef.current = event.tab.url
-              resetBrowserZoomState()
-            }
-          }
-        } else if (event.type === 'end') {
-          clearStartupTimer()
-          if (busyRef.current) {
-            busyRef.current = false
-            setBusy(false)
-          }
-        } else if (event.type === 'dialog') {
-          setDialog({
-            dialogType: event.dialogType ?? 'alert',
-            message: event.message ?? 'Browser dialog'
-          })
-        } else if (event.type === 'dialogClosed') {
-          setDialog(null)
-        } else if (event.type === 'error') {
-          clearStartupTimer()
-          if (busyRef.current) {
-            busyRef.current = false
-            setBusy(false)
-          }
-          const message = event.message ?? event.error?.message ?? 'Browser stream failed.'
-          if (shouldSurfaceBrowserError(message)) {
-            setError(message)
-          }
-        }
-      },
-      {
-        onBinaryFrame: (frame) => {
-          if (streamGenerationRef.current !== generation) {
-            return
-          }
-          clearStartupTimer()
-          if (cacheKey) {
-            applyFrameThrottled(frame, cacheKey)
-          }
-        }
-      }
-    )
-    return () => {
-      clearStartupTimer()
-      clearFrameThrottle()
-      unsubscribe()
-    }
-  }, [
+  const { frameGeometry, pageParams, sendBrowserRequest } = useMobileBrowserStream({
     appActive,
-    applyFrameThrottled,
-    clearFrameThrottle,
+    browserImageRefs,
+    browserLayerRefs,
+    browserViewMode,
+    busyRef,
+    cacheKey,
     client,
+    frameMetadata,
+    frameMetadataRef,
+    frameMountedRef,
+    frameThrottleTimerRef,
+    frameUriRef,
+    lastAppliedFrameAtRef,
+    lastStreamCacheKeyRef,
+    lastZoomResetUrlRef,
+    layout,
+    pendingFrameLayerRef,
+    pendingThrottledFrameRef,
     resetBrowserZoomState,
     screencastSupported,
-    streamRequest,
-    cacheKey,
-    tab.browserPageId,
-    worktreeId
-  ])
-
-  const sendBrowserRequest = useCallback(
-    async (
-      method: string,
-      params: Record<string, unknown> = {},
-      opts: { showBusy?: boolean; suppressError?: boolean; timeoutMs?: number } = {}
-    ): Promise<unknown | null> => {
-      const base = pageParams()
-      if (!client || !base) {
-        return null
-      }
-      if (opts.showBusy) {
-        busyRef.current = true
-        setBusy(true)
-      }
-      try {
-        const response = await client.sendRequest(
-          method,
-          { ...base, ...params },
-          { timeoutMs: opts.timeoutMs ?? 15_000 }
-        )
-        if (!response.ok) {
-          throw new Error((response as RpcFailure).error.message)
-        }
-        setError(null)
-        return (response as RpcSuccess).result
-      } catch (err) {
-        const message = browserErrorMessage(err, 'Browser command failed')
-        if (!opts.suppressError && shouldSurfaceBrowserError(message)) {
-          setError(message)
-        }
-        return null
-      } finally {
-        if (opts.showBusy) {
-          busyRef.current = false
-          setBusy(false)
-        }
-      }
-    },
-    [client, pageParams]
-  )
+    setAddressValue,
+    setBusy,
+    setDialog,
+    setError,
+    setFrameMetadata,
+    setFrameUri,
+    setZoom,
+    streamGenerationRef,
+    tab,
+    visibleFrameLayerRef,
+    worktreeId,
+    zoomRef
+  })
 
   const navigateToAddress = useCallback(async () => {
     const url = normalizeBrowserUrl(addressValue)
@@ -591,411 +249,45 @@ export function MobileBrowserPane({
     }
   }, [addressValue, resetBrowserZoomState, sendBrowserRequest])
 
-  const flushPendingWheelCommand = useCallback(() => {
-    if (wheelCommandInFlightRef.current) {
-      return
-    }
-    const pending = pendingWheelCommandRef.current
-    if (!pending || !client) {
-      return
-    }
-    pendingWheelCommandRef.current = null
-    wheelCommandInFlightRef.current = true
-    void (async () => {
-      try {
-        assertRpcOk(
-          await client.sendRequest('browser.mouseMove', {
-            ...pending.base,
-            x: pending.point.x,
-            y: pending.point.y
-          }),
-          'Browser pointer move failed'
-        )
-        assertRpcOk(
-          await client.sendRequest('browser.mouseWheel', {
-            ...pending.base,
-            dx: pending.dx,
-            dy: pending.dy
-          }),
-          'Browser scroll failed'
-        )
-        setError(null)
-      } catch {
-        // Scroll bursts commonly race page reload/navigation. Avoid replacing
-        // the live browser with transient command errors like selector_not_found.
-      } finally {
-        wheelCommandInFlightRef.current = false
-        flushPendingWheelCommand()
-      }
-    })()
-  }, [client])
+  const { panResponder, sendDialogCommand, sendKeyboardText, sendKeypress, togglePointerModifier } =
+    useMobileBrowserInteractions({
+      clearLongPressTimer,
+      client,
+      dialogRef,
+      frameGeometry,
+      frameMetadataRef,
+      keyboardValue,
+      layoutRef,
+      longPressTimerRef,
+      onToast,
+      pageParams,
+      panRef,
+      pinchRef,
+      pointerModifiers,
+      sendBrowserRequest,
+      scrollingRef,
+      startPointRef,
+      setDialog,
+      setError,
+      setKeyboardValue,
+      setPointerModifiers,
+      setZoom,
+      zoomRef
+    })
 
-  const sendPointerClick = useCallback(
-    async (point: BrowserPoint, button: 'left' | 'right') => {
-      const base = pageParams()
-      if (!client || !base) {
-        return
-      }
-      const clickResult = await sendBrowserRequest(
-        'browser.mouseClick',
-        {
-          x: point.x,
-          y: point.y,
-          button,
-          modifiers: pointerModifiers,
-          ...(button === 'left'
-            ? {
-                radius: computeBrowserTouchClickRadiusCss(
-                  layoutRef.current,
-                  frameMetadataRef.current,
-                  zoomRef.current,
-                  TOUCH_CLICK_RADIUS_DIP
-                )
-              }
-            : {})
-        },
-        { suppressError: true, timeoutMs: 5_000 }
-      )
-      if (clickResult !== null || pointerModifiers.length > 0) {
-        return
-      }
-      try {
-        assertRpcOk(
-          await client.sendRequest('browser.mouseMove', { ...base, x: point.x, y: point.y }),
-          'Browser pointer move failed'
-        )
-        assertRpcOk(
-          await client.sendRequest('browser.mouseDown', { ...base, button }),
-          'Browser pointer down failed'
-        )
-        assertRpcOk(
-          await client.sendRequest('browser.mouseUp', { ...base, button }),
-          'Browser pointer up failed'
-        )
-        setError(null)
-      } catch {
-        // Pointer commands can race page navigation. Keep the stream visible;
-        // actionable failures still surface through navigation/stream errors.
-      }
-    },
-    [client, pageParams, pointerModifiers, sendBrowserRequest]
-  )
-
-  const togglePointerModifier = useCallback((modifier: BrowserPointerModifier) => {
-    setPointerModifiers((current) =>
-      current.includes(modifier)
-        ? current.filter((candidate) => candidate !== modifier)
-        : [...current, modifier]
-    )
-  }, [])
-
-  const sendWheel = useCallback(
-    (point: BrowserPoint, screenDx: number, screenDy: number) => {
-      const base = pageParams()
-      if (!client || !base) {
-        return
-      }
-      const currentLayout = layoutRef.current
-      const geometry = computeBrowserFrameGeometry(currentLayout, frameMetadataRef.current)
-      const localZoom = zoomRef.current.scale
-      const scale = (geometry?.scale ?? 1) * localZoom
-      const cssDx = screenDx / scale
-      const cssDy = screenDy / scale
-      const delta = { dx: Math.round(-cssDx), dy: Math.round(-cssDy) }
-      if (Math.abs(delta.dx) < 1 && Math.abs(delta.dy) < 1) {
-        return
-      }
-      const pending = pendingWheelCommandRef.current
-      pendingWheelCommandRef.current =
-        pending &&
-        pending.base.page === base.page &&
-        pending.gestureId === wheelGestureIdRef.current
-          ? {
-              base,
-              point,
-              gestureId: wheelGestureIdRef.current,
-              dx: pending.dx + delta.dx,
-              dy: pending.dy + delta.dy
-            }
-          : { base, point, gestureId: wheelGestureIdRef.current, ...delta }
-      flushPendingWheelCommand()
-    },
-    [client, flushPendingWheelCommand, pageParams]
-  )
-
-  const mapTouchPoint = useCallback((locationX: number, locationY: number): BrowserPoint | null => {
-    return mapScreenToBrowserPoint(
-      locationX,
-      locationY,
-      layoutRef.current,
-      frameMetadataRef.current,
-      zoomRef.current
-    )
-  }, [])
-
-  const handleResponderGrant = useCallback(
-    (event: GestureResponderEvent) => {
-      const pinch = createPinchGesture(event, frameGeometry, zoomRef.current)
-      if (pinch) {
-        clearLongPressTimer()
-        pinchRef.current = pinch
-        panRef.current = null
-        startPointRef.current = null
-        return
-      }
-      const startPoint = readLocalTouchPoint(event.nativeEvent)
-      if (!startPoint) {
-        return
-      }
-      startPointRef.current = { x: startPoint.x, y: startPoint.y, t: Date.now() }
-      rightClickSentRef.current = false
-      scrollingRef.current = false
-      wheelGestureIdRef.current += 1
-      lastWheelRef.current = { dx: 0, dy: 0, at: 0 }
-      panRef.current =
-        zoomRef.current.scale > MIN_ZOOM
-          ? {
-              x: startPoint.x,
-              y: startPoint.y,
-              offsetX: zoomRef.current.offsetX,
-              offsetY: zoomRef.current.offsetY
-            }
-          : null
-      clearLongPressTimer()
-      longPressTimerRef.current = setTimeout(() => {
-        const start = startPointRef.current
-        if (!start) {
-          return
-        }
-        const point = mapTouchPoint(start.x, start.y)
-        if (!point) {
-          return
-        }
-        rightClickSentRef.current = true
-        void sendPointerClick(point, 'right')
-        onToast('Right click')
-      }, LONG_PRESS_MS)
-    },
-    [clearLongPressTimer, frameGeometry, mapTouchPoint, onToast, sendPointerClick]
-  )
-
-  const handleResponderMove = useCallback(
-    (event: GestureResponderEvent, gesture: PanResponderGestureState) => {
-      const startedPinch = pinchRef.current
-        ? null
-        : createPinchGesture(event, frameGeometry, zoomRef.current)
-      if (startedPinch) {
-        clearLongPressTimer()
-        pinchRef.current = startedPinch
-        panRef.current = null
-        startPointRef.current = null
-      }
-      const activePinch = pinchRef.current
-      const nextPinch = activePinch ? updatePinchZoom(event, frameGeometry, activePinch) : null
-      if (nextPinch) {
-        clearLongPressTimer()
-        zoomRef.current = nextPinch
-        setZoom(nextPinch)
-        return
-      }
-      if (activePinch) {
-        pinchRef.current = null
-      }
-      const moved = Math.hypot(gesture.dx, gesture.dy)
-      if (moved > TAP_SLOP) {
-        clearLongPressTimer()
-      }
-      const activePan = panRef.current
-      if (activePan && frameGeometry) {
-        const currentPoint = readLocalTouchPoint(event.nativeEvent)
-        if (!currentPoint) {
-          return
-        }
-        if (!scrollingRef.current && moved <= TAP_SLOP) {
-          return
-        }
-        scrollingRef.current = true
-        startPointRef.current = null
-        const nextZoom = clampBrowserZoomState(
-          {
-            scale: zoomRef.current.scale,
-            offsetX: activePan.offsetX + currentPoint.x - activePan.x,
-            offsetY: activePan.offsetY + currentPoint.y - activePan.y
-          },
-          frameGeometry,
-          MIN_ZOOM,
-          MAX_ZOOM
-        )
-        zoomRef.current = nextZoom
-        setZoom(nextZoom)
-        return
-      }
-      if (!scrollingRef.current) {
-        if (moved <= SCROLL_START_SLOP) {
-          return
-        }
-        scrollingRef.current = true
-        startPointRef.current = null
-      }
-      const now = Date.now()
-      if (now - lastWheelRef.current.at < WHEEL_INTERVAL_MS) {
-        return
-      }
-      const deltaX = gesture.dx - lastWheelRef.current.dx
-      const deltaY = gesture.dy - lastWheelRef.current.dy
-      if (Math.abs(deltaX) + Math.abs(deltaY) < 8) {
-        return
-      }
-      const currentPoint = readLocalTouchPoint(event.nativeEvent)
-      if (!currentPoint) {
-        return
-      }
-      const point = mapTouchPoint(currentPoint.x, currentPoint.y)
-      if (!point) {
-        return
-      }
-      lastWheelRef.current = { dx: gesture.dx, dy: gesture.dy, at: now }
-      sendWheel(point, deltaX, deltaY)
-    },
-    [clearLongPressTimer, frameGeometry, mapTouchPoint, sendWheel]
-  )
-
-  const handleResponderRelease = useCallback(
-    (event: GestureResponderEvent, gesture: PanResponderGestureState) => {
-      clearLongPressTimer()
-      pinchRef.current = null
-      panRef.current = null
-      const start = startPointRef.current
-      startPointRef.current = null
-      const wasScrolling = scrollingRef.current
-      scrollingRef.current = false
-      if (!start || rightClickSentRef.current || wasScrolling) {
-        return
-      }
-      const moved = Math.hypot(gesture.dx, gesture.dy)
-      if (moved <= TAP_SLOP && Date.now() - start.t < LONG_PRESS_MS) {
-        // Why: native browser taps resolve at touch-up. Using touch-down makes
-        // tiny finger drift feel like the click lands left/up of the finger.
-        const release = readLocalTouchPoint(event.nativeEvent) ?? start
-        const point = mapTouchPoint(release.x, release.y)
-        if (point) {
-          void sendPointerClick(point, 'left')
-        }
-      }
-    },
-    [clearLongPressTimer, mapTouchPoint, sendPointerClick]
-  )
-
-  const panResponder = useMemo(
-    () =>
-      PanResponder.create({
-        onStartShouldSetPanResponder: () => dialogRef.current === null,
-        onMoveShouldSetPanResponder: () => dialogRef.current === null,
-        onPanResponderGrant: handleResponderGrant,
-        onPanResponderMove: handleResponderMove,
-        onPanResponderRelease: handleResponderRelease,
-        onPanResponderTerminate: () => {
-          clearLongPressTimer()
-          pinchRef.current = null
-          panRef.current = null
-          scrollingRef.current = false
-          startPointRef.current = null
-        },
-        onPanResponderTerminationRequest: () => true
-      }),
-    [clearLongPressTimer, handleResponderGrant, handleResponderMove, handleResponderRelease]
-  )
-
-  const sendKeyboardText = useCallback(async () => {
-    const text = keyboardValue
-    if (!text) {
-      return
-    }
-    setKeyboardValue('')
-    const result = await sendBrowserRequest(
-      'browser.keyboardInsertText',
-      { text },
-      { suppressError: true }
-    )
-    if (result !== null) {
-      onToast('Sent')
-    } else {
-      setKeyboardValue(text)
-    }
-  }, [keyboardValue, onToast, sendBrowserRequest])
-
-  const sendKeypress = useCallback(
-    async (key: string) => {
-      await sendBrowserRequest('browser.keypress', { key }, { suppressError: true })
-    },
-    [sendBrowserRequest]
-  )
-
-  const sendDialogCommand = useCallback(
-    async (method: 'browser.dialogAccept' | 'browser.dialogDismiss') => {
-      setDialog(null)
-      await sendBrowserRequest(method, {}, { suppressError: true, timeoutMs: 5_000 })
-    },
-    [sendBrowserRequest]
-  )
-
-  const setBrowserImageRef = useCallback((layer: FrameLayer, image: Image | null) => {
-    browserImageRefs.current[layer] = image
-    const currentFrameUri = frameUriRef.current
-    if (image && currentFrameUri) {
-      updateBrowserImageSource(image, currentFrameUri)
-    }
-  }, [])
-  const setBrowserLayerRef = useCallback((layer: FrameLayer, view: View | null) => {
-    browserLayerRefs.current[layer] = view
-    updateBrowserLayerVisibility(browserLayerRefs.current, visibleFrameLayerRef.current)
-  }, [])
-  const setBrowserLayer0Ref = useCallback(
-    (view: View | null) => setBrowserLayerRef(0, view),
-    [setBrowserLayerRef]
-  )
-  const setBrowserLayer1Ref = useCallback(
-    (view: View | null) => setBrowserLayerRef(1, view),
-    [setBrowserLayerRef]
-  )
-  const setBrowserImageLayer0Ref = useCallback(
-    (image: Image | null) => setBrowserImageRef(0, image),
-    [setBrowserImageRef]
-  )
-  const setBrowserImageLayer1Ref = useCallback(
-    (image: Image | null) => setBrowserImageRef(1, image),
-    [setBrowserImageRef]
-  )
-
-  const handleBrowserImageLoad = useCallback((layer: FrameLayer) => {
-    if (pendingFrameLayerRef.current !== layer) {
-      return
-    }
-    pendingFrameLayerRef.current = null
-    visibleFrameLayerRef.current = layer
-    updateBrowserLayerVisibility(browserLayerRefs.current, layer)
-  }, [])
-  const handleBrowserImageLayer0Load = useCallback(
-    () => handleBrowserImageLoad(0),
-    [handleBrowserImageLoad]
-  )
-  const handleBrowserImageLayer1Load = useCallback(
-    () => handleBrowserImageLoad(1),
-    [handleBrowserImageLoad]
-  )
-  const handleBrowserImageError = useCallback((layer: FrameLayer) => {
-    if (pendingFrameLayerRef.current === layer) {
-      pendingFrameLayerRef.current = null
-    }
-  }, [])
-  const handleBrowserImageLayer0Error = useCallback(
-    () => handleBrowserImageError(0),
-    [handleBrowserImageError]
-  )
-  const handleBrowserImageLayer1Error = useCallback(
-    () => handleBrowserImageError(1),
-    [handleBrowserImageError]
-  )
+  const {
+    browserLayerRef,
+    frameLayerErrorHandler,
+    frameLayerLoadHandler,
+    frameLayerRef,
+    frameLayerStyle
+  } = useMobileBrowserPaneLayers({
+    browserImageRefs,
+    browserLayerRefs,
+    frameUriRef,
+    pendingFrameLayerRef,
+    visibleFrameLayerRef
+  })
 
   const controlsDisabled = !client || !tab.browserPageId || screencastSupported !== true
   const goBack = useCallback(() => {
@@ -1016,6 +308,7 @@ export function MobileBrowserPane({
     }
     void sendBrowserRequest('browser.reload', {}, { suppressError: true })
   }, [controlsDisabled, sendBrowserRequest])
+
   const selectBrowserViewMode = useCallback(
     (mode: MobileBrowserViewMode) => {
       if (browserViewMode === mode) {
@@ -1028,241 +321,48 @@ export function MobileBrowserPane({
     },
     [browserViewMode, resetBrowserZoomState, tab.browserPageId, worktreeId]
   )
+
   const renderedFrameSource =
     frameUriRef.current || frameUri ? { uri: frameUriRef.current ?? frameUri! } : null
-  const frameLayerStyle = useCallback((layer: FrameLayer) => {
-    return [
-      styles.browserImageLayer,
-      visibleFrameLayerRef.current !== layer && styles.browserImageLayerHidden
-    ]
-  }, [])
-  const browserLayerRef = useCallback(
-    (layer: FrameLayer) => (layer === 0 ? setBrowserLayer0Ref : setBrowserLayer1Ref),
-    [setBrowserLayer0Ref, setBrowserLayer1Ref]
-  )
-  const frameLayerRef = useCallback(
-    (layer: FrameLayer) => (layer === 0 ? setBrowserImageLayer0Ref : setBrowserImageLayer1Ref),
-    [setBrowserImageLayer0Ref, setBrowserImageLayer1Ref]
-  )
-  const frameLayerLoadHandler = useCallback(
-    (layer: FrameLayer) =>
-      layer === 0 ? handleBrowserImageLayer0Load : handleBrowserImageLayer1Load,
-    [handleBrowserImageLayer0Load, handleBrowserImageLayer1Load]
-  )
-  const frameLayerErrorHandler = useCallback(
-    (layer: FrameLayer) =>
-      layer === 0 ? handleBrowserImageLayer0Error : handleBrowserImageLayer1Error,
-    [handleBrowserImageLayer0Error, handleBrowserImageLayer1Error]
-  )
 
   return (
-    <View ref={setRootViewRef} style={styles.root}>
-      <View style={styles.toolbar}>
-        <MobileBrowserToolbarIconButton
-          disabled={controlsDisabled || !tab.canGoBack}
-          label="Back"
-          onPress={goBack}
-        >
-          <ChevronLeft size={15} color={buttonColor(!controlsDisabled && tab.canGoBack)} />
-        </MobileBrowserToolbarIconButton>
-        <MobileBrowserToolbarIconButton
-          disabled={controlsDisabled || !tab.canGoForward}
-          label="Forward"
-          onPress={goForward}
-        >
-          <ChevronRight size={15} color={buttonColor(!controlsDisabled && tab.canGoForward)} />
-        </MobileBrowserToolbarIconButton>
-        <MobileBrowserToolbarIconButton
-          disabled={controlsDisabled}
-          label="Reload"
-          onPress={reloadPage}
-        >
-          <RefreshCw size={15} color={buttonColor(!controlsDisabled)} />
-        </MobileBrowserToolbarIconButton>
-        <MobileBrowserAddressField
-          value={addressValue}
-          onChangeText={setAddressValue}
-          onFocus={() => setAddressFocused(true)}
-          onBlur={() => setAddressFocused(false)}
-          onSubmit={() => void navigateToAddress()}
-          focused={addressFocused}
-          disabled={controlsDisabled}
-        />
-        <MobileBrowserViewModeSwitch
-          disabled={controlsDisabled}
-          value={browserViewMode}
-          onChange={selectBrowserViewMode}
-        />
-      </View>
-
-      <View
-        style={styles.viewport}
-        onLayout={(event) => {
-          const next = {
-            width: event.nativeEvent.layout.width,
-            height: event.nativeEvent.layout.height
-          }
-          const current = layoutRef.current
-          if (current && current.width === next.width && current.height === next.height) {
-            return
-          }
-          layoutRef.current = next
-          setLayout(next)
-        }}
-        {...panResponder.panHandlers}
-      >
-        {renderedFrameSource ? (
-          <View style={styles.browserImageHost}>
-            {frameGeometry ? (
-              <View
-                pointerEvents="none"
-                style={[
-                  styles.browserZoomOffset,
-                  {
-                    width: frameGeometry.renderedWidth,
-                    height: frameGeometry.renderedHeight,
-                    transform: [{ translateX: zoom.offsetX }, { translateY: zoom.offsetY }]
-                  }
-                ]}
-              >
-                <View
-                  style={[
-                    styles.browserFrameBox,
-                    {
-                      width: frameGeometry.renderedWidth,
-                      height: frameGeometry.renderedHeight,
-                      transform: [{ scale: zoom.scale }]
-                    }
-                  ]}
-                >
-                  {([0, 1] as const).map((layer) => (
-                    <View
-                      key={layer}
-                      ref={browserLayerRef(layer)}
-                      pointerEvents="none"
-                      style={frameLayerStyle(layer)}
-                    >
-                      <Image
-                        ref={frameLayerRef(layer)}
-                        source={renderedFrameSource}
-                        resizeMode="stretch"
-                        fadeDuration={0}
-                        onLoad={frameLayerLoadHandler(layer)}
-                        onError={frameLayerErrorHandler(layer)}
-                        style={[
-                          styles.browserImage,
-                          {
-                            width: frameGeometry.renderedWidth,
-                            height: frameGeometry.renderedHeight
-                          }
-                        ]}
-                      />
-                    </View>
-                  ))}
-                </View>
-              </View>
-            ) : (
-              ([0, 1] as const).map((layer) => (
-                <View
-                  key={layer}
-                  ref={browserLayerRef(layer)}
-                  pointerEvents="none"
-                  style={frameLayerStyle(layer)}
-                >
-                  <Image
-                    ref={frameLayerRef(layer)}
-                    source={renderedFrameSource}
-                    resizeMode="contain"
-                    fadeDuration={0}
-                    onLoad={frameLayerLoadHandler(layer)}
-                    onError={frameLayerErrorHandler(layer)}
-                    style={styles.browserImageFill}
-                  />
-                </View>
-              ))
-            )}
-          </View>
-        ) : null}
-        {!renderedFrameSource || busy || error ? (
-          <View pointerEvents="none" style={styles.overlay}>
-            {/* Why: a stream can report ready and then deliver no frames, so key the
-                indicator off actually having pixels or it clears into a blank pane. */}
-            {busy || (!renderedFrameSource && !error) ? (
-              <ActivityIndicator size="small" color={colors.textSecondary} />
-            ) : null}
-            {error ? <Text style={styles.errorText}>{error}</Text> : null}
-          </View>
-        ) : null}
-        {dialog ? (
-          <View style={styles.dialogOverlay}>
-            <View style={styles.dialogCard}>
-              <Text style={styles.dialogTitle}>Browser Dialog</Text>
-              <Text style={styles.dialogMessage}>{dialog.message}</Text>
-              <View style={styles.dialogActions}>
-                {dialog.dialogType !== 'alert' ? (
-                  <Pressable
-                    style={({ pressed }) => [
-                      styles.dialogButton,
-                      pressed && styles.dialogButtonPressed
-                    ]}
-                    onPress={() => void sendDialogCommand('browser.dialogDismiss')}
-                  >
-                    <Text style={styles.dialogButtonText}>Cancel</Text>
-                  </Pressable>
-                ) : null}
-                <Pressable
-                  style={({ pressed }) => [
-                    styles.dialogButton,
-                    styles.dialogButtonPrimary,
-                    pressed && styles.dialogButtonPressed
-                  ]}
-                  onPress={() => void sendDialogCommand('browser.dialogAccept')}
-                >
-                  <Text style={[styles.dialogButtonText, styles.dialogButtonPrimaryText]}>OK</Text>
-                </Pressable>
-              </View>
-            </View>
-          </View>
-        ) : null}
-      </View>
-
-      <View
-        style={[
-          styles.keyboardDock,
-          { paddingBottom: bottomInset, transform: [{ translateY: -keyboardLift }] }
-        ]}
-      >
-        <MobileBrowserPointerModifiers
-          disabled={controlsDisabled}
-          selectedModifiers={pointerModifiers}
-          onToggle={togglePointerModifier}
-        />
-        <MobileBrowserKeyRow
-          disabled={controlsDisabled}
-          onKeypress={(key) => void sendKeypress(key)}
-        />
-        <View style={styles.inputRow}>
-          <TextInput
-            style={styles.keyboardInput}
-            value={keyboardValue}
-            onChangeText={setKeyboardValue}
-            placeholder="Type on page…"
-            placeholderTextColor={colors.textMuted}
-            autoCapitalize="none"
-            autoCorrect={false}
-            editable={!controlsDisabled}
-            onSubmitEditing={() => void sendKeyboardText()}
-          />
-          <Pressable
-            style={[styles.sendButton, (controlsDisabled || !keyboardValue) && styles.disabled]}
-            disabled={controlsDisabled || !keyboardValue}
-            onPress={() => void sendKeyboardText()}
-            accessibilityLabel="Send text to browser"
-          >
-            <ArrowUp size={18} color={buttonColor(!controlsDisabled && !!keyboardValue)} />
-          </Pressable>
-        </View>
-      </View>
-    </View>
+    <MobileBrowserPaneView
+      addressFocused={addressFocused}
+      addressValue={addressValue}
+      bottomInset={bottomInset}
+      browserLayerRef={browserLayerRef}
+      browserViewMode={browserViewMode}
+      busy={busy}
+      controlsDisabled={controlsDisabled}
+      dialog={dialog}
+      error={error}
+      frameGeometry={frameGeometry}
+      frameLayerErrorHandler={frameLayerErrorHandler}
+      frameLayerLoadHandler={frameLayerLoadHandler}
+      frameLayerRef={frameLayerRef}
+      frameLayerStyle={frameLayerStyle}
+      goBack={goBack}
+      goForward={goForward}
+      keyboardLift={keyboardLift}
+      keyboardValue={keyboardValue}
+      layoutRef={layoutRef}
+      navigateToAddress={navigateToAddress}
+      panResponder={panResponder}
+      pointerModifiers={pointerModifiers}
+      reloadPage={reloadPage}
+      renderedFrameSource={renderedFrameSource}
+      selectBrowserViewMode={selectBrowserViewMode}
+      sendDialogCommand={sendDialogCommand}
+      sendKeyboardText={sendKeyboardText}
+      sendKeypress={sendKeypress}
+      setAddressFocused={setAddressFocused}
+      setAddressValue={setAddressValue}
+      setKeyboardValue={setKeyboardValue}
+      setLayout={setLayout}
+      setRootViewRef={setRootViewRef}
+      tab={tab}
+      togglePointerModifier={togglePointerModifier}
+      zoom={zoom}
+    />
   )
 }
diff --git a/mobile/src/browser/MobileBrowserPaneView.tsx b/mobile/src/browser/MobileBrowserPaneView.tsx
new file mode 100644
index 00000000000..e36e7044837
--- /dev/null
+++ b/mobile/src/browser/MobileBrowserPaneView.tsx
@@ -0,0 +1,321 @@
+import type { Dispatch, RefObject, SetStateAction } from 'react'
+import {
+  ActivityIndicator,
+  Image,
+  Pressable,
+  Text,
+  TextInput,
+  View,
+  type PanResponderInstance,
+  type StyleProp,
+  type ViewStyle
+} from 'react-native'
+import { ArrowUp, ChevronLeft, ChevronRight, RefreshCw } from 'lucide-react-native'
+import { colors } from '../theme/mobile-theme'
+import { MobileBrowserAddressField } from './MobileBrowserAddressField'
+import { MobileBrowserKeyRow } from './MobileBrowserKeyRow'
+import {
+  MobileBrowserPointerModifiers,
+  type BrowserPointerModifier
+} from './MobileBrowserPointerModifiers'
+import { MobileBrowserToolbarIconButton } from './MobileBrowserToolbarIconButton'
+import { MobileBrowserViewModeSwitch } from './MobileBrowserViewModeSwitch'
+import { buttonColor, type FrameLayer } from './mobile-browser-frame-state'
+import { mobileBrowserPaneStyles as styles } from './mobile-browser-pane-styles'
+import type {
+  BrowserFrameGeometry,
+  BrowserTouchLayout,
+  BrowserZoomState
+} from './browser-touch-geometry'
+import type { MobileBrowserViewMode } from './browser-screencast-request'
+import type { MobileBrowserTab } from './MobileBrowserPane'
+
+type MobileBrowserPaneViewProps = {
+  addressFocused: boolean
+  addressValue: string
+  bottomInset: number
+  browserLayerRef: (layer: FrameLayer) => (view: View | null) => void
+  browserViewMode: MobileBrowserViewMode
+  busy: boolean
+  controlsDisabled: boolean
+  dialog: { dialogType: string; message: string } | null
+  error: string | null
+  frameGeometry: BrowserFrameGeometry | null
+  frameLayerErrorHandler: (layer: FrameLayer) => () => void
+  frameLayerLoadHandler: (layer: FrameLayer) => () => void
+  frameLayerRef: (layer: FrameLayer) => (image: Image | null) => void
+  frameLayerStyle: (layer: FrameLayer) => StyleProp<ViewStyle>
+  goBack: () => void
+  goForward: () => void
+  keyboardLift: number
+  keyboardValue: string
+  layoutRef: RefObject<BrowserTouchLayout | null>
+  navigateToAddress: () => Promise<void>
+  panResponder: PanResponderInstance
+  pointerModifiers: BrowserPointerModifier[]
+  reloadPage: () => void
+  renderedFrameSource: { uri: string } | null
+  selectBrowserViewMode: (mode: MobileBrowserViewMode) => void
+  sendDialogCommand: (method: 'browser.dialogDismiss' | 'browser.dialogAccept') => Promise<void>
+  sendKeyboardText: () => Promise<void>
+  sendKeypress: (key: string) => Promise<void>
+  setAddressFocused: Dispatch<SetStateAction<boolean>>
+  setAddressValue: Dispatch<SetStateAction<string>>
+  setKeyboardValue: Dispatch<SetStateAction<string>>
+  setLayout: Dispatch<SetStateAction<BrowserTouchLayout | null>>
+  setRootViewRef: (view: View | null) => void
+  tab: MobileBrowserTab
+  togglePointerModifier: (modifier: BrowserPointerModifier) => void
+  zoom: BrowserZoomState
+}
+
+export function MobileBrowserPaneView(props: MobileBrowserPaneViewProps) {
+  const {
+    addressFocused,
+    addressValue,
+    bottomInset,
+    browserLayerRef,
+    browserViewMode,
+    busy,
+    controlsDisabled,
+    dialog,
+    error,
+    frameGeometry,
+    frameLayerErrorHandler,
+    frameLayerLoadHandler,
+    frameLayerRef,
+    frameLayerStyle,
+    goBack,
+    goForward,
+    keyboardLift,
+    keyboardValue,
+    layoutRef,
+    navigateToAddress,
+    panResponder,
+    pointerModifiers,
+    reloadPage,
+    renderedFrameSource,
+    selectBrowserViewMode,
+    sendDialogCommand,
+    sendKeyboardText,
+    sendKeypress,
+    setAddressFocused,
+    setAddressValue,
+    setKeyboardValue,
+    setLayout,
+    setRootViewRef,
+    tab,
+    togglePointerModifier,
+    zoom
+  } = props
+  return (
+    <View ref={setRootViewRef} style={styles.root}>
+      <View style={styles.toolbar}>
+        <MobileBrowserToolbarIconButton
+          disabled={controlsDisabled || !tab.canGoBack}
+          label="Back"
+          onPress={goBack}
+        >
+          <ChevronLeft size={15} color={buttonColor(!controlsDisabled && tab.canGoBack)} />
+        </MobileBrowserToolbarIconButton>
+        <MobileBrowserToolbarIconButton
+          disabled={controlsDisabled || !tab.canGoForward}
+          label="Forward"
+          onPress={goForward}
+        >
+          <ChevronRight size={15} color={buttonColor(!controlsDisabled && tab.canGoForward)} />
+        </MobileBrowserToolbarIconButton>
+        <MobileBrowserToolbarIconButton
+          disabled={controlsDisabled}
+          label="Reload"
+          onPress={reloadPage}
+        >
+          <RefreshCw size={15} color={buttonColor(!controlsDisabled)} />
+        </MobileBrowserToolbarIconButton>
+        <MobileBrowserAddressField
+          value={addressValue}
+          onChangeText={setAddressValue}
+          onFocus={() => setAddressFocused(true)}
+          onBlur={() => setAddressFocused(false)}
+          onSubmit={() => void navigateToAddress()}
+          focused={addressFocused}
+          disabled={controlsDisabled}
+        />
+        <MobileBrowserViewModeSwitch
+          disabled={controlsDisabled}
+          value={browserViewMode}
+          onChange={selectBrowserViewMode}
+        />
+      </View>
+
+      <View
+        style={styles.viewport}
+        onLayout={(event) => {
+          const next = {
+            width: event.nativeEvent.layout.width,
+            height: event.nativeEvent.layout.height
+          }
+          const current = layoutRef.current
+          if (current && current.width === next.width && current.height === next.height) {
+            return
+          }
+          layoutRef.current = next
+          setLayout(next)
+        }}
+        {...panResponder.panHandlers}
+      >
+        {renderedFrameSource ? (
+          <View style={styles.browserImageHost}>
+            {frameGeometry ? (
+              <View
+                pointerEvents="none"
+                style={[
+                  styles.browserZoomOffset,
+                  {
+                    width: frameGeometry.renderedWidth,
+                    height: frameGeometry.renderedHeight,
+                    transform: [{ translateX: zoom.offsetX }, { translateY: zoom.offsetY }]
+                  }
+                ]}
+              >
+                <View
+                  style={[
+                    styles.browserFrameBox,
+                    {
+                      width: frameGeometry.renderedWidth,
+                      height: frameGeometry.renderedHeight,
+                      transform: [{ scale: zoom.scale }]
+                    }
+                  ]}
+                >
+                  {([0, 1] as const).map((layer) => (
+                    <View
+                      key={layer}
+                      ref={browserLayerRef(layer)}
+                      pointerEvents="none"
+                      style={frameLayerStyle(layer)}
+                    >
+                      <Image
+                        ref={frameLayerRef(layer)}
+                        source={renderedFrameSource}
+                        resizeMode="stretch"
+                        fadeDuration={0}
+                        onLoad={frameLayerLoadHandler(layer)}
+                        onError={frameLayerErrorHandler(layer)}
+                        style={[
+                          styles.browserImage,
+                          {
+                            width: frameGeometry.renderedWidth,
+                            height: frameGeometry.renderedHeight
+                          }
+                        ]}
+                      />
+                    </View>
+                  ))}
+                </View>
+              </View>
+            ) : (
+              ([0, 1] as const).map((layer) => (
+                <View
+                  key={layer}
+                  ref={browserLayerRef(layer)}
+                  pointerEvents="none"
+                  style={frameLayerStyle(layer)}
+                >
+                  <Image
+                    ref={frameLayerRef(layer)}
+                    source={renderedFrameSource}
+                    resizeMode="contain"
+                    fadeDuration={0}
+                    onLoad={frameLayerLoadHandler(layer)}
+                    onError={frameLayerErrorHandler(layer)}
+                    style={styles.browserImageFill}
+                  />
+                </View>
+              ))
+            )}
+          </View>
+        ) : null}
+        {!renderedFrameSource || busy || error ? (
+          <View pointerEvents="none" style={styles.overlay}>
+            {/* Why: a stream can report ready and then deliver no frames, so key the
+                indicator off actually having pixels or it clears into a blank pane. */}
+            {busy || (!renderedFrameSource && !error) ? (
+              <ActivityIndicator size="small" color={colors.textSecondary} />
+            ) : null}
+            {error ? <Text style={styles.errorText}>{error}</Text> : null}
+          </View>
+        ) : null}
+        {dialog ? (
+          <View style={styles.dialogOverlay}>
+            <View style={styles.dialogCard}>
+              <Text style={styles.dialogTitle}>Browser Dialog</Text>
+              <Text style={styles.dialogMessage}>{dialog.message}</Text>
+              <View style={styles.dialogActions}>
+                {dialog.dialogType !== 'alert' ? (
+                  <Pressable
+                    style={({ pressed }) => [
+                      styles.dialogButton,
+                      pressed && styles.dialogButtonPressed
+                    ]}
+                    onPress={() => void sendDialogCommand('browser.dialogDismiss')}
+                  >
+                    <Text style={styles.dialogButtonText}>Cancel</Text>
+                  </Pressable>
+                ) : null}
+                <Pressable
+                  style={({ pressed }) => [
+                    styles.dialogButton,
+                    styles.dialogButtonPrimary,
+                    pressed && styles.dialogButtonPressed
+                  ]}
+                  onPress={() => void sendDialogCommand('browser.dialogAccept')}
+                >
+                  <Text style={[styles.dialogButtonText, styles.dialogButtonPrimaryText]}>OK</Text>
+                </Pressable>
+              </View>
+            </View>
+          </View>
+        ) : null}
+      </View>
+
+      <View
+        style={[
+          styles.keyboardDock,
+          { paddingBottom: bottomInset, transform: [{ translateY: -keyboardLift }] }
+        ]}
+      >
+        <MobileBrowserPointerModifiers
+          disabled={controlsDisabled}
+          selectedModifiers={pointerModifiers}
+          onToggle={togglePointerModifier}
+        />
+        <MobileBrowserKeyRow
+          disabled={controlsDisabled}
+          onKeypress={(key) => void sendKeypress(key)}
+        />
+        <View style={styles.inputRow}>
+          <TextInput
+            style={styles.keyboardInput}
+            value={keyboardValue}
+            onChangeText={setKeyboardValue}
+            placeholder="Type on page…"
+            placeholderTextColor={colors.textMuted}
+            autoCapitalize="none"
+            autoCorrect={false}
+            editable={!controlsDisabled}
+            onSubmitEditing={() => void sendKeyboardText()}
+          />
+          <Pressable
+            style={[styles.sendButton, (controlsDisabled || !keyboardValue) && styles.disabled]}
+            disabled={controlsDisabled || !keyboardValue}
+            onPress={() => void sendKeyboardText()}
+            accessibilityLabel="Send text to browser"
+          >
+            <ArrowUp size={18} color={buttonColor(!controlsDisabled && !!keyboardValue)} />
+          </Pressable>
+        </View>
+      </View>
+    </View>
+  )
+}
diff --git a/mobile/src/browser/mobile-browser-stream-events.ts b/mobile/src/browser/mobile-browser-stream-events.ts
new file mode 100644
index 00000000000..5b65b2987f6
--- /dev/null
+++ b/mobile/src/browser/mobile-browser-stream-events.ts
@@ -0,0 +1,77 @@
+import type { Dispatch, SetStateAction } from 'react'
+import { displayBrowserUrl } from './browser-url'
+import { shouldSurfaceBrowserError } from './mobile-browser-frame-state'
+
+export type BrowserDialogState = { dialogType: string; message: string }
+
+export type ScreencastEvent = {
+  type?: string
+  message?: string
+  error?: { message?: string }
+  dialogType?: string
+  tab?: { url?: string; title?: string; canGoBack?: boolean; canGoForward?: boolean }
+}
+
+type HandleScreencastEventArgs = {
+  busyRef: { current: boolean }
+  clearStartupTimer: () => void
+  event: ScreencastEvent
+  lastZoomResetUrlRef: { current: string }
+  resetBrowserZoomState: () => void
+  setAddressValue: Dispatch<SetStateAction<string>>
+  setBusy: Dispatch<SetStateAction<boolean>>
+  setDialog: Dispatch<SetStateAction<BrowserDialogState | null>>
+  setError: Dispatch<SetStateAction<string | null>>
+}
+
+export function handleBrowserScreencastEvent(args: HandleScreencastEventArgs): void {
+  const {
+    busyRef,
+    clearStartupTimer,
+    event,
+    lastZoomResetUrlRef,
+    resetBrowserZoomState,
+    setAddressValue,
+    setBusy,
+    setDialog,
+    setError
+  } = args
+
+  if (event.type === 'ready') {
+    clearStartupTimer()
+    if (busyRef.current) {
+      busyRef.current = false
+      setBusy(false)
+    }
+    if (typeof event.tab?.url === 'string') {
+      setAddressValue(displayBrowserUrl(event.tab.url))
+      if (event.tab.url !== lastZoomResetUrlRef.current) {
+        lastZoomResetUrlRef.current = event.tab.url
+        resetBrowserZoomState()
+      }
+    }
+  } else if (event.type === 'end') {
+    clearStartupTimer()
+    if (busyRef.current) {
+      busyRef.current = false
+      setBusy(false)
+    }
+  } else if (event.type === 'dialog') {
+    setDialog({
+      dialogType: event.dialogType ?? 'alert',
+      message: event.message ?? 'Browser dialog'
+    })
+  } else if (event.type === 'dialogClosed') {
+    setDialog(null)
+  } else if (event.type === 'error') {
+    clearStartupTimer()
+    if (busyRef.current) {
+      busyRef.current = false
+      setBusy(false)
+    }
+    const message = event.message ?? event.error?.message ?? 'Browser stream failed.'
+    if (shouldSurfaceBrowserError(message)) {
+      setError(message)
+    }
+  }
+}
diff --git a/mobile/src/browser/use-mobile-browser-commands.ts b/mobile/src/browser/use-mobile-browser-commands.ts
new file mode 100644
index 00000000000..30554d4db5f
--- /dev/null
+++ b/mobile/src/browser/use-mobile-browser-commands.ts
@@ -0,0 +1,248 @@
+import { useCallback, useRef, type Dispatch, type SetStateAction } from 'react'
+import type { RpcClient } from '../transport/rpc-client'
+import type { BrowserScreencastFrameMetadata } from '../transport/browser-screencast-protocol'
+import { assertRpcOk } from './mobile-browser-frame-state'
+import {
+  computeBrowserFrameGeometry,
+  computeBrowserTouchClickRadiusCss,
+  mapScreenToBrowserPoint,
+  type BrowserPoint,
+  type BrowserTouchLayout,
+  type BrowserZoomState
+} from './browser-touch-geometry'
+import type { BrowserPointerModifier } from './MobileBrowserPointerModifiers'
+
+const TOUCH_CLICK_RADIUS_DIP = 14
+type BrowserPageParams = { worktree: string; page: string }
+type PendingWheelCommand = {
+  base: BrowserPageParams
+  point: BrowserPoint
+  gestureId: number
+  dx: number
+  dy: number
+}
+type SendBrowserRequest = (
+  method: string,
+  params?: Record<string, unknown>,
+  options?: { showBusy?: boolean; suppressError?: boolean; timeoutMs?: number }
+) => Promise<unknown | null>
+
+type MobileBrowserCommandArgs = {
+  client: RpcClient | null
+  frameMetadataRef: { current: BrowserScreencastFrameMetadata | null }
+  keyboardValue: string
+  layoutRef: { current: BrowserTouchLayout | null }
+  onToast: (message: string, durationMs?: number) => void
+  pageParams: () => BrowserPageParams | null
+  pointerModifiers: BrowserPointerModifier[]
+  sendBrowserRequest: SendBrowserRequest
+  setDialog: Dispatch<SetStateAction<{ dialogType: string; message: string } | null>>
+  setError: Dispatch<SetStateAction<string | null>>
+  setKeyboardValue: Dispatch<SetStateAction<string>>
+  setPointerModifiers: Dispatch<SetStateAction<BrowserPointerModifier[]>>
+  zoomRef: { current: BrowserZoomState }
+}
+
+export function useMobileBrowserCommands(args: MobileBrowserCommandArgs) {
+  const {
+    client,
+    frameMetadataRef,
+    keyboardValue,
+    layoutRef,
+    onToast,
+    pageParams,
+    pointerModifiers,
+    sendBrowserRequest,
+    setDialog,
+    setError,
+    setKeyboardValue,
+    setPointerModifiers,
+    zoomRef
+  } = args
+
+  const pendingWheelCommandRef = useRef<PendingWheelCommand | null>(null)
+
+  const wheelCommandInFlightRef = useRef(false)
+
+  const flushPendingWheelCommand = useCallback(() => {
+    if (wheelCommandInFlightRef.current) {
+      return
+    }
+    const pending = pendingWheelCommandRef.current
+    if (!pending || !client) {
+      return
+    }
+    pendingWheelCommandRef.current = null
+    wheelCommandInFlightRef.current = true
+    void (async () => {
+      try {
+        assertRpcOk(
+          await client.sendRequest('browser.mouseMove', {
+            ...pending.base,
+            x: pending.point.x,
+            y: pending.point.y
+          }),
+          'Browser pointer move failed'
+        )
+        assertRpcOk(
+          await client.sendRequest('browser.mouseWheel', {
+            ...pending.base,
+            dx: pending.dx,
+            dy: pending.dy
+          }),
+          'Browser scroll failed'
+        )
+        setError(null)
+      } catch {
+        // Scroll bursts commonly race page reload/navigation. Avoid replacing
+        // the live browser with transient command errors like selector_not_found.
+      } finally {
+        wheelCommandInFlightRef.current = false
+        flushPendingWheelCommand()
+      }
+    })()
+  }, [client])
+
+  const sendPointerClick = useCallback(
+    async (point: BrowserPoint, button: 'left' | 'right') => {
+      const base = pageParams()
+      if (!client || !base) {
+        return
+      }
+      const clickResult = await sendBrowserRequest(
+        'browser.mouseClick',
+        {
+          x: point.x,
+          y: point.y,
+          button,
+          modifiers: pointerModifiers,
+          ...(button === 'left'
+            ? {
+                radius: computeBrowserTouchClickRadiusCss(
+                  layoutRef.current,
+                  frameMetadataRef.current,
+                  zoomRef.current,
+                  TOUCH_CLICK_RADIUS_DIP
+                )
+              }
+            : {})
+        },
+        { suppressError: true, timeoutMs: 5_000 }
+      )
+      if (clickResult !== null || pointerModifiers.length > 0) {
+        return
+      }
+      try {
+        assertRpcOk(
+          await client.sendRequest('browser.mouseMove', { ...base, x: point.x, y: point.y }),
+          'Browser pointer move failed'
+        )
+        assertRpcOk(
+          await client.sendRequest('browser.mouseDown', { ...base, button }),
+          'Browser pointer down failed'
+        )
+        assertRpcOk(
+          await client.sendRequest('browser.mouseUp', { ...base, button }),
+          'Browser pointer up failed'
+        )
+        setError(null)
+      } catch {
+        // Pointer commands can race page navigation. Keep the stream visible;
+        // actionable failures still surface through navigation/stream errors.
+      }
+    },
+    [client, pageParams, pointerModifiers, sendBrowserRequest]
+  )
+
+  const togglePointerModifier = useCallback((modifier: BrowserPointerModifier) => {
+    setPointerModifiers((current) =>
+      current.includes(modifier)
+        ? current.filter((candidate) => candidate !== modifier)
+        : [...current, modifier]
+    )
+  }, [])
+
+  const sendWheel = useCallback(
+    (point: BrowserPoint, screenDx: number, screenDy: number, gestureId: number) => {
+      const base = pageParams()
+      if (!client || !base) {
+        return
+      }
+      const currentLayout = layoutRef.current
+      const geometry = computeBrowserFrameGeometry(currentLayout, frameMetadataRef.current)
+      const localZoom = zoomRef.current.scale
+      const scale = (geometry?.scale ?? 1) * localZoom
+      const cssDx = screenDx / scale
+      const cssDy = screenDy / scale
+      const delta = { dx: Math.round(-cssDx), dy: Math.round(-cssDy) }
+      if (Math.abs(delta.dx) < 1 && Math.abs(delta.dy) < 1) {
+        return
+      }
+      const pending = pendingWheelCommandRef.current
+      pendingWheelCommandRef.current =
+        pending && pending.base.page === base.page && pending.gestureId === gestureId
+          ? {
+              base,
+              point,
+              gestureId,
+              dx: pending.dx + delta.dx,
+              dy: pending.dy + delta.dy
+            }
+          : { base, point, gestureId, ...delta }
+      flushPendingWheelCommand()
+    },
+    [client, flushPendingWheelCommand, pageParams]
+  )
+
+  const mapTouchPoint = useCallback((locationX: number, locationY: number): BrowserPoint | null => {
+    return mapScreenToBrowserPoint(
+      locationX,
+      locationY,
+      layoutRef.current,
+      frameMetadataRef.current,
+      zoomRef.current
+    )
+  }, [])
+
+  const sendKeyboardText = useCallback(async () => {
+    const text = keyboardValue
+    if (!text) {
+      return
+    }
+    setKeyboardValue('')
+    const result = await sendBrowserRequest(
+      'browser.keyboardInsertText',
+      { text },
+      { suppressError: true }
+    )
+    if (result !== null) {
+      onToast('Sent')
+    } else {
+      setKeyboardValue(text)
+    }
+  }, [keyboardValue, onToast, sendBrowserRequest])
+
+  const sendKeypress = useCallback(
+    async (key: string) => {
+      await sendBrowserRequest('browser.keypress', { key }, { suppressError: true })
+    },
+    [sendBrowserRequest]
+  )
+
+  const sendDialogCommand = useCallback(
+    async (method: 'browser.dialogAccept' | 'browser.dialogDismiss') => {
+      setDialog(null)
+      await sendBrowserRequest(method, {}, { suppressError: true, timeoutMs: 5_000 })
+    },
+    [sendBrowserRequest]
+  )
+  return {
+    mapTouchPoint,
+    sendDialogCommand,
+    sendKeyboardText,
+    sendKeypress,
+    sendPointerClick,
+    sendWheel,
+    togglePointerModifier
+  }
+}
diff --git a/mobile/src/browser/use-mobile-browser-frame-apply.ts b/mobile/src/browser/use-mobile-browser-frame-apply.ts
new file mode 100644
index 00000000000..8634edbc924
--- /dev/null
+++ b/mobile/src/browser/use-mobile-browser-frame-apply.ts
@@ -0,0 +1,122 @@
+import { useCallback, type Dispatch, type SetStateAction } from 'react'
+import type { Image } from 'react-native'
+import type {
+  BrowserScreencastFrame,
+  BrowserScreencastFrameMetadata
+} from '../transport/browser-screencast-protocol'
+import { MOBILE_BROWSER_FRAME_MIN_INTERVAL_MS } from './browser-screencast-request'
+import {
+  browserFrameMetadataEqual,
+  cacheBrowserFrame,
+  createBrowserFrameDataUri,
+  updateBrowserImageSource,
+  type FrameLayer
+} from './mobile-browser-frame-state'
+
+type PendingFrame = { frame: BrowserScreencastFrame; cacheKey: string }
+type BrowserFrameApplyArgs = {
+  browserImageRefs: { current: [Image | null, Image | null] }
+  busyRef: { current: boolean }
+  frameMetadataRef: { current: BrowserScreencastFrameMetadata | null }
+  frameMountedRef: { current: boolean }
+  frameThrottleTimerRef: { current: ReturnType<typeof setTimeout> | null }
+  frameUriRef: { current: string | null }
+  lastAppliedFrameAtRef: { current: number }
+  pendingFrameLayerRef: { current: FrameLayer | null }
+  pendingThrottledFrameRef: { current: PendingFrame | null }
+  setBusy: Dispatch<SetStateAction<boolean>>
+  setFrameMetadata: Dispatch<SetStateAction<BrowserScreencastFrameMetadata | null>>
+  setFrameUri: Dispatch<SetStateAction<string | null>>
+  visibleFrameLayerRef: { current: FrameLayer }
+}
+export function useMobileBrowserFrameApply(args: BrowserFrameApplyArgs) {
+  const {
+    browserImageRefs,
+    busyRef,
+    frameMetadataRef,
+    frameMountedRef,
+    frameThrottleTimerRef,
+    frameUriRef,
+    lastAppliedFrameAtRef,
+    pendingFrameLayerRef,
+    pendingThrottledFrameRef,
+    setBusy,
+    setFrameMetadata,
+    setFrameUri,
+    visibleFrameLayerRef
+  } = args
+  const applyFrame = useCallback((frame: BrowserScreencastFrame, frameCacheKey: string): void => {
+    if (!browserFrameMetadataEqual(frameMetadataRef.current, frame.metadata)) {
+      frameMetadataRef.current = frame.metadata
+      setFrameMetadata(frame.metadata)
+    }
+    const nextFrameUri = createBrowserFrameDataUri(frame)
+    cacheBrowserFrame(frameCacheKey, { uri: nextFrameUri, metadata: frame.metadata })
+    if (!frameMountedRef.current) {
+      frameUriRef.current = nextFrameUri
+      frameMountedRef.current = true
+      setFrameUri(nextFrameUri)
+      updateBrowserImageSource(browserImageRefs.current[0], nextFrameUri)
+    } else if (pendingFrameLayerRef.current === null) {
+      // Why: decode the next frame offscreen and keep the previous layer visible
+      // until onLoad; replacing the visible Image directly flashes black.
+      const nextLayer: FrameLayer = visibleFrameLayerRef.current === 0 ? 1 : 0
+      frameUriRef.current = nextFrameUri
+      pendingFrameLayerRef.current = nextLayer
+      updateBrowserImageSource(browserImageRefs.current[nextLayer], nextFrameUri)
+    } else {
+      // Why: popovers/menus can settle in one final frame while the previous
+      // offscreen frame is still decoding. Keep the hidden layer pointed at
+      // the newest frame instead of dropping the final static state.
+      frameUriRef.current = nextFrameUri
+      updateBrowserImageSource(browserImageRefs.current[pendingFrameLayerRef.current], nextFrameUri)
+    }
+    if (busyRef.current) {
+      busyRef.current = false
+      setBusy(false)
+    }
+  }, [])
+
+  const clearFrameThrottle = useCallback(() => {
+    pendingThrottledFrameRef.current = null
+    if (frameThrottleTimerRef.current) {
+      clearTimeout(frameThrottleTimerRef.current)
+      frameThrottleTimerRef.current = null
+    }
+  }, [])
+
+  const applyFrameThrottled = useCallback(
+    (frame: BrowserScreencastFrame, frameCacheKey: string): void => {
+      const now = Date.now()
+      const elapsed = now - lastAppliedFrameAtRef.current
+      if (lastAppliedFrameAtRef.current === 0 || elapsed >= MOBILE_BROWSER_FRAME_MIN_INTERVAL_MS) {
+        clearFrameThrottle()
+        lastAppliedFrameAtRef.current = now
+        applyFrame(frame, frameCacheKey)
+        return
+      }
+
+      // Why: static UI changes can be the last frame Chromium emits. Coalesce
+      // throttled frames so the final visible state is applied after the delay.
+      pendingThrottledFrameRef.current = { frame, cacheKey: frameCacheKey }
+      if (frameThrottleTimerRef.current) {
+        return
+      }
+      frameThrottleTimerRef.current = setTimeout(
+        () => {
+          frameThrottleTimerRef.current = null
+          const pending = pendingThrottledFrameRef.current
+          pendingThrottledFrameRef.current = null
+          if (!pending) {
+            return
+          }
+          lastAppliedFrameAtRef.current = Date.now()
+          applyFrame(pending.frame, pending.cacheKey)
+        },
+        Math.max(0, MOBILE_BROWSER_FRAME_MIN_INTERVAL_MS - elapsed)
+      )
+    },
+    [applyFrame, clearFrameThrottle]
+  )
+  return { applyFrameThrottled, clearFrameThrottle }
+}
diff --git a/mobile/src/browser/use-mobile-browser-interactions.ts b/mobile/src/browser/use-mobile-browser-interactions.ts
new file mode 100644
index 00000000000..519ad45ab3b
--- /dev/null
+++ b/mobile/src/browser/use-mobile-browser-interactions.ts
@@ -0,0 +1,290 @@
+import { useCallback, useMemo, useRef, type Dispatch, type SetStateAction } from 'react'
+import {
+  PanResponder,
+  type GestureResponderEvent,
+  type PanResponderGestureState
+} from 'react-native'
+import type { RpcClient } from '../transport/rpc-client'
+import {
+  createPinchGesture,
+  MAX_ZOOM,
+  MIN_ZOOM,
+  updatePinchZoom,
+  type PinchGesture
+} from './mobile-browser-frame-state'
+import {
+  clampBrowserZoomState,
+  readLocalTouchPoint,
+  type BrowserFrameGeometry,
+  type BrowserTouchLayout,
+  type BrowserZoomState
+} from './browser-touch-geometry'
+import type { BrowserPointerModifier } from './MobileBrowserPointerModifiers'
+import type { BrowserScreencastFrameMetadata } from '../transport/browser-screencast-protocol'
+
+import { useMobileBrowserCommands } from './use-mobile-browser-commands'
+const TAP_SLOP = 16
+const SCROLL_START_SLOP = 22
+const LONG_PRESS_MS = 550
+const WHEEL_INTERVAL_MS = 70
+
+type BrowserPageParams = { worktree: string; page: string }
+type PanGesture = { x: number; y: number; offsetX: number; offsetY: number }
+type SendBrowserRequest = (
+  method: string,
+  params?: Record<string, unknown>,
+  options?: { showBusy?: boolean; suppressError?: boolean; timeoutMs?: number }
+) => Promise<unknown | null>
+
+type MobileBrowserInteractionArgs = {
+  clearLongPressTimer: () => void
+  client: RpcClient | null
+  dialogRef: { current: { dialogType: string; message: string } | null }
+  frameGeometry: BrowserFrameGeometry | null
+  frameMetadataRef: { current: BrowserScreencastFrameMetadata | null }
+  keyboardValue: string
+  layoutRef: { current: BrowserTouchLayout | null }
+  longPressTimerRef: { current: ReturnType<typeof setTimeout> | null }
+  onToast: (message: string, durationMs?: number) => void
+  pageParams: () => BrowserPageParams | null
+  panRef: { current: PanGesture | null }
+  pinchRef: { current: PinchGesture | null }
+  pointerModifiers: BrowserPointerModifier[]
+  sendBrowserRequest: SendBrowserRequest
+  setDialog: Dispatch<SetStateAction<{ dialogType: string; message: string } | null>>
+  setError: Dispatch<SetStateAction<string | null>>
+  setKeyboardValue: Dispatch<SetStateAction<string>>
+  scrollingRef: { current: boolean }
+  startPointRef: { current: { x: number; y: number; t: number } | null }
+  setPointerModifiers: Dispatch<SetStateAction<BrowserPointerModifier[]>>
+  setZoom: Dispatch<SetStateAction<BrowserZoomState>>
+  zoomRef: { current: BrowserZoomState }
+}
+
+export function useMobileBrowserInteractions(args: MobileBrowserInteractionArgs) {
+  const {
+    clearLongPressTimer,
+    client,
+    dialogRef,
+    frameGeometry,
+    frameMetadataRef,
+    keyboardValue,
+    layoutRef,
+    longPressTimerRef,
+    onToast,
+    pageParams,
+    panRef,
+    pinchRef,
+    pointerModifiers,
+    scrollingRef,
+    sendBrowserRequest,
+    setDialog,
+    setError,
+    setKeyboardValue,
+    setPointerModifiers,
+    setZoom,
+    startPointRef,
+    zoomRef
+  } = args
+  const rightClickSentRef = useRef(false)
+  const lastWheelRef = useRef({ dx: 0, dy: 0, at: 0 })
+  const wheelGestureIdRef = useRef(0)
+  const {
+    mapTouchPoint,
+    sendDialogCommand,
+    sendKeyboardText,
+    sendKeypress,
+    sendPointerClick,
+    sendWheel,
+    togglePointerModifier
+  } = useMobileBrowserCommands({
+    client,
+    frameMetadataRef,
+    keyboardValue,
+    layoutRef,
+    onToast,
+    pageParams,
+    pointerModifiers,
+    sendBrowserRequest,
+    setDialog,
+    setError,
+    setKeyboardValue,
+    setPointerModifiers,
+    zoomRef
+  })
+
+  const handleResponderGrant = useCallback(
+    (event: GestureResponderEvent) => {
+      const pinch = createPinchGesture(event, frameGeometry, zoomRef.current)
+      if (pinch) {
+        clearLongPressTimer()
+        pinchRef.current = pinch
+        panRef.current = null
+        startPointRef.current = null
+        return
+      }
+      const startPoint = readLocalTouchPoint(event.nativeEvent)
+      if (!startPoint) {
+        return
+      }
+      startPointRef.current = { x: startPoint.x, y: startPoint.y, t: Date.now() }
+      rightClickSentRef.current = false
+      scrollingRef.current = false
+      wheelGestureIdRef.current += 1
+      lastWheelRef.current = { dx: 0, dy: 0, at: 0 }
+      panRef.current =
+        zoomRef.current.scale > MIN_ZOOM
+          ? {
+              x: startPoint.x,
+              y: startPoint.y,
+              offsetX: zoomRef.current.offsetX,
+              offsetY: zoomRef.current.offsetY
+            }
+          : null
+      clearLongPressTimer()
+      longPressTimerRef.current = setTimeout(() => {
+        const start = startPointRef.current
+        if (!start) {
+          return
+        }
+        const point = mapTouchPoint(start.x, start.y)
+        if (!point) {
+          return
+        }
+        rightClickSentRef.current = true
+        void sendPointerClick(point, 'right')
+        onToast('Right click')
+      }, LONG_PRESS_MS)
+    },
+    [clearLongPressTimer, frameGeometry, mapTouchPoint, onToast, sendPointerClick]
+  )
+
+  const handleResponderMove = useCallback(
+    (event: GestureResponderEvent, gesture: PanResponderGestureState) => {
+      const startedPinch = pinchRef.current
+        ? null
+        : createPinchGesture(event, frameGeometry, zoomRef.current)
+      if (startedPinch) {
+        clearLongPressTimer()
+        pinchRef.current = startedPinch
+        panRef.current = null
+        startPointRef.current = null
+      }
+      const activePinch = pinchRef.current
+      const nextPinch = activePinch ? updatePinchZoom(event, frameGeometry, activePinch) : null
+      if (nextPinch) {
+        clearLongPressTimer()
+        zoomRef.current = nextPinch
+        setZoom(nextPinch)
+        return
+      }
+      if (activePinch) {
+        pinchRef.current = null
+      }
+      const moved = Math.hypot(gesture.dx, gesture.dy)
+      if (moved > TAP_SLOP) {
+        clearLongPressTimer()
+      }
+      const activePan = panRef.current
+      if (activePan && frameGeometry) {
+        const currentPoint = readLocalTouchPoint(event.nativeEvent)
+        if (!currentPoint) {
+          return
+        }
+        if (!scrollingRef.current && moved <= TAP_SLOP) {
+          return
+        }
+        scrollingRef.current = true
+        startPointRef.current = null
+        const nextZoom = clampBrowserZoomState(
+          {
+            scale: zoomRef.current.scale,
+            offsetX: activePan.offsetX + currentPoint.x - activePan.x,
+            offsetY: activePan.offsetY + currentPoint.y - activePan.y
+          },
+          frameGeometry,
+          MIN_ZOOM,
+          MAX_ZOOM
+        )
+        zoomRef.current = nextZoom
+        setZoom(nextZoom)
+        return
+      }
+      if (!scrollingRef.current) {
+        if (moved <= SCROLL_START_SLOP) {
+          return
+        }
+        scrollingRef.current = true
+        startPointRef.current = null
+      }
+      const now = Date.now()
+      if (now - lastWheelRef.current.at < WHEEL_INTERVAL_MS) {
+        return
+      }
+      const deltaX = gesture.dx - lastWheelRef.current.dx
+      const deltaY = gesture.dy - lastWheelRef.current.dy
+      if (Math.abs(deltaX) + Math.abs(deltaY) < 8) {
+        return
+      }
+      const currentPoint = readLocalTouchPoint(event.nativeEvent)
+      if (!currentPoint) {
+        return
+      }
+      const point = mapTouchPoint(currentPoint.x, currentPoint.y)
+      if (!point) {
+        return
+      }
+      lastWheelRef.current = { dx: gesture.dx, dy: gesture.dy, at: now }
+      sendWheel(point, deltaX, deltaY, wheelGestureIdRef.current)
+    },
+    [clearLongPressTimer, frameGeometry, mapTouchPoint, sendWheel]
+  )
+
+  const handleResponderRelease = useCallback(
+    (event: GestureResponderEvent, gesture: PanResponderGestureState) => {
+      clearLongPressTimer()
+      pinchRef.current = null
+      panRef.current = null
+      const start = startPointRef.current
+      startPointRef.current = null
+      const wasScrolling = scrollingRef.current
+      scrollingRef.current = false
+      if (!start || rightClickSentRef.current || wasScrolling) {
+        return
+      }
+      const moved = Math.hypot(gesture.dx, gesture.dy)
+      if (moved <= TAP_SLOP && Date.now() - start.t < LONG_PRESS_MS) {
+        // Why: native browser taps resolve at touch-up. Using touch-down makes
+        // tiny finger drift feel like the click lands left/up of the finger.
+        const release = readLocalTouchPoint(event.nativeEvent) ?? start
+        const point = mapTouchPoint(release.x, release.y)
+        if (point) {
+          void sendPointerClick(point, 'left')
+        }
+      }
+    },
+    [clearLongPressTimer, mapTouchPoint, sendPointerClick]
+  )
+
+  const panResponder = useMemo(
+    () =>
+      PanResponder.create({
+        onStartShouldSetPanResponder: () => dialogRef.current === null,
+        onMoveShouldSetPanResponder: () => dialogRef.current === null,
+        onPanResponderGrant: handleResponderGrant,
+        onPanResponderMove: handleResponderMove,
+        onPanResponderRelease: handleResponderRelease,
+        onPanResponderTerminate: () => {
+          clearLongPressTimer()
+          pinchRef.current = null
+          panRef.current = null
+          scrollingRef.current = false
+          startPointRef.current = null
+        },
+        onPanResponderTerminationRequest: () => true
+      }),
+    [clearLongPressTimer, handleResponderGrant, handleResponderMove, handleResponderRelease]
+  )
+
+  return { panResponder, sendDialogCommand, sendKeyboardText, sendKeypress, togglePointerModifier }
+}
diff --git a/mobile/src/browser/use-mobile-browser-pane-layers.ts b/mobile/src/browser/use-mobile-browser-pane-layers.ts
new file mode 100644
index 00000000000..a91ca22e71f
--- /dev/null
+++ b/mobile/src/browser/use-mobile-browser-pane-layers.ts
@@ -0,0 +1,141 @@
+import { useCallback } from 'react'
+import type { Image, View } from 'react-native'
+import {
+  updateBrowserImageSource,
+  updateBrowserLayerVisibility,
+  type FrameLayer
+} from './mobile-browser-frame-state'
+import { mobileBrowserPaneStyles as styles } from './mobile-browser-pane-styles'
+
+type BrowserLayerHandlersArgs = {
+  browserImageRefs: { current: [Image | null, Image | null] }
+  browserLayerRefs: { current: [View | null, View | null] }
+  frameUriRef: { current: string | null }
+  pendingFrameLayerRef: { current: FrameLayer | null }
+  visibleFrameLayerRef: { current: FrameLayer }
+}
+
+export function useMobileBrowserPaneLayers(args: BrowserLayerHandlersArgs) {
+  const {
+    browserImageRefs,
+    browserLayerRefs,
+    frameUriRef,
+    pendingFrameLayerRef,
+    visibleFrameLayerRef
+  } = args
+
+  const setBrowserImageRef = useCallback(
+    (layer: FrameLayer, image: Image | null) => {
+      browserImageRefs.current[layer] = image
+      const currentFrameUri = frameUriRef.current
+      if (image && currentFrameUri) {
+        updateBrowserImageSource(image, currentFrameUri)
+      }
+    },
+    [browserImageRefs, frameUriRef]
+  )
+
+  const setBrowserLayerRef = useCallback(
+    (layer: FrameLayer, view: View | null) => {
+      browserLayerRefs.current[layer] = view
+      updateBrowserLayerVisibility(browserLayerRefs.current, visibleFrameLayerRef.current)
+    },
+    [browserLayerRefs, visibleFrameLayerRef]
+  )
+
+  const setBrowserLayer0Ref = useCallback(
+    (view: View | null) => setBrowserLayerRef(0, view),
+    [setBrowserLayerRef]
+  )
+  const setBrowserLayer1Ref = useCallback(
+    (view: View | null) => setBrowserLayerRef(1, view),
+    [setBrowserLayerRef]
+  )
+  const setBrowserImageLayer0Ref = useCallback(
+    (image: Image | null) => setBrowserImageRef(0, image),
+    [setBrowserImageRef]
+  )
+  const setBrowserImageLayer1Ref = useCallback(
+    (image: Image | null) => setBrowserImageRef(1, image),
+    [setBrowserImageRef]
+  )
+
+  const handleBrowserImageLoad = useCallback(
+    (layer: FrameLayer) => {
+      if (pendingFrameLayerRef.current !== layer) {
+        return
+      }
+      pendingFrameLayerRef.current = null
+      visibleFrameLayerRef.current = layer
+      updateBrowserLayerVisibility(browserLayerRefs.current, layer)
+    },
+    [browserLayerRefs, pendingFrameLayerRef, visibleFrameLayerRef]
+  )
+
+  const handleBrowserImageLayer0Load = useCallback(
+    () => handleBrowserImageLoad(0),
+    [handleBrowserImageLoad]
+  )
+  const handleBrowserImageLayer1Load = useCallback(
+    () => handleBrowserImageLoad(1),
+    [handleBrowserImageLoad]
+  )
+
+  const handleBrowserImageError = useCallback(
+    (layer: FrameLayer) => {
+      if (pendingFrameLayerRef.current === layer) {
+        pendingFrameLayerRef.current = null
+      }
+    },
+    [pendingFrameLayerRef]
+  )
+
+  const handleBrowserImageLayer0Error = useCallback(
+    () => handleBrowserImageError(0),
+    [handleBrowserImageError]
+  )
+  const handleBrowserImageLayer1Error = useCallback(
+    () => handleBrowserImageError(1),
+    [handleBrowserImageError]
+  )
+
+  const frameLayerStyle = useCallback(
+    (layer: FrameLayer) => {
+      return [
+        styles.browserImageLayer,
+        visibleFrameLayerRef.current !== layer && styles.browserImageLayerHidden
+      ]
+    },
+    [visibleFrameLayerRef]
+  )
+
+  const browserLayerRef = useCallback(
+    (layer: FrameLayer) => (layer === 0 ? setBrowserLayer0Ref : setBrowserLayer1Ref),
+    [setBrowserLayer0Ref, setBrowserLayer1Ref]
+  )
+
+  const frameLayerRef = useCallback(
+    (layer: FrameLayer) => (layer === 0 ? setBrowserImageLayer0Ref : setBrowserImageLayer1Ref),
+    [setBrowserImageLayer0Ref, setBrowserImageLayer1Ref]
+  )
+
+  const frameLayerLoadHandler = useCallback(
+    (layer: FrameLayer) =>
+      layer === 0 ? handleBrowserImageLayer0Load : handleBrowserImageLayer1Load,
+    [handleBrowserImageLayer0Load, handleBrowserImageLayer1Load]
+  )
+
+  const frameLayerErrorHandler = useCallback(
+    (layer: FrameLayer) =>
+      layer === 0 ? handleBrowserImageLayer0Error : handleBrowserImageLayer1Error,
+    [handleBrowserImageLayer0Error, handleBrowserImageLayer1Error]
+  )
+
+  return {
+    browserLayerRef,
+    frameLayerErrorHandler,
+    frameLayerLoadHandler,
+    frameLayerRef,
+    frameLayerStyle
+  }
+}
diff --git a/mobile/src/browser/use-mobile-browser-request.ts b/mobile/src/browser/use-mobile-browser-request.ts
new file mode 100644
index 00000000000..311b9250ff0
--- /dev/null
+++ b/mobile/src/browser/use-mobile-browser-request.ts
@@ -0,0 +1,67 @@
+import { useCallback, type Dispatch, type SetStateAction } from 'react'
+import type { RpcClient } from '../transport/rpc-client'
+import type { RpcFailure, RpcSuccess } from '../transport/types'
+import { browserErrorMessage, shouldSurfaceBrowserError } from './mobile-browser-frame-state'
+
+type BrowserRequestArgs = {
+  busyRef: { current: boolean }
+  client: RpcClient | null
+  pageId: string | null
+  setBusy: Dispatch<SetStateAction<boolean>>
+  setError: Dispatch<SetStateAction<string | null>>
+  worktreeId: string
+}
+export function useMobileBrowserRequest(args: BrowserRequestArgs) {
+  const { busyRef, client, pageId, setBusy, setError, worktreeId } = args
+  const pageParams = useCallback(() => {
+    if (!pageId) {
+      return null
+    }
+    return {
+      worktree: `id:${worktreeId}`,
+      page: pageId
+    }
+  }, [pageId, worktreeId])
+
+  const sendBrowserRequest = useCallback(
+    async (
+      method: string,
+      params: Record<string, unknown> = {},
+      opts: { showBusy?: boolean; suppressError?: boolean; timeoutMs?: number } = {}
+    ): Promise<unknown | null> => {
+      const base = pageParams()
+      if (!client || !base) {
+        return null
+      }
+      if (opts.showBusy) {
+        busyRef.current = true
+        setBusy(true)
+      }
+      try {
+        const response = await client.sendRequest(
+          method,
+          { ...base, ...params },
+          { timeoutMs: opts.timeoutMs ?? 15_000 }
+        )
+        if (!response.ok) {
+          throw new Error((response as RpcFailure).error.message)
+        }
+        setError(null)
+        return (response as RpcSuccess).result
+      } catch (err) {
+        const message = browserErrorMessage(err, 'Browser command failed')
+        if (!opts.suppressError && shouldSurfaceBrowserError(message)) {
+          setError(message)
+        }
+        return null
+      } finally {
+        if (opts.showBusy) {
+          busyRef.current = false
+          setBusy(false)
+        }
+      }
+    },
+    [client, pageParams]
+  )
+  return { pageParams, sendBrowserRequest }
+}
diff --git a/mobile/src/browser/use-mobile-browser-stream.ts b/mobile/src/browser/use-mobile-browser-stream.ts
new file mode 100644
index 00000000000..5b55dd03ff5
--- /dev/null
+++ b/mobile/src/browser/use-mobile-browser-stream.ts
@@ -0,0 +1,283 @@
+import { useEffect, useMemo, type Dispatch, type SetStateAction } from 'react'
+import { PixelRatio, type Image, type View } from 'react-native'
+import type { RpcClient } from '../transport/rpc-client'
+import type {
+  BrowserScreencastFrame,
+  BrowserScreencastFrameMetadata
+} from '../transport/browser-screencast-protocol'
+import {
+  buildMobileBrowserScreencastRequest,
+  type MobileBrowserViewMode
+} from './browser-screencast-request'
+import {
+  MAX_ZOOM,
+  MIN_ZOOM,
+  getCachedBrowserFrame,
+  updateBrowserLayerVisibility,
+  type FrameLayer
+} from './mobile-browser-frame-state'
+import {
+  clampBrowserZoomState,
+  computeBrowserFrameGeometry,
+  type BrowserTouchLayout,
+  type BrowserZoomState
+} from './browser-touch-geometry'
+import type { MobileBrowserTab } from './MobileBrowserPane'
+import {
+  handleBrowserScreencastEvent,
+  type BrowserDialogState,
+  type ScreencastEvent
+} from './mobile-browser-stream-events'
+import { useMobileBrowserFrameApply } from './use-mobile-browser-frame-apply'
+import { useMobileBrowserRequest } from './use-mobile-browser-request'
+
+type PendingFrame = { frame: BrowserScreencastFrame; cacheKey: string }
+
+type MobileBrowserStreamArgs = {
+  appActive: boolean
+  browserImageRefs: { current: [Image | null, Image | null] }
+  browserLayerRefs: { current: [View | null, View | null] }
+  browserViewMode: MobileBrowserViewMode
+  busyRef: { current: boolean }
+  cacheKey: string | null
+  client: RpcClient | null
+  frameMetadata: BrowserScreencastFrameMetadata | null
+  frameMetadataRef: { current: BrowserScreencastFrameMetadata | null }
+  frameMountedRef: { current: boolean }
+  frameThrottleTimerRef: { current: ReturnType<typeof setTimeout> | null }
+  frameUriRef: { current: string | null }
+  lastAppliedFrameAtRef: { current: number }
+  lastStreamCacheKeyRef: { current: string | null }
+  lastZoomResetUrlRef: { current: string }
+  layout: BrowserTouchLayout | null
+  pendingFrameLayerRef: { current: FrameLayer | null }
+  pendingThrottledFrameRef: { current: PendingFrame | null }
+  resetBrowserZoomState: () => void
+  screencastSupported: boolean | null
+  setAddressValue: Dispatch<SetStateAction<string>>
+  setBusy: Dispatch<SetStateAction<boolean>>
+  setDialog: Dispatch<SetStateAction<BrowserDialogState | null>>
+  setError: Dispatch<SetStateAction<string | null>>
+  setFrameMetadata: Dispatch<SetStateAction<BrowserScreencastFrameMetadata | null>>
+  setFrameUri: Dispatch<SetStateAction<string | null>>
+  setZoom: Dispatch<SetStateAction<BrowserZoomState>>
+  streamGenerationRef: { current: number }
+  tab: MobileBrowserTab
+  visibleFrameLayerRef: { current: FrameLayer }
+  worktreeId: string
+  zoomRef: { current: BrowserZoomState }
+}
+
+export function useMobileBrowserStream(args: MobileBrowserStreamArgs) {
+  const {
+    appActive,
+    browserImageRefs,
+    browserLayerRefs,
+    browserViewMode,
+    busyRef,
+    cacheKey,
+    client,
+    frameMetadata,
+    frameMetadataRef,
+    frameMountedRef,
+    frameThrottleTimerRef,
+    frameUriRef,
+    lastAppliedFrameAtRef,
+    lastStreamCacheKeyRef,
+    lastZoomResetUrlRef,
+    layout,
+    pendingFrameLayerRef,
+    pendingThrottledFrameRef,
+    resetBrowserZoomState,
+    screencastSupported,
+    setAddressValue,
+    setBusy,
+    setDialog,
+    setError,
+    setFrameMetadata,
+    setFrameUri,
+    setZoom,
+    streamGenerationRef,
+    tab,
+    visibleFrameLayerRef,
+    worktreeId,
+    zoomRef
+  } = args
+
+  const { pageParams, sendBrowserRequest } = useMobileBrowserRequest({
+    busyRef,
+    client,
+    pageId: tab.browserPageId,
+    setBusy,
+    setError,
+    worktreeId
+  })
+
+  const { applyFrameThrottled, clearFrameThrottle } = useMobileBrowserFrameApply({
+    browserImageRefs,
+    busyRef,
+    frameMetadataRef,
+    frameMountedRef,
+    frameThrottleTimerRef,
+    frameUriRef,
+    lastAppliedFrameAtRef,
+    pendingFrameLayerRef,
+    pendingThrottledFrameRef,
+    setBusy,
+    setFrameMetadata,
+    setFrameUri,
+    visibleFrameLayerRef
+  })
+
+  const streamRequest = useMemo(
+    () => buildMobileBrowserScreencastRequest(layout, PixelRatio.get(), browserViewMode),
+    [browserViewMode, layout]
+  )
+
+  const frameGeometry = useMemo(
+    () => computeBrowserFrameGeometry(layout, frameMetadata),
+    [frameMetadata, layout]
+  )
+
+  useEffect(() => {
+    if (!frameGeometry) {
+      return
+    }
+    setZoom((current) => {
+      const next = clampBrowserZoomState(current, frameGeometry, MIN_ZOOM, MAX_ZOOM)
+      if (
+        next.scale === current.scale &&
+        next.offsetX === current.offsetX &&
+        next.offsetY === current.offsetY
+      ) {
+        return current
+      }
+      // Why: rotation/layout changes can shrink the legal pan range while the
+      // current zoom state still points at the previous viewport geometry.
+      zoomRef.current = next
+      return next
+    })
+  }, [frameGeometry])
+
+  useEffect(() => {
+    streamGenerationRef.current += 1
+    const generation = streamGenerationRef.current
+    const sameStream = Boolean(cacheKey) && lastStreamCacheKeyRef.current === cacheKey
+    lastStreamCacheKeyRef.current = cacheKey
+    if (!sameStream || !frameUriRef.current) {
+      const cachedFrame = getCachedBrowserFrame(cacheKey)
+      if (cachedFrame) {
+        frameUriRef.current = cachedFrame.uri
+        frameMountedRef.current = true
+        frameMetadataRef.current = cachedFrame.metadata
+        setFrameUri(cachedFrame.uri)
+        setFrameMetadata(cachedFrame.metadata)
+      } else {
+        frameUriRef.current = null
+        frameMountedRef.current = false
+        setFrameUri(null)
+        setFrameMetadata(null)
+        frameMetadataRef.current = null
+      }
+    } else {
+      frameMountedRef.current = true
+    }
+    pendingFrameLayerRef.current = null
+    if (!sameStream || !frameUriRef.current) {
+      visibleFrameLayerRef.current = 0
+    }
+    updateBrowserLayerVisibility(browserLayerRefs.current, visibleFrameLayerRef.current)
+    lastAppliedFrameAtRef.current = 0
+    clearFrameThrottle()
+    busyRef.current = false
+    setDialog(null)
+    setError(null)
+    if (
+      !client ||
+      screencastSupported !== true ||
+      !tab.browserPageId ||
+      !appActive ||
+      !streamRequest
+    ) {
+      busyRef.current = false
+      setBusy(false)
+      if (screencastSupported === false) {
+        setError('Update desktop Orca to stream browser tabs on mobile.')
+      } else if (screencastSupported === null) {
+        setError('Checking desktop browser streaming support.')
+      } else if (!tab.browserPageId) {
+        setError('Browser page is not available yet.')
+      }
+      return
+    }
+    busyRef.current = true
+    setBusy(true)
+    let startupTimer: ReturnType<typeof setTimeout> | null = setTimeout(() => {
+      if (streamGenerationRef.current !== generation) {
+        return
+      }
+      busyRef.current = false
+      setBusy(false)
+      setError('Browser stream timed out.')
+    }, 15_000)
+    const clearStartupTimer = (): void => {
+      if (startupTimer) {
+        clearTimeout(startupTimer)
+        startupTimer = null
+      }
+    }
+    const unsubscribe = client.subscribe(
+      'browser.screencast',
+      {
+        worktree: `id:${worktreeId}`,
+        page: tab.browserPageId,
+        ...streamRequest
+      },
+      (payload) => {
+        if (streamGenerationRef.current !== generation) {
+          return
+        }
+        handleBrowserScreencastEvent({
+          busyRef,
+          clearStartupTimer,
+          event: payload as ScreencastEvent,
+          lastZoomResetUrlRef,
+          resetBrowserZoomState,
+          setAddressValue,
+          setBusy,
+          setDialog,
+          setError
+        })
+      },
+      {
+        onBinaryFrame: (frame) => {
+          if (streamGenerationRef.current !== generation) {
+            return
+          }
+          clearStartupTimer()
+          if (cacheKey) {
+            applyFrameThrottled(frame, cacheKey)
+          }
+        }
+      }
+    )
+    return () => {
+      clearStartupTimer()
+      clearFrameThrottle()
+      unsubscribe()
+    }
+  }, [
+    appActive,
+    applyFrameThrottled,
+    clearFrameThrottle,
+    client,
+    resetBrowserZoomState,
+    screencastSupported,
+    streamRequest,
+    cacheKey,
+    tab.browserPageId,
+    worktreeId
+  ])
+
+  return { frameGeometry, pageParams, sendBrowserRequest }
+}
diff --git a/mobile/src/diagnostics/troubleshoot-screen-styles.ts b/mobile/src/diagnostics/troubleshoot-screen-styles.ts
new file mode 100644
index 00000000000..bf200e3c080
--- /dev/null
+++ b/mobile/src/diagnostics/troubleshoot-screen-styles.ts
@@ -0,0 +1,134 @@
+import { StyleSheet } from 'react-native'
+import { colors, spacing, typography } from '../theme/mobile-theme'
+
+export const troubleshootScreenStyles = StyleSheet.create({
+  container: {
+    flex: 1,
+    backgroundColor: colors.bgBase,
+    padding: spacing.lg
+  },
+  topRow: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    marginBottom: spacing.lg
+  },
+  backButton: {
+    width: 36,
+    height: 36,
+    borderRadius: 18,
+    alignItems: 'center',
+    justifyContent: 'center',
+    marginRight: spacing.sm
+  },
+  heading: {
+    fontSize: 20,
+    fontWeight: '700',
+    color: colors.textPrimary
+  },
+  scroll: {
+    flex: 1
+  },
+  scrollContent: {
+    paddingBottom: spacing.xl
+  },
+  diagnosticButton: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    justifyContent: 'center',
+    gap: spacing.sm,
+    backgroundColor: colors.bgRaised,
+    borderRadius: 10,
+    paddingVertical: spacing.md,
+    paddingHorizontal: spacing.lg,
+    marginBottom: spacing.lg
+  },
+  diagnosticButtonPressed: {
+    opacity: 0.7
+  },
+  diagnosticButtonDisabled: {
+    opacity: 0.5
+  },
+  diagnosticButtonLabel: {
+    fontSize: typography.bodySize,
+    fontWeight: '600',
+    color: colors.textPrimary
+  },
+  checkRow: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    gap: spacing.sm,
+    paddingVertical: spacing.sm + 2,
+    paddingHorizontal: spacing.md + 2
+  },
+  checkLabel: {
+    fontSize: typography.bodySize,
+    fontWeight: '500',
+    color: colors.textPrimary
+  },
+  checkDetail: {
+    flex: 1,
+    textAlign: 'right',
+    fontSize: typography.metaSize,
+    color: colors.textMuted
+  },
+  checkDetailFail: {
+    color: colors.statusRed
+  },
+  sectionHeading: {
+    fontSize: typography.metaSize,
+    fontWeight: '600',
+    color: colors.textMuted,
+    textTransform: 'uppercase',
+    letterSpacing: 0.5,
+    marginBottom: spacing.sm,
+    marginTop: spacing.sm,
+    paddingHorizontal: spacing.xs
+  },
+  section: {
+    backgroundColor: colors.bgPanel,
+    borderRadius: 12,
+    overflow: 'hidden',
+    marginBottom: spacing.lg
+  },
+  separator: {
+    height: StyleSheet.hairlineWidth,
+    backgroundColor: colors.borderSubtle,
+    marginHorizontal: spacing.md
+  },
+  rowPressed: {
+    backgroundColor: colors.bgRaised
+  },
+  accordionHeader: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    gap: spacing.sm + 2,
+    paddingVertical: spacing.md,
+    paddingHorizontal: spacing.md + 2
+  },
+  accordionTitle: {
+    flex: 1,
+    fontSize: typography.bodySize,
+    fontWeight: '500',
+    color: colors.textPrimary
+  },
+  accordionBody: {
+    paddingHorizontal: spacing.md + 2,
+    paddingBottom: spacing.md,
+    gap: spacing.xs + 2
+  },
+  stepRow: {
+    flexDirection: 'row',
+    gap: spacing.sm
+  },
+  bullet: {
+    fontSize: typography.metaSize,
+    color: colors.textMuted,
+    lineHeight: 18
+  },
+  stepText: {
+    flex: 1,
+    fontSize: typography.metaSize,
+    color: colors.textMuted,
+    lineHeight: 18
+  }
+})
diff --git a/mobile/src/files/file-list-fallback.ts b/mobile/src/files/file-list-fallback.ts
index ef3041029af..aa7323e13b5 100644
--- a/mobile/src/files/file-list-fallback.ts
+++ b/mobile/src/files/file-list-fallback.ts
@@ -60,13 +60,10 @@ export function directoryCacheFromFileList(files: LegacyMobileFileEntry[]): Dire
     Array.from(childrenByDir, ([path, children]) => [
       path,
       {
-        entries: Array.from(
-          children,
-          ([name, isDirectory]): MobileDirEntry => ({
-            name,
-            isDirectory
-          })
-        )
+        entries: Array.from(children, ([name, isDirectory]): MobileDirEntry => ({
+          name,
+          isDirectory
+        }))
       }
     ])
   )
diff --git a/mobile/src/hooks/use-mobile-dictation-source.test.ts b/mobile/src/hooks/use-mobile-dictation-source.test.ts
index 0649e7ee54b..a3192ce86ea 100644
--- a/mobile/src/hooks/use-mobile-dictation-source.test.ts
+++ b/mobile/src/hooks/use-mobile-dictation-source.test.ts
@@ -95,7 +95,7 @@ describe('useMobileDictation source invariants', () => {
       /import \{[^}]*createMobileDictationKeepAwakeOwner[^}]*\} from '\.\/mobile-dictation-keep-awake'/
     )
     expect(source).toContain(
-      'const keepAwakeOwner = useMemo(createMobileDictationKeepAwakeOwner, [])'
+      'const keepAwakeOwner = useMemo(() => createMobileDictationKeepAwakeOwner(), [])'
     )
     expect(keepAwakeSource).toContain('activateKeepAwakeAsync')
     expect(keepAwakeSource).toContain('deactivateKeepAwake')
diff --git a/mobile/src/hooks/use-mobile-dictation.ts b/mobile/src/hooks/use-mobile-dictation.ts
index 648048dc451..7dd1689c94e 100644
--- a/mobile/src/hooks/use-mobile-dictation.ts
+++ b/mobile/src/hooks/use-mobile-dictation.ts
@@ -26,7 +26,7 @@ export type { UseMobileDictationResult } from './mobile-dictation-session-state'
 
 export function useMobileDictation(options: UseMobileDictationOptions): UseMobileDictationResult {
   const { client, enabled, onTranscript, onError } = options
-  const keepAwakeOwner = useMemo(createMobileDictationKeepAwakeOwner, [])
+  const keepAwakeOwner = useMemo(() => createMobileDictationKeepAwakeOwner(), [])
   const [status, setStatus] = useState<DictationStatus>('idle')
   const [error, setError] = useState<string | null>(null)
   const activeIdRef = useRef<string | null>(null)
diff --git a/mobile/src/host-screen/host-screen-header.tsx b/mobile/src/host-screen/host-screen-header.tsx
new file mode 100644
index 00000000000..8a5caab2858
--- /dev/null
+++ b/mobile/src/host-screen/host-screen-header.tsx
@@ -0,0 +1,337 @@
+import { Pressable, Text, View } from 'react-native'
+import {
+  ChevronLeft,
+  Filter,
+  Layers,
+  List,
+  PanelLeftClose,
+  Plus,
+  Search,
+  SlidersHorizontal,
+  SquareTerminal,
+  UserCircle,
+  X
+} from 'lucide-react-native'
+import { StatusDot } from '../components/StatusDot'
+import { classifyConnection, type ConnectionVerdict } from '../transport/connection-health'
+import { colors } from '../theme/mobile-theme'
+import { hostScreenStyles as styles } from './host-screen-styles'
+import type { HostScreenController } from './use-host-screen-controller'
+
+function isErrorVerdict(v: ConnectionVerdict): boolean {
+  return v.kind === 'warning' || v.kind === 'unreachable' || v.kind === 'auth-failed'
+}
+
+export function HostScreenHeader({ controller }: { controller: HostScreenController }) {
+  const {
+    actions,
+    connState,
+    embedded,
+    floatingWorkspaceEnabled,
+    forceReconnectHost,
+    hostId,
+    lastConnectedAt,
+    onHideSidebar,
+    reconnectAttempts,
+    relayRecovery,
+    settings,
+    state
+  } = controller
+
+  return (
+    <View style={styles.topChrome}>
+      <View style={styles.statusBar}>
+        <Pressable
+          style={styles.backButton}
+          onPress={actions.leaveHost}
+          accessibilityRole="button"
+          accessibilityLabel="Back to hosts"
+          hitSlop={8}
+        >
+          <ChevronLeft size={22} color={colors.textPrimary} />
+        </Pressable>
+        {(() => {
+          const headerVerdict = classifyConnection({
+            state: connState,
+            reconnectAttempts,
+            lastConnectedAt,
+            ...relayRecovery
+          })
+          return (
+            <>
+              <View style={styles.hostIdentity}>
+                <StatusDot state={connState} verdict={headerVerdict} />
+                <Text style={styles.hostNameText} numberOfLines={1}>
+                  {state.hostName || 'Host'}
+                </Text>
+              </View>
+              {connState !== 'connected' &&
+                (() => {
+                  // Why: auth-failed has its own banner, so suppress the Reconnect button for that verdict.
+                  const verdict = headerVerdict
+                  const isError = isErrorVerdict(verdict)
+                  const showReconnectButton = isError && hostId && verdict.kind !== 'auth-failed'
+                  if (!showReconnectButton) {
+                    return null
+                  }
+                  return (
+                    <Pressable
+                      style={styles.reconnectButton}
+                      onPress={() => void forceReconnectHost(hostId!)}
+                      hitSlop={8}
+                    >
+                      <Text style={styles.reconnectButtonText}>Reconnect</Text>
+                    </Pressable>
+                  )
+                })()}
+            </>
+          )
+        })()}
+        {!embedded && floatingWorkspaceEnabled ? (
+          <Pressable
+            style={[
+              styles.floatingWorkspaceHeaderButton,
+              connState !== 'connected' && styles.toolbarIconDisabled
+            ]}
+            onPress={actions.openFloatingWorkspace}
+            disabled={connState !== 'connected'}
+            accessibilityRole="button"
+            accessibilityLabel="Floating Workspace"
+            hitSlop={8}
+          >
+            <SquareTerminal
+              size={18}
+              color={connState === 'connected' ? colors.textPrimary : colors.textMuted}
+            />
+          </Pressable>
+        ) : null}
+        {embedded && onHideSidebar ? (
+          <Pressable
+            style={styles.sidebarCollapseButton}
+            onPress={onHideSidebar}
+            accessibilityRole="button"
+            accessibilityLabel="Hide sidebar"
+            hitSlop={8}
+          >
+            <PanelLeftClose size={14} color={colors.textSecondary} />
+          </Pressable>
+        ) : null}
+      </View>
+
+      {/* Filter/sort/group toolbar */}
+      {embedded ? (
+        <View style={styles.embeddedToolbar}>
+          <View style={styles.embeddedToolbarRow}>
+            <Pressable
+              style={[
+                styles.filterChip,
+                styles.embeddedFilterChip,
+                settings.activeFilterCount > 0 && styles.filterChipActive
+              ]}
+              onPress={() => state.setShowFilterModal(true)}
+              accessibilityRole="button"
+              accessibilityLabel={`Filter workspaces${settings.activeFilterCount > 0 ? `, ${settings.activeFilterCount} active` : ''}`}
+            >
+              <Filter
+                size={12}
+                color={settings.activeFilterCount > 0 ? colors.textPrimary : colors.textSecondary}
+              />
+              <Text
+                style={[
+                  styles.filterChipText,
+                  settings.activeFilterCount > 0 && styles.filterChipTextActive
+                ]}
+                numberOfLines={1}
+              >
+                Filter{settings.activeFilterCount > 0 ? ` ${settings.activeFilterCount}` : ''}
+              </Text>
+            </Pressable>
+
+            <Pressable
+              style={[styles.modeButton, styles.embeddedModeButton]}
+              onPress={() => state.setShowSortPicker(true)}
+              accessibilityRole="button"
+              accessibilityLabel={`Sort by ${settings.selectedSortLabel}`}
+            >
+              <SlidersHorizontal size={14} color={colors.textSecondary} />
+              <Text style={styles.sortLabel} numberOfLines={1}>
+                {settings.selectedSortLabel}
+              </Text>
+            </Pressable>
+
+            <Pressable
+              style={[styles.modeButton, styles.embeddedModeButton]}
+              onPress={() => state.setShowGroupPicker(true)}
+              accessibilityRole="button"
+              accessibilityLabel="Group workspaces"
+            >
+              <Layers size={14} color={colors.textSecondary} />
+              <Text style={styles.sortLabel} numberOfLines={1}>
+                {state.groupMode === 'none'
+                  ? 'Group'
+                  : state.groupMode === 'workspaceStatus'
+                    ? 'Status'
+                    : state.groupMode === 'repo'
+                      ? 'Repo'
+                      : 'PR'}
+              </Text>
+            </Pressable>
+          </View>
+
+          <View style={styles.embeddedToolbarRow}>
+            <Pressable
+              style={[
+                styles.embeddedToolbarIconButton,
+                connState !== 'connected' && styles.toolbarIconDisabled
+              ]}
+              onPress={() => actions.navigateFromHostList(`/h/${hostId}/accounts`)}
+              disabled={connState !== 'connected'}
+              accessibilityRole="button"
+              accessibilityLabel="Accounts"
+            >
+              <UserCircle
+                size={16}
+                color={connState === 'connected' ? colors.textSecondary : colors.textMuted}
+              />
+            </Pressable>
+
+            <Pressable
+              style={[
+                styles.embeddedToolbarIconButton,
+                connState !== 'connected' && styles.toolbarIconDisabled
+              ]}
+              onPress={() => actions.navigateFromHostList(`/h/${hostId}/tasks`)}
+              disabled={connState !== 'connected'}
+              accessibilityRole="button"
+              accessibilityLabel="Tasks"
+            >
+              <List
+                size={16}
+                color={connState === 'connected' ? colors.textSecondary : colors.textMuted}
+              />
+            </Pressable>
+
+            {floatingWorkspaceEnabled ? (
+              <Pressable
+                style={[
+                  styles.embeddedToolbarIconButton,
+                  connState !== 'connected' && styles.toolbarIconDisabled
+                ]}
+                onPress={actions.openFloatingWorkspace}
+                disabled={connState !== 'connected'}
+                accessibilityRole="button"
+                accessibilityLabel="Floating Workspace"
+              >
+                <SquareTerminal
+                  size={18}
+                  color={connState === 'connected' ? colors.textSecondary : colors.textMuted}
+                />
+              </Pressable>
+            ) : null}
+
+            <Pressable
+              style={[
+                styles.embeddedToolbarIconButton,
+                connState !== 'connected' && styles.toolbarIconDisabled
+              ]}
+              onPress={actions.openNewWorktreeModal}
+              disabled={connState !== 'connected'}
+              accessibilityRole="button"
+              accessibilityLabel="New workspace"
+            >
+              <Plus
+                size={16}
+                color={connState === 'connected' ? colors.textPrimary : colors.textMuted}
+              />
+            </Pressable>
+
+            <Pressable
+              style={styles.embeddedToolbarIconButton}
+              onPress={() => state.setShowSearch((s) => !s)}
+              accessibilityRole="button"
+              accessibilityLabel={state.showSearch ? 'Close search' : 'Search workspaces'}
+            >
+              {state.showSearch ? (
+                <X size={16} color={colors.textSecondary} />
+              ) : (
+                <Search size={16} color={colors.textSecondary} />
+              )}
+            </Pressable>
+          </View>
+        </View>
+      ) : (
+        <View style={styles.toolbar}>
+          <Pressable
+            style={[styles.filterChip, settings.activeFilterCount > 0 && styles.filterChipActive]}
+            onPress={() => state.setShowFilterModal(true)}
+          >
+            <Filter
+              size={12}
+              color={settings.activeFilterCount > 0 ? colors.textPrimary : colors.textSecondary}
+            />
+            <Text
+              style={[
+                styles.filterChipText,
+                settings.activeFilterCount > 0 && styles.filterChipTextActive
+              ]}
+            >
+              Filter{settings.activeFilterCount > 0 ? ` (${settings.activeFilterCount})` : ''}
+            </Text>
+          </Pressable>
+
+          <Pressable style={styles.modeButton} onPress={() => state.setShowSortPicker(true)}>
+            <SlidersHorizontal size={14} color={colors.textSecondary} />
+            <Text style={styles.sortLabel} numberOfLines={1}>
+              {settings.selectedSortLabel}
+            </Text>
+          </Pressable>
+
+          <Pressable style={styles.modeButton} onPress={() => state.setShowGroupPicker(true)}>
+            <Layers size={14} color={colors.textSecondary} />
+            <Text style={styles.sortLabel} numberOfLines={1}>
+              {state.groupMode === 'none'
+                ? 'Group'
+                : state.groupMode === 'workspaceStatus'
+                  ? 'Status'
+                  : state.groupMode === 'repo'
+                    ? 'Repo'
+                    : 'PR'}
+            </Text>
+          </Pressable>
+
+          <View style={styles.toolbarSpacer} />
+
+          <Pressable
+            style={styles.searchToggle}
+            onPress={() => actions.navigateFromHostList(`/h/${hostId}/accounts`)}
+            disabled={connState !== 'connected'}
+          >
+            <UserCircle
+              size={16}
+              color={connState === 'connected' ? colors.textSecondary : colors.textMuted}
+            />
+          </Pressable>
+
+          <Pressable
+            style={styles.searchToggle}
+            onPress={() => actions.navigateFromHostList(`/h/${hostId}/tasks`)}
+            disabled={connState !== 'connected'}
+          >
+            <List
+              size={16}
+              color={connState === 'connected' ? colors.textSecondary : colors.textMuted}
+            />
+          </Pressable>
+
+          <Pressable style={styles.searchToggle} onPress={() => state.setShowSearch((s) => !s)}>
+            {state.showSearch ? (
+              <X size={16} color={colors.textSecondary} />
+            ) : (
+              <Search size={16} color={colors.textSecondary} />
+            )}
+          </Pressable>
+        </View>
+      )}
+    </View>
+  )
+}
diff --git a/mobile/src/host-screen/host-screen-overlays.tsx b/mobile/src/host-screen/host-screen-overlays.tsx
new file mode 100644
index 00000000000..07cbbd58fc5
--- /dev/null
+++ b/mobile/src/host-screen/host-screen-overlays.tsx
@@ -0,0 +1,231 @@
+import { Pressable, Text, View } from 'react-native'
+import { Check, Moon } from 'lucide-react-native'
+import { buildWorktreeNavigationActions } from '../agent-history/worktree-navigation-actions'
+import { ActionSheetContent } from '../components/ActionSheetModal'
+import { BottomDrawer } from '../components/BottomDrawer'
+import { ConfirmModal } from '../components/ConfirmModal'
+import { NewWorktreeModalController } from '../components/NewWorktreeModalController'
+import { PickerModal } from '../components/PickerModal'
+import { colors } from '../theme/mobile-theme'
+import { hostNewWorktreeSessionRoute } from '../host-route-action-state'
+import { getWorktreeRowIdentity } from '../worktree/worktree-host-row-identity'
+import {
+  WORKSPACE_GROUP_OPTIONS as GROUP_OPTIONS,
+  WORKSPACE_SORT_OPTIONS as SORT_OPTIONS
+} from '../worktree/workspace-list-picker-options'
+import { isWorktreePinned } from '../worktree/workspace-list-sections'
+import { hostScreenStyles as styles } from './host-screen-styles'
+import type { HostScreenController } from './use-host-screen-controller'
+
+export function HostScreenOverlays({ controller }: { controller: HostScreenController }) {
+  const {
+    actions,
+    catalog,
+    client,
+    existingWorktreePaths,
+    hostCapabilities,
+    hostId,
+    settings,
+    showNewWorktree,
+    state
+  } = controller
+  const actionTarget = state.actionTarget
+
+  return (
+    <>
+      <PickerModal
+        visible={state.showSortPicker}
+        title="Sort By"
+        options={SORT_OPTIONS}
+        selected={state.sortMode}
+        onSelect={settings.handleSortChange}
+        onClose={() => state.setShowSortPicker(false)}
+      />
+
+      <PickerModal
+        visible={state.showGroupPicker}
+        title="Group By"
+        options={GROUP_OPTIONS}
+        selected={state.groupMode}
+        onSelect={settings.handleGroupChange}
+        onClose={() => state.setShowGroupPicker(false)}
+      />
+
+      <BottomDrawer visible={state.showFilterModal} onClose={() => state.setShowFilterModal(false)}>
+        <View style={styles.filterModalHeader}>
+          <Text style={styles.filterModalTitle}>Filter</Text>
+          {settings.activeFilterCount > 0 && (
+            <Pressable onPress={settings.clearFilters}>
+              <Text style={styles.clearFiltersText}>Clear filters</Text>
+            </Pressable>
+          )}
+        </View>
+
+        <Text style={styles.filterSectionLabel}>Workspaces</Text>
+        <View style={styles.filterGroup}>
+          <Pressable style={styles.filterRow} onPress={settings.toggleHideSleeping}>
+            <Text style={styles.filterRowText}>Hide sleeping</Text>
+            {state.filters.hideSleeping && <Check size={14} color={colors.textPrimary} />}
+          </Pressable>
+          <View style={styles.filterSeparator} />
+          <Pressable style={styles.filterRow} onPress={settings.toggleHideDefaultBranch}>
+            <Text style={styles.filterRowText}>Hide default branch</Text>
+            {state.filters.hideDefaultBranch && <Check size={14} color={colors.textPrimary} />}
+          </Pressable>
+        </View>
+
+        {controller.sectionsResult.uniqueRepos.length > 1 && (
+          <>
+            <Text style={styles.filterSectionLabel}>Repositories</Text>
+            <View style={styles.filterGroup}>
+              {controller.sectionsResult.uniqueRepos.map((repo, i) => (
+                <View key={repo.id}>
+                  {i > 0 && <View style={styles.filterSeparator} />}
+                  <Pressable
+                    style={styles.filterRow}
+                    onPress={() => settings.toggleRepoFilter(repo.id)}
+                  >
+                    <View style={[styles.filterRepoDot, { backgroundColor: repo.color }]} />
+                    <Text style={styles.filterRowText} numberOfLines={1}>
+                      {repo.name}
+                    </Text>
+                    {state.filters.filterRepoIds.has(repo.id) && (
+                      <Check size={14} color={colors.textPrimary} />
+                    )}
+                  </Pressable>
+                </View>
+              ))}
+            </View>
+          </>
+        )}
+      </BottomDrawer>
+
+      {/* Worktree long-press action sheet (inline confirm to avoid double-Modal lag) */}
+      <BottomDrawer
+        visible={actionTarget != null}
+        onClose={() => {
+          state.setConfirmDelete(null)
+          state.setActionTarget(null)
+        }}
+      >
+        {state.confirmDelete ? (
+          <View>
+            <View style={styles.confirmContent}>
+              <Text style={styles.confirmTitle}>Delete Worktree</Text>
+              <Text style={styles.confirmMessage}>
+                Delete "{state.confirmDelete.displayName || state.confirmDelete.repo}" (
+                {state.confirmDelete.branch})?
+              </Text>
+            </View>
+            <View style={styles.confirmButtons}>
+              <Pressable
+                style={({ pressed }) => [
+                  styles.confirmBtn,
+                  styles.confirmBtnCancel,
+                  pressed && styles.confirmBtnPressed
+                ]}
+                onPress={() => state.setConfirmDelete(null)}
+              >
+                <Text style={styles.confirmBtnCancelText}>Cancel</Text>
+              </Pressable>
+              <Pressable
+                style={({ pressed }) => [
+                  styles.confirmBtn,
+                  styles.confirmBtnDestructive,
+                  pressed && styles.confirmBtnPressed
+                ]}
+                onPress={() => {
+                  if (state.confirmDelete) {
+                    void actions.handleDeleteWorktree(state.confirmDelete)
+                  }
+                  state.setConfirmDelete(null)
+                  state.setActionTarget(null)
+                }}
+              >
+                <Text style={styles.confirmBtnDestructiveText}>Delete</Text>
+              </Pressable>
+            </View>
+          </View>
+        ) : (
+          <ActionSheetContent
+            title={actionTarget ? actionTarget.displayName || actionTarget.repo : undefined}
+            message={actionTarget?.branch}
+            actions={
+              actionTarget
+                ? [
+                    ...buildWorktreeNavigationActions({
+                      hostId,
+                      worktreeId: actionTarget.worktreeId,
+                      worktreeName: actionTarget.displayName || actionTarget.repo,
+                      hostCapabilities,
+                      navigate: actions.navigateFromHostList,
+                      onDone: () => state.setActionTarget(null)
+                    }),
+                    {
+                      label: 'Sleep',
+                      icon: Moon,
+                      onPress: () => {
+                        if (client) {
+                          state.setSleptIds((prev) =>
+                            new Set(prev).add(getWorktreeRowIdentity(actionTarget))
+                          )
+                          void client
+                            .sendRequest('worktree.sleep', {
+                              worktree: `id:${actionTarget.worktreeId}`
+                            })
+                            .catch(() => null)
+                        }
+                        state.setActionTarget(null)
+                      }
+                    },
+                    {
+                      label: isWorktreePinned(actionTarget, state.pinnedIds) ? 'Unpin' : 'Pin',
+                      onPress: () => {
+                        actions.togglePin(actionTarget.worktreeId)
+                        state.setActionTarget(null)
+                      }
+                    },
+                    {
+                      label: 'Delete',
+                      destructive: true,
+                      onPress: () => state.setConfirmDelete(actionTarget)
+                    }
+                  ]
+                : []
+            }
+          />
+        )}
+      </BottomDrawer>
+
+      {/* Host remove confirmation */}
+      <ConfirmModal
+        visible={state.confirmRemoveHost}
+        title="Remove Host"
+        message={`Remove "${state.hostName}"? You can re-pair later.`}
+        confirmLabel="Remove"
+        destructive
+        onConfirm={() => void actions.handleRemoveHost()}
+        onCancel={() => state.setConfirmRemoveHost(false)}
+      />
+
+      <NewWorktreeModalController
+        ref={state.newWorktreeModalRef}
+        routeVisible={showNewWorktree}
+        client={client}
+        hostId={hostId}
+        existingWorktreePaths={existingWorktreePaths}
+        existingWorktrees={state.worktrees}
+        onVisibleChange={(visible) => {
+          state.newWorktreeModalVisibleRef.current = visible
+        }}
+        onCreated={(worktreeId, worktreeName) => {
+          void catalog.fetchWorktrees({ allowDuringModal: true })
+          actions.navigateFromHostList(
+            hostNewWorktreeSessionRoute(hostId, worktreeId, worktreeName)
+          )
+        }}
+        onRouteVisibleChange={actions.setShowNewWorktreeVisible}
+      />
+    </>
+  )
+}
diff --git a/mobile/src/host-screen/host-screen-view.tsx b/mobile/src/host-screen/host-screen-view.tsx
new file mode 100644
index 00000000000..e70f07d773a
--- /dev/null
+++ b/mobile/src/host-screen/host-screen-view.tsx
@@ -0,0 +1,25 @@
+import { Text, View } from 'react-native'
+import { SafeAreaView } from 'react-native-safe-area-context'
+import { hostScreenStyles as styles } from './host-screen-styles'
+import { HostScreenHeader } from './host-screen-header'
+import { HostScreenOverlays } from './host-screen-overlays'
+import { HostWorkspaceList } from './host-workspace-list'
+import type { HostScreenController } from './use-host-screen-controller'
+
+export function HostScreenView({ controller }: { controller: HostScreenController }) {
+  if (controller.state.error) {
+    return (
+      <View style={styles.centered}>
+        <Text style={styles.errorText}>{controller.state.error}</Text>
+      </View>
+    )
+  }
+
+  return (
+    <SafeAreaView style={styles.container} edges={['top']}>
+      <HostScreenHeader controller={controller} />
+      <HostWorkspaceList controller={controller} />
+      <HostScreenOverlays controller={controller} />
+    </SafeAreaView>
+  )
+}
diff --git a/mobile/src/host-screen/host-workspace-list.tsx b/mobile/src/host-screen/host-workspace-list.tsx
new file mode 100644
index 00000000000..13f11780e1c
--- /dev/null
+++ b/mobile/src/host-screen/host-workspace-list.tsx
@@ -0,0 +1,199 @@
+import { Pressable, RefreshControl, SectionList, Text, View } from 'react-native'
+import { ChevronDown, ChevronRight, Pin } from 'lucide-react-native'
+import { AuthFailedBanner } from '../components/AuthFailedBanner'
+import { HostDiagnosticsLink } from '../components/HostDiagnosticsLink'
+import { HostRouteNoticeBanner } from '../components/HostRouteNoticeBanner'
+import { MobileRepoIcon } from '../components/MobileRepoIcon'
+import { MobileSearchField } from '../components/MobileSearchField'
+import { NewWorkspaceFab, FAB_SIZE } from '../components/NewWorkspaceFab'
+import { WorktreeListRow } from '../components/WorktreeListRow'
+import { colors, spacing } from '../theme/mobile-theme'
+import { getWorktreeRowIdentity } from '../worktree/worktree-host-row-identity'
+import { HostWorkspaceListStates } from '../worktree/host-workspace-list-states'
+import { getWorktreeStatus } from '../worktree/workspace-list-sections'
+import { repoColor } from '../worktree/repo-color'
+import { hostScreenStyles as styles } from './host-screen-styles'
+import type { HostScreenController } from './use-host-screen-controller'
+
+export function HostWorkspaceList({ controller }: { controller: HostScreenController }) {
+  const {
+    actions,
+    activeWorktreeScroll,
+    catalog,
+    connState,
+    contentMaxWidth,
+    displayWorktrees,
+    embedded,
+    forceReconnectHost,
+    hostId,
+    insets,
+    isReadOnly,
+    isWideLayout,
+    noticeParam,
+    now,
+    reconnectAttempts,
+    relayRecovery,
+    routeNotice,
+    router,
+    sectionsResult,
+    setDismissedNotice,
+    settings,
+    state
+  } = controller
+  const { rawSections, sections, uniqueRepoColors } = sectionsResult
+
+  return (
+    <>
+      {/* Auth failed: a latched relay rejection must reach the same re-pair affordance. */}
+      {(connState === 'auth-failed' || relayRecovery.pairingRejected) && (
+        <AuthFailedBanner
+          canRetry={!!hostId}
+          onRetry={() => hostId && void forceReconnectHost(hostId)}
+          onRepair={() => router.push('/pair-scan')}
+          onRemove={() => state.setConfirmRemoveHost(true)}
+        />
+      )}
+
+      {connState !== 'connected' &&
+      !relayRecovery.pairingRejected &&
+      reconnectAttempts >= 3 &&
+      hostId ? (
+        <HostDiagnosticsLink
+          onPress={() =>
+            router.push({ pathname: '/connection-log', params: { hostId: String(hostId) } })
+          }
+        />
+      ) : null}
+
+      {/* Why a bounced route landed here (e.g. the workspace was deleted on the desktop). */}
+      {routeNotice && (
+        <HostRouteNoticeBanner
+          message={routeNotice}
+          onDismiss={() => setDismissedNotice(noticeParam ?? null)}
+        />
+      )}
+
+      {/* Search bar */}
+      {state.showSearch && (
+        <View style={styles.searchBar}>
+          <MobileSearchField
+            value={state.search}
+            onChangeText={state.setSearch}
+            placeholder="Search worktrees…"
+            autoFocus
+            // Why: new key per open remounts the focus effect across rapid toggles so the keyboard reappears.
+            focusKey={state.showSearch}
+            accessibilityLabel="Search worktrees"
+          />
+        </View>
+      )}
+
+      <HostWorkspaceListStates
+        connState={connState}
+        worktreesLoaded={state.worktreesLoaded}
+        displayCount={displayWorktrees.length}
+        sectionCount={sections.length}
+        catalogError={state.catalogError}
+        search={state.search}
+        activeFilterCount={settings.activeFilterCount}
+      />
+
+      {sections.length > 0 && (
+        <SectionList
+          ref={activeWorktreeScroll.sectionListRef}
+          sections={sections}
+          keyExtractor={(w) => w.sectionListKey ?? getWorktreeRowIdentity(w)}
+          stickySectionHeadersEnabled={false}
+          // Why: keep the search IME up while tapping clear / scrolling results.
+          keyboardShouldPersistTaps="handled"
+          keyboardDismissMode="on-drag"
+          onScrollToIndexFailed={activeWorktreeScroll.onScrollToIndexFailed}
+          // Why: edge-to-edge under the system nav bar; insets.bottom keeps the last row above it.
+          contentContainerStyle={[
+            styles.list,
+            // Reserve room so the last row stays tappable above the phone's floating "+" (embedded uses the toolbar +).
+            { paddingBottom: (embedded ? spacing.lg : FAB_SIZE + spacing.xl) + insets.bottom },
+            isWideLayout &&
+              !embedded && { maxWidth: contentMaxWidth, width: '100%', alignSelf: 'center' }
+          ]}
+          renderSectionHeader={({ section }) => {
+            if (!section.title) {
+              return null
+            }
+            const isCollapsed = state.collapsedGroups.has(section.key)
+            const rawSection = rawSections.find((s) => s.key === section.key)
+            const count = rawSection?.data.length ?? 0
+            const repoSectionColor =
+              state.groupMode === 'repo' ? uniqueRepoColors.get(section.title) : null
+            const repoSectionIcon =
+              state.groupMode === 'repo' ? state.repoIconsByName.get(section.title) : null
+            return (
+              <Pressable
+                style={styles.sectionHeader}
+                onPress={() => settings.toggleCollapsed(section.key)}
+              >
+                {isCollapsed ? (
+                  <ChevronRight size={12} color={colors.textMuted} style={styles.sectionIcon} />
+                ) : (
+                  <ChevronDown size={12} color={colors.textMuted} style={styles.sectionIcon} />
+                )}
+                {section.icon === 'pin' && (
+                  <Pin size={12} color={colors.textMuted} style={styles.sectionIcon} />
+                )}
+                {state.groupMode === 'repo' ? (
+                  <View style={styles.sectionRepoIcon}>
+                    <MobileRepoIcon
+                      repoIcon={repoSectionIcon}
+                      size={14}
+                      color={repoSectionColor ?? colors.textSecondary}
+                    />
+                  </View>
+                ) : null}
+                <Text style={styles.sectionTitle}>{section.title}</Text>
+                <Text style={styles.sectionCount}>{count}</Text>
+              </Pressable>
+            )
+          }}
+          ItemSeparatorComponent={ListSeparator}
+          // Why (#8498): manual pull-to-refresh forces a fresh snapshot after a stale-cache reconnect.
+          refreshControl={
+            <RefreshControl
+              refreshing={catalog.refreshing}
+              onRefresh={catalog.onRefresh}
+              tintColor={colors.textSecondary}
+              colors={[colors.textSecondary]}
+            />
+          }
+          renderItem={({ item }) => (
+            <WorktreeListRow
+              item={item}
+              isReadOnly={isReadOnly}
+              now={now}
+              status={getWorktreeStatus(item)}
+              repoColor={uniqueRepoColors.get(item.repo) ?? repoColor(item.repo)}
+              repoIcon={state.repoIconsByName.get(item.repo) ?? null}
+              hideRepo={state.groupMode === 'repo'}
+              onPress={actions.openWorktreeSession}
+              onLongPress={
+                item.workspaceKind === 'folder-workspace' ? undefined : state.setActionTarget
+              }
+              onToggleLineage={settings.toggleWorktreeLineage}
+            />
+          )}
+        />
+      )}
+
+      {/* Floating "new workspace" button — phone only; embedded sidebars keep the toolbar +. */}
+      {!embedded && (
+        <NewWorkspaceFab
+          onPress={actions.openNewWorktreeModal}
+          disabled={connState !== 'connected'}
+        />
+      )}
+    </>
+  )
+}
+
+function ListSeparator() {
+  return <View style={styles.separator} />
+}
diff --git a/mobile/src/host-screen/use-host-repo-metadata.ts b/mobile/src/host-screen/use-host-repo-metadata.ts
new file mode 100644
index 00000000000..a5367a971ad
--- /dev/null
+++ b/mobile/src/host-screen/use-host-repo-metadata.ts
@@ -0,0 +1,85 @@
+import { useCallback } from 'react'
+import { setCachedRepos } from '../cache/repo-cache'
+import type { RpcClient } from '../transport/rpc-client'
+import type { ConnectionState, RpcSuccess } from '../transport/types'
+import type { RepoSummary } from '../worktree/host-worktree-rpc-types'
+import { repoColor } from '../worktree/repo-color'
+import type { HostScreenState } from './use-host-screen-state'
+
+const REPO_METADATA_REFRESH_MS = 60_000
+
+export function useHostRepoMetadata(args: {
+  client: RpcClient | null
+  connState: ConnectionState
+  hostId: string | undefined
+  state: HostScreenState
+}) {
+  const { client, connState, hostId, state } = args
+  const {
+    clientRef,
+    fetchRepoMetadataInFlightRef,
+    fetchRepoMetadataPendingRef,
+    repoMetadataFetchedAtRef,
+    setRepoColorsByName,
+    setRepoIconsByName,
+    setRepoIdsByName
+  } = state
+
+  const fetchRepoMetadata = useCallback(
+    async (options: { force?: boolean; queueIfInFlight?: boolean } = {}) => {
+      if (!client || connState !== 'connected' || !hostId) {
+        return
+      }
+      if (fetchRepoMetadataInFlightRef.current.has(client)) {
+        if (options.queueIfInFlight) {
+          fetchRepoMetadataPendingRef.current.add(client)
+        }
+        return
+      }
+      const now = Date.now()
+      if (!options.force && now - repoMetadataFetchedAtRef.current < REPO_METADATA_REFRESH_MS) {
+        return
+      }
+      fetchRepoMetadataInFlightRef.current.add(client)
+      const requestClient = client,
+        requestHostId = hostId
+      try {
+        do {
+          fetchRepoMetadataPendingRef.current.delete(requestClient)
+          const repoResponse = await requestClient.sendRequest('repo.list')
+          if (clientRef.current !== requestClient || hostId !== requestHostId || !repoResponse.ok) {
+            return
+          }
+          const repoResult = (repoResponse as RpcSuccess).result as { repos: RepoSummary[] }
+          repoMetadataFetchedAtRef.current = Date.now()
+          setCachedRepos(requestHostId, repoResult.repos)
+          setRepoColorsByName(
+            new Map(
+              repoResult.repos.map((repo) => [
+                repo.displayName,
+                repo.badgeColor || repoColor(repo.displayName)
+              ])
+            )
+          )
+          setRepoIconsByName(
+            new Map(
+              repoResult.repos.flatMap((repo) =>
+                repo.repoIcon ? [[repo.displayName, repo.repoIcon] as const] : []
+              )
+            )
+          )
+          setRepoIdsByName(new Map(repoResult.repos.map((repo) => [repo.displayName, repo.id])))
+        } while (fetchRepoMetadataPendingRef.current.has(requestClient))
+      } catch {
+        // Repo metadata is decorative; the next refresh can retry.
+      } finally {
+        fetchRepoMetadataInFlightRef.current.delete(requestClient)
+      }
+    },
+    [client, connState, hostId]
+  )
+
+  return fetchRepoMetadata
+}
+
+export type FetchHostRepoMetadata = ReturnType<typeof useHostRepoMetadata>
diff --git a/mobile/src/host-screen/use-host-screen-controller.ts b/mobile/src/host-screen/use-host-screen-controller.ts
new file mode 100644
index 00000000000..347fd36a72e
--- /dev/null
+++ b/mobile/src/host-screen/use-host-screen-controller.ts
@@ -0,0 +1,158 @@
+import { useMemo, useState } from 'react'
+import { useLocalSearchParams, usePathname, useRouter } from 'expo-router'
+import { useSafeAreaInsets } from 'react-native-safe-area-context'
+import { useHostProtocolGates } from '../components/HostProtocolGate'
+import { visibleHostRouteNotice } from '../host-route-notice'
+import { resolveHostRouteActionState } from '../host-route-action-state'
+import { useActiveWorktreeScroll } from '../hooks/use-active-worktree-scroll'
+import { useNow } from '../hooks/use-now'
+import { useResponsiveLayout } from '../layout/responsive-layout'
+import { useForgetHostClient, useForceReconnect, useHostClient } from '../transport/client-context'
+import {
+  useLastConnectedAt,
+  useReconnectAttempt,
+  useRelayRecoveryStatus
+} from '../transport/client-context-connection-metrics'
+import { applyWorktreeRowDisplayState } from '../worktree/worktree-host-row-identity'
+import { useWorkspaceSections } from '../worktree/use-workspace-sections'
+import { useHostRepoMetadata } from './use-host-repo-metadata'
+import { useHostScreenIdentity } from './use-host-screen-identity'
+import { useHostScreenState } from './use-host-screen-state'
+import { useHostViewSettings } from './use-host-view-settings'
+import { useHostWorktreeActions } from './use-host-worktree-actions'
+import { useHostWorktreeCatalog } from './use-host-worktree-catalog'
+
+export type HostScreenProps = {
+  // When true, rendered as the persistent tablet sidebar by the host layout, not as its own routed screen.
+  embedded?: boolean
+  // Route params aren't in scope when rendered from the layout, so the caller passes these explicitly.
+  hostId?: string
+  action?: string
+  onHideSidebar?: () => void
+}
+
+export function useHostScreenController({
+  embedded = false,
+  hostId: hostIdProp,
+  action: actionProp,
+  onHideSidebar
+}: HostScreenProps = {}) {
+  const params = useLocalSearchParams<{ hostId: string; action?: string; notice?: string }>()
+  const hostId = hostIdProp ?? params.hostId
+  const action = actionProp ?? params.action
+  const [dismissedNotice, setDismissedNotice] = useState<string | null>(null)
+  const noticeParam = params.notice?.trim()
+  const routeNotice = visibleHostRouteNotice(embedded, noticeParam, dismissedNotice)
+  const router = useRouter()
+  const pathname = usePathname()
+  const insets = useSafeAreaInsets()
+  // Why: cap and center the list on wide/tablet canvases; on phones isWideLayout is false so it stays edge-to-edge.
+  const { isWideLayout, contentMaxWidth } = useResponsiveLayout()
+  // Shared client per host owned by RpcClientProvider. See docs/mobile-shared-client-per-host.md.
+  const { client, state: connState } = useHostClient(hostId)
+  const reconnectAttempts = useReconnectAttempt(hostId)
+  const lastConnectedAt = useLastConnectedAt(hostId)
+  const relayRecovery = useRelayRecoveryStatus(hostId)
+  const forgetHostClient = useForgetHostClient()
+  const forceReconnectHost = useForceReconnect()
+  // One tick drives every visible agent row's relative timestamp.
+  const now = useNow(30_000)
+  const { hostCapabilities, floatingWorkspaceEnabled } = useHostProtocolGates()
+  const state = useHostScreenState(hostId, action)
+  const settings = useHostViewSettings({ client, connState, hostId, state })
+
+  useHostScreenIdentity({ client, hostId, state })
+  const fetchRepoMetadata = useHostRepoMetadata({ client, connState, hostId, state })
+  const catalog = useHostWorktreeCatalog({
+    client,
+    connState,
+    embedded,
+    fetchRepoMetadata,
+    hostId,
+    state,
+    syncViewSettingsFromDesktop: settings.syncViewSettingsFromDesktop
+  })
+  const actions = useHostWorktreeActions({
+    client,
+    connState,
+    embedded,
+    fetchWorktrees: catalog.fetchWorktrees,
+    forgetHostClient,
+    hostId,
+    pathname,
+    router,
+    state
+  })
+
+  const resolvedRouteActionState = resolveHostRouteActionState(state.routeActionState, action)
+  // Why: resolve `action=newWorktree` before commit, but don't reopen after the user closes while the URL persists.
+  if (resolvedRouteActionState !== state.routeActionState) {
+    state.setRouteActionState(resolvedRouteActionState)
+  }
+  const showNewWorktree = resolvedRouteActionState.showNewWorktree
+
+  const displayWorktrees = useMemo(() => {
+    // Why: live `worktrees` is authoritative only while connected; under the amber
+    // mount default, connecting/handshaking must keep the pre-reconnect list too.
+    const base = connState === 'connected' ? state.worktrees : state.lastKnownWorktrees
+    return applyWorktreeRowDisplayState(
+      base,
+      state.sleptIds,
+      state.optimisticActiveWorktreeIdentity
+    )
+  }, [
+    connState,
+    state.worktrees,
+    state.lastKnownWorktrees,
+    state.sleptIds,
+    state.optimisticActiveWorktreeIdentity
+  ])
+  const sectionsResult = useWorkspaceSections({
+    displayWorktrees,
+    sortMode: state.sortMode,
+    filters: state.filters,
+    search: state.search,
+    groupMode: state.groupMode,
+    pinnedIds: state.pinnedIds,
+    repoIdsByName: state.repoIdsByName,
+    repoColorsByName: state.repoColorsByName,
+    collapsedGroups: state.collapsedGroups,
+    workspaceStatuses: state.workspaceStatuses
+  })
+  const existingWorktreePaths = useMemo(() => state.worktrees.map((w) => w.path), [state.worktrees])
+  const activeWorktreeScroll = useActiveWorktreeScroll(sectionsResult.sections)
+
+  return {
+    actions,
+    activeWorktreeScroll,
+    catalog,
+    client,
+    connState,
+    contentMaxWidth,
+    displayWorktrees,
+    embedded,
+    existingWorktreePaths,
+    floatingWorkspaceEnabled,
+    forceReconnectHost,
+    hostCapabilities,
+    hostId,
+    insets,
+    isReadOnly: connState === 'auth-failed',
+    isWideLayout,
+    lastConnectedAt,
+    noticeParam,
+    now,
+    onHideSidebar,
+    reconnectAttempts,
+    relayRecovery,
+    routeNotice,
+    router,
+    sectionsResult,
+    setDismissedNotice,
+    settings,
+    showNewWorktree,
+    state
+  }
+}
+
+export type HostScreenController = ReturnType<typeof useHostScreenController>
diff --git a/mobile/src/host-screen/use-host-screen-identity.ts b/mobile/src/host-screen/use-host-screen-identity.ts
new file mode 100644
index 00000000000..c0b09f61714
--- /dev/null
+++ b/mobile/src/host-screen/use-host-screen-identity.ts
@@ -0,0 +1,90 @@
+import { useEffect } from 'react'
+import { getCachedWorktrees } from '../cache/worktree-cache'
+import { loadPinnedIds } from '../storage/preferences'
+import { loadHosts, updateLastConnected } from '../transport/host-store'
+import type { RpcClient } from '../transport/rpc-client'
+import type { Worktree } from '../worktree/workspace-list-sections'
+import type { HostScreenState } from './use-host-screen-state'
+
+export function useHostScreenIdentity(args: {
+  client: RpcClient | null
+  hostId: string | undefined
+  state: HostScreenState
+}): void {
+  const { client, hostId, state } = args
+  const {
+    clientRef,
+    repoMetadataFetchedAtRef,
+    setCatalogError,
+    setError,
+    setHostName,
+    setLastKnownWorktrees,
+    setPinnedIds,
+    setRepoColorsByName,
+    setRepoIconsByName,
+    setWorktrees,
+    setWorktreesLoaded
+  } = state
+
+  // Load persisted pins from local cache; view settings are no longer local (they sync via ui.get).
+  useEffect(() => {
+    if (!hostId) {
+      return
+    }
+    let stale = false
+    void (async () => {
+      const pins = await loadPinnedIds(hostId)
+      if (stale) {
+        return
+      }
+      setPinnedIds(pins)
+    })()
+    return () => {
+      stale = true
+    }
+  }, [hostId])
+
+  // Why: mirror client into a ref so imperative call sites read it without re-subscribing.
+  useEffect(() => {
+    clientRef.current = client
+  }, [client])
+
+  useEffect(() => {
+    setHostName('')
+    setError('')
+    setRepoColorsByName(new Map())
+    setRepoIconsByName(new Map())
+    repoMetadataFetchedAtRef.current = 0
+    // Why: useState initializer runs only on first mount, so re-seed the cache when Expo Router reuses this screen for a new hostId.
+    const freshCache = hostId ? (getCachedWorktrees(hostId) as Worktree[] | null) : null
+    setCatalogError(null)
+    if (freshCache) {
+      setWorktrees(freshCache)
+      setLastKnownWorktrees(freshCache)
+      setWorktreesLoaded(true)
+    } else {
+      setWorktreesLoaded(false)
+      setWorktrees([])
+      setLastKnownWorktrees([])
+    }
+    if (!hostId) {
+      return
+    }
+    let stale = false
+    void loadHosts().then((hosts) => {
+      if (stale) {
+        return
+      }
+      const host = hosts.find((h) => h.id === hostId)
+      if (!host) {
+        setError('Host not found')
+        return
+      }
+      setHostName(host.name)
+      void updateLastConnected(host.id)
+    })
+    return () => {
+      stale = true
+    }
+  }, [hostId])
+}
diff --git a/mobile/src/host-screen/use-host-screen-state.ts b/mobile/src/host-screen/use-host-screen-state.ts
new file mode 100644
index 00000000000..b27e15ffb91
--- /dev/null
+++ b/mobile/src/host-screen/use-host-screen-state.ts
@@ -0,0 +1,148 @@
+import { useRef, useState } from 'react'
+import type { RepoIcon } from '../../../src/shared/repo-icon'
+import type { WorkspaceStatusDefinition } from '../../../src/shared/worktree/types'
+import { getCachedWorktrees } from '../cache/worktree-cache'
+import { createInitialHostRouteActionState } from '../host-route-action-state'
+import type { RpcClient } from '../transport/rpc-client'
+import { DEFAULT_MOBILE_WORKSPACE_STATUSES } from '../worktree/mobile-workspace-statuses'
+import { WorktreeCatalogSnapshotClient } from '../worktree/worktree-catalog-snapshot-client'
+import type {
+  MobileGroupMode,
+  MobileSortMode,
+  MobileViewState
+} from '../worktree/workspace-view-settings'
+import type { FilterState, Worktree } from '../worktree/workspace-list-sections'
+
+export function useHostScreenState(hostId: string | undefined, action: string | undefined) {
+  const [initialCache] = useState(() =>
+    hostId ? (getCachedWorktrees(hostId) as Worktree[] | null) : null
+  )
+  const clientRef = useRef<RpcClient | null>(null)
+  const fetchWorktreesInFlightRef = useRef(false)
+  // Why: useRef, not useMemo — React may discard memoized values, which would silently
+  // reset the snapshot token this object exists to own.
+  const worktreeCatalogRef = useRef(new WorktreeCatalogSnapshotClient())
+  const fetchRepoMetadataInFlightRef = useRef(new WeakSet<RpcClient>())
+  const fetchRepoMetadataPendingRef = useRef(new WeakSet<RpcClient>())
+  const repoMetadataFetchedAtRef = useRef(0)
+  const newWorktreeModalRef = useRef<{ open: () => void }>(null)
+  const newWorktreeModalVisibleRef = useRef(false)
+  const [worktrees, setWorktrees] = useState<Worktree[]>(initialCache ?? [])
+  const [worktreesLoaded, setWorktreesLoaded] = useState(initialCache != null)
+  // Why (STA-3123): error code of the last failed worktree.ps, so a broken catalog
+  // path renders as a failure instead of an empty host. Cleared on the next success.
+  const [catalogError, setCatalogError] = useState<string | null>(null)
+  // Why: track the locally-opened worktree so the active-row highlight moves instantly instead of waiting for the next poll.
+  const [optimisticActiveWorktreeIdentity, setOptimisticActiveWorktreeIdentity] = useState<
+    string | null
+  >(null)
+  const [repoColorsByName, setRepoColorsByName] = useState<Map<string, string>>(new Map())
+  const [repoIconsByName, setRepoIconsByName] = useState<Map<string, RepoIcon>>(new Map())
+  const [hostName, setHostName] = useState('')
+  const [error, setError] = useState('')
+  const [lastKnownWorktrees, setLastKnownWorktrees] = useState<Worktree[]>(initialCache ?? [])
+  const [search, setSearch] = useState('')
+  const [showSearch, setShowSearch] = useState(false)
+  const [sortMode, setSortMode] = useState<MobileSortMode>('recent')
+  const [filters, setFilters] = useState<FilterState>({
+    filterRepoIds: new Set(),
+    hideSleeping: false,
+    hideDefaultBranch: false,
+    alwaysShowDefaultBranch: true
+  })
+  const [groupMode, setGroupMode] = useState<MobileGroupMode>('repo')
+  const [workspaceStatuses, setWorkspaceStatuses] = useState<readonly WorkspaceStatusDefinition[]>(
+    DEFAULT_MOBILE_WORKSPACE_STATUSES
+  )
+  // displayName → repo id: filters key on repo id, but section headers/rows key on displayName, so bridge the two.
+  const [repoIdsByName, setRepoIdsByName] = useState<Map<string, string>>(new Map())
+  const [showSortPicker, setShowSortPicker] = useState(false)
+  const [showGroupPicker, setShowGroupPicker] = useState(false)
+  const [showFilterModal, setShowFilterModal] = useState(false)
+  const [actionTarget, setActionTarget] = useState<Worktree | null>(null)
+  const [confirmDelete, setConfirmDelete] = useState<Worktree | null>(null)
+  const [confirmRemoveHost, setConfirmRemoveHost] = useState(false)
+  const [routeActionState, setRouteActionState] = useState(() =>
+    createInitialHostRouteActionState(action)
+  )
+  const [sleptIds, setSleptIds] = useState<Set<string>>(new Set())
+  const [pinnedIds, setPinnedIds] = useState<Set<string>>(new Set())
+  const [collapsedGroups, setCollapsedGroups] = useState<Set<string>>(new Set())
+  // Why: ref so the ui.get merge and ui.set writes read the latest values without re-creating callbacks on every state change.
+  const viewStateRef = useRef<MobileViewState>({
+    groupMode: 'repo',
+    sortMode: 'recent',
+    hideSleeping: false,
+    hideDefaultBranch: false,
+    alwaysShowDefaultBranch: true,
+    filterRepoIds: [],
+    collapsedGroups: [],
+    workspaceStatuses: DEFAULT_MOBILE_WORKSPACE_STATUSES
+  })
+
+  return {
+    actionTarget,
+    catalogError,
+    clientRef,
+    collapsedGroups,
+    confirmDelete,
+    confirmRemoveHost,
+    error,
+    fetchRepoMetadataInFlightRef,
+    fetchRepoMetadataPendingRef,
+    fetchWorktreesInFlightRef,
+    filters,
+    groupMode,
+    hostName,
+    lastKnownWorktrees,
+    newWorktreeModalRef,
+    newWorktreeModalVisibleRef,
+    optimisticActiveWorktreeIdentity,
+    pinnedIds,
+    repoColorsByName,
+    repoIconsByName,
+    repoIdsByName,
+    repoMetadataFetchedAtRef,
+    routeActionState,
+    search,
+    setActionTarget,
+    setCatalogError,
+    setCollapsedGroups,
+    setConfirmDelete,
+    setConfirmRemoveHost,
+    setError,
+    setFilters,
+    setGroupMode,
+    setHostName,
+    setLastKnownWorktrees,
+    setOptimisticActiveWorktreeIdentity,
+    setPinnedIds,
+    setRepoColorsByName,
+    setRepoIconsByName,
+    setRepoIdsByName,
+    setRouteActionState,
+    setSearch,
+    setShowFilterModal,
+    setShowGroupPicker,
+    setShowSearch,
+    setShowSortPicker,
+    setSleptIds,
+    setSortMode,
+    setWorkspaceStatuses,
+    setWorktrees,
+    setWorktreesLoaded,
+    showFilterModal,
+    showGroupPicker,
+    showSearch,
+    showSortPicker,
+    sleptIds,
+    sortMode,
+    viewStateRef,
+    workspaceStatuses,
+    worktreeCatalogRef,
+    worktrees,
+    worktreesLoaded
+  }
+}
+
+export type HostScreenState = ReturnType<typeof useHostScreenState>
diff --git a/mobile/src/host-screen/use-host-view-settings.ts b/mobile/src/host-screen/use-host-view-settings.ts
new file mode 100644
index 00000000000..877aa5f3c9f
--- /dev/null
+++ b/mobile/src/host-screen/use-host-view-settings.ts
@@ -0,0 +1,194 @@
+import { useCallback, useEffect, useMemo } from 'react'
+import type { RpcClient } from '../transport/rpc-client'
+import type { ConnectionState, RpcSuccess } from '../transport/types'
+import { getMobileWorkspaceLineageGroupKey } from '../worktree/mobile-workspace-lineage'
+import { WORKSPACE_SORT_OPTIONS as SORT_OPTIONS } from '../worktree/workspace-list-picker-options'
+import {
+  applyDesktopViewSettings,
+  buildWorkspaceViewSettingsUpdate,
+  type MobileGroupMode,
+  type MobileSortMode,
+  type MobileViewState,
+  type WorkspaceViewSettings
+} from '../worktree/workspace-view-settings'
+import type { Worktree } from '../worktree/workspace-list-sections'
+import type { HostScreenState } from './use-host-screen-state'
+
+export function useHostViewSettings(args: {
+  client: RpcClient | null
+  connState: ConnectionState
+  hostId: string | undefined
+  state: HostScreenState
+}) {
+  const { client, connState, hostId, state } = args
+  const {
+    clientRef,
+    collapsedGroups,
+    filters,
+    groupMode,
+    setCollapsedGroups,
+    setFilters,
+    setGroupMode,
+    setSortMode,
+    setWorkspaceStatuses,
+    sortMode,
+    viewStateRef,
+    workspaceStatuses
+  } = state
+
+  useEffect(() => {
+    viewStateRef.current = {
+      groupMode,
+      sortMode,
+      hideSleeping: filters.hideSleeping,
+      hideDefaultBranch: filters.hideDefaultBranch,
+      alwaysShowDefaultBranch: filters.alwaysShowDefaultBranch !== false,
+      filterRepoIds: [...filters.filterRepoIds],
+      collapsedGroups: [...collapsedGroups],
+      workspaceStatuses
+    }
+  }, [groupMode, sortMode, filters, collapsedGroups, workspaceStatuses])
+
+  // Apply a MobileViewState onto the individual states and the snapshot ref in one shot.
+  const applyViewState = useCallback((next: MobileViewState) => {
+    viewStateRef.current = next
+    setGroupMode(next.groupMode)
+    setSortMode(next.sortMode)
+    setWorkspaceStatuses(next.workspaceStatuses)
+    setCollapsedGroups(new Set(next.collapsedGroups))
+    setFilters({
+      filterRepoIds: new Set(next.filterRepoIds),
+      hideSleeping: next.hideSleeping,
+      hideDefaultBranch: next.hideDefaultBranch,
+      alwaysShowDefaultBranch: next.alwaysShowDefaultBranch
+    })
+  }, [])
+
+  // Apply the change locally, then patch the desktop's shared store (ui.set) so both apps stay in sync.
+  const persistViewSettings = useCallback(
+    (patch: Partial<MobileViewState>) => {
+      const next: MobileViewState = { ...viewStateRef.current, ...patch }
+      applyViewState(next)
+      if (!client) {
+        return
+      }
+      // Send only the touched fields: the host merges partial updates, so a stale
+      // mirror can no longer revert sibling settings another client just changed
+      // (STA-5781; supersedes the #8873 whole-payload special case).
+      const payload: WorkspaceViewSettings = buildWorkspaceViewSettingsUpdate(patch, next)
+      if (Object.keys(payload).length === 0) {
+        return
+      }
+      void client.sendRequest('ui.set', payload).catch(() => {
+        // Best-effort: view settings are a convenience preference.
+      })
+    },
+    [client, applyViewState]
+  )
+
+  // Merge the desktop's shared view settings (PersistedUIState) onto local state so desktop changes appear here.
+  const syncViewSettingsFromDesktop = useCallback(async () => {
+    if (!client || connState !== 'connected') {
+      return
+    }
+    const requestClient = client
+    const requestHostId = hostId
+    try {
+      const response = await requestClient.sendRequest('ui.get')
+      if (clientRef.current !== requestClient || hostId !== requestHostId || !response.ok) {
+        return
+      }
+      const ui = ((response as RpcSuccess).result as { ui?: WorkspaceViewSettings }).ui
+      if (!ui) {
+        return
+      }
+      applyViewState(applyDesktopViewSettings(viewStateRef.current, ui))
+    } catch {
+      // Transient transport failure; retry on the next focus/connect.
+    }
+  }, [client, connState, hostId, applyViewState])
+
+  const handleSortChange = useCallback(
+    (value: MobileSortMode) => {
+      persistViewSettings({ sortMode: value })
+    },
+    [persistViewSettings]
+  )
+
+  const toggleHideSleeping = useCallback(() => {
+    persistViewSettings({ hideSleeping: !viewStateRef.current.hideSleeping })
+  }, [persistViewSettings])
+
+  const toggleHideDefaultBranch = useCallback(() => {
+    persistViewSettings({ hideDefaultBranch: !viewStateRef.current.hideDefaultBranch })
+  }, [persistViewSettings])
+
+  const toggleRepoFilter = useCallback(
+    (repoId: string) => {
+      const next = new Set(viewStateRef.current.filterRepoIds)
+      if (next.has(repoId)) {
+        next.delete(repoId)
+      } else {
+        next.add(repoId)
+      }
+      persistViewSettings({ filterRepoIds: [...next] })
+    },
+    [persistViewSettings]
+  )
+
+  const clearFilters = useCallback(() => {
+    persistViewSettings({ hideSleeping: false, hideDefaultBranch: false, filterRepoIds: [] })
+  }, [persistViewSettings])
+
+  const activeFilterCount = useMemo(() => {
+    let count = 0
+    if (filters.hideSleeping) {
+      count++
+    }
+    if (filters.hideDefaultBranch) {
+      count++
+    }
+    count += filters.filterRepoIds.size
+    return count
+  }, [filters])
+  const selectedSortLabel =
+    SORT_OPTIONS.find((option) => option.value === sortMode)?.label ?? 'Recent'
+
+  const handleGroupChange = useCallback(
+    (value: MobileGroupMode) => {
+      persistViewSettings({ groupMode: value })
+    },
+    [persistViewSettings]
+  )
+
+  const toggleCollapsed = useCallback(
+    (key: string) => {
+      const next = new Set(viewStateRef.current.collapsedGroups)
+      if (!next.delete(key)) {
+        next.add(key)
+      }
+      persistViewSettings({ collapsedGroups: [...next] })
+    },
+    [persistViewSettings]
+  )
+  const toggleWorktreeLineage = useCallback(
+    (item: Worktree) => toggleCollapsed(getMobileWorkspaceLineageGroupKey(item)),
+    [toggleCollapsed]
+  )
+
+  return {
+    activeFilterCount,
+    clearFilters,
+    handleGroupChange,
+    handleSortChange,
+    selectedSortLabel,
+    syncViewSettingsFromDesktop,
+    toggleCollapsed,
+    toggleHideDefaultBranch,
+    toggleHideSleeping,
+    toggleRepoFilter,
+    toggleWorktreeLineage
+  }
+}
+
+export type HostViewSettings = ReturnType<typeof useHostViewSettings>
diff --git a/mobile/src/host-screen/use-host-worktree-actions.ts b/mobile/src/host-screen/use-host-worktree-actions.ts
new file mode 100644
index 00000000000..21f49a4f306
--- /dev/null
+++ b/mobile/src/host-screen/use-host-worktree-actions.ts
@@ -0,0 +1,212 @@
+import { useCallback } from 'react'
+import { Alert } from 'react-native'
+import type { useRouter } from 'expo-router'
+import { floatingWorkspaceSessionPath } from '../session/floating-workspace'
+import { savePinnedIds } from '../storage/preferences'
+import type { useForgetHostClient } from '../transport/client-context'
+import { removeHostAndCloseClient } from '../transport/host-removal-lifecycle'
+import type { RpcClient } from '../transport/rpc-client'
+import type { ConnectionState } from '../transport/types'
+import { setHostRouteNewWorktreeVisible } from '../host-route-action-state'
+import { leaveHostRoute } from '../host-route-exit'
+import { getWorktreeRowIdentity, removeWorktreeRow } from '../worktree/worktree-host-row-identity'
+import { isWorktreePinned, type Worktree } from '../worktree/workspace-list-sections'
+import type { HostScreenState } from './use-host-screen-state'
+
+export function useHostWorktreeActions(args: {
+  client: RpcClient | null
+  connState: ConnectionState
+  embedded: boolean
+  fetchWorktrees: (options?: { allowDuringModal?: boolean }) => Promise<void>
+  forgetHostClient: ReturnType<typeof useForgetHostClient>
+  hostId: string | undefined
+  pathname: string
+  router: ReturnType<typeof useRouter>
+  state: HostScreenState
+}) {
+  const {
+    client,
+    connState,
+    embedded,
+    fetchWorktrees,
+    forgetHostClient,
+    hostId,
+    pathname,
+    router,
+    state
+  } = args
+  const {
+    newWorktreeModalRef,
+    newWorktreeModalVisibleRef,
+    pinnedIds,
+    setConfirmRemoveHost,
+    setLastKnownWorktrees,
+    setOptimisticActiveWorktreeIdentity,
+    setPinnedIds,
+    setRouteActionState,
+    setWorktrees,
+    worktrees
+  } = state
+
+  const leaveHost = useCallback(() => {
+    leaveHostRoute(router)
+  }, [router])
+
+  const openNewWorktreeModal = useCallback(() => {
+    const modal = newWorktreeModalRef.current
+    if (!modal) {
+      return
+    }
+    newWorktreeModalVisibleRef.current = true
+    modal.open()
+  }, [])
+
+  const setShowNewWorktreeVisible = useCallback((visible: boolean) => {
+    setRouteActionState((current) => setHostRouteNewWorktreeVisible(current, visible))
+  }, [])
+
+  const updateLocalPins = useCallback(
+    (worktreeId: string, pinned: boolean) => {
+      setPinnedIds((prev) => {
+        const next = new Set(prev)
+        if (pinned) {
+          next.add(worktreeId)
+        } else {
+          next.delete(worktreeId)
+        }
+        if (hostId) {
+          void savePinnedIds(hostId, next)
+        }
+        return next
+      })
+    },
+    [hostId]
+  )
+
+  const togglePin = useCallback(
+    (worktreeId: string) => {
+      const worktree = worktrees.find((w) => w.worktreeId === worktreeId)
+      const currentlyPinned = worktree
+        ? isWorktreePinned(worktree, pinnedIds)
+        : pinnedIds.has(worktreeId)
+      const newPinned = !currentlyPinned
+
+      setWorktrees((prev) =>
+        prev.map((w) => (w.worktreeId === worktreeId ? { ...w, isPinned: newPinned } : w))
+      )
+      setLastKnownWorktrees((prev) =>
+        prev.map((w) => (w.worktreeId === worktreeId ? { ...w, isPinned: newPinned } : w))
+      )
+
+      updateLocalPins(worktreeId, newPinned)
+
+      if (client) {
+        client
+          .sendRequest('worktree.set', {
+            worktree: `id:${worktreeId}`,
+            isPinned: newPinned
+          })
+          .catch(() => {})
+      }
+    },
+    [client, worktrees, pinnedIds, updateLocalPins]
+  )
+
+  const handleDeleteWorktree = useCallback(
+    async (item: Worktree) => {
+      if (!client) {
+        return
+      }
+
+      const removeFromList = (list: Worktree[]) => removeWorktreeRow(list, item)
+      setWorktrees(removeFromList)
+      setLastKnownWorktrees(removeFromList)
+
+      try {
+        const response = await client.sendRequest('worktree.rm', {
+          worktree: `id:${item.worktreeId}`,
+          force: true
+        })
+        if (!response.ok) {
+          setWorktrees((prev) => [...prev, item])
+          setLastKnownWorktrees((prev) => [...prev, item])
+        }
+        void fetchWorktrees()
+      } catch {
+        setWorktrees((prev) => [...prev, item])
+        setLastKnownWorktrees((prev) => [...prev, item])
+      }
+    },
+    [client, fetchWorktrees]
+  )
+
+  const handleRemoveHost = useCallback(async () => {
+    if (!hostId) {
+      return
+    }
+    try {
+      await removeHostAndCloseClient(hostId, forgetHostClient)
+      leaveHost()
+    } catch {
+      // Why: removal can fail while still paired; re-open confirm (ConfirmModal closes on confirm).
+      setConfirmRemoveHost(true)
+      Alert.alert('Could not remove host', 'Please try again.')
+    }
+  }, [hostId, leaveHost, forgetHostClient])
+
+  const navigateFromHostList = useCallback(
+    (target: string) => {
+      if (!embedded) {
+        router.push(target)
+        return
+      }
+      if (pathname === (target.split('?')[0] ?? target)) {
+        return
+      }
+      if (pathname === `/h/${hostId}`) {
+        router.push(target)
+        return
+      }
+      router.replace(target)
+    },
+    [embedded, hostId, pathname, router]
+  )
+
+  const openWorktreeSession = useCallback(
+    (item: Worktree) => {
+      setOptimisticActiveWorktreeIdentity(getWorktreeRowIdentity(item))
+      if (client && connState === 'connected') {
+        void client
+          .sendRequest('worktree.activate', {
+            worktree: `id:${item.worktreeId}`,
+            notifyClients: false,
+            navigation: 'caller'
+          })
+          .catch(() => null)
+      }
+      const target = `/h/${hostId}/session/${encodeURIComponent(item.worktreeId)}?name=${encodeURIComponent(item.displayName || item.repo)}`
+      navigateFromHostList(target)
+    },
+    [client, connState, hostId, navigateFromHostList]
+  )
+
+  const openFloatingWorkspace = useCallback(() => {
+    // Why: no worktree.activate here — the floating sentinel has no worktree
+    // record; session.tabs.list hydrates its host-owned tabs on open.
+    navigateFromHostList(floatingWorkspaceSessionPath(hostId))
+  }, [hostId, navigateFromHostList])
+
+  return {
+    handleDeleteWorktree,
+    handleRemoveHost,
+    leaveHost,
+    navigateFromHostList,
+    openFloatingWorkspace,
+    openNewWorktreeModal,
+    openWorktreeSession,
+    setShowNewWorktreeVisible,
+    togglePin
+  }
+}
+
+export type HostWorktreeActions = ReturnType<typeof useHostWorktreeActions>
diff --git a/mobile/src/host-screen/use-host-worktree-catalog.ts b/mobile/src/host-screen/use-host-worktree-catalog.ts
new file mode 100644
index 00000000000..9acfed854fa
--- /dev/null
+++ b/mobile/src/host-screen/use-host-worktree-catalog.ts
@@ -0,0 +1,174 @@
+import { useCallback, useEffect } from 'react'
+import { useFocusEffect } from 'expo-router'
+import { setCachedWorktrees } from '../cache/worktree-cache'
+import type { RpcClient } from '../transport/rpc-client'
+import type { ConnectionState } from '../transport/types'
+import { useWorktreeResync } from '../transport/use-worktree-resync'
+import { startHostWorktreeRefresh } from '../worktree/host-worktree-refresh'
+import { areWorktreeListsEqual } from '../worktree/worktree-list-snapshot'
+import {
+  clearConfirmedActiveWorktreeIdentity,
+  retainLiveSleptWorktreeIdentities
+} from '../worktree/worktree-host-row-identity'
+import { savePinnedIds } from '../storage/preferences'
+import type { FetchHostRepoMetadata } from './use-host-repo-metadata'
+import type { HostScreenState } from './use-host-screen-state'
+
+export function useHostWorktreeCatalog(args: {
+  client: RpcClient | null
+  connState: ConnectionState
+  embedded: boolean
+  fetchRepoMetadata: FetchHostRepoMetadata
+  hostId: string | undefined
+  state: HostScreenState
+  syncViewSettingsFromDesktop: () => Promise<void>
+}) {
+  const {
+    client,
+    connState,
+    embedded,
+    fetchRepoMetadata,
+    hostId,
+    state,
+    syncViewSettingsFromDesktop
+  } = args
+  const {
+    clientRef,
+    fetchWorktreesInFlightRef,
+    newWorktreeModalVisibleRef,
+    setCatalogError,
+    setLastKnownWorktrees,
+    setOptimisticActiveWorktreeIdentity,
+    setPinnedIds,
+    setSleptIds,
+    setWorktrees,
+    setWorktreesLoaded,
+    worktreeCatalogRef
+  } = state
+
+  const fetchWorktrees = useCallback(
+    async (options: { allowDuringModal?: boolean } = {}) => {
+      if (!client || connState !== 'connected' || !hostId) {
+        return
+      }
+      if (!options.allowDuringModal && newWorktreeModalVisibleRef.current) {
+        return
+      }
+      // Why: prevent slow remote hosts from stacking overlapping worktree.ps requests during polling.
+      if (fetchWorktreesInFlightRef.current) {
+        return
+      }
+      fetchWorktreesInFlightRef.current = true
+      const requestClient = client
+      const requestHostId = hostId
+
+      try {
+        const fetched = await worktreeCatalogRef.current.fetch(requestClient, requestHostId)
+        if (clientRef.current !== requestClient || hostId !== requestHostId) {
+          return
+        }
+        if (!options.allowDuringModal && newWorktreeModalVisibleRef.current) {
+          return
+        }
+        // Why (STA-3123): a failed catalog request must not pass for "0 worktrees";
+        // surface it so a broken remote host is diagnosable instead of looking empty.
+        if (fetched.kind === 'request_failed') {
+          setCatalogError(fetched.code)
+          return
+        }
+        if (fetched.pending.admission.kind === 'invalid') {
+          setCatalogError('invalid_response')
+        }
+        // Why: unchanged responses still yield the confirmed rows, so every poll reasserts
+        // host truth over optimistic local edits regardless of payload size.
+        const confirmed = worktreeCatalogRef.current.admit(fetched.pending)
+        if (confirmed) {
+          setCatalogError(null)
+          // Why: reuse the existing array on identical snapshots to keep SectionList/sort rebuilds off the tap path.
+          setWorktrees((current) =>
+            areWorktreeListsEqual(current, confirmed) ? current : confirmed
+          )
+          setLastKnownWorktrees((current) =>
+            areWorktreeListsEqual(current, confirmed) ? current : confirmed
+          )
+          setWorktreesLoaded(true)
+          // Why (#8498): overwrite the home-written cache with the confirmed snapshot so a reconnect/remount can't serve a stale list.
+          if (hostId) {
+            setCachedWorktrees(hostId, confirmed, { proven: true })
+          }
+          // Drop the optimistic active override once the host reports it active, so later desktop changes win.
+          setOptimisticActiveWorktreeIdentity((pending) =>
+            clearConfirmedActiveWorktreeIdentity(pending, confirmed)
+          )
+
+          // Clear optimistic sleep overrides once the server confirms inactive (liveTerminalCount === 0).
+          setSleptIds((prev) => retainLiveSleptWorktreeIdentities(prev, confirmed))
+
+          // Sync pin state from server so desktop-initiated pins reflect without relying on stale AsyncStorage.
+          const serverPinned = new Set(confirmed.filter((w) => w.isPinned).map((w) => w.worktreeId))
+          setPinnedIds((prev) => {
+            if (serverPinned.size === prev.size && [...serverPinned].every((id) => prev.has(id))) {
+              return prev
+            }
+            if (hostId) {
+              void savePinnedIds(hostId, serverPinned)
+            }
+            return serverPinned
+          })
+        }
+      } catch {
+        // Will retry on reconnect
+        if (clientRef.current === requestClient && hostId === requestHostId) {
+          setCatalogError('network_error')
+        }
+      } finally {
+        fetchWorktreesInFlightRef.current = false
+      }
+    },
+    [client, connState, hostId]
+  )
+
+  useFocusEffect(
+    useCallback(() => {
+      // Why: focus nudges reconnect and probes a possibly half-open socket; empty deps fire per focus, not per state flip (which defeats backoff).
+      // 'focus' keeps a healthy relay green — probe, never suspend (S2 grey blink).
+      clientRef.current?.notifyForeground('focus')
+    }, [])
+  )
+
+  const startWorktreeRefresh = useCallback(() => {
+    if (!client || connState !== 'connected') {
+      return
+    }
+    void syncViewSettingsFromDesktop()
+    return startHostWorktreeRefresh({ client, fetchWorktrees, fetchRepoMetadata })
+  }, [client, connState, fetchWorktrees, fetchRepoMetadata, syncViewSettingsFromDesktop])
+
+  useFocusEffect(
+    useCallback(() => {
+      // The embedded sidebar isn't a routed screen (focus never fires); it refreshes via the mount effect below.
+      if (!embedded) {
+        return startWorktreeRefresh()
+      }
+    }, [embedded, startWorktreeRefresh])
+  )
+
+  // Why: the embedded sidebar is never the focused route, so wire its refresh lifecycle from a mount effect.
+  useEffect(() => {
+    if (embedded) {
+      return startWorktreeRefresh()
+    }
+  }, [embedded, startWorktreeRefresh])
+
+  // Why (#8498): steady-state polls miss the transition INTO 'connected' after background/sleep, when the cache is stalest.
+  const { refreshing, onRefresh } = useWorktreeResync({
+    client,
+    connState,
+    fetchWorktrees,
+    fetchRepoMetadata
+  })
+
+  return { fetchWorktrees, onRefresh, refreshing }
+}
+
+export type HostWorktreeCatalog = ReturnType<typeof useHostWorktreeCatalog>
diff --git a/mobile/src/session/mobile-session-startup-source.test.ts b/mobile/src/session/mobile-session-startup-source.test.ts
index 37b1c18971b..7f089b5bcf7 100644
--- a/mobile/src/session/mobile-session-startup-source.test.ts
+++ b/mobile/src/session/mobile-session-startup-source.test.ts
@@ -9,6 +9,10 @@ const reconciliationHookSource = readFileSync(
   new URL('./use-mobile-session-tabs-reconciliation.ts', import.meta.url),
   'utf8'
 )
+const terminalInventoryRecoverySource = readFileSync(
+  new URL('./use-mobile-terminal-inventory-recovery.ts', import.meta.url),
+  'utf8'
+)
 const autoCreateHookSource = readFileSync(
   new URL('./use-initial-session-terminal-autocreate.ts', import.meta.url),
   'utf8'
@@ -68,25 +72,44 @@ describe('mobile session startup', () => {
     expect(autoCreateHookSource).toContain('sawSessionTabs: stateRef.current.sawSessionTabs')
   })
 
-  it('delegates stream ownership while retaining the exact terminal polling cadence', () => {
+  it('delegates stream ownership while retaining degraded polling and a certified sweep', () => {
     expect(source).toContain('useMobileSessionTabsReconciliation<')
     expect(source).toContain('const applicationRevision = ++appliedSessionTabsRevisionRef.current')
     expect(source).toContain('getApplicationRevision: getSessionTabsApplicationRevision')
     expect(source).not.toContain("client.subscribe(\n      'session.tabs.subscribe'")
     expect(reconciliationHookSource).toContain("client.subscribe(\n      'session.tabs.subscribe'")
-    expect(reconciliationHookSource).toContain(
-      "if (AppState.currentState !== 'active') {\n          controller.setReconciliationActive(false)"
-    )
-    expect(reconciliationHookSource).toContain('void controller.poll()')
-    expect(reconciliationHookSource).toContain('void fetchTerminals()')
+    expect(reconciliationHookSource).toContain("if (AppState.currentState !== 'active')")
+    expect(reconciliationHookSource).toContain('suspendTerminalInventoryRecovery(true)')
+    expect(reconciliationHookSource).toContain('controller.poll()')
+    expect(reconciliationHookSource).toContain('tabsRequest !== null')
+    expect(reconciliationHookSource).toContain('void refreshTerminalInventory()')
     expect(reconciliationHookSource).toContain("AppState.addEventListener('change'")
     expect(reconciliationHookSource).toContain('const interval = setInterval(')
-    expect(reconciliationHookSource).toContain('2000')
+    expect(reconciliationHookSource).toContain('RECONCILIATION_INTERVAL_MS = 2000')
+    expect(terminalInventoryRecoverySource).toContain('CERTIFIED_TERMINAL_SWEEP_MS = 60_000')
     expect(reconciliationHookSource).toContain('controller.setReconciliationActive(false)')
     expect(reconciliationHookSource).toContain('clearInterval(interval)')
     expect(reconciliationHookSource).toContain('appStateSubscription.remove()')
   })
 
+  it('confirms terminal stream teardown with a committed inventory-recovery bridge', () => {
+    expect(source).toContain("if (data.type === 'end' || data.type === 'error')")
+    expect(source).toContain('signalTerminalInventoryRecovery()')
+    expect(terminalInventoryRecoverySource).toContain('actionRef.current = recoveryAction')
+    expect(terminalInventoryRecoverySource).toContain('pendingSignalScopeRef.current = scopeKey')
+    expect(terminalInventoryRecoverySource).toContain(
+      'committedScope !== null && committedScope !== scopeKey'
+    )
+    expect(source).toContain('return terminalInventoryRequest.activate()')
+    expect(source).toContain('if (!isCurrent())')
+    expect(terminalInventoryRecoverySource).toContain(
+      'TERMINAL_INVENTORY_CONFIRMATION_DELAY_MS = 750'
+    )
+    expect(terminalInventoryRecoverySource).toContain(
+      'refreshTerminalInventory({ allowEmptyLoaded: true })'
+    )
+  })
+
   it('loads session tabs without waiting for desktop activation', () => {
     const startupEffect = sliceBetween(
       'void (async () => {',
diff --git a/mobile/src/session/mobile-session-tabs-stream-health.test.ts b/mobile/src/session/mobile-session-tabs-stream-health.test.ts
index 399128bb511..b86e5061fa0 100644
--- a/mobile/src/session/mobile-session-tabs-stream-health.test.ts
+++ b/mobile/src/session/mobile-session-tabs-stream-health.test.ts
@@ -72,12 +72,10 @@ function makeHarness(options?: {
   } as unknown as RpcClient
   const apply =
     options?.apply ??
-    vi.fn(
-      (value: TestResult): SessionTabsApplyOutcome<string> => ({
-        accepted: true,
-        effectiveTabs: value.tabs
-      })
-    )
+    vi.fn((value: TestResult): SessionTabsApplyOutcome<string> => ({
+      accepted: true,
+      effectiveTabs: value.tabs
+    }))
   const consumeAccepted = vi.fn()
   let recoveryNeeded = false
   const controller = new MobileSessionTabsStreamHealth<TestResult, string>({
@@ -306,9 +304,8 @@ describe('MobileSessionTabsStreamHealth', () => {
   })
 
   it('does not consume a rejected stream snapshot or update', () => {
-    const apply = vi.fn(
-      (value: TestResult): SessionTabsApplyOutcome<string> =>
-        value.type ? { accepted: false } : { accepted: true, effectiveTabs: value.tabs }
+    const apply = vi.fn((value: TestResult): SessionTabsApplyOutcome<string> =>
+      value.type ? { accepted: false } : { accepted: true, effectiveTabs: value.tabs }
     )
     const harness = makeHarness({ apply })
     const subscription = harness.controller.beginSubscription()
diff --git a/mobile/src/session/mobile-terminal-inventory-request.test.ts b/mobile/src/session/mobile-terminal-inventory-request.test.ts
new file mode 100644
index 00000000000..a3d0ac926c8
--- /dev/null
+++ b/mobile/src/session/mobile-terminal-inventory-request.test.ts
@@ -0,0 +1,90 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { MobileTerminalInventoryRequest } from './mobile-terminal-inventory-request'
+
+function deferred<T>() {
+  let resolve!: (value: T) => void
+  let reject!: (reason?: unknown) => void
+  const promise = new Promise<T>((resolvePromise, rejectPromise) => {
+    resolve = resolvePromise
+    reject = rejectPromise
+  })
+  return { promise, reject, resolve }
+}
+
+describe('MobileTerminalInventoryRequest', () => {
+  afterEach(() => {
+    vi.restoreAllMocks()
+  })
+
+  it('shares an in-flight request and upgrades its empty-list handling', async () => {
+    const response = deferred<void>()
+    const execute = vi.fn(async (allowsEmpty: () => boolean) => {
+      await response.promise
+      return allowsEmpty()
+    })
+    const requests = new MobileTerminalInventoryRequest()
+    const startupStarted = vi.fn()
+    const recoveryStarted = vi.fn()
+    vi.spyOn(Date, 'now').mockReturnValueOnce(100).mockReturnValue(200)
+
+    const startup = requests.run(false, execute, startupStarted)
+    const recovery = requests.run(true, execute, recoveryStarted)
+    expect(recovery).toBe(startup)
+    expect(startupStarted).toHaveBeenCalledExactlyOnceWith(100)
+    expect(recoveryStarted).toHaveBeenCalledExactlyOnceWith(100)
+    await Promise.resolve()
+    expect(execute).toHaveBeenCalledTimes(1)
+
+    response.resolve()
+    await expect(startup).resolves.toBe(true)
+    await expect(recovery).resolves.toBe(true)
+  })
+
+  it('starts fresh after the shared request settles or rejects', async () => {
+    const requests = new MobileTerminalInventoryRequest()
+    const failure = new Error('transport lost')
+
+    await expect(
+      requests.run(true, async () => {
+        throw failure
+      })
+    ).rejects.toBe(failure)
+    await expect(requests.run(true, async () => true)).resolves.toBe(true)
+  })
+
+  it('fences a response after its route activation is replaced', async () => {
+    const oldResponse = deferred<void>()
+    const nextResponse = deferred<void>()
+    const applied: string[] = []
+    const oldRequest = new MobileTerminalInventoryRequest()
+    const deactivateOld = oldRequest.activate()
+    const oldResult = oldRequest.run(true, async (_allowsEmpty, isCurrent) => {
+      await oldResponse.promise
+      if (!isCurrent()) {
+        return false
+      }
+      applied.push('old')
+      return true
+    })
+    await Promise.resolve()
+
+    deactivateOld()
+    const nextRequest = new MobileTerminalInventoryRequest()
+    nextRequest.activate()
+    const nextResult = nextRequest.run(true, async (_allowsEmpty, isCurrent) => {
+      await nextResponse.promise
+      if (!isCurrent()) {
+        return false
+      }
+      applied.push('next')
+      return true
+    })
+    await Promise.resolve()
+
+    nextResponse.resolve()
+    await expect(nextResult).resolves.toBe(true)
+    oldResponse.resolve()
+    await expect(oldResult).resolves.toBe(false)
+    expect(applied).toEqual(['next'])
+  })
+})
diff --git a/mobile/src/session/mobile-terminal-inventory-request.ts b/mobile/src/session/mobile-terminal-inventory-request.ts
new file mode 100644
index 00000000000..8257dd5c0c7
--- /dev/null
+++ b/mobile/src/session/mobile-terminal-inventory-request.ts
@@ -0,0 +1,52 @@
+type InFlightTerminalInventoryRequest = {
+  allowEmptyLoaded: boolean
+  promise: Promise<boolean>
+  startedAt: number
+}
+
+export class MobileTerminalInventoryRequest {
+  private activation: symbol | null = null
+  private inFlight: InFlightTerminalInventoryRequest | null = null
+
+  activate(): () => void {
+    const activation = Symbol('terminal-inventory-activation')
+    this.activation = activation
+    return () => {
+      if (this.activation === activation) {
+        this.activation = null
+      }
+    }
+  }
+
+  run(
+    allowEmptyLoaded: boolean,
+    execute: (allowsEmpty: () => boolean, isCurrent: () => boolean) => Promise<boolean>,
+    onPhysicalRequestStarted?: (startedAt: number) => void
+  ): Promise<boolean> {
+    if (this.inFlight) {
+      this.inFlight.allowEmptyLoaded ||= allowEmptyLoaded
+      onPhysicalRequestStarted?.(this.inFlight.startedAt)
+      return this.inFlight.promise
+    }
+    const activation = this.activation
+    const request: InFlightTerminalInventoryRequest = {
+      allowEmptyLoaded,
+      promise: Promise.resolve(false),
+      startedAt: Date.now()
+    }
+    onPhysicalRequestStarted?.(request.startedAt)
+    const execution = Promise.resolve().then(() =>
+      execute(
+        () => request.allowEmptyLoaded,
+        () => activation !== null && this.activation === activation
+      )
+    )
+    request.promise = execution.finally(() => {
+      if (this.inFlight === request) {
+        this.inFlight = null
+      }
+    })
+    this.inFlight = request
+    return request.promise
+  }
+}
diff --git a/mobile/src/session/mobile-terminal-records.test.ts b/mobile/src/session/mobile-terminal-records.test.ts
index cdcbfaafade..0b2b534df93 100644
--- a/mobile/src/session/mobile-terminal-records.test.ts
+++ b/mobile/src/session/mobile-terminal-records.test.ts
@@ -1,6 +1,7 @@
 import { describe, expect, it } from 'vitest'
 import {
   getTerminalRecordsFromSessionTabs,
+  hasConnectedTerminalAbsentFromSessionTabs,
   mergeTerminalListWithKnownRecords,
   mergeTerminalRecordsByCurrentOrder,
   mobileSessionTabsEqual,
@@ -150,4 +151,70 @@ describe('mobile terminal records', () => {
       )
     ).toBe(false)
   })
+
+  const record = (over: Partial<TerminalRecord> & { handle: string }): TerminalRecord => ({
+    title: 'Terminal',
+    terminalTheme: undefined,
+    isActive: false,
+    ...over
+  })
+  const terminalTab = (handle: string): MobileTerminalSessionTab => ({
+    id: `tab-${handle}`,
+    type: 'terminal',
+    terminal: handle,
+    title: 'Terminal',
+    isActive: false
+  })
+
+  it('reports a connected terminal the tab snapshot dropped', () => {
+    const held = [
+      record({ handle: 'pty-1', connected: true }),
+      record({ handle: 'pty-2', connected: true })
+    ]
+
+    expect(hasConnectedTerminalAbsentFromSessionTabs(held, [terminalTab('pty-1')])).toBe(true)
+  })
+
+  it('ignores parked handles that tabs never carry', () => {
+    const parked = [
+      record({ handle: 'pty-1', connected: false }),
+      record({ handle: 'pty-2', connected: false })
+    ]
+
+    // A worktree with no live PTY lists every parked leaf while tabs publish none;
+    // treating that as absence would pin the caller to the fast cadence forever.
+    expect(hasConnectedTerminalAbsentFromSessionTabs(parked, [])).toBe(false)
+  })
+
+  it('ignores orphaned PTYs, which have no leaf and so never appear as a tab', () => {
+    const orphan = [record({ handle: 'pty-1', connected: true, orphaned: true })]
+
+    expect(hasConnectedTerminalAbsentFromSessionTabs(orphan, [])).toBe(false)
+  })
+
+  it('ignores a host that omits connected rather than assuming liveness', () => {
+    expect(hasConnectedTerminalAbsentFromSessionTabs([record({ handle: 'pty-1' })], [])).toBe(false)
+  })
+
+  it('clears once the snapshot covers every connected terminal', () => {
+    const held = [record({ handle: 'pty-1', connected: true })]
+
+    expect(
+      hasConnectedTerminalAbsentFromSessionTabs(held, [terminalTab('pty-1'), terminalTab('pty-2')])
+    ).toBe(false)
+  })
+
+  it('keeps the merge additive so absence only schedules the sweep', () => {
+    const held = [
+      record({ handle: 'pty-1', connected: true }),
+      record({ handle: 'pty-2', connected: true })
+    ]
+    const tabs = [terminalTab('pty-1')]
+
+    expect(
+      mergeTerminalRecordsByCurrentOrder(getTerminalRecordsFromSessionTabs(tabs), held).map(
+        (terminal) => terminal.handle
+      )
+    ).toEqual(['pty-1', 'pty-2'])
+  })
 })
diff --git a/mobile/src/session/mobile-terminal-records.ts b/mobile/src/session/mobile-terminal-records.ts
index 4a9e4438c84..854513a1a87 100644
--- a/mobile/src/session/mobile-terminal-records.ts
+++ b/mobile/src/session/mobile-terminal-records.ts
@@ -6,6 +6,10 @@ export type TerminalRecord = {
   title: string
   terminalTheme?: MobileTerminalTheme
   isActive: boolean
+  /** From `terminal.list`; parked and proven-absent leaves report false. */
+  connected?: boolean
+  /** From `terminal.list`; a live PTY with no leaf, so it never appears as a tab. */
+  orphaned?: boolean
 }
 
 export type MobileTerminalSessionTab = {
@@ -157,6 +161,26 @@ export function mergeTerminalRecordsByCurrentOrder(
   ]
 }
 
+// Why: tab snapshots are partial and can transiently omit a live terminal, so absence
+// here is only a hint to schedule the `terminal.list` sweep -- never a reason to prune.
+// Restricted to connected, non-orphaned handles: parked leaves and orphaned PTYs are
+// legitimately absent from tabs forever and would pin the caller to the fast cadence.
+export function hasConnectedTerminalAbsentFromSessionTabs(
+  currentTerminals: readonly TerminalRecord[],
+  tabs: readonly MobileSessionTabLike[]
+): boolean {
+  const tabbable = currentTerminals.filter(
+    (terminal) => terminal.connected === true && terminal.orphaned !== true
+  )
+  if (tabbable.length === 0) {
+    return false
+  }
+  const tabHandles = new Set(
+    getTerminalRecordsFromSessionTabs(tabs).map((terminal) => terminal.handle)
+  )
+  return tabbable.some((terminal) => !tabHandles.has(terminal.handle))
+}
+
 export function getTerminalRecordsFromSessionTabs(
   tabs: readonly MobileSessionTabLike[]
 ): TerminalRecord[] {
@@ -169,7 +193,8 @@ export function getTerminalRecordsFromSessionTabs(
         handle: tab.terminal,
         title: tab.title || 'Terminal',
         terminalTheme: tab.terminalTheme,
-        isActive: tab.isActive === true
+        isActive: tab.isActive === true,
+        connected: true
       }
     ]
   })
diff --git a/mobile/src/session/use-mobile-session-tabs-reconciliation.test.ts b/mobile/src/session/use-mobile-session-tabs-reconciliation.test.ts
index 33c507f2712..3b419994848 100644
--- a/mobile/src/session/use-mobile-session-tabs-reconciliation.test.ts
+++ b/mobile/src/session/use-mobile-session-tabs-reconciliation.test.ts
@@ -1,9 +1,11 @@
-import { createElement } from 'react'
+import { createElement, useEffect } from 'react'
 import { act, create, type ReactTestRenderer } from 'react-test-renderer'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type { RpcClient } from '../transport/rpc-client'
+import type { ConnectionState } from '../transport/types'
 import type { SessionTabsApplyOutcome } from './mobile-session-tabs-stream-health'
 import { useMobileSessionTabsReconciliation } from './use-mobile-session-tabs-reconciliation'
+import type { MobileTerminalInventoryRefreshOptions } from './use-mobile-terminal-inventory-recovery'
 
 const lifecycle = vi.hoisted(() => ({
   appState: 'active',
@@ -38,13 +40,14 @@ type TestResult = {
   tabs: string[]
 }
 
-const fetchTerminals = vi.fn(async () => {})
-const applySessionTabs = vi.fn(
-  (value: TestResult): SessionTabsApplyOutcome<string> => ({
-    accepted: true,
-    effectiveTabs: value.tabs
-  })
-)
+const fetchTerminals = vi.fn(async (options?: MobileTerminalInventoryRefreshOptions) => {
+  options?.onPhysicalRequestStarted?.(Date.now())
+  return true
+})
+const applySessionTabs = vi.fn((value: TestResult): SessionTabsApplyOutcome<string> => ({
+  accepted: true,
+  effectiveTabs: value.tabs
+}))
 const consumeAcceptedSessionTabs = vi.fn()
 let recoveryNeeded = false
 let clearRecoveryAt = Number.POSITIVE_INFINITY
@@ -52,6 +55,9 @@ const hasRecoveryNeed = () => recoveryNeeded
 const subscribe = vi.fn()
 const unsubscribe = vi.fn()
 let streamListener: ((payload: unknown) => void) | null = null
+let requestTerminalInventoryRecovery: (() => void) | null = null
+let connectionState: ConnectionState = 'connected'
+let clientConnectionState: ConnectionState = 'connected'
 let listSequence = 0
 const sendRequest = vi.fn(async () => ({
   id: `list-${++listSequence}`,
@@ -64,8 +70,17 @@ const sendRequest = vi.fn(async () => ({
 }))
 const client = {
   sendRequest,
-  subscribe
+  subscribe,
+  getState: () => clientConnectionState
 } as unknown as RpcClient
+const replacementClient = {
+  sendRequest,
+  subscribe,
+  getState: () => clientConnectionState
+} as unknown as RpcClient
+let currentClient: RpcClient = client
+let currentWorktreeId = 'repo::worktree'
+let currentTerminalInventoryRecoveryScopeKey = 'host::repo::worktree'
 
 function applyWithRecovery(value: TestResult): SessionTabsApplyOutcome<string> {
   const outcome = applySessionTabs(value)
@@ -76,15 +91,24 @@ function applyWithRecovery(value: TestResult): SessionTabsApplyOutcome<string> {
 }
 
 function Harness(): null {
-  useMobileSessionTabsReconciliation<TestResult, string>({
-    client,
-    connState: 'connected',
-    worktreeId: 'repo::worktree',
+  const actions = useMobileSessionTabsReconciliation<TestResult, string>({
+    client: currentClient,
+    connState: connectionState,
+    worktreeId: currentWorktreeId,
     applySessionTabs: applyWithRecovery,
     consumeAcceptedSessionTabs,
     fetchTerminals,
+    terminalInventoryRecoveryScopeKey: currentTerminalInventoryRecoveryScopeKey,
     hasRecoveryNeed
   })
+  useEffect(() => {
+    requestTerminalInventoryRecovery = actions.requestTerminalInventoryRecovery
+    return () => {
+      if (requestTerminalInventoryRecovery === actions.requestTerminalInventoryRecovery) {
+        requestTerminalInventoryRecovery = null
+      }
+    }
+  }, [actions.requestTerminalInventoryRecovery])
   return null
 }
 
@@ -110,6 +134,13 @@ async function setAppState(state: string): Promise<void> {
   })
 }
 
+function expectedRecoveryInventoryOptions() {
+  return expect.objectContaining({
+    allowEmptyLoaded: true,
+    onPhysicalRequestStarted: expect.any(Function)
+  })
+}
+
 describe('useMobileSessionTabsReconciliation', () => {
   let renderer: ReactTestRenderer | null = null
   async function mount(): Promise<void> {
@@ -125,10 +156,19 @@ describe('useMobileSessionTabsReconciliation', () => {
     lifecycle.appState = 'active'
     lifecycle.focused = true
     lifecycle.listeners.clear()
+    connectionState = 'connected'
+    clientConnectionState = 'connected'
+    currentClient = client
+    currentWorktreeId = 'repo::worktree'
+    currentTerminalInventoryRecoveryScopeKey = 'host::repo::worktree'
     recoveryNeeded = false
     clearRecoveryAt = Number.POSITIVE_INFINITY
     listSequence = 0
-    fetchTerminals.mockClear()
+    fetchTerminals.mockReset()
+    fetchTerminals.mockImplementation(async (options?: MobileTerminalInventoryRefreshOptions) => {
+      options?.onPhysicalRequestStarted?.(Date.now())
+      return true
+    })
     applySessionTabs.mockClear()
     consumeAcceptedSessionTabs.mockClear()
     unsubscribe.mockClear()
@@ -147,10 +187,11 @@ describe('useMobileSessionTabsReconciliation', () => {
     act(() => renderer?.unmount())
     renderer = null
     streamListener = null
+    requestTerminalInventoryRecovery = null
     vi.useRealTimers()
   })
 
-  it('does zero tab lists and thirty terminal lists in a certified warm minute', async () => {
+  it('runs one terminal health sweep and zero tab lists in a certified warm minute', async () => {
     await mount()
     await emitStream({ type: 'updated', snapshotVersion: 1, tabs: ['tab-1'] })
     sendRequest.mockClear()
@@ -161,7 +202,275 @@ describe('useMobileSessionTabsReconciliation', () => {
     })
 
     expect(sendRequest).not.toHaveBeenCalled()
-    expect(fetchTerminals).toHaveBeenCalledTimes(30)
+    expect(fetchTerminals).toHaveBeenCalledTimes(1)
+  })
+
+  it('backs off a failed certified terminal sweep for another minute', async () => {
+    await mount()
+    await emitStream({ type: 'updated', snapshotVersion: 1, tabs: ['tab-1'] })
+    fetchTerminals.mockClear()
+    fetchTerminals.mockResolvedValue(false)
+
+    await act(async () => {
+      await vi.advanceTimersByTimeAsync(60_000)
+    })
+    expect(fetchTerminals).toHaveBeenCalledTimes(1)
+
+    await act(async () => {
+      await vi.advanceTimersByTimeAsync(58_000)
+    })
+    expect(fetchTerminals).toHaveBeenCalledTimes(1)
+
+    await act(async () => {
+      await vi.advanceTimersByTimeAsync(2_000)
+    })
+    expect(fetchTerminals).toHaveBeenCalledTimes(2)
+  })
+
+  it('coalesces terminal teardown into two separated inventory passes', async () => {
+    await mount()
+    await emitStream({ type: 'updated', snapshotVersion: 1, tabs: ['tab-1'] })
+    fetchTerminals.mockClear()
+
+    await act(async () => {
+      requestTerminalInventoryRecovery?.()
+      requestTerminalInventoryRecovery?.()
+      requestTerminalInventoryRecovery?.()
+      await flush()
+    })
+
+    expect(fetchTerminals).toHaveBeenCalledExactlyOnceWith(expectedRecoveryInventoryOptions())
+    await act(async () => {
+      await vi.advanceTimersByTimeAsync(749)
+    })
+    expect(fetchTerminals).toHaveBeenCalledTimes(1)
+    await act(async () => {
+      await vi.advanceTimersByTimeAsync(1)
+    })
+    expect(fetchTerminals).toHaveBeenCalledTimes(2)
+    expect(fetchTerminals).toHaveBeenLastCalledWith(expectedRecoveryInventoryOptions())
+  })
+
+  it('moves the certified sweep deadline after teardown recovery', async () => {
+    await mount()
+    await emitStream({ type: 'updated', snapshotVersion: 1, tabs: ['tab-1'] })
+    fetchTerminals.mockClear()
+
+    await act(async () => {
+      await vi.advanceTimersByTimeAsync(59_000)
+      requestTerminalInventoryRecovery?.()
+      await flush()
+      await vi.advanceTimersByTimeAsync(1_000)
+    })
+
+    expect(fetchTerminals).toHaveBeenCalledTimes(2)
+    expect(fetchTerminals).toHaveBeenNthCalledWith(1, expectedRecoveryInventoryOptions())
+    expect(fetchTerminals).toHaveBeenNthCalledWith(2, expectedRecoveryInventoryOptions())
+  })
+
+  it.each(['failure', 'rejection'] as const)(
+    'does not confirm terminal absence after an unverifiable first-pass %s',
+    async (outcome) => {
+      await mount()
+      await emitStream({ type: 'updated', snapshotVersion: 1, tabs: ['tab-1'] })
+      fetchTerminals.mockClear()
+      if (outcome === 'failure') {
+        fetchTerminals.mockResolvedValueOnce(false)
+      } else {
+        fetchTerminals.mockRejectedValueOnce(new Error('transport lost'))
+      }
+
+      await act(async () => {
+        requestTerminalInventoryRecovery?.()
+        await flush()
+        await vi.advanceTimersByTimeAsync(750)
+      })
+
+      expect(fetchTerminals).toHaveBeenCalledExactlyOnceWith(expectedRecoveryInventoryOptions())
+    }
+  )
+
+  it.each(['background', 'blur', 'disconnect', 'socket-loss', 'unmount'] as const)(
+    'cancels terminal inventory confirmation on %s',
+    async (lifecycleChange) => {
+      await mount()
+      await emitStream({ type: 'updated', snapshotVersion: 1, tabs: ['tab-1'] })
+      fetchTerminals.mockClear()
+      await act(async () => {
+        requestTerminalInventoryRecovery?.()
+        await flush()
+      })
+      expect(fetchTerminals).toHaveBeenCalledTimes(1)
+
+      if (lifecycleChange === 'background') {
+        await setAppState('background')
+      } else if (lifecycleChange === 'blur') {
+        lifecycle.focused = false
+        await act(async () => {
+          renderer?.update(createElement(Harness))
+          await flush()
+        })
+      } else if (lifecycleChange === 'disconnect') {
+        connectionState = 'disconnected'
+        await act(async () => {
+          renderer?.update(createElement(Harness))
+          await flush()
+        })
+      } else if (lifecycleChange === 'socket-loss') {
+        clientConnectionState = 'disconnected'
+      } else {
+        await act(async () => {
+          renderer?.unmount()
+          await flush()
+        })
+        renderer = null
+      }
+
+      await act(async () => {
+        await vi.advanceTimersByTimeAsync(750)
+      })
+      expect(fetchTerminals).toHaveBeenCalledTimes(1)
+    }
+  )
+
+  it('resumes a pending terminal confirmation after returning to the foreground', async () => {
+    await mount()
+    await emitStream({ type: 'updated', snapshotVersion: 1, tabs: ['tab-1'] })
+    fetchTerminals.mockClear()
+    await act(async () => {
+      requestTerminalInventoryRecovery?.()
+      await flush()
+    })
+    expect(fetchTerminals).toHaveBeenCalledTimes(1)
+
+    await setAppState('background')
+    await act(async () => {
+      await vi.advanceTimersByTimeAsync(750)
+    })
+    expect(fetchTerminals).toHaveBeenCalledTimes(1)
+
+    await setAppState('active')
+    await act(async () => {
+      await vi.advanceTimersByTimeAsync(750)
+    })
+
+    expect(fetchTerminals).toHaveBeenCalledTimes(4)
+    expect(fetchTerminals).toHaveBeenNthCalledWith(3, expectedRecoveryInventoryOptions())
+    expect(fetchTerminals).toHaveBeenNthCalledWith(4, expectedRecoveryInventoryOptions())
+  })
+
+  it('resumes pending terminal recovery after a silent socket reconnect', async () => {
+    await mount()
+    await emitStream({ type: 'updated', snapshotVersion: 1, tabs: ['tab-1'] })
+    fetchTerminals.mockClear()
+    await act(async () => {
+      requestTerminalInventoryRecovery?.()
+      await flush()
+    })
+    expect(fetchTerminals).toHaveBeenCalledTimes(1)
+
+    clientConnectionState = 'disconnected'
+    await act(async () => {
+      await vi.advanceTimersByTimeAsync(750)
+    })
+    expect(fetchTerminals).toHaveBeenCalledTimes(1)
+
+    clientConnectionState = 'connected'
+    await act(async () => {
+      await vi.advanceTimersByTimeAsync(1_250)
+      await vi.advanceTimersByTimeAsync(750)
+    })
+
+    expect(fetchTerminals).toHaveBeenCalledTimes(3)
+    expect(fetchTerminals).toHaveBeenNthCalledWith(2, expectedRecoveryInventoryOptions())
+    expect(fetchTerminals).toHaveBeenNthCalledWith(3, expectedRecoveryInventoryOptions())
+  })
+
+  it('resumes a pending terminal confirmation after controller replacement', async () => {
+    await mount()
+    await emitStream({ type: 'updated', snapshotVersion: 1, tabs: ['tab-1'] })
+    fetchTerminals.mockClear()
+    await act(async () => {
+      requestTerminalInventoryRecovery?.()
+      await flush()
+    })
+    expect(fetchTerminals).toHaveBeenCalledTimes(1)
+
+    currentClient = replacementClient
+    await act(async () => {
+      renderer?.update(createElement(Harness))
+      await flush()
+    })
+    expect(fetchTerminals).toHaveBeenCalledTimes(3)
+
+    await act(async () => {
+      await vi.advanceTimersByTimeAsync(750)
+    })
+    expect(fetchTerminals).toHaveBeenCalledTimes(4)
+    expect(fetchTerminals).toHaveBeenLastCalledWith(expectedRecoveryInventoryOptions())
+  })
+
+  it('drops pending terminal confirmation when the route identity changes', async () => {
+    await mount()
+    await emitStream({ type: 'updated', snapshotVersion: 1, tabs: ['tab-1'] })
+    fetchTerminals.mockClear()
+    await act(async () => {
+      requestTerminalInventoryRecovery?.()
+      await flush()
+    })
+    expect(fetchTerminals).toHaveBeenCalledTimes(1)
+
+    currentWorktreeId = 'repo::other-worktree'
+    currentTerminalInventoryRecoveryScopeKey = 'host::repo::other-worktree'
+    await act(async () => {
+      renderer?.update(createElement(Harness))
+      await flush()
+    })
+    await act(async () => {
+      await vi.advanceTimersByTimeAsync(750)
+    })
+
+    expect(fetchTerminals).toHaveBeenCalledTimes(2)
+    expect(fetchTerminals).toHaveBeenLastCalledWith(
+      expect.objectContaining({ onPhysicalRequestStarted: expect.any(Function) })
+    )
+  })
+
+  it('starts replacement-tab polling after confirmed terminal inventory absence', async () => {
+    await mount()
+    await emitStream({ type: 'updated', snapshotVersion: 1, tabs: ['tab-1'] })
+    sendRequest.mockClear()
+    fetchTerminals.mockClear()
+    clearRecoveryAt = 4_000
+    let successfulEmptyInventories = 0
+    let terminalPruned = false
+    fetchTerminals.mockImplementation(async () => {
+      successfulEmptyInventories += 1
+      if (successfulEmptyInventories === 2) {
+        terminalPruned = true
+        recoveryNeeded = true
+      }
+      return true
+    })
+
+    await act(async () => {
+      requestTerminalInventoryRecovery?.()
+      await flush()
+    })
+    expect(terminalPruned).toBe(false)
+
+    await act(async () => {
+      await vi.advanceTimersByTimeAsync(750)
+    })
+    expect(successfulEmptyInventories).toBe(2)
+    expect(terminalPruned).toBe(true)
+
+    await act(async () => {
+      await vi.advanceTimersByTimeAsync(5_250)
+    })
+
+    expect(sendRequest).toHaveBeenCalledTimes(2)
+    expect(recoveryNeeded).toBe(false)
   })
 
   it('runs an immediate list plus five fallback lists over ten probing seconds', async () => {
@@ -262,7 +571,7 @@ describe('useMobileSessionTabsReconciliation', () => {
     })
 
     expect(sendRequest).toHaveBeenCalledTimes(5)
-    expect(fetchTerminals).toHaveBeenCalledTimes(6)
+    expect(fetchTerminals).toHaveBeenCalledTimes(5)
     expect(recoveryNeeded).toBe(false)
   })
 
diff --git a/mobile/src/session/use-mobile-session-tabs-reconciliation.ts b/mobile/src/session/use-mobile-session-tabs-reconciliation.ts
index 277fc77ac47..18858d31026 100644
--- a/mobile/src/session/use-mobile-session-tabs-reconciliation.ts
+++ b/mobile/src/session/use-mobile-session-tabs-reconciliation.ts
@@ -9,6 +9,10 @@ import {
   type SessionTabsStreamSource
 } from './mobile-session-tabs-stream-health'
 import { PendingTerminalHandleRecoveryBudget } from './pending-terminal-handle-recovery'
+import {
+  useMobileTerminalInventoryRecovery,
+  type MobileTerminalInventoryRefreshOptions
+} from './use-mobile-terminal-inventory-recovery'
 
 type Params<Result, Tab> = {
   client: RpcClient | null
@@ -20,7 +24,8 @@ type Params<Result, Tab> = {
     effectiveTabs: readonly Tab[],
     source: SessionTabsStreamSource
   ) => void
-  fetchTerminals: () => Promise<void>
+  fetchTerminals: (options?: MobileTerminalInventoryRefreshOptions) => Promise<boolean>
+  terminalInventoryRecoveryScopeKey: string
   hasRecoveryNeed: () => boolean
   pendingTerminalRecoveryContextKey?: string | null
   getPendingTerminalRecoveryContextKey?: () => string | null
@@ -37,9 +42,11 @@ type ResultActions = {
   ensureSessionTabs: () => Promise<void>
   fetchPendingBrowserSessionTabs: () => Promise<void>
   retryPendingTerminalRecovery: () => Promise<void>
+  requestTerminalInventoryRecovery: () => void
 }
 
 const resolved = Promise.resolve()
+const RECONCILIATION_INTERVAL_MS = 2000
 
 export function useMobileSessionTabsReconciliation<Result, Tab>({
   client,
@@ -48,6 +55,7 @@ export function useMobileSessionTabsReconciliation<Result, Tab>({
   applySessionTabs,
   consumeAcceptedSessionTabs,
   fetchTerminals,
+  terminalInventoryRecoveryScopeKey,
   hasRecoveryNeed,
   pendingTerminalRecoveryContextKey,
   getPendingTerminalRecoveryContextKey,
@@ -122,11 +130,27 @@ export function useMobileSessionTabsReconciliation<Result, Tab>({
     ]
   )
 
+  const {
+    activateTerminalInventoryRecovery,
+    isCertifiedTerminalSweepDue,
+    refreshTerminalInventory,
+    requestTerminalInventoryRecovery,
+    resetCertifiedTerminalSweep,
+    resumePendingTerminalInventoryRecovery,
+    suspendTerminalInventoryRecovery
+  } = useMobileTerminalInventoryRecovery({
+    client,
+    connState,
+    fetchTerminals,
+    scopeKey: terminalInventoryRecoveryScopeKey
+  })
+
   useEffect(
     () => () => {
+      suspendTerminalInventoryRecovery(true)
       controller?.dispose()
     },
-    [controller]
+    [controller, suspendTerminalInventoryRecovery]
   )
 
   useEffect(() => {
@@ -149,38 +173,57 @@ export function useMobileSessionTabsReconciliation<Result, Tab>({
   useFocusEffect(
     useCallback(() => {
       if (!controller || connState !== 'connected') {
+        suspendTerminalInventoryRecovery(true)
         return
       }
+      activateTerminalInventoryRecovery()
+      resetCertifiedTerminalSweep()
       const refresh = (forceTabs: boolean): void => {
         if (AppState.currentState !== 'active') {
+          suspendTerminalInventoryRecovery(true)
           controller.setReconciliationActive(false)
           return
         }
+        activateTerminalInventoryRecovery()
         controller.setReconciliationActive(true)
-        if (forceTabs) {
-          void controller.requestReconciliation()
-        } else {
-          void controller.poll()
+        const tabsRequest = forceTabs ? controller.requestReconciliation() : controller.poll()
+        const now = Date.now()
+        // Why: healthy tab streams own liveness; retain only a slow inventory sweep for stale handles and metadata.
+        if (forceTabs || tabsRequest !== null || isCertifiedTerminalSweepDue(now)) {
+          void refreshTerminalInventory()
         }
-        void fetchTerminals()
+        resumePendingTerminalInventoryRecovery()
       }
       const appStateSubscription = AppState.addEventListener('change', (state) => {
         if (state === 'active') {
+          activateTerminalInventoryRecovery()
           resetPendingTerminalRecovery()
           refresh(true)
         } else {
+          suspendTerminalInventoryRecovery(true)
           controller.setReconciliationActive(false)
         }
       })
-      const interval = setInterval(() => refresh(false), 2000)
+      const interval = setInterval(() => refresh(false), RECONCILIATION_INTERVAL_MS)
       resetPendingTerminalRecovery()
       refresh(true)
       return () => {
+        suspendTerminalInventoryRecovery(true)
         controller.setReconciliationActive(false)
         clearInterval(interval)
         appStateSubscription.remove()
       }
-    }, [connState, controller, fetchTerminals, resetPendingTerminalRecovery])
+    }, [
+      activateTerminalInventoryRecovery,
+      connState,
+      controller,
+      isCertifiedTerminalSweepDue,
+      refreshTerminalInventory,
+      resetPendingTerminalRecovery,
+      resetCertifiedTerminalSweep,
+      resumePendingTerminalInventoryRecovery,
+      suspendTerminalInventoryRecovery
+    ])
   )
 
   return {
@@ -199,6 +242,7 @@ export function useMobileSessionTabsReconciliation<Result, Tab>({
     retryPendingTerminalRecovery: useCallback(() => {
       resetPendingTerminalRecovery()
       return controller?.retryReconciliation() ?? resolved
-    }, [controller, resetPendingTerminalRecovery])
+    }, [controller, resetPendingTerminalRecovery]),
+    requestTerminalInventoryRecovery
   }
 }
diff --git a/mobile/src/session/use-mobile-terminal-inventory-recovery.test.ts b/mobile/src/session/use-mobile-terminal-inventory-recovery.test.ts
new file mode 100644
index 00000000000..83d568b4151
--- /dev/null
+++ b/mobile/src/session/use-mobile-terminal-inventory-recovery.test.ts
@@ -0,0 +1,322 @@
+import { createElement, useEffect } from 'react'
+import { act, create, type ReactTestRenderer } from 'react-test-renderer'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { RpcClient } from '../transport/rpc-client'
+import {
+  useMobileTerminalInventoryRecovery,
+  useMobileTerminalInventoryRecoveryBridge
+} from './use-mobile-terminal-inventory-recovery'
+
+const lifecycle = vi.hoisted(() => ({ appState: 'active' }))
+
+vi.mock('react-native', () => ({
+  AppState: {
+    get currentState() {
+      return lifecycle.appState
+    }
+  }
+}))
+
+function deferred<T>() {
+  let resolve!: (value: T) => void
+  let reject!: (reason?: unknown) => void
+  const promise = new Promise<T>((resolvePromise, rejectPromise) => {
+    resolve = resolvePromise
+    reject = rejectPromise
+  })
+  return { promise, reject, resolve }
+}
+
+const client = {
+  getState: () => 'connected'
+} as unknown as RpcClient
+const fetchTerminals = vi.fn(async () => true)
+type RecoveryActions = ReturnType<typeof useMobileTerminalInventoryRecovery>
+let actions: RecoveryActions | null = null
+
+function Harness({ scopeKey }: { scopeKey: string }): null {
+  const recovery = useMobileTerminalInventoryRecovery({
+    client,
+    connState: 'connected',
+    fetchTerminals,
+    scopeKey
+  })
+  useEffect(() => {
+    actions = recovery
+    return () => {
+      if (actions === recovery) {
+        actions = null
+      }
+    }
+  }, [recovery])
+  return null
+}
+
+function BridgeHarness({
+  scopeKey,
+  connect,
+  request
+}: {
+  scopeKey: string
+  connect: boolean
+  request: () => void
+}): null {
+  const bridge = useMobileTerminalInventoryRecoveryBridge(scopeKey)
+  useEffect(() => {
+    bridgeSignal = bridge.signalTerminalInventoryRecovery
+    if (!connect) {
+      return () => {
+        if (bridgeSignal === bridge.signalTerminalInventoryRecovery) {
+          bridgeSignal = null
+        }
+      }
+    }
+    return bridge.registerTerminalInventoryRecoveryAction(request)
+  }, [bridge, connect, request])
+  return null
+}
+
+let bridgeSignal: (() => void) | null = null
+
+async function flush(): Promise<void> {
+  await Promise.resolve()
+  await Promise.resolve()
+}
+
+describe('useMobileTerminalInventoryRecovery', () => {
+  let renderer: ReactTestRenderer | null = null
+  let bridgeRenderer: ReactTestRenderer | null = null
+
+  async function mount(scopeKey = 'host::worktree-a'): Promise<void> {
+    await act(async () => {
+      renderer = create(createElement(Harness, { scopeKey }))
+      await flush()
+    })
+    act(() => actions?.activateTerminalInventoryRecovery())
+  }
+
+  beforeEach(() => {
+    vi.useFakeTimers()
+    lifecycle.appState = 'active'
+    fetchTerminals.mockReset()
+    fetchTerminals.mockResolvedValue(true)
+    bridgeSignal = null
+  })
+
+  afterEach(() => {
+    act(() => renderer?.unmount())
+    act(() => bridgeRenderer?.unmount())
+    renderer = null
+    bridgeRenderer = null
+    actions = null
+    bridgeSignal = null
+    vi.useRealTimers()
+  })
+
+  it('queues a bridge signal until the recovery action connects', async () => {
+    const request = vi.fn()
+    await act(async () => {
+      bridgeRenderer = create(
+        createElement(BridgeHarness, { scopeKey: 'scope-a', connect: false, request })
+      )
+      await flush()
+    })
+
+    const preConnectSignal = bridgeSignal
+    expect(preConnectSignal).toEqual(expect.any(Function))
+    act(() => preConnectSignal?.())
+    expect(request).not.toHaveBeenCalled()
+
+    await act(async () => {
+      bridgeRenderer?.update(
+        createElement(BridgeHarness, { scopeKey: 'scope-a', connect: true, request })
+      )
+      await flush()
+    })
+    expect(request).toHaveBeenCalledExactlyOnceWith()
+  })
+
+  it('ignores a stale bridge signal after the committed scope changes', async () => {
+    const requestA = vi.fn()
+    const requestB = vi.fn()
+    await act(async () => {
+      bridgeRenderer = create(
+        createElement(BridgeHarness, { scopeKey: 'scope-a', connect: true, request: requestA })
+      )
+      await flush()
+    })
+    const staleSignal = bridgeSignal
+
+    await act(async () => {
+      bridgeRenderer?.update(
+        createElement(BridgeHarness, { scopeKey: 'scope-b', connect: true, request: requestB })
+      )
+      await flush()
+    })
+    act(() => staleSignal?.())
+    expect(requestA).not.toHaveBeenCalled()
+    expect(requestB).not.toHaveBeenCalled()
+
+    act(() => bridgeSignal?.())
+    expect(requestB).toHaveBeenCalledExactlyOnceWith()
+  })
+
+  it('coalesces signals before confirmation into the scheduled pass', async () => {
+    const firstPass = deferred<boolean>()
+    const confirmation = deferred<boolean>()
+    fetchTerminals
+      .mockImplementationOnce(() => firstPass.promise)
+      .mockImplementationOnce(() => confirmation.promise)
+    await mount()
+
+    act(() => {
+      actions?.requestTerminalInventoryRecovery()
+      actions?.requestTerminalInventoryRecovery()
+    })
+    expect(fetchTerminals).toHaveBeenCalledTimes(1)
+
+    await act(async () => {
+      firstPass.resolve(true)
+      await flush()
+      actions?.requestTerminalInventoryRecovery()
+      await vi.advanceTimersByTimeAsync(750)
+    })
+    expect(fetchTerminals).toHaveBeenCalledTimes(2)
+
+    await act(async () => {
+      confirmation.resolve(true)
+      await flush()
+      await vi.advanceTimersByTimeAsync(10_000)
+    })
+    expect(fetchTerminals).toHaveBeenCalledTimes(2)
+  })
+
+  it.each(['failure', 'rejection'] as const)(
+    'retries one queued signal after a first-pass %s',
+    async (outcome) => {
+      const firstPass = deferred<boolean>()
+      fetchTerminals.mockImplementationOnce(() => firstPass.promise).mockResolvedValueOnce(false)
+      await mount()
+
+      act(() => {
+        actions?.requestTerminalInventoryRecovery()
+        actions?.requestTerminalInventoryRecovery()
+      })
+      await act(async () => {
+        if (outcome === 'failure') {
+          firstPass.resolve(false)
+        } else {
+          firstPass.reject(new Error('transport lost'))
+        }
+        await flush()
+      })
+
+      expect(fetchTerminals).toHaveBeenCalledTimes(2)
+      await act(async () => {
+        await vi.advanceTimersByTimeAsync(10_000)
+      })
+      expect(fetchTerminals).toHaveBeenCalledTimes(2)
+    }
+  )
+
+  it('runs one follow-up cycle for signals received during confirmation', async () => {
+    const confirmation = deferred<boolean>()
+    fetchTerminals
+      .mockResolvedValueOnce(true)
+      .mockImplementationOnce(() => confirmation.promise)
+      .mockResolvedValueOnce(false)
+    await mount()
+
+    act(() => actions?.requestTerminalInventoryRecovery())
+    await act(async () => {
+      await flush()
+      await vi.advanceTimersByTimeAsync(750)
+      actions?.requestTerminalInventoryRecovery()
+      actions?.requestTerminalInventoryRecovery()
+      confirmation.resolve(false)
+      await flush()
+    })
+
+    expect(fetchTerminals).toHaveBeenCalledTimes(3)
+    await act(async () => {
+      await vi.advanceTimersByTimeAsync(10_000)
+    })
+    expect(fetchTerminals).toHaveBeenCalledTimes(3)
+  })
+
+  it('retains one cycle across lifecycle suspension and fences the old pass', async () => {
+    const oldPass = deferred<boolean>()
+    fetchTerminals.mockImplementationOnce(() => oldPass.promise).mockResolvedValueOnce(false)
+    await mount()
+
+    act(() => {
+      actions?.requestTerminalInventoryRecovery()
+      actions?.suspendTerminalInventoryRecovery(true)
+    })
+    await act(async () => {
+      oldPass.resolve(false)
+      await flush()
+    })
+    expect(fetchTerminals).toHaveBeenCalledTimes(1)
+
+    act(() => {
+      actions?.activateTerminalInventoryRecovery()
+      actions?.resumePendingTerminalInventoryRecovery()
+    })
+    await act(flush)
+    expect(fetchTerminals).toHaveBeenCalledTimes(2)
+  })
+
+  it('drops queued work when the recovery scope changes', async () => {
+    const oldPass = deferred<boolean>()
+    fetchTerminals.mockImplementationOnce(() => oldPass.promise)
+    await mount()
+
+    act(() => {
+      actions?.requestTerminalInventoryRecovery()
+      actions?.requestTerminalInventoryRecovery()
+    })
+    await act(async () => {
+      renderer?.update(createElement(Harness, { scopeKey: 'host::worktree-b' }))
+    })
+    await act(async () => {
+      oldPass.resolve(false)
+      await flush()
+    })
+    act(() => {
+      actions?.activateTerminalInventoryRecovery()
+      actions?.resumePendingTerminalInventoryRecovery()
+    })
+
+    expect(fetchTerminals).toHaveBeenCalledTimes(1)
+  })
+
+  it('does not let an old inventory completion move the new scope deadline', async () => {
+    const oldPass = deferred<boolean>()
+    let reportPhysicalStart: ((startedAt: number) => void) | undefined
+    fetchTerminals.mockImplementationOnce(async (options) => {
+      reportPhysicalStart = options?.onPhysicalRequestStarted
+      return oldPass.promise
+    })
+    await mount('scope-a')
+    vi.setSystemTime(100)
+    const oldRefresh = actions?.refreshTerminalInventory
+    expect(oldRefresh).toEqual(expect.any(Function))
+    const oldRequest = oldRefresh!()
+    await flush()
+    reportPhysicalStart?.(100)
+    expect(actions?.isCertifiedTerminalSweepDue(100)).toBe(false)
+
+    await act(async () => {
+      renderer?.update(createElement(Harness, { scopeKey: 'scope-b' }))
+      await flush()
+    })
+    expect(actions?.isCertifiedTerminalSweepDue(100)).toBe(true)
+
+    reportPhysicalStart?.(100)
+    oldPass.resolve(true)
+    await oldRequest
+    await flush()
+    expect(actions?.isCertifiedTerminalSweepDue(100)).toBe(true)
+  })
+})
diff --git a/mobile/src/session/use-mobile-terminal-inventory-recovery.ts b/mobile/src/session/use-mobile-terminal-inventory-recovery.ts
new file mode 100644
index 00000000000..fe56d68a819
--- /dev/null
+++ b/mobile/src/session/use-mobile-terminal-inventory-recovery.ts
@@ -0,0 +1,248 @@
+import { useCallback, useEffect, useRef } from 'react'
+import { AppState } from 'react-native'
+import type { RpcClient } from '../transport/rpc-client'
+import type { ConnectionState } from '../transport/types'
+
+export type MobileTerminalInventoryRefreshOptions = {
+  allowEmptyLoaded?: boolean
+  onPhysicalRequestStarted?: (startedAt: number) => void
+}
+
+type MobileTerminalInventoryRecoveryAction = {
+  request: () => void
+  scope: string
+}
+
+/** Bridges terminal stream callbacks to the committed route's recovery action. */
+export function useMobileTerminalInventoryRecoveryBridge(scopeKey: string) {
+  const committedScopeRef = useRef<string | null>(null)
+  const actionRef = useRef<MobileTerminalInventoryRecoveryAction | null>(null)
+  const pendingSignalScopeRef = useRef<string | null>(null)
+
+  useEffect(() => {
+    committedScopeRef.current = scopeKey
+    return () => {
+      if (committedScopeRef.current === scopeKey) {
+        committedScopeRef.current = null
+      }
+    }
+  }, [scopeKey])
+
+  const signalTerminalInventoryRecovery = useCallback(() => {
+    const committedScope = committedScopeRef.current
+    if (committedScope !== null && committedScope !== scopeKey) {
+      return
+    }
+    const recoveryAction = actionRef.current
+    if (recoveryAction?.scope === scopeKey) {
+      recoveryAction.request()
+      return
+    }
+    pendingSignalScopeRef.current = scopeKey
+  }, [scopeKey])
+
+  const registerTerminalInventoryRecoveryAction = useCallback(
+    (request: () => void): (() => void) => {
+      const recoveryAction = { request, scope: scopeKey }
+      actionRef.current = recoveryAction
+      const pendingScope = pendingSignalScopeRef.current
+      pendingSignalScopeRef.current = null
+      if (pendingScope === scopeKey) {
+        request()
+      }
+      return () => {
+        if (actionRef.current === recoveryAction) {
+          actionRef.current = null
+        }
+      }
+    },
+    [scopeKey]
+  )
+
+  return {
+    registerTerminalInventoryRecoveryAction,
+    signalTerminalInventoryRecovery
+  }
+}
+
+type Params = {
+  client: RpcClient | null
+  connState: ConnectionState
+  fetchTerminals: (options?: MobileTerminalInventoryRefreshOptions) => Promise<boolean>
+  scopeKey: string
+}
+
+type RecoveryState = {
+  active: boolean
+  generation: number
+  pending: boolean
+  phase: 'idle' | 'first-pass' | 'confirmation-wait' | 'confirmation-pass'
+  timer: ReturnType<typeof setTimeout> | null
+}
+
+const CERTIFIED_TERMINAL_SWEEP_MS = 60_000
+const TERMINAL_INVENTORY_CONFIRMATION_DELAY_MS = 750
+
+export function useMobileTerminalInventoryRecovery({
+  client,
+  connState,
+  fetchTerminals,
+  scopeKey
+}: Params) {
+  const stateRef = useRef<RecoveryState>({
+    active: false,
+    generation: 0,
+    pending: false,
+    phase: 'idle',
+    timer: null
+  })
+  const lastAttemptAtRef = useRef(Number.NEGATIVE_INFINITY)
+  const refreshTerminalInventory = useCallback(
+    async (options?: MobileTerminalInventoryRefreshOptions): Promise<boolean> => {
+      const logicalStartedAt = Date.now()
+      const generation = stateRef.current.generation
+      let physicalStartReported = false
+      try {
+        return await fetchTerminals({
+          ...options,
+          onPhysicalRequestStarted: (startedAt) => {
+            physicalStartReported = true
+            if (stateRef.current.generation === generation) {
+              lastAttemptAtRef.current = startedAt
+            }
+          }
+        })
+      } finally {
+        if (!physicalStartReported && stateRef.current.generation === generation) {
+          lastAttemptAtRef.current = logicalStartedAt
+        }
+      }
+    },
+    [fetchTerminals]
+  )
+  const isCertifiedTerminalSweepDue = useCallback((now: number): boolean => {
+    const elapsed = now - lastAttemptAtRef.current
+    return elapsed < 0 || elapsed >= CERTIFIED_TERMINAL_SWEEP_MS
+  }, [])
+  const resetCertifiedTerminalSweep = useCallback(() => {
+    lastAttemptAtRef.current = Number.NEGATIVE_INFINITY
+  }, [])
+  const canRun = useCallback(
+    () =>
+      stateRef.current.active &&
+      AppState.currentState === 'active' &&
+      connState === 'connected' &&
+      (client?.getState?.() ?? connState) === 'connected',
+    [client, connState]
+  )
+  const suspendTerminalInventoryRecovery = useCallback((retainPending: boolean): void => {
+    const state = stateRef.current
+    state.active = false
+    state.generation += 1
+    state.pending = retainPending && (state.pending || state.phase !== 'idle')
+    state.phase = 'idle'
+    if (state.timer !== null) {
+      clearTimeout(state.timer)
+      state.timer = null
+    }
+  }, [])
+  const activateTerminalInventoryRecovery = useCallback(() => {
+    stateRef.current.active = true
+  }, [])
+  const requestTerminalInventoryRecovery = useCallback((): void => {
+    const state = stateRef.current
+    if (!canRun()) {
+      state.pending = true
+      return
+    }
+    if (state.phase === 'first-pass' || state.phase === 'confirmation-pass') {
+      state.pending = true
+      return
+    }
+    if (state.phase === 'confirmation-wait') {
+      return
+    }
+
+    const startCycle = (): void => {
+      state.pending = false
+      state.phase = 'first-pass'
+      const generation = state.generation
+      const finishPass = (): void => {
+        state.phase = 'idle'
+        if (state.pending && canRun()) {
+          startCycle()
+        }
+      }
+
+      void (async () => {
+        let firstPassSucceeded = false
+        try {
+          firstPassSucceeded = await refreshTerminalInventory({ allowEmptyLoaded: true })
+        } catch {
+          // A failed inventory is unverifiable.
+        }
+        if (generation !== state.generation) {
+          return
+        }
+        if (!firstPassSucceeded) {
+          finishPass()
+          return
+        }
+        // The confirmation pass also satisfies signals received during the first pass.
+        state.pending = false
+        if (!canRun()) {
+          state.pending = true
+          state.phase = 'idle'
+          return
+        }
+        state.phase = 'confirmation-wait'
+        state.timer = setTimeout(() => {
+          state.timer = null
+          if (generation !== state.generation) {
+            return
+          }
+          if (!canRun()) {
+            state.pending = true
+            state.phase = 'idle'
+            return
+          }
+          state.phase = 'confirmation-pass'
+          void refreshTerminalInventory({ allowEmptyLoaded: true })
+            .catch(() => {
+              // A transport failure cannot confirm terminal absence.
+            })
+            .finally(() => {
+              if (generation === state.generation) {
+                finishPass()
+              }
+            })
+        }, TERMINAL_INVENTORY_CONFIRMATION_DELAY_MS)
+      })()
+    }
+
+    startCycle()
+  }, [canRun, refreshTerminalInventory])
+  const resumePendingTerminalInventoryRecovery = useCallback(() => {
+    if (stateRef.current.pending) {
+      requestTerminalInventoryRecovery()
+    }
+  }, [requestTerminalInventoryRecovery])
+
+  useEffect(
+    () => () => {
+      suspendTerminalInventoryRecovery(false)
+      lastAttemptAtRef.current = Number.NEGATIVE_INFINITY
+    },
+    [scopeKey, suspendTerminalInventoryRecovery]
+  )
+
+  return {
+    activateTerminalInventoryRecovery,
+    isCertifiedTerminalSweepDue,
+    refreshTerminalInventory,
+    requestTerminalInventoryRecovery,
+    resetCertifiedTerminalSweep,
+    resumePendingTerminalInventoryRecovery,
+    suspendTerminalInventoryRecovery
+  }
+}
diff --git a/mobile/src/transport/mobile-direct-endpoint-probe.test.ts b/mobile/src/transport/mobile-direct-endpoint-probe.test.ts
index 3afa8c08aac..69fe8a2ab8a 100644
--- a/mobile/src/transport/mobile-direct-endpoint-probe.test.ts
+++ b/mobile/src/transport/mobile-direct-endpoint-probe.test.ts
@@ -4,14 +4,12 @@ import { openAuthenticatedDirectEndpoint } from './mobile-direct-endpoint-probe'
 import type { ConnectionState, HostProfile, RpcResponse } from './types'
 
 class FakeClient implements RpcClient {
-  readonly sendRequest = vi.fn(
-    async (): Promise<RpcResponse> => ({
-      id: 'rpc-1',
-      ok: true,
-      result: {},
-      _meta: { runtimeId: 'runtime-1' }
-    })
-  )
+  readonly sendRequest = vi.fn(async (): Promise<RpcResponse> => ({
+    id: 'rpc-1',
+    ok: true,
+    result: {},
+    _meta: { runtimeId: 'runtime-1' }
+  }))
   readonly subscribe = vi.fn(() => () => {})
   readonly updateTerminalSubscriptionViewport = vi.fn()
   readonly notifyForeground = vi.fn()
diff --git a/mobile/src/transport/mobile-relay-runtime-failover.test.ts b/mobile/src/transport/mobile-relay-runtime-failover.test.ts
index 0187ac251d8..795f2618dfb 100644
--- a/mobile/src/transport/mobile-relay-runtime-failover.test.ts
+++ b/mobile/src/transport/mobile-relay-runtime-failover.test.ts
@@ -41,14 +41,12 @@ vi.mock('./e2ee', () => ({
 }))
 
 class FakeSession implements RpcClient {
-  readonly sendRequest = vi.fn(
-    async (): Promise<RpcResponse> => ({
-      id: 'rpc-1',
-      ok: true,
-      result: {},
-      _meta: { runtimeId: 'runtime-1' }
-    })
-  )
+  readonly sendRequest = vi.fn(async (): Promise<RpcResponse> => ({
+    id: 'rpc-1',
+    ok: true,
+    result: {},
+    _meta: { runtimeId: 'runtime-1' }
+  }))
   readonly subscribe = vi.fn(() => () => {})
   readonly updateTerminalSubscriptionViewport = vi.fn()
   readonly notifyForeground = vi.fn()
diff --git a/mobile/src/worktree/mobile-worktree-activation-source.test.ts b/mobile/src/worktree/mobile-worktree-activation-source.test.ts
index 0b06f21f70b..6d6497de67f 100644
--- a/mobile/src/worktree/mobile-worktree-activation-source.test.ts
+++ b/mobile/src/worktree/mobile-worktree-activation-source.test.ts
@@ -1,7 +1,10 @@
 import { readFileSync } from 'node:fs'
 import { describe, expect, it } from 'vitest'
 
-const source = readFileSync(new URL('../../app/h/[hostId]/index.tsx', import.meta.url), 'utf8')
+const source = readFileSync(
+  new URL('../host-screen/use-host-worktree-actions.ts', import.meta.url),
+  'utf8'
+)
 
 function sliceBetween(startPattern: string, endPattern: string): string {
   const start = source.indexOf(startPattern)
@@ -15,7 +18,7 @@ describe('mobile worktree activation', () => {
   it('opens mobile sessions without foregrounding other paired clients', () => {
     const openSession = sliceBetween(
       'const openWorktreeSession = useCallback(',
-      'const handleSortChange = useCallback'
+      'const openFloatingWorkspace = useCallback'
     )
 
     expect(openSession).toContain("sendRequest('worktree.activate'")
diff --git a/package.json b/package.json
index 7d0cc956642..a83c74cc9ea 100644
--- a/package.json
+++ b/package.json
@@ -167,7 +167,7 @@
     "sherpa-onnx": "1.12.37",
     "ssh2": "^1.17.0",
     "tweetnacl": "^1.0.3",
-    "ws": "^8.21.0",
+    "ws": "^8.21.3",
     "yaml": "^2.8.4",
     "zod": "~4.4.3"
   },
@@ -181,14 +181,16 @@
     "@sanity/diff-match-patch": "^3.2.0",
     "@stablyai/playwright-test": "^2.1.14",
     "@tailwindcss/vite": "^4.2.4",
-    "@tanstack/react-virtual": "^3.13.24",
+    "@tanstack/react-virtual": "^3.14.10",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.2",
     "@testing-library/user-event": "^14.6.1",
+    "@tiptap/extension-code-block": "^3.22.5",
     "@tiptap/extension-code-block-lowlight": "^3.22.5",
     "@tiptap/extension-details": "^3.22.5",
     "@tiptap/extension-image": "^3.22.5",
     "@tiptap/extension-link": "^3.22.5",
+    "@tiptap/extension-list": "^3.22.5",
     "@tiptap/extension-mathematics": "3.22.5",
     "@tiptap/extension-placeholder": "^3.22.5",
     "@tiptap/extension-table": "3.22.4",
@@ -220,13 +222,13 @@
     "clsx": "^2.1.1",
     "cmdk": "^1.1.1",
     "dompurify": "^3.4.13",
-    "electron": "^43.1.0",
+    "electron": "^43.4.1",
     "electron-builder": "^26.15.3",
     "electron-builder-squirrel-windows": "^26.15.3",
     "electron-vite": "^5.0.0",
     "emoji-picker-react": "^4.19.1",
     "emojibase-data": "17.0.0",
-    "happy-dom": "^20.9.0",
+    "happy-dom": "^20.11.8",
     "html-to-image": "^1.11.13",
     "husky": "^9.1.7",
     "i18next-cli": "1.65.0",
@@ -235,18 +237,18 @@
     "lowlight": "^3.3.0",
     "lucide-react": "^0.577.0",
     "marked": "^17.0.1",
-    "mermaid": "^11.16.1",
+    "mermaid": "^11.17.2",
     "monaco-editor": "^0.55.1",
-    "oxfmt": "^0.52.0",
-    "oxlint": "^1.77.0",
+    "oxfmt": "^0.65.0",
+    "oxlint": "^1.80.0",
     "oxlint-plugin-react-doctor": "0.9.1",
     "oxlint-tsgolint": "7.0.2001",
-    "pdfjs-dist": "^6.2.108",
+    "pdfjs-dist": "^6.3.289",
     "pngjs": "^7.0.0",
     "radix-ui": "^1.6.2",
-    "react": "^19.2.7",
+    "react": "^19.2.8",
     "react-colorful": "^5.7.0",
-    "react-dom": "^19.2.7",
+    "react-dom": "^19.2.8",
     "react-grab": "^0.1.33",
     "react-markdown": "^10.1.0",
     "react-refresh": "^0.18.0",
@@ -269,7 +271,7 @@
     "typescript-api": "npm:typescript@6.0.3",
     "unified": "^11.0.5",
     "vite": "npm:rolldown-vite@7.3.1",
-    "vitest": "^4.1.5",
+    "vitest": "^4.1.11",
     "vscode-oniguruma": "^2.0.1",
     "vscode-textmate": "^9.3.2",
     "zustand": "^5.0.14"
@@ -296,41 +298,7 @@
   "engines": {
     "node": "24"
   },
-  "packageManager": "pnpm@10.24.0+sha512.01ff8ae71b4419903b65c60fb2dc9d34cf8bb6e06d03bde112ef38f7a34d6904c424ba66bea5cdcf12890230bf39f9580473140ed9c946fef328b6e5238a345a",
-  "pnpm": {
-    "overrides": {
-      "monaco-editor>dompurify": "3.4.13"
-    },
-    "supportedArchitectures": {
-      "os": [
-        "current",
-        "darwin",
-        "linux",
-        "win32"
-      ],
-      "cpu": [
-        "current",
-        "x64",
-        "arm64"
-      ]
-    },
-    "onlyBuiltDependencies": [
-      "@parcel/watcher",
-      "cpu-features",
-      "esbuild",
-      "node-pty",
-      "sherpa-onnx"
-    ],
-    "patchedDependencies": {
-      "node-pty@1.1.0": "config/patches/node-pty@1.1.0.patch",
-      "@xterm/addon-ligatures@0.11.0-beta.287": "config/patches/@xterm__addon-ligatures@0.11.0-beta.287.patch",
-      "@xterm/addon-webgl@0.20.0-beta.286": "config/patches/@xterm__addon-webgl@0.20.0-beta.286.patch",
-      "@xterm/addon-serialize@0.15.0-beta.287": "config/patches/@xterm__addon-serialize@0.15.0-beta.287.patch",
-      "@xterm/xterm@6.1.0-beta.287": "config/patches/@xterm__xterm@6.1.0-beta.287.patch",
-      "lint-staged@16.4.0": "config/patches/lint-staged@16.4.0.patch",
-      "@vscode/windows-process-tree@0.8.0": "config/patches/@vscode__windows-process-tree@0.8.0.patch"
-    }
-  },
+  "packageManager": "pnpm@12.0.0+sha512.9e2e3dc3911995868dc94b8175c217c27e95408fa03b4a22749778f2b34f773b77cdd3b39ede8171b22fcd53be6a35342e9fac9948a68ef58df6488ce89a7e67",
   "reactDoctor": {
     "rules": {
       "react-doctor/js-combine-iterations": "off"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 75b6ec89192..f0f2b278864 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,3 +1,104 @@
+---
+lockfileVersion: '9.0'
+
+importers:
+
+  .:
+    configDependencies: {}
+    packageManagerDependencies:
+      pnpm:
+        specifier: 12.0.0
+        version: 12.0.0
+
+packages:
+
+  '@pnpm/exe.darwin-arm64@12.0.0':
+    resolution: {integrity: sha512-sqeoPfVMIfQhbwzDrKraXY2ynyuWClFqzvfImzAS/yczEru1m5SGvQ9kgFPDvQzJZ9AetedgJeDZC6qYvH8/tQ==}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@pnpm/exe.darwin-x64@12.0.0':
+    resolution: {integrity: sha512-Quc3J6c9cGTy+LDgz1cLVgCNOU9IERuyAlDoEj0DCilKqvo50Jx1GV8k74iwn4J9fFSKkm8JrwNvtTDj3uWnUA==}
+    cpu: [x64]
+    os: [darwin]
+
+  '@pnpm/exe.linux-arm64-musl@12.0.0':
+    resolution: {integrity: sha512-EVWd3OTmgsMFhXx69b5JxIzoabG9Ma7m4OeTaf0ZKBzMnfYi8u21NDQo92ToMrdYL5dYDDCHsyYIjXzk+d0HhA==}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
+  '@pnpm/exe.linux-arm64@12.0.0':
+    resolution: {integrity: sha512-cXHHW8M4rAPsYNkKZO9WVcpLLK55i9EaIsZPfIqUuY2eopd5LqnFyBge54HCh1GC0yCX8ySn0hYIi+4OyAEoDg==}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
+  '@pnpm/exe.linux-x64-musl@12.0.0':
+    resolution: {integrity: sha512-UcXwMdFjly0mpddkGigHKTxe27IMv2fUK4IWW/MHmJ3yMguxXmkwNlEI4aE+G1HO2TLo20uNEUWD4ymLe/DaCQ==}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
+  '@pnpm/exe.linux-x64@12.0.0':
+    resolution: {integrity: sha512-6Rsl+zEWMOmus7v7/9J3OE8EMvHyNAfxYmDfmhQG4J0985OuT3G3Ho9NSGHjkBn4aU4bgklWifRhe1HX8dUSyw==}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
+  '@pnpm/exe.win32-arm64@12.0.0':
+    resolution: {integrity: sha512-O5F76A4oVFrpDGdFxEszRIThOSBfjHdH5c006gR+7UTCfiXrukr1XfqPungUI1DXcSR5gb9jBsPQqQZOAoOOxw==}
+    cpu: [arm64]
+    os: [win32]
+
+  '@pnpm/exe.win32-x64@12.0.0':
+    resolution: {integrity: sha512-5dKFajIEWJ1ai+KHXFJvskY6vchbunmLwSUV2ywbLymcmJjfY5XJVpgzPCyIoVCMVG0zHorr66+hM8h8b3aRfQ==}
+    cpu: [x64]
+    os: [win32]
+
+  pnpm@12.0.0:
+    resolution: {integrity: sha512-ni49w5EZlYaNyUuBdcIXwn6VQI+gO0oidJd48rNPdzt3zdOznt6BcbIvzVO+ajU0Lp+smUimjvWN9kiM6Jp+Zw==}
+    engines: {node: '>=18.*'}
+    hasBin: true
+
+snapshots:
+
+  '@pnpm/exe.darwin-arm64@12.0.0':
+    optional: true
+
+  '@pnpm/exe.darwin-x64@12.0.0':
+    optional: true
+
+  '@pnpm/exe.linux-arm64-musl@12.0.0':
+    optional: true
+
+  '@pnpm/exe.linux-arm64@12.0.0':
+    optional: true
+
+  '@pnpm/exe.linux-x64-musl@12.0.0':
+    optional: true
+
+  '@pnpm/exe.linux-x64@12.0.0':
+    optional: true
+
+  '@pnpm/exe.win32-arm64@12.0.0':
+    optional: true
+
+  '@pnpm/exe.win32-x64@12.0.0':
+    optional: true
+
+  pnpm@12.0.0:
+    optionalDependencies:
+      '@pnpm/exe.darwin-arm64': 12.0.0
+      '@pnpm/exe.darwin-x64': 12.0.0
+      '@pnpm/exe.linux-arm64': 12.0.0
+      '@pnpm/exe.linux-arm64-musl': 12.0.0
+      '@pnpm/exe.linux-x64': 12.0.0
+      '@pnpm/exe.linux-x64-musl': 12.0.0
+      '@pnpm/exe.win32-arm64': 12.0.0
+      '@pnpm/exe.win32-x64': 12.0.0
+
+---
 lockfileVersion: '9.0'
 
 settings:
@@ -8,27 +109,13 @@ overrides:
   monaco-editor>dompurify: 3.4.13
 
 patchedDependencies:
-  '@vscode/windows-process-tree@0.8.0':
-    hash: 946ffb2b1026bcb554d9920681fb00f546c28fc5de6d95a877d198b49bf73988
-    path: config/patches/@vscode__windows-process-tree@0.8.0.patch
-  '@xterm/addon-ligatures@0.11.0-beta.287':
-    hash: 47405b9994b5acf1b4e90b49250358c1ca03649854d59560e7732b72fe336920
-    path: config/patches/@xterm__addon-ligatures@0.11.0-beta.287.patch
-  '@xterm/addon-serialize@0.15.0-beta.287':
-    hash: af3b156143ed2ee9903b753145b63dd4a2ee72cadd7ef333ab0f4d5d3ebfc32c
-    path: config/patches/@xterm__addon-serialize@0.15.0-beta.287.patch
-  '@xterm/addon-webgl@0.20.0-beta.286':
-    hash: 118f649459ba56a51627d46603e2d5d81d837ac9c4dc393f5cc20263d0ac1b91
-    path: config/patches/@xterm__addon-webgl@0.20.0-beta.286.patch
-  '@xterm/xterm@6.1.0-beta.287':
-    hash: 46796c152f3b73e28238f44499eaf5a867a863809bc7b470b159526a41e354f7
-    path: config/patches/@xterm__xterm@6.1.0-beta.287.patch
-  lint-staged@16.4.0:
-    hash: 7333b3837f80a7fbd045964db6d76ba4fc118e49134bdbabb00585b6b7b60673
-    path: config/patches/lint-staged@16.4.0.patch
-  node-pty@1.1.0:
-    hash: 9a2eedbf2448b8ff1387a8a740ee5e4e968bf8484d7d80e12a3f6a2dc26b0e17
-    path: config/patches/node-pty@1.1.0.patch
+  '@vscode/windows-process-tree@0.8.0': 9217ef36c01ed74127fef5512b0c92089cdbf820fd6c109dd671137eebdc7585
+  '@xterm/addon-ligatures@0.11.0-beta.287': 47405b9994b5acf1b4e90b49250358c1ca03649854d59560e7732b72fe336920
+  '@xterm/addon-serialize@0.15.0-beta.287': af3b156143ed2ee9903b753145b63dd4a2ee72cadd7ef333ab0f4d5d3ebfc32c
+  '@xterm/addon-webgl@0.20.0-beta.286': 2c301a06ad9caa635d746147dcb2b1c69aa026904f65e1183564f08a0e601b91
+  '@xterm/xterm@6.1.0-beta.287': 46796c152f3b73e28238f44499eaf5a867a863809bc7b470b159526a41e354f7
+  lint-staged@16.4.0: 7333b3837f80a7fbd045964db6d76ba4fc118e49134bdbabb00585b6b7b60673
+  node-pty@1.1.0: 9a2eedbf2448b8ff1387a8a740ee5e4e968bf8484d7d80e12a3f6a2dc26b0e17
 
 importers:
 
@@ -36,10 +123,10 @@ importers:
     dependencies:
       '@electron-toolkit/preload':
         specifier: ^3.0.2
-        version: 3.0.2(electron@43.1.0)
+        version: 3.0.2(electron@43.4.1(supports-color@7.2.0))
       '@electron-toolkit/utils':
         specifier: ^4.0.0
-        version: 4.0.0(electron@43.1.0)
+        version: 4.0.0(electron@43.4.1(supports-color@7.2.0))
       '@floating-ui/dom':
         specifier: 1.7.6
         version: 1.7.6
@@ -60,7 +147,7 @@ importers:
         version: 0.27.0
       electron-updater:
         specifier: ^6.8.9
-        version: 6.8.9
+        version: 6.8.9(supports-color@7.2.0)
       i18next:
         specifier: ^26.3.1
         version: 26.3.1(typescript@7.0.2)
@@ -84,7 +171,7 @@ importers:
         version: 1.5.4
       react-i18next:
         specifier: ^17.0.8
-        version: 17.0.8(i18next@26.3.1(typescript@7.0.2))(react-dom@19.2.7(react@19.2.7))(react@19.2.7)(typescript@7.0.2)
+        version: 17.0.8(i18next@26.3.1(typescript@7.0.2))(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(typescript@7.0.2)
       serve-sim:
         specifier: ^0.1.40
         version: 0.1.40(typescript@7.0.2)
@@ -98,8 +185,8 @@ importers:
         specifier: ^1.0.3
         version: 1.0.3
       ws:
-        specifier: ^8.21.0
-        version: 8.21.0
+        specifier: ^8.21.3
+        version: 8.21.3
       yaml:
         specifier: ^2.8.4
         version: 2.8.4
@@ -109,19 +196,19 @@ importers:
     devDependencies:
       '@dnd-kit/core':
         specifier: ^6.3.1
-        version: 6.3.1(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+        version: 6.3.1(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       '@dnd-kit/sortable':
         specifier: ^10.0.0
-        version: 10.0.0(@dnd-kit/core@6.3.1(react-dom@19.2.7(react@19.2.7))(react@19.2.7))(react@19.2.7)
+        version: 10.0.0(@dnd-kit/core@6.3.1(react-dom@19.2.8(react@19.2.8))(react@19.2.8))(react@19.2.8)
       '@electron-toolkit/tsconfig':
         specifier: ^2.0.0
         version: 2.0.0(@types/node@25.9.5)
       '@electron/rebuild':
         specifier: ^4.2.0
-        version: 4.2.0
+        version: 4.2.0(supports-color@7.2.0)
       '@monaco-editor/react':
         specifier: ^4.7.0
-        version: 4.7.0(monaco-editor@0.55.1)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+        version: 4.7.0(monaco-editor@0.55.1)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       '@playwright/test':
         specifier: ^1.59.1
         version: 1.59.1
@@ -135,17 +222,20 @@ importers:
         specifier: ^4.2.4
         version: 4.2.4(rolldown-vite@7.3.1(@emnapi/core@1.11.2)(@emnapi/runtime@1.11.2)(@types/node@25.9.5)(jiti@2.7.0)(yaml@2.8.4))
       '@tanstack/react-virtual':
-        specifier: ^3.13.24
-        version: 3.13.24(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+        specifier: ^3.14.10
+        version: 3.14.10(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       '@testing-library/jest-dom':
         specifier: ^6.9.1
         version: 6.9.1
       '@testing-library/react':
         specifier: ^16.3.2
-        version: 16.3.2(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+        version: 16.3.2(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       '@testing-library/user-event':
         specifier: ^14.6.1
         version: 14.6.1(@testing-library/dom@10.4.1)
+      '@tiptap/extension-code-block':
+        specifier: ^3.22.5
+        version: 3.22.5(@tiptap/core@3.22.5(@tiptap/pm@3.22.5))(@tiptap/pm@3.22.5)
       '@tiptap/extension-code-block-lowlight':
         specifier: ^3.22.5
         version: 3.22.5(@tiptap/core@3.22.5(@tiptap/pm@3.22.5))(@tiptap/extension-code-block@3.22.5(@tiptap/core@3.22.5(@tiptap/pm@3.22.5))(@tiptap/pm@3.22.5))(@tiptap/pm@3.22.5)(highlight.js@11.11.1)(lowlight@3.3.0)
@@ -158,6 +248,9 @@ importers:
       '@tiptap/extension-link':
         specifier: ^3.22.5
         version: 3.22.5(@tiptap/core@3.22.5(@tiptap/pm@3.22.5))(@tiptap/pm@3.22.5)
+      '@tiptap/extension-list':
+        specifier: ^3.22.5
+        version: 3.22.5(@tiptap/core@3.22.5(@tiptap/pm@3.22.5))(@tiptap/pm@3.22.5)
       '@tiptap/extension-mathematics':
         specifier: 3.22.5
         version: 3.22.5(@tiptap/core@3.22.5(@tiptap/pm@3.22.5))(@tiptap/pm@3.22.5)(katex@0.16.45)
@@ -190,7 +283,7 @@ importers:
         version: 3.22.5
       '@tiptap/react':
         specifier: ^3.22.5
-        version: 3.22.5(@floating-ui/dom@1.7.6)(@tiptap/core@3.22.5(@tiptap/pm@3.22.5))(@tiptap/pm@3.22.5)(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+        version: 3.22.5(@floating-ui/dom@1.7.6)(@tiptap/core@3.22.5(@tiptap/pm@3.22.5))(@tiptap/pm@3.22.5)(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       '@tiptap/starter-kit':
         specifier: ^3.22.5
         version: 3.22.5
@@ -235,7 +328,7 @@ importers:
         version: 0.13.0-beta.287(@xterm/xterm@6.1.0-beta.287(patch_hash=46796c152f3b73e28238f44499eaf5a867a863809bc7b470b159526a41e354f7))
       '@xterm/addon-webgl':
         specifier: 0.20.0-beta.286
-        version: 0.20.0-beta.286(patch_hash=118f649459ba56a51627d46603e2d5d81d837ac9c4dc393f5cc20263d0ac1b91)(@xterm/xterm@6.1.0-beta.287(patch_hash=46796c152f3b73e28238f44499eaf5a867a863809bc7b470b159526a41e354f7))
+        version: 0.20.0-beta.286(patch_hash=2c301a06ad9caa635d746147dcb2b1c69aa026904f65e1183564f08a0e601b91)(@xterm/xterm@6.1.0-beta.287(patch_hash=46796c152f3b73e28238f44499eaf5a867a863809bc7b470b159526a41e354f7))
       '@xterm/xterm':
         specifier: 6.1.0-beta.287
         version: 6.1.0-beta.287(patch_hash=46796c152f3b73e28238f44499eaf5a867a863809bc7b470b159526a41e354f7)
@@ -247,13 +340,13 @@ importers:
         version: 2.1.1
       cmdk:
         specifier: ^1.1.1
-        version: 1.1.1(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+        version: 1.1.1(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       dompurify:
         specifier: ^3.4.13
         version: 3.4.13
       electron:
-        specifier: ^43.1.0
-        version: 43.1.0
+        specifier: ^43.4.1
+        version: 43.4.1(supports-color@7.2.0)
       electron-builder:
         specifier: ^26.15.3
         version: 26.15.3(electron-builder-squirrel-windows@26.15.3)
@@ -265,13 +358,13 @@ importers:
         version: 5.0.0(@swc/core@1.15.46)(rolldown-vite@7.3.1(@emnapi/core@1.11.2)(@emnapi/runtime@1.11.2)(@types/node@25.9.5)(jiti@2.7.0)(yaml@2.8.4))
       emoji-picker-react:
         specifier: ^4.19.1
-        version: 4.19.1(react@19.2.7)
+        version: 4.19.1(react@19.2.8)
       emojibase-data:
         specifier: 17.0.0
         version: 17.0.0(emojibase@17.0.0)
       happy-dom:
-        specifier: ^20.9.0
-        version: 20.9.0
+        specifier: ^20.11.8
+        version: 20.11.8
       html-to-image:
         specifier: ^1.11.13
         version: 1.11.13
@@ -280,7 +373,7 @@ importers:
         version: 9.1.7
       i18next-cli:
         specifier: 1.65.0
-        version: 1.65.0(@types/node@25.9.5)(react-dom@19.2.7(react@19.2.7))(typescript@7.0.2)
+        version: 1.65.0(@types/node@25.9.5)(react-dom@19.2.8(react@19.2.8))(typescript@7.0.2)
       katex:
         specifier: ^0.16.45
         version: 0.16.45
@@ -292,22 +385,22 @@ importers:
         version: 3.3.0
       lucide-react:
         specifier: ^0.577.0
-        version: 0.577.0(react@19.2.7)
+        version: 0.577.0(react@19.2.8)
       marked:
         specifier: ^17.0.1
         version: 17.0.6
       mermaid:
-        specifier: ^11.16.1
-        version: 11.16.1
+        specifier: ^11.17.2
+        version: 11.17.2
       monaco-editor:
         specifier: ^0.55.1
         version: 0.55.1
       oxfmt:
-        specifier: ^0.52.0
-        version: 0.52.0
+        specifier: ^0.65.0
+        version: 0.65.0
       oxlint:
-        specifier: ^1.77.0
-        version: 1.77.0(oxlint-tsgolint@7.0.2001)
+        specifier: ^1.80.0
+        version: 1.80.0(oxlint-tsgolint@7.0.2001)
       oxlint-plugin-react-doctor:
         specifier: 0.9.1
         version: 0.9.1
@@ -315,29 +408,29 @@ importers:
         specifier: 7.0.2001
         version: 7.0.2001
       pdfjs-dist:
-        specifier: ^6.2.108
-        version: 6.2.108
+        specifier: ^6.3.289
+        version: 6.3.289
       pngjs:
         specifier: ^7.0.0
         version: 7.0.0
       radix-ui:
         specifier: ^1.6.2
-        version: 1.6.2(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+        version: 1.6.2(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       react:
-        specifier: ^19.2.7
-        version: 19.2.7
+        specifier: ^19.2.8
+        version: 19.2.8
       react-colorful:
         specifier: ^5.7.0
-        version: 5.7.0(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+        version: 5.7.0(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       react-dom:
-        specifier: ^19.2.7
-        version: 19.2.7(react@19.2.7)
+        specifier: ^19.2.8
+        version: 19.2.8(react@19.2.8)
       react-grab:
         specifier: ^0.1.33
-        version: 0.1.34(react@19.2.7)
+        version: 0.1.34(react@19.2.8)
       react-markdown:
         specifier: ^10.1.0
-        version: 10.1.0(@types/react@19.2.17)(react@19.2.7)
+        version: 10.1.0(@types/react@19.2.17)(react@19.2.8)
       react-refresh:
         specifier: ^0.18.0
         version: 0.18.0
@@ -361,22 +454,22 @@ importers:
         version: 4.0.0
       remark-frontmatter:
         specifier: ^5.0.0
-        version: 5.0.0
+        version: 5.0.0(supports-color@7.2.0)
       remark-gfm:
         specifier: ^4.0.1
-        version: 4.0.1
+        version: 4.0.1(supports-color@7.2.0)
       remark-math:
         specifier: ^6.0.0
-        version: 6.0.0
+        version: 6.0.0(supports-color@7.2.0)
       remark-parse:
         specifier: ^11.0.0
-        version: 11.0.0
+        version: 11.0.0(supports-color@7.2.0)
       shadcn:
         specifier: ^4.13.1
         version: 4.13.1(typescript@7.0.2)
       sonner:
         specifier: ^2.0.7
-        version: 2.0.7(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+        version: 2.0.7(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       tailwind-merge:
         specifier: ^3.5.0
         version: 3.5.0
@@ -399,8 +492,8 @@ importers:
         specifier: npm:rolldown-vite@7.3.1
         version: rolldown-vite@7.3.1(@emnapi/core@1.11.2)(@emnapi/runtime@1.11.2)(@types/node@25.9.5)(jiti@2.7.0)(yaml@2.8.4)
       vitest:
-        specifier: ^4.1.5
-        version: 4.1.5(@opentelemetry/api@1.9.1)(@types/node@25.9.5)(happy-dom@20.9.0)(msw@2.14.3(@types/node@25.9.5)(typescript@7.0.2))(rolldown-vite@7.3.1(@emnapi/core@1.11.2)(@emnapi/runtime@1.11.2)(@types/node@25.9.5)(jiti@2.7.0)(yaml@2.8.4))
+        specifier: ^4.1.11
+        version: 4.1.11(@opentelemetry/api@1.9.1)(@types/node@25.9.5)(happy-dom@20.11.8)(msw@2.14.3(@types/node@25.9.5)(typescript@7.0.2))(rolldown-vite@7.3.1(@emnapi/core@1.11.2)(@emnapi/runtime@1.11.2)(@types/node@25.9.5)(jiti@2.7.0)(yaml@2.8.4))
       vscode-oniguruma:
         specifier: ^2.0.1
         version: 2.0.1
@@ -409,11 +502,11 @@ importers:
         version: 9.3.2
       zustand:
         specifier: ^5.0.14
-        version: 5.0.14(@types/react@19.2.17)(react@19.2.7)(use-sync-external-store@1.6.0(react@19.2.7))
+        version: 5.0.14(@types/react@19.2.17)(react@19.2.8)(use-sync-external-store@1.6.0(react@19.2.8))
     optionalDependencies:
       '@vscode/windows-process-tree':
         specifier: 0.8.0
-        version: 0.8.0(patch_hash=946ffb2b1026bcb554d9920681fb00f546c28fc5de6d95a877d198b49bf73988)
+        version: 0.8.0(patch_hash=9217ef36c01ed74127fef5512b0c92089cdbf820fd6c109dd671137eebdc7585)
       sherpa-onnx-darwin-arm64:
         specifier: 1.12.37
         version: 1.12.37
@@ -1058,8 +1151,8 @@ packages:
     resolution: {integrity: sha512-9QOtNffcOF/c1seMCDnjckb3R9WHcG34tky+FHpNKKCW0wc/scYLwMtO+ptyGUfMW0/b/n4qRiALlaFHc9Oj7Q==}
     engines: {node: '>= 10.0.0'}
 
-  '@mermaid-js/parser@1.2.0':
-    resolution: {integrity: sha512-oYPyv8A4As1yH5Bx+04iQEQxXuIQDe0GKCNSRgao6z8AM9jixXIfP0vsppRLvGf+nKIOb9/LdpWA4YuJiVvESA==}
+  '@mermaid-js/parser@1.2.1':
+    resolution: {integrity: sha512-n12NohV3mrUyUL2o93IgG/ifeW9FTyeJn3zDxkhwa8MJ9Fxg3HQMlA3RiGmD/3UnJvheztkjjQAjA2T4LmUcpw==}
 
   '@modelcontextprotocol/sdk@1.30.0':
     resolution: {integrity: sha512-xKd8OIzlqNzcqcNumGAa6g+PW2kjD5vrpcKOnfldAUPP3j7lnqMPwlTXQm8gF+UwH72z0lqaRbjr9hqGz0eITA==}
@@ -1351,124 +1444,124 @@ packages:
   '@oxc-project/types@0.141.0':
     resolution: {integrity: sha512-S4as7z0j0xQkXcJlyY5ehntwK8/wRkQb9Cyqw+J/N2rkWGQGK0SxD6X6DhQTc7qsxVTBxXbxZtBJh3mr3PtIzQ==}
 
-  '@oxfmt/binding-android-arm-eabi@0.52.0':
-    resolution: {integrity: sha512-17EMSJnQ9g+upVHrAUYDMfH5lvRKQ9Nvg8WtEoH72oDr1VpWz+7/o3tD97U1EToen2YAQ/68JmtDYkQUi20dfQ==}
+  '@oxfmt/binding-android-arm-eabi@0.65.0':
+    resolution: {integrity: sha512-M10Gs1SSpTNI6ahGx3M/OlIdUF4hkaP6OgUb+MS79t/Pgflk3r1nW5gPFqsZGUAXg0H1AfANT9AvLdBSTIhZKg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [android]
 
-  '@oxfmt/binding-android-arm64@0.52.0':
-    resolution: {integrity: sha512-A2G1IdwGEW2lLJkIxcvuirRH1CzSl/e0NX11zTlW1gvxJThfwbI/BEoaKrTNpm7M2FchvIf6guvIQU7d5iz+OQ==}
+  '@oxfmt/binding-android-arm64@0.65.0':
+    resolution: {integrity: sha512-6DXH5sftNlaHpWJG50hFMF+Qxtq5D2TmahvcDPxWNcGIf8qrC9Y0YgHYcYZ2hlWzaccKXh/f3GcssH8vtkl4JA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [android]
 
-  '@oxfmt/binding-darwin-arm64@0.52.0':
-    resolution: {integrity: sha512-f9+bLvOYxy7NttCLFTvQ7afmqDOWY4wIP9xdvfj5trQ1qj6f2UFAGwZESlfsMjvJNTyRpXfIlOanCI9FOvoeQA==}
+  '@oxfmt/binding-darwin-arm64@0.65.0':
+    resolution: {integrity: sha512-K9m7lr53pcOLETNsC88sWes/GWHUGjZyHx95UhYcSXy0r30haLdeXlSufSenEAtoLaW753WN8/l4M7GYcRt6cg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [darwin]
 
-  '@oxfmt/binding-darwin-x64@0.52.0':
-    resolution: {integrity: sha512-YSTB9sJ5nnQd/Q0ddHkgof0ZCHPAnWZT1IW2SJ8omz7CP7KluJhO1fNHrpqdxCtpztJwSs4hY1uAee35wKxxaw==}
+  '@oxfmt/binding-darwin-x64@0.65.0':
+    resolution: {integrity: sha512-sTNwIx1gre3MyiHOPLu7IGW4UyMScYL4DTmJT01p4vzB0En+OJUQz6KuH8t0PpsClRSaMuY3b0QmtoPItfO8Lg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [darwin]
 
-  '@oxfmt/binding-freebsd-x64@0.52.0':
-    resolution: {integrity: sha512-NIrRNTTPCs4UbmVs0bxLSCDlLCtIRMJIXklNKaXa5Oj2/K1UIMBvgE8+uPVo01Io3N9HF0+GAX+aAHjUgZS7vA==}
+  '@oxfmt/binding-freebsd-x64@0.65.0':
+    resolution: {integrity: sha512-lYZMVIiIpnjGu5hJb2jxA8NYQ/e0OTGuaiAf4dqlGPNnPmUTu23FZRMltmjro/KkQm1uE4NT4n5yJ2zWmKcpfA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [freebsd]
 
-  '@oxfmt/binding-linux-arm-gnueabihf@0.52.0':
-    resolution: {integrity: sha512-JXUCde8mn3GpgQouz2PXUokgy/uT1QrRJBL2s983VWcSQp62wTFYiNXgTKdeo1Jgbr0IgUnKKvzIk/YBlj/nVQ==}
+  '@oxfmt/binding-linux-arm-gnueabihf@0.65.0':
+    resolution: {integrity: sha512-gIdXFAt/bURnjxuoedDEWdZ0PEWEmdDcm8qdpoFYYvW3QMk/5D4vUaH4mlMeRpeTdST4izUgHVO6RawQ4QulJw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [linux]
 
-  '@oxfmt/binding-linux-arm-musleabihf@0.52.0':
-    resolution: {integrity: sha512-psbUXaRZ+V8DaXz10Qf7LSHtdtdKAmC8fxXgeU608jjzrmWK4quamZMOpl6sf+dikoFHA85uE93Q0BqxrCdQrQ==}
+  '@oxfmt/binding-linux-arm-musleabihf@0.65.0':
+    resolution: {integrity: sha512-jJVyADto7gA2AaX5qAjAexrxx9PJQaKWOe8PICE7yKMbjBRyOHcmj9TtVJ+MZYDUQ3hodU0AcoTj0jFQ1W4C6Q==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [linux]
 
-  '@oxfmt/binding-linux-arm64-gnu@0.52.0':
-    resolution: {integrity: sha512-Jw7MgWUU9lcLCcy82updISP3EthTlfvAwR6gWNxPzqly7+fLvOi2gHQE9xXQjpqaVLm/8P+gOzlv9ODuoVlaaw==}
+  '@oxfmt/binding-linux-arm64-gnu@0.65.0':
+    resolution: {integrity: sha512-p3RFkB+u7u+8up99b/NEcI1hdpLDiGgJYNwDorB60n7eH+eKposAKuMBxx+NqB3b+sJP4CZmYDh9G7X62tUsKg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@oxfmt/binding-linux-arm64-musl@0.52.0':
-    resolution: {integrity: sha512-wZg6bLjDvh2KibyI3QFUYo8GTXneIFsd0JvehtvJiUmQ8WRPERgxd/VM4ctWb86U5FT1FkqgS8/wZKVB+AZScg==}
+  '@oxfmt/binding-linux-arm64-musl@0.65.0':
+    resolution: {integrity: sha512-5Prb0uFzJHr+OUD/qS/TmU526wD+PaHDsm3KoRiUXbMIDpTSErjeQYkK3OQeshAvD/PuLa9WGEi9WPajjdOZJg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@oxfmt/binding-linux-ppc64-gnu@0.52.0':
-    resolution: {integrity: sha512-IngE8uxhNvxcMrLjZNDo9xNLY7rEK33AKnaMd2B46he1e/mz2CfcW6If/U1wUjdRZddm1QzQaciqZkuMkdh1FA==}
+  '@oxfmt/binding-linux-ppc64-gnu@0.65.0':
+    resolution: {integrity: sha512-S8svxTp81obnF3admN9yd+u2rOYXtyzThLGBTg1PY6TPtGcC09BaaXLQD+TBSMa7yvqhCDZ8DFri+S/yG60qCg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [ppc64]
     os: [linux]
     libc: [glibc]
 
-  '@oxfmt/binding-linux-riscv64-gnu@0.52.0':
-    resolution: {integrity: sha512-H3+DdFMv/efN3Efmhsv18jDrpiWWqKG7wsfAlQBqAt6z/E2Bx+TwEj2Nowe51CPOWB8/mFBC2dAMSgVFLvvowA==}
+  '@oxfmt/binding-linux-riscv64-gnu@0.65.0':
+    resolution: {integrity: sha512-WtXBr75G/h2qOHy8SiGtC1R6aS3jt4mE52v1D8AtwMXIgoOmSNP9lKvbSaTRoL0e5wsMPoi6T72QWDYPu+S+nA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [riscv64]
     os: [linux]
     libc: [glibc]
 
-  '@oxfmt/binding-linux-riscv64-musl@0.52.0':
-    resolution: {integrity: sha512-zji+1kb7lJKohSDjzC1IsS+K/cKRs1hdVf0ZH0VbdbiakmtLvN9twBoXo/k8VdjFax7kfo+DyPxS7vv52br1aw==}
+  '@oxfmt/binding-linux-riscv64-musl@0.65.0':
+    resolution: {integrity: sha512-YwSLVvpaz4o/nv/miiPEBJz+eJ+VmbgNIrao6RccK9ce+L5EA8wP+ZD0uFeq6wKOza6zoWv/dR0sj6lip6R3EA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [riscv64]
     os: [linux]
     libc: [musl]
 
-  '@oxfmt/binding-linux-s390x-gnu@0.52.0':
-    resolution: {integrity: sha512-hcLBYedpCy7ToUvvBidWk7+11Yhg1oAZ4+6hKPic/mQI6NaqXJSXMps5nFlwUuX2ewhtLZZDPg63TI042qGKBg==}
+  '@oxfmt/binding-linux-s390x-gnu@0.65.0':
+    resolution: {integrity: sha512-XQTPqgvyrgkKcFq+Tp2eK6JS7sqqJ+nRmy2Fav4j3I+i4dJoPJm7YwEdoeSDX9xkqj9jZ/lWfF3bXUWztIrn6A==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [s390x]
     os: [linux]
     libc: [glibc]
 
-  '@oxfmt/binding-linux-x64-gnu@0.52.0':
-    resolution: {integrity: sha512-IDO2loXK2OtTOhSPchU9MW25mWL2QCDGdJbjN8MXKZVS80qXe5gMTwQWu/gMJ3juoBHbkuUZNB2N1LHzNT7DoA==}
+  '@oxfmt/binding-linux-x64-gnu@0.65.0':
+    resolution: {integrity: sha512-cjZlx6S/VkeCNWCbwZriTnLnZeTcV3DEyeRGSw/2wwLP9viq+C0bJ4bC1k/ZLkFxDcB1lUgSasPkYGP1bdraOg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@oxfmt/binding-linux-x64-musl@0.52.0':
-    resolution: {integrity: sha512-mAV2Hjn0SatJ+KoAzKUC3eJhdJ8wv+3m1KyuS0dTsbF0c5weq+QrCt/DRZZM+uj/XiKzCDEUKYsBF30e2qkcyw==}
+  '@oxfmt/binding-linux-x64-musl@0.65.0':
+    resolution: {integrity: sha512-2azCjxdLtK4zCcIOU1dlXlU0xxfbPi6EjwWx7Ac7teWPidIIDOcIhudup83xNCKYhtqeVd/gaVDOxbUq4syXWA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@oxfmt/binding-openharmony-arm64@0.52.0':
-    resolution: {integrity: sha512-vd4npaUIwChxp7XzkqmepBWTT9YMcSe/NBApVGPC30/lLyOVaV3dvma1SKo03t8O73BPRAG7EyJzGlN5cJM5hQ==}
+  '@oxfmt/binding-openharmony-arm64@0.65.0':
+    resolution: {integrity: sha512-KXQ7xi1e/voP0IQaw6fG6XY4Z5+Llf1XmRSZS1t7pVFCecFJ0iXaboKmVwjFtp5MLlT5iWQrJ2U1C3GJdZ2u+Q==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [openharmony]
 
-  '@oxfmt/binding-win32-arm64-msvc@0.52.0':
-    resolution: {integrity: sha512-k2sz6gWQdMfh5HPpIS+Bw/0UEV/kaK2xuqJRrWL233sEHx9WLlsmvlPFM4HUNThkYbSN0U0vPW7LVKZWDS8hPQ==}
+  '@oxfmt/binding-win32-arm64-msvc@0.65.0':
+    resolution: {integrity: sha512-2FbbjG5jEqLSLKVJwBap84uJfpn5Y5A53KEO0aUNr+zeiRB9nyPUIFMcSbZVMFLitfBytFWRNngozXYjb6Rsbw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [win32]
 
-  '@oxfmt/binding-win32-ia32-msvc@0.52.0':
-    resolution: {integrity: sha512-rhke69GTcArodLHpjMTfNnvjTEBryDeZcUCKK/VjXDMtfTULl6QRh0ymX5/hbCUv2WjYm9h/QbW++q2vE15gWQ==}
+  '@oxfmt/binding-win32-ia32-msvc@0.65.0':
+    resolution: {integrity: sha512-LJ+ZacAPSjegDOnSLyA1TMWAhdDrsK4el3REdr1oL2UtVBCMhO2II/Sb3cEW6mF2MfLhl8hDNCSvc7KSbgk3LQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [ia32]
     os: [win32]
 
-  '@oxfmt/binding-win32-x64-msvc@0.52.0':
-    resolution: {integrity: sha512-q5xL7oeXkZdEtNZWBdvehJcmt+GRu9l2bK40yJs1jJXlqq+r0Hygb1rTjq+FM2o/2xyt4cufH6KRplHp3Jjsvw==}
+  '@oxfmt/binding-win32-x64-msvc@0.65.0':
+    resolution: {integrity: sha512-higu9cWEO6XXFzATD1jf0mCK34rNfN2H9JrJie7QB1IhleVpTh0QlLH9Ip2C1H/Nd5n0v5pvRtC+5R0uE4HpVg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [win32]
@@ -1503,124 +1596,124 @@ packages:
     cpu: [x64]
     os: [win32]
 
-  '@oxlint/binding-android-arm-eabi@1.77.0':
-    resolution: {integrity: sha512-E06sKWS6PiI6HRxS1wyQg22HvApt01hI7fV+T3wUk3OSbaaP4a3hYGY/MIQDmASqCiRjBdpRQYkgMkqH82cWmQ==}
+  '@oxlint/binding-android-arm-eabi@1.80.0':
+    resolution: {integrity: sha512-RM3Plj+biQpxa5d1GOOX6ciDlcUROmm4OZ/pLTpitkQt2mJv4jhtY4cbgaetOm5UKWZe05/TGQ6o1Vl8EOHkrA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [android]
 
-  '@oxlint/binding-android-arm64@1.77.0':
-    resolution: {integrity: sha512-NvsKz0KZxTp9cYWPLf+FXaSZwB3oO3peAjtukpOMBgse2vhQSoIIVqeO1yR0lEo/UcdZIDL18uq+kL0LzQ0ytA==}
+  '@oxlint/binding-android-arm64@1.80.0':
+    resolution: {integrity: sha512-YlO5JEf0Yr2bUUlu8O8daVcUxtcGGbcSmyV7E7nSbJbfAdxTE0PFPwgnIlw7wXJaTYjb+qs5hI5q3jxUkI7cAw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [android]
 
-  '@oxlint/binding-darwin-arm64@1.77.0':
-    resolution: {integrity: sha512-bgjTn6nW4bQCFBvSvuHCpDD+sONvmpo4lGI4PxzMt1quBA+xYxhczk6RiCn3GZ9gY8uhaBbwhj9MdKGfu6T9DA==}
+  '@oxlint/binding-darwin-arm64@1.80.0':
+    resolution: {integrity: sha512-BULDOyO3AhsmdWfQeIUCykDt3dd7XZBGLhp1eIh56skRv01O+cNjNPwXMIbeW1x4+pxcln5if72wcRgViVo7PA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [darwin]
 
-  '@oxlint/binding-darwin-x64@1.77.0':
-    resolution: {integrity: sha512-aotaIttH1R6j1Rwhx0M0htgeZyGtVQqYNTVEYMN/UcgHPquGA6kmk9OyuDc3a2GKUQBC+3C3GVQCcrRPMYqAFA==}
+  '@oxlint/binding-darwin-x64@1.80.0':
+    resolution: {integrity: sha512-YJ4JzLw7N5TDSQFlA0hAQGHvnDZgyypm1yunObVWcWiF9KM7eGCJKYKLgTC2Fi/57OdnBhbj4OkzPGdFQJ6HyA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [darwin]
 
-  '@oxlint/binding-freebsd-x64@1.77.0':
-    resolution: {integrity: sha512-nNx/wta7ksRAdYvq+l4AWjXkLxEXHALhENxjj2cYbQAIR4ybaA5L+hCbE63HOmft5czQ6ks+hb8vmEAnn7YGPg==}
+  '@oxlint/binding-freebsd-x64@1.80.0':
+    resolution: {integrity: sha512-AYUIk5QnL0s8oWAYsREZwkRYy1SupJTXALo93J1TgzHywxQtdM99FecRMQ87MXEdPQ0j1TmEpeeq3fGNkpvMqg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [freebsd]
 
-  '@oxlint/binding-linux-arm-gnueabihf@1.77.0':
-    resolution: {integrity: sha512-tMLLjM7xXtzXisVCzkOTXNCy9bZVId2wteNwjohlFDR/jY6WagpEDA1c1wu4xRc20Hojaxj+V6DSR7gbKxijWA==}
+  '@oxlint/binding-linux-arm-gnueabihf@1.80.0':
+    resolution: {integrity: sha512-9hBZVANupQ89W9dXyE0n8doCyaW5pDyGn3y6XlIMPZ+rIKuyqkr3SNUXmVJIhuvUq0NBU3RBiSXXE69l4XI6KA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [linux]
 
-  '@oxlint/binding-linux-arm-musleabihf@1.77.0':
-    resolution: {integrity: sha512-MiAFDFaqR0tmHTAyo0YDcZ5hyLREdYw/RQhc2R3cbT+8O3tB+zqPM2th9TTQ+Uo3jn/embS+DO+HyX9ztCPkOQ==}
+  '@oxlint/binding-linux-arm-musleabihf@1.80.0':
+    resolution: {integrity: sha512-SvS2uKqzY+pbfuvAHzH4338R6Zwo805GAwrIMVvK1KxoOWCIjZUdfzTCvilD7z6JK91v011+zYMryabhDo2AsQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [linux]
 
-  '@oxlint/binding-linux-arm64-gnu@1.77.0':
-    resolution: {integrity: sha512-/xqQ3B16i1T4cyt/9Mn+4CpzhUXoBXp7kVpIwzOXNFLj5JmK1bIjsbSnX296Gg8A/o7oDtKWikFgBx0SLwztkw==}
+  '@oxlint/binding-linux-arm64-gnu@1.80.0':
+    resolution: {integrity: sha512-tCLadyqRVL3pQTRPNg7cjXKvcvS4fbyXeQHhKk5BTJ1oftQln5/yIIWbu/Xom/DX41zv2P9QGt6+D/TtQVtY3A==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@oxlint/binding-linux-arm64-musl@1.77.0':
-    resolution: {integrity: sha512-LSbwuRKiNCenPDcbARqAZ5RfBy7gmj7vOvfJRLeCDU3gFtSxWbhv/+VTlaUqzUhNj1gFLHB8h7ALnxa/Az6z6g==}
+  '@oxlint/binding-linux-arm64-musl@1.80.0':
+    resolution: {integrity: sha512-XfpCNRlOPcLlJl4Bn/FUhjqlR6BVavEykERBf/MV7YA9VZDa5g5znVqYhyviMafcxS9Pe/i/kPvHNO0U6svEHQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@oxlint/binding-linux-ppc64-gnu@1.77.0':
-    resolution: {integrity: sha512-QWdcH31mXEUe5Nq1s0CfCpceaKjIo9uZtwDjAuL681g1axf+5x8xrg/eXWaw//4NCxYZ4V4e5Hu5tvdR+pTBlg==}
+  '@oxlint/binding-linux-ppc64-gnu@1.80.0':
+    resolution: {integrity: sha512-3I4yMwcFG9NeO8ioY6JBBuKsIm5GL/x7MATt1S4tVWaxPu5HcJ+XnLUbcVBTxG8q2Wu56HSj+NmXQiVYb1lp6A==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [ppc64]
     os: [linux]
     libc: [glibc]
 
-  '@oxlint/binding-linux-riscv64-gnu@1.77.0':
-    resolution: {integrity: sha512-GnOfYgJxbcElOiPZaDFDl406ONddwvOWk2jvAAAEjwAl4GofNoHF+/HHUIBYa6bFCArlcGPi0XjC4cU1pkgF/Q==}
+  '@oxlint/binding-linux-riscv64-gnu@1.80.0':
+    resolution: {integrity: sha512-E1wAKymkpe1/E8helzBKdm81OBOF+ezxRyXRMEuik3ZpWDER5CPOKZwF66RsdwW98uwZv8UTFremUQtC1CzdJA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [riscv64]
     os: [linux]
     libc: [glibc]
 
-  '@oxlint/binding-linux-riscv64-musl@1.77.0':
-    resolution: {integrity: sha512-AyEMTUCf0xY+hHF+IxqXFQIX0yQOIR8ykpY0lJNOw9xYqOzUX8dyZfRvlG0RfXwuQn2eonf/8NrMmDSZJjdqsA==}
+  '@oxlint/binding-linux-riscv64-musl@1.80.0':
+    resolution: {integrity: sha512-+gLRGD4sIo3+VA++iham5UxD9tKSoJ/VOrROCEXIcknrYtQg6iIQgvjN0cpiRF7N6UYC7pJbvHJlDnMge5LRpQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [riscv64]
     os: [linux]
     libc: [musl]
 
-  '@oxlint/binding-linux-s390x-gnu@1.77.0':
-    resolution: {integrity: sha512-sPLzEcNvxd/oyVQ5oZo92CiHkFkpBeRop13E/P3TPY+hZfXHKCOWKI70TE2RYwMKFJDc20EMjH16L7NZICtKTw==}
+  '@oxlint/binding-linux-s390x-gnu@1.80.0':
+    resolution: {integrity: sha512-aR0PrzHj9leW3NmzBAAP4EzdoBNoJcs9sjnIQPIwyRnBGYrRbXUIpEB5Q39AqK3PLY5JK5uEhDQDiUa1QSAstw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [s390x]
     os: [linux]
     libc: [glibc]
 
-  '@oxlint/binding-linux-x64-gnu@1.77.0':
-    resolution: {integrity: sha512-1Oh2ssH2L7lwyvkdSqaMUfsGfwU2Wfvew+obBUYjRVqhpBcUpwnsPSEr1IzVi9XqkuY10geiLsNKecqaZC34Dw==}
+  '@oxlint/binding-linux-x64-gnu@1.80.0':
+    resolution: {integrity: sha512-vSVh5cSo3Xxs6ghBCcFJlpbkbENzDog1qXtoXLa/HC3aCrR4XO76GZbXmQoCPHnu99nQpdCeC3H9tdNICfDh7A==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@oxlint/binding-linux-x64-musl@1.77.0':
-    resolution: {integrity: sha512-0j/2wRgNGO+Qj/M1uu/p57h/hFTTWWcfie0ufkbabeus2s5+/QqkCflnMOwLLN5m2GsNeWp4xdl4cPa4n7QCOQ==}
+  '@oxlint/binding-linux-x64-musl@1.80.0':
+    resolution: {integrity: sha512-FfzBXpNQ8u7/ZI/p8bl73MeZ508Ax3hxWp3SiJpEFiC+BB9XcXy5FAZHTLKDPSzrUpxQZSZJAVdDmuJp/+HDBQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@oxlint/binding-openharmony-arm64@1.77.0':
-    resolution: {integrity: sha512-BJ/j54qS0usEnyDkLYURMj2iiD9h5Cyy+ppzeMSXBGRXaGRNWnj1Mw14NqWMR5E/PzdgB30OOCCzLzbRoduafw==}
+  '@oxlint/binding-openharmony-arm64@1.80.0':
+    resolution: {integrity: sha512-zMzbkumtmprCgRwoYNzcB3iC39fXdJIMLMU33KdCjEGLlJGOEt1+LwQ4LF8ndLzAEKVz4BR0y3V6Xrkk3Nm3yA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [openharmony]
 
-  '@oxlint/binding-win32-arm64-msvc@1.77.0':
-    resolution: {integrity: sha512-Yh8w+g2Lpx7StrvtYkoz9JJvXjB9wxgFChFNb85nrXm/wj/XTwGWS1hve9+900HL7llrntYB3YP+y32E3tRqzA==}
+  '@oxlint/binding-win32-arm64-msvc@1.80.0':
+    resolution: {integrity: sha512-ib6iRcrXsk4t1fm3iKcwksyWh1ZkZXC/2mEzakl0ai2+6HZunf1WWMZ/xP9EJAvw9g9K4UVTC3NF/+G2qLrbTQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [win32]
 
-  '@oxlint/binding-win32-ia32-msvc@1.77.0':
-    resolution: {integrity: sha512-zja5b7+6a7UsRFgAQSrnax5vrzliEyNPLCjfXONu/vTWswaIVZGFajJZptaeRvPE4LghtFdAzVFlexTm7MVTGA==}
+  '@oxlint/binding-win32-ia32-msvc@1.80.0':
+    resolution: {integrity: sha512-xhRWBMpLxZvgKAH6+DJZmpP+W8Y8UdQOSU1JfxSWNXsaBaRGW77j+1hCuNHlzj7OH4SPN8fYd1q0o2qrDtoVyw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [ia32]
     os: [win32]
 
-  '@oxlint/binding-win32-x64-msvc@1.77.0':
-    resolution: {integrity: sha512-+teyvPDZ2RjUvo+SuCqS/UhaJl1QtdW5fWT5NJTV61V5MIuIS90Db9LixmtEGvXixyttiK62P96MSu3UlpviBw==}
+  '@oxlint/binding-win32-x64-msvc@1.80.0':
+    resolution: {integrity: sha512-yAnO7lwBYQnz2pcfBPIGQQZWIX5zd5R/1aAKIF3oE+TVj7IhoHcROjOkz3sRDngzqhfPKfFaXqug5j5rE5dn6Q==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [win32]
@@ -2748,14 +2841,14 @@ packages:
     peerDependencies:
       vite: ^5.2.0 || ^6 || ^7 || ^8
 
-  '@tanstack/react-virtual@3.13.24':
-    resolution: {integrity: sha512-aIJvz5OSkhNIhZIpYivrxrPTKYsjW9Uzy+sP/mx0S3sev2HyvPb7xmjbYvokzEpfgYHy/HjzJ2zFAETuUfgCpg==}
+  '@tanstack/react-virtual@3.14.10':
+    resolution: {integrity: sha512-SRyoUbdFMRHuYXMijV5H4ZarQWpXkj3iANq8OFre+pybeVap8ZJjZ3Nz9bVjx4d8PfobVUQUdKyyyHYk3E+djw==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
 
-  '@tanstack/virtual-core@3.14.0':
-    resolution: {integrity: sha512-JLANqGy/D6k4Ujmh8Tr25lGimuOXNiaVyXaCAZS0W+1390sADdGnyUdSWNIfd49gebtIxGMij4IktRVzrdr12Q==}
+  '@tanstack/virtual-core@3.17.8':
+    resolution: {integrity: sha512-BfEvehNpOT75r5Ksc5xW6NZuXujTfb7nlSEyVu4XHG3gdxNg1KqXruWbDewXOUaUYIo4oRbSfkjIajz4MAT8tA==}
 
   '@testing-library/dom@10.4.1':
     resolution: {integrity: sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==}
@@ -3364,11 +3457,11 @@ packages:
     peerDependencies:
       vite: ^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0
 
-  '@vitest/expect@4.1.5':
-    resolution: {integrity: sha512-PWBaRY5JoKuRnHlUHfpV/KohFylaDZTupcXN1H9vYryNLOnitSw60Mw9IAE2r67NbwwzBw/Cc/8q9BK3kIX8Kw==}
+  '@vitest/expect@4.1.11':
+    resolution: {integrity: sha512-VX2x5vNJXET47KAFzwERI+KRMtTTCSWTfSMKsW7JsUsXV4psq++e3DvZpuTDOpHcxytiDs6p2nhVb2tVDiiUYw==}
 
-  '@vitest/mocker@4.1.5':
-    resolution: {integrity: sha512-/x2EmFC4mT4NNzqvC3fmesuV97w5FC903KPmey4gsnJiMQ3Be1IlDKVaDaG8iqaLFHqJ2FVEkxZk5VmeLjIItw==}
+  '@vitest/mocker@4.1.11':
+    resolution: {integrity: sha512-2XJVD55d1o5AZous5CCGKS74g/riOj9odEt2bQpCVZeblHyHdnMeFl4jl0XjU21stf4mbjUkew2eXQZt65g5CQ==}
     peerDependencies:
       msw: ^2.4.9
       vite: ^6.0.0 || ^7.0.0 || ^8.0.0
@@ -3378,20 +3471,20 @@ packages:
       vite:
         optional: true
 
-  '@vitest/pretty-format@4.1.5':
-    resolution: {integrity: sha512-7I3q6l5qr03dVfMX2wCo9FxwSJbPdwKjy2uu/YPpU3wfHvIL4QHwVRp57OfGrDFeUJ8/8QdfBKIV12FTtLn00g==}
+  '@vitest/pretty-format@4.1.11':
+    resolution: {integrity: sha512-yiZzPbGTS9Sr/JpFl8zHrcIkAofNbFV6k21vIgQN/cY/oxZeXhJv5sc/MBJ5jFKWmWs+oJHw0UXLZjmf931+Vw==}
 
-  '@vitest/runner@4.1.5':
-    resolution: {integrity: sha512-2D+o7Pr82IEO46YPpoA/YU0neeyr6FTerQb5Ro7BUnBuv6NQtT/kmVnczngiMEBhzgqz2UZYl5gArejsyERDSQ==}
+  '@vitest/runner@4.1.11':
+    resolution: {integrity: sha512-LztvUgdwMNJMIkj3hQnnxiC2Xy1zNxq928W/xhjCLaNCzqTZOudjwbQf6v9IntZGPw132i2Lq2rgTRZHD3JHNw==}
 
-  '@vitest/snapshot@4.1.5':
-    resolution: {integrity: sha512-zypXEt4KH/XgKGPUz4eC2AvErYx0My5hfL8oDb1HzGFpEk1P62bxSohdyOmvz+d9UJwanI68MKwr2EquOaOgMQ==}
+  '@vitest/snapshot@4.1.11':
+    resolution: {integrity: sha512-pN7ikn1ON7h8ee4gIAp4AzyK+zBtJPzVbqOgu5LCEh4VaJVbPQcgYQYJIMGQPXVeJJq1fnfazis7a5pFNPahog==}
 
-  '@vitest/spy@4.1.5':
-    resolution: {integrity: sha512-2lNOsh6+R2Idnf1TCZqSwYlKN2E/iDlD8sgU59kYVl+OMDmvldO1VDk39smRfpUNwYpNRVn3w4YfuC7KfbBnkQ==}
+  '@vitest/spy@4.1.11':
+    resolution: {integrity: sha512-apNa/prQy2qCeywhnixOHPRCgGNhvg7T4Dapfl1GahLp/R+uhBm5cPyFoNVyqsNd2h1nJxL6BqqdIjiABL60YA==}
 
-  '@vitest/utils@4.1.5':
-    resolution: {integrity: sha512-76wdkrmfXfqGjueGgnb45ITPyUi1ycZ4IHgC2bhPDUfWHklY/q3MdLOAB+TF1e6xfl8NxNY0ZYaPCFNWSsw3Ug==}
+  '@vitest/utils@4.1.11':
+    resolution: {integrity: sha512-zTCVGpyFsGWBhllOyKlTw/vnr6D9qxsfSDyfbyZmTyjHw5N/VuvzHpHoQjm2ZJzn4RJgx5w4r7V0er69CmLgPQ==}
 
   '@vscode/windows-process-tree@0.8.0':
     resolution: {integrity: sha512-TI+h2GRwX+igD/YYJMQQVAFcsCNSg7Te2yYxQpKMzwto5RsJ8d2KKgOeur/p/6sAOQwZvopiTDOClyTHEn9MhQ==}
@@ -3399,6 +3492,7 @@ packages:
   '@xmldom/xmldom@0.8.13':
     resolution: {integrity: sha512-KRYzxepc14G/CEpEGc3Yn+JKaAeT63smlDr+vjB8jRfgTBBI9wRj/nkQEO+ucV8p8I9bfKLWp37uHgFrbntPvw==}
     engines: {node: '>=10.0.0'}
+
   '@xterm/addon-fit@0.12.0-beta.287':
     resolution: {integrity: sha512-2MDj+J4x67bjOS/SuBPxSYEWH38NbX6ENV18RbKVOhfRYCX3yERnuHBOrgH9hYdY8rCtsLQmuVgF6cmvCJiV2w==}
     peerDependencies:
@@ -3605,6 +3699,10 @@ packages:
   buffer-from@1.1.2:
     resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
 
+  buffer-image-size@0.6.4:
+    resolution: {integrity: sha512-nEh+kZOPY1w+gcCMobZ6ETUp9WfibndnosbpwB1iJk/8Gt5ZF2bhS6+B6bPYz424KtwsR6Rflc3tCz1/ghX2dQ==}
+    engines: {node: '>=4.0'}
+
   buildcheck@0.0.7:
     resolution: {integrity: sha512-lHblz4ahamxpTmnsk+MNTRWsjYKv965MwOrSJyeD588rR3Jcu7swE+0wN5F+PbL5cjgu/9ObkhfzEPuofEMwLA==}
     engines: {node: '>=10.0.0'}
@@ -3887,8 +3985,8 @@ packages:
     peerDependencies:
       cytoscape: ^3.2.0
 
-  cytoscape@3.33.3:
-    resolution: {integrity: sha512-Gej7U+OKR+LZ8kvX7rb2HhCYJ0IhvEFsnkud4SB1PR+BUY/TsSO0dmOW59WEVLu51b1Rm+gQRKoz4bLYxGSZ2g==}
+  cytoscape@3.34.2:
+    resolution: {integrity: sha512-Cm2jaj1X/PBNlzV9yH8zcfGOxO7U+CJ/+mxSBVPSchLaugdp4jtlGx5qaHtPRZ6tgiZ5P+o1XoRfJA+ba6KM3g==}
     engines: {node: '>=0.10'}
 
   d3-array@2.12.1:
@@ -4033,8 +4131,8 @@ packages:
   dagre-d3-es@7.0.14:
     resolution: {integrity: sha512-P4rFMVq9ESWqmOgK+dlXvOtLwYg0i7u0HBGJER0LZDJT2VHIPAMZ/riPxqJceWMStH5+E61QxFra9kIS3AqdMg==}
 
-  dayjs@1.11.20:
-    resolution: {integrity: sha512-YbwwqR/uYpeoP4pu043q+LTDLFBLApUP6VxRihdfNTqu4ubqMlGDLd6ErXhEgsyvY0K6nCs7nggYumAN+9uEuQ==}
+  dayjs@1.11.23:
+    resolution: {integrity: sha512-QDTCU0M0MxR3hQfnlDJfwekQiaanm1ubOD231u73WBckQ/fsamwRLiE2GBz6D3a/xF1NgfiDLJjXBa1hYOYTtQ==}
 
   debug@4.4.3:
     resolution: {integrity: sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==}
@@ -4205,8 +4303,8 @@ packages:
     resolution: {integrity: sha512-bO3y10YikuUwUuDUQRM4KfwNkKhnpVO7IPdbsrejwN9/AABJzzTQ4GeHwyzNSrVO+tEH3/Np255a3sVZpZDjvg==}
     engines: {node: '>=8.0.0'}
 
-  electron@43.1.0:
-    resolution: {integrity: sha512-DPfxpQLd4NL3BJ8DBxYAfmLUKKesF5Rx9dQx5FyczAP8bhOPScjHE48GArVeXu68LlAainuwkmQTQvdZwpIIAQ==}
+  electron@43.4.1:
+    resolution: {integrity: sha512-5b+EuiwkgG5iRcsEL34rimgRpkYp15SsfZOa0pC5kXs0Tb82TH4n95rpQzTZa7yRCbA7tm0WoEbuBL6NaAhAcA==}
     engines: {node: '>= 22.12.0'}
     hasBin: true
 
@@ -4406,6 +4504,9 @@ packages:
   fast-wrap-ansi@0.2.2:
     resolution: {integrity: sha512-7F2Fl+TjRSenLqlU3UjSH0iyqopqoZIu7eZVpEirP2g1GtWa2G/ecEmBdgz31+Mxr+ELclgg6sokpSFIQiZ02Q==}
 
+  fastdom@1.0.12:
+    resolution: {integrity: sha512-LB+xjSTEbjHE1cWsxu+tN2Xqr1kpi+V9aADI7sVM5ZMaXyYGPHULQMzpJMYqOTULK/73pUkWVzzObFRBkPr+hg==}
+
   fastq@1.20.1:
     resolution: {integrity: sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==}
 
@@ -4583,8 +4684,8 @@ packages:
   hachure-fill@0.5.2:
     resolution: {integrity: sha512-3GKBOn+m2LX9iq+JC1064cSFprJY4jL1jCXTcpnfER5HYE2l/4EfWSGzkPa/ZDBmYI0ZOEj5VHV/eKnPGkHuOg==}
 
-  happy-dom@20.9.0:
-    resolution: {integrity: sha512-GZZ9mKe8r646NUAf/zemnGbjYh4Bt8/MqASJY+pSm5ZDtc3YQox+4gsLI7yi1hba6o+eCsGxpHn5+iEVn31/FQ==}
+  happy-dom@20.11.8:
+    resolution: {integrity: sha512-TeAoM8pTDKNVcP5z3MptRTb7UH9q126GrjTFOgormgA19tmT30JTiIxb1CVXs7xljpItypUp/yHSPFD4QRHMsQ==}
     engines: {node: '>=20.0.0'}
 
   has-flag@4.0.0:
@@ -4964,6 +5065,10 @@ packages:
     resolution: {integrity: sha512-pQpZbdBu7wCTmQUh7ufPmLr0pFoObnGUoL/yhtwJDgmmQpbkg/0HSVti25Fu4rmd1oCR6NGWe9vqTWuWv3GcNA==}
     hasBin: true
 
+  katex@0.16.47:
+    resolution: {integrity: sha512-Eeo8Ys1doU1z+x8AZsPpQu+p/QcZBI5PeOo7QGQdy2x2m0MU/hYagBbGOmXwr5KVbEfVuWv9LpnQWeehogurjg==}
+    hasBin: true
+
   keyv@4.5.4:
     resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==}
 
@@ -5233,8 +5338,8 @@ packages:
     resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
     engines: {node: '>= 8'}
 
-  mermaid@11.16.1:
-    resolution: {integrity: sha512-TQsq6u22fAn3rek5VOubrhKPo1g5hwC3FXUN9hiyupTckcYiGuuKGkNQrKYwGJkXUxZdojwRG46gsSCFZMDp4g==}
+  mermaid@11.17.2:
+    resolution: {integrity: sha512-V6K3C8EBdEsPFZXSKMJe6ppQOENxuHARr9GvHX4hh47lAbhMRD9qf4oEK7LoaRQxULMa80/qt5gHO73aCleBBg==}
 
   micromark-core-commonmark@2.0.3:
     resolution: {integrity: sha512-RDBrHEMSxVFLg6xvnXmb1Ayr2WzLAWjeSATAoxwKYJV94TeNavgoIdA0a9ytzDSVzBy2YKFK+emCPOEibLeCrg==}
@@ -5544,8 +5649,8 @@ packages:
     resolution: {integrity: sha512-uFkGGr1KMWd6aWv9UAqooYrN78trw8MWWmoPvgWokfBEUq1+eiIQ+qfj3wokhy0fxtZWZk+0dHoS7/yRTJtd6w==}
     engines: {node: ^20.19.0 || >=22.12.0}
 
-  oxfmt@0.52.0:
-    resolution: {integrity: sha512-nJlYM35F64zTDMecCNhoHNkf+D/eHv7xcjj9XDSj+bFAVtN93m7v8DQMdHd6nDG6Akf/kEYYHmDUBs2Dz27Sug==}
+  oxfmt@0.65.0:
+    resolution: {integrity: sha512-SgS5VgnP42T0zl3zWD+xoH8FCqg1SAFnSRoOT/qeoa6gxcYIqrDMOmcXIg/EWSN92Du4ogB4riuKhKd6Y4CGhw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
     peerDependencies:
@@ -5565,8 +5670,8 @@ packages:
     resolution: {integrity: sha512-KjK/XLcXr1DSyonKhsuFqJRiuKqcyG9j3LJ8nkOsrLzGvodBPqzHOKauy10asLMDI0sUpvb+1sxlzff3udZvfg==}
     hasBin: true
 
-  oxlint@1.77.0:
-    resolution: {integrity: sha512-qnGh8XJHaQ0dprrDXNQZgS0FgjI6v+V3+X8DwmaV++5Aamy6jGKfDdQ1TUvhUxtmKFAbEf4/WeO5QZX+5WSngg==}
+  oxlint@1.80.0:
+    resolution: {integrity: sha512-5nTiSps4qdbCWLbxzuO00alHkEO2exR9YMN/ig6QXWrLsYSG0KaObOAM+l6oU2LcKPWoSAGYbkZIGEu1ViiWKA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
     peerDependencies:
@@ -5662,8 +5767,8 @@ packages:
   pathe@2.0.3:
     resolution: {integrity: sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==}
 
-  pdfjs-dist@6.2.108:
-    resolution: {integrity: sha512-YxFb+SQcodN2rnX9Tn3dHYlqfb7NjlzzfONPpJd+AKoKtUjEdevTfbC07d5TcczzOK6261auRkP/M8OBHs9vFQ==}
+  pdfjs-dist@6.3.289:
+    resolution: {integrity: sha512-ZHjSVpDa3D6izMq8/04lvkhkATUmL9px6ChPaXc1k6nU2Mrhlg1/7F0bdUqCwUjw3NsPTfPZsMDUU6ZIcRaeQw==}
     engines: {node: '>=22.13.0 || >=24'}
 
   pe-library@0.4.1:
@@ -5879,10 +5984,10 @@ packages:
       react: '>=16.8.0'
       react-dom: '>=16.8.0'
 
-  react-dom@19.2.7:
-    resolution: {integrity: sha512-t0BRVXvbiE/o20Hfw669rLbMCDWtYZLvmJigy2f0MxsXF+71pxhR3xOkspmsO8h3ZlNzyibAmtCa3l4lYKk6gQ==}
+  react-dom@19.2.8:
+    resolution: {integrity: sha512-rVprimfGBG3DR+Tq0IQG2DT5PxKth1WIGDmj5yPmlzr4YBe7uyE+Du4oVqTDXZSHGGGXRtTJEGSSePyQCMBglQ==}
     peerDependencies:
-      react: ^19.2.7
+      react: ^19.2.8
 
   react-grab@0.1.34:
     resolution: {integrity: sha512-jtdOdv0kb90oqL+pMszSh9DOLgVRaX4ZE6XN4GkDEpNNUqveQfZT014+EeJraljpqQfuWKW+96NrrRqUD93D2g==}
@@ -5952,8 +6057,8 @@ packages:
       '@types/react':
         optional: true
 
-  react@19.2.7:
-    resolution: {integrity: sha512-HNe9WslTbXmFK8o8cmwgAeJFSBvt1bPdHCVKtaaV+WlAN36mpT4hcRpwbf3fY56ar2oIXzsBpOAiIRHAdY0OlQ==}
+  react@19.2.8:
+    resolution: {integrity: sha512-PWaYA1L/q9u2u7xYQi+Y3L3Yfnie7XyLeaJICV1MGD6LprsBxcAqGjYyr0eY3p+QdsA+x/Irkt4Qif8D63+Sbw==}
     engines: {node: '>=0.10.0'}
 
   read-binary-file-arch@1.0.6:
@@ -6344,6 +6449,9 @@ packages:
   strict-event-emitter@0.5.1:
     resolution: {integrity: sha512-vMgjE/GGEPEFnhFub6pa4FmJBRBVOLpIII2hvCZ8Kzb7K0hlHo7mQv6xYrBvCL2LtAIBwFUK8wvuJgTVSQ5MFQ==}
 
+  strictdom@1.0.1:
+    resolution: {integrity: sha512-cEmp9QeXXRmjj/rVp9oyiqcvyocWab/HaoN4+bwFeZ7QzykJD6L3yD4v12K1x0tHpqRqVpJevN3gW7kyM39Bqg==}
+
   string-argv@0.3.2:
     resolution: {integrity: sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==}
     engines: {node: '>=0.6.19'}
@@ -6668,20 +6776,20 @@ packages:
   vfile@6.0.3:
     resolution: {integrity: sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==}
 
-  vitest@4.1.5:
-    resolution: {integrity: sha512-9Xx1v3/ih3m9hN+SbfkUyy0JAs72ap3r7joc87XL6jwF0jGg6mFBvQ1SrwaX+h8BlkX6Hz9shdd1uo6AF+ZGpg==}
+  vitest@4.1.11:
+    resolution: {integrity: sha512-fhACrNXUidIbGSBr5FlbuBkO7VWC1ZyLl0DO4CU2DrQoAPxX84Ysxs+HeGQpii5lZWV1Q4gBZTTu49mF+A6Edw==}
     engines: {node: ^20.0.0 || ^22.0.0 || >=24.0.0}
     hasBin: true
     peerDependencies:
       '@edge-runtime/vm': '*'
       '@opentelemetry/api': ^1.9.0
       '@types/node': ^20.0.0 || ^22.0.0 || >=24.0.0
-      '@vitest/browser-playwright': 4.1.5
-      '@vitest/browser-preview': 4.1.5
-      '@vitest/browser-webdriverio': 4.1.5
-      '@vitest/coverage-istanbul': 4.1.5
-      '@vitest/coverage-v8': 4.1.5
-      '@vitest/ui': 4.1.5
+      '@vitest/browser-playwright': 4.1.11
+      '@vitest/browser-preview': 4.1.11
+      '@vitest/browser-webdriverio': 4.1.11
+      '@vitest/coverage-istanbul': 4.1.11
+      '@vitest/coverage-v8': 4.1.11
+      '@vitest/ui': 4.1.11
       happy-dom: '*'
       jsdom: '*'
       vite: ^6.0.0 || ^7.0.0 || ^8.0.0
@@ -6791,6 +6899,18 @@ packages:
       utf-8-validate:
         optional: true
 
+  ws@8.21.3:
+    resolution: {integrity: sha512-201TZ/kPWxoPr/OKWjquZR1SWKXcvxdH+e1xrx89b3YbmzLMFCLfnaG1HFIgWzJOEWZ7MvpK++odZufgYR50Rw==}
+    engines: {node: '>=10.0.0'}
+    peerDependencies:
+      bufferutil: ^4.0.1
+      utf-8-validate: '>=5.0.2'
+    peerDependenciesMeta:
+      bufferutil:
+        optional: true
+      utf-8-validate:
+        optional: true
+
   wsl-utils@0.3.1:
     resolution: {integrity: sha512-g/eziiSUNBSsdDJtCLB8bdYEUMj4jR7AGeUo96p/3dTafgjHhpF4RiCFPiRILwjQoDXx5MqkBr4fwWtR3Ky4Wg==}
     engines: {node: '>=20'}
@@ -6916,7 +7036,7 @@ snapshots:
       '@babel/types': 7.29.7
       '@jridgewell/remapping': 2.3.5
       convert-source-map: 2.0.0
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@7.2.0)
       gensync: 1.0.0-beta.2
       json5: 2.2.3
       semver: 6.3.1
@@ -7089,7 +7209,7 @@ snapshots:
       '@babel/parser': 7.29.7
       '@babel/template': 7.29.7
       '@babel/types': 7.29.7
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@7.2.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -7108,29 +7228,29 @@ snapshots:
 
   '@croct/json@2.1.0': {}
 
-  '@dnd-kit/accessibility@3.1.1(react@19.2.7)':
+  '@dnd-kit/accessibility@3.1.1(react@19.2.8)':
     dependencies:
-      react: 19.2.7
+      react: 19.2.8
       tslib: 2.8.1
 
-  '@dnd-kit/core@6.3.1(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@dnd-kit/core@6.3.1(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@dnd-kit/accessibility': 3.1.1(react@19.2.7)
-      '@dnd-kit/utilities': 3.2.2(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@dnd-kit/accessibility': 3.1.1(react@19.2.8)
+      '@dnd-kit/utilities': 3.2.2(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
       tslib: 2.8.1
 
-  '@dnd-kit/sortable@10.0.0(@dnd-kit/core@6.3.1(react-dom@19.2.7(react@19.2.7))(react@19.2.7))(react@19.2.7)':
+  '@dnd-kit/sortable@10.0.0(@dnd-kit/core@6.3.1(react-dom@19.2.8(react@19.2.8))(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@dnd-kit/core': 6.3.1(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@dnd-kit/utilities': 3.2.2(react@19.2.7)
-      react: 19.2.7
+      '@dnd-kit/core': 6.3.1(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@dnd-kit/utilities': 3.2.2(react@19.2.8)
+      react: 19.2.8
       tslib: 2.8.1
 
-  '@dnd-kit/utilities@3.2.2(react@19.2.7)':
+  '@dnd-kit/utilities@3.2.2(react@19.2.8)':
     dependencies:
-      react: 19.2.7
+      react: 19.2.8
       tslib: 2.8.1
 
   '@dotenvx/dotenvx@1.66.0':
@@ -7152,17 +7272,17 @@ snapshots:
 
   '@electron-internal/extract-zip@1.0.4': {}
 
-  '@electron-toolkit/preload@3.0.2(electron@43.1.0)':
+  '@electron-toolkit/preload@3.0.2(electron@43.4.1(supports-color@7.2.0))':
     dependencies:
-      electron: 43.1.0
+      electron: 43.4.1(supports-color@7.2.0)
 
   '@electron-toolkit/tsconfig@2.0.0(@types/node@25.9.5)':
     dependencies:
       '@types/node': 25.9.5
 
-  '@electron-toolkit/utils@4.0.0(electron@43.1.0)':
+  '@electron-toolkit/utils@4.0.0(electron@43.4.1(supports-color@7.2.0))':
     dependencies:
-      electron: 43.1.0
+      electron: 43.4.1(supports-color@7.2.0)
 
   '@electron/asar@3.4.1':
     dependencies:
@@ -7176,45 +7296,45 @@ snapshots:
       fs-extra: 9.1.0
       minimist: 1.2.8
 
-  '@electron/get@3.1.0':
+  '@electron/get@3.1.0(supports-color@7.2.0)':
     dependencies:
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@7.2.0)
       env-paths: 2.2.1
       fs-extra: 8.1.0
       got: 11.8.6
       progress: 2.0.3
       semver: 6.3.1
-      sumchecker: 3.0.1
+      sumchecker: 3.0.1(supports-color@7.2.0)
     optionalDependencies:
       global-agent: 3.0.0
     transitivePeerDependencies:
       - supports-color
 
-  '@electron/get@5.0.0':
+  '@electron/get@5.0.0(supports-color@7.2.0)':
     dependencies:
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@7.2.0)
       env-paths: 3.0.0
       graceful-fs: 4.2.11
       progress: 2.0.3
       semver: 7.8.1
-      sumchecker: 3.0.1
+      sumchecker: 3.0.1(supports-color@7.2.0)
     optionalDependencies:
       undici: 7.29.0
     transitivePeerDependencies:
       - supports-color
 
-  '@electron/notarize@2.5.0':
+  '@electron/notarize@2.5.0(supports-color@7.2.0)':
     dependencies:
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@7.2.0)
       fs-extra: 9.1.0
       promise-retry: 2.0.1
     transitivePeerDependencies:
       - supports-color
 
-  '@electron/osx-sign@1.3.3':
+  '@electron/osx-sign@1.3.3(supports-color@7.2.0)':
     dependencies:
       compare-version: 0.1.2
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@7.2.0)
       fs-extra: 10.1.0
       isbinaryfile: 4.0.10
       minimist: 1.2.8
@@ -7222,22 +7342,22 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@electron/rebuild@4.2.0':
+  '@electron/rebuild@4.2.0(supports-color@7.2.0)':
     dependencies:
       '@malept/cross-spawn-promise': 2.0.0
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@7.2.0)
       node-abi: 4.33.0
       node-api-version: 0.2.1
       node-gyp: 12.3.0
-      read-binary-file-arch: 1.0.6
+      read-binary-file-arch: 1.0.6(supports-color@7.2.0)
     transitivePeerDependencies:
       - supports-color
 
-  '@electron/universal@2.0.3':
+  '@electron/universal@2.0.3(supports-color@7.2.0)':
     dependencies:
       '@electron/asar': 3.4.1
       '@malept/cross-spawn-promise': 2.0.0
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@7.2.0)
       dir-compare: 4.2.0
       fs-extra: 11.3.6
       minimatch: 9.0.9
@@ -7248,7 +7368,7 @@ snapshots:
   '@electron/windows-sign@1.2.2':
     dependencies:
       cross-dirname: 0.1.0
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@7.2.0)
       fs-extra: 11.3.6
       minimist: 1.2.8
       postject: 1.0.0-alpha.6
@@ -7359,11 +7479,11 @@ snapshots:
       '@floating-ui/core': 1.7.5
       '@floating-ui/utils': 0.2.11
 
-  '@floating-ui/react-dom@2.1.8(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@floating-ui/react-dom@2.1.8(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@floating-ui/dom': 1.7.6
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
 
   '@floating-ui/utils@0.2.11': {}
 
@@ -7535,16 +7655,16 @@ snapshots:
     dependencies:
       cross-spawn: 7.0.6
 
-  '@malept/flatpak-bundler@0.4.0':
+  '@malept/flatpak-bundler@0.4.0(supports-color@7.2.0)':
     dependencies:
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@7.2.0)
       fs-extra: 9.1.0
       lodash: 4.18.1
       tmp-promise: 3.0.3
     transitivePeerDependencies:
       - supports-color
 
-  '@mermaid-js/parser@1.2.0':
+  '@mermaid-js/parser@1.2.1':
     dependencies:
       '@chevrotain/types': 11.1.2
 
@@ -7574,12 +7694,12 @@ snapshots:
     dependencies:
       state-local: 1.0.7
 
-  '@monaco-editor/react@4.7.0(monaco-editor@0.55.1)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@monaco-editor/react@4.7.0(monaco-editor@0.55.1)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@monaco-editor/loader': 1.7.0
       monaco-editor: 0.55.1
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
 
   '@mswjs/interceptors@0.41.9':
     dependencies:
@@ -7758,61 +7878,61 @@ snapshots:
 
   '@oxc-project/types@0.141.0': {}
 
-  '@oxfmt/binding-android-arm-eabi@0.52.0':
+  '@oxfmt/binding-android-arm-eabi@0.65.0':
     optional: true
 
-  '@oxfmt/binding-android-arm64@0.52.0':
+  '@oxfmt/binding-android-arm64@0.65.0':
     optional: true
 
-  '@oxfmt/binding-darwin-arm64@0.52.0':
+  '@oxfmt/binding-darwin-arm64@0.65.0':
     optional: true
 
-  '@oxfmt/binding-darwin-x64@0.52.0':
+  '@oxfmt/binding-darwin-x64@0.65.0':
     optional: true
 
-  '@oxfmt/binding-freebsd-x64@0.52.0':
+  '@oxfmt/binding-freebsd-x64@0.65.0':
     optional: true
 
-  '@oxfmt/binding-linux-arm-gnueabihf@0.52.0':
+  '@oxfmt/binding-linux-arm-gnueabihf@0.65.0':
     optional: true
 
-  '@oxfmt/binding-linux-arm-musleabihf@0.52.0':
+  '@oxfmt/binding-linux-arm-musleabihf@0.65.0':
     optional: true
 
-  '@oxfmt/binding-linux-arm64-gnu@0.52.0':
+  '@oxfmt/binding-linux-arm64-gnu@0.65.0':
     optional: true
 
-  '@oxfmt/binding-linux-arm64-musl@0.52.0':
+  '@oxfmt/binding-linux-arm64-musl@0.65.0':
     optional: true
 
-  '@oxfmt/binding-linux-ppc64-gnu@0.52.0':
+  '@oxfmt/binding-linux-ppc64-gnu@0.65.0':
     optional: true
 
-  '@oxfmt/binding-linux-riscv64-gnu@0.52.0':
+  '@oxfmt/binding-linux-riscv64-gnu@0.65.0':
     optional: true
 
-  '@oxfmt/binding-linux-riscv64-musl@0.52.0':
+  '@oxfmt/binding-linux-riscv64-musl@0.65.0':
     optional: true
 
-  '@oxfmt/binding-linux-s390x-gnu@0.52.0':
+  '@oxfmt/binding-linux-s390x-gnu@0.65.0':
     optional: true
 
-  '@oxfmt/binding-linux-x64-gnu@0.52.0':
+  '@oxfmt/binding-linux-x64-gnu@0.65.0':
     optional: true
 
-  '@oxfmt/binding-linux-x64-musl@0.52.0':
+  '@oxfmt/binding-linux-x64-musl@0.65.0':
     optional: true
 
-  '@oxfmt/binding-openharmony-arm64@0.52.0':
+  '@oxfmt/binding-openharmony-arm64@0.65.0':
     optional: true
 
-  '@oxfmt/binding-win32-arm64-msvc@0.52.0':
+  '@oxfmt/binding-win32-arm64-msvc@0.65.0':
     optional: true
 
-  '@oxfmt/binding-win32-ia32-msvc@0.52.0':
+  '@oxfmt/binding-win32-ia32-msvc@0.65.0':
     optional: true
 
-  '@oxfmt/binding-win32-x64-msvc@0.52.0':
+  '@oxfmt/binding-win32-x64-msvc@0.65.0':
     optional: true
 
   '@oxlint-tsgolint/darwin-arm64@7.0.2001':
@@ -7833,61 +7953,61 @@ snapshots:
   '@oxlint-tsgolint/win32-x64@7.0.2001':
     optional: true
 
-  '@oxlint/binding-android-arm-eabi@1.77.0':
+  '@oxlint/binding-android-arm-eabi@1.80.0':
     optional: true
 
-  '@oxlint/binding-android-arm64@1.77.0':
+  '@oxlint/binding-android-arm64@1.80.0':
     optional: true
 
-  '@oxlint/binding-darwin-arm64@1.77.0':
+  '@oxlint/binding-darwin-arm64@1.80.0':
     optional: true
 
-  '@oxlint/binding-darwin-x64@1.77.0':
+  '@oxlint/binding-darwin-x64@1.80.0':
     optional: true
 
-  '@oxlint/binding-freebsd-x64@1.77.0':
+  '@oxlint/binding-freebsd-x64@1.80.0':
     optional: true
 
-  '@oxlint/binding-linux-arm-gnueabihf@1.77.0':
+  '@oxlint/binding-linux-arm-gnueabihf@1.80.0':
     optional: true
 
-  '@oxlint/binding-linux-arm-musleabihf@1.77.0':
+  '@oxlint/binding-linux-arm-musleabihf@1.80.0':
     optional: true
 
-  '@oxlint/binding-linux-arm64-gnu@1.77.0':
+  '@oxlint/binding-linux-arm64-gnu@1.80.0':
     optional: true
 
-  '@oxlint/binding-linux-arm64-musl@1.77.0':
+  '@oxlint/binding-linux-arm64-musl@1.80.0':
     optional: true
 
-  '@oxlint/binding-linux-ppc64-gnu@1.77.0':
+  '@oxlint/binding-linux-ppc64-gnu@1.80.0':
     optional: true
 
-  '@oxlint/binding-linux-riscv64-gnu@1.77.0':
+  '@oxlint/binding-linux-riscv64-gnu@1.80.0':
     optional: true
 
-  '@oxlint/binding-linux-riscv64-musl@1.77.0':
+  '@oxlint/binding-linux-riscv64-musl@1.80.0':
     optional: true
 
-  '@oxlint/binding-linux-s390x-gnu@1.77.0':
+  '@oxlint/binding-linux-s390x-gnu@1.80.0':
     optional: true
 
-  '@oxlint/binding-linux-x64-gnu@1.77.0':
+  '@oxlint/binding-linux-x64-gnu@1.80.0':
     optional: true
 
-  '@oxlint/binding-linux-x64-musl@1.77.0':
+  '@oxlint/binding-linux-x64-musl@1.80.0':
     optional: true
 
-  '@oxlint/binding-openharmony-arm64@1.77.0':
+  '@oxlint/binding-openharmony-arm64@1.80.0':
     optional: true
 
-  '@oxlint/binding-win32-arm64-msvc@1.77.0':
+  '@oxlint/binding-win32-arm64-msvc@1.80.0':
     optional: true
 
-  '@oxlint/binding-win32-ia32-msvc@1.77.0':
+  '@oxlint/binding-win32-ia32-msvc@1.80.0':
     optional: true
 
-  '@oxlint/binding-win32-x64-msvc@1.77.0':
+  '@oxlint/binding-win32-x64-msvc@1.80.0':
     optional: true
 
   '@parcel/watcher-android-arm64@2.5.6':
@@ -7986,742 +8106,742 @@ snapshots:
 
   '@radix-ui/primitive@1.1.5': {}
 
-  '@radix-ui/react-accessible-icon@1.1.11(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@radix-ui/react-accessible-icon@1.1.11(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-visually-hidden': 1.2.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@radix-ui/react-visually-hidden': 1.2.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
 
-  '@radix-ui/react-accordion@1.2.16(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@radix-ui/react-accordion@1.2.16(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/primitive': 1.1.5
-      '@radix-ui/react-collapsible': 1.1.16(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-collection': 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-direction': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-id': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@radix-ui/react-collapsible': 1.1.16(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-collection': 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-direction': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-id': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
 
-  '@radix-ui/react-alert-dialog@1.1.19(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@radix-ui/react-alert-dialog@1.1.19(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/primitive': 1.1.5
-      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-dialog': 1.1.19(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-dialog': 1.1.19(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
 
-  '@radix-ui/react-arrow@1.1.11(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@radix-ui/react-arrow@1.1.11(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
 
-  '@radix-ui/react-aspect-ratio@1.1.11(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@radix-ui/react-aspect-ratio@1.1.11(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
 
-  '@radix-ui/react-avatar@1.2.2(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@radix-ui/react-avatar@1.2.2(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-use-callback-ref': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-is-hydrated': 0.1.1(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-callback-ref': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-is-hydrated': 0.1.1(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
 
-  '@radix-ui/react-checkbox@1.3.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@radix-ui/react-checkbox@1.3.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/primitive': 1.1.5
-      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-presence': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-previous': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-size': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-presence': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-previous': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-size': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
 
-  '@radix-ui/react-collapsible@1.1.16(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@radix-ui/react-collapsible@1.1.16(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/primitive': 1.1.5
-      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-id': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-presence': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-id': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-presence': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
 
-  '@radix-ui/react-collection@1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@radix-ui/react-collection@1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-slot': 1.3.0(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-slot': 1.3.0(@types/react@19.2.17)(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
 
-  '@radix-ui/react-compose-refs@1.1.3(@types/react@19.2.17)(react@19.2.7)':
+  '@radix-ui/react-compose-refs@1.1.3(@types/react@19.2.17)(react@19.2.8)':
     dependencies:
-      react: 19.2.7
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.17
 
-  '@radix-ui/react-context-menu@2.3.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@radix-ui/react-context-menu@2.3.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/primitive': 1.1.5
-      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-menu': 2.1.20(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-menu': 2.1.20(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
 
-  '@radix-ui/react-context@1.2.0(@types/react@19.2.17)(react@19.2.7)':
+  '@radix-ui/react-context@1.2.0(@types/react@19.2.17)(react@19.2.8)':
     dependencies:
-      react: 19.2.7
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.17
 
-  '@radix-ui/react-dialog@1.1.19(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@radix-ui/react-dialog@1.1.19(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/primitive': 1.1.5
-      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-dismissable-layer': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-focus-guards': 1.1.4(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-focus-scope': 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-id': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-portal': 1.1.13(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-presence': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-slot': 1.3.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.7)
+      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-dismissable-layer': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-focus-guards': 1.1.4(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-focus-scope': 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-id': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-portal': 1.1.13(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-presence': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-slot': 1.3.0(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.8)
       aria-hidden: 1.2.6
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
-      react-remove-scroll: 2.7.2(@types/react@19.2.17)(react@19.2.7)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
+      react-remove-scroll: 2.7.2(@types/react@19.2.17)(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
 
-  '@radix-ui/react-direction@1.1.2(@types/react@19.2.17)(react@19.2.7)':
+  '@radix-ui/react-direction@1.1.2(@types/react@19.2.17)(react@19.2.8)':
     dependencies:
-      react: 19.2.7
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.17
 
-  '@radix-ui/react-dismissable-layer@1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@radix-ui/react-dismissable-layer@1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/primitive': 1.1.5
-      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-use-callback-ref': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-effect-event': 0.0.3(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-callback-ref': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-effect-event': 0.0.3(@types/react@19.2.17)(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
 
-  '@radix-ui/react-dropdown-menu@2.1.20(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@radix-ui/react-dropdown-menu@2.1.20(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/primitive': 1.1.5
-      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-id': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-menu': 2.1.20(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-id': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-menu': 2.1.20(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
 
-  '@radix-ui/react-focus-guards@1.1.4(@types/react@19.2.17)(react@19.2.7)':
+  '@radix-ui/react-focus-guards@1.1.4(@types/react@19.2.17)(react@19.2.8)':
     dependencies:
-      react: 19.2.7
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.17
 
-  '@radix-ui/react-focus-scope@1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@radix-ui/react-focus-scope@1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-use-callback-ref': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-callback-ref': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
 
-  '@radix-ui/react-form@0.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@radix-ui/react-form@0.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/primitive': 1.1.5
-      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-id': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-label': 2.1.11(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-id': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-label': 2.1.11(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
 
-  '@radix-ui/react-hover-card@1.1.19(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@radix-ui/react-hover-card@1.1.19(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/primitive': 1.1.5
-      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-dismissable-layer': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-popper': 1.3.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-portal': 1.1.13(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-presence': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-dismissable-layer': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-popper': 1.3.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-portal': 1.1.13(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-presence': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
 
-  '@radix-ui/react-id@1.1.2(@types/react@19.2.17)(react@19.2.7)':
+  '@radix-ui/react-id@1.1.2(@types/react@19.2.17)(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
+      '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.17
 
-  '@radix-ui/react-label@2.1.11(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@radix-ui/react-label@2.1.11(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
 
-  '@radix-ui/react-menu@2.1.20(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@radix-ui/react-menu@2.1.20(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/primitive': 1.1.5
-      '@radix-ui/react-collection': 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-direction': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-dismissable-layer': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-focus-guards': 1.1.4(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-focus-scope': 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-id': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-popper': 1.3.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-portal': 1.1.13(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-presence': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-roving-focus': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-slot': 1.3.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-callback-ref': 1.1.2(@types/react@19.2.17)(react@19.2.7)
+      '@radix-ui/react-collection': 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-direction': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-dismissable-layer': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-focus-guards': 1.1.4(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-focus-scope': 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-id': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-popper': 1.3.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-portal': 1.1.13(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-presence': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-roving-focus': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-slot': 1.3.0(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-callback-ref': 1.1.2(@types/react@19.2.17)(react@19.2.8)
       aria-hidden: 1.2.6
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
-      react-remove-scroll: 2.7.2(@types/react@19.2.17)(react@19.2.7)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
+      react-remove-scroll: 2.7.2(@types/react@19.2.17)(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
 
-  '@radix-ui/react-menubar@1.1.20(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@radix-ui/react-menubar@1.1.20(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/primitive': 1.1.5
-      '@radix-ui/react-collection': 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-direction': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-id': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-menu': 2.1.20(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-roving-focus': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@radix-ui/react-collection': 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-direction': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-id': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-menu': 2.1.20(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-roving-focus': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
 
-  '@radix-ui/react-navigation-menu@1.2.18(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@radix-ui/react-navigation-menu@1.2.18(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/primitive': 1.1.5
-      '@radix-ui/react-collection': 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-direction': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-dismissable-layer': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-id': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-presence': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-use-callback-ref': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-previous': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-visually-hidden': 1.2.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@radix-ui/react-collection': 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-direction': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-dismissable-layer': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-id': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-presence': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-callback-ref': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-previous': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-visually-hidden': 1.2.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
 
-  '@radix-ui/react-one-time-password-field@0.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@radix-ui/react-one-time-password-field@0.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/number': 1.1.2
       '@radix-ui/primitive': 1.1.5
-      '@radix-ui/react-collection': 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-direction': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-roving-focus': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-effect-event': 0.0.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-is-hydrated': 0.1.1(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@radix-ui/react-collection': 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-direction': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-roving-focus': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-effect-event': 0.0.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-is-hydrated': 0.1.1(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
 
-  '@radix-ui/react-password-toggle-field@0.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@radix-ui/react-password-toggle-field@0.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/primitive': 1.1.5
-      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-id': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-effect-event': 0.0.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-is-hydrated': 0.1.1(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-id': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-effect-event': 0.0.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-is-hydrated': 0.1.1(@types/react@19.2.17)(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
 
-  '@radix-ui/react-popover@1.1.19(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@radix-ui/react-popover@1.1.19(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/primitive': 1.1.5
-      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-dismissable-layer': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-focus-guards': 1.1.4(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-focus-scope': 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-id': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-popper': 1.3.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-portal': 1.1.13(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-presence': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-slot': 1.3.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.7)
+      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-dismissable-layer': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-focus-guards': 1.1.4(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-focus-scope': 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-id': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-popper': 1.3.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-portal': 1.1.13(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-presence': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-slot': 1.3.0(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.8)
       aria-hidden: 1.2.6
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
-      react-remove-scroll: 2.7.2(@types/react@19.2.17)(react@19.2.7)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
+      react-remove-scroll: 2.7.2(@types/react@19.2.17)(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
 
-  '@radix-ui/react-popper@1.3.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@radix-ui/react-popper@1.3.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@floating-ui/react-dom': 2.1.8(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-arrow': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-use-callback-ref': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-rect': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-size': 1.1.2(@types/react@19.2.17)(react@19.2.7)
+      '@floating-ui/react-dom': 2.1.8(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-arrow': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-callback-ref': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-rect': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-size': 1.1.2(@types/react@19.2.17)(react@19.2.8)
       '@radix-ui/rect': 1.1.2
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
 
-  '@radix-ui/react-portal@1.1.13(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@radix-ui/react-portal@1.1.13(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
 
-  '@radix-ui/react-presence@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@radix-ui/react-presence@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
 
-  '@radix-ui/react-primitive@2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@radix-ui/react-primitive@2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-slot': 1.3.0(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@radix-ui/react-slot': 1.3.0(@types/react@19.2.17)(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
 
-  '@radix-ui/react-progress@1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@radix-ui/react-progress@1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
 
-  '@radix-ui/react-radio-group@1.4.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@radix-ui/react-radio-group@1.4.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/primitive': 1.1.5
-      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-direction': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-presence': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-roving-focus': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-previous': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-size': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-direction': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-presence': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-roving-focus': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-previous': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-size': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
 
-  '@radix-ui/react-roving-focus@1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@radix-ui/react-roving-focus@1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/primitive': 1.1.5
-      '@radix-ui/react-collection': 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-direction': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-id': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-use-callback-ref': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-is-hydrated': 0.1.1(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@radix-ui/react-collection': 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-direction': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-id': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-callback-ref': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-is-hydrated': 0.1.1(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
 
-  '@radix-ui/react-scroll-area@1.2.14(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@radix-ui/react-scroll-area@1.2.14(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/number': 1.1.2
       '@radix-ui/primitive': 1.1.5
-      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-direction': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-presence': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-use-callback-ref': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-direction': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-presence': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-callback-ref': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
 
-  '@radix-ui/react-select@2.3.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@radix-ui/react-select@2.3.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/number': 1.1.2
       '@radix-ui/primitive': 1.1.5
-      '@radix-ui/react-collection': 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-direction': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-dismissable-layer': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-focus-guards': 1.1.4(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-focus-scope': 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-id': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-popper': 1.3.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-portal': 1.1.13(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-presence': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-slot': 1.3.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-callback-ref': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-previous': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-visually-hidden': 1.2.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+      '@radix-ui/react-collection': 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-direction': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-dismissable-layer': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-focus-guards': 1.1.4(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-focus-scope': 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-id': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-popper': 1.3.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-portal': 1.1.13(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-presence': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-slot': 1.3.0(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-callback-ref': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-previous': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-visually-hidden': 1.2.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       aria-hidden: 1.2.6
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
-      react-remove-scroll: 2.7.2(@types/react@19.2.17)(react@19.2.7)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
+      react-remove-scroll: 2.7.2(@types/react@19.2.17)(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
 
-  '@radix-ui/react-separator@1.1.11(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@radix-ui/react-separator@1.1.11(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
 
-  '@radix-ui/react-slider@1.4.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@radix-ui/react-slider@1.4.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/number': 1.1.2
       '@radix-ui/primitive': 1.1.5
-      '@radix-ui/react-collection': 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-direction': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-previous': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-size': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@radix-ui/react-collection': 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-direction': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-previous': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-size': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
 
-  '@radix-ui/react-slot@1.3.0(@types/react@19.2.17)(react@19.2.7)':
+  '@radix-ui/react-slot@1.3.0(@types/react@19.2.17)(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
+      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.8)
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.17
 
-  '@radix-ui/react-switch@1.3.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@radix-ui/react-switch@1.3.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/primitive': 1.1.5
-      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-previous': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-size': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-previous': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-size': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
 
-  '@radix-ui/react-tabs@1.1.17(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@radix-ui/react-tabs@1.1.17(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/primitive': 1.1.5
-      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-direction': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-id': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-presence': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-roving-focus': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-direction': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-id': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-presence': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-roving-focus': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
 
-  '@radix-ui/react-toast@1.2.19(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@radix-ui/react-toast@1.2.19(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/primitive': 1.1.5
-      '@radix-ui/react-collection': 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-dismissable-layer': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-portal': 1.1.13(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-presence': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-use-callback-ref': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-visually-hidden': 1.2.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@radix-ui/react-collection': 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-dismissable-layer': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-portal': 1.1.13(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-presence': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-callback-ref': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-visually-hidden': 1.2.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
 
-  '@radix-ui/react-toggle-group@1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@radix-ui/react-toggle-group@1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/primitive': 1.1.5
-      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-direction': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-roving-focus': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-toggle': 1.1.14(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-direction': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-roving-focus': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-toggle': 1.1.14(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
 
-  '@radix-ui/react-toggle@1.1.14(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@radix-ui/react-toggle@1.1.14(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/primitive': 1.1.5
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
 
-  '@radix-ui/react-toolbar@1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@radix-ui/react-toolbar@1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/primitive': 1.1.5
-      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-direction': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-roving-focus': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-separator': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-toggle-group': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-direction': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-roving-focus': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-separator': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-toggle-group': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
 
-  '@radix-ui/react-tooltip@1.2.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@radix-ui/react-tooltip@1.2.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/primitive': 1.1.5
-      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-dismissable-layer': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-id': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-popper': 1.3.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-portal': 1.1.13(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-presence': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-slot': 1.3.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-visually-hidden': 1.2.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-dismissable-layer': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-id': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-popper': 1.3.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-portal': 1.1.13(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-presence': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-slot': 1.3.0(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-visually-hidden': 1.2.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
 
-  '@radix-ui/react-use-callback-ref@1.1.2(@types/react@19.2.17)(react@19.2.7)':
+  '@radix-ui/react-use-callback-ref@1.1.2(@types/react@19.2.17)(react@19.2.8)':
     dependencies:
-      react: 19.2.7
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.17
 
-  '@radix-ui/react-use-controllable-state@1.2.3(@types/react@19.2.17)(react@19.2.7)':
+  '@radix-ui/react-use-controllable-state@1.2.3(@types/react@19.2.17)(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-use-effect-event': 0.0.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
+      '@radix-ui/react-use-effect-event': 0.0.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.17
 
-  '@radix-ui/react-use-effect-event@0.0.3(@types/react@19.2.17)(react@19.2.7)':
+  '@radix-ui/react-use-effect-event@0.0.3(@types/react@19.2.17)(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
+      '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.17
 
-  '@radix-ui/react-use-escape-keydown@1.1.3(@types/react@19.2.17)(react@19.2.7)':
+  '@radix-ui/react-use-escape-keydown@1.1.3(@types/react@19.2.17)(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-use-callback-ref': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
+      '@radix-ui/react-use-callback-ref': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.17
 
-  '@radix-ui/react-use-is-hydrated@0.1.1(@types/react@19.2.17)(react@19.2.7)':
+  '@radix-ui/react-use-is-hydrated@0.1.1(@types/react@19.2.17)(react@19.2.8)':
     dependencies:
-      react: 19.2.7
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.17
 
-  '@radix-ui/react-use-layout-effect@1.1.2(@types/react@19.2.17)(react@19.2.7)':
+  '@radix-ui/react-use-layout-effect@1.1.2(@types/react@19.2.17)(react@19.2.8)':
     dependencies:
-      react: 19.2.7
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.17
 
-  '@radix-ui/react-use-previous@1.1.2(@types/react@19.2.17)(react@19.2.7)':
+  '@radix-ui/react-use-previous@1.1.2(@types/react@19.2.17)(react@19.2.8)':
     dependencies:
-      react: 19.2.7
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.17
 
-  '@radix-ui/react-use-rect@1.1.2(@types/react@19.2.17)(react@19.2.7)':
+  '@radix-ui/react-use-rect@1.1.2(@types/react@19.2.17)(react@19.2.8)':
     dependencies:
       '@radix-ui/rect': 1.1.2
-      react: 19.2.7
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.17
 
-  '@radix-ui/react-use-size@1.1.2(@types/react@19.2.17)(react@19.2.7)':
+  '@radix-ui/react-use-size@1.1.2(@types/react@19.2.17)(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
+      '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.17
 
-  '@radix-ui/react-visually-hidden@1.2.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@radix-ui/react-visually-hidden@1.2.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
@@ -8954,13 +9074,13 @@ snapshots:
       tailwindcss: 4.2.4
       vite: rolldown-vite@7.3.1(@emnapi/core@1.11.2)(@emnapi/runtime@1.11.2)(@types/node@25.9.5)(jiti@2.7.0)(yaml@2.8.4)
 
-  '@tanstack/react-virtual@3.13.24(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@tanstack/react-virtual@3.14.10(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@tanstack/virtual-core': 3.14.0
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@tanstack/virtual-core': 3.17.8
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
 
-  '@tanstack/virtual-core@3.14.0': {}
+  '@tanstack/virtual-core@3.17.8': {}
 
   '@testing-library/dom@10.4.1':
     dependencies:
@@ -8982,12 +9102,12 @@ snapshots:
       picocolors: 1.1.1
       redent: 3.0.0
 
-  '@testing-library/react@16.3.2(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@testing-library/react@16.3.2(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@babel/runtime': 7.29.7
       '@testing-library/dom': 10.4.1
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
@@ -9186,7 +9306,7 @@ snapshots:
       prosemirror-transform: 1.12.0
       prosemirror-view: 1.41.8
 
-  '@tiptap/react@3.22.5(@floating-ui/dom@1.7.6)(@tiptap/core@3.22.5(@tiptap/pm@3.22.5))(@tiptap/pm@3.22.5)(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@tiptap/react@3.22.5(@floating-ui/dom@1.7.6)(@tiptap/core@3.22.5(@tiptap/pm@3.22.5))(@tiptap/pm@3.22.5)(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@tiptap/core': 3.22.5(@tiptap/pm@3.22.5)
       '@tiptap/pm': 3.22.5
@@ -9194,9 +9314,9 @@ snapshots:
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
       '@types/use-sync-external-store': 0.0.6
       fast-equals: 5.4.0
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
-      use-sync-external-store: 1.6.0(react@19.2.7)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
+      use-sync-external-store: 1.6.0(react@19.2.8)
     optionalDependencies:
       '@tiptap/extension-bubble-menu': 3.22.5(@tiptap/core@3.22.5(@tiptap/pm@3.22.5))(@tiptap/pm@3.22.5)
       '@tiptap/extension-floating-menu': 3.22.5(@floating-ui/dom@1.7.6)(@tiptap/core@3.22.5(@tiptap/pm@3.22.5))(@tiptap/pm@3.22.5)
@@ -9575,49 +9695,49 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@vitest/expect@4.1.5':
+  '@vitest/expect@4.1.11':
     dependencies:
       '@standard-schema/spec': 1.1.0
       '@types/chai': 5.2.3
-      '@vitest/spy': 4.1.5
-      '@vitest/utils': 4.1.5
+      '@vitest/spy': 4.1.11
+      '@vitest/utils': 4.1.11
       chai: 6.2.2
       tinyrainbow: 3.1.0
 
-  '@vitest/mocker@4.1.5(msw@2.14.3(@types/node@25.9.5)(typescript@7.0.2))(rolldown-vite@7.3.1(@emnapi/core@1.11.2)(@emnapi/runtime@1.11.2)(@types/node@25.9.5)(jiti@2.7.0)(yaml@2.8.4))':
+  '@vitest/mocker@4.1.11(msw@2.14.3(@types/node@25.9.5)(typescript@7.0.2))(rolldown-vite@7.3.1(@emnapi/core@1.11.2)(@emnapi/runtime@1.11.2)(@types/node@25.9.5)(jiti@2.7.0)(yaml@2.8.4))':
     dependencies:
-      '@vitest/spy': 4.1.5
+      '@vitest/spy': 4.1.11
       estree-walker: 3.0.3
       magic-string: 0.30.21
     optionalDependencies:
       msw: 2.14.3(@types/node@25.9.5)(typescript@7.0.2)
       vite: rolldown-vite@7.3.1(@emnapi/core@1.11.2)(@emnapi/runtime@1.11.2)(@types/node@25.9.5)(jiti@2.7.0)(yaml@2.8.4)
 
-  '@vitest/pretty-format@4.1.5':
+  '@vitest/pretty-format@4.1.11':
     dependencies:
       tinyrainbow: 3.1.0
 
-  '@vitest/runner@4.1.5':
+  '@vitest/runner@4.1.11':
     dependencies:
-      '@vitest/utils': 4.1.5
+      '@vitest/utils': 4.1.11
       pathe: 2.0.3
 
-  '@vitest/snapshot@4.1.5':
+  '@vitest/snapshot@4.1.11':
     dependencies:
-      '@vitest/pretty-format': 4.1.5
-      '@vitest/utils': 4.1.5
+      '@vitest/pretty-format': 4.1.11
+      '@vitest/utils': 4.1.11
       magic-string: 0.30.21
       pathe: 2.0.3
 
-  '@vitest/spy@4.1.5': {}
+  '@vitest/spy@4.1.11': {}
 
-  '@vitest/utils@4.1.5':
+  '@vitest/utils@4.1.11':
     dependencies:
-      '@vitest/pretty-format': 4.1.5
+      '@vitest/pretty-format': 4.1.11
       convert-source-map: 2.0.0
       tinyrainbow: 3.1.0
 
-  '@vscode/windows-process-tree@0.8.0(patch_hash=946ffb2b1026bcb554d9920681fb00f546c28fc5de6d95a877d198b49bf73988)':
+  '@vscode/windows-process-tree@0.8.0(patch_hash=9217ef36c01ed74127fef5512b0c92089cdbf820fd6c109dd671137eebdc7585)':
     dependencies:
       node-addon-api: 7.1.0
     optional: true
@@ -9650,7 +9770,7 @@ snapshots:
     dependencies:
       '@xterm/xterm': 6.1.0-beta.287(patch_hash=46796c152f3b73e28238f44499eaf5a867a863809bc7b470b159526a41e354f7)
 
-  '@xterm/addon-webgl@0.20.0-beta.286(patch_hash=118f649459ba56a51627d46603e2d5d81d837ac9c4dc393f5cc20263d0ac1b91)(@xterm/xterm@6.1.0-beta.287(patch_hash=46796c152f3b73e28238f44499eaf5a867a863809bc7b470b159526a41e354f7))':
+  '@xterm/addon-webgl@0.20.0-beta.286(patch_hash=2c301a06ad9caa635d746147dcb2b1c69aa026904f65e1183564f08a0e601b91)(@xterm/xterm@6.1.0-beta.287(patch_hash=46796c152f3b73e28238f44499eaf5a867a863809bc7b470b159526a41e354f7))':
     dependencies:
       '@xterm/xterm': 6.1.0-beta.287(patch_hash=46796c152f3b73e28238f44499eaf5a867a863809bc7b470b159526a41e354f7)
 
@@ -9698,33 +9818,33 @@ snapshots:
 
   ansi-styles@6.2.3: {}
 
-  app-builder-lib@26.15.3(dmg-builder@26.15.3)(electron-builder-squirrel-windows@26.15.3):
+  app-builder-lib@26.15.3(dmg-builder@26.15.3)(electron-builder-squirrel-windows@26.15.3)(supports-color@7.2.0):
     dependencies:
       '@electron/asar': 3.4.1
       '@electron/fuses': 1.8.0
-      '@electron/get': 3.1.0
-      '@electron/notarize': 2.5.0
-      '@electron/osx-sign': 1.3.3
-      '@electron/rebuild': 4.2.0
-      '@electron/universal': 2.0.3
-      '@malept/flatpak-bundler': 0.4.0
+      '@electron/get': 3.1.0(supports-color@7.2.0)
+      '@electron/notarize': 2.5.0(supports-color@7.2.0)
+      '@electron/osx-sign': 1.3.3(supports-color@7.2.0)
+      '@electron/rebuild': 4.2.0(supports-color@7.2.0)
+      '@electron/universal': 2.0.3(supports-color@7.2.0)
+      '@malept/flatpak-bundler': 0.4.0(supports-color@7.2.0)
       '@noble/hashes': 2.2.0
       '@peculiar/webcrypto': 1.7.1
       '@types/fs-extra': 9.0.13
       ajv: 8.20.0
       asn1js: 3.0.10
       async-exit-hook: 2.0.1
-      builder-util: 26.15.3
-      builder-util-runtime: 9.7.0
+      builder-util: 26.15.3(supports-color@7.2.0)
+      builder-util-runtime: 9.7.0(supports-color@7.2.0)
       chromium-pickle-js: 0.2.0
       ci-info: 4.3.1
-      debug: 4.4.3
-      dmg-builder: 26.15.3(electron-builder-squirrel-windows@26.15.3)
+      debug: 4.4.3(supports-color@7.2.0)
+      dmg-builder: 26.15.3(electron-builder-squirrel-windows@26.15.3)(supports-color@7.2.0)
       dotenv: 16.6.1
       dotenv-expand: 11.0.7
       ejs: 3.1.10
       electron-builder-squirrel-windows: 26.15.3(dmg-builder@26.15.3)
-      electron-publish: 26.15.3
+      electron-publish: 26.15.3(supports-color@7.2.0)
       fs-extra: 10.1.0
       hosted-git-info: 4.1.0
       isbinaryfile: 5.0.7
@@ -9796,9 +9916,9 @@ snapshots:
     dependencies:
       tweetnacl: 0.14.5
 
-  bippy@0.5.40(react@19.2.7):
+  bippy@0.5.40(react@19.2.8):
     dependencies:
-      react: 19.2.7
+      react: 19.2.8
 
   bluebird@3.7.2: {}
 
@@ -9806,7 +9926,7 @@ snapshots:
     dependencies:
       bytes: 3.1.2
       content-type: 2.0.0
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@7.2.0)
       http-errors: 2.0.1
       iconv-lite: 0.7.2
       on-finished: 2.4.1
@@ -9846,26 +9966,30 @@ snapshots:
 
   buffer-from@1.1.2: {}
 
+  buffer-image-size@0.6.4:
+    dependencies:
+      '@types/node': 25.9.5
+
   buildcheck@0.0.7:
     optional: true
 
-  builder-util-runtime@9.7.0:
+  builder-util-runtime@9.7.0(supports-color@7.2.0):
     dependencies:
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@7.2.0)
       sax: 1.6.0
     transitivePeerDependencies:
       - supports-color
 
-  builder-util@26.15.3:
+  builder-util@26.15.3(supports-color@7.2.0):
     dependencies:
       '@types/debug': 4.1.13
-      builder-util-runtime: 9.7.0
+      builder-util-runtime: 9.7.0(supports-color@7.2.0)
       chalk: 4.1.2
       cross-spawn: 7.0.6
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@7.2.0)
       fs-extra: 10.1.0
-      http-proxy-agent: 7.0.2
-      https-proxy-agent: 7.0.6
+      http-proxy-agent: 7.0.2(supports-color@7.2.0)
+      https-proxy-agent: 7.0.6(supports-color@7.2.0)
       js-yaml: 4.3.1
       sanitize-filename: 1.6.4
       source-map-support: 0.5.21
@@ -9983,14 +10107,14 @@ snapshots:
 
   clsx@2.1.1: {}
 
-  cmdk@1.1.1(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7):
+  cmdk@1.1.1(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8):
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-dialog': 1.1.19(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-id': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-dialog': 1.1.19(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-id': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     transitivePeerDependencies:
       - '@types/react'
       - '@types/react-dom'
@@ -10090,17 +10214,17 @@ snapshots:
 
   csstype@3.2.3: {}
 
-  cytoscape-cose-bilkent@4.1.0(cytoscape@3.33.3):
+  cytoscape-cose-bilkent@4.1.0(cytoscape@3.34.2):
     dependencies:
       cose-base: 1.0.3
-      cytoscape: 3.33.3
+      cytoscape: 3.34.2
 
-  cytoscape-fcose@2.2.0(cytoscape@3.33.3):
+  cytoscape-fcose@2.2.0(cytoscape@3.34.2):
     dependencies:
       cose-base: 2.2.0
-      cytoscape: 3.33.3
+      cytoscape: 3.34.2
 
-  cytoscape@3.33.3: {}
+  cytoscape@3.34.2: {}
 
   d3-array@2.12.1:
     dependencies:
@@ -10274,11 +10398,13 @@ snapshots:
       d3: 7.9.0
       lodash-es: 4.18.1
 
-  dayjs@1.11.20: {}
+  dayjs@1.11.23: {}
 
-  debug@4.4.3:
+  debug@4.4.3(supports-color@7.2.0):
     dependencies:
       ms: 2.1.3
+    optionalDependencies:
+      supports-color: 7.2.0
 
   decamelize@1.2.0: {}
 
@@ -10349,10 +10475,10 @@ snapshots:
       minimatch: 3.1.5
       p-limit: 3.1.0
 
-  dmg-builder@26.15.3(electron-builder-squirrel-windows@26.15.3):
+  dmg-builder@26.15.3(electron-builder-squirrel-windows@26.15.3)(supports-color@7.2.0):
     dependencies:
-      app-builder-lib: 26.15.3(dmg-builder@26.15.3)(electron-builder-squirrel-windows@26.15.3)
-      builder-util: 26.15.3
+      app-builder-lib: 26.15.3(dmg-builder@26.15.3)(electron-builder-squirrel-windows@26.15.3)(supports-color@7.2.0)
+      builder-util: 26.15.3(supports-color@7.2.0)
       fs-extra: 10.1.0
       js-yaml: 4.3.1
     transitivePeerDependencies:
@@ -10400,8 +10526,8 @@ snapshots:
 
   electron-builder-squirrel-windows@26.15.3(dmg-builder@26.15.3):
     dependencies:
-      app-builder-lib: 26.15.3(dmg-builder@26.15.3)(electron-builder-squirrel-windows@26.15.3)
-      builder-util: 26.15.3
+      app-builder-lib: 26.15.3(dmg-builder@26.15.3)(electron-builder-squirrel-windows@26.15.3)(supports-color@7.2.0)
+      builder-util: 26.15.3(supports-color@7.2.0)
       electron-winstaller: 5.4.0
     transitivePeerDependencies:
       - dmg-builder
@@ -10409,12 +10535,12 @@ snapshots:
 
   electron-builder@26.15.3(electron-builder-squirrel-windows@26.15.3):
     dependencies:
-      app-builder-lib: 26.15.3(dmg-builder@26.15.3)(electron-builder-squirrel-windows@26.15.3)
-      builder-util: 26.15.3
-      builder-util-runtime: 9.7.0
+      app-builder-lib: 26.15.3(dmg-builder@26.15.3)(electron-builder-squirrel-windows@26.15.3)(supports-color@7.2.0)
+      builder-util: 26.15.3(supports-color@7.2.0)
+      builder-util-runtime: 9.7.0(supports-color@7.2.0)
       chalk: 4.1.2
       ci-info: 4.4.0
-      dmg-builder: 26.15.3(electron-builder-squirrel-windows@26.15.3)
+      dmg-builder: 26.15.3(electron-builder-squirrel-windows@26.15.3)(supports-color@7.2.0)
       fs-extra: 10.1.0
       lazy-val: 1.0.5
       simple-update-notifier: 2.0.0
@@ -10423,12 +10549,12 @@ snapshots:
       - electron-builder-squirrel-windows
       - supports-color
 
-  electron-publish@26.15.3:
+  electron-publish@26.15.3(supports-color@7.2.0):
     dependencies:
       '@types/fs-extra': 9.0.13
       aws4: 1.13.2
-      builder-util: 26.15.3
-      builder-util-runtime: 9.7.0
+      builder-util: 26.15.3(supports-color@7.2.0)
+      builder-util-runtime: 9.7.0(supports-color@7.2.0)
       chalk: 4.1.2
       form-data: 4.0.6
       fs-extra: 10.1.0
@@ -10439,9 +10565,9 @@ snapshots:
 
   electron-to-chromium@1.5.351: {}
 
-  electron-updater@6.8.9:
+  electron-updater@6.8.9(supports-color@7.2.0):
     dependencies:
-      builder-util-runtime: 9.7.0
+      builder-util-runtime: 9.7.0(supports-color@7.2.0)
       fs-extra: 10.1.0
       js-yaml: 4.3.1
       lazy-val: 1.0.5
@@ -10469,7 +10595,7 @@ snapshots:
   electron-winstaller@5.4.0:
     dependencies:
       '@electron/asar': 3.4.1
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@7.2.0)
       fs-extra: 7.0.1
       lodash: 4.18.1
       temp: 0.9.4
@@ -10478,18 +10604,18 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  electron@43.1.0:
+  electron@43.4.1(supports-color@7.2.0):
     dependencies:
       '@electron-internal/extract-zip': 1.0.4
-      '@electron/get': 5.0.0
+      '@electron/get': 5.0.0(supports-color@7.2.0)
       '@types/node': 24.12.4
     transitivePeerDependencies:
       - supports-color
 
-  emoji-picker-react@4.19.1(react@19.2.7):
+  emoji-picker-react@4.19.1(react@19.2.8):
     dependencies:
       flairup: 1.0.0
-      react: 19.2.7
+      react: 19.2.8
 
   emoji-regex@10.6.0: {}
 
@@ -10665,7 +10791,7 @@ snapshots:
       content-type: 1.0.5
       cookie: 0.7.2
       cookie-signature: 1.2.2
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@7.2.0)
       depd: 2.0.0
       encodeurl: 2.0.0
       escape-html: 1.0.3
@@ -10716,6 +10842,10 @@ snapshots:
     dependencies:
       fast-string-width: 3.0.2
 
+  fastdom@1.0.12:
+    dependencies:
+      strictdom: 1.0.1
+
   fastq@1.20.1:
     dependencies:
       reusify: 1.1.0
@@ -10742,7 +10872,7 @@ snapshots:
 
   finalhandler@2.1.1:
     dependencies:
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@7.2.0)
       encodeurl: 2.0.0
       escape-html: 1.0.3
       on-finished: 2.4.1
@@ -10919,11 +11049,12 @@ snapshots:
 
   hachure-fill@0.5.2: {}
 
-  happy-dom@20.9.0:
+  happy-dom@20.11.8:
     dependencies:
       '@types/node': 25.9.5
       '@types/whatwg-mimetype': 3.0.2
       '@types/ws': 8.18.1
+      buffer-image-size: 0.6.4
       entities: 7.0.1
       whatwg-mimetype: 3.0.0
       ws: 8.21.0
@@ -11102,10 +11233,10 @@ snapshots:
       statuses: 2.0.2
       toidentifier: 1.0.1
 
-  http-proxy-agent@7.0.2:
+  http-proxy-agent@7.0.2(supports-color@7.2.0):
     dependencies:
       agent-base: 7.1.4
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@7.2.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -11114,10 +11245,10 @@ snapshots:
       quick-lru: 5.1.1
       resolve-alpn: 1.2.1
 
-  https-proxy-agent@7.0.6:
+  https-proxy-agent@7.0.6(supports-color@7.2.0):
     dependencies:
       agent-base: 7.1.4
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@7.2.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -11127,7 +11258,7 @@ snapshots:
 
   husky@9.1.7: {}
 
-  i18next-cli@1.65.0(@types/node@25.9.5)(react-dom@19.2.7(react@19.2.7))(typescript@7.0.2):
+  i18next-cli@1.65.0(@types/node@25.9.5)(react-dom@19.2.8(react@19.2.8))(typescript@7.0.2):
     dependencies:
       '@croct/json5-parser': 0.2.2
       '@swc/core': 1.15.46
@@ -11143,8 +11274,8 @@ snapshots:
       magic-string: 0.30.21
       minimatch: 10.2.5
       ora: 9.4.0
-      react: 19.2.7
-      react-i18next: 17.0.8(i18next@26.3.1(typescript@7.0.2))(react-dom@19.2.7(react@19.2.7))(react@19.2.7)(typescript@7.0.2)
+      react: 19.2.8
+      react-i18next: 17.0.8(i18next@26.3.1(typescript@7.0.2))(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(typescript@7.0.2)
       yaml: 2.9.0
     transitivePeerDependencies:
       - '@swc/helpers'
@@ -11338,6 +11469,10 @@ snapshots:
     dependencies:
       commander: 8.3.0
 
+  katex@0.16.47:
+    dependencies:
+      commander: 8.3.0
+
   keyv@4.5.4:
     dependencies:
       json-buffer: 3.0.1
@@ -11475,9 +11610,9 @@ snapshots:
     dependencies:
       yallist: 4.0.0
 
-  lucide-react@0.577.0(react@19.2.7):
+  lucide-react@0.577.0(react@19.2.8):
     dependencies:
-      react: 19.2.7
+      react: 19.2.8
 
   lz-string@1.5.0: {}
 
@@ -11507,14 +11642,14 @@ snapshots:
       unist-util-is: 6.0.1
       unist-util-visit-parents: 6.0.2
 
-  mdast-util-from-markdown@2.0.3:
+  mdast-util-from-markdown@2.0.3(supports-color@7.2.0):
     dependencies:
       '@types/mdast': 4.0.4
       '@types/unist': 3.0.3
       decode-named-character-reference: 1.3.0
       devlop: 1.1.0
       mdast-util-to-string: 4.0.0
-      micromark: 4.0.2
+      micromark: 4.0.2(supports-color@7.2.0)
       micromark-util-decode-numeric-character-reference: 2.0.2
       micromark-util-decode-string: 2.0.1
       micromark-util-normalize-identifier: 2.0.1
@@ -11524,12 +11659,12 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  mdast-util-frontmatter@2.0.1:
+  mdast-util-frontmatter@2.0.1(supports-color@7.2.0):
     dependencies:
       '@types/mdast': 4.0.4
       devlop: 1.1.0
       escape-string-regexp: 5.0.0
-      mdast-util-from-markdown: 2.0.3
+      mdast-util-from-markdown: 2.0.3(supports-color@7.2.0)
       mdast-util-to-markdown: 2.1.2
       micromark-extension-frontmatter: 2.0.0
     transitivePeerDependencies:
@@ -11543,62 +11678,62 @@ snapshots:
       mdast-util-find-and-replace: 3.0.2
       micromark-util-character: 2.1.1
 
-  mdast-util-gfm-footnote@2.1.0:
+  mdast-util-gfm-footnote@2.1.0(supports-color@7.2.0):
     dependencies:
       '@types/mdast': 4.0.4
       devlop: 1.1.0
-      mdast-util-from-markdown: 2.0.3
+      mdast-util-from-markdown: 2.0.3(supports-color@7.2.0)
       mdast-util-to-markdown: 2.1.2
       micromark-util-normalize-identifier: 2.0.1
     transitivePeerDependencies:
       - supports-color
 
-  mdast-util-gfm-strikethrough@2.0.0:
+  mdast-util-gfm-strikethrough@2.0.0(supports-color@7.2.0):
     dependencies:
       '@types/mdast': 4.0.4
-      mdast-util-from-markdown: 2.0.3
+      mdast-util-from-markdown: 2.0.3(supports-color@7.2.0)
       mdast-util-to-markdown: 2.1.2
     transitivePeerDependencies:
       - supports-color
 
-  mdast-util-gfm-table@2.0.0:
+  mdast-util-gfm-table@2.0.0(supports-color@7.2.0):
     dependencies:
       '@types/mdast': 4.0.4
       devlop: 1.1.0
       markdown-table: 3.0.4
-      mdast-util-from-markdown: 2.0.3
+      mdast-util-from-markdown: 2.0.3(supports-color@7.2.0)
       mdast-util-to-markdown: 2.1.2
     transitivePeerDependencies:
       - supports-color
 
-  mdast-util-gfm-task-list-item@2.0.0:
+  mdast-util-gfm-task-list-item@2.0.0(supports-color@7.2.0):
     dependencies:
       '@types/mdast': 4.0.4
       devlop: 1.1.0
-      mdast-util-from-markdown: 2.0.3
+      mdast-util-from-markdown: 2.0.3(supports-color@7.2.0)
       mdast-util-to-markdown: 2.1.2
     transitivePeerDependencies:
       - supports-color
 
-  mdast-util-gfm@3.1.0:
+  mdast-util-gfm@3.1.0(supports-color@7.2.0):
     dependencies:
-      mdast-util-from-markdown: 2.0.3
+      mdast-util-from-markdown: 2.0.3(supports-color@7.2.0)
       mdast-util-gfm-autolink-literal: 2.0.1
-      mdast-util-gfm-footnote: 2.1.0
-      mdast-util-gfm-strikethrough: 2.0.0
-      mdast-util-gfm-table: 2.0.0
-      mdast-util-gfm-task-list-item: 2.0.0
+      mdast-util-gfm-footnote: 2.1.0(supports-color@7.2.0)
+      mdast-util-gfm-strikethrough: 2.0.0(supports-color@7.2.0)
+      mdast-util-gfm-table: 2.0.0(supports-color@7.2.0)
+      mdast-util-gfm-task-list-item: 2.0.0(supports-color@7.2.0)
       mdast-util-to-markdown: 2.1.2
     transitivePeerDependencies:
       - supports-color
 
-  mdast-util-math@3.0.0:
+  mdast-util-math@3.0.0(supports-color@7.2.0):
     dependencies:
       '@types/hast': 3.0.4
       '@types/mdast': 4.0.4
       devlop: 1.1.0
       longest-streak: 3.1.0
-      mdast-util-from-markdown: 2.0.3
+      mdast-util-from-markdown: 2.0.3(supports-color@7.2.0)
       mdast-util-to-markdown: 2.1.2
       unist-util-remove-position: 5.0.0
     transitivePeerDependencies:
@@ -11610,7 +11745,7 @@ snapshots:
       '@types/hast': 3.0.4
       '@types/mdast': 4.0.4
       devlop: 1.1.0
-      mdast-util-from-markdown: 2.0.3
+      mdast-util-from-markdown: 2.0.3(supports-color@7.2.0)
       mdast-util-to-markdown: 2.1.2
     transitivePeerDependencies:
       - supports-color
@@ -11623,7 +11758,7 @@ snapshots:
       '@types/unist': 3.0.3
       ccount: 2.0.1
       devlop: 1.1.0
-      mdast-util-from-markdown: 2.0.3
+      mdast-util-from-markdown: 2.0.3(supports-color@7.2.0)
       mdast-util-to-markdown: 2.1.2
       parse-entities: 4.0.2
       stringify-entities: 4.0.4
@@ -11638,7 +11773,7 @@ snapshots:
       '@types/hast': 3.0.4
       '@types/mdast': 4.0.4
       devlop: 1.1.0
-      mdast-util-from-markdown: 2.0.3
+      mdast-util-from-markdown: 2.0.3(supports-color@7.2.0)
       mdast-util-to-markdown: 2.1.2
     transitivePeerDependencies:
       - supports-color
@@ -11689,23 +11824,24 @@ snapshots:
 
   merge2@1.4.1: {}
 
-  mermaid@11.16.1:
+  mermaid@11.17.2:
     dependencies:
       '@braintree/sanitize-url': 7.1.2
       '@iconify/utils': 3.1.1
-      '@mermaid-js/parser': 1.2.0
+      '@mermaid-js/parser': 1.2.1
       '@types/d3': 7.4.3
       '@upsetjs/venn.js': 2.0.0
-      cytoscape: 3.33.3
-      cytoscape-cose-bilkent: 4.1.0(cytoscape@3.33.3)
-      cytoscape-fcose: 2.2.0(cytoscape@3.33.3)
+      cytoscape: 3.34.2
+      cytoscape-cose-bilkent: 4.1.0(cytoscape@3.34.2)
+      cytoscape-fcose: 2.2.0(cytoscape@3.34.2)
       d3: 7.9.0
       d3-sankey: 0.12.3
       dagre-d3-es: 7.0.14
-      dayjs: 1.11.20
+      dayjs: 1.11.23
       dompurify: 3.4.13
       es-toolkit: 1.46.1
-      katex: 0.16.45
+      fastdom: 1.0.12
+      katex: 0.16.47
       khroma: 2.1.0
       marked: 16.4.2
       roughjs: 4.6.6
@@ -11899,10 +12035,10 @@ snapshots:
 
   micromark-util-types@2.0.2: {}
 
-  micromark@4.0.2:
+  micromark@4.0.2(supports-color@7.2.0):
     dependencies:
       '@types/debug': 4.1.13
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@7.2.0)
       decode-named-character-reference: 1.3.0
       devlop: 1.1.0
       micromark-core-commonmark: 2.0.3
@@ -12170,29 +12306,29 @@ snapshots:
       '@oxc-parser/binding-win32-ia32-msvc': 0.141.0
       '@oxc-parser/binding-win32-x64-msvc': 0.141.0
 
-  oxfmt@0.52.0:
+  oxfmt@0.65.0:
     dependencies:
       tinypool: 2.1.0
     optionalDependencies:
-      '@oxfmt/binding-android-arm-eabi': 0.52.0
-      '@oxfmt/binding-android-arm64': 0.52.0
-      '@oxfmt/binding-darwin-arm64': 0.52.0
-      '@oxfmt/binding-darwin-x64': 0.52.0
-      '@oxfmt/binding-freebsd-x64': 0.52.0
-      '@oxfmt/binding-linux-arm-gnueabihf': 0.52.0
-      '@oxfmt/binding-linux-arm-musleabihf': 0.52.0
-      '@oxfmt/binding-linux-arm64-gnu': 0.52.0
-      '@oxfmt/binding-linux-arm64-musl': 0.52.0
-      '@oxfmt/binding-linux-ppc64-gnu': 0.52.0
-      '@oxfmt/binding-linux-riscv64-gnu': 0.52.0
-      '@oxfmt/binding-linux-riscv64-musl': 0.52.0
-      '@oxfmt/binding-linux-s390x-gnu': 0.52.0
-      '@oxfmt/binding-linux-x64-gnu': 0.52.0
-      '@oxfmt/binding-linux-x64-musl': 0.52.0
-      '@oxfmt/binding-openharmony-arm64': 0.52.0
-      '@oxfmt/binding-win32-arm64-msvc': 0.52.0
-      '@oxfmt/binding-win32-ia32-msvc': 0.52.0
-      '@oxfmt/binding-win32-x64-msvc': 0.52.0
+      '@oxfmt/binding-android-arm-eabi': 0.65.0
+      '@oxfmt/binding-android-arm64': 0.65.0
+      '@oxfmt/binding-darwin-arm64': 0.65.0
+      '@oxfmt/binding-darwin-x64': 0.65.0
+      '@oxfmt/binding-freebsd-x64': 0.65.0
+      '@oxfmt/binding-linux-arm-gnueabihf': 0.65.0
+      '@oxfmt/binding-linux-arm-musleabihf': 0.65.0
+      '@oxfmt/binding-linux-arm64-gnu': 0.65.0
+      '@oxfmt/binding-linux-arm64-musl': 0.65.0
+      '@oxfmt/binding-linux-ppc64-gnu': 0.65.0
+      '@oxfmt/binding-linux-riscv64-gnu': 0.65.0
+      '@oxfmt/binding-linux-riscv64-musl': 0.65.0
+      '@oxfmt/binding-linux-s390x-gnu': 0.65.0
+      '@oxfmt/binding-linux-x64-gnu': 0.65.0
+      '@oxfmt/binding-linux-x64-musl': 0.65.0
+      '@oxfmt/binding-openharmony-arm64': 0.65.0
+      '@oxfmt/binding-win32-arm64-msvc': 0.65.0
+      '@oxfmt/binding-win32-ia32-msvc': 0.65.0
+      '@oxfmt/binding-win32-x64-msvc': 0.65.0
 
   oxlint-plugin-react-doctor@0.9.1:
     dependencies:
@@ -12210,27 +12346,27 @@ snapshots:
       '@oxlint-tsgolint/win32-arm64': 7.0.2001
       '@oxlint-tsgolint/win32-x64': 7.0.2001
 
-  oxlint@1.77.0(oxlint-tsgolint@7.0.2001):
+  oxlint@1.80.0(oxlint-tsgolint@7.0.2001):
     optionalDependencies:
-      '@oxlint/binding-android-arm-eabi': 1.77.0
-      '@oxlint/binding-android-arm64': 1.77.0
-      '@oxlint/binding-darwin-arm64': 1.77.0
-      '@oxlint/binding-darwin-x64': 1.77.0
-      '@oxlint/binding-freebsd-x64': 1.77.0
-      '@oxlint/binding-linux-arm-gnueabihf': 1.77.0
-      '@oxlint/binding-linux-arm-musleabihf': 1.77.0
-      '@oxlint/binding-linux-arm64-gnu': 1.77.0
-      '@oxlint/binding-linux-arm64-musl': 1.77.0
-      '@oxlint/binding-linux-ppc64-gnu': 1.77.0
-      '@oxlint/binding-linux-riscv64-gnu': 1.77.0
-      '@oxlint/binding-linux-riscv64-musl': 1.77.0
-      '@oxlint/binding-linux-s390x-gnu': 1.77.0
-      '@oxlint/binding-linux-x64-gnu': 1.77.0
-      '@oxlint/binding-linux-x64-musl': 1.77.0
-      '@oxlint/binding-openharmony-arm64': 1.77.0
-      '@oxlint/binding-win32-arm64-msvc': 1.77.0
-      '@oxlint/binding-win32-ia32-msvc': 1.77.0
-      '@oxlint/binding-win32-x64-msvc': 1.77.0
+      '@oxlint/binding-android-arm-eabi': 1.80.0
+      '@oxlint/binding-android-arm64': 1.80.0
+      '@oxlint/binding-darwin-arm64': 1.80.0
+      '@oxlint/binding-darwin-x64': 1.80.0
+      '@oxlint/binding-freebsd-x64': 1.80.0
+      '@oxlint/binding-linux-arm-gnueabihf': 1.80.0
+      '@oxlint/binding-linux-arm-musleabihf': 1.80.0
+      '@oxlint/binding-linux-arm64-gnu': 1.80.0
+      '@oxlint/binding-linux-arm64-musl': 1.80.0
+      '@oxlint/binding-linux-ppc64-gnu': 1.80.0
+      '@oxlint/binding-linux-riscv64-gnu': 1.80.0
+      '@oxlint/binding-linux-riscv64-musl': 1.80.0
+      '@oxlint/binding-linux-s390x-gnu': 1.80.0
+      '@oxlint/binding-linux-x64-gnu': 1.80.0
+      '@oxlint/binding-linux-x64-musl': 1.80.0
+      '@oxlint/binding-openharmony-arm64': 1.80.0
+      '@oxlint/binding-win32-arm64-msvc': 1.80.0
+      '@oxlint/binding-win32-ia32-msvc': 1.80.0
+      '@oxlint/binding-win32-x64-msvc': 1.80.0
       oxlint-tsgolint: 7.0.2001
 
   p-cancelable@2.1.1: {}
@@ -12309,7 +12445,7 @@ snapshots:
 
   pathe@2.0.3: {}
 
-  pdfjs-dist@6.2.108:
+  pdfjs-dist@6.3.289:
     optionalDependencies:
       '@napi-rs/canvas': 1.0.3
 
@@ -12524,65 +12660,65 @@ snapshots:
 
   quick-lru@5.1.1: {}
 
-  radix-ui@1.6.2(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7):
+  radix-ui@1.6.2(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8):
     dependencies:
       '@radix-ui/primitive': 1.1.5
-      '@radix-ui/react-accessible-icon': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-accordion': 1.2.16(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-alert-dialog': 1.1.19(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-arrow': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-aspect-ratio': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-avatar': 1.2.2(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-checkbox': 1.3.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-collapsible': 1.1.16(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-collection': 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-context-menu': 2.3.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-dialog': 1.1.19(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-direction': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-dismissable-layer': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-dropdown-menu': 2.1.20(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-focus-guards': 1.1.4(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-focus-scope': 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-form': 0.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-hover-card': 1.1.19(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-label': 2.1.11(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-menu': 2.1.20(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-menubar': 1.1.20(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-navigation-menu': 1.2.18(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-one-time-password-field': 0.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-password-toggle-field': 0.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-popover': 1.1.19(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-popper': 1.3.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-portal': 1.1.13(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-presence': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-progress': 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-radio-group': 1.4.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-roving-focus': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-scroll-area': 1.2.14(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-select': 2.3.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-separator': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-slider': 1.4.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-slot': 1.3.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-switch': 1.3.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-tabs': 1.1.17(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-toast': 1.2.19(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-toggle': 1.1.14(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-toggle-group': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-toolbar': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-tooltip': 1.2.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-use-callback-ref': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-effect-event': 0.0.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-escape-keydown': 1.1.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-is-hydrated': 0.1.1(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-size': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-visually-hidden': 1.2.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@radix-ui/react-accessible-icon': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-accordion': 1.2.16(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-alert-dialog': 1.1.19(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-arrow': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-aspect-ratio': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-avatar': 1.2.2(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-checkbox': 1.3.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-collapsible': 1.1.16(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-collection': 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-context-menu': 2.3.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-dialog': 1.1.19(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-direction': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-dismissable-layer': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-dropdown-menu': 2.1.20(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-focus-guards': 1.1.4(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-focus-scope': 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-form': 0.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-hover-card': 1.1.19(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-label': 2.1.11(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-menu': 2.1.20(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-menubar': 1.1.20(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-navigation-menu': 1.2.18(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-one-time-password-field': 0.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-password-toggle-field': 0.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-popover': 1.1.19(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-popper': 1.3.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-portal': 1.1.13(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-presence': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-progress': 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-radio-group': 1.4.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-roving-focus': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-scroll-area': 1.2.14(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-select': 2.3.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-separator': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-slider': 1.4.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-slot': 1.3.0(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-switch': 1.3.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-tabs': 1.1.17(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-toast': 1.2.19(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-toggle': 1.1.14(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-toggle-group': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-toolbar': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-tooltip': 1.2.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-callback-ref': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-effect-event': 0.0.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-escape-keydown': 1.1.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-is-hydrated': 0.1.1(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-size': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-visually-hidden': 1.2.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
@@ -12596,37 +12732,37 @@ snapshots:
       iconv-lite: 0.7.2
       unpipe: 1.0.0
 
-  react-colorful@5.7.0(react-dom@19.2.7(react@19.2.7))(react@19.2.7):
+  react-colorful@5.7.0(react-dom@19.2.8(react@19.2.8))(react@19.2.8):
     dependencies:
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
 
-  react-dom@19.2.7(react@19.2.7):
+  react-dom@19.2.8(react@19.2.8):
     dependencies:
-      react: 19.2.7
+      react: 19.2.8
       scheduler: 0.27.0
 
-  react-grab@0.1.34(react@19.2.7):
+  react-grab@0.1.34(react@19.2.8):
     dependencies:
       '@react-grab/cli': 0.1.34
-      bippy: 0.5.40(react@19.2.7)
+      bippy: 0.5.40(react@19.2.8)
     optionalDependencies:
-      react: 19.2.7
+      react: 19.2.8
 
-  react-i18next@17.0.8(i18next@26.3.1(typescript@7.0.2))(react-dom@19.2.7(react@19.2.7))(react@19.2.7)(typescript@7.0.2):
+  react-i18next@17.0.8(i18next@26.3.1(typescript@7.0.2))(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(typescript@7.0.2):
     dependencies:
       '@babel/runtime': 7.29.7
       html-parse-stringify: 3.0.1
       i18next: 26.3.1(typescript@7.0.2)
-      react: 19.2.7
-      use-sync-external-store: 1.6.0(react@19.2.7)
+      react: 19.2.8
+      use-sync-external-store: 1.6.0(react@19.2.8)
     optionalDependencies:
-      react-dom: 19.2.7(react@19.2.7)
+      react-dom: 19.2.8(react@19.2.8)
       typescript: 7.0.2
 
   react-is@17.0.2: {}
 
-  react-markdown@10.1.0(@types/react@19.2.17)(react@19.2.7):
+  react-markdown@10.1.0(@types/react@19.2.17)(react@19.2.8):
     dependencies:
       '@types/hast': 3.0.4
       '@types/mdast': 4.0.4
@@ -12635,8 +12771,8 @@ snapshots:
       hast-util-to-jsx-runtime: 2.3.6
       html-url-attributes: 3.0.1
       mdast-util-to-hast: 13.2.1
-      react: 19.2.7
-      remark-parse: 11.0.0
+      react: 19.2.8
+      remark-parse: 11.0.0(supports-color@7.2.0)
       remark-rehype: 11.1.2
       unified: 11.0.5
       unist-util-visit: 5.1.0
@@ -12646,38 +12782,38 @@ snapshots:
 
   react-refresh@0.18.0: {}
 
-  react-remove-scroll-bar@2.3.8(@types/react@19.2.17)(react@19.2.7):
+  react-remove-scroll-bar@2.3.8(@types/react@19.2.17)(react@19.2.8):
     dependencies:
-      react: 19.2.7
-      react-style-singleton: 2.2.3(@types/react@19.2.17)(react@19.2.7)
+      react: 19.2.8
+      react-style-singleton: 2.2.3(@types/react@19.2.17)(react@19.2.8)
       tslib: 2.8.1
     optionalDependencies:
       '@types/react': 19.2.17
 
-  react-remove-scroll@2.7.2(@types/react@19.2.17)(react@19.2.7):
+  react-remove-scroll@2.7.2(@types/react@19.2.17)(react@19.2.8):
     dependencies:
-      react: 19.2.7
-      react-remove-scroll-bar: 2.3.8(@types/react@19.2.17)(react@19.2.7)
-      react-style-singleton: 2.2.3(@types/react@19.2.17)(react@19.2.7)
+      react: 19.2.8
+      react-remove-scroll-bar: 2.3.8(@types/react@19.2.17)(react@19.2.8)
+      react-style-singleton: 2.2.3(@types/react@19.2.17)(react@19.2.8)
       tslib: 2.8.1
-      use-callback-ref: 1.3.3(@types/react@19.2.17)(react@19.2.7)
-      use-sidecar: 1.1.3(@types/react@19.2.17)(react@19.2.7)
+      use-callback-ref: 1.3.3(@types/react@19.2.17)(react@19.2.8)
+      use-sidecar: 1.1.3(@types/react@19.2.17)(react@19.2.8)
     optionalDependencies:
       '@types/react': 19.2.17
 
-  react-style-singleton@2.2.3(@types/react@19.2.17)(react@19.2.7):
+  react-style-singleton@2.2.3(@types/react@19.2.17)(react@19.2.8):
     dependencies:
       get-nonce: 1.0.1
-      react: 19.2.7
+      react: 19.2.8
       tslib: 2.8.1
     optionalDependencies:
       '@types/react': 19.2.17
 
-  react@19.2.7: {}
+  react@19.2.8: {}
 
-  read-binary-file-arch@1.0.6:
+  read-binary-file-arch@1.0.6(supports-color@7.2.0):
     dependencies:
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@7.2.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -12749,39 +12885,39 @@ snapshots:
       mdast-util-newline-to-break: 2.0.0
       unified: 11.0.5
 
-  remark-frontmatter@5.0.0:
+  remark-frontmatter@5.0.0(supports-color@7.2.0):
     dependencies:
       '@types/mdast': 4.0.4
-      mdast-util-frontmatter: 2.0.1
+      mdast-util-frontmatter: 2.0.1(supports-color@7.2.0)
       micromark-extension-frontmatter: 2.0.0
       unified: 11.0.5
     transitivePeerDependencies:
       - supports-color
 
-  remark-gfm@4.0.1:
+  remark-gfm@4.0.1(supports-color@7.2.0):
     dependencies:
       '@types/mdast': 4.0.4
-      mdast-util-gfm: 3.1.0
+      mdast-util-gfm: 3.1.0(supports-color@7.2.0)
       micromark-extension-gfm: 3.0.0
-      remark-parse: 11.0.0
+      remark-parse: 11.0.0(supports-color@7.2.0)
       remark-stringify: 11.0.0
       unified: 11.0.5
     transitivePeerDependencies:
       - supports-color
 
-  remark-math@6.0.0:
+  remark-math@6.0.0(supports-color@7.2.0):
     dependencies:
       '@types/mdast': 4.0.4
-      mdast-util-math: 3.0.0
+      mdast-util-math: 3.0.0(supports-color@7.2.0)
       micromark-extension-math: 3.1.0
       unified: 11.0.5
     transitivePeerDependencies:
       - supports-color
 
-  remark-parse@11.0.0:
+  remark-parse@11.0.0(supports-color@7.2.0):
     dependencies:
       '@types/mdast': 4.0.4
-      mdast-util-from-markdown: 2.0.3
+      mdast-util-from-markdown: 2.0.3(supports-color@7.2.0)
       micromark-util-types: 2.0.2
       unified: 11.0.5
     transitivePeerDependencies:
@@ -12902,7 +13038,7 @@ snapshots:
 
   router@2.2.0:
     dependencies:
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@7.2.0)
       depd: 2.0.0
       is-promise: 4.0.0
       parseurl: 1.3.3
@@ -12945,7 +13081,7 @@ snapshots:
 
   send@1.2.1:
     dependencies:
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@7.2.0)
       encodeurl: 2.0.0
       escape-html: 1.0.3
       etag: 1.8.1
@@ -13101,10 +13237,10 @@ snapshots:
 
   smol-toml@1.6.1: {}
 
-  sonner@2.0.7(react-dom@19.2.7(react@19.2.7))(react@19.2.7):
+  sonner@2.0.7(react-dom@19.2.8(react@19.2.8))(react@19.2.8):
     dependencies:
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
 
   source-map-js@1.2.1: {}
 
@@ -13145,6 +13281,8 @@ snapshots:
   strict-event-emitter@0.5.1:
     optional: true
 
+  strictdom@1.0.1: {}
+
   string-argv@0.3.2: {}
 
   string-width@4.2.3:
@@ -13207,9 +13345,9 @@ snapshots:
 
   stylis@4.4.0: {}
 
-  sumchecker@3.0.1:
+  sumchecker@3.0.1(supports-color@7.2.0):
     dependencies:
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@7.2.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -13438,24 +13576,24 @@ snapshots:
       escalade: 3.2.0
       picocolors: 1.1.1
 
-  use-callback-ref@1.3.3(@types/react@19.2.17)(react@19.2.7):
+  use-callback-ref@1.3.3(@types/react@19.2.17)(react@19.2.8):
     dependencies:
-      react: 19.2.7
+      react: 19.2.8
       tslib: 2.8.1
     optionalDependencies:
       '@types/react': 19.2.17
 
-  use-sidecar@1.1.3(@types/react@19.2.17)(react@19.2.7):
+  use-sidecar@1.1.3(@types/react@19.2.17)(react@19.2.8):
     dependencies:
       detect-node-es: 1.1.0
-      react: 19.2.7
+      react: 19.2.8
       tslib: 2.8.1
     optionalDependencies:
       '@types/react': 19.2.17
 
-  use-sync-external-store@1.6.0(react@19.2.7):
+  use-sync-external-store@1.6.0(react@19.2.8):
     dependencies:
-      react: 19.2.7
+      react: 19.2.8
 
   utf8-byte-length@1.0.5: {}
 
@@ -13482,15 +13620,15 @@ snapshots:
       '@types/unist': 3.0.3
       vfile-message: 4.0.3
 
-  vitest@4.1.5(@opentelemetry/api@1.9.1)(@types/node@25.9.5)(happy-dom@20.9.0)(msw@2.14.3(@types/node@25.9.5)(typescript@7.0.2))(rolldown-vite@7.3.1(@emnapi/core@1.11.2)(@emnapi/runtime@1.11.2)(@types/node@25.9.5)(jiti@2.7.0)(yaml@2.8.4)):
+  vitest@4.1.11(@opentelemetry/api@1.9.1)(@types/node@25.9.5)(happy-dom@20.11.8)(msw@2.14.3(@types/node@25.9.5)(typescript@7.0.2))(rolldown-vite@7.3.1(@emnapi/core@1.11.2)(@emnapi/runtime@1.11.2)(@types/node@25.9.5)(jiti@2.7.0)(yaml@2.8.4)):
     dependencies:
-      '@vitest/expect': 4.1.5
-      '@vitest/mocker': 4.1.5(msw@2.14.3(@types/node@25.9.5)(typescript@7.0.2))(rolldown-vite@7.3.1(@emnapi/core@1.11.2)(@emnapi/runtime@1.11.2)(@types/node@25.9.5)(jiti@2.7.0)(yaml@2.8.4))
-      '@vitest/pretty-format': 4.1.5
-      '@vitest/runner': 4.1.5
-      '@vitest/snapshot': 4.1.5
-      '@vitest/spy': 4.1.5
-      '@vitest/utils': 4.1.5
+      '@vitest/expect': 4.1.11
+      '@vitest/mocker': 4.1.11(msw@2.14.3(@types/node@25.9.5)(typescript@7.0.2))(rolldown-vite@7.3.1(@emnapi/core@1.11.2)(@emnapi/runtime@1.11.2)(@types/node@25.9.5)(jiti@2.7.0)(yaml@2.8.4))
+      '@vitest/pretty-format': 4.1.11
+      '@vitest/runner': 4.1.11
+      '@vitest/snapshot': 4.1.11
+      '@vitest/spy': 4.1.11
+      '@vitest/utils': 4.1.11
       es-module-lexer: 2.1.0
       expect-type: 1.3.0
       magic-string: 0.30.21
@@ -13507,7 +13645,7 @@ snapshots:
     optionalDependencies:
       '@opentelemetry/api': 1.9.1
       '@types/node': 25.9.5
-      happy-dom: 20.9.0
+      happy-dom: 20.11.8
     transitivePeerDependencies:
       - msw
 
@@ -13581,6 +13719,8 @@ snapshots:
 
   ws@8.21.0: {}
 
+  ws@8.21.3: {}
+
   wsl-utils@0.3.1:
     dependencies:
       is-wsl: 3.1.1
@@ -13649,10 +13789,10 @@ snapshots:
 
   zod@4.4.3: {}
 
-  zustand@5.0.14(@types/react@19.2.17)(react@19.2.7)(use-sync-external-store@1.6.0(react@19.2.7)):
+  zustand@5.0.14(@types/react@19.2.17)(react@19.2.8)(use-sync-external-store@1.6.0(react@19.2.8)):
     optionalDependencies:
       '@types/react': 19.2.17
-      react: 19.2.7
-      use-sync-external-store: 1.6.0(react@19.2.7)
+      react: 19.2.8
+      use-sync-external-store: 1.6.0(react@19.2.8)
 
   zwitch@2.0.4: {}
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 52304c4dedb..5d2bbaad077 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -3,3 +3,46 @@
 # package graph. Without this file `pnpm -r` auto-discovers mobile/ and its
 # nested package, and the root's patchedDependencies fail as ERR_PNPM_UNUSED_PATCH.
 packages: []
+
+minimumReleaseAge: 4320
+# 6.3.289 is younger than the 3-day age gate; drop this once it ages.
+minimumReleaseAgeExclude:
+  - pdfjs-dist
+shamefullyHoist: true
+
+supportedArchitectures:
+  os:
+    - current
+    - darwin
+    - linux
+    - win32
+  cpu:
+    - current
+    - x64
+    - arm64
+
+allowBuilds:
+  '@parcel/watcher': true
+  '@swc/core': false
+  '@vscode/windows-process-tree': false
+  agent-browser: false
+  cpu-features: true
+  electron-winstaller: false
+  esbuild: true
+  msw: false
+  node-pty: true
+  sherpa-onnx: true
+  ssh2: false
+  windows-native-registry: false
+
+overrides:
+  monaco-editor>dompurify: 3.4.13
+
+patchedDependencies:
+  node-pty@1.1.0: config/patches/node-pty@1.1.0.patch
+  '@xterm/addon-ligatures@0.11.0-beta.287': config/patches/@xterm__addon-ligatures@0.11.0-beta.287.patch
+  '@xterm/addon-webgl@0.20.0-beta.286': config/patches/@xterm__addon-webgl@0.20.0-beta.286.patch
+  '@xterm/addon-serialize@0.15.0-beta.287': config/patches/@xterm__addon-serialize@0.15.0-beta.287.patch
+  '@xterm/xterm@6.1.0-beta.287': config/patches/@xterm__xterm@6.1.0-beta.287.patch
+  lint-staged@16.4.0: config/patches/lint-staged@16.4.0.patch
+  '@vscode/windows-process-tree@0.8.0': config/patches/@vscode__windows-process-tree@0.8.0.patch
diff --git a/src/main/__fixtures__/shell-wrapper-snapshots/daemon-bash-rcfile.txt b/src/main/__fixtures__/shell-wrapper-snapshots/daemon-bash-rcfile.txt
index b91f1065f84..54837bf4d65 100644
--- a/src/main/__fixtures__/shell-wrapper-snapshots/daemon-bash-rcfile.txt
+++ b/src/main/__fixtures__/shell-wrapper-snapshots/daemon-bash-rcfile.txt
@@ -45,11 +45,14 @@ __orca_omp_should_skip_extension() {
   return 1
 }
 __orca_omp_cwd_is_usable() {
+  local __orca_physical_cwd
   [[ -x . ]] || return 1
-  if [[ -n "${PWD:-}" ]]; then
-    [[ -d "${PWD}" && "${PWD}" -ef . ]]
+  if [[ -n "${PWD:-}" && -d "${PWD:-}" ]]; then
+    [[ "${PWD}" -ef . ]]
   else
-    builtin pwd -P >/dev/null 2>&1
+    # Why compare the path: shell builtins can print a cached path for a deleted cwd.
+    __orca_physical_cwd="$(builtin pwd -P 2>/dev/null)" || return 1
+    [[ -d "$__orca_physical_cwd" && "$__orca_physical_cwd" -ef . ]]
   fi
 }
 __orca_omp_invoke() {
@@ -69,7 +72,7 @@ __orca_omp_invoke() {
 __orca_omp() {
   local __orca_use_extension=1
   __orca_omp_should_skip_extension "${1:-}" && __orca_use_extension=0
-  if [[ $__orca_use_extension -eq 1 ]] && ! __orca_omp_cwd_is_usable; then
+  if ! __orca_omp_cwd_is_usable; then
     local __orca_logical_cwd="${PWD:-${ORCA_WORKTREE_PATH:-${ORCA_ROOT_PATH:-}}}"
     # Why: a restored shell can retain the deleted directory inode after its path is recreated.
     (
diff --git a/src/main/__fixtures__/shell-wrapper-snapshots/daemon-zsh-zshenv.txt b/src/main/__fixtures__/shell-wrapper-snapshots/daemon-zsh-zshenv.txt
index bce09f52ff0..3d3403ad099 100644
--- a/src/main/__fixtures__/shell-wrapper-snapshots/daemon-zsh-zshenv.txt
+++ b/src/main/__fixtures__/shell-wrapper-snapshots/daemon-zsh-zshenv.txt
@@ -83,11 +83,14 @@ __orca_deferred_init() {
       return 1
     }
     __orca_omp_cwd_is_usable() {
+      local __orca_physical_cwd
       [[ -x . ]] || return 1
-      if [[ -n "${PWD:-}" ]]; then
-        [[ -d "${PWD}" && "${PWD}" -ef . ]]
+      if [[ -n "${PWD:-}" && -d "${PWD:-}" ]]; then
+        [[ "${PWD}" -ef . ]]
       else
-        builtin pwd -P >/dev/null 2>&1
+        # Why compare the path: shell builtins can print a cached path for a deleted cwd.
+        __orca_physical_cwd="$(builtin pwd -P 2>/dev/null)" || return 1
+        [[ -d "$__orca_physical_cwd" && "$__orca_physical_cwd" -ef . ]]
       fi
     }
     __orca_omp_invoke() {
@@ -107,7 +110,7 @@ __orca_deferred_init() {
     __orca_omp() {
       local __orca_use_extension=1
       __orca_omp_should_skip_extension "${1:-}" && __orca_use_extension=0
-      if [[ $__orca_use_extension -eq 1 ]] && ! __orca_omp_cwd_is_usable; then
+      if ! __orca_omp_cwd_is_usable; then
         local __orca_logical_cwd="${PWD:-${ORCA_WORKTREE_PATH:-${ORCA_ROOT_PATH:-}}}"
         # Why: a restored shell can retain the deleted directory inode after its path is recreated.
         (
diff --git a/src/main/__fixtures__/shell-wrapper-snapshots/local-bash-rcfile.txt b/src/main/__fixtures__/shell-wrapper-snapshots/local-bash-rcfile.txt
index ee9cb7975ec..d4bb98997c2 100644
--- a/src/main/__fixtures__/shell-wrapper-snapshots/local-bash-rcfile.txt
+++ b/src/main/__fixtures__/shell-wrapper-snapshots/local-bash-rcfile.txt
@@ -48,11 +48,14 @@ __orca_omp_should_skip_extension() {
   return 1
 }
 __orca_omp_cwd_is_usable() {
+  local __orca_physical_cwd
   [[ -x . ]] || return 1
-  if [[ -n "${PWD:-}" ]]; then
-    [[ -d "${PWD}" && "${PWD}" -ef . ]]
+  if [[ -n "${PWD:-}" && -d "${PWD:-}" ]]; then
+    [[ "${PWD}" -ef . ]]
   else
-    builtin pwd -P >/dev/null 2>&1
+    # Why compare the path: shell builtins can print a cached path for a deleted cwd.
+    __orca_physical_cwd="$(builtin pwd -P 2>/dev/null)" || return 1
+    [[ -d "$__orca_physical_cwd" && "$__orca_physical_cwd" -ef . ]]
   fi
 }
 __orca_omp_invoke() {
@@ -72,7 +75,7 @@ __orca_omp_invoke() {
 __orca_omp() {
   local __orca_use_extension=1
   __orca_omp_should_skip_extension "${1:-}" && __orca_use_extension=0
-  if [[ $__orca_use_extension -eq 1 ]] && ! __orca_omp_cwd_is_usable; then
+  if ! __orca_omp_cwd_is_usable; then
     local __orca_logical_cwd="${PWD:-${ORCA_WORKTREE_PATH:-${ORCA_ROOT_PATH:-}}}"
     # Why: a restored shell can retain the deleted directory inode after its path is recreated.
     (
diff --git a/src/main/__fixtures__/shell-wrapper-snapshots/local-zsh-zshenv.txt b/src/main/__fixtures__/shell-wrapper-snapshots/local-zsh-zshenv.txt
index 222cab93896..ee18600acb1 100644
--- a/src/main/__fixtures__/shell-wrapper-snapshots/local-zsh-zshenv.txt
+++ b/src/main/__fixtures__/shell-wrapper-snapshots/local-zsh-zshenv.txt
@@ -83,11 +83,14 @@ __orca_deferred_init() {
       return 1
     }
     __orca_omp_cwd_is_usable() {
+      local __orca_physical_cwd
       [[ -x . ]] || return 1
-      if [[ -n "${PWD:-}" ]]; then
-        [[ -d "${PWD}" && "${PWD}" -ef . ]]
+      if [[ -n "${PWD:-}" && -d "${PWD:-}" ]]; then
+        [[ "${PWD}" -ef . ]]
       else
-        builtin pwd -P >/dev/null 2>&1
+        # Why compare the path: shell builtins can print a cached path for a deleted cwd.
+        __orca_physical_cwd="$(builtin pwd -P 2>/dev/null)" || return 1
+        [[ -d "$__orca_physical_cwd" && "$__orca_physical_cwd" -ef . ]]
       fi
     }
     __orca_omp_invoke() {
@@ -107,7 +110,7 @@ __orca_deferred_init() {
     __orca_omp() {
       local __orca_use_extension=1
       __orca_omp_should_skip_extension "${1:-}" && __orca_use_extension=0
-      if [[ $__orca_use_extension -eq 1 ]] && ! __orca_omp_cwd_is_usable; then
+      if ! __orca_omp_cwd_is_usable; then
         local __orca_logical_cwd="${PWD:-${ORCA_WORKTREE_PATH:-${ORCA_ROOT_PATH:-}}}"
         # Why: a restored shell can retain the deleted directory inode after its path is recreated.
         (
diff --git a/src/main/__fixtures__/shell-wrapper-snapshots/relay-bash-rcfile.txt b/src/main/__fixtures__/shell-wrapper-snapshots/relay-bash-rcfile.txt
index 9d90929085d..de9c8f95248 100644
--- a/src/main/__fixtures__/shell-wrapper-snapshots/relay-bash-rcfile.txt
+++ b/src/main/__fixtures__/shell-wrapper-snapshots/relay-bash-rcfile.txt
@@ -37,11 +37,14 @@ __orca_omp_should_skip_extension() {
   return 1
 }
 __orca_omp_cwd_is_usable() {
+  local __orca_physical_cwd
   [[ -x . ]] || return 1
-  if [[ -n "${PWD:-}" ]]; then
-    [[ -d "${PWD}" && "${PWD}" -ef . ]]
+  if [[ -n "${PWD:-}" && -d "${PWD:-}" ]]; then
+    [[ "${PWD}" -ef . ]]
   else
-    builtin pwd -P >/dev/null 2>&1
+    # Why compare the path: shell builtins can print a cached path for a deleted cwd.
+    __orca_physical_cwd="$(builtin pwd -P 2>/dev/null)" || return 1
+    [[ -d "$__orca_physical_cwd" && "$__orca_physical_cwd" -ef . ]]
   fi
 }
 __orca_omp_invoke() {
@@ -61,7 +64,7 @@ __orca_omp_invoke() {
 __orca_omp() {
   local __orca_use_extension=1
   __orca_omp_should_skip_extension "${1:-}" && __orca_use_extension=0
-  if [[ $__orca_use_extension -eq 1 ]] && ! __orca_omp_cwd_is_usable; then
+  if ! __orca_omp_cwd_is_usable; then
     local __orca_logical_cwd="${PWD:-${ORCA_WORKTREE_PATH:-${ORCA_ROOT_PATH:-}}}"
     # Why: a restored shell can retain the deleted directory inode after its path is recreated.
     (
diff --git a/src/main/__fixtures__/shell-wrapper-snapshots/relay-zsh-zshenv.txt b/src/main/__fixtures__/shell-wrapper-snapshots/relay-zsh-zshenv.txt
index 335b54c60c3..394bc4a6d10 100644
--- a/src/main/__fixtures__/shell-wrapper-snapshots/relay-zsh-zshenv.txt
+++ b/src/main/__fixtures__/shell-wrapper-snapshots/relay-zsh-zshenv.txt
@@ -57,11 +57,14 @@ __orca_deferred_init() {
       return 1
     }
     __orca_omp_cwd_is_usable() {
+      local __orca_physical_cwd
       [[ -x . ]] || return 1
-      if [[ -n "${PWD:-}" ]]; then
-        [[ -d "${PWD}" && "${PWD}" -ef . ]]
+      if [[ -n "${PWD:-}" && -d "${PWD:-}" ]]; then
+        [[ "${PWD}" -ef . ]]
       else
-        builtin pwd -P >/dev/null 2>&1
+        # Why compare the path: shell builtins can print a cached path for a deleted cwd.
+        __orca_physical_cwd="$(builtin pwd -P 2>/dev/null)" || return 1
+        [[ -d "$__orca_physical_cwd" && "$__orca_physical_cwd" -ef . ]]
       fi
     }
     __orca_omp_invoke() {
@@ -81,7 +84,7 @@ __orca_deferred_init() {
     __orca_omp() {
       local __orca_use_extension=1
       __orca_omp_should_skip_extension "${1:-}" && __orca_use_extension=0
-      if [[ $__orca_use_extension -eq 1 ]] && ! __orca_omp_cwd_is_usable; then
+      if ! __orca_omp_cwd_is_usable; then
         local __orca_logical_cwd="${PWD:-${ORCA_WORKTREE_PATH:-${ORCA_ROOT_PATH:-}}}"
         # Why: a restored shell can retain the deleted directory inode after its path is recreated.
         (
diff --git a/src/main/ai-vault/session-scanner.ts b/src/main/ai-vault/session-scanner.ts
index b4ef6f06ce7..4b0deb4c68f 100644
--- a/src/main/ai-vault/session-scanner.ts
+++ b/src/main/ai-vault/session-scanner.ts
@@ -85,23 +85,21 @@ export async function scanAiVaultSessions(
     const candidates = dedupeCodexRolloutFileAliases(
       discoveries
         .flatMap((discovery) =>
-          discovery.files.map(
-            (file): SessionFileCandidate => ({
-              agent: discovery.agent,
-              file,
-              codexHome:
-                discovery.agent === 'codex'
-                  ? codexHomeForSessionsDir(
-                      discovery.rootDir,
-                      options.defaultCodexHomeDir ?? DEFAULT_CODEX_HOME_DIR
-                    )
-                  : null,
-              antigravityHistoryPath:
-                discovery.agent === 'antigravity'
-                  ? antigravityHistoryPathForBrainDir(discovery.rootDir)
-                  : undefined
-            })
-          )
+          discovery.files.map((file): SessionFileCandidate => ({
+            agent: discovery.agent,
+            file,
+            codexHome:
+              discovery.agent === 'codex'
+                ? codexHomeForSessionsDir(
+                    discovery.rootDir,
+                    options.defaultCodexHomeDir ?? DEFAULT_CODEX_HOME_DIR
+                  )
+                : null,
+            antigravityHistoryPath:
+              discovery.agent === 'antigravity'
+                ? antigravityHistoryPathForBrainDir(discovery.rootDir)
+                : undefined
+          }))
         )
         .sort((left, right) => right.file.mtimeMs - left.file.mtimeMs),
       {
@@ -203,9 +201,11 @@ async function scanInScopeSessions(args: {
     excludedFilePaths: args.alreadyParsedFilePaths,
     issues: args.issues
   })
-  const candidates = files.map(
-    (file): SessionFileCandidate => ({ agent: 'claude', file, codexHome: null })
-  )
+  const candidates = files.map((file): SessionFileCandidate => ({
+    agent: 'claude',
+    file,
+    codexHome: null
+  }))
   if (candidates.length === 0) {
     return []
   }
diff --git a/src/main/automations/external-manager-discovery.ts b/src/main/automations/external-manager-discovery.ts
new file mode 100644
index 00000000000..9eed6c44a40
--- /dev/null
+++ b/src/main/automations/external-manager-discovery.ts
@@ -0,0 +1,163 @@
+import { existsSync } from 'node:fs'
+import { readFile } from 'node:fs/promises'
+import { homedir } from 'node:os'
+import { join } from 'node:path'
+import type {
+  ExternalAutomationManager,
+  ExternalAutomationProvider
+} from '../../shared/automations-types'
+import type { SshTarget } from '../../shared/ssh-types'
+import { getActiveMultiplexer } from '../ssh/ssh-target-registry'
+import { mapHermesJobs, mapOpenClawJobs } from './external-job-mappers'
+import { readHermesCronOutputRunsPage } from './hermes-cron-output'
+import { isExternalAutomationCommandOnPath } from './external-manager-local-command'
+import { externalAutomationRelayErrorMessage } from './external-manager-relay'
+
+const HERMES_HOME = process.env.HERMES_HOME?.trim() || join(homedir(), '.hermes')
+const HERMES_CRON_DIR = join(HERMES_HOME, 'cron')
+const HERMES_JOBS_FILE = join(HERMES_CRON_DIR, 'jobs.json')
+const OPENCLAW_JOBS_FILE = join(homedir(), '.openclaw', 'cron', 'jobs.json')
+const PROVIDER_LABELS: Record<ExternalAutomationProvider, string> = {
+  hermes: 'Hermes',
+  openclaw: 'OpenClaw'
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null && !Array.isArray(value)
+}
+
+async function readLocalHermesJobs(): Promise<unknown[]> {
+  if (!existsSync(HERMES_JOBS_FILE)) {
+    return []
+  }
+  const content = await readFile(HERMES_JOBS_FILE, 'utf-8')
+  const parsed = JSON.parse(content) as unknown
+  const jobs = Array.isArray(parsed)
+    ? parsed
+    : isRecord(parsed) && Array.isArray(parsed.jobs)
+      ? parsed.jobs
+      : []
+  return Promise.all(
+    jobs.map(async (job) => {
+      if (!isRecord(job)) {
+        return job
+      }
+      const jobId = typeof job.id === 'string' ? job.id : null
+      if (!jobId) {
+        return job
+      }
+      const runsPage = await readHermesCronOutputRunsPage(jobId, { page: 1, pageSize: 0 })
+      return {
+        ...job,
+        run_count: runsPage.total,
+        runs: []
+      }
+    })
+  )
+}
+
+async function readLocalOpenClawJobs(): Promise<unknown[]> {
+  if (!existsSync(OPENCLAW_JOBS_FILE)) {
+    return []
+  }
+  const content = await readFile(OPENCLAW_JOBS_FILE, 'utf-8')
+  const parsed = JSON.parse(content) as unknown
+  return isRecord(parsed) && Array.isArray(parsed.jobs) ? parsed.jobs : []
+}
+
+function mapProviderJobs(
+  provider: ExternalAutomationProvider,
+  managerId: string,
+  jobs: unknown[]
+): ExternalAutomationManager['jobs'] {
+  return provider === 'hermes' ? mapHermesJobs(managerId, jobs) : mapOpenClawJobs(managerId, jobs)
+}
+
+export async function listLocalManager(
+  provider: ExternalAutomationProvider
+): Promise<ExternalAutomationManager | null> {
+  const [availableResult, jobsResult] = await Promise.allSettled([
+    isExternalAutomationCommandOnPath(provider),
+    provider === 'hermes' ? readLocalHermesJobs() : readLocalOpenClawJobs()
+  ])
+  const available = availableResult.status === 'fulfilled' && availableResult.value
+  const jobs = jobsResult.status === 'fulfilled' ? jobsResult.value : []
+  const readError = jobsResult.status === 'rejected' ? String(jobsResult.reason) : null
+  if (!available && jobs.length === 0 && !readError) {
+    return null
+  }
+  const managerId = `${provider}:local`
+  const providerLabel = PROVIDER_LABELS[provider]
+  return {
+    id: managerId,
+    provider,
+    label: `${providerLabel} on this computer`,
+    targetLabel: 'this computer',
+    target: { type: 'local' },
+    status: readError ? 'unavailable' : 'available',
+    error:
+      readError ??
+      (available
+        ? null
+        : `${providerLabel} jobs were found, but the ${provider} CLI is not on PATH.`),
+    canManage: !readError && available,
+    jobs: mapProviderJobs(provider, managerId, jobs)
+  }
+}
+
+export async function listRemoteManager(
+  target: SshTarget,
+  provider: ExternalAutomationProvider
+): Promise<ExternalAutomationManager> {
+  const providerLabel = PROVIDER_LABELS[provider]
+  const managerProviderId = `${provider}:ssh:${target.id}`
+  const mux = getActiveMultiplexer(target.id)
+  if (!mux || mux.isDisposed()) {
+    return {
+      id: managerProviderId,
+      provider,
+      label: `${providerLabel} on ${target.label}`,
+      targetLabel: target.label,
+      target: { type: 'ssh', connectionId: target.id },
+      status: 'unavailable',
+      error: 'SSH target is not connected.',
+      canManage: false,
+      jobs: []
+    }
+  }
+  try {
+    const result = (await mux.request('externalAutomations.list', { provider })) as {
+      jobs?: unknown[]
+      hermesAvailable?: boolean
+      openclawAvailable?: boolean
+      error?: string | null
+    }
+    const commandAvailable =
+      provider === 'hermes' ? result.hermesAvailable === true : result.openclawAvailable === true
+    const readError = result.error ?? null
+    return {
+      id: managerProviderId,
+      provider,
+      label: `${providerLabel} on ${target.label}`,
+      targetLabel: target.label,
+      target: { type: 'ssh', connectionId: target.id },
+      status: readError ? 'unavailable' : 'available',
+      error:
+        readError ?? (commandAvailable ? null : `${providerLabel} CLI is not on the remote PATH.`),
+      canManage: !readError && commandAvailable,
+      jobs: mapProviderJobs(provider, managerProviderId, result.jobs ?? [])
+    }
+  } catch (error) {
+    return {
+      id: managerProviderId,
+      provider,
+      label: `${providerLabel} on ${target.label}`,
+      targetLabel: target.label,
+      target: { type: 'ssh', connectionId: target.id },
+      status: 'unavailable',
+      error: externalAutomationRelayErrorMessage(error),
+      canManage: false,
+      jobs: []
+    }
+  }
+}
diff --git a/src/main/automations/external-manager-job-id.ts b/src/main/automations/external-manager-job-id.ts
new file mode 100644
index 00000000000..6d8ac157f98
--- /dev/null
+++ b/src/main/automations/external-manager-job-id.ts
@@ -0,0 +1,7 @@
+const EXTERNAL_JOB_ID_PATTERN = /^[A-Za-z0-9][A-Za-z0-9._:-]*$/
+
+export function assertExternalAutomationJobId(jobId: string): void {
+  if (!EXTERNAL_JOB_ID_PATTERN.test(jobId)) {
+    throw new Error('Invalid external automation job ID.')
+  }
+}
diff --git a/src/main/automations/external-manager-local-command.ts b/src/main/automations/external-manager-local-command.ts
new file mode 100644
index 00000000000..44d81e68ec8
--- /dev/null
+++ b/src/main/automations/external-manager-local-command.ts
@@ -0,0 +1,45 @@
+import { runProcess } from '../../shared/child-process/run-process'
+
+const LOCAL_COMMAND_LOOKUP_TIMEOUT_MS = 5_000
+const LOCAL_AUTOMATION_COMMAND_TIMEOUT_MS = 30_000
+
+function runLocalProviderCommand(
+  command: string,
+  args: string[],
+  options: { timeoutMs: number; timeoutMessage: string }
+): Promise<void> {
+  return runProcess({ program: command, args, timeoutMs: options.timeoutMs }).then((result) => {
+    if (result.timedOut) {
+      throw new Error(options.timeoutMessage)
+    }
+    if (result.code !== 0) {
+      throw new Error(
+        result.stderr.trim() || `Command exited with code ${result.code ?? 'unknown'}.`
+      )
+    }
+  })
+}
+
+export async function isExternalAutomationCommandOnPath(command: string): Promise<boolean> {
+  const finder = process.platform === 'win32' ? 'where' : 'which'
+  try {
+    // Why: these probes run while loading Automations; a wedged PATH shim must
+    // not keep the list IPC pending forever.
+    await runLocalProviderCommand(finder, [command], {
+      timeoutMs: LOCAL_COMMAND_LOOKUP_TIMEOUT_MS,
+      timeoutMessage: `Command lookup timed out after ${LOCAL_COMMAND_LOOKUP_TIMEOUT_MS}ms.`
+    })
+    return true
+  } catch {
+    return false
+  }
+}
+
+// Why: local automation mutations back UI actions; a wedged CLI must not keep
+// create/edit/run/delete pending after Node signals a timeout.
+export function runLocalAutomationCommand(command: string, args: string[]): Promise<void> {
+  return runLocalProviderCommand(command, args, {
+    timeoutMs: LOCAL_AUTOMATION_COMMAND_TIMEOUT_MS,
+    timeoutMessage: `Local automation command timed out after ${LOCAL_AUTOMATION_COMMAND_TIMEOUT_MS}ms.`
+  })
+}
diff --git a/src/main/automations/external-manager-mutations.ts b/src/main/automations/external-manager-mutations.ts
new file mode 100644
index 00000000000..215e00e7a8e
--- /dev/null
+++ b/src/main/automations/external-manager-mutations.ts
@@ -0,0 +1,139 @@
+import type {
+  ExternalAutomationAction,
+  ExternalAutomationActionInput,
+  ExternalAutomationCreateInput,
+  ExternalAutomationProvider,
+  ExternalAutomationUpdateInput
+} from '../../shared/automations-types'
+import { assertExternalAutomationJobId } from './external-manager-job-id'
+import { runLocalAutomationCommand } from './external-manager-local-command'
+import { requireExternalAutomationMultiplexer } from './external-manager-relay'
+import { clearHermesCronOutputRunCountCache } from './hermes-cron-output'
+
+const PROVIDER_ACTION_COMMANDS: Record<
+  ExternalAutomationProvider,
+  Record<ExternalAutomationAction, string>
+> = {
+  hermes: { pause: 'pause', resume: 'resume', run: 'run', delete: 'remove' },
+  openclaw: { pause: 'disable', resume: 'enable', run: 'run', delete: 'rm' }
+}
+
+/** Fails closed like its neighbours: an unlisted or inherited key is not an action. */
+function providerActionCommand(
+  provider: ExternalAutomationProvider,
+  action: ExternalAutomationAction
+): string {
+  const commands = Object.hasOwn(PROVIDER_ACTION_COMMANDS, provider)
+    ? PROVIDER_ACTION_COMMANDS[provider]
+    : null
+  const command = commands && Object.hasOwn(commands, action) ? commands[action] : null
+  if (typeof command !== 'string') {
+    throw new Error('Unsupported external automation action.')
+  }
+  return command
+}
+
+function normalizeHermesCronMutationInput(input: ExternalAutomationCreateInput): {
+  name: string
+  prompt: string
+  schedule: string
+  workdir: string | null
+} {
+  if (input.provider !== 'hermes') {
+    throw new Error('Only Hermes cron creation and editing are supported.')
+  }
+  const name = input.name.trim()
+  const prompt = input.prompt.trim()
+  const schedule = input.schedule.trim()
+  const workdir = input.workdir?.trim() || null
+  if (!prompt) {
+    throw new Error('Hermes cron requires a prompt.')
+  }
+  if (!schedule) {
+    throw new Error('Hermes cron requires a schedule.')
+  }
+  return {
+    name: name || prompt.slice(0, 50).trim() || 'Hermes cron',
+    prompt,
+    schedule,
+    workdir
+  }
+}
+
+/** Edit args when `jobId` is given, create args otherwise; both are argv, never a shell string. */
+function hermesCronMutationArgs(
+  jobId: string | null,
+  input: { name: string; prompt: string; schedule: string; workdir: string | null }
+): string[] {
+  const args = jobId
+    ? ['cron', 'edit', jobId, '--schedule', input.schedule, '--prompt', input.prompt]
+    : ['cron', 'create', input.schedule, input.prompt]
+  args.push('--name', input.name)
+  if (!jobId) {
+    args.push('--deliver', 'local')
+  }
+  if (input.workdir) {
+    args.push('--workdir', input.workdir)
+  }
+  return args
+}
+
+export async function createExternalAutomation(
+  input: ExternalAutomationCreateInput
+): Promise<void> {
+  const normalized = normalizeHermesCronMutationInput(input)
+  if (input.target.type === 'local') {
+    await runLocalAutomationCommand('hermes', hermesCronMutationArgs(null, normalized))
+    clearHermesCronOutputRunCountCache()
+    return
+  }
+  await requireExternalAutomationMultiplexer(input.target.connectionId).request(
+    'externalAutomations.create',
+    {
+      provider: input.provider,
+      ...normalized
+    }
+  )
+}
+
+export async function updateExternalAutomation(
+  input: ExternalAutomationUpdateInput
+): Promise<void> {
+  assertExternalAutomationJobId(input.jobId)
+  const normalized = normalizeHermesCronMutationInput(input)
+  if (input.target.type === 'local') {
+    await runLocalAutomationCommand('hermes', hermesCronMutationArgs(input.jobId, normalized))
+    clearHermesCronOutputRunCountCache(input.jobId)
+    return
+  }
+  await requireExternalAutomationMultiplexer(input.target.connectionId).request(
+    'externalAutomations.update',
+    {
+      provider: input.provider,
+      jobId: input.jobId,
+      ...normalized
+    }
+  )
+}
+
+export async function runExternalAutomationAction(
+  input: ExternalAutomationActionInput
+): Promise<void> {
+  assertExternalAutomationJobId(input.jobId)
+  const command = providerActionCommand(input.provider, input.action)
+  if (input.target.type === 'local') {
+    await runLocalAutomationCommand(input.provider, ['cron', command, input.jobId])
+    if (input.provider === 'hermes') {
+      clearHermesCronOutputRunCountCache(input.jobId)
+    }
+    return
+  }
+  await requireExternalAutomationMultiplexer(input.target.connectionId).request(
+    'externalAutomations.act',
+    {
+      provider: input.provider,
+      action: input.action,
+      jobId: input.jobId
+    }
+  )
+}
diff --git a/src/main/automations/external-manager-relay.ts b/src/main/automations/external-manager-relay.ts
new file mode 100644
index 00000000000..f223c55d0b8
--- /dev/null
+++ b/src/main/automations/external-manager-relay.ts
@@ -0,0 +1,35 @@
+import { JsonRpcErrorCode } from '../ssh/relay-protocol'
+import { getActiveMultiplexer } from '../ssh/ssh-target-registry'
+
+export function requireExternalAutomationMultiplexer(
+  connectionId: string
+): NonNullable<ReturnType<typeof getActiveMultiplexer>> {
+  const mux = getActiveMultiplexer(connectionId)
+  if (!mux || mux.isDisposed()) {
+    throw new Error(`SSH target "${connectionId}" is not connected.`)
+  }
+  return mux
+}
+
+/**
+ * True only for a structured JSON-RPC `-32601`, never for error prose.
+ *
+ * A `-32601` object means the peer parsed the request and declined the method,
+ * so it is positive evidence the connection is healthy. Matching the words
+ * "method not found" instead would let a genuinely broken relay be reported as
+ * a missing capability, hiding a dead connection behind a capability notice.
+ */
+export function isRelayMethodNotFoundError(error: unknown): boolean {
+  return (
+    typeof error === 'object' &&
+    error !== null &&
+    (error as { code?: unknown }).code === JsonRpcErrorCode.MethodNotFound
+  )
+}
+
+export function externalAutomationRelayErrorMessage(error: unknown): string {
+  if (isRelayMethodNotFoundError(error)) {
+    return 'Remote relay does not support external automation management. Reconnect the SSH target to deploy the latest relay.'
+  }
+  return error instanceof Error ? error.message : String(error)
+}
diff --git a/src/main/automations/external-manager-runs.ts b/src/main/automations/external-manager-runs.ts
new file mode 100644
index 00000000000..ebb0b0b6dde
--- /dev/null
+++ b/src/main/automations/external-manager-runs.ts
@@ -0,0 +1,81 @@
+import type {
+  ExternalAutomationProvider,
+  ExternalAutomationRunsInput,
+  ExternalAutomationRunsPage
+} from '../../shared/automations-types'
+import {
+  EXTERNAL_AUTOMATION_SCOPE_CODES,
+  ExternalAutomationScopeError
+} from '../../shared/external-automation-scope'
+import { mapHermesJobs } from './external-job-mappers'
+import { assertExternalAutomationJobId } from './external-manager-job-id'
+import {
+  isRelayMethodNotFoundError,
+  requireExternalAutomationMultiplexer
+} from './external-manager-relay'
+import { readHermesCronOutputRunsPage } from './hermes-cron-output'
+
+/**
+ * Runs the relay's paged runs call, translating "no such method" into a code the
+ * renderer can act on.
+ *
+ * The structured code exists only here: Electron IPC preserves nothing but the
+ * message, so a renderer that re-derived this from the host's prose would be
+ * guessing. Translating at the boundary that can still see the code is what lets
+ * the caller fall back to job-carried runs without matching free text.
+ */
+async function requestRemoteExternalRuns(
+  connectionId: string,
+  params: { provider: ExternalAutomationProvider; jobId: string; page: number; pageSize: number }
+): Promise<{ total?: number; runs?: unknown[] }> {
+  try {
+    return (await requireExternalAutomationMultiplexer(connectionId).request(
+      'externalAutomations.runs',
+      params
+    )) as {
+      total?: number
+      runs?: unknown[]
+    }
+  } catch (error) {
+    if (isRelayMethodNotFoundError(error)) {
+      throw new ExternalAutomationScopeError(EXTERNAL_AUTOMATION_SCOPE_CODES.runsUnsupported)
+    }
+    throw error
+  }
+}
+
+export async function listExternalAutomationRuns(
+  input: ExternalAutomationRunsInput
+): Promise<ExternalAutomationRunsPage> {
+  assertExternalAutomationJobId(input.jobId)
+  const page = Number.isFinite(input.page) ? Math.max(1, Math.floor(input.page)) : 1
+  const pageSize = Number.isFinite(input.pageSize)
+    ? Math.min(100, Math.max(1, Math.floor(input.pageSize)))
+    : 25
+  const identity = {
+    managerId: input.managerId,
+    provider: input.provider,
+    target: input.target,
+    jobId: input.jobId,
+    page,
+    pageSize
+  }
+  if (input.provider !== 'hermes') {
+    return { ...identity, total: 0, runs: [] }
+  }
+  const result =
+    input.target.type === 'local'
+      ? await readHermesCronOutputRunsPage(input.jobId, { page, pageSize })
+      : await requestRemoteExternalRuns(input.target.connectionId, {
+          provider: input.provider,
+          jobId: input.jobId,
+          page,
+          pageSize
+        })
+  return {
+    ...identity,
+    total: typeof result.total === 'number' && Number.isFinite(result.total) ? result.total : 0,
+    runs:
+      mapHermesJobs(input.managerId, [{ id: input.jobId, runs: result.runs ?? [] }])[0]?.runs ?? []
+  }
+}
diff --git a/src/main/automations/external-manager.ts b/src/main/automations/external-manager.ts
index 0905f1943de..d1adeb3e83c 100644
--- a/src/main/automations/external-manager.ts
+++ b/src/main/automations/external-manager.ts
@@ -1,34 +1,16 @@
-/* eslint-disable max-lines -- Why: external automation discovery, pagination,
- * and lifecycle routing share provider/target validation and remote relay fallbacks. */
-import { existsSync } from 'node:fs'
-import { readFile } from 'node:fs/promises'
-import { homedir } from 'node:os'
-import { join } from 'node:path'
-import { runProcess } from '../../shared/child-process/run-process'
 import type {
-  ExternalAutomationAction,
-  ExternalAutomationActionInput,
   ExternalAutomationCreateInput,
-  ExternalAutomationManager,
-  ExternalAutomationProvider,
-  ExternalAutomationRunsInput,
-  ExternalAutomationRunsPage,
-  ExternalAutomationUpdateInput
+  ExternalAutomationRunsPage
 } from '../../shared/automations-types'
-import {
-  EXTERNAL_AUTOMATION_SCOPE_CODES,
-  ExternalAutomationScopeError,
-  type ScopedExternalAutomationRequest,
-  type ScopedExternalManagerActionRequest,
-  type ScopedExternalManagerCreateRequest,
-  type ScopedExternalManagerListRequest,
-  type ScopedExternalManagerMutationFields,
-  type ScopedExternalManagerRunsRequest,
-  type ScopedExternalManagerUpdateRequest
+import type {
+  ScopedExternalAutomationRequest,
+  ScopedExternalManagerActionRequest,
+  ScopedExternalManagerCreateRequest,
+  ScopedExternalManagerListRequest,
+  ScopedExternalManagerMutationFields,
+  ScopedExternalManagerRunsRequest,
+  ScopedExternalManagerUpdateRequest
 } from '../../shared/external-automation-scope'
-import type { SshTarget } from '../../shared/ssh-types'
-import { getActiveMultiplexer } from '../ssh/ssh-target-registry'
-import { JsonRpcErrorCode } from '../ssh/relay-protocol'
 import {
   resolveExternalAutomationScope,
   type DesktopSshTargetRegistry,
@@ -40,423 +22,19 @@ import {
   type ExternalAutomationManagerCacheEntry
 } from './external-automation-manager-cache'
 import type { ExternalAutomationProbeScheduler } from './external-automation-probe-scheduler'
-import { mapHermesJobs, mapOpenClawJobs } from './external-job-mappers'
+import { listLocalManager, listRemoteManager } from './external-manager-discovery'
 import {
-  clearHermesCronOutputRunCountCache,
-  readHermesCronOutputRunsPage
-} from './hermes-cron-output'
+  createExternalAutomation,
+  runExternalAutomationAction,
+  updateExternalAutomation
+} from './external-manager-mutations'
+import { listExternalAutomationRuns } from './external-manager-runs'
 
-const HERMES_HOME = process.env.HERMES_HOME?.trim() || join(homedir(), '.hermes')
-const HERMES_CRON_DIR = join(HERMES_HOME, 'cron')
-const HERMES_JOBS_FILE = join(HERMES_CRON_DIR, 'jobs.json')
-const OPENCLAW_JOBS_FILE = join(homedir(), '.openclaw', 'cron', 'jobs.json')
-const EXTERNAL_JOB_ID_PATTERN = /^[A-Za-z0-9][A-Za-z0-9._:-]*$/
-const LOCAL_COMMAND_LOOKUP_TIMEOUT_MS = 5_000
-const LOCAL_AUTOMATION_COMMAND_TIMEOUT_MS = 30_000
-const PROVIDER_LABELS: Record<ExternalAutomationProvider, string> = {
-  hermes: 'Hermes',
-  openclaw: 'OpenClaw'
-}
-
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === 'object' && value !== null && !Array.isArray(value)
-}
-
-function runLocalProviderCommand(
-  command: string,
-  args: string[],
-  options: { timeoutMs: number; timeoutMessage: string }
-): Promise<void> {
-  return runProcess({ program: command, args, timeoutMs: options.timeoutMs }).then((result) => {
-    if (result.timedOut) {
-      throw new Error(options.timeoutMessage)
-    }
-    if (result.code !== 0) {
-      throw new Error(
-        result.stderr.trim() || `Command exited with code ${result.code ?? 'unknown'}.`
-      )
-    }
-  })
-}
-
-async function isCommandOnPath(command: string): Promise<boolean> {
-  const finder = process.platform === 'win32' ? 'where' : 'which'
-  try {
-    // Why: these probes run while loading Automations; a wedged PATH shim must
-    // not keep the list IPC pending forever.
-    await runLocalProviderCommand(finder, [command], {
-      timeoutMs: LOCAL_COMMAND_LOOKUP_TIMEOUT_MS,
-      timeoutMessage: `Command lookup timed out after ${LOCAL_COMMAND_LOOKUP_TIMEOUT_MS}ms.`
-    })
-    return true
-  } catch {
-    return false
-  }
-}
-
-// Why: local automation mutations back UI actions; a wedged CLI must not keep
-// create/edit/run/delete pending after Node signals a timeout.
-function runLocalAutomationCommand(command: string, args: string[]): Promise<void> {
-  return runLocalProviderCommand(command, args, {
-    timeoutMs: LOCAL_AUTOMATION_COMMAND_TIMEOUT_MS,
-    timeoutMessage: `Local automation command timed out after ${LOCAL_AUTOMATION_COMMAND_TIMEOUT_MS}ms.`
-  })
-}
-
-async function readLocalHermesJobs(): Promise<unknown[]> {
-  if (!existsSync(HERMES_JOBS_FILE)) {
-    return []
-  }
-  const content = await readFile(HERMES_JOBS_FILE, 'utf-8')
-  const parsed = JSON.parse(content) as unknown
-  const jobs = Array.isArray(parsed)
-    ? parsed
-    : isRecord(parsed) && Array.isArray(parsed.jobs)
-      ? parsed.jobs
-      : []
-  return Promise.all(
-    jobs.map(async (job) => {
-      if (!isRecord(job)) {
-        return job
-      }
-      const jobId = typeof job.id === 'string' ? job.id : null
-      if (!jobId) {
-        return job
-      }
-      const runsPage = await readHermesCronOutputRunsPage(jobId, { page: 1, pageSize: 0 })
-      return {
-        ...job,
-        run_count: runsPage.total,
-        runs: []
-      }
-    })
-  )
-}
-
-async function readLocalOpenClawJobs(): Promise<unknown[]> {
-  if (!existsSync(OPENCLAW_JOBS_FILE)) {
-    return []
-  }
-  const content = await readFile(OPENCLAW_JOBS_FILE, 'utf-8')
-  const parsed = JSON.parse(content) as unknown
-  return isRecord(parsed) && Array.isArray(parsed.jobs) ? parsed.jobs : []
-}
-
-function mapProviderJobs(
-  provider: ExternalAutomationProvider,
-  managerId: string,
-  jobs: unknown[]
-): ExternalAutomationManager['jobs'] {
-  return provider === 'hermes' ? mapHermesJobs(managerId, jobs) : mapOpenClawJobs(managerId, jobs)
-}
-
-async function listLocalManager(
-  provider: ExternalAutomationProvider
-): Promise<ExternalAutomationManager | null> {
-  const [availableResult, jobsResult] = await Promise.allSettled([
-    isCommandOnPath(provider),
-    provider === 'hermes' ? readLocalHermesJobs() : readLocalOpenClawJobs()
-  ])
-  const available = availableResult.status === 'fulfilled' && availableResult.value
-  const jobs = jobsResult.status === 'fulfilled' ? jobsResult.value : []
-  const readError = jobsResult.status === 'rejected' ? String(jobsResult.reason) : null
-  if (!available && jobs.length === 0 && !readError) {
-    return null
-  }
-  const managerId = `${provider}:local`
-  const providerLabel = PROVIDER_LABELS[provider]
-  return {
-    id: managerId,
-    provider,
-    label: `${providerLabel} on this computer`,
-    targetLabel: 'this computer',
-    target: { type: 'local' },
-    status: readError ? 'unavailable' : 'available',
-    error:
-      readError ??
-      (available
-        ? null
-        : `${providerLabel} jobs were found, but the ${provider} CLI is not on PATH.`),
-    canManage: !readError && available,
-    jobs: mapProviderJobs(provider, managerId, jobs)
-  }
-}
-
-function requireMultiplexer(
-  connectionId: string
-): NonNullable<ReturnType<typeof getActiveMultiplexer>> {
-  const mux = getActiveMultiplexer(connectionId)
-  if (!mux || mux.isDisposed()) {
-    throw new Error(`SSH target "${connectionId}" is not connected.`)
-  }
-  return mux
-}
-
-/**
- * True only for a structured JSON-RPC `-32601`, never for error prose.
- *
- * A `-32601` object means the peer parsed the request and declined the method,
- * so it is positive evidence the connection is healthy. Matching the words
- * "method not found" instead would let a genuinely broken relay be reported as
- * a missing capability, hiding a dead connection behind a capability notice.
- */
-function isRelayMethodNotFoundError(error: unknown): boolean {
-  return (
-    typeof error === 'object' &&
-    error !== null &&
-    (error as { code?: unknown }).code === JsonRpcErrorCode.MethodNotFound
-  )
-}
-
-function remoteRelayErrorMessage(error: unknown): string {
-  if (isRelayMethodNotFoundError(error)) {
-    return 'Remote relay does not support external automation management. Reconnect the SSH target to deploy the latest relay.'
-  }
-  return error instanceof Error ? error.message : String(error)
-}
-
-async function listRemoteManager(
-  target: SshTarget,
-  provider: ExternalAutomationProvider
-): Promise<ExternalAutomationManager> {
-  const providerLabel = PROVIDER_LABELS[provider]
-  const managerProviderId = `${provider}:ssh:${target.id}`
-  const mux = getActiveMultiplexer(target.id)
-  if (!mux || mux.isDisposed()) {
-    return {
-      id: managerProviderId,
-      provider,
-      label: `${providerLabel} on ${target.label}`,
-      targetLabel: target.label,
-      target: { type: 'ssh', connectionId: target.id },
-      status: 'unavailable',
-      error: 'SSH target is not connected.',
-      canManage: false,
-      jobs: []
-    }
-  }
-  try {
-    const result = (await mux.request('externalAutomations.list', { provider })) as {
-      jobs?: unknown[]
-      hermesAvailable?: boolean
-      openclawAvailable?: boolean
-      error?: string | null
-    }
-    const commandAvailable =
-      provider === 'hermes' ? result.hermesAvailable === true : result.openclawAvailable === true
-    const readError = result.error ?? null
-    return {
-      id: managerProviderId,
-      provider,
-      label: `${providerLabel} on ${target.label}`,
-      targetLabel: target.label,
-      target: { type: 'ssh', connectionId: target.id },
-      status: readError ? 'unavailable' : 'available',
-      error:
-        readError ?? (commandAvailable ? null : `${providerLabel} CLI is not on the remote PATH.`),
-      canManage: !readError && commandAvailable,
-      jobs: mapProviderJobs(provider, managerProviderId, result.jobs ?? [])
-    }
-  } catch (error) {
-    return {
-      id: managerProviderId,
-      provider,
-      label: `${providerLabel} on ${target.label}`,
-      targetLabel: target.label,
-      target: { type: 'ssh', connectionId: target.id },
-      status: 'unavailable',
-      error: remoteRelayErrorMessage(error),
-      canManage: false,
-      jobs: []
-    }
-  }
-}
-
-/**
- * Runs the relay's paged runs call, translating "no such method" into a code the
- * renderer can act on.
- *
- * The structured code exists only here: Electron IPC preserves nothing but the
- * message, so a renderer that re-derived this from the host's prose would be
- * guessing. Translating at the boundary that can still see the code is what lets
- * the caller fall back to job-carried runs without matching free text.
- */
-async function requestRemoteExternalRuns(
-  connectionId: string,
-  params: { provider: ExternalAutomationProvider; jobId: string; page: number; pageSize: number }
-): Promise<{ total?: number; runs?: unknown[] }> {
-  try {
-    return (await requireMultiplexer(connectionId).request('externalAutomations.runs', params)) as {
-      total?: number
-      runs?: unknown[]
-    }
-  } catch (error) {
-    if (isRelayMethodNotFoundError(error)) {
-      throw new ExternalAutomationScopeError(EXTERNAL_AUTOMATION_SCOPE_CODES.runsUnsupported)
-    }
-    throw error
-  }
-}
-
-export async function listExternalAutomationRuns(
-  input: ExternalAutomationRunsInput
-): Promise<ExternalAutomationRunsPage> {
-  if (!EXTERNAL_JOB_ID_PATTERN.test(input.jobId)) {
-    throw new Error('Invalid external automation job ID.')
-  }
-  const page = Number.isFinite(input.page) ? Math.max(1, Math.floor(input.page)) : 1
-  const pageSize = Number.isFinite(input.pageSize)
-    ? Math.min(100, Math.max(1, Math.floor(input.pageSize)))
-    : 25
-  const identity = {
-    managerId: input.managerId,
-    provider: input.provider,
-    target: input.target,
-    jobId: input.jobId,
-    page,
-    pageSize
-  }
-  if (input.provider !== 'hermes') {
-    return { ...identity, total: 0, runs: [] }
-  }
-  const result =
-    input.target.type === 'local'
-      ? await readHermesCronOutputRunsPage(input.jobId, { page, pageSize })
-      : await requestRemoteExternalRuns(input.target.connectionId, {
-          provider: input.provider,
-          jobId: input.jobId,
-          page,
-          pageSize
-        })
-  return {
-    ...identity,
-    total: typeof result.total === 'number' && Number.isFinite(result.total) ? result.total : 0,
-    runs:
-      mapHermesJobs(input.managerId, [{ id: input.jobId, runs: result.runs ?? [] }])[0]?.runs ?? []
-  }
-}
-
-const PROVIDER_ACTION_COMMANDS: Record<
-  ExternalAutomationProvider,
-  Record<ExternalAutomationAction, string>
-> = {
-  hermes: { pause: 'pause', resume: 'resume', run: 'run', delete: 'remove' },
-  openclaw: { pause: 'disable', resume: 'enable', run: 'run', delete: 'rm' }
-}
-
-/** Fails closed like its neighbours: an unlisted or inherited key is not an action. */
-function providerActionCommand(
-  provider: ExternalAutomationProvider,
-  action: ExternalAutomationAction
-): string {
-  const commands = Object.hasOwn(PROVIDER_ACTION_COMMANDS, provider)
-    ? PROVIDER_ACTION_COMMANDS[provider]
-    : null
-  const command = commands && Object.hasOwn(commands, action) ? commands[action] : null
-  if (typeof command !== 'string') {
-    throw new Error('Unsupported external automation action.')
-  }
-  return command
-}
-
-function normalizeHermesCronMutationInput(input: ExternalAutomationCreateInput): {
-  name: string
-  prompt: string
-  schedule: string
-  workdir: string | null
-} {
-  if (input.provider !== 'hermes') {
-    throw new Error('Only Hermes cron creation and editing are supported.')
-  }
-  const name = input.name.trim()
-  const prompt = input.prompt.trim()
-  const schedule = input.schedule.trim()
-  const workdir = input.workdir?.trim() || null
-  if (!prompt) {
-    throw new Error('Hermes cron requires a prompt.')
-  }
-  if (!schedule) {
-    throw new Error('Hermes cron requires a schedule.')
-  }
-  return {
-    name: name || prompt.slice(0, 50).trim() || 'Hermes cron',
-    prompt,
-    schedule,
-    workdir
-  }
-}
-
-/** Edit args when `jobId` is given, create args otherwise; both are argv, never a shell string. */
-function hermesCronMutationArgs(
-  jobId: string | null,
-  input: { name: string; prompt: string; schedule: string; workdir: string | null }
-): string[] {
-  const args = jobId
-    ? ['cron', 'edit', jobId, '--schedule', input.schedule, '--prompt', input.prompt]
-    : ['cron', 'create', input.schedule, input.prompt]
-  args.push('--name', input.name)
-  if (!jobId) {
-    args.push('--deliver', 'local')
-  }
-  if (input.workdir) {
-    args.push('--workdir', input.workdir)
-  }
-  return args
-}
-
-export async function createExternalAutomation(
-  input: ExternalAutomationCreateInput
-): Promise<void> {
-  const normalized = normalizeHermesCronMutationInput(input)
-  if (input.target.type === 'local') {
-    await runLocalAutomationCommand('hermes', hermesCronMutationArgs(null, normalized))
-    clearHermesCronOutputRunCountCache()
-    return
-  }
-  await requireMultiplexer(input.target.connectionId).request('externalAutomations.create', {
-    provider: input.provider,
-    ...normalized
-  })
-}
-
-export async function updateExternalAutomation(
-  input: ExternalAutomationUpdateInput
-): Promise<void> {
-  if (!EXTERNAL_JOB_ID_PATTERN.test(input.jobId)) {
-    throw new Error('Invalid external automation job ID.')
-  }
-  const normalized = normalizeHermesCronMutationInput(input)
-  if (input.target.type === 'local') {
-    await runLocalAutomationCommand('hermes', hermesCronMutationArgs(input.jobId, normalized))
-    clearHermesCronOutputRunCountCache(input.jobId)
-    return
-  }
-  await requireMultiplexer(input.target.connectionId).request('externalAutomations.update', {
-    provider: input.provider,
-    jobId: input.jobId,
-    ...normalized
-  })
-}
-
-export async function runExternalAutomationAction(
-  input: ExternalAutomationActionInput
-): Promise<void> {
-  if (!EXTERNAL_JOB_ID_PATTERN.test(input.jobId)) {
-    throw new Error('Invalid external automation job ID.')
-  }
-  const command = providerActionCommand(input.provider, input.action)
-  if (input.target.type === 'local') {
-    await runLocalAutomationCommand(input.provider, ['cron', command, input.jobId])
-    if (input.provider === 'hermes') {
-      clearHermesCronOutputRunCountCache(input.jobId)
-    }
-    return
-  }
-  await requireMultiplexer(input.target.connectionId).request('externalAutomations.act', {
-    provider: input.provider,
-    action: input.action,
-    jobId: input.jobId
-  })
+export {
+  createExternalAutomation,
+  listExternalAutomationRuns,
+  runExternalAutomationAction,
+  updateExternalAutomation
 }
 
 export type ScopedExternalAutomationDeps = {
diff --git a/src/main/browser/browser-guest-shortcut-dispatch.ts b/src/main/browser/browser-guest-shortcut-dispatch.ts
index fa4bd966994..5d24dce43ea 100644
--- a/src/main/browser/browser-guest-shortcut-dispatch.ts
+++ b/src/main/browser/browser-guest-shortcut-dispatch.ts
@@ -160,7 +160,9 @@ export function forwardGuestShortcutInput(
     if (isFloatingGuest) {
       renderer.send('ui:closeFloatingItem', { sourceId: browserTabId })
     } else {
-      renderer.send('ui:closeActiveTab')
+      // Why: carry the guest's page id — activeTabType/activeBrowserTabId can be stale in split
+      // layouts (guest focus doesn't reach the group's focus-capture), silently dropping the close.
+      renderer.send('ui:closeActiveTab', { sourceId: browserTabId })
     }
   } else if (keybindingMatchesAction('tab.nextSameType', input, process.platform, keybindings)) {
     renderer.send('ui:switchTab', 1)
diff --git a/src/main/browser/browser-guest-shortcut-forwarding.test.ts b/src/main/browser/browser-guest-shortcut-forwarding.test.ts
index 19bf03bd2f8..f7f35917fa9 100644
--- a/src/main/browser/browser-guest-shortcut-forwarding.test.ts
+++ b/src/main/browser/browser-guest-shortcut-forwarding.test.ts
@@ -872,7 +872,9 @@ describe('setupGuestShortcutForwarding', () => {
       expect(rendererSendMock).toHaveBeenCalledWith('ui:closeFloatingItem', {
         sourceId: browserTabId
       })
-      expect(rendererSendMock).not.toHaveBeenCalledWith('ui:closeActiveTab')
+      expect(rendererSendMock.mock.calls.some(([channel]) => channel === 'ui:closeActiveTab')).toBe(
+        false
+      )
     })
 
     it('routes workspace/tab index chords to ui:selectFloatingIndex for a floating guest', () => {
@@ -903,7 +905,7 @@ describe('setupGuestShortcutForwarding', () => {
       triggerBeforeInput(closeInput)
       triggerBeforeInput(workspaceIndexInput)
 
-      expect(rendererSendMock).toHaveBeenCalledWith('ui:closeActiveTab')
+      expect(rendererSendMock).toHaveBeenCalledWith('ui:closeActiveTab', { sourceId: browserTabId })
       expect(rendererSendMock).toHaveBeenCalledWith('ui:jumpToWorktreeIndex', 0)
       expect(rendererSendMock).not.toHaveBeenCalledWith('ui:closeFloatingItem', expect.anything())
       expect(rendererSendMock).not.toHaveBeenCalledWith('ui:selectFloatingIndex', expect.anything())
@@ -918,7 +920,7 @@ describe('setupGuestShortcutForwarding', () => {
 
       triggerBeforeInput(closeInput)
 
-      expect(rendererSendMock).toHaveBeenCalledWith('ui:closeActiveTab')
+      expect(rendererSendMock).toHaveBeenCalledWith('ui:closeActiveTab', { sourceId: browserTabId })
       expect(rendererSendMock).not.toHaveBeenCalledWith('ui:closeFloatingItem', expect.anything())
     })
 
diff --git a/src/main/browser/browser-manager-guest-shortcuts.test.ts b/src/main/browser/browser-manager-guest-shortcuts.test.ts
index cc9af9b6329..fa84fd99d50 100644
--- a/src/main/browser/browser-manager-guest-shortcuts.test.ts
+++ b/src/main/browser/browser-manager-guest-shortcuts.test.ts
@@ -297,7 +297,9 @@ describe('browserManager', () => {
 
     expect(rendererSendMock).toHaveBeenNthCalledWith(1, 'ui:newBrowserTab')
     expect(rendererSendMock).toHaveBeenNthCalledWith(2, 'ui:newTerminalTab')
-    expect(rendererSendMock).toHaveBeenNthCalledWith(3, 'ui:closeActiveTab')
+    expect(rendererSendMock).toHaveBeenNthCalledWith(3, 'ui:closeActiveTab', {
+      sourceId: 'browser-1'
+    })
     expect(rendererSendMock).toHaveBeenNthCalledWith(4, 'ui:switchTabAcrossAllTypes', 1)
     expect(rendererSendMock).toHaveBeenNthCalledWith(5, 'ui:switchTab', 1)
     expect(rendererSendMock).toHaveBeenNthCalledWith(6, 'ui:switchTerminalTab', 1)
diff --git a/src/main/browser/cdp-bridge-command-module.ts b/src/main/browser/cdp-bridge-command-module.ts
new file mode 100644
index 00000000000..b6cbbb424c3
--- /dev/null
+++ b/src/main/browser/cdp-bridge-command-module.ts
@@ -0,0 +1,132 @@
+import type { WebContents } from 'electron'
+import type { BrowserScreenshotResult, BrowserScrollResult } from '../../shared/runtime-types'
+import type { CdpTabState } from './cdp-auxiliary-commands'
+import type { CdpCommandSender, RefEntry } from './snapshot-engine'
+import type { CdpBridgeState, CdpQueuedCommand } from './cdp-bridge-state'
+import type { CdpDebuggerLifecycle } from './cdp-debugger-lifecycle'
+import type { CdpNavigationOperations } from './cdp-navigation-operations'
+import type { CdpRefResolution } from './cdp-ref-resolution'
+
+export type CdpScrollDirection = BrowserScrollResult extends { scrolled: infer Direction }
+  ? Direction
+  : never
+export type CdpScreenshotFormat = BrowserScreenshotResult extends { format: infer Format }
+  ? Format
+  : never
+
+export abstract class CdpBridgeCommandModule {
+  constructor(
+    private readonly bridgeState: CdpBridgeState,
+    private readonly debuggerLifecycle: CdpDebuggerLifecycle,
+    private readonly refResolution: CdpRefResolution,
+    private readonly navigation: CdpNavigationOperations
+  ) {}
+
+  protected get activeWebContentsId(): number | null {
+    return this.bridgeState.activeWebContentsId
+  }
+
+  protected set activeWebContentsId(webContentsId: number | null) {
+    this.bridgeState.activeWebContentsId = webContentsId
+  }
+
+  protected get tabState(): Map<string, CdpTabState> {
+    return this.bridgeState.tabState
+  }
+
+  protected get commandQueues(): Map<string, CdpQueuedCommand[]> {
+    return this.bridgeState.commandQueues
+  }
+
+  protected getActiveGuest(): WebContents {
+    return this.bridgeState.getActiveGuest()
+  }
+
+  protected getRegisteredTabs(): Map<string, number> {
+    return this.bridgeState.getRegisteredTabs()
+  }
+
+  protected resolveTabId(webContentsId: number): string {
+    return this.bridgeState.resolveTabId(webContentsId)
+  }
+
+  protected resolveTabIdSafe(webContentsId: number): string | null {
+    return this.bridgeState.resolveTabIdSafe(webContentsId)
+  }
+
+  protected getOrCreateTabState(tabId: string): CdpTabState {
+    return this.bridgeState.getOrCreateTabState(tabId)
+  }
+
+  protected removeDebuggerListeners(guest: WebContents, state: CdpTabState): void {
+    this.debuggerLifecycle.removeDebuggerListeners(guest, state)
+  }
+
+  protected ensureDebuggerAttached(guest: WebContents): Promise<void> {
+    return this.debuggerLifecycle.ensureDebuggerAttached(guest)
+  }
+
+  protected makeCdpSender(guest: WebContents, sessionId?: string): CdpCommandSender {
+    return this.debuggerLifecycle.makeCdpSender(guest, sessionId)
+  }
+
+  protected senderForRef(guest: WebContents, ref: RefEntry): CdpCommandSender {
+    return this.refResolution.senderForRef(guest, ref)
+  }
+
+  protected resolveRef(
+    guest: WebContents,
+    sender: CdpCommandSender,
+    ref: string
+  ): Promise<RefEntry> {
+    return this.refResolution.resolveRef(guest, sender, ref)
+  }
+
+  protected scrollIntoView(sender: CdpCommandSender, backendNodeId: number): Promise<void> {
+    return this.refResolution.scrollIntoView(sender, backendNodeId)
+  }
+
+  protected getElementCenter(
+    sender: CdpCommandSender,
+    backendNodeId: number
+  ): Promise<{ cx: number; cy: number }> {
+    return this.refResolution.getElementCenter(sender, backendNodeId)
+  }
+
+  protected getPageCoordinates(
+    guest: WebContents,
+    refEntry: RefEntry,
+    localCx: number,
+    localCy: number
+  ): Promise<{ cx: number; cy: number }> {
+    return this.refResolution.getPageCoordinates(guest, refEntry, localCx, localCy)
+  }
+
+  protected getNavigationId(sender: CdpCommandSender): Promise<string> {
+    return this.navigation.getNavigationId(sender)
+  }
+
+  protected getPreviousHistoryEntryId(sender: CdpCommandSender): Promise<number> {
+    return this.navigation.getPreviousHistoryEntryId(sender)
+  }
+
+  protected waitForLoad(sender: CdpCommandSender, guest: WebContents): Promise<void> {
+    return this.navigation.waitForLoad(sender, guest)
+  }
+
+  protected waitForNetworkIdle(
+    guest: WebContents,
+    timeoutMs: number,
+    idleMs: number
+  ): Promise<void> {
+    return this.navigation.waitForNetworkIdle(guest, timeoutMs, idleMs)
+  }
+
+  protected invalidateRefMap(webContentsId: number): void {
+    this.bridgeState.invalidateRefMap(webContentsId)
+  }
+
+  protected enqueueCommand<T>(execute: () => Promise<T>): Promise<T> {
+    return this.bridgeState.enqueueCommand(execute)
+  }
+}
diff --git a/src/main/browser/cdp-bridge-command-set.ts b/src/main/browser/cdp-bridge-command-set.ts
new file mode 100644
index 00000000000..988c69a2258
--- /dev/null
+++ b/src/main/browser/cdp-bridge-command-set.ts
@@ -0,0 +1,65 @@
+import type { WebContents } from 'electron'
+import { CdpAuxiliaryCommands, type CdpTabState } from './cdp-auxiliary-commands'
+import type { CdpCommandSender } from './snapshot-engine'
+import type { CdpBridgeState } from './cdp-bridge-state'
+import { CdpDebuggerLifecycle } from './cdp-debugger-lifecycle'
+import { CdpElementStateCommands } from './cdp-element-state-commands'
+import { CdpNavigationOperations } from './cdp-navigation-operations'
+import { CdpPageCommands } from './cdp-page-commands'
+import { CdpPointerCommands } from './cdp-pointer-commands'
+import { CdpRefResolution } from './cdp-ref-resolution'
+import { CdpTabCommands } from './cdp-tab-commands'
+import { CdpTextInputCommands } from './cdp-text-input-commands'
+
+export class CdpBridgeCommandSet {
+  readonly auxiliary: CdpAuxiliaryCommands
+  readonly elements: CdpElementStateCommands
+  readonly page: CdpPageCommands
+  readonly pointer: CdpPointerCommands
+  readonly tabs: CdpTabCommands
+  readonly textInput: CdpTextInputCommands
+
+  constructor(bridgeState: CdpBridgeState) {
+    const debuggerLifecycle = new CdpDebuggerLifecycle(bridgeState)
+    const navigation = new CdpNavigationOperations()
+    const refResolution = new CdpRefResolution(bridgeState, debuggerLifecycle, navigation)
+    const moduleArgs = [bridgeState, debuggerLifecycle, refResolution, navigation] as const
+
+    this.elements = new CdpElementStateCommands(...moduleArgs)
+    this.page = new CdpPageCommands(...moduleArgs)
+    this.pointer = new CdpPointerCommands(...moduleArgs)
+    this.tabs = new CdpTabCommands(...moduleArgs)
+    this.textInput = new CdpTextInputCommands(...moduleArgs)
+    this.auxiliary = new CdpAuxiliaryCommands({
+      run: <T>(
+        operation: (context: {
+          guest: WebContents
+          sender: CdpCommandSender
+          state: CdpTabState
+        }) => Promise<T>
+      ): Promise<T> =>
+        bridgeState.enqueueCommand(async () => {
+          const guest = bridgeState.getActiveGuest()
+          const sender = debuggerLifecycle.makeCdpSender(guest)
+          await debuggerLifecycle.ensureDebuggerAttached(guest)
+          const state = bridgeState.getOrCreateTabState(bridgeState.resolveTabId(guest.id))
+          return operation({ guest, sender, state })
+        }),
+      runOnState: <T>(
+        operation: (context: { guest: WebContents; state: CdpTabState }) => Promise<T>
+      ): Promise<T> =>
+        bridgeState.enqueueCommand(async () => {
+          const guest = bridgeState.getActiveGuest()
+          const state = bridgeState.getOrCreateTabState(bridgeState.resolveTabId(guest.id))
+          return operation({ guest, state })
+        }),
+      current: () => {
+        const guest = bridgeState.getActiveGuest()
+        return {
+          guest,
+          state: bridgeState.getOrCreateTabState(bridgeState.resolveTabId(guest.id))
+        }
+      }
+    })
+  }
+}
diff --git a/src/main/browser/cdp-bridge-state.ts b/src/main/browser/cdp-bridge-state.ts
new file mode 100644
index 00000000000..9eed291b04d
--- /dev/null
+++ b/src/main/browser/cdp-bridge-state.ts
@@ -0,0 +1,176 @@
+import { webContents } from 'electron'
+import { BrowserError } from './browser-error'
+import type { CdpTabState } from './cdp-auxiliary-commands'
+
+export type CdpQueuedCommand = {
+  execute: () => Promise<unknown>
+  resolve: (value: unknown) => void
+  reject: (reason: unknown) => void
+}
+
+export type CdpBridgeStateBindings = {
+  getActiveWebContentsId: () => number | null
+  setActiveWebContentsId: (webContentsId: number | null) => void
+  getRegisteredTabs: () => Map<string, number>
+  tabState: Map<string, CdpTabState>
+  commandQueues: Map<string, CdpQueuedCommand[]>
+  processingQueues: Set<string>
+}
+
+export class CdpBridgeState {
+  constructor(private readonly bindings: CdpBridgeStateBindings) {}
+
+  get activeWebContentsId(): number | null {
+    return this.bindings.getActiveWebContentsId()
+  }
+
+  set activeWebContentsId(webContentsId: number | null) {
+    this.bindings.setActiveWebContentsId(webContentsId)
+  }
+
+  get tabState(): Map<string, CdpTabState> {
+    return this.bindings.tabState
+  }
+
+  get commandQueues(): Map<string, CdpQueuedCommand[]> {
+    return this.bindings.commandQueues
+  }
+
+  get processingQueues(): Set<string> {
+    return this.bindings.processingQueues
+  }
+
+  // ── Private helpers ──
+
+  getActiveGuest(): Electron.WebContents {
+    if (this.activeWebContentsId !== null) {
+      const guest = webContents.fromId(this.activeWebContentsId)
+      if (guest && !guest.isDestroyed()) {
+        return guest
+      }
+      // Why: webContentsId goes stale after a process swap; fall through to auto-select since the tab may have a new id.
+      this.activeWebContentsId = null
+    }
+
+    const tabs = [...this.getRegisteredTabs()]
+    if (tabs.length === 0) {
+      throw new BrowserError(
+        'browser_no_tab',
+        'No browser tab is open. Use the Orca UI to open a browser tab first.'
+      )
+    }
+    if (tabs.length === 1) {
+      this.activeWebContentsId = tabs[0][1]
+    } else {
+      throw new BrowserError(
+        'browser_no_tab',
+        "Multiple browser tabs are open. Run 'orca tab list' and 'orca tab switch --index <n>' to select one."
+      )
+    }
+
+    const guest = webContents.fromId(this.activeWebContentsId!)
+    if (!guest || guest.isDestroyed()) {
+      this.activeWebContentsId = null
+      throw new BrowserError(
+        'browser_debugger_detached',
+        "The active browser tab was closed. Run 'orca tab list' to find remaining tabs."
+      )
+    }
+    return guest
+  }
+
+  getRegisteredTabs(): Map<string, number> {
+    return this.bindings.getRegisteredTabs()
+  }
+
+  resolveTabId(webContentsId: number): string {
+    for (const [tabId, wcId] of this.getRegisteredTabs()) {
+      if (wcId === webContentsId) {
+        return tabId
+      }
+    }
+    throw new BrowserError('browser_debugger_detached', 'Tab is no longer registered.')
+  }
+
+  resolveTabIdSafe(webContentsId: number): string | null {
+    for (const [tabId, wcId] of this.getRegisteredTabs()) {
+      if (wcId === webContentsId) {
+        return tabId
+      }
+    }
+    return null
+  }
+
+  getOrCreateTabState(tabId: string): CdpTabState {
+    let state = this.tabState.get(tabId)
+    if (!state) {
+      state = {
+        navigationId: null,
+        snapshotResult: null,
+        debuggerAttached: false,
+        debuggerDetachListener: null,
+        debuggerMessageListener: null,
+        iframeSessions: new Map(),
+        capturing: false,
+        consoleLog: [],
+        networkLog: [],
+        intercepting: false,
+        interceptPatterns: [],
+        pausedRequests: new Map(),
+        networkRequestMap: new Map()
+      }
+      this.tabState.set(tabId, state)
+    }
+    return state
+  }
+
+  invalidateRefMap(webContentsId: number): void {
+    const tabId = this.resolveTabIdSafe(webContentsId)
+    if (tabId) {
+      const state = this.tabState.get(tabId)
+      if (state) {
+        state.snapshotResult = null
+        state.navigationId = null
+      }
+    }
+  }
+
+  async enqueueCommand<T>(execute: () => Promise<T>): Promise<T> {
+    const guest = this.getActiveGuest()
+    const tabId = this.resolveTabId(guest.id)
+
+    return new Promise<T>((resolve, reject) => {
+      let queue = this.commandQueues.get(tabId)
+      if (!queue) {
+        queue = []
+        this.commandQueues.set(tabId, queue)
+      }
+      queue.push({
+        execute: execute as () => Promise<unknown>,
+        resolve: resolve as (value: unknown) => void,
+        reject
+      })
+      this.processQueue(tabId)
+    })
+  }
+
+  private async processQueue(tabId: string): Promise<void> {
+    if (this.processingQueues.has(tabId)) {
+      return
+    }
+    this.processingQueues.add(tabId)
+
+    const queue = this.commandQueues.get(tabId)
+    while (queue && queue.length > 0) {
+      const cmd = queue.shift()!
+      try {
+        const result = await cmd.execute()
+        cmd.resolve(result)
+      } catch (error) {
+        cmd.reject(error)
+      }
+    }
+
+    this.processingQueues.delete(tabId)
+  }
+}
diff --git a/src/main/browser/cdp-bridge.ts b/src/main/browser/cdp-bridge.ts
index 73dec07f2d2..dbe6dadf74d 100644
--- a/src/main/browser/cdp-bridge.ts
+++ b/src/main/browser/cdp-bridge.ts
@@ -1,5 +1,3 @@
-/* eslint-disable max-lines -- Why: the CDP bridge owns debugger lifecycle, ref map management, command serialization, and all browser interaction logic in one module so the browser automation boundary stays coherent. */
-import { webContents } from 'electron'
 import type {
   BrowserCaptureStartResult,
   BrowserCaptureStopResult,
@@ -21,7 +19,6 @@ import type {
   BrowserInterceptEnableResult,
   BrowserInterceptedRequest,
   BrowserKeypressResult,
-  BrowserNetworkEntry,
   BrowserNetworkLogResult,
   BrowserPdfResult,
   BrowserScreenshotResult,
@@ -29,7 +26,6 @@ import type {
   BrowserSelectAllResult,
   BrowserSelectResult,
   BrowserSnapshotResult,
-  BrowserTabInfo,
   BrowserTabListResult,
   BrowserTabSwitchResult,
   BrowserTypeResult,
@@ -37,608 +33,130 @@ import type {
   BrowserViewportResult,
   BrowserWaitResult
 } from '../../shared/runtime-types'
-import { buildSnapshot, type CdpCommandSender, type RefEntry } from './snapshot-engine'
-import { insertTextThroughCdp } from './browser-text-insertion'
 import type { BrowserManager } from './browser-manager'
-import { ANTI_DETECTION_SCRIPT } from './anti-detection'
-import { BrowserError } from './browser-error'
-import { CdpAuxiliaryCommands, type CdpTabState } from './cdp-auxiliary-commands'
-
-const CAPTURE_LOG_LIMIT = 1000
+import type { CdpAuxiliaryCommands, CdpTabState } from './cdp-auxiliary-commands'
+import { CdpBridgeCommandSet } from './cdp-bridge-command-set'
+import { CdpBridgeState, type CdpQueuedCommand } from './cdp-bridge-state'
 
 // Why re-exported: moved to ./browser-error so the runtime can catch it without
 // pulling Chromium in. Existing importers of this path keep working.
 export { BrowserError } from './browser-error'
 
-type QueuedCommand = {
-  execute: () => Promise<unknown>
-  resolve: (value: unknown) => void
-  reject: (reason: unknown) => void
-}
-
 export class CdpBridge {
   private activeWebContentsId: number | null = null
   private readonly tabState = new Map<string, CdpTabState>()
-  private readonly commandQueues = new Map<string, QueuedCommand[]>()
+  private readonly commandQueues = new Map<string, CdpQueuedCommand[]>()
   private readonly processingQueues = new Set<string>()
   private readonly browserManager: BrowserManager
+  private readonly bridgeState: CdpBridgeState
+  private readonly commands: CdpBridgeCommandSet
   private readonly auxiliaryCommands: CdpAuxiliaryCommands
 
   constructor(browserManager: BrowserManager) {
     this.browserManager = browserManager
-    this.auxiliaryCommands = new CdpAuxiliaryCommands({
-      run: <T>(
-        operation: (context: {
-          guest: Electron.WebContents
-          sender: CdpCommandSender
-          state: CdpTabState
-        }) => Promise<T>
-      ): Promise<T> =>
-        this.enqueueCommand(async () => {
-          const guest = this.getActiveGuest()
-          const sender = this.makeCdpSender(guest)
-          await this.ensureDebuggerAttached(guest)
-          const state = this.getOrCreateTabState(this.resolveTabId(guest.id))
-          return operation({ guest, sender, state })
-        }),
-      runOnState: <T>(
-        operation: (context: { guest: Electron.WebContents; state: CdpTabState }) => Promise<T>
-      ): Promise<T> =>
-        this.enqueueCommand(async () => {
-          const guest = this.getActiveGuest()
-          const state = this.getOrCreateTabState(this.resolveTabId(guest.id))
-          return operation({ guest, state })
-        }),
-      current: () => {
-        const guest = this.getActiveGuest()
-        return {
-          guest,
-          state: this.getOrCreateTabState(this.resolveTabId(guest.id))
-        }
-      }
+    this.bridgeState = new CdpBridgeState({
+      getActiveWebContentsId: () => this.activeWebContentsId,
+      setActiveWebContentsId: (webContentsId) => {
+        this.activeWebContentsId = webContentsId
+      },
+      getRegisteredTabs: () => this.getRegisteredTabs(),
+      tabState: this.tabState,
+      commandQueues: this.commandQueues,
+      processingQueues: this.processingQueues
     })
+    this.commands = new CdpBridgeCommandSet(this.bridgeState)
+    this.auxiliaryCommands = this.commands.auxiliary
   }
 
   setActiveTab(webContentsId: number): void {
-    this.activeWebContentsId = webContentsId
+    this.commands.tabs.setActiveTab(webContentsId)
   }
 
   getActiveWebContentsId(): number | null {
-    return this.activeWebContentsId
+    return this.commands.tabs.getActiveWebContentsId()
   }
 
   getActivePageId(_worktreeId?: string): string | null {
-    if (!this.activeWebContentsId) {
-      return null
-    }
-    for (const [tabId, wcId] of this.getRegisteredTabs()) {
-      if (wcId === this.activeWebContentsId) {
-        return tabId
-      }
-    }
-    return null
+    return this.commands.tabs.getActivePageId(_worktreeId)
   }
 
   getPageInfo(
     _worktreeId?: string,
     browserPageId?: string
   ): { browserPageId: string; url: string; title: string } | null {
-    // Why: expose the same metadata lookup as other bridges, though the CDP bridge routes only one active tab.
-    const resolvedPageId = browserPageId ?? this.getActivePageId()
-    if (!resolvedPageId) {
-      return null
-    }
-    const webContentsId = this.getRegisteredTabs().get(resolvedPageId)
-    if (webContentsId == null) {
-      return null
-    }
-    const guest = webContents.fromId(webContentsId)
-    if (!guest || guest.isDestroyed()) {
-      return null
-    }
-    return {
-      browserPageId: resolvedPageId,
-      url: guest.getURL(),
-      title: guest.getTitle()
-    }
+    return this.commands.tabs.getPageInfo(_worktreeId, browserPageId)
   }
 
   async snapshot(): Promise<BrowserSnapshotResult> {
-    return this.enqueueCommand(async () => {
-      const guest = this.getActiveGuest()
-      const sender = this.makeCdpSender(guest)
-      await this.ensureDebuggerAttached(guest)
-
-      const tabId = this.resolveTabId(guest.id)
-      const state = this.getOrCreateTabState(tabId)
-
-      const result = await buildSnapshot(sender, state.iframeSessions, (sessionId) =>
-        this.makeCdpSender(guest, sessionId)
-      )
-      state.snapshotResult = result
-
-      const navId = await this.getNavigationId(sender)
-      state.navigationId = navId
-
-      return {
-        browserPageId: tabId,
-        snapshot: result.snapshot,
-        refs: result.refs,
-        url: guest.getURL(),
-        title: guest.getTitle()
-      }
-    })
+    return this.commands.page.snapshot()
   }
 
   async click(element: string): Promise<BrowserClickResult> {
-    return this.enqueueCommand(async () => {
-      const guest = this.getActiveGuest()
-      const sender = this.makeCdpSender(guest)
-      await this.ensureDebuggerAttached(guest)
-
-      const node = await this.resolveRef(guest, sender, element)
-      const refSender = this.senderForRef(guest, node)
-
-      await this.scrollIntoView(refSender, node.backendDOMNodeId)
-      const localCenter = await this.getElementCenter(refSender, node.backendDOMNodeId)
-      const { cx, cy } = await this.getPageCoordinates(guest, node, localCenter.cx, localCenter.cy)
-
-      // Why: mouseMoved fires mouseenter/mouseover so sites reveal hover-dependent menus/targets before the click lands.
-      await sender('Input.dispatchMouseEvent', { type: 'mouseMoved', x: cx, y: cy })
-      await sender('Input.dispatchMouseEvent', {
-        type: 'mousePressed',
-        x: cx,
-        y: cy,
-        button: 'left',
-        clickCount: 1
-      })
-      await sender('Input.dispatchMouseEvent', {
-        type: 'mouseReleased',
-        x: cx,
-        y: cy,
-        button: 'left',
-        clickCount: 1
-      })
-
-      return { clicked: element }
-    })
+    return this.commands.pointer.click(element)
   }
 
   async hover(element: string): Promise<BrowserHoverResult> {
-    return this.enqueueCommand(async () => {
-      const guest = this.getActiveGuest()
-      const sender = this.makeCdpSender(guest)
-      await this.ensureDebuggerAttached(guest)
-
-      const node = await this.resolveRef(guest, sender, element)
-      const refSender = this.senderForRef(guest, node)
-      await this.scrollIntoView(refSender, node.backendDOMNodeId)
-      const localCenter = await this.getElementCenter(refSender, node.backendDOMNodeId)
-      const { cx, cy } = await this.getPageCoordinates(guest, node, localCenter.cx, localCenter.cy)
-
-      await sender('Input.dispatchMouseEvent', { type: 'mouseMoved', x: cx, y: cy })
-
-      return { hovered: element }
-    })
+    return this.commands.pointer.hover(element)
   }
 
   async drag(fromElement: string, toElement: string): Promise<BrowserDragResult> {
-    return this.enqueueCommand(async () => {
-      const guest = this.getActiveGuest()
-      const sender = this.makeCdpSender(guest)
-      await this.ensureDebuggerAttached(guest)
-
-      const fromNode = await this.resolveRef(guest, sender, fromElement)
-      const toNode = await this.resolveRef(guest, sender, toElement)
-      const fromSender = this.senderForRef(guest, fromNode)
-      const toSender = this.senderForRef(guest, toNode)
-
-      await this.scrollIntoView(fromSender, fromNode.backendDOMNodeId)
-      const fromLocal = await this.getElementCenter(fromSender, fromNode.backendDOMNodeId)
-      const from = await this.getPageCoordinates(guest, fromNode, fromLocal.cx, fromLocal.cy)
-      const toLocal = await this.getElementCenter(toSender, toNode.backendDOMNodeId)
-      const to = await this.getPageCoordinates(guest, toNode, toLocal.cx, toLocal.cy)
-
-      // Why: interpolate the drag so intermediate elements fire dragenter/dragover, which many drag-and-drop libs require.
-      await sender('Input.dispatchMouseEvent', { type: 'mouseMoved', x: from.cx, y: from.cy })
-      await sender('Input.dispatchMouseEvent', {
-        type: 'mousePressed',
-        x: from.cx,
-        y: from.cy,
-        button: 'left'
-      })
-
-      const steps = 10
-      for (let i = 1; i <= steps; i++) {
-        const x = from.cx + ((to.cx - from.cx) * i) / steps
-        const y = from.cy + ((to.cy - from.cy) * i) / steps
-        await sender('Input.dispatchMouseEvent', { type: 'mouseMoved', x, y, buttons: 1 })
-        await new Promise((r) => setTimeout(r, 10))
-      }
-
-      await sender('Input.dispatchMouseEvent', {
-        type: 'mouseReleased',
-        x: to.cx,
-        y: to.cy,
-        button: 'left'
-      })
-
-      return { dragged: { from: fromElement, to: toElement } }
-    })
+    return this.commands.pointer.drag(fromElement, toElement)
   }
 
   async uploadFile(element: string, filePaths: string[]): Promise<BrowserUploadResult> {
-    return this.enqueueCommand(async () => {
-      const guest = this.getActiveGuest()
-      const sender = this.makeCdpSender(guest)
-      await this.ensureDebuggerAttached(guest)
-
-      const node = await this.resolveRef(guest, sender, element)
-      const refSender = this.senderForRef(guest, node)
-      await refSender('DOM.setFileInputFiles', {
-        files: filePaths,
-        backendNodeId: node.backendDOMNodeId
-      })
-
-      return { uploaded: filePaths.length }
-    })
+    return this.commands.elements.uploadFile(element, filePaths)
   }
 
   async goto(url: string): Promise<BrowserGotoResult> {
-    return this.enqueueCommand(async () => {
-      const guest = this.getActiveGuest()
-      const sender = this.makeCdpSender(guest)
-      await this.ensureDebuggerAttached(guest)
-
-      const { errorText } = (await sender('Page.navigate', { url })) as {
-        errorText?: string
-      }
-
-      if (errorText) {
-        throw new BrowserError('browser_navigation_failed', `Navigation failed: ${errorText}`)
-      }
-
-      await this.waitForLoad(sender, guest)
-      this.invalidateRefMap(guest.id)
-
-      return { url: guest.getURL(), title: guest.getTitle() }
-    })
+    return this.commands.page.goto(url)
   }
 
   async fill(element: string, value: string): Promise<BrowserFillResult> {
-    return this.enqueueCommand(async () => {
-      const guest = this.getActiveGuest()
-      const sender = this.makeCdpSender(guest)
-      await this.ensureDebuggerAttached(guest)
-
-      const node = await this.resolveRef(guest, sender, element)
-      const refSender = this.senderForRef(guest, node)
-
-      await refSender('DOM.focus', { backendNodeId: node.backendDOMNodeId })
-
-      // Why: select-all + delete clears the existing value before typing, matching Playwright/agent-browser fill().
-      await sender('Input.dispatchKeyEvent', {
-        type: 'keyDown',
-        key: 'a',
-        modifiers: process.platform === 'darwin' ? 4 : 2
-      })
-      await sender('Input.dispatchKeyEvent', {
-        type: 'keyUp',
-        key: 'a',
-        modifiers: process.platform === 'darwin' ? 4 : 2
-      })
-      await sender('Input.dispatchKeyEvent', { type: 'keyDown', key: 'Delete' })
-      await sender('Input.dispatchKeyEvent', { type: 'keyUp', key: 'Delete' })
-
-      await insertTextThroughCdp(sender, value)
-
-      // Why: React's synthetic listeners ignore native key events, so dispatch input/change so controlled components update.
-      // Why: use refSender for iframe sessions so document.activeElement is the focused element inside the iframe, not the parent <iframe>.
-      const eventSender = node.sessionId ? refSender : sender
-      await eventSender('Runtime.evaluate', {
-        expression: `(() => {
-          const el = document.activeElement;
-          if (el) {
-            el.dispatchEvent(new Event('input', { bubbles: true }));
-            el.dispatchEvent(new Event('change', { bubbles: true }));
-          }
-        })()`,
-        returnByValue: true
-      })
-
-      return { filled: element }
-    })
+    return this.commands.textInput.fill(element, value)
   }
 
   async type(input: string): Promise<BrowserTypeResult> {
-    return this.enqueueCommand(async () => {
-      const guest = this.getActiveGuest()
-      const sender = this.makeCdpSender(guest)
-      await this.ensureDebuggerAttached(guest)
-
-      await insertTextThroughCdp(sender, input)
-      return { typed: true }
-    })
+    return this.commands.textInput.type(input)
   }
 
   async select(element: string, value: string): Promise<BrowserSelectResult> {
-    return this.enqueueCommand(async () => {
-      const guest = this.getActiveGuest()
-      const sender = this.makeCdpSender(guest)
-      await this.ensureDebuggerAttached(guest)
-
-      const node = await this.resolveRef(guest, sender, element)
-      const refSender = this.senderForRef(guest, node)
-      const { nodeId } = (await refSender('DOM.requestNode', {
-        backendNodeId: node.backendDOMNodeId
-      })) as { nodeId: number }
-
-      const { object } = (await refSender('DOM.resolveNode', { nodeId })) as {
-        object: { objectId: string }
-      }
-
-      // Why: match on label (textContent) and value so opaque option IDs still select; also handles combobox via click.
-      await refSender('Runtime.callFunctionOn', {
-        objectId: object.objectId,
-        functionDeclaration: `function(val) {
-          if (this.options) {
-            for (const opt of this.options) {
-              if (opt.value === val || opt.textContent.trim() === val) {
-                this.value = opt.value;
-                this.dispatchEvent(new Event('input', { bubbles: true }));
-                this.dispatchEvent(new Event('change', { bubbles: true }));
-                return;
-              }
-            }
-            this.value = val;
-            this.dispatchEvent(new Event('input', { bubbles: true }));
-            this.dispatchEvent(new Event('change', { bubbles: true }));
-          } else {
-            const opts = this.querySelectorAll('[role="option"], li, [data-value]');
-            for (const opt of opts) {
-              const text = opt.textContent ? opt.textContent.trim() : '';
-              const dv = opt.getAttribute('data-value');
-              if (text === val || dv === val) {
-                opt.click();
-                return;
-              }
-            }
-          }
-        }`,
-        arguments: [{ value }]
-      })
-
-      return { selected: element }
-    })
+    return this.commands.elements.select(element, value)
   }
 
   async scroll(direction: 'up' | 'down', amount?: number): Promise<BrowserScrollResult> {
-    return this.enqueueCommand(async () => {
-      const guest = this.getActiveGuest()
-      const sender = this.makeCdpSender(guest)
-      await this.ensureDebuggerAttached(guest)
-
-      // Why: JS scrollBy needs no focus and is deterministic, unlike mouseWheel which is unreliable in Electron webviews.
-      const expr = amount
-        ? `window.scrollBy(0, ${direction === 'down' ? amount : -amount})`
-        : `window.scrollBy(0, ${direction === 'down' ? 'window.innerHeight' : '-window.innerHeight'})`
-      await sender('Runtime.evaluate', { expression: expr, returnByValue: true })
-
-      return { scrolled: direction }
-    })
+    return this.commands.page.scroll(direction, amount)
   }
 
   async wait(timeoutMs = 5000): Promise<BrowserWaitResult> {
-    return this.enqueueCommand(async () => {
-      const guest = this.getActiveGuest()
-      await this.ensureDebuggerAttached(guest)
-      await this.waitForNetworkIdle(guest, timeoutMs, 500)
-      return { waited: true }
-    })
+    return this.commands.page.wait(timeoutMs)
   }
 
   async check(element: string, checked: boolean): Promise<BrowserCheckResult> {
-    return this.enqueueCommand(async () => {
-      const guest = this.getActiveGuest()
-      const sender = this.makeCdpSender(guest)
-      await this.ensureDebuggerAttached(guest)
-
-      const node = await this.resolveRef(guest, sender, element)
-      const refSender = this.senderForRef(guest, node)
-
-      const { nodeId } = (await refSender('DOM.requestNode', {
-        backendNodeId: node.backendDOMNodeId
-      })) as { nodeId: number }
-      const { object } = (await refSender('DOM.resolveNode', { nodeId })) as {
-        object: { objectId: string }
-      }
-
-      const { result: currentState } = (await refSender('Runtime.callFunctionOn', {
-        objectId: object.objectId,
-        functionDeclaration: 'function() { return this.checked; }',
-        returnByValue: true
-      })) as { result: { value: boolean } }
-
-      if (currentState.value !== checked) {
-        await this.scrollIntoView(refSender, node.backendDOMNodeId)
-        const localCenter = await this.getElementCenter(refSender, node.backendDOMNodeId)
-        const { cx, cy } = await this.getPageCoordinates(
-          guest,
-          node,
-          localCenter.cx,
-          localCenter.cy
-        )
-        await sender('Input.dispatchMouseEvent', { type: 'mouseMoved', x: cx, y: cy })
-        await sender('Input.dispatchMouseEvent', {
-          type: 'mousePressed',
-          x: cx,
-          y: cy,
-          button: 'left',
-          clickCount: 1
-        })
-        await sender('Input.dispatchMouseEvent', {
-          type: 'mouseReleased',
-          x: cx,
-          y: cy,
-          button: 'left',
-          clickCount: 1
-        })
-
-        // Why: custom checkboxes may not toggle from a coordinate click; verify state and fall back to programmatic .click().
-        try {
-          const { result: afterState } = (await refSender('Runtime.callFunctionOn', {
-            objectId: object.objectId,
-            functionDeclaration: 'function() { return this.checked; }',
-            returnByValue: true
-          })) as { result: { value: boolean } }
-
-          if (afterState.value !== checked) {
-            await refSender('Runtime.callFunctionOn', {
-              objectId: object.objectId,
-              functionDeclaration: 'function() { this.click(); }'
-            })
-          }
-        } catch {
-          // objectId stale after re-render — click was dispatched, accept the result
-        }
-      }
-
-      return { checked }
-    })
+    return this.commands.elements.check(element, checked)
   }
 
   async focus(element: string): Promise<BrowserFocusResult> {
-    return this.enqueueCommand(async () => {
-      const guest = this.getActiveGuest()
-      const sender = this.makeCdpSender(guest)
-      await this.ensureDebuggerAttached(guest)
-
-      const node = await this.resolveRef(guest, sender, element)
-      const refSender = this.senderForRef(guest, node)
-      await refSender('DOM.focus', { backendNodeId: node.backendDOMNodeId })
-
-      return { focused: element }
-    })
+    return this.commands.textInput.focus(element)
   }
 
   async clear(element: string): Promise<BrowserClearResult> {
-    return this.enqueueCommand(async () => {
-      const guest = this.getActiveGuest()
-      const sender = this.makeCdpSender(guest)
-      await this.ensureDebuggerAttached(guest)
-
-      const node = await this.resolveRef(guest, sender, element)
-      const refSender = this.senderForRef(guest, node)
-
-      const { nodeId } = (await refSender('DOM.requestNode', {
-        backendNodeId: node.backendDOMNodeId
-      })) as { nodeId: number }
-      const { object } = (await refSender('DOM.resolveNode', { nodeId })) as {
-        object: { objectId: string }
-      }
-
-      await refSender('Runtime.callFunctionOn', {
-        objectId: object.objectId,
-        functionDeclaration: `function() {
-          this.value = '';
-          this.dispatchEvent(new Event('input', { bubbles: true }));
-          this.dispatchEvent(new Event('change', { bubbles: true }));
-        }`
-      })
-
-      return { cleared: element }
-    })
+    return this.commands.textInput.clear(element)
   }
 
   async selectAll(element: string): Promise<BrowserSelectAllResult> {
-    return this.enqueueCommand(async () => {
-      const guest = this.getActiveGuest()
-      const sender = this.makeCdpSender(guest)
-      await this.ensureDebuggerAttached(guest)
-
-      const node = await this.resolveRef(guest, sender, element)
-      const refSender = this.senderForRef(guest, node)
-      await refSender('DOM.focus', { backendNodeId: node.backendDOMNodeId })
-
-      await sender('Input.dispatchKeyEvent', {
-        type: 'keyDown',
-        key: 'a',
-        modifiers: process.platform === 'darwin' ? 4 : 2
-      })
-      await sender('Input.dispatchKeyEvent', {
-        type: 'keyUp',
-        key: 'a',
-        modifiers: process.platform === 'darwin' ? 4 : 2
-      })
-
-      return { selected: element }
-    })
+    return this.commands.textInput.selectAll(element)
   }
 
   async keypress(key: string): Promise<BrowserKeypressResult> {
-    return this.enqueueCommand(async () => {
-      const guest = this.getActiveGuest()
-      const sender = this.makeCdpSender(guest)
-      await this.ensureDebuggerAttached(guest)
-
-      const keyDef = resolveKeyDefinition(key)
-      await sender('Input.dispatchKeyEvent', {
-        type: 'keyDown',
-        ...keyDef
-      })
-      await sender('Input.dispatchKeyEvent', {
-        type: 'keyUp',
-        ...keyDef
-      })
-
-      return { pressed: key }
-    })
+    return this.commands.textInput.keypress(key)
   }
 
   async pdf(): Promise<BrowserPdfResult> {
-    return this.enqueueCommand(async () => {
-      const guest = this.getActiveGuest()
-      const sender = this.makeCdpSender(guest)
-      await this.ensureDebuggerAttached(guest)
-
-      const { data } = (await sender('Page.printToPDF', {
-        printBackground: true
-      })) as { data: string }
-
-      return { data }
-    })
+    return this.commands.page.pdf()
   }
 
   async fullPageScreenshot(format: 'png' | 'jpeg' = 'png'): Promise<BrowserScreenshotResult> {
-    return this.enqueueCommand(async () => {
-      const guest = this.getActiveGuest()
-      const sender = this.makeCdpSender(guest)
-      await this.ensureDebuggerAttached(guest)
-
-      const metrics = (await sender('Page.getLayoutMetrics')) as {
-        cssContentSize?: { width: number; height: number }
-        contentSize?: { width: number; height: number }
-      }
-      // Why: screenshot clip uses CSS pixels; on HiDPI, device-pixel contentSize tiles duplicates, so prefer cssContentSize.
-      const contentSize = metrics.cssContentSize ?? metrics.contentSize
-      if (!contentSize) {
-        throw new BrowserError('browser_error', 'Unable to determine full-page screenshot bounds')
-      }
-
-      const { data } = (await sender('Page.captureScreenshot', {
-        format,
-        captureBeyondViewport: true,
-        clip: {
-          x: 0,
-          y: 0,
-          width: Math.ceil(contentSize.width),
-          height: Math.ceil(contentSize.height),
-          scale: 1
-        }
-      })) as { data: string }
-
-      return { data, format }
-    })
+    return this.commands.page.fullPageScreenshot(format)
   }
 
   // ── Cookie management ──
@@ -720,185 +238,35 @@ export class CdpBridge {
   }
 
   async back(): Promise<{ url: string; title: string }> {
-    return this.enqueueCommand(async () => {
-      const guest = this.getActiveGuest()
-      const sender = this.makeCdpSender(guest)
-      await this.ensureDebuggerAttached(guest)
-
-      await sender('Page.navigateToHistoryEntry', {
-        entryId: await this.getPreviousHistoryEntryId(sender)
-      })
-      await this.waitForLoad(sender, guest)
-      this.invalidateRefMap(guest.id)
-
-      return { url: guest.getURL(), title: guest.getTitle() }
-    })
+    return this.commands.page.back()
   }
 
   async reload(): Promise<{ url: string; title: string }> {
-    return this.enqueueCommand(async () => {
-      const guest = this.getActiveGuest()
-      const sender = this.makeCdpSender(guest)
-      await this.ensureDebuggerAttached(guest)
-
-      await sender('Page.reload')
-      await this.waitForLoad(sender, guest)
-      this.invalidateRefMap(guest.id)
-
-      return { url: guest.getURL(), title: guest.getTitle() }
-    })
+    return this.commands.page.reload()
   }
 
   async screenshot(format: 'png' | 'jpeg' = 'png'): Promise<BrowserScreenshotResult> {
-    return this.enqueueCommand(async () => {
-      const guest = this.getActiveGuest()
-      const sender = this.makeCdpSender(guest)
-      await this.ensureDebuggerAttached(guest)
-
-      const { data } = (await sender('Page.captureScreenshot', {
-        format
-      })) as { data: string }
-
-      return { data, format }
-    })
+    return this.commands.page.screenshot(format)
   }
 
   async evaluate(expression: string): Promise<BrowserEvalResult> {
-    return this.enqueueCommand(async () => {
-      const guest = this.getActiveGuest()
-      const sender = this.makeCdpSender(guest)
-      await this.ensureDebuggerAttached(guest)
-
-      const { result, exceptionDetails } = (await sender('Runtime.evaluate', {
-        expression,
-        returnByValue: true
-      })) as {
-        result: { value?: unknown; type: string; description?: string }
-        exceptionDetails?: { text: string; exception?: { description?: string } }
-      }
-
-      if (exceptionDetails) {
-        throw new BrowserError(
-          'browser_eval_error',
-          exceptionDetails.exception?.description ?? exceptionDetails.text
-        )
-      }
-
-      const valueStr =
-        result.value !== undefined ? String(result.value) : (result.description ?? '')
-      // Why: include origin to match agent-browser's BrowserEvalResult shape across both bridges.
-      const { result: urlResult } = (await sender('Runtime.evaluate', {
-        expression: 'location.origin',
-        returnByValue: true
-      })) as { result: { value: string } }
-      return {
-        result: valueStr,
-        origin: urlResult.value
-      }
-    })
+    return this.commands.page.evaluate(expression)
   }
 
   tabList(): BrowserTabListResult {
-    const tabs: BrowserTabInfo[] = []
-    let index = 0
-
-    for (const [tabId, wcId] of this.getRegisteredTabs()) {
-      const guest = webContents.fromId(wcId)
-      if (!guest || guest.isDestroyed()) {
-        continue
-      }
-      tabs.push({
-        browserPageId: tabId,
-        index,
-        url: guest.getURL(),
-        title: guest.getTitle(),
-        active: wcId === this.activeWebContentsId
-      })
-      index++
-    }
-
-    return { tabs }
+    return this.commands.tabs.tabList()
   }
 
   async tabSwitch(index: number): Promise<BrowserTabSwitchResult> {
-    // Why: filter to live tabs so indices match tabList(), skipping destroyed-but-uncleaned entries.
-    const liveEntries = [...this.getRegisteredTabs()].filter(([_, wcId]) => {
-      const guest = webContents.fromId(wcId)
-      return guest && !guest.isDestroyed()
-    })
-    if (index < 0 || index >= liveEntries.length) {
-      throw new BrowserError(
-        'browser_tab_not_found',
-        `Tab index ${index} is out of range. ${liveEntries.length} tab(s) open.`
-      )
-    }
-
-    const [tabId, wcId] = liveEntries[index]
-    if (this.activeWebContentsId !== null) {
-      this.invalidateRefMap(this.activeWebContentsId)
-    }
-    this.activeWebContentsId = wcId
-
-    return { switched: index, browserPageId: tabId }
+    return this.commands.tabs.tabSwitch(index)
   }
 
   onTabClosed(webContentsId: number): void {
-    if (this.activeWebContentsId === webContentsId) {
-      this.activeWebContentsId = null
-    }
-    const tabId = this.resolveTabIdSafe(webContentsId)
-    if (tabId) {
-      const state = this.tabState.get(tabId)
-      const guest = webContents.fromId(webContentsId)
-      if (state && guest) {
-        this.removeDebuggerListeners(guest, state)
-      }
-      this.tabState.delete(tabId)
-      this.commandQueues.delete(tabId)
-    }
+    this.commands.tabs.onTabClosed(webContentsId)
   }
 
   onTabChanged(webContentsId: number): void {
-    this.activeWebContentsId = webContentsId
-  }
-
-  // ── Private helpers ──
-
-  private getActiveGuest(): Electron.WebContents {
-    if (this.activeWebContentsId !== null) {
-      const guest = webContents.fromId(this.activeWebContentsId)
-      if (guest && !guest.isDestroyed()) {
-        return guest
-      }
-      // Why: webContentsId goes stale after a process swap; fall through to auto-select since the tab may have a new id.
-      this.activeWebContentsId = null
-    }
-
-    const tabs = [...this.getRegisteredTabs()]
-    if (tabs.length === 0) {
-      throw new BrowserError(
-        'browser_no_tab',
-        'No browser tab is open. Use the Orca UI to open a browser tab first.'
-      )
-    }
-    if (tabs.length === 1) {
-      this.activeWebContentsId = tabs[0][1]
-    } else {
-      throw new BrowserError(
-        'browser_no_tab',
-        "Multiple browser tabs are open. Run 'orca tab list' and 'orca tab switch --index <n>' to select one."
-      )
-    }
-
-    const guest = webContents.fromId(this.activeWebContentsId!)
-    if (!guest || guest.isDestroyed()) {
-      this.activeWebContentsId = null
-      throw new BrowserError(
-        'browser_debugger_detached',
-        "The active browser tab was closed. Run 'orca tab list' to find remaining tabs."
-      )
-    }
-    return guest
+    this.commands.tabs.onTabChanged(webContentsId)
   }
 
   private getRegisteredTabs(): Map<string, number> {
@@ -906,706 +274,4 @@ export class CdpBridge {
     return (this.browserManager as unknown as { webContentsIdByTabId: Map<string, number> })
       .webContentsIdByTabId
   }
-
-  private resolveTabId(webContentsId: number): string {
-    for (const [tabId, wcId] of this.getRegisteredTabs()) {
-      if (wcId === webContentsId) {
-        return tabId
-      }
-    }
-    throw new BrowserError('browser_debugger_detached', 'Tab is no longer registered.')
-  }
-
-  private resolveTabIdSafe(webContentsId: number): string | null {
-    for (const [tabId, wcId] of this.getRegisteredTabs()) {
-      if (wcId === webContentsId) {
-        return tabId
-      }
-    }
-    return null
-  }
-
-  private getOrCreateTabState(tabId: string): CdpTabState {
-    let state = this.tabState.get(tabId)
-    if (!state) {
-      state = {
-        navigationId: null,
-        snapshotResult: null,
-        debuggerAttached: false,
-        debuggerDetachListener: null,
-        debuggerMessageListener: null,
-        iframeSessions: new Map(),
-        capturing: false,
-        consoleLog: [],
-        networkLog: [],
-        intercepting: false,
-        interceptPatterns: [],
-        pausedRequests: new Map(),
-        networkRequestMap: new Map()
-      }
-      this.tabState.set(tabId, state)
-    }
-    return state
-  }
-
-  private removeDebuggerListeners(guest: Electron.WebContents, state: CdpTabState): void {
-    const detachListener = state.debuggerDetachListener
-    const messageListener = state.debuggerMessageListener
-    state.debuggerDetachListener = null
-    state.debuggerMessageListener = null
-
-    if (detachListener) {
-      try {
-        guest.debugger.removeListener('detach', detachListener as never)
-      } catch {
-        // guest may already be destroyed
-      }
-    }
-    if (messageListener) {
-      try {
-        guest.debugger.removeListener('message', messageListener as never)
-      } catch {
-        // guest may already be destroyed
-      }
-    }
-  }
-
-  private async ensureDebuggerAttached(guest: Electron.WebContents): Promise<void> {
-    const tabId = this.resolveTabId(guest.id)
-    const state = this.getOrCreateTabState(tabId)
-    if (state.debuggerAttached && guest.debugger.isAttached()) {
-      return
-    }
-
-    try {
-      // Why: BrowserManager already attached the debugger; reuse it to avoid "another debugger is already attached."
-      if (!guest.debugger.isAttached()) {
-        guest.debugger.attach('1.3')
-      }
-    } catch {
-      throw new BrowserError(
-        'browser_cdp_error',
-        'Could not attach debugger. DevTools may already be open for this tab.'
-      )
-    }
-
-    const sender = this.makeCdpSender(guest)
-    await sender('Page.enable')
-    await sender('DOM.enable')
-    await sender('Network.enable')
-
-    // Why: OOPIF iframes are invisible to the parent CDP session; flatten:true gives each a targetable sessionId.
-    await sender('Target.setAutoAttach', {
-      autoAttach: true,
-      waitForDebuggerOnStart: false,
-      flatten: true
-    })
-
-    // Why: CDP attach exposes automation signals (navigator.webdriver) that Cloudflare checks; override per new document.
-    await sender('Page.addScriptToEvaluateOnNewDocument', {
-      source: ANTI_DETECTION_SCRIPT
-    })
-
-    // Why: only remove this bridge's listeners; screencast/proxy sessions share the debugger and own their teardown.
-    this.removeDebuggerListeners(guest, state)
-
-    const detachListener = (): void => {
-      state.debuggerAttached = false
-      state.snapshotResult = null
-      state.iframeSessions.clear()
-      this.removeDebuggerListeners(guest, state)
-    }
-
-    const messageListener = (_event: unknown, method: string, params: unknown): void => {
-      if (method === 'Page.frameNavigated') {
-        state.snapshotResult = null
-        state.navigationId = null
-      }
-      // Why: an unhandled JS dialog blocks all subsequent CDP commands; auto-dismiss to avoid hanging.
-      if (method === 'Page.javascriptDialogOpening') {
-        const dialog = params as { type: string; message: string } | undefined
-        guest.debugger
-          .sendCommand('Page.handleJavaScriptDialog', {
-            accept: dialog?.type !== 'beforeunload'
-          })
-          .catch(() => {})
-      }
-      // Why: track iframe sessions so CDP commands and AX queries route to the correct session.
-      if (method === 'Target.attachedToTarget') {
-        const p = params as
-          | {
-              sessionId?: string
-              targetInfo?: { type?: string; targetId?: string }
-            }
-          | undefined
-        if (p?.sessionId && p.targetInfo?.type === 'iframe' && p.targetInfo.targetId) {
-          state.iframeSessions.set(p.targetInfo.targetId, p.sessionId)
-          guest.debugger.sendCommand('DOM.enable', {}, p.sessionId).catch(() => {})
-          guest.debugger.sendCommand('Accessibility.enable', {}, p.sessionId).catch(() => {})
-          guest.debugger.sendCommand('Runtime.enable', {}, p.sessionId).catch(() => {})
-        }
-      }
-      if (method === 'Target.detachedFromTarget') {
-        const p = params as { sessionId?: string } | undefined
-        if (p?.sessionId) {
-          for (const [frameId, sid] of state.iframeSessions) {
-            if (sid === p.sessionId) {
-              state.iframeSessions.delete(frameId)
-              break
-            }
-          }
-        }
-      }
-      // Why: buffer console/network events per-tab so the agent can retrieve them on demand.
-      if (state.capturing) {
-        if (method === 'Runtime.consoleAPICalled') {
-          const p = params as
-            | {
-                type?: string
-                args?: { value?: string; description?: string }[]
-                timestamp?: number
-                stackTrace?: { callFrames?: { url?: string; lineNumber?: number }[] }
-              }
-            | undefined
-          if (p) {
-            const text = (p.args ?? []).map((a) => a.value ?? a.description ?? '').join(' ')
-            state.consoleLog.push({
-              level: p.type ?? 'log',
-              text,
-              timestamp: p.timestamp ?? Date.now(),
-              url: p.stackTrace?.callFrames?.[0]?.url,
-              line: p.stackTrace?.callFrames?.[0]?.lineNumber
-            })
-            if (state.consoleLog.length > CAPTURE_LOG_LIMIT) {
-              state.consoleLog.shift()
-            }
-          }
-        }
-        if (method === 'Network.responseReceived') {
-          const p = params as
-            | {
-                requestId?: string
-                response?: {
-                  url?: string
-                  status?: number
-                  mimeType?: string
-                  headers?: Record<string, string>
-                }
-                type?: string
-                timestamp?: number
-              }
-            | undefined
-          if (p?.response) {
-            const entry: BrowserNetworkEntry = {
-              url: p.response.url ?? '',
-              method: '',
-              status: p.response.status ?? 0,
-              mimeType: p.response.mimeType ?? '',
-              size: 0,
-              timestamp: p.timestamp ?? Date.now()
-            }
-            state.networkLog.push(entry)
-            // Why: map requestId→entry so loadingFinished attributes size to the right response, not the latest one.
-            if (p.requestId) {
-              state.networkRequestMap.set(p.requestId, entry)
-            }
-            if (state.networkLog.length > CAPTURE_LOG_LIMIT) {
-              const evicted = state.networkLog.shift()
-              if (evicted) {
-                for (const [requestId, requestEntry] of state.networkRequestMap) {
-                  if (requestEntry === evicted) {
-                    state.networkRequestMap.delete(requestId)
-                    break
-                  }
-                }
-              }
-            }
-          }
-        }
-        if (method === 'Network.loadingFinished' || method === 'Network.loadingFailed') {
-          const p = params as { requestId?: string; encodedDataLength?: number } | undefined
-          if (p?.requestId) {
-            const entry = state.networkRequestMap.get(p.requestId)
-            if (entry && method === 'Network.loadingFinished' && p.encodedDataLength) {
-              entry.size = p.encodedDataLength
-            }
-            state.networkRequestMap.delete(p.requestId)
-          }
-        }
-      }
-      // Why: buffer paused requests so the agent can later inspect and continue or block them.
-      if (state.intercepting && method === 'Fetch.requestPaused') {
-        const p = params as
-          | {
-              requestId?: string
-              request?: { url?: string; method?: string; headers?: Record<string, string> }
-              resourceType?: string
-            }
-          | undefined
-        if (p?.requestId && p.request) {
-          state.pausedRequests.set(p.requestId, {
-            id: p.requestId,
-            url: p.request.url ?? '',
-            method: p.request.method ?? 'GET',
-            headers: (p.request.headers ?? {}) as Record<string, string>,
-            resourceType: p.resourceType ?? 'Other'
-          })
-        }
-      }
-    }
-
-    state.debuggerDetachListener = detachListener
-    state.debuggerMessageListener = messageListener
-    guest.debugger.on('detach', detachListener)
-    guest.debugger.on('message', messageListener)
-
-    state.debuggerAttached = true
-  }
-
-  private makeCdpSender(guest: Electron.WebContents, sessionId?: string): CdpCommandSender {
-    return (method: string, params?: Record<string, unknown>) => {
-      const command = guest.debugger.sendCommand(method, params, sessionId) as Promise<unknown>
-      // Why: Electron's CDP sendCommand can hang on a stale debugger session, so a 10s timeout bounds the RPC.
-      let timer: ReturnType<typeof setTimeout>
-      return Promise.race([
-        command.finally(() => clearTimeout(timer)),
-        new Promise<never>((_, reject) => {
-          timer = setTimeout(
-            () =>
-              reject(new BrowserError('browser_cdp_error', `CDP command "${method}" timed out`)),
-            10_000
-          )
-        })
-      ])
-    }
-  }
-
-  private senderForRef(guest: Electron.WebContents, ref: RefEntry): CdpCommandSender {
-    return ref.sessionId ? this.makeCdpSender(guest, ref.sessionId) : this.makeCdpSender(guest)
-  }
-
-  private async resolveRef(
-    guest: Electron.WebContents,
-    sender: CdpCommandSender,
-    ref: string
-  ): Promise<RefEntry> {
-    const tabId = this.resolveTabId(guest.id)
-    const state = this.getOrCreateTabState(tabId)
-
-    if (!state.snapshotResult) {
-      throw new BrowserError(
-        'browser_stale_ref',
-        "No snapshot exists for this tab. Run 'orca snapshot' first."
-      )
-    }
-
-    const entry = state.snapshotResult.refMap.get(ref)
-    if (!entry) {
-      throw new BrowserError(
-        'browser_ref_not_found',
-        `Element ref ${ref} was not found. Run 'orca snapshot' to see available refs.`
-      )
-    }
-
-    // Why: iframe refs use a child session with independent nav history, so a parent-navId check would falsely reject them.
-    if (!entry.sessionId) {
-      const currentNavId = await this.getNavigationId(sender)
-      if (state.navigationId && currentNavId !== state.navigationId) {
-        state.snapshotResult = null
-        state.navigationId = null
-        throw new BrowserError(
-          'browser_stale_ref',
-          "The page has navigated since the last snapshot. Run 'orca snapshot' to get fresh refs."
-        )
-      }
-    }
-
-    const refSender = entry.sessionId ? this.makeCdpSender(guest, entry.sessionId) : sender
-    try {
-      await refSender('DOM.describeNode', { backendNodeId: entry.backendDOMNodeId })
-      return entry
-    } catch {
-      // Why: dynamic pages re-render nodes, detaching snapshot refs; re-query the AX tree by role+name for the fresh node.
-      const recovered = await this.tryRecoverRef(refSender, entry)
-      if (recovered) {
-        entry.backendDOMNodeId = recovered
-        return entry
-      }
-      state.snapshotResult = null
-      throw new BrowserError(
-        'browser_stale_ref',
-        `Element ${ref} no longer exists in the DOM. Run 'orca snapshot' to get fresh refs.`
-      )
-    }
-  }
-
-  private async scrollIntoView(sender: CdpCommandSender, backendNodeId: number): Promise<void> {
-    const { nodeId } = (await sender('DOM.requestNode', { backendNodeId })) as { nodeId: number }
-    const { object } = (await sender('DOM.resolveNode', { nodeId })) as {
-      object: { objectId: string }
-    }
-    await sender('Runtime.callFunctionOn', {
-      objectId: object.objectId,
-      functionDeclaration: `function() { this.scrollIntoView({ block: 'center', inline: 'center' }); }`
-    })
-  }
-
-  private async getElementCenter(
-    sender: CdpCommandSender,
-    backendNodeId: number
-  ): Promise<{ cx: number; cy: number }> {
-    const { model } = (await sender('DOM.getBoxModel', { backendNodeId })) as {
-      model: { content: number[] }
-    }
-    const [x1, y1, , , x3, y3] = model.content
-    return { cx: (x1 + x3) / 2, cy: (y1 + y3) / 2 }
-  }
-
-  // Why: cross-origin iframes report iframe-local coords, but Input events use parent-page space; add the iframe offset.
-  private async getIframeOffset(
-    guest: Electron.WebContents,
-    sessionId: string
-  ): Promise<{ offsetX: number; offsetY: number }> {
-    const tabId = this.resolveTabId(guest.id)
-    const state = this.getOrCreateTabState(tabId)
-    const parentSender = this.makeCdpSender(guest)
-
-    for (const [targetId, sid] of state.iframeSessions) {
-      if (sid === sessionId) {
-        try {
-          // Why: match the iframe's target URL against DOM iframe src to pick the right element on multi-iframe pages.
-          const { targetInfo } = (await parentSender('Target.getTargetInfo', {
-            targetId
-          })) as { targetInfo: { url?: string } }
-
-          const targetUrl = targetInfo?.url
-
-          const { result } = (await parentSender('Runtime.evaluate', {
-            expression: `(() => {
-              const frames = document.querySelectorAll('iframe, frame');
-              const rects = [];
-              for (const f of frames) {
-                const rect = f.getBoundingClientRect();
-                rects.push({ x: rect.x, y: rect.y, src: f.src || '' });
-              }
-              return JSON.stringify(rects);
-            })()`,
-            returnByValue: true
-          })) as { result: { value: string } }
-
-          const rects = JSON.parse(result.value) as { x: number; y: number; src: string }[]
-
-          // Match by URL first (reliable for cross-origin iframes)
-          if (targetUrl) {
-            for (const rect of rects) {
-              if (rect.src === targetUrl) {
-                return { offsetX: rect.x, offsetY: rect.y }
-              }
-            }
-            // Why: iframe may redirect after load so src differs from target URL; match by origin as a fallback.
-            try {
-              const targetOrigin = new URL(targetUrl).origin
-              for (const rect of rects) {
-                if (rect.src && new URL(rect.src).origin === targetOrigin) {
-                  return { offsetX: rect.x, offsetY: rect.y }
-                }
-              }
-            } catch {
-              // URL parsing failed — fall through
-            }
-          }
-
-          // Fallback: if only one iframe exists, use its position
-          if (rects.length === 1) {
-            return { offsetX: rects[0].x, offsetY: rects[0].y }
-          }
-        } catch {
-          // Can't determine offset, return zero (best effort)
-        }
-        break
-      }
-    }
-
-    return { offsetX: 0, offsetY: 0 }
-  }
-
-  // Why: Input.dispatchMouseEvent uses parent-page coords, so translate iframe-local coords for iframe elements.
-  private async getPageCoordinates(
-    guest: Electron.WebContents,
-    refEntry: RefEntry,
-    localCx: number,
-    localCy: number
-  ): Promise<{ cx: number; cy: number }> {
-    if (!refEntry.sessionId) {
-      return { cx: localCx, cy: localCy }
-    }
-    const { offsetX, offsetY } = await this.getIframeOffset(guest, refEntry.sessionId)
-    return { cx: localCx + offsetX, cy: localCy + offsetY }
-  }
-
-  // Why: nth-index disambiguates duplicate role+name matches so recovery hits the original element, not the first match.
-  private async tryRecoverRef(sender: CdpCommandSender, entry: RefEntry): Promise<number | null> {
-    try {
-      const { nodes } = (await sender('Accessibility.getFullAXTree')) as {
-        nodes: { role?: { value: string }; name?: { value: string }; backendDOMNodeId?: number }[]
-      }
-      const matches: number[] = []
-      for (const node of nodes) {
-        if (
-          node.role?.value === entry.role &&
-          node.name?.value === entry.name &&
-          node.backendDOMNodeId
-        ) {
-          matches.push(node.backendDOMNodeId)
-        }
-      }
-
-      const targetIndex = (entry.nth ?? 1) - 1
-      const candidates = targetIndex < matches.length ? [matches[targetIndex], ...matches] : matches
-
-      for (const backendNodeId of candidates) {
-        try {
-          await sender('DOM.describeNode', { backendNodeId })
-          return backendNodeId
-        } catch {
-          continue
-        }
-      }
-    } catch {
-      // AX tree unavailable — can't recover
-    }
-    return null
-  }
-
-  private async getNavigationId(sender: CdpCommandSender): Promise<string> {
-    const { entries, currentIndex } = (await sender('Page.getNavigationHistory')) as {
-      entries: { id: number; url: string }[]
-      currentIndex: number
-    }
-    const current = entries[currentIndex]
-    return current ? `${current.id}:${current.url}` : 'unknown'
-  }
-
-  private async getPreviousHistoryEntryId(sender: CdpCommandSender): Promise<number> {
-    const { entries, currentIndex } = (await sender('Page.getNavigationHistory')) as {
-      entries: { id: number }[]
-      currentIndex: number
-    }
-    if (currentIndex <= 0) {
-      throw new BrowserError('browser_navigation_failed', 'No previous history entry.')
-    }
-    return entries[currentIndex - 1].id
-  }
-
-  private async waitForLoad(sender: CdpCommandSender, guest: Electron.WebContents): Promise<void> {
-    // Why: SPAs fire 'load' before async content renders, so also wait for 500ms of network idle.
-    const TIMEOUT_MS = 25_000
-    const IDLE_MS = 500
-    const startedAt = Date.now()
-
-    // Phase 1: wait for readyState=complete
-    await new Promise<void>((resolve, reject) => {
-      let settled = false
-      let pollTimer: ReturnType<typeof setTimeout> | null = null
-
-      const finish = (callback: () => void): void => {
-        if (settled) {
-          return
-        }
-        settled = true
-        clearTimeout(timeout)
-        if (pollTimer) {
-          clearTimeout(pollTimer)
-          pollTimer = null
-        }
-        callback()
-      }
-
-      const timeout = setTimeout(() => {
-        finish(() => reject(new BrowserError('browser_timeout', 'Page load timed out.')))
-      }, TIMEOUT_MS)
-
-      const check = async (): Promise<void> => {
-        if (settled) {
-          return
-        }
-        try {
-          const { result } = (await sender('Runtime.evaluate', {
-            expression: 'document.readyState',
-            returnByValue: true
-          })) as { result: { value: string } }
-          if (settled) {
-            return
-          }
-          if (result.value === 'complete') {
-            finish(resolve)
-          } else {
-            pollTimer = setTimeout(() => {
-              pollTimer = null
-              void check()
-            }, 100)
-          }
-        } catch {
-          finish(resolve)
-        }
-      }
-      void check()
-    })
-
-    // Phase 2: wait for network idle
-    const remaining = TIMEOUT_MS - (Date.now() - startedAt)
-    if (remaining <= 0) {
-      return
-    }
-    await this.waitForNetworkIdle(guest, Math.min(remaining, 5000), IDLE_MS)
-  }
-
-  private waitForNetworkIdle(
-    guest: Electron.WebContents,
-    timeoutMs: number,
-    idleMs: number
-  ): Promise<void> {
-    return new Promise((resolve) => {
-      let pending = 0
-      let settled = false
-      let idleTimer: ReturnType<typeof setTimeout> | null = null
-      const overallTimeout = setTimeout(done, timeoutMs)
-
-      function done(): void {
-        if (settled) {
-          return
-        }
-        settled = true
-        clearTimeout(overallTimeout)
-        if (idleTimer) {
-          clearTimeout(idleTimer)
-        }
-        guest.debugger.removeListener('message', onMessage)
-        resolve()
-      }
-
-      function checkIdle(): void {
-        if (pending <= 0) {
-          if (idleTimer) {
-            clearTimeout(idleTimer)
-          }
-          idleTimer = setTimeout(done, idleMs)
-        }
-      }
-
-      function onMessage(_event: unknown, method: string): void {
-        if (method === 'Network.requestWillBeSent') {
-          pending++
-          if (idleTimer) {
-            clearTimeout(idleTimer)
-            idleTimer = null
-          }
-        } else if (method === 'Network.loadingFinished' || method === 'Network.loadingFailed') {
-          pending = Math.max(0, pending - 1)
-          checkIdle()
-        }
-      }
-
-      guest.debugger.on('message', onMessage)
-      checkIdle()
-    })
-  }
-
-  private invalidateRefMap(webContentsId: number): void {
-    const tabId = this.resolveTabIdSafe(webContentsId)
-    if (tabId) {
-      const state = this.tabState.get(tabId)
-      if (state) {
-        state.snapshotResult = null
-        state.navigationId = null
-      }
-    }
-  }
-
-  private async enqueueCommand<T>(execute: () => Promise<T>): Promise<T> {
-    const guest = this.getActiveGuest()
-    const tabId = this.resolveTabId(guest.id)
-
-    return new Promise<T>((resolve, reject) => {
-      let queue = this.commandQueues.get(tabId)
-      if (!queue) {
-        queue = []
-        this.commandQueues.set(tabId, queue)
-      }
-      queue.push({
-        execute: execute as () => Promise<unknown>,
-        resolve: resolve as (value: unknown) => void,
-        reject
-      })
-      this.processQueue(tabId)
-    })
-  }
-
-  private async processQueue(tabId: string): Promise<void> {
-    if (this.processingQueues.has(tabId)) {
-      return
-    }
-    this.processingQueues.add(tabId)
-
-    const queue = this.commandQueues.get(tabId)
-    while (queue && queue.length > 0) {
-      const cmd = queue.shift()!
-      try {
-        const result = await cmd.execute()
-        cmd.resolve(result)
-      } catch (error) {
-        cmd.reject(error)
-      }
-    }
-
-    this.processingQueues.delete(tabId)
-  }
-}
-
-// Why: Input.dispatchKeyEvent needs `text` for keys with default actions (Enter/Tab), or Chrome skips the action.
-type KeyDefinition = {
-  key: string
-  code: string
-  windowsVirtualKeyCode?: number
-  text?: string
-}
-
-const KEY_DEFINITIONS: Record<string, KeyDefinition> = {
-  Enter: { key: 'Enter', code: 'Enter', windowsVirtualKeyCode: 13, text: '\r' },
-  Tab: { key: 'Tab', code: 'Tab', windowsVirtualKeyCode: 9, text: '\t' },
-  Escape: { key: 'Escape', code: 'Escape', windowsVirtualKeyCode: 27 },
-  Backspace: { key: 'Backspace', code: 'Backspace', windowsVirtualKeyCode: 8 },
-  Delete: { key: 'Delete', code: 'Delete', windowsVirtualKeyCode: 46 },
-  ArrowUp: { key: 'ArrowUp', code: 'ArrowUp', windowsVirtualKeyCode: 38 },
-  ArrowDown: { key: 'ArrowDown', code: 'ArrowDown', windowsVirtualKeyCode: 40 },
-  ArrowLeft: { key: 'ArrowLeft', code: 'ArrowLeft', windowsVirtualKeyCode: 37 },
-  ArrowRight: { key: 'ArrowRight', code: 'ArrowRight', windowsVirtualKeyCode: 39 },
-  Home: { key: 'Home', code: 'Home', windowsVirtualKeyCode: 36 },
-  End: { key: 'End', code: 'End', windowsVirtualKeyCode: 35 },
-  PageUp: { key: 'PageUp', code: 'PageUp', windowsVirtualKeyCode: 33 },
-  PageDown: { key: 'PageDown', code: 'PageDown', windowsVirtualKeyCode: 34 },
-  Space: { key: ' ', code: 'Space', windowsVirtualKeyCode: 32, text: ' ' }
-}
-
-function resolveKeyDefinition(key: string): KeyDefinition {
-  if (KEY_DEFINITIONS[key]) {
-    return KEY_DEFINITIONS[key]
-  }
-  // Why: sites that check event.code drop events with invalid code values.
-  if (key.length === 1) {
-    const charCode = key.charCodeAt(0)
-    if (charCode >= 48 && charCode <= 57) {
-      return { key, code: `Digit${key}`, windowsVirtualKeyCode: charCode, text: key }
-    }
-    if ((charCode >= 65 && charCode <= 90) || (charCode >= 97 && charCode <= 122)) {
-      return {
-        key,
-        code: `Key${key.toUpperCase()}`,
-        windowsVirtualKeyCode: key.toUpperCase().charCodeAt(0),
-        text: key
-      }
-    }
-    return { key, code: '', windowsVirtualKeyCode: charCode, text: key }
-  }
-  return { key, code: key }
 }
diff --git a/src/main/browser/cdp-debugger-events.ts b/src/main/browser/cdp-debugger-events.ts
new file mode 100644
index 00000000000..023d648a8ca
--- /dev/null
+++ b/src/main/browser/cdp-debugger-events.ts
@@ -0,0 +1,148 @@
+import type { WebContents } from 'electron'
+import type { BrowserNetworkEntry } from '../../shared/runtime-types'
+import type { CdpTabState } from './cdp-auxiliary-commands'
+
+const CAPTURE_LOG_LIMIT = 1000
+
+export function createCdpDebuggerMessageListener(
+  guest: WebContents,
+  state: CdpTabState
+): (_event: unknown, method: string, params: unknown) => void {
+  return (_event: unknown, method: string, params: unknown): void => {
+    if (method === 'Page.frameNavigated') {
+      state.snapshotResult = null
+      state.navigationId = null
+    }
+    // Why: an unhandled JS dialog blocks all subsequent CDP commands; auto-dismiss to avoid hanging.
+    if (method === 'Page.javascriptDialogOpening') {
+      const dialog = params as { type: string; message: string } | undefined
+      guest.debugger
+        .sendCommand('Page.handleJavaScriptDialog', {
+          accept: dialog?.type !== 'beforeunload'
+        })
+        .catch(() => {})
+    }
+    // Why: track iframe sessions so CDP commands and AX queries route to the correct session.
+    if (method === 'Target.attachedToTarget') {
+      const p = params as
+        | {
+            sessionId?: string
+            targetInfo?: { type?: string; targetId?: string }
+          }
+        | undefined
+      if (p?.sessionId && p.targetInfo?.type === 'iframe' && p.targetInfo.targetId) {
+        state.iframeSessions.set(p.targetInfo.targetId, p.sessionId)
+        guest.debugger.sendCommand('DOM.enable', {}, p.sessionId).catch(() => {})
+        guest.debugger.sendCommand('Accessibility.enable', {}, p.sessionId).catch(() => {})
+        guest.debugger.sendCommand('Runtime.enable', {}, p.sessionId).catch(() => {})
+      }
+    }
+    if (method === 'Target.detachedFromTarget') {
+      const p = params as { sessionId?: string } | undefined
+      if (p?.sessionId) {
+        for (const [frameId, sid] of state.iframeSessions) {
+          if (sid === p.sessionId) {
+            state.iframeSessions.delete(frameId)
+            break
+          }
+        }
+      }
+    }
+    // Why: buffer console/network events per-tab so the agent can retrieve them on demand.
+    if (state.capturing) {
+      if (method === 'Runtime.consoleAPICalled') {
+        const p = params as
+          | {
+              type?: string
+              args?: { value?: string; description?: string }[]
+              timestamp?: number
+              stackTrace?: { callFrames?: { url?: string; lineNumber?: number }[] }
+            }
+          | undefined
+        if (p) {
+          const text = (p.args ?? []).map((a) => a.value ?? a.description ?? '').join(' ')
+          state.consoleLog.push({
+            level: p.type ?? 'log',
+            text,
+            timestamp: p.timestamp ?? Date.now(),
+            url: p.stackTrace?.callFrames?.[0]?.url,
+            line: p.stackTrace?.callFrames?.[0]?.lineNumber
+          })
+          if (state.consoleLog.length > CAPTURE_LOG_LIMIT) {
+            state.consoleLog.shift()
+          }
+        }
+      }
+      if (method === 'Network.responseReceived') {
+        const p = params as
+          | {
+              requestId?: string
+              response?: {
+                url?: string
+                status?: number
+                mimeType?: string
+                headers?: Record<string, string>
+              }
+              type?: string
+              timestamp?: number
+            }
+          | undefined
+        if (p?.response) {
+          const entry: BrowserNetworkEntry = {
+            url: p.response.url ?? '',
+            method: '',
+            status: p.response.status ?? 0,
+            mimeType: p.response.mimeType ?? '',
+            size: 0,
+            timestamp: p.timestamp ?? Date.now()
+          }
+          state.networkLog.push(entry)
+          // Why: map requestId→entry so loadingFinished attributes size to the right response, not the latest one.
+          if (p.requestId) {
+            state.networkRequestMap.set(p.requestId, entry)
+          }
+          if (state.networkLog.length > CAPTURE_LOG_LIMIT) {
+            const evicted = state.networkLog.shift()
+            if (evicted) {
+              for (const [requestId, requestEntry] of state.networkRequestMap) {
+                if (requestEntry === evicted) {
+                  state.networkRequestMap.delete(requestId)
+                  break
+                }
+              }
+            }
+          }
+        }
+      }
+      if (method === 'Network.loadingFinished' || method === 'Network.loadingFailed') {
+        const p = params as { requestId?: string; encodedDataLength?: number } | undefined
+        if (p?.requestId) {
+          const entry = state.networkRequestMap.get(p.requestId)
+          if (entry && method === 'Network.loadingFinished' && p.encodedDataLength) {
+            entry.size = p.encodedDataLength
+          }
+          state.networkRequestMap.delete(p.requestId)
+        }
+      }
+    }
+    // Why: buffer paused requests so the agent can later inspect and continue or block them.
+    if (state.intercepting && method === 'Fetch.requestPaused') {
+      const p = params as
+        | {
+            requestId?: string
+            request?: { url?: string; method?: string; headers?: Record<string, string> }
+            resourceType?: string
+          }
+        | undefined
+      if (p?.requestId && p.request) {
+        state.pausedRequests.set(p.requestId, {
+          id: p.requestId,
+          url: p.request.url ?? '',
+          method: p.request.method ?? 'GET',
+          headers: (p.request.headers ?? {}) as Record<string, string>,
+          resourceType: p.resourceType ?? 'Other'
+        })
+      }
+    }
+  }
+}
diff --git a/src/main/browser/cdp-debugger-lifecycle.ts b/src/main/browser/cdp-debugger-lifecycle.ts
new file mode 100644
index 00000000000..f969f113d59
--- /dev/null
+++ b/src/main/browser/cdp-debugger-lifecycle.ts
@@ -0,0 +1,107 @@
+import type { WebContents } from 'electron'
+import { ANTI_DETECTION_SCRIPT } from './anti-detection'
+import { BrowserError } from './browser-error'
+import type { CdpTabState } from './cdp-auxiliary-commands'
+import type { CdpCommandSender } from './snapshot-engine'
+import type { CdpBridgeState } from './cdp-bridge-state'
+import { createCdpDebuggerMessageListener } from './cdp-debugger-events'
+
+export class CdpDebuggerLifecycle {
+  constructor(private readonly bridgeState: CdpBridgeState) {}
+
+  removeDebuggerListeners(guest: WebContents, state: CdpTabState): void {
+    const detachListener = state.debuggerDetachListener
+    const messageListener = state.debuggerMessageListener
+    state.debuggerDetachListener = null
+    state.debuggerMessageListener = null
+
+    if (detachListener) {
+      try {
+        guest.debugger.removeListener('detach', detachListener as never)
+      } catch {
+        // guest may already be destroyed
+      }
+    }
+    if (messageListener) {
+      try {
+        guest.debugger.removeListener('message', messageListener as never)
+      } catch {
+        // guest may already be destroyed
+      }
+    }
+  }
+
+  async ensureDebuggerAttached(guest: WebContents): Promise<void> {
+    const tabId = this.bridgeState.resolveTabId(guest.id)
+    const state = this.bridgeState.getOrCreateTabState(tabId)
+    if (state.debuggerAttached && guest.debugger.isAttached()) {
+      return
+    }
+
+    try {
+      // Why: BrowserManager already attached the debugger; reuse it to avoid "another debugger is already attached."
+      if (!guest.debugger.isAttached()) {
+        guest.debugger.attach('1.3')
+      }
+    } catch {
+      throw new BrowserError(
+        'browser_cdp_error',
+        'Could not attach debugger. DevTools may already be open for this tab.'
+      )
+    }
+
+    const sender = this.makeCdpSender(guest)
+    await sender('Page.enable')
+    await sender('DOM.enable')
+    await sender('Network.enable')
+
+    // Why: OOPIF iframes are invisible to the parent CDP session; flatten:true gives each a targetable sessionId.
+    await sender('Target.setAutoAttach', {
+      autoAttach: true,
+      waitForDebuggerOnStart: false,
+      flatten: true
+    })
+
+    // Why: CDP attach exposes automation signals (navigator.webdriver) that Cloudflare checks; override per new document.
+    await sender('Page.addScriptToEvaluateOnNewDocument', {
+      source: ANTI_DETECTION_SCRIPT
+    })
+
+    // Why: only remove this bridge's listeners; screencast/proxy sessions share the debugger and own their teardown.
+    this.removeDebuggerListeners(guest, state)
+
+    const detachListener = (): void => {
+      state.debuggerAttached = false
+      state.snapshotResult = null
+      state.iframeSessions.clear()
+      this.removeDebuggerListeners(guest, state)
+    }
+
+    const messageListener = createCdpDebuggerMessageListener(guest, state)
+
+    state.debuggerDetachListener = detachListener
+    state.debuggerMessageListener = messageListener
+    guest.debugger.on('detach', detachListener)
+    guest.debugger.on('message', messageListener)
+
+    state.debuggerAttached = true
+  }
+
+  makeCdpSender(guest: WebContents, sessionId?: string): CdpCommandSender {
+    return (method: string, params?: Record<string, unknown>) => {
+      const command = guest.debugger.sendCommand(method, params, sessionId) as Promise<unknown>
+      // Why: Electron's CDP sendCommand can hang on a stale debugger session, so a 10s timeout bounds the RPC.
+      let timer: ReturnType<typeof setTimeout>
+      return Promise.race([
+        command.finally(() => clearTimeout(timer)),
+        new Promise<never>((_, reject) => {
+          timer = setTimeout(
+            () =>
+              reject(new BrowserError('browser_cdp_error', `CDP command "${method}" timed out`)),
+            10_000
+          )
+        })
+      ])
+    }
+  }
+}
diff --git a/src/main/browser/cdp-element-state-commands.ts b/src/main/browser/cdp-element-state-commands.ts
new file mode 100644
index 00000000000..5f5d9ce3030
--- /dev/null
+++ b/src/main/browser/cdp-element-state-commands.ts
@@ -0,0 +1,146 @@
+import type {
+  BrowserCheckResult,
+  BrowserSelectResult,
+  BrowserUploadResult
+} from '../../shared/runtime-types'
+import { CdpBridgeCommandModule } from './cdp-bridge-command-module'
+
+export class CdpElementStateCommands extends CdpBridgeCommandModule {
+  uploadFile(element: string, filePaths: string[]): Promise<BrowserUploadResult> {
+    return this.enqueueCommand(async () => {
+      const guest = this.getActiveGuest()
+      const sender = this.makeCdpSender(guest)
+      await this.ensureDebuggerAttached(guest)
+
+      const node = await this.resolveRef(guest, sender, element)
+      const refSender = this.senderForRef(guest, node)
+      await refSender('DOM.setFileInputFiles', {
+        files: filePaths,
+        backendNodeId: node.backendDOMNodeId
+      })
+
+      return { uploaded: filePaths.length }
+    })
+  }
+
+  select(element: string, value: string): Promise<BrowserSelectResult> {
+    return this.enqueueCommand(async () => {
+      const guest = this.getActiveGuest()
+      const sender = this.makeCdpSender(guest)
+      await this.ensureDebuggerAttached(guest)
+
+      const node = await this.resolveRef(guest, sender, element)
+      const refSender = this.senderForRef(guest, node)
+      const { nodeId } = (await refSender('DOM.requestNode', {
+        backendNodeId: node.backendDOMNodeId
+      })) as { nodeId: number }
+
+      const { object } = (await refSender('DOM.resolveNode', { nodeId })) as {
+        object: { objectId: string }
+      }
+
+      // Why: match on label (textContent) and value so opaque option IDs still select; also handles combobox via click.
+      await refSender('Runtime.callFunctionOn', {
+        objectId: object.objectId,
+        functionDeclaration: `function(val) {
+          if (this.options) {
+            for (const opt of this.options) {
+              if (opt.value === val || opt.textContent.trim() === val) {
+                this.value = opt.value;
+                this.dispatchEvent(new Event('input', { bubbles: true }));
+                this.dispatchEvent(new Event('change', { bubbles: true }));
+                return;
+              }
+            }
+            this.value = val;
+            this.dispatchEvent(new Event('input', { bubbles: true }));
+            this.dispatchEvent(new Event('change', { bubbles: true }));
+          } else {
+            const opts = this.querySelectorAll('[role="option"], li, [data-value]');
+            for (const opt of opts) {
+              const text = opt.textContent ? opt.textContent.trim() : '';
+              const dv = opt.getAttribute('data-value');
+              if (text === val || dv === val) {
+                opt.click();
+                return;
+              }
+            }
+          }
+        }`,
+        arguments: [{ value }]
+      })
+
+      return { selected: element }
+    })
+  }
+
+  check(element: string, checked: boolean): Promise<BrowserCheckResult> {
+    return this.enqueueCommand(async () => {
+      const guest = this.getActiveGuest()
+      const sender = this.makeCdpSender(guest)
+      await this.ensureDebuggerAttached(guest)
+
+      const node = await this.resolveRef(guest, sender, element)
+      const refSender = this.senderForRef(guest, node)
+
+      const { nodeId } = (await refSender('DOM.requestNode', {
+        backendNodeId: node.backendDOMNodeId
+      })) as { nodeId: number }
+      const { object } = (await refSender('DOM.resolveNode', { nodeId })) as {
+        object: { objectId: string }
+      }
+
+      const { result: currentState } = (await refSender('Runtime.callFunctionOn', {
+        objectId: object.objectId,
+        functionDeclaration: 'function() { return this.checked; }',
+        returnByValue: true
+      })) as { result: { value: boolean } }
+
+      if (currentState.value !== checked) {
+        await this.scrollIntoView(refSender, node.backendDOMNodeId)
+        const localCenter = await this.getElementCenter(refSender, node.backendDOMNodeId)
+        const { cx, cy } = await this.getPageCoordinates(
+          guest,
+          node,
+          localCenter.cx,
+          localCenter.cy
+        )
+        await sender('Input.dispatchMouseEvent', { type: 'mouseMoved', x: cx, y: cy })
+        await sender('Input.dispatchMouseEvent', {
+          type: 'mousePressed',
+          x: cx,
+          y: cy,
+          button: 'left',
+          clickCount: 1
+        })
+        await sender('Input.dispatchMouseEvent', {
+          type: 'mouseReleased',
+          x: cx,
+          y: cy,
+          button: 'left',
+          clickCount: 1
+        })
+
+        // Why: custom checkboxes may not toggle from a coordinate click; verify state and fall back to programmatic .click().
+        try {
+          const { result: afterState } = (await refSender('Runtime.callFunctionOn', {
+            objectId: object.objectId,
+            functionDeclaration: 'function() { return this.checked; }',
+            returnByValue: true
+          })) as { result: { value: boolean } }
+
+          if (afterState.value !== checked) {
+            await refSender('Runtime.callFunctionOn', {
+              objectId: object.objectId,
+              functionDeclaration: 'function() { this.click(); }'
+            })
+          }
+        } catch {
+          // objectId stale after re-render — click was dispatched, accept the result
+        }
+      }
+
+      return { checked }
+    })
+  }
+}
diff --git a/src/main/browser/cdp-navigation-operations.ts b/src/main/browser/cdp-navigation-operations.ts
new file mode 100644
index 00000000000..5e664877abc
--- /dev/null
+++ b/src/main/browser/cdp-navigation-operations.ts
@@ -0,0 +1,135 @@
+import type { WebContents } from 'electron'
+import { BrowserError } from './browser-error'
+import type { CdpCommandSender } from './snapshot-engine'
+
+export class CdpNavigationOperations {
+  async getNavigationId(sender: CdpCommandSender): Promise<string> {
+    const { entries, currentIndex } = (await sender('Page.getNavigationHistory')) as {
+      entries: { id: number; url: string }[]
+      currentIndex: number
+    }
+    const current = entries[currentIndex]
+    return current ? `${current.id}:${current.url}` : 'unknown'
+  }
+
+  async getPreviousHistoryEntryId(sender: CdpCommandSender): Promise<number> {
+    const { entries, currentIndex } = (await sender('Page.getNavigationHistory')) as {
+      entries: { id: number }[]
+      currentIndex: number
+    }
+    if (currentIndex <= 0) {
+      throw new BrowserError('browser_navigation_failed', 'No previous history entry.')
+    }
+    return entries[currentIndex - 1].id
+  }
+
+  async waitForLoad(sender: CdpCommandSender, guest: WebContents): Promise<void> {
+    // Why: SPAs fire 'load' before async content renders, so also wait for 500ms of network idle.
+    const TIMEOUT_MS = 25_000
+    const IDLE_MS = 500
+    const startedAt = Date.now()
+
+    // Phase 1: wait for readyState=complete
+    await new Promise<void>((resolve, reject) => {
+      let settled = false
+      let pollTimer: ReturnType<typeof setTimeout> | null = null
+
+      const finish = (callback: () => void): void => {
+        if (settled) {
+          return
+        }
+        settled = true
+        clearTimeout(timeout)
+        if (pollTimer) {
+          clearTimeout(pollTimer)
+          pollTimer = null
+        }
+        callback()
+      }
+
+      const timeout = setTimeout(() => {
+        finish(() => reject(new BrowserError('browser_timeout', 'Page load timed out.')))
+      }, TIMEOUT_MS)
+
+      const check = async (): Promise<void> => {
+        if (settled) {
+          return
+        }
+        try {
+          const { result } = (await sender('Runtime.evaluate', {
+            expression: 'document.readyState',
+            returnByValue: true
+          })) as { result: { value: string } }
+          if (settled) {
+            return
+          }
+          if (result.value === 'complete') {
+            finish(resolve)
+          } else {
+            pollTimer = setTimeout(() => {
+              pollTimer = null
+              void check()
+            }, 100)
+          }
+        } catch {
+          finish(resolve)
+        }
+      }
+      void check()
+    })
+
+    // Phase 2: wait for network idle
+    const remaining = TIMEOUT_MS - (Date.now() - startedAt)
+    if (remaining <= 0) {
+      return
+    }
+    await this.waitForNetworkIdle(guest, Math.min(remaining, 5000), IDLE_MS)
+  }
+
+  waitForNetworkIdle(guest: WebContents, timeoutMs: number, idleMs: number): Promise<void> {
+    return new Promise((resolve) => {
+      let pending = 0
+      let settled = false
+      let idleTimer: ReturnType<typeof setTimeout> | null = null
+      const overallTimeout = setTimeout(done, timeoutMs)
+
+      function done(): void {
+        if (settled) {
+          return
+        }
+        settled = true
+        clearTimeout(overallTimeout)
+        if (idleTimer) {
+          clearTimeout(idleTimer)
+        }
+        guest.debugger.removeListener('message', onMessage)
+        resolve()
+      }
+
+      function checkIdle(): void {
+        if (pending <= 0) {
+          if (idleTimer) {
+            clearTimeout(idleTimer)
+          }
+          idleTimer = setTimeout(done, idleMs)
+        }
+      }
+
+      function onMessage(_event: unknown, method: string): void {
+        if (method === 'Network.requestWillBeSent') {
+          pending++
+          if (idleTimer) {
+            clearTimeout(idleTimer)
+            idleTimer = null
+          }
+        } else if (method === 'Network.loadingFinished' || method === 'Network.loadingFailed') {
+          pending = Math.max(0, pending - 1)
+          checkIdle()
+        }
+      }
+
+      guest.debugger.on('message', onMessage)
+      checkIdle()
+    })
+  }
+}
diff --git a/src/main/browser/cdp-page-commands.ts b/src/main/browser/cdp-page-commands.ts
new file mode 100644
index 00000000000..79b78b42a58
--- /dev/null
+++ b/src/main/browser/cdp-page-commands.ts
@@ -0,0 +1,216 @@
+import type {
+  BrowserEvalResult,
+  BrowserGotoResult,
+  BrowserPdfResult,
+  BrowserScreenshotResult,
+  BrowserScrollResult,
+  BrowserSnapshotResult,
+  BrowserWaitResult
+} from '../../shared/runtime-types'
+import { BrowserError } from './browser-error'
+import {
+  CdpBridgeCommandModule,
+  type CdpScreenshotFormat,
+  type CdpScrollDirection
+} from './cdp-bridge-command-module'
+import { buildSnapshot } from './snapshot-engine'
+
+export class CdpPageCommands extends CdpBridgeCommandModule {
+  snapshot(): Promise<BrowserSnapshotResult> {
+    return this.enqueueCommand(async () => {
+      const guest = this.getActiveGuest()
+      const sender = this.makeCdpSender(guest)
+      await this.ensureDebuggerAttached(guest)
+
+      const tabId = this.resolveTabId(guest.id)
+      const state = this.getOrCreateTabState(tabId)
+
+      const result = await buildSnapshot(sender, state.iframeSessions, (sessionId) =>
+        this.makeCdpSender(guest, sessionId)
+      )
+      state.snapshotResult = result
+
+      const navId = await this.getNavigationId(sender)
+      state.navigationId = navId
+
+      return {
+        browserPageId: tabId,
+        snapshot: result.snapshot,
+        refs: result.refs,
+        url: guest.getURL(),
+        title: guest.getTitle()
+      }
+    })
+  }
+
+  goto(url: string): Promise<BrowserGotoResult> {
+    return this.enqueueCommand(async () => {
+      const guest = this.getActiveGuest()
+      const sender = this.makeCdpSender(guest)
+      await this.ensureDebuggerAttached(guest)
+
+      const { errorText } = (await sender('Page.navigate', { url })) as {
+        errorText?: string
+      }
+
+      if (errorText) {
+        throw new BrowserError('browser_navigation_failed', `Navigation failed: ${errorText}`)
+      }
+
+      await this.waitForLoad(sender, guest)
+      this.invalidateRefMap(guest.id)
+
+      return { url: guest.getURL(), title: guest.getTitle() }
+    })
+  }
+
+  scroll(direction: CdpScrollDirection, amount?: number): Promise<BrowserScrollResult> {
+    return this.enqueueCommand(async () => {
+      const guest = this.getActiveGuest()
+      const sender = this.makeCdpSender(guest)
+      await this.ensureDebuggerAttached(guest)
+
+      // Why: JS scrollBy needs no focus and is deterministic, unlike mouseWheel which is unreliable in Electron webviews.
+      const expr = amount
+        ? `window.scrollBy(0, ${direction === 'down' ? amount : -amount})`
+        : `window.scrollBy(0, ${direction === 'down' ? 'window.innerHeight' : '-window.innerHeight'})`
+      await sender('Runtime.evaluate', { expression: expr, returnByValue: true })
+
+      return { scrolled: direction }
+    })
+  }
+
+  wait(timeoutMs: number): Promise<BrowserWaitResult> {
+    return this.enqueueCommand(async () => {
+      const guest = this.getActiveGuest()
+      await this.ensureDebuggerAttached(guest)
+      await this.waitForNetworkIdle(guest, timeoutMs, 500)
+      return { waited: true }
+    })
+  }
+
+  pdf(): Promise<BrowserPdfResult> {
+    return this.enqueueCommand(async () => {
+      const guest = this.getActiveGuest()
+      const sender = this.makeCdpSender(guest)
+      await this.ensureDebuggerAttached(guest)
+
+      const { data } = (await sender('Page.printToPDF', {
+        printBackground: true
+      })) as { data: string }
+
+      return { data }
+    })
+  }
+
+  fullPageScreenshot(format: CdpScreenshotFormat): Promise<BrowserScreenshotResult> {
+    return this.enqueueCommand(async () => {
+      const guest = this.getActiveGuest()
+      const sender = this.makeCdpSender(guest)
+      await this.ensureDebuggerAttached(guest)
+
+      const metrics = (await sender('Page.getLayoutMetrics')) as {
+        cssContentSize?: { width: number; height: number }
+        contentSize?: { width: number; height: number }
+      }
+      // Why: screenshot clip uses CSS pixels; on HiDPI, device-pixel contentSize tiles duplicates, so prefer cssContentSize.
+      const contentSize = metrics.cssContentSize ?? metrics.contentSize
+      if (!contentSize) {
+        throw new BrowserError('browser_error', 'Unable to determine full-page screenshot bounds')
+      }
+
+      const { data } = (await sender('Page.captureScreenshot', {
+        format,
+        captureBeyondViewport: true,
+        clip: {
+          x: 0,
+          y: 0,
+          width: Math.ceil(contentSize.width),
+          height: Math.ceil(contentSize.height),
+          scale: 1
+        }
+      })) as { data: string }
+
+      return { data, format }
+    })
+  }
+
+  back(): Promise<{ url: string; title: string }> {
+    return this.enqueueCommand(async () => {
+      const guest = this.getActiveGuest()
+      const sender = this.makeCdpSender(guest)
+      await this.ensureDebuggerAttached(guest)
+
+      await sender('Page.navigateToHistoryEntry', {
+        entryId: await this.getPreviousHistoryEntryId(sender)
+      })
+      await this.waitForLoad(sender, guest)
+      this.invalidateRefMap(guest.id)
+
+      return { url: guest.getURL(), title: guest.getTitle() }
+    })
+  }
+
+  reload(): Promise<{ url: string; title: string }> {
+    return this.enqueueCommand(async () => {
+      const guest = this.getActiveGuest()
+      const sender = this.makeCdpSender(guest)
+      await this.ensureDebuggerAttached(guest)
+
+      await sender('Page.reload')
+      await this.waitForLoad(sender, guest)
+      this.invalidateRefMap(guest.id)
+
+      return { url: guest.getURL(), title: guest.getTitle() }
+    })
+  }
+
+  screenshot(format: CdpScreenshotFormat): Promise<BrowserScreenshotResult> {
+    return this.enqueueCommand(async () => {
+      const guest = this.getActiveGuest()
+      const sender = this.makeCdpSender(guest)
+      await this.ensureDebuggerAttached(guest)
+
+      const { data } = (await sender('Page.captureScreenshot', {
+        format
+      })) as { data: string }
+
+      return { data, format }
+    })
+  }
+
+  evaluate(expression: string): Promise<BrowserEvalResult> {
+    return this.enqueueCommand(async () => {
+      const guest = this.getActiveGuest()
+      const sender = this.makeCdpSender(guest)
+      await this.ensureDebuggerAttached(guest)
+
+      const { result, exceptionDetails } = (await sender('Runtime.evaluate', {
+        expression,
+        returnByValue: true
+      })) as {
+        result: { value?: unknown; type: string; description?: string }
+        exceptionDetails?: { text: string; exception?: { description?: string } }
+      }
+
+      if (exceptionDetails) {
+        throw new BrowserError(
+          'browser_eval_error',
+          exceptionDetails.exception?.description ?? exceptionDetails.text
+        )
+      }
+
+      const valueStr =
+        result.value !== undefined ? String(result.value) : (result.description ?? '')
+      // Why: include origin to match agent-browser's BrowserEvalResult shape across both bridges.
+      const { result: urlResult } = (await sender('Runtime.evaluate', {
+        expression: 'location.origin',
+        returnByValue: true
+      })) as { result: { value: string } }
+      return {
+        result: valueStr,
+        origin: urlResult.value
+      }
+    })
+  }
+}
diff --git a/src/main/browser/cdp-pointer-commands.ts b/src/main/browser/cdp-pointer-commands.ts
new file mode 100644
index 00000000000..80644ad15c7
--- /dev/null
+++ b/src/main/browser/cdp-pointer-commands.ts
@@ -0,0 +1,105 @@
+import type {
+  BrowserClickResult,
+  BrowserDragResult,
+  BrowserHoverResult
+} from '../../shared/runtime-types'
+import { CdpBridgeCommandModule } from './cdp-bridge-command-module'
+
+export class CdpPointerCommands extends CdpBridgeCommandModule {
+  click(element: string): Promise<BrowserClickResult> {
+    return this.enqueueCommand(async () => {
+      const guest = this.getActiveGuest()
+      const sender = this.makeCdpSender(guest)
+      await this.ensureDebuggerAttached(guest)
+
+      const node = await this.resolveRef(guest, sender, element)
+      const refSender = this.senderForRef(guest, node)
+
+      await this.scrollIntoView(refSender, node.backendDOMNodeId)
+      const localCenter = await this.getElementCenter(refSender, node.backendDOMNodeId)
+      const { cx, cy } = await this.getPageCoordinates(guest, node, localCenter.cx, localCenter.cy)
+
+      // Why: mouseMoved fires mouseenter/mouseover so sites reveal hover-dependent menus/targets before the click lands.
+      await sender('Input.dispatchMouseEvent', { type: 'mouseMoved', x: cx, y: cy })
+      await sender('Input.dispatchMouseEvent', {
+        type: 'mousePressed',
+        x: cx,
+        y: cy,
+        button: 'left',
+        clickCount: 1
+      })
+      await sender('Input.dispatchMouseEvent', {
+        type: 'mouseReleased',
+        x: cx,
+        y: cy,
+        button: 'left',
+        clickCount: 1
+      })
+
+      return { clicked: element }
+    })
+  }
+
+  hover(element: string): Promise<BrowserHoverResult> {
+    return this.enqueueCommand(async () => {
+      const guest = this.getActiveGuest()
+      const sender = this.makeCdpSender(guest)
+      await this.ensureDebuggerAttached(guest)
+
+      const node = await this.resolveRef(guest, sender, element)
+      const refSender = this.senderForRef(guest, node)
+      await this.scrollIntoView(refSender, node.backendDOMNodeId)
+      const localCenter = await this.getElementCenter(refSender, node.backendDOMNodeId)
+      const { cx, cy } = await this.getPageCoordinates(guest, node, localCenter.cx, localCenter.cy)
+
+      await sender('Input.dispatchMouseEvent', { type: 'mouseMoved', x: cx, y: cy })
+
+      return { hovered: element }
+    })
+  }
+
+  drag(fromElement: string, toElement: string): Promise<BrowserDragResult> {
+    return this.enqueueCommand(async () => {
+      const guest = this.getActiveGuest()
+      const sender = this.makeCdpSender(guest)
+      await this.ensureDebuggerAttached(guest)
+
+      const fromNode = await this.resolveRef(guest, sender, fromElement)
+      const toNode = await this.resolveRef(guest, sender, toElement)
+      const fromSender = this.senderForRef(guest, fromNode)
+      const toSender = this.senderForRef(guest, toNode)
+
+      await this.scrollIntoView(fromSender, fromNode.backendDOMNodeId)
+      const fromLocal = await this.getElementCenter(fromSender, fromNode.backendDOMNodeId)
+      const from = await this.getPageCoordinates(guest, fromNode, fromLocal.cx, fromLocal.cy)
+      const toLocal = await this.getElementCenter(toSender, toNode.backendDOMNodeId)
+      const to = await this.getPageCoordinates(guest, toNode, toLocal.cx, toLocal.cy)
+
+      // Why: interpolate the drag so intermediate elements fire dragenter/dragover, which many drag-and-drop libs require.
+      await sender('Input.dispatchMouseEvent', { type: 'mouseMoved', x: from.cx, y: from.cy })
+      await sender('Input.dispatchMouseEvent', {
+        type: 'mousePressed',
+        x: from.cx,
+        y: from.cy,
+        button: 'left'
+      })
+
+      const steps = 10
+      for (let i = 1; i <= steps; i++) {
+        const x = from.cx + ((to.cx - from.cx) * i) / steps
+        const y = from.cy + ((to.cy - from.cy) * i) / steps
+        await sender('Input.dispatchMouseEvent', { type: 'mouseMoved', x, y, buttons: 1 })
+        await new Promise((r) => setTimeout(r, 10))
+      }
+
+      await sender('Input.dispatchMouseEvent', {
+        type: 'mouseReleased',
+        x: to.cx,
+        y: to.cy,
+        button: 'left'
+      })
+
+      return { dragged: { from: fromElement, to: toElement } }
+    })
+  }
+}
diff --git a/src/main/browser/cdp-print-to-pdf.test.ts b/src/main/browser/cdp-print-to-pdf.test.ts
index e6f2163b5dd..4ecf8c50b09 100644
--- a/src/main/browser/cdp-print-to-pdf.test.ts
+++ b/src/main/browser/cdp-print-to-pdf.test.ts
@@ -38,7 +38,7 @@ describe('buildPrintToPdfOptions', () => {
       generateDocumentOutline: false,
       scale: 1.5,
       pageSize: { width: 8.5, height: 11 },
-      margins: { marginType: 'custom', top: 0.25, bottom: 0.5, left: 0.75, right: 1 },
+      margins: { top: 0.25, bottom: 0.5, left: 0.75, right: 1 },
       pageRanges: '1-2',
       headerTemplate: '<span></span>',
       footerTemplate: '<span></span>'
@@ -47,7 +47,6 @@ describe('buildPrintToPdfOptions', () => {
 
   it('defaults omitted margin sides to 1cm when any side is set', () => {
     expect(buildPrintToPdfOptions({ marginTop: 0.25 }).margins).toEqual({
-      marginType: 'custom',
       top: 0.25,
       bottom: DEFAULT_MARGIN_INCHES,
       left: DEFAULT_MARGIN_INCHES,
diff --git a/src/main/browser/cdp-print-to-pdf.ts b/src/main/browser/cdp-print-to-pdf.ts
index 643013377d8..480b99f87e3 100644
--- a/src/main/browser/cdp-print-to-pdf.ts
+++ b/src/main/browser/cdp-print-to-pdf.ts
@@ -54,8 +54,8 @@ export function buildPrintToPdfOptions(params: Record<string, unknown>): PrintTo
   const marginRight = finiteNumber(params.marginRight)
   if ([marginTop, marginBottom, marginLeft, marginRight].some((margin) => margin !== null)) {
     // CDP and Electron printToPDF both use inches; omitted CDP sides default to 1cm.
+    // Electron 43.4 dropped marginType from PrintToPDFMargins; sides imply custom.
     options.margins = {
-      marginType: 'custom',
       top: marginTop ?? PDF_DEFAULT_MARGIN_INCHES,
       bottom: marginBottom ?? PDF_DEFAULT_MARGIN_INCHES,
       left: marginLeft ?? PDF_DEFAULT_MARGIN_INCHES,
diff --git a/src/main/browser/cdp-ref-resolution.ts b/src/main/browser/cdp-ref-resolution.ts
new file mode 100644
index 00000000000..0bd44935048
--- /dev/null
+++ b/src/main/browser/cdp-ref-resolution.ts
@@ -0,0 +1,224 @@
+import type { WebContents } from 'electron'
+import { BrowserError } from './browser-error'
+import type { CdpTabState } from './cdp-auxiliary-commands'
+import type { CdpCommandSender, RefEntry } from './snapshot-engine'
+import type { CdpBridgeState } from './cdp-bridge-state'
+import type { CdpDebuggerLifecycle } from './cdp-debugger-lifecycle'
+import type { CdpNavigationOperations } from './cdp-navigation-operations'
+
+export class CdpRefResolution {
+  constructor(
+    private readonly bridgeState: CdpBridgeState,
+    private readonly debuggerLifecycle: CdpDebuggerLifecycle,
+    private readonly navigation: CdpNavigationOperations
+  ) {}
+
+  senderForRef(guest: WebContents, ref: RefEntry): CdpCommandSender {
+    return ref.sessionId ? this.makeCdpSender(guest, ref.sessionId) : this.makeCdpSender(guest)
+  }
+
+  async resolveRef(guest: WebContents, sender: CdpCommandSender, ref: string): Promise<RefEntry> {
+    const tabId = this.resolveTabId(guest.id)
+    const state = this.getOrCreateTabState(tabId)
+
+    if (!state.snapshotResult) {
+      throw new BrowserError(
+        'browser_stale_ref',
+        "No snapshot exists for this tab. Run 'orca snapshot' first."
+      )
+    }
+
+    const entry = state.snapshotResult.refMap.get(ref)
+    if (!entry) {
+      throw new BrowserError(
+        'browser_ref_not_found',
+        `Element ref ${ref} was not found. Run 'orca snapshot' to see available refs.`
+      )
+    }
+
+    // Why: iframe refs use a child session with independent nav history, so a parent-navId check would falsely reject them.
+    if (!entry.sessionId) {
+      const currentNavId = await this.getNavigationId(sender)
+      if (state.navigationId && currentNavId !== state.navigationId) {
+        state.snapshotResult = null
+        state.navigationId = null
+        throw new BrowserError(
+          'browser_stale_ref',
+          "The page has navigated since the last snapshot. Run 'orca snapshot' to get fresh refs."
+        )
+      }
+    }
+
+    const refSender = entry.sessionId ? this.makeCdpSender(guest, entry.sessionId) : sender
+    try {
+      await refSender('DOM.describeNode', { backendNodeId: entry.backendDOMNodeId })
+      return entry
+    } catch {
+      // Why: dynamic pages re-render nodes, detaching snapshot refs; re-query the AX tree by role+name for the fresh node.
+      const recovered = await this.tryRecoverRef(refSender, entry)
+      if (recovered) {
+        entry.backendDOMNodeId = recovered
+        return entry
+      }
+      state.snapshotResult = null
+      throw new BrowserError(
+        'browser_stale_ref',
+        `Element ${ref} no longer exists in the DOM. Run 'orca snapshot' to get fresh refs.`
+      )
+    }
+  }
+
+  async scrollIntoView(sender: CdpCommandSender, backendNodeId: number): Promise<void> {
+    const { nodeId } = (await sender('DOM.requestNode', { backendNodeId })) as { nodeId: number }
+    const { object } = (await sender('DOM.resolveNode', { nodeId })) as {
+      object: { objectId: string }
+    }
+    await sender('Runtime.callFunctionOn', {
+      objectId: object.objectId,
+      functionDeclaration: `function() { this.scrollIntoView({ block: 'center', inline: 'center' }); }`
+    })
+  }
+
+  async getElementCenter(
+    sender: CdpCommandSender,
+    backendNodeId: number
+  ): Promise<{ cx: number; cy: number }> {
+    const { model } = (await sender('DOM.getBoxModel', { backendNodeId })) as {
+      model: { content: number[] }
+    }
+    const [x1, y1, , , x3, y3] = model.content
+    return { cx: (x1 + x3) / 2, cy: (y1 + y3) / 2 }
+  }
+
+  // Why: cross-origin iframes report iframe-local coords, but Input events use parent-page space; add the iframe offset.
+  private async getIframeOffset(
+    guest: WebContents,
+    sessionId: string
+  ): Promise<{ offsetX: number; offsetY: number }> {
+    const tabId = this.resolveTabId(guest.id)
+    const state = this.getOrCreateTabState(tabId)
+    const parentSender = this.makeCdpSender(guest)
+
+    for (const [targetId, sid] of state.iframeSessions) {
+      if (sid === sessionId) {
+        try {
+          // Why: match the iframe's target URL against DOM iframe src to pick the right element on multi-iframe pages.
+          const { targetInfo } = (await parentSender('Target.getTargetInfo', {
+            targetId
+          })) as { targetInfo: { url?: string } }
+
+          const targetUrl = targetInfo?.url
+
+          const { result } = (await parentSender('Runtime.evaluate', {
+            expression: `(() => {
+              const frames = document.querySelectorAll('iframe, frame');
+              const rects = [];
+              for (const f of frames) {
+                const rect = f.getBoundingClientRect();
+                rects.push({ x: rect.x, y: rect.y, src: f.src || '' });
+              }
+              return JSON.stringify(rects);
+            })()`,
+            returnByValue: true
+          })) as { result: { value: string } }
+
+          const rects = JSON.parse(result.value) as { x: number; y: number; src: string }[]
+
+          // Match by URL first (reliable for cross-origin iframes)
+          if (targetUrl) {
+            for (const rect of rects) {
+              if (rect.src === targetUrl) {
+                return { offsetX: rect.x, offsetY: rect.y }
+              }
+            }
+            // Why: iframe may redirect after load so src differs from target URL; match by origin as a fallback.
+            try {
+              const targetOrigin = new URL(targetUrl).origin
+              for (const rect of rects) {
+                if (rect.src && new URL(rect.src).origin === targetOrigin) {
+                  return { offsetX: rect.x, offsetY: rect.y }
+                }
+              }
+            } catch {
+              // URL parsing failed — fall through
+            }
+          }
+
+          // Fallback: if only one iframe exists, use its position
+          if (rects.length === 1) {
+            return { offsetX: rects[0].x, offsetY: rects[0].y }
+          }
+        } catch {
+          // Can't determine offset, return zero (best effort)
+        }
+        break
+      }
+    }
+
+    return { offsetX: 0, offsetY: 0 }
+  }
+
+  // Why: Input.dispatchMouseEvent uses parent-page coords, so translate iframe-local coords for iframe elements.
+  async getPageCoordinates(
+    guest: WebContents,
+    refEntry: RefEntry,
+    localCx: number,
+    localCy: number
+  ): Promise<{ cx: number; cy: number }> {
+    if (!refEntry.sessionId) {
+      return { cx: localCx, cy: localCy }
+    }
+    const { offsetX, offsetY } = await this.getIframeOffset(guest, refEntry.sessionId)
+    return { cx: localCx + offsetX, cy: localCy + offsetY }
+  }
+
+  // Why: nth-index disambiguates duplicate role+name matches so recovery hits the original element, not the first match.
+  private async tryRecoverRef(sender: CdpCommandSender, entry: RefEntry): Promise<number | null> {
+    try {
+      const { nodes } = (await sender('Accessibility.getFullAXTree')) as {
+        nodes: { role?: { value: string }; name?: { value: string }; backendDOMNodeId?: number }[]
+      }
+      const matches: number[] = []
+      for (const node of nodes) {
+        if (
+          node.role?.value === entry.role &&
+          node.name?.value === entry.name &&
+          node.backendDOMNodeId
+        ) {
+          matches.push(node.backendDOMNodeId)
+        }
+      }
+
+      const targetIndex = (entry.nth ?? 1) - 1
+      const candidates = targetIndex < matches.length ? [matches[targetIndex], ...matches] : matches
+
+      for (const backendNodeId of candidates) {
+        try {
+          await sender('DOM.describeNode', { backendNodeId })
+          return backendNodeId
+        } catch {
+          continue
+        }
+      }
+    } catch {
+      // AX tree unavailable — can't recover
+    }
+    return null
+  }
+
+  private resolveTabId(webContentsId: number): string {
+    return this.bridgeState.resolveTabId(webContentsId)
+  }
+
+  private getOrCreateTabState(tabId: string): CdpTabState {
+    return this.bridgeState.getOrCreateTabState(tabId)
+  }
+
+  private makeCdpSender(guest: WebContents, sessionId?: string): CdpCommandSender {
+    return this.debuggerLifecycle.makeCdpSender(guest, sessionId)
+  }
+
+  private getNavigationId(sender: CdpCommandSender): Promise<string> {
+    return this.navigation.getNavigationId(sender)
+  }
+}
diff --git a/src/main/browser/cdp-tab-commands.ts b/src/main/browser/cdp-tab-commands.ts
new file mode 100644
index 00000000000..2a13f58173e
--- /dev/null
+++ b/src/main/browser/cdp-tab-commands.ts
@@ -0,0 +1,118 @@
+import { webContents } from 'electron'
+import type {
+  BrowserTabInfo,
+  BrowserTabListResult,
+  BrowserTabSwitchResult
+} from '../../shared/runtime-types'
+import { BrowserError } from './browser-error'
+import { CdpBridgeCommandModule } from './cdp-bridge-command-module'
+
+export class CdpTabCommands extends CdpBridgeCommandModule {
+  setActiveTab(webContentsId: number): void {
+    this.activeWebContentsId = webContentsId
+  }
+
+  getActiveWebContentsId(): number | null {
+    return this.activeWebContentsId
+  }
+
+  getActivePageId(_worktreeId?: string): string | null {
+    if (!this.activeWebContentsId) {
+      return null
+    }
+    for (const [tabId, wcId] of this.getRegisteredTabs()) {
+      if (wcId === this.activeWebContentsId) {
+        return tabId
+      }
+    }
+    return null
+  }
+
+  getPageInfo(
+    _worktreeId?: string,
+    browserPageId?: string
+  ): { browserPageId: string; url: string; title: string } | null {
+    // Why: expose the same metadata lookup as other bridges, though the CDP bridge routes only one active tab.
+    const resolvedPageId = browserPageId ?? this.getActivePageId()
+    if (!resolvedPageId) {
+      return null
+    }
+    const webContentsId = this.getRegisteredTabs().get(resolvedPageId)
+    if (webContentsId == null) {
+      return null
+    }
+    const guest = webContents.fromId(webContentsId)
+    if (!guest || guest.isDestroyed()) {
+      return null
+    }
+    return {
+      browserPageId: resolvedPageId,
+      url: guest.getURL(),
+      title: guest.getTitle()
+    }
+  }
+
+  tabList(): BrowserTabListResult {
+    const tabs: BrowserTabInfo[] = []
+    let index = 0
+
+    for (const [tabId, wcId] of this.getRegisteredTabs()) {
+      const guest = webContents.fromId(wcId)
+      if (!guest || guest.isDestroyed()) {
+        continue
+      }
+      tabs.push({
+        browserPageId: tabId,
+        index,
+        url: guest.getURL(),
+        title: guest.getTitle(),
+        active: wcId === this.activeWebContentsId
+      })
+      index++
+    }
+
+    return { tabs }
+  }
+
+  tabSwitch(index: number): BrowserTabSwitchResult {
+    // Why: filter to live tabs so indices match tabList(), skipping destroyed-but-uncleaned entries.
+    const liveEntries = [...this.getRegisteredTabs()].filter(([_tabId, wcId]) => {
+      const guest = webContents.fromId(wcId)
+      return guest && !guest.isDestroyed()
+    })
+    if (index < 0 || index >= liveEntries.length) {
+      throw new BrowserError(
+        'browser_tab_not_found',
+        `Tab index ${index} is out of range. ${liveEntries.length} tab(s) open.`
+      )
+    }
+
+    const [tabId, wcId] = liveEntries[index]
+    if (this.activeWebContentsId !== null) {
+      this.invalidateRefMap(this.activeWebContentsId)
+    }
+    this.activeWebContentsId = wcId
+
+    return { switched: index, browserPageId: tabId }
+  }
+
+  onTabClosed(webContentsId: number): void {
+    if (this.activeWebContentsId === webContentsId) {
+      this.activeWebContentsId = null
+    }
+    const tabId = this.resolveTabIdSafe(webContentsId)
+    if (tabId) {
+      const state = this.tabState.get(tabId)
+      const guest = webContents.fromId(webContentsId)
+      if (state && guest) {
+        this.removeDebuggerListeners(guest, state)
+      }
+      this.tabState.delete(tabId)
+      this.commandQueues.delete(tabId)
+    }
+  }
+
+  onTabChanged(webContentsId: number): void {
+    this.activeWebContentsId = webContentsId
+  }
+}
diff --git a/src/main/browser/cdp-text-input-commands.ts b/src/main/browser/cdp-text-input-commands.ts
new file mode 100644
index 00000000000..b37a92bc993
--- /dev/null
+++ b/src/main/browser/cdp-text-input-commands.ts
@@ -0,0 +1,204 @@
+import type {
+  BrowserClearResult,
+  BrowserFillResult,
+  BrowserFocusResult,
+  BrowserKeypressResult,
+  BrowserSelectAllResult,
+  BrowserTypeResult
+} from '../../shared/runtime-types'
+import { insertTextThroughCdp } from './browser-text-insertion'
+import { CdpBridgeCommandModule } from './cdp-bridge-command-module'
+
+export class CdpTextInputCommands extends CdpBridgeCommandModule {
+  fill(element: string, value: string): Promise<BrowserFillResult> {
+    return this.enqueueCommand(async () => {
+      const guest = this.getActiveGuest()
+      const sender = this.makeCdpSender(guest)
+      await this.ensureDebuggerAttached(guest)
+
+      const node = await this.resolveRef(guest, sender, element)
+      const refSender = this.senderForRef(guest, node)
+
+      await refSender('DOM.focus', { backendNodeId: node.backendDOMNodeId })
+
+      // Why: select-all + delete clears the existing value before typing, matching Playwright/agent-browser fill().
+      await sender('Input.dispatchKeyEvent', {
+        type: 'keyDown',
+        key: 'a',
+        modifiers: process.platform === 'darwin' ? 4 : 2
+      })
+      await sender('Input.dispatchKeyEvent', {
+        type: 'keyUp',
+        key: 'a',
+        modifiers: process.platform === 'darwin' ? 4 : 2
+      })
+      await sender('Input.dispatchKeyEvent', { type: 'keyDown', key: 'Delete' })
+      await sender('Input.dispatchKeyEvent', { type: 'keyUp', key: 'Delete' })
+
+      await insertTextThroughCdp(sender, value)
+
+      // Why: React's synthetic listeners ignore native key events, so dispatch input/change so controlled components update.
+      // Why: use refSender for iframe sessions so document.activeElement is the focused element inside the iframe, not the parent <iframe>.
+      const eventSender = node.sessionId ? refSender : sender
+      await eventSender('Runtime.evaluate', {
+        expression: `(() => {
+          const el = document.activeElement;
+          if (el) {
+            el.dispatchEvent(new Event('input', { bubbles: true }));
+            el.dispatchEvent(new Event('change', { bubbles: true }));
+          }
+        })()`,
+        returnByValue: true
+      })
+
+      return { filled: element }
+    })
+  }
+
+  type(input: string): Promise<BrowserTypeResult> {
+    return this.enqueueCommand(async () => {
+      const guest = this.getActiveGuest()
+      const sender = this.makeCdpSender(guest)
+      await this.ensureDebuggerAttached(guest)
+
+      await insertTextThroughCdp(sender, input)
+      return { typed: true }
+    })
+  }
+
+  focus(element: string): Promise<BrowserFocusResult> {
+    return this.enqueueCommand(async () => {
+      const guest = this.getActiveGuest()
+      const sender = this.makeCdpSender(guest)
+      await this.ensureDebuggerAttached(guest)
+
+      const node = await this.resolveRef(guest, sender, element)
+      const refSender = this.senderForRef(guest, node)
+      await refSender('DOM.focus', { backendNodeId: node.backendDOMNodeId })
+
+      return { focused: element }
+    })
+  }
+
+  clear(element: string): Promise<BrowserClearResult> {
+    return this.enqueueCommand(async () => {
+      const guest = this.getActiveGuest()
+      const sender = this.makeCdpSender(guest)
+      await this.ensureDebuggerAttached(guest)
+
+      const node = await this.resolveRef(guest, sender, element)
+      const refSender = this.senderForRef(guest, node)
+
+      const { nodeId } = (await refSender('DOM.requestNode', {
+        backendNodeId: node.backendDOMNodeId
+      })) as { nodeId: number }
+      const { object } = (await refSender('DOM.resolveNode', { nodeId })) as {
+        object: { objectId: string }
+      }
+
+      await refSender('Runtime.callFunctionOn', {
+        objectId: object.objectId,
+        functionDeclaration: `function() {
+          this.value = '';
+          this.dispatchEvent(new Event('input', { bubbles: true }));
+          this.dispatchEvent(new Event('change', { bubbles: true }));
+        }`
+      })
+
+      return { cleared: element }
+    })
+  }
+
+  selectAll(element: string): Promise<BrowserSelectAllResult> {
+    return this.enqueueCommand(async () => {
+      const guest = this.getActiveGuest()
+      const sender = this.makeCdpSender(guest)
+      await this.ensureDebuggerAttached(guest)
+
+      const node = await this.resolveRef(guest, sender, element)
+      const refSender = this.senderForRef(guest, node)
+      await refSender('DOM.focus', { backendNodeId: node.backendDOMNodeId })
+
+      await sender('Input.dispatchKeyEvent', {
+        type: 'keyDown',
+        key: 'a',
+        modifiers: process.platform === 'darwin' ? 4 : 2
+      })
+      await sender('Input.dispatchKeyEvent', {
+        type: 'keyUp',
+        key: 'a',
+        modifiers: process.platform === 'darwin' ? 4 : 2
+      })
+
+      return { selected: element }
+    })
+  }
+
+  keypress(key: string): Promise<BrowserKeypressResult> {
+    return this.enqueueCommand(async () => {
+      const guest = this.getActiveGuest()
+      const sender = this.makeCdpSender(guest)
+      await this.ensureDebuggerAttached(guest)
+
+      const keyDef = resolveKeyDefinition(key)
+      await sender('Input.dispatchKeyEvent', {
+        type: 'keyDown',
+        ...keyDef
+      })
+      await sender('Input.dispatchKeyEvent', {
+        type: 'keyUp',
+        ...keyDef
+      })
+
+      return { pressed: key }
+    })
+  }
+}
+
+// Why: Input.dispatchKeyEvent needs `text` for keys with default actions (Enter/Tab), or Chrome skips the action.
+type KeyDefinition = {
+  key: string
+  code: string
+  windowsVirtualKeyCode?: number
+  text?: string
+}
+
+const KEY_DEFINITIONS: Record<string, KeyDefinition> = {
+  Enter: { key: 'Enter', code: 'Enter', windowsVirtualKeyCode: 13, text: '\r' },
+  Tab: { key: 'Tab', code: 'Tab', windowsVirtualKeyCode: 9, text: '\t' },
+  Escape: { key: 'Escape', code: 'Escape', windowsVirtualKeyCode: 27 },
+  Backspace: { key: 'Backspace', code: 'Backspace', windowsVirtualKeyCode: 8 },
+  Delete: { key: 'Delete', code: 'Delete', windowsVirtualKeyCode: 46 },
+  ArrowUp: { key: 'ArrowUp', code: 'ArrowUp', windowsVirtualKeyCode: 38 },
+  ArrowDown: { key: 'ArrowDown', code: 'ArrowDown', windowsVirtualKeyCode: 40 },
+  ArrowLeft: { key: 'ArrowLeft', code: 'ArrowLeft', windowsVirtualKeyCode: 37 },
+  ArrowRight: { key: 'ArrowRight', code: 'ArrowRight', windowsVirtualKeyCode: 39 },
+  Home: { key: 'Home', code: 'Home', windowsVirtualKeyCode: 36 },
+  End: { key: 'End', code: 'End', windowsVirtualKeyCode: 35 },
+  PageUp: { key: 'PageUp', code: 'PageUp', windowsVirtualKeyCode: 33 },
+  PageDown: { key: 'PageDown', code: 'PageDown', windowsVirtualKeyCode: 34 },
+  Space: { key: ' ', code: 'Space', windowsVirtualKeyCode: 32, text: ' ' }
+}
+
+function resolveKeyDefinition(key: string): KeyDefinition {
+  if (KEY_DEFINITIONS[key]) {
+    return KEY_DEFINITIONS[key]
+  }
+  // Why: sites that check event.code drop events with invalid code values.
+  if (key.length === 1) {
+    const charCode = key.charCodeAt(0)
+    if (charCode >= 48 && charCode <= 57) {
+      return { key, code: `Digit${key}`, windowsVirtualKeyCode: charCode, text: key }
+    }
+    if ((charCode >= 65 && charCode <= 90) || (charCode >= 97 && charCode <= 122)) {
+      return {
+        key,
+        code: `Key${key.toUpperCase()}`,
+        windowsVirtualKeyCode: key.toUpperCase().charCodeAt(0),
+        text: key
+      }
+    }
+    return { key, code: '', windowsVirtualKeyCode: charCode, text: key }
+  }
+  return { key, code: key }
+}
diff --git a/src/main/browser/cdp-ws-proxy.test.ts b/src/main/browser/cdp-ws-proxy.test.ts
index 142e3832be2..c5f098ffa91 100644
--- a/src/main/browser/cdp-ws-proxy.test.ts
+++ b/src/main/browser/cdp-ws-proxy.test.ts
@@ -599,7 +599,6 @@ describe('CdpWsProxy', () => {
       printBackground: true,
       pageSize: { width: 8.5, height: 11 },
       margins: {
-        marginType: 'custom',
         top: 0.25,
         bottom: 0.5,
         left: 0.75,
@@ -625,7 +624,6 @@ describe('CdpWsProxy', () => {
 
     expect(mock.webContents.printToPDF).toHaveBeenCalledWith({
       margins: {
-        marginType: 'custom',
         top: 0.25,
         bottom: defaultPdfMarginInches,
         left: defaultPdfMarginInches,
diff --git a/src/main/browser/popup-origin-bar-window.test.ts b/src/main/browser/popup-origin-bar-window.test.ts
index 3e816e74b07..fedcd4dfdd0 100644
--- a/src/main/browser/popup-origin-bar-window.test.ts
+++ b/src/main/browser/popup-origin-bar-window.test.ts
@@ -285,6 +285,7 @@ describe('openPopupWithOriginBar', () => {
   it('closes the window when the popup content is destroyed, without re-closing the contents', () => {
     const adopted = createFakeWebContents()
     openPopupWithOriginBar({ webContents: adopted as never }, 'https://example.com/')
+    const { bar } = lastViews()
 
     adopted.emit('destroyed')
 
@@ -292,6 +293,7 @@ describe('openPopupWithOriginBar', () => {
     // The window's closed handler must not call close() on already-destroyed
     // contents — that throws in real Electron.
     expect(adopted.close).not.toHaveBeenCalled()
+    expect(bar.webContents.close).toHaveBeenCalledTimes(1)
   })
 
   it('re-asserts the origin when the popup finishes loading', () => {
@@ -326,11 +328,54 @@ describe('openPopupWithOriginBar', () => {
     const adopted = createFakeWebContents()
     const onClosed = vi.fn()
     const popup = openPopupWithOriginBar({ webContents: adopted as never }, 'https://example.com/')
+    const { bar } = lastViews()
     popup.onClosed(onClosed)
 
     popup.close()
 
     expect(adopted.close).toHaveBeenCalledTimes(1)
+    expect(bar.webContents.close).toHaveBeenCalledTimes(1)
     expect(onClosed).toHaveBeenCalledTimes(1)
   })
+
+  it('releases every origin bar across repeated popup lifecycles', () => {
+    const cycleCount = 25
+    const originBars: FakeWebContents[] = []
+
+    for (let cycle = 0; cycle < cycleCount; cycle += 1) {
+      const popup = openPopupWithOriginBar({}, `https://example.com/${cycle}`)
+      originBars.push(lastViews().bar.webContents)
+      popup.close()
+    }
+
+    expect(originBars.filter((contents) => contents.close.mock.calls.length === 1)).toHaveLength(
+      cycleCount
+    )
+  })
+
+  it('tolerates an origin bar destroyed before its window closes', () => {
+    const adopted = createFakeWebContents()
+    const onClosed = vi.fn()
+    const popup = openPopupWithOriginBar({ webContents: adopted as never }, 'https://example.com/')
+    popup.onClosed(onClosed)
+    const { bar } = lastViews()
+    const barWebContents = bar.webContents
+    barWebContents.emit('destroyed')
+    Object.defineProperty(bar, 'webContents', { get: () => undefined })
+
+    expect(() => popup.close()).not.toThrow()
+    expect(adopted.close).toHaveBeenCalledTimes(1)
+    expect(barWebContents.close).not.toHaveBeenCalled()
+    expect(onClosed).toHaveBeenCalledTimes(1)
+  })
+
+  it('closes both child contents when popup preparation fails', () => {
+    const adopted = createFakeWebContents()
+
+    openPopupWithOriginBar({ webContents: adopted as never }, 'https://example.com/', () => false)
+
+    expect(adopted.close).toHaveBeenCalledTimes(1)
+    expect(lastViews().bar.webContents.close).toHaveBeenCalledTimes(1)
+    expect(lastWindow().close).toHaveBeenCalledTimes(1)
+  })
 })
diff --git a/src/main/browser/popup-origin-bar-window.ts b/src/main/browser/popup-origin-bar-window.ts
index 376c318d1ae..cfbe3ef3d3b 100644
--- a/src/main/browser/popup-origin-bar-window.ts
+++ b/src/main/browser/popup-origin-bar-window.ts
@@ -92,7 +92,8 @@ function clampPopupContentSize(options: PopupChildWindowOptions): {
 // caller's popup bookkeeping cannot leak an entry for a window that no longer exists.
 function closeUnpreparedPopup(
   window: BaseWindow,
-  contentWebContents: Electron.WebContents
+  contentWebContents: Electron.WebContents,
+  originBarWebContents: Electron.WebContents
 ): PopupOriginBarWindow {
   const closedListeners: (() => void)[] = []
   let closed = false
@@ -105,6 +106,9 @@ function closeUnpreparedPopup(
   if (!contentWebContents.isDestroyed()) {
     contentWebContents.close()
   }
+  if (!originBarWebContents.isDestroyed()) {
+    originBarWebContents.close()
+  }
   if (!window.isDestroyed()) {
     window.close()
   }
@@ -159,6 +163,7 @@ export function openPopupWithOriginBar(
   const originBarView = new WebContentsView({
     webPreferences: { contextIsolation: true, nodeIntegration: false, sandbox: true }
   })
+  const originBarWebContents = originBarView.webContents
   const contentView = new WebContentsView({
     // Why: Electron rejects an explicitly undefined webContents; omitting it
     // lets WebContentsView create contents for Cmd/Ctrl-click popups.
@@ -188,7 +193,7 @@ export function openPopupWithOriginBar(
 
   const contentWebContents = contentView.webContents
   if (prepareContent && !prepareContent(contentWebContents)) {
-    return closeUnpreparedPopup(window, contentWebContents)
+    return closeUnpreparedPopup(window, contentWebContents, originBarWebContents)
   }
   let currentUrl = initialUrl
   const renderOrigin = (): void => {
@@ -202,15 +207,15 @@ export function openPopupWithOriginBar(
     }
     // Why: textContent + JSON encoding — the URL is attacker-controlled and
     // must never be interpolated into the bar's markup.
-    void originBarView.webContents
+    void originBarWebContents
       .executeJavaScript(
         `document.body.classList.toggle('insecure', ${insecure ? 'true' : 'false'});` +
           `document.getElementById('origin').textContent = ${JSON.stringify(label)};`
       )
       .catch(() => {})
   }
-  originBarView.webContents.once('did-finish-load', renderOrigin)
-  void originBarView.webContents.loadURL(
+  originBarWebContents.once('did-finish-load', renderOrigin)
+  void originBarWebContents.loadURL(
     `data:text/html;charset=utf-8,${encodeURIComponent(ORIGIN_BAR_HTML)}`
   )
 
@@ -253,6 +258,10 @@ export function openPopupWithOriginBar(
       // pages often notify the opener from unload.
       contentWebContents.close()
     }
+    // Why: BaseWindow does not destroy child WebContentsView contents when it closes.
+    if (!originBarWebContents.isDestroyed()) {
+      originBarWebContents.close()
+    }
     for (const listener of closedListeners) {
       listener()
     }
diff --git a/src/main/claude-accounts/runtime-auth-service.ts b/src/main/claude-accounts/runtime-auth-service.ts
index e720378a8b8..dead38a7780 100644
--- a/src/main/claude-accounts/runtime-auth-service.ts
+++ b/src/main/claude-accounts/runtime-auth-service.ts
@@ -1,112 +1,16 @@
-/* eslint-disable max-lines -- Why: keeps file/Keychain/snapshot/env-patch auth semantics together so PTY launch and quota-fetch paths can't drift. */
-import { chmodSync, existsSync, mkdirSync, readFileSync, rmSync } from 'node:fs'
-import { dirname, join } from 'node:path'
-import { app } from 'electron'
-import type { ClaudeManagedAccount } from '../../shared/managed-account-types'
 import type { Store } from '../persistence'
-import { writeFileAtomically } from '../codex-accounts/fs-utils'
-import type { ClaudeEnvPatch } from './environment'
-import {
-  readClaudeManagedAuthFile,
-  resolveOwnedClaudeManagedAuthPath,
-  writeClaudeManagedAuthFile
-} from './managed-auth-path'
-import { parseWslUncPath } from '../../shared/wsl-paths'
-import { resolveLocalAccountRuntimeTarget } from '../../shared/local-account-runtime'
-import { getDefaultWslDistro, getWslHome, toWindowsWslPath } from '../wsl'
-const OWNERSHIP_PROBE_TIMEOUT = 'orca-wsl-ownership-probe-timeout'
-
-import { runWslProcess } from '../wsl/wsl-runner'
-import { hasLiveClaudePtys } from './live-pty-gate'
-import { isOauthTokenExpiring, refreshClaudeOauthCredentials } from './oauth-refresh'
-import { ClaudeRuntimePathResolver } from './runtime-paths'
-import {
-  deleteActiveClaudeKeychainCredentialsStrict,
-  readActiveClaudeKeychainCredentials,
-  readActiveClaudeKeychainCredentialsStrict,
-  readManagedClaudeKeychainCredentials,
-  writeActiveClaudeKeychainCredentials,
-  writeActiveClaudeKeychainCredentialsForRuntime,
-  writeManagedClaudeKeychainCredentials
-} from './keychain'
 import {
   getSelectedClaudeAccountIdForTarget,
-  normalizeClaudeAccountSelectionTarget,
-  normalizeClaudeRuntimeSelection,
-  setSelectedClaudeAccountIdForTarget,
   type ClaudeAccountSelectionTarget
 } from './runtime-selection'
+import { ClaudeRuntimeAuthSync } from './runtime-auth/runtime-auth-sync'
+import type { ClaudeRuntimeAuthPreparation } from './runtime-auth/runtime-auth-types'
 
-export type ClaudeRuntimeAuthPreparation = {
-  configDir: string
-  runtime?: 'host' | 'wsl'
-  wslDistro?: string | null
-  wslLinuxConfigDir?: string | null
-  envPatch: ClaudeEnvPatch
-  stripAuthEnv: boolean
-  managedRefreshDeferredByLivePty?: boolean
-  provenance: string
-}
+export type { ClaudeRuntimeAuthPreparation } from './runtime-auth/runtime-auth-types'
 
-type ClaudeSystemDefaultSnapshot = {
-  credentialsJson: string | null
-  configOauthAccount: unknown
-  keychainCredentialsJson: string | null
-  scopedKeychainCredentialsJson?: string | null
-  legacyKeychainCredentialsJson?: string | null
-  scopedKeychainCredentialsCaptured?: boolean
-  legacyKeychainCredentialsCaptured?: boolean
-  capturedAt: number
-}
-
-type ClaudeAuthIdentity = {
-  accountUuid: string | null
-  email: string | null
-  organizationUuid: string | null
-}
-
-type ClaudeReadBackResult =
-  | { status: 'unchanged' | 'persisted' }
-  | {
-      status: 'rejected'
-      runtimeCredentialsChanged: boolean
-      hasValidChangedRuntimeCredentials: boolean
-      runtimeCredentialsJson?: string
-    }
-type ClaudeReadBackMatch =
-  | { kind: 'matched'; account: ClaudeManagedAccount; managedCredentialsJson: string }
-  | { kind: 'none' | 'ambiguous' }
-type ClaudeKeychainReadResult =
-  | { status: 'captured'; credentialsJson: string | null }
-  | { status: 'failed' }
-type ClaudeKeychainSnapshotValue =
-  | { status: 'captured'; credentialsJson: string | null }
-  | { status: 'unknown' }
-type ClaudeRefreshTokenComparison = 'same' | 'different' | 'missing'
-type ClaudeRuntimeCredentialCandidate = {
-  credentialsJson: string
-  runtimeOauthAccount: unknown
-}
-
-const RUNTIME_OAUTH_ACCOUNT_PARSE_ERROR = Symbol('runtime-oauth-account-parse-error')
-
-function shellQuote(value: string): string {
-  return `'${value.replace(/'/g, "'\\''")}'`
-}
-
-export class ClaudeRuntimeAuthService {
-  private readonly pathResolver = new ClaudeRuntimePathResolver()
-  private mutationQueue: Promise<unknown> = Promise.resolve()
-  private lastSyncedAccountId: string | null = null
-  // Why: creds Orca last wrote to the shared file; a mismatch on managed→default transition means an external login overwrote it, so adopt it as the new default.
-  private lastWrittenCredentialsJson: string | null = null
-  private hasMaterializedRuntimeAuth = false
-  private hasLastWrittenOauthAccount = false
-  private lastWrittenOauthAccount: unknown = null
-  private skipNextReadBackForAccountId: string | null = null
-  private managedRefreshDeferredByLivePtyAccountId: string | null = null
-
-  constructor(private readonly store: Store) {
+export class ClaudeRuntimeAuthService extends ClaudeRuntimeAuthSync {
+  constructor(store: Store) {
+    super(store)
     this.initializeLastSyncedState()
     void this.safeSyncForCurrentSelection()
   }
@@ -175,276 +79,6 @@ export class ClaudeRuntimeAuthService {
     return next
   }
 
-  private async doSyncForCurrentSelection(target?: ClaudeAccountSelectionTarget): Promise<void> {
-    const settings = this.store.getSettings()
-    const effectiveTarget = this.resolveWslDefaultTarget(target)
-    const normalizedTarget = normalizeClaudeAccountSelectionTarget(effectiveTarget)
-    const activeAccountId = getSelectedClaudeAccountIdForTarget(settings, normalizedTarget)
-    const activeAccount = this.getActiveAccount(settings.claudeManagedAccounts, activeAccountId)
-    const previousAccount = this.getActiveAccount(
-      settings.claudeManagedAccounts,
-      this.lastSyncedAccountId
-    )
-    this.managedRefreshDeferredByLivePtyAccountId = null
-    const previousManagedCredentialsJson = previousAccount
-      ? await this.readManagedCredentials(previousAccount)
-      : null
-    const previousManagedOauthAccount = previousAccount
-      ? await this.readManagedOauthAccount(previousAccount)
-      : null
-    if (previousAccount && previousAccount.id !== activeAccount?.id) {
-      if (previousManagedCredentialsJson) {
-        const outgoingReadBackResult = await this.readBackRefreshedTokens(
-          previousManagedCredentialsJson,
-          {
-            updateLastWrittenCredentialsJson: true
-          }
-        )
-        if (
-          outgoingReadBackResult.status === 'rejected' &&
-          outgoingReadBackResult.runtimeCredentialsChanged &&
-          hasLiveClaudePtys()
-        ) {
-          if (
-            outgoingReadBackResult.runtimeCredentialsJson &&
-            this.liveRuntimeCredentialsCanUpdateActiveAccount(
-              outgoingReadBackResult.runtimeCredentialsJson,
-              previousAccount,
-              previousManagedCredentialsJson,
-              previousManagedOauthAccount
-            )
-          ) {
-            // Why: switching away while Claude is live must preserve verified token refreshes before replacing shared runtime credentials.
-            await this.writeManagedCredentials(
-              previousAccount,
-              outgoingReadBackResult.runtimeCredentialsJson
-            )
-          } else {
-            // Why: the runtime blob may lack identity proof for a live-session refresh; skip persisting it, but still let new terminals move to the account.
-            console.warn(
-              '[claude-runtime-auth] Skipping unverified live Claude auth read-back while switching accounts'
-            )
-          }
-        }
-      }
-    }
-    if (!activeAccount) {
-      if (activeAccountId) {
-        const nextSelection = setSelectedClaudeAccountIdForTarget(
-          normalizeClaudeRuntimeSelection(settings),
-          null,
-          normalizedTarget
-        )
-        this.store.updateSettings({
-          activeClaudeManagedAccountId:
-            normalizedTarget.runtime === 'host' ? null : settings.activeClaudeManagedAccountId,
-          activeClaudeManagedAccountIdsByRuntime: nextSelection
-        })
-      }
-      if (normalizedTarget.runtime === 'wsl') {
-        return
-      }
-      if (this.lastSyncedAccountId !== null) {
-        await (previousAccount
-          ? this.restoreSystemDefaultSnapshot(
-              previousManagedCredentialsJson,
-              previousManagedOauthAccount
-            )
-          : this.restoreSystemDefaultSnapshot(this.lastWrittenCredentialsJson, undefined))
-        this.lastSyncedAccountId = null
-      }
-      return
-    }
-
-    if (activeAccount.managedAuthRuntime === 'wsl') {
-      if (!(await this.getOwnedManagedAuthPath(activeAccount))) {
-        console.warn(
-          '[claude-runtime-auth] Active WSL managed account is not owned by Orca, restoring system default'
-        )
-        const nextSelection = setSelectedClaudeAccountIdForTarget(
-          normalizeClaudeRuntimeSelection(settings),
-          null,
-          normalizedTarget
-        )
-        this.store.updateSettings({
-          activeClaudeManagedAccountId:
-            normalizedTarget.runtime === 'host' ? null : settings.activeClaudeManagedAccountId,
-          activeClaudeManagedAccountIdsByRuntime: nextSelection
-        })
-        return
-      }
-      const credentialsJson = await this.readManagedCredentials(activeAccount)
-      if (!credentialsJson || !this.isValidCredentialsJsonObject(credentialsJson)) {
-        console.warn(
-          '[claude-runtime-auth] Active WSL managed account is missing or has invalid credentials, restoring system default'
-        )
-        const nextSelection = setSelectedClaudeAccountIdForTarget(
-          normalizeClaudeRuntimeSelection(settings),
-          null,
-          normalizedTarget
-        )
-        this.store.updateSettings({
-          activeClaudeManagedAccountId:
-            normalizedTarget.runtime === 'host' ? null : settings.activeClaudeManagedAccountId,
-          activeClaudeManagedAccountIdsByRuntime: nextSelection
-        })
-        return
-      }
-      // Why: WSL managed accounts are isolated by their Linux CLAUDE_CONFIG_DIR; materializing into Windows ~/.claude would mix two auth stores.
-      this.clearLastWrittenRuntimeState()
-      return
-    }
-
-    if (!(await this.getOwnedManagedAuthPath(activeAccount))) {
-      console.warn(
-        '[claude-runtime-auth] Active managed account is not owned by Orca, restoring system default'
-      )
-      if (this.lastSyncedAccountId !== null) {
-        if (
-          previousAccount &&
-          (previousAccount.id !== activeAccount.id ||
-            this.hasMaterializedRuntimeAuth ||
-            this.runtimeOauthAccountMatches(await this.readManagedOauthAccount(previousAccount)))
-        ) {
-          await this.restoreSystemDefaultSnapshotForMissingManagedCredentials(
-            previousAccount,
-            previousManagedOauthAccount
-          )
-        } else if (!previousAccount && this.hasMaterializedRuntimeAuth) {
-          await this.restoreSystemDefaultSnapshot(this.lastWrittenCredentialsJson, undefined)
-        }
-      }
-      this.store.updateSettings({ activeClaudeManagedAccountId: null })
-      this.lastSyncedAccountId = null
-      return
-    }
-
-    let credentialsJson = await this.readManagedCredentials(activeAccount)
-    if (!credentialsJson || !this.isValidCredentialsJsonObject(credentialsJson)) {
-      console.warn(
-        '[claude-runtime-auth] Active managed account is missing or has invalid credentials, restoring system default'
-      )
-      if (this.lastSyncedAccountId !== null) {
-        if (
-          previousAccount &&
-          (previousAccount.id !== activeAccount.id ||
-            this.hasMaterializedRuntimeAuth ||
-            this.runtimeOauthAccountMatches(previousManagedOauthAccount))
-        ) {
-          await this.restoreSystemDefaultSnapshotForMissingManagedCredentials(
-            previousAccount,
-            previousManagedOauthAccount
-          )
-        } else if (!previousAccount && this.hasMaterializedRuntimeAuth) {
-          await this.restoreSystemDefaultSnapshot(this.lastWrittenCredentialsJson, undefined)
-        }
-      }
-      this.store.updateSettings({ activeClaudeManagedAccountId: null })
-      this.lastSyncedAccountId = null
-      return
-    }
-
-    if (this.lastSyncedAccountId === null) {
-      const paths = this.pathResolver.getRuntimePaths()
-      const runtimeCredentialsJson = existsSync(paths.credentialsPath)
-        ? readFileSync(paths.credentialsPath, 'utf-8')
-        : null
-      await this.captureSystemDefaultSnapshotForManagedEntry(
-        runtimeCredentialsJson,
-        credentialsJson
-      )
-    }
-
-    // Why: the CLI writes refreshed tokens to .credentials.json; if runtime differs from our last write, preserve them to managed storage before overwriting.
-    if (this.lastSyncedAccountId === activeAccount.id) {
-      if (this.skipNextReadBackForAccountId === activeAccount.id) {
-        this.skipNextReadBackForAccountId = null
-      } else {
-        const readBackResult = await this.readBackRefreshedTokens(credentialsJson, {
-          updateLastWrittenCredentialsJson: true
-        })
-        if (readBackResult.status === 'persisted') {
-          const updatedCredentialsJson = await this.readManagedCredentials(activeAccount)
-          if (updatedCredentialsJson && this.isValidCredentialsJsonObject(updatedCredentialsJson)) {
-            credentialsJson = updatedCredentialsJson
-          }
-        } else if (
-          readBackResult.status === 'rejected' &&
-          readBackResult.runtimeCredentialsChanged &&
-          // Why: a live Claude that lost a refresh race can wipe its runtime blob (empty tokens); preserving that would log out every new session.
-          readBackResult.hasValidChangedRuntimeCredentials &&
-          hasLiveClaudePtys()
-        ) {
-          if (
-            readBackResult.runtimeCredentialsJson &&
-            this.liveRuntimeCredentialsCanUpdateActiveAccount(
-              readBackResult.runtimeCredentialsJson,
-              activeAccount,
-              credentialsJson,
-              await this.readManagedOauthAccount(activeAccount)
-            )
-          ) {
-            // Why: this Claude launched under the active managed account, but persistence still needs positive account proof.
-            await this.writeManagedCredentials(activeAccount, readBackResult.runtimeCredentialsJson)
-            credentialsJson = readBackResult.runtimeCredentialsJson
-          } else {
-            // Why: while Claude runs, an unknown refresh may belong to a live session; rewriting stale managed auth logs it out.
-            console.warn(
-              '[claude-runtime-auth] Preserving changed Claude runtime credentials while live Claude terminals are running'
-            )
-            this.lastSyncedAccountId = activeAccount.id
-            this.hasMaterializedRuntimeAuth = true
-            return
-          }
-        }
-      }
-    }
-
-    if (this.lastSyncedAccountId !== activeAccount.id) {
-      this.skipNextReadBackForAccountId = null
-    }
-
-    // Why: rotate+persist the single-use token to managed storage before materializing (else runtime gets a stale token that fails invalid_grant); skip while a live PTY owns the creds since refreshing would double-rotate it (invalidating one copy) — read-back preserves its refresh instead.
-    const liveClaudePtys = hasLiveClaudePtys()
-    if (liveClaudePtys && isOauthTokenExpiring(credentialsJson)) {
-      this.managedRefreshDeferredByLivePtyAccountId = activeAccount.id
-    }
-    if (!liveClaudePtys) {
-      const refreshed = await this.refreshManagedAccountTokenIfNeeded(
-        activeAccount,
-        credentialsJson
-      )
-      if (refreshed) {
-        credentialsJson = refreshed
-      }
-    }
-
-    const paths = this.pathResolver.getRuntimePaths()
-    this.writeRuntimeCredentials(credentialsJson)
-    if (process.platform === 'darwin') {
-      // Why: Claude Code 2.1+ reads the scoped service, older builds the legacy unsuffixed one; runtime switching must satisfy both.
-      try {
-        await writeActiveClaudeKeychainCredentialsForRuntime(credentialsJson, paths.configDir)
-      } catch (error) {
-        await this.restoreSystemDefaultSnapshot(
-          credentialsJson,
-          await this.readManagedOauthAccount(activeAccount)
-        )
-        throw error
-      }
-    }
-    const managedOauthAccount = await this.readManagedOauthAccount(activeAccount)
-    if (this.writeRuntimeOauthAccount(managedOauthAccount)) {
-      this.lastWrittenOauthAccount = managedOauthAccount
-      this.hasLastWrittenOauthAccount = true
-    } else {
-      this.lastWrittenOauthAccount = null
-      this.hasLastWrittenOauthAccount = false
-    }
-    this.lastSyncedAccountId = activeAccount.id
-    this.hasMaterializedRuntimeAuth = true
-  }
-
   // Why: re-auth/add-account write fresh managed tokens; skip the next read-back so stale runtime tokens can't overwrite them.
   clearLastWrittenCredentialsJson(
     accountId = this.store.getSettings().activeClaudeManagedAccountId
@@ -454,1361 +88,4 @@ export class ClaudeRuntimeAuthService {
     }
     this.skipNextReadBackForAccountId = accountId
   }
-
-  private async readBackRefreshedTokens(
-    baselineCredentialsJson: string,
-    options: { updateLastWrittenCredentialsJson: boolean }
-  ): Promise<ClaudeReadBackResult> {
-    try {
-      const candidates =
-        await this.readRuntimeCredentialCandidatesForReadBack(baselineCredentialsJson)
-      if (candidates.length === 0) {
-        return { status: 'unchanged' }
-      }
-      const changedCandidates =
-        this.lastWrittenCredentialsJson === null
-          ? candidates
-          : candidates.filter(
-              (candidate) => candidate.credentialsJson !== this.lastWrittenCredentialsJson
-            )
-      if (changedCandidates.length === 0) {
-        return { status: 'unchanged' }
-      }
-
-      const acceptedCandidates: {
-        credentialsJson: string
-        match: Extract<ClaudeReadBackMatch, { kind: 'matched' }>
-      }[] = []
-      const ambiguousCandidates: string[] = []
-      let sawAmbiguousCandidate = false
-      let sawValidChangedCandidate = false
-      for (const runtimeContents of changedCandidates) {
-        if (!this.isValidCredentialsJsonObject(runtimeContents.credentialsJson)) {
-          continue
-        }
-        sawValidChangedCandidate = true
-        const match = await this.findManagedAccountForRuntimeCredentials(
-          runtimeContents.credentialsJson,
-          runtimeContents.runtimeOauthAccount
-        )
-        if (match.kind === 'ambiguous') {
-          sawAmbiguousCandidate = true
-          ambiguousCandidates.push(runtimeContents.credentialsJson)
-          continue
-        }
-        if (match.kind !== 'matched') {
-          continue
-        }
-        // Why: on cold start we can't tell a fresh CLI refresh from stale runtime creds; adopt only when expiry or a rotated refresh token proves runtime is newer than managed.
-        if (this.lastWrittenCredentialsJson === null) {
-          const fresher = this.runtimeCredentialsAreFresher(
-            runtimeContents.credentialsJson,
-            match.managedCredentialsJson
-          )
-          const refreshTokenRotated =
-            this.compareRefreshTokens(
-              runtimeContents.credentialsJson,
-              match.managedCredentialsJson
-            ) === 'different'
-          const older = this.runtimeCredentialsAreOlder(
-            runtimeContents.credentialsJson,
-            match.managedCredentialsJson
-          )
-          if (!fresher && !(refreshTokenRotated && !older)) {
-            continue
-          }
-        } else if (
-          this.runtimeCredentialsAreOlder(
-            runtimeContents.credentialsJson,
-            match.managedCredentialsJson
-          )
-        ) {
-          continue
-        }
-        acceptedCandidates.push({ credentialsJson: runtimeContents.credentialsJson, match })
-      }
-      if (acceptedCandidates.length === 0) {
-        if (sawAmbiguousCandidate) {
-          console.warn('[claude-runtime-auth] Refusing ambiguous Claude auth read-back')
-        }
-        return {
-          status: 'rejected',
-          runtimeCredentialsChanged: true,
-          hasValidChangedRuntimeCredentials: sawValidChangedCandidate,
-          runtimeCredentialsJson:
-            ambiguousCandidates.length === 1 ? ambiguousCandidates[0] : undefined
-        }
-      }
-      const { credentialsJson: runtimeContents, match } =
-        this.chooseFreshestReadBackCandidate(acceptedCandidates)
-
-      await this.writeManagedCredentials(match.account, runtimeContents)
-      if (options.updateLastWrittenCredentialsJson) {
-        this.writeRuntimeCredentials(runtimeContents)
-        this.lastWrittenCredentialsJson = runtimeContents
-        if (process.platform === 'darwin') {
-          const paths = this.pathResolver.getRuntimePaths()
-          await writeActiveClaudeKeychainCredentialsForRuntime(runtimeContents, paths.configDir)
-        }
-      }
-      return { status: 'persisted' }
-    } catch (error) {
-      // Why: read-back is best-effort; a transient fs error must not block forward sync (worst case: one more stale-token cycle).
-      console.warn('[claude-runtime-auth] Failed to read back refreshed tokens:', error)
-      return {
-        status: 'rejected',
-        runtimeCredentialsChanged:
-          this.runtimeCredentialsChangedSinceLastWrite(baselineCredentialsJson),
-        // Why: an fs error hides whether a live session's refresh is present, so err toward preserving runtime state.
-        hasValidChangedRuntimeCredentials: true
-      }
-    }
-  }
-
-  private async readRuntimeCredentialCandidatesForReadBack(
-    baselineCredentialsJson: string
-  ): Promise<ClaudeRuntimeCredentialCandidate[]> {
-    const paths = this.pathResolver.getRuntimePaths()
-    const fileCredentials = existsSync(paths.credentialsPath)
-      ? readFileSync(paths.credentialsPath, 'utf-8')
-      : null
-    const runtimeOauthAccount = this.readRuntimeOauthAccount()
-    const candidates: ClaudeRuntimeCredentialCandidate[] = []
-    const pushCandidate = (credentialsJson: string | null): void => {
-      if (
-        credentialsJson &&
-        !candidates.some((candidate) => candidate.credentialsJson === credentialsJson)
-      ) {
-        candidates.push({ credentialsJson, runtimeOauthAccount })
-      }
-    }
-    if (process.platform === 'darwin') {
-      const scopedKeychainCredentials = await this.readActiveClaudeKeychainCredentialsBestEffort(
-        paths.configDir
-      )
-      const legacyKeychainCredentials = await this.readActiveClaudeKeychainCredentialsBestEffort()
-      if (this.lastWrittenCredentialsJson === null) {
-        pushCandidate(scopedKeychainCredentials)
-        pushCandidate(legacyKeychainCredentials)
-        pushCandidate(fileCredentials)
-        return candidates.filter(
-          (candidate) => candidate.credentialsJson !== baselineCredentialsJson
-        )
-      }
-      pushCandidate(scopedKeychainCredentials)
-      pushCandidate(legacyKeychainCredentials)
-    }
-    pushCandidate(fileCredentials)
-    return candidates
-  }
-
-  private getPreparation(target?: ClaudeAccountSelectionTarget): ClaudeRuntimeAuthPreparation {
-    const settings = this.store.getSettings()
-    const paths = this.pathResolver.getRuntimePaths()
-    const normalizedTarget = this.resolveWslDefaultTarget(
-      target ?? this.getDefaultAccountSelectionTarget(settings)
-    )
-    const activeAccountId = getSelectedClaudeAccountIdForTarget(settings, normalizedTarget)
-    const activeAccount = this.getActiveAccount(settings.claudeManagedAccounts, activeAccountId)
-    if (
-      normalizeClaudeAccountSelectionTarget(normalizedTarget).runtime === 'wsl' &&
-      activeAccount?.managedAuthRuntime === 'wsl' &&
-      activeAccount.wslLinuxAuthPath
-    ) {
-      return {
-        configDir: activeAccount.managedAuthPath,
-        runtime: 'wsl',
-        wslDistro: activeAccount.wslDistro ?? null,
-        wslLinuxConfigDir: activeAccount.wslLinuxAuthPath,
-        envPatch: { CLAUDE_CONFIG_DIR: activeAccount.wslLinuxAuthPath },
-        stripAuthEnv: true,
-        provenance: `managed:${activeAccount.id}:wsl:${activeAccount.wslDistro ?? ''}`
-      }
-    }
-    if (normalizeClaudeAccountSelectionTarget(normalizedTarget).runtime === 'wsl') {
-      const distro =
-        normalizeClaudeAccountSelectionTarget(normalizedTarget).wslDistro ?? getDefaultWslDistro()
-      const wslHome = distro ? getWslHome(distro) : null
-      const wslHomeInfo = wslHome ? parseWslUncPath(wslHome) : null
-      if (distro && wslHome && wslHomeInfo) {
-        const windowsConfigDir = join(wslHome, '.claude')
-        const linuxConfigDir = `${wslHomeInfo.linuxPath.replace(/\/$/, '')}/.claude`
-        return {
-          configDir: windowsConfigDir,
-          runtime: 'wsl',
-          wslDistro: distro,
-          wslLinuxConfigDir: linuxConfigDir,
-          envPatch: {},
-          stripAuthEnv: true,
-          provenance: `wsl:${distro}:system`
-        }
-      }
-      return {
-        configDir: paths.configDir,
-        runtime: 'wsl',
-        wslDistro: normalizeClaudeAccountSelectionTarget(normalizedTarget).wslDistro,
-        wslLinuxConfigDir: null,
-        envPatch: {},
-        stripAuthEnv: true,
-        provenance: `wsl:${normalizeClaudeAccountSelectionTarget(normalizedTarget).wslDistro ?? '__default__'}:system`
-      }
-    }
-    return {
-      configDir: paths.configDir,
-      runtime: 'host',
-      wslDistro: null,
-      wslLinuxConfigDir: null,
-      envPatch: paths.envPatch,
-      stripAuthEnv: Boolean(activeAccountId && activeAccount?.managedAuthRuntime !== 'wsl'),
-      managedRefreshDeferredByLivePty: Boolean(
-        activeAccountId &&
-        activeAccount?.managedAuthRuntime !== 'wsl' &&
-        this.managedRefreshDeferredByLivePtyAccountId === activeAccountId
-      ),
-      provenance:
-        activeAccountId && activeAccount?.managedAuthRuntime !== 'wsl'
-          ? `managed:${activeAccountId}`
-          : 'system'
-    }
-  }
-
-  private getActiveAccount(
-    accounts: ClaudeManagedAccount[],
-    activeAccountId: string | null
-  ): ClaudeManagedAccount | null {
-    if (!activeAccountId) {
-      return null
-    }
-    return accounts.find((account) => account.id === activeAccountId) ?? null
-  }
-
-  private getDefaultAccountSelectionTarget(
-    settings = this.store.getSettings()
-  ): ClaudeAccountSelectionTarget {
-    // Why: Windows auth follows the resolved account runtime; stale cross-platform WSL pins must stay local-host.
-    const resolved = resolveLocalAccountRuntimeTarget(settings)
-    if (process.platform === 'win32' && resolved.runtime === 'wsl') {
-      return { runtime: 'wsl', wslDistro: resolved.wslDistro }
-    }
-    return { runtime: 'host' }
-  }
-
-  private resolveWslDefaultTarget(
-    target?: ClaudeAccountSelectionTarget
-  ): ClaudeAccountSelectionTarget {
-    if (target?.runtime !== 'wsl' || target.wslDistro?.trim()) {
-      return target ?? { runtime: 'host' }
-    }
-    const defaultDistro = getDefaultWslDistro()
-    return defaultDistro ? { runtime: 'wsl', wslDistro: defaultDistro } : target
-  }
-
-  private async findManagedAccountForRuntimeCredentials(
-    runtimeCredentialsJson: string,
-    runtimeOauthAccount: unknown
-  ): Promise<ClaudeReadBackMatch> {
-    const matches: { account: ClaudeManagedAccount; managedCredentialsJson: string }[] = []
-    let unverifiableCount = 0
-    for (const account of this.store.getSettings().claudeManagedAccounts) {
-      const managedCredentialsJson = await this.readManagedCredentials(account)
-      if (!managedCredentialsJson) {
-        continue
-      }
-      const match = this.runtimeCredentialsMatchAccount(
-        runtimeCredentialsJson,
-        runtimeOauthAccount,
-        account,
-        managedCredentialsJson,
-        await this.readManagedOauthAccount(account)
-      )
-      if (match === 'match') {
-        matches.push({ account, managedCredentialsJson })
-      } else if (match === 'unverifiable') {
-        unverifiableCount += 1
-      }
-    }
-
-    if (matches.length === 1 && unverifiableCount === 0) {
-      return { kind: 'matched', ...matches[0] }
-    }
-    return { kind: matches.length === 0 && unverifiableCount === 0 ? 'none' : 'ambiguous' }
-  }
-
-  private runtimeCredentialsMatchAccount(
-    runtimeCredentialsJson: string,
-    runtimeOauthAccount: unknown,
-    account: ClaudeManagedAccount,
-    managedCredentialsJson: string,
-    managedOauthAccount: unknown
-  ): 'match' | 'mismatch' | 'unverifiable' {
-    const identity = this.readIdentityFromCredentials(runtimeCredentialsJson)
-    if (!identity) {
-      return 'mismatch'
-    }
-    const managedIdentity = this.readIdentityFromCredentials(managedCredentialsJson)
-    const managedOauthIdentity = this.readIdentityFromOauthAccount(managedOauthAccount)
-    const runtimeOauthIdentity = this.readIdentityFromOauthAccount(runtimeOauthAccount)
-    const credentialOauthConflict =
-      (identity.accountUuid &&
-        runtimeOauthIdentity.accountUuid &&
-        identity.accountUuid !== runtimeOauthIdentity.accountUuid) ||
-      (identity.email &&
-        runtimeOauthIdentity.email &&
-        identity.email !== runtimeOauthIdentity.email) ||
-      (identity.organizationUuid &&
-        runtimeOauthIdentity.organizationUuid &&
-        identity.organizationUuid !== runtimeOauthIdentity.organizationUuid)
-    if (credentialOauthConflict) {
-      return 'mismatch'
-    }
-
-    // Why: mirrors the Codex runtime-home guard; don't persist shared runtime creds into the managed account if another login rewrote them.
-    const selectedOrganizationUuid = this.normalizeField(
-      account.organizationUuid ??
-        managedIdentity?.organizationUuid ??
-        managedOauthIdentity.organizationUuid
-    )
-    const oauthAccountMatches =
-      Boolean(managedOauthIdentity.accountUuid) &&
-      managedOauthIdentity.accountUuid === runtimeOauthIdentity.accountUuid &&
-      Boolean(runtimeOauthIdentity.email || runtimeOauthIdentity.organizationUuid)
-    const runtimeEmail = identity.email ?? runtimeOauthIdentity.email
-    const runtimeOrganizationUuid =
-      identity.organizationUuid ?? runtimeOauthIdentity.organizationUuid
-    const refreshTokenComparison = this.compareRefreshTokens(
-      runtimeCredentialsJson,
-      managedCredentialsJson
-    )
-    if (!runtimeEmail) {
-      if (refreshTokenComparison === 'same') {
-        return 'match'
-      }
-      if (identity.organizationUuid) {
-        if (selectedOrganizationUuid && selectedOrganizationUuid !== identity.organizationUuid) {
-          return 'mismatch'
-        }
-        return 'unverifiable'
-      }
-      if (oauthAccountMatches) {
-        return 'match'
-      }
-      if (!runtimeOrganizationUuid && refreshTokenComparison === 'different') {
-        return 'mismatch'
-      }
-      return 'unverifiable'
-    }
-    if (account.email && this.normalizeField(account.email) !== runtimeEmail) {
-      return 'mismatch'
-    }
-    if (selectedOrganizationUuid && !runtimeOrganizationUuid) {
-      return refreshTokenComparison === 'same' || oauthAccountMatches ? 'match' : 'unverifiable'
-    }
-    if (
-      selectedOrganizationUuid &&
-      runtimeOrganizationUuid &&
-      selectedOrganizationUuid !== runtimeOrganizationUuid
-    ) {
-      return 'mismatch'
-    }
-    if (!selectedOrganizationUuid && runtimeOrganizationUuid) {
-      return refreshTokenComparison === 'same' ? 'match' : 'unverifiable'
-    }
-
-    return 'match'
-  }
-
-  private liveRuntimeCredentialsCanUpdateActiveAccount(
-    runtimeCredentialsJson: string,
-    account: ClaudeManagedAccount,
-    managedCredentialsJson: string,
-    managedOauthAccount: unknown
-  ): boolean {
-    const match = this.runtimeCredentialsMatchAccount(
-      runtimeCredentialsJson,
-      this.readRuntimeOauthAccount(),
-      account,
-      managedCredentialsJson,
-      managedOauthAccount
-    )
-    if (match === 'match') {
-      return true
-    }
-    const identity = this.readIdentityFromCredentials(runtimeCredentialsJson)
-    const managedIdentity = this.readIdentityFromCredentials(managedCredentialsJson)
-    const managedOauthIdentity = this.readIdentityFromOauthAccount(managedOauthAccount)
-    const runtimeOauthIdentity = this.readIdentityFromOauthAccount(this.readRuntimeOauthAccount())
-    const selectedOrganizationUuid = this.normalizeField(
-      account.organizationUuid ??
-        managedIdentity?.organizationUuid ??
-        managedOauthIdentity.organizationUuid
-    )
-    return (
-      match === 'unverifiable' &&
-      Boolean(selectedOrganizationUuid) &&
-      (identity?.organizationUuid ?? runtimeOauthIdentity.organizationUuid) ===
-        selectedOrganizationUuid
-    )
-  }
-
-  private readIdentityFromCredentials(credentialsJson: string): ClaudeAuthIdentity | null {
-    let parsed: Record<string, unknown>
-    try {
-      parsed = JSON.parse(credentialsJson) as Record<string, unknown>
-    } catch {
-      return null
-    }
-    const oauth = this.asRecord(parsed.claudeAiOauth)
-    return {
-      accountUuid: this.normalizeField(
-        this.readString(oauth, 'accountUuid') ?? this.readString(oauth, 'accountId')
-      ),
-      email: this.normalizeField(this.readString(oauth, 'email')),
-      organizationUuid: this.normalizeField(
-        this.readString(oauth, 'organizationUuid') ?? this.readString(oauth, 'organizationId')
-      )
-    }
-  }
-
-  private isValidCredentialsJsonObject(credentialsJson: string): boolean {
-    try {
-      const parsed = this.asRecord(JSON.parse(credentialsJson))
-      const oauth = this.asRecord(parsed?.claudeAiOauth)
-      return this.normalizeField(this.readString(oauth, 'accessToken')) !== null
-    } catch {
-      return false
-    }
-  }
-
-  private runtimeCredentialsAreFresher(
-    runtimeCredentialsJson: string,
-    managedCredentialsJson: string
-  ): boolean {
-    const runtimeFreshness = this.readFreshnessFromCredentials(runtimeCredentialsJson)
-    const managedFreshness = this.readFreshnessFromCredentials(managedCredentialsJson)
-    return (
-      runtimeFreshness !== null && managedFreshness !== null && runtimeFreshness > managedFreshness
-    )
-  }
-
-  private runtimeCredentialsAreOlder(
-    runtimeCredentialsJson: string,
-    managedCredentialsJson: string
-  ): boolean {
-    const runtimeFreshness = this.readFreshnessFromCredentials(runtimeCredentialsJson)
-    const managedFreshness = this.readFreshnessFromCredentials(managedCredentialsJson)
-    return (
-      runtimeFreshness !== null && managedFreshness !== null && runtimeFreshness < managedFreshness
-    )
-  }
-
-  private chooseFreshestReadBackCandidate(
-    candidates: {
-      credentialsJson: string
-      match: Extract<ClaudeReadBackMatch, { kind: 'matched' }>
-    }[]
-  ): {
-    credentialsJson: string
-    match: Extract<ClaudeReadBackMatch, { kind: 'matched' }>
-  } {
-    return candidates.reduce((freshest, candidate) => {
-      const candidateFreshness = this.readFreshnessFromCredentials(candidate.credentialsJson)
-      const freshestFreshness = this.readFreshnessFromCredentials(freshest.credentialsJson)
-      if (
-        candidateFreshness !== null &&
-        (freshestFreshness === null || candidateFreshness > freshestFreshness)
-      ) {
-        return candidate
-      }
-      return freshest
-    })
-  }
-
-  private readFreshnessFromCredentials(credentialsJson: string): number | null {
-    let parsed: Record<string, unknown>
-    try {
-      parsed = JSON.parse(credentialsJson) as Record<string, unknown>
-    } catch {
-      return null
-    }
-    const oauth = this.asRecord(parsed.claudeAiOauth)
-    return (
-      this.readNumber(oauth, 'expiresAt') ??
-      this.readNumber(oauth, 'expires_at') ??
-      this.readNumber(oauth, 'expiry') ??
-      this.readNumber(oauth, 'expires')
-    )
-  }
-
-  private compareRefreshTokens(
-    runtimeCredentialsJson: string,
-    managedCredentialsJson: string
-  ): ClaudeRefreshTokenComparison {
-    const runtimeRefreshToken = this.readRefreshTokenFromCredentials(runtimeCredentialsJson)
-    const managedRefreshToken = this.readRefreshTokenFromCredentials(managedCredentialsJson)
-    if (!runtimeRefreshToken || !managedRefreshToken) {
-      return 'missing'
-    }
-    return runtimeRefreshToken === managedRefreshToken ? 'same' : 'different'
-  }
-
-  private readRefreshTokenFromCredentials(credentialsJson: string): string | null {
-    try {
-      const parsed = JSON.parse(credentialsJson) as Record<string, unknown>
-      const oauth = this.asRecord(parsed.claudeAiOauth)
-      return this.normalizeField(this.readString(oauth, 'refreshToken'))
-    } catch {
-      return null
-    }
-  }
-
-  private readIdentityFromOauthAccount(oauthAccount: unknown): ClaudeAuthIdentity {
-    const oauth = this.asRecord(oauthAccount)
-    return {
-      accountUuid: this.normalizeField(
-        this.readString(oauth, 'accountUuid') ?? this.readString(oauth, 'accountId')
-      ),
-      email: this.normalizeField(
-        this.readString(oauth, 'emailAddress') ?? this.readString(oauth, 'email')
-      ),
-      organizationUuid: this.normalizeField(
-        this.readString(oauth, 'organizationUuid') ?? this.readString(oauth, 'organizationId')
-      )
-    }
-  }
-
-  private asRecord(value: unknown): Record<string, unknown> | null {
-    if (!value || typeof value !== 'object' || Array.isArray(value)) {
-      return null
-    }
-    return value as Record<string, unknown>
-  }
-
-  private readString(value: Record<string, unknown> | null, key: string): string | null {
-    const candidate = value?.[key]
-    return typeof candidate === 'string' ? candidate : null
-  }
-
-  private readNumber(value: Record<string, unknown> | null, key: string): number | null {
-    const candidate = value?.[key]
-    if (typeof candidate === 'number' && Number.isFinite(candidate)) {
-      return candidate
-    }
-    if (typeof candidate === 'string') {
-      const parsed = Number(candidate)
-      return Number.isFinite(parsed) ? parsed : null
-    }
-    return null
-  }
-
-  private normalizeField(value: string | null | undefined): string | null {
-    if (!value) {
-      return null
-    }
-    const trimmed = value.trim()
-    return trimmed === '' ? null : trimmed
-  }
-
-  private async readManagedCredentials(account: ClaudeManagedAccount): Promise<string | null> {
-    const managedAuthPath = await this.getOwnedManagedAuthPath(account)
-    if (!managedAuthPath) {
-      return null
-    }
-    if (process.platform === 'darwin') {
-      return readManagedClaudeKeychainCredentials(account.id)
-    }
-    return readClaudeManagedAuthFile(managedAuthPath, '.credentials.json')
-  }
-
-  private async writeManagedCredentials(
-    account: ClaudeManagedAccount,
-    credentialsJson: string
-  ): Promise<void> {
-    const managedAuthPath = await this.getOwnedManagedAuthPath(account)
-    if (!managedAuthPath) {
-      throw new Error('Managed Claude auth storage is not owned by Orca.')
-    }
-    if (process.platform === 'darwin') {
-      await writeManagedClaudeKeychainCredentials(account.id, credentialsJson)
-      return
-    }
-    writeClaudeManagedAuthFile(managedAuthPath, '.credentials.json', credentialsJson)
-  }
-
-  /**
-   * Proactively refresh an account's OAuth token and persist the rotation to
-   * managed storage. Returns the refreshed credentials JSON, or null when no
-   * refresh happened (token valid, no refresh token, or network failure).
-   *
-   * Caller guarantees this account isn't the live/active one and runs inside the
-   * serialized mutation queue, so the single-use refresh token can't rotate concurrently.
-   */
-  private async refreshManagedAccountTokenIfNeeded(
-    account: ClaudeManagedAccount,
-    credentialsJson: string
-  ): Promise<string | null> {
-    if (!isOauthTokenExpiring(credentialsJson)) {
-      return null
-    }
-    const refreshed = await refreshClaudeOauthCredentials(credentialsJson)
-    if (!refreshed || !this.isValidCredentialsJsonObject(refreshed)) {
-      return null
-    }
-    try {
-      await this.writeManagedCredentials(account, refreshed)
-    } catch (error) {
-      console.warn('[claude-runtime-auth] Failed to persist refreshed Claude token:', error)
-      return null
-    }
-    return refreshed
-  }
-
-  private async readManagedOauthAccount(account: ClaudeManagedAccount): Promise<unknown> {
-    const managedAuthPath = await this.getOwnedManagedAuthPath(account)
-    if (!managedAuthPath) {
-      return null
-    }
-    try {
-      const contents = readClaudeManagedAuthFile(managedAuthPath, 'oauth-account.json')
-      return contents ? (JSON.parse(contents) as unknown) : null
-    } catch {
-      return null
-    }
-  }
-
-  private async getOwnedManagedAuthPath(account: ClaudeManagedAccount): Promise<string | null> {
-    const wslInfo = parseWslUncPath(account.managedAuthPath)
-    if (wslInfo) {
-      if (
-        !wslInfo.linuxPath.includes('/.local/share/orca/claude-accounts/') ||
-        !wslInfo.linuxPath.endsWith('/auth')
-      ) {
-        return null
-      }
-      if (process.platform === 'win32') {
-        try {
-          const owned = await runWslProcess({
-            distro: wslInfo.distro,
-            loginPath: 'none',
-            shell: 'bash',
-            script: [
-              'set -euo pipefail',
-              `candidate=${shellQuote(wslInfo.linuxPath)}`,
-              'managed_root="${HOME%/}/.local/share/orca/claude-accounts"',
-              'candidate_real=$(readlink -f -- "$candidate")',
-              'managed_root_real=$(readlink -f -- "$managed_root")',
-              'test -f "$candidate_real/.orca-managed-claude-auth"',
-              `test "$(cat "$candidate_real/.orca-managed-claude-auth")" = ${shellQuote(account.id)}`,
-              'case "$candidate_real" in "$managed_root_real"/*/auth) printf "%s\\n" "$candidate_real" ;; *) exit 35 ;; esac'
-            ].join('\n'),
-            timeoutMs: 5000
-          })
-          if (owned.timedOut) {
-            throw new Error(OWNERSHIP_PROBE_TIMEOUT)
-          }
-          if (owned.code !== 0) {
-            return null
-          }
-          const canonicalLinuxPath = owned.stdout.trim()
-          return canonicalLinuxPath ? toWindowsWslPath(canonicalLinuxPath, wslInfo.distro) : null
-        } catch (error) {
-          // Why rethrow a timeout: null means "not owned by Orca", and the
-          // caller persists that -- clearing the user's account selection. A
-          // slow distro must not decide ownership. Swallowing it here is what
-          // made the previous guard dead code.
-          if (error instanceof Error && error.message === OWNERSHIP_PROBE_TIMEOUT) {
-            throw error
-          }
-          return null
-        }
-      }
-      return existsSync(account.managedAuthPath) ? account.managedAuthPath : null
-    }
-    return resolveOwnedClaudeManagedAuthPath(account.id, account.managedAuthPath, {
-      adoptLegacyMarker: true
-    })
-  }
-
-  private async captureSystemDefaultSnapshotForManagedEntry(
-    runtimeCredentialsJson: string | null,
-    managedCredentialsJson: string
-  ): Promise<void> {
-    const snapshotPath = this.getSystemDefaultSnapshotPath()
-    const existingSnapshot = this.readSystemDefaultSnapshot(snapshotPath)
-    if (runtimeCredentialsJson !== managedCredentialsJson) {
-      await this.captureSystemDefaultSnapshot({
-        force: true,
-        previousSnapshot: existingSnapshot,
-        managedCredentialsJson
-      })
-      return
-    }
-    if (existingSnapshot) {
-      await this.captureSystemDefaultSnapshot({
-        force: true,
-        credentialsJsonOverride: existingSnapshot.credentialsJson,
-        previousSnapshot: existingSnapshot,
-        managedCredentialsJson
-      })
-      return
-    }
-    await this.captureSystemDefaultSnapshot({ force: false })
-  }
-
-  private async captureSystemDefaultSnapshot(options: {
-    force: boolean
-    credentialsJsonOverride?: string | null
-    previousSnapshot?: ClaudeSystemDefaultSnapshot | null
-    managedCredentialsJson?: string
-  }): Promise<void> {
-    const snapshotPath = this.getSystemDefaultSnapshotPath()
-    if (!options.force && existsSync(snapshotPath)) {
-      return
-    }
-
-    const paths = this.pathResolver.getRuntimePaths()
-    const credentialsJson =
-      options.credentialsJsonOverride !== undefined
-        ? options.credentialsJsonOverride
-        : existsSync(paths.credentialsPath)
-          ? readFileSync(paths.credentialsPath, 'utf-8')
-          : null
-    const keychainCredentialsJson = await this.readAggregateClaudeKeychainCredentialsBestEffort(
-      paths.configDir
-    )
-    const scopedKeychainCredentials =
-      process.platform === 'darwin'
-        ? await this.readActiveClaudeKeychainCredentialsForSnapshot(paths.configDir)
-        : ({ status: 'captured', credentialsJson: null } as const)
-    const legacyKeychainCredentialsJson =
-      process.platform === 'darwin'
-        ? await this.readActiveClaudeKeychainCredentialsForSnapshot()
-        : ({ status: 'captured', credentialsJson: null } as const)
-    if (
-      scopedKeychainCredentials.status === 'failed' ||
-      legacyKeychainCredentialsJson.status === 'failed'
-    ) {
-      throw new Error('Cannot capture current Claude Keychain credentials')
-    }
-    const scopedKeychainCredentialsJson =
-      scopedKeychainCredentials.status === 'captured'
-        ? this.snapshotKeychainCredentials(
-            scopedKeychainCredentials.credentialsJson,
-            options.previousSnapshot,
-            'scoped',
-            options.managedCredentialsJson
-          )
-        : undefined
-    const legacyKeychainSnapshotJson =
-      legacyKeychainCredentialsJson.status === 'captured'
-        ? this.snapshotKeychainCredentials(
-            legacyKeychainCredentialsJson.credentialsJson,
-            options.previousSnapshot,
-            'legacy',
-            options.managedCredentialsJson
-          )
-        : undefined
-    const configOauthAccount = this.readRuntimeOauthAccount()
-    const snapshot: ClaudeSystemDefaultSnapshot = {
-      credentialsJson,
-      configOauthAccount:
-        configOauthAccount === RUNTIME_OAUTH_ACCOUNT_PARSE_ERROR ? null : configOauthAccount,
-      keychainCredentialsJson,
-      scopedKeychainCredentialsJson,
-      legacyKeychainCredentialsJson: legacyKeychainSnapshotJson,
-      scopedKeychainCredentialsCaptured: scopedKeychainCredentials.status === 'captured',
-      legacyKeychainCredentialsCaptured: legacyKeychainCredentialsJson.status === 'captured',
-      capturedAt: Date.now()
-    }
-    this.writeJson(snapshotPath, snapshot)
-  }
-
-  private async restoreSystemDefaultSnapshot(
-    ownedCredentialsJson?: string | null,
-    ownedOauthAccount?: unknown
-  ): Promise<void> {
-    const snapshotPath = this.getSystemDefaultSnapshotPath()
-    const paths = this.pathResolver.getRuntimePaths()
-    const previouslyWrittenCredentialsJson =
-      this.lastWrittenCredentialsJson ?? ownedCredentialsJson ?? null
-    const snapshot = this.readSystemDefaultSnapshot(snapshotPath)
-
-    const fileCredentialsOwned = this.hasUnchangedRuntimeCredentials(
-      previouslyWrittenCredentialsJson
-    )
-    let hasCredentialSurfaceOwnership = fileCredentialsOwned
-    // Why: prove ownership before mutating anything, and restore OAuth first so a failure leaves the credential proof intact for retry.
-    this.lastWrittenCredentialsJson = previouslyWrittenCredentialsJson
-    let scopedSnapshot: ClaudeKeychainSnapshotValue | null = null
-    let legacySnapshot: ClaudeKeychainSnapshotValue | null = null
-    let scopedKeychainOwned = false
-    let legacyKeychainOwned = false
-    if (process.platform === 'darwin') {
-      scopedSnapshot = this.readKeychainSnapshotValue(snapshot, 'scoped')
-      legacySnapshot = this.readKeychainSnapshotValue(snapshot, 'legacy')
-      scopedKeychainOwned = await this.hasUnchangedActiveClaudeKeychainCredentials(
-        scopedSnapshot,
-        previouslyWrittenCredentialsJson,
-        paths.configDir
-      )
-      legacyKeychainOwned = await this.hasUnchangedActiveClaudeKeychainCredentials(
-        legacySnapshot,
-        previouslyWrittenCredentialsJson
-      )
-      hasCredentialSurfaceOwnership =
-        fileCredentialsOwned || scopedKeychainOwned || legacyKeychainOwned
-    }
-    this.restoreRuntimeOauthAccountIfOwned(
-      snapshot?.configOauthAccount ?? null,
-      this.getOwnedRuntimeOauthBaseline(ownedOauthAccount, hasCredentialSurfaceOwnership),
-      { allowCredentialSurfaceOwnership: hasCredentialSurfaceOwnership }
-    )
-    if (fileCredentialsOwned) {
-      this.restoreRuntimeCredentials(snapshot?.credentialsJson ?? null)
-    }
-    if (process.platform === 'darwin') {
-      if (scopedSnapshot?.status === 'captured' && scopedKeychainOwned) {
-        await this.restoreActiveClaudeKeychainCredentials(
-          scopedSnapshot.credentialsJson,
-          paths.configDir
-        )
-      }
-      if (legacySnapshot?.status === 'captured' && legacyKeychainOwned) {
-        await this.restoreActiveClaudeKeychainCredentials(legacySnapshot.credentialsJson)
-      }
-    }
-    this.lastWrittenCredentialsJson = null
-    this.lastWrittenOauthAccount = null
-    this.hasLastWrittenOauthAccount = false
-    this.hasMaterializedRuntimeAuth = false
-  }
-
-  private getOwnedRuntimeOauthBaseline(
-    ownedOauthAccount: unknown,
-    hasCredentialSurfaceOwnership: boolean
-  ): unknown {
-    if (this.hasLastWrittenOauthAccount) {
-      return this.lastWrittenOauthAccount
-    }
-    // Why: managed metadata hints identity but isn't proof Orca wrote .claude.json; use only after a credential surface proves ownership.
-    if (hasCredentialSurfaceOwnership && ownedOauthAccount !== undefined) {
-      return ownedOauthAccount
-    }
-    return null
-  }
-
-  private readSystemDefaultSnapshot(snapshotPath: string): ClaudeSystemDefaultSnapshot | null {
-    if (!existsSync(snapshotPath)) {
-      return null
-    }
-    try {
-      const parsed = JSON.parse(readFileSync(snapshotPath, 'utf-8')) as unknown
-      if (this.isSystemDefaultSnapshot(parsed)) {
-        return parsed
-      }
-      throw new Error('Invalid Claude system-default auth snapshot shape')
-    } catch (error) {
-      console.warn('[claude-runtime-auth] Ignoring invalid system-default auth snapshot:', error)
-      rmSync(snapshotPath, { force: true })
-      return null
-    }
-  }
-
-  private async clearRuntimeAuthForAccount(
-    account: ClaudeManagedAccount,
-    managedOauthAccount: unknown
-  ): Promise<void> {
-    const paths = this.pathResolver.getRuntimePaths()
-    const fileCredentialsOwned = this.runtimeCredentialsBelongToAccount(
-      this.readRuntimeCredentialsFile(),
-      account,
-      managedOauthAccount
-    )
-    let scopedKeychainOwned = false
-    let legacyKeychainOwned = false
-    if (process.platform === 'darwin') {
-      scopedKeychainOwned = await this.hasActiveKeychainCredentialsForAccount(
-        account,
-        managedOauthAccount,
-        paths.configDir
-      )
-      legacyKeychainOwned = await this.hasActiveKeychainCredentialsForAccount(
-        account,
-        managedOauthAccount
-      )
-    }
-    const hasCredentialSurfaceOwnership =
-      fileCredentialsOwned || scopedKeychainOwned || legacyKeychainOwned
-    this.restoreRuntimeOauthAccountIfOwned(
-      null,
-      this.getOwnedRuntimeOauthBaseline(managedOauthAccount, hasCredentialSurfaceOwnership),
-      {
-        allowCredentialSurfaceOwnership: hasCredentialSurfaceOwnership
-      }
-    )
-    if (fileCredentialsOwned) {
-      rmSync(paths.credentialsPath, { force: true })
-    }
-    if (process.platform === 'darwin') {
-      if (scopedKeychainOwned) {
-        await deleteActiveClaudeKeychainCredentialsStrict(paths.configDir)
-      }
-      if (legacyKeychainOwned) {
-        await deleteActiveClaudeKeychainCredentialsStrict()
-      }
-    }
-  }
-
-  private async restoreSystemDefaultSnapshotForMissingManagedCredentials(
-    account: ClaudeManagedAccount,
-    managedOauthAccount: unknown
-  ): Promise<void> {
-    const snapshot = this.readSystemDefaultSnapshot(this.getSystemDefaultSnapshotPath())
-    if (!snapshot) {
-      await this.clearRuntimeAuthForAccount(account, managedOauthAccount)
-      this.clearLastWrittenRuntimeState()
-      return
-    }
-    const paths = this.pathResolver.getRuntimePaths()
-    const fileCredentialsOwned = this.runtimeCredentialsBelongToAccount(
-      this.readRuntimeCredentialsFile(),
-      account,
-      managedOauthAccount
-    )
-    let scopedSnapshot: ClaudeKeychainSnapshotValue | null = null
-    let legacySnapshot: ClaudeKeychainSnapshotValue | null = null
-    let scopedKeychainOwned = false
-    let legacyKeychainOwned = false
-    if (process.platform === 'darwin') {
-      scopedSnapshot = this.readKeychainSnapshotValue(snapshot, 'scoped')
-      legacySnapshot = this.readKeychainSnapshotValue(snapshot, 'legacy')
-      scopedKeychainOwned = await this.hasActiveKeychainCredentialsForAccount(
-        account,
-        managedOauthAccount,
-        paths.configDir
-      )
-      legacyKeychainOwned = await this.hasActiveKeychainCredentialsForAccount(
-        account,
-        managedOauthAccount
-      )
-    }
-    const hasCredentialSurfaceOwnership =
-      fileCredentialsOwned || scopedKeychainOwned || legacyKeychainOwned
-    this.restoreRuntimeOauthAccountIfOwned(
-      snapshot.configOauthAccount,
-      this.getOwnedRuntimeOauthBaseline(managedOauthAccount, hasCredentialSurfaceOwnership),
-      {
-        allowCredentialSurfaceOwnership: hasCredentialSurfaceOwnership
-      }
-    )
-    if (fileCredentialsOwned) {
-      this.restoreRuntimeCredentials(snapshot.credentialsJson)
-    }
-    if (process.platform === 'darwin') {
-      if (scopedSnapshot?.status === 'captured' && scopedKeychainOwned) {
-        await this.restoreActiveClaudeKeychainCredentials(
-          scopedSnapshot.credentialsJson,
-          paths.configDir
-        )
-      }
-      if (legacySnapshot?.status === 'captured' && legacyKeychainOwned) {
-        await this.restoreActiveClaudeKeychainCredentials(legacySnapshot.credentialsJson)
-      }
-    }
-    this.clearLastWrittenRuntimeState()
-  }
-
-  private readRuntimeCredentialsFile(): string | null {
-    const credentialsPath = this.pathResolver.getRuntimePaths().credentialsPath
-    return existsSync(credentialsPath) ? readFileSync(credentialsPath, 'utf-8') : null
-  }
-
-  private runtimeCredentialsBelongToAccount(
-    credentialsJson: string | null,
-    account: ClaudeManagedAccount,
-    managedOauthAccount: unknown
-  ): boolean {
-    if (!credentialsJson) {
-      return false
-    }
-    const identity = this.readIdentityFromCredentials(credentialsJson)
-    if (
-      !identity?.email ||
-      (account.email && this.normalizeField(account.email) !== identity.email)
-    ) {
-      return false
-    }
-    const oauthIdentity = this.readIdentityFromOauthAccount(managedOauthAccount)
-    const selectedOrganizationUuid = this.normalizeField(
-      account.organizationUuid ?? oauthIdentity.organizationUuid
-    )
-    if (selectedOrganizationUuid) {
-      return identity.organizationUuid === selectedOrganizationUuid
-    }
-    return !identity.organizationUuid
-  }
-
-  private clearLastWrittenRuntimeState(): void {
-    this.lastWrittenCredentialsJson = null
-    this.lastWrittenOauthAccount = null
-    this.hasLastWrittenOauthAccount = false
-    this.hasMaterializedRuntimeAuth = false
-  }
-
-  private hasUnchangedRuntimeCredentials(previouslyWrittenCredentialsJson: string | null): boolean {
-    if (previouslyWrittenCredentialsJson === null) {
-      return false
-    }
-    const paths = this.pathResolver.getRuntimePaths()
-    const currentCredentialsJson = existsSync(paths.credentialsPath)
-      ? readFileSync(paths.credentialsPath, 'utf-8')
-      : null
-    return currentCredentialsJson === previouslyWrittenCredentialsJson
-  }
-
-  private runtimeCredentialsChangedSinceLastWrite(baselineCredentialsJson: string): boolean {
-    const paths = this.pathResolver.getRuntimePaths()
-    try {
-      const currentCredentialsJson = existsSync(paths.credentialsPath)
-        ? readFileSync(paths.credentialsPath, 'utf-8')
-        : null
-      return (
-        currentCredentialsJson !== null &&
-        currentCredentialsJson !== (this.lastWrittenCredentialsJson ?? baselineCredentialsJson)
-      )
-    } catch {
-      return false
-    }
-  }
-
-  private restoreRuntimeCredentials(credentialsJson: string | null): void {
-    const paths = this.pathResolver.getRuntimePaths()
-    if (credentialsJson !== null) {
-      this.writeRuntimeCredentials(credentialsJson)
-    } else {
-      rmSync(paths.credentialsPath, { force: true })
-    }
-  }
-
-  private restoreRuntimeOauthAccountIfOwned(
-    oauthAccount: unknown,
-    ownedOauthAccount: unknown,
-    options: { allowCredentialSurfaceOwnership: boolean }
-  ): void {
-    const currentOauthAccount = this.readRuntimeOauthAccount()
-    if (currentOauthAccount === RUNTIME_OAUTH_ACCOUNT_PARSE_ERROR) {
-      return
-    }
-    if (options.allowCredentialSurfaceOwnership) {
-      this.writeRuntimeOauthAccount(oauthAccount)
-      return
-    }
-    if (
-      (ownedOauthAccount === null || ownedOauthAccount === undefined) &&
-      !options.allowCredentialSurfaceOwnership
-    ) {
-      return
-    }
-    if (!this.jsonValuesEqual(currentOauthAccount, ownedOauthAccount)) {
-      return
-    }
-    this.writeRuntimeOauthAccount(oauthAccount)
-  }
-
-  private async hasUnchangedActiveClaudeKeychainCredentials(
-    snapshotValue: ClaudeKeychainSnapshotValue,
-    previouslyWrittenCredentialsJson: string | null,
-    configDir?: string
-  ): Promise<boolean> {
-    if (snapshotValue.status === 'unknown') {
-      return false
-    }
-    const currentCredentialsJson =
-      await this.readActiveClaudeKeychainCredentialsBestEffort(configDir)
-    return (
-      previouslyWrittenCredentialsJson !== null &&
-      currentCredentialsJson === previouslyWrittenCredentialsJson
-    )
-  }
-
-  private async restoreActiveClaudeKeychainCredentials(
-    credentialsJson: string | null,
-    configDir?: string
-  ): Promise<void> {
-    await (credentialsJson !== null
-      ? writeActiveClaudeKeychainCredentials(credentialsJson, configDir)
-      : deleteActiveClaudeKeychainCredentialsStrict(configDir))
-  }
-
-  private async hasActiveKeychainCredentialsForAccount(
-    account: ClaudeManagedAccount,
-    managedOauthAccount: unknown,
-    configDir?: string
-  ): Promise<boolean> {
-    const currentCredentialsJson =
-      await this.readActiveClaudeKeychainCredentialsBestEffort(configDir)
-    return this.runtimeCredentialsBelongToAccount(
-      currentCredentialsJson,
-      account,
-      managedOauthAccount
-    )
-  }
-
-  private readRuntimeOauthAccount(): unknown {
-    const configPath = this.pathResolver.getRuntimePaths().configPath
-    if (!existsSync(configPath)) {
-      return null
-    }
-    try {
-      const parsed = JSON.parse(readFileSync(configPath, 'utf-8')) as unknown
-      const record = this.asRecord(parsed)
-      if (!record) {
-        return RUNTIME_OAUTH_ACCOUNT_PARSE_ERROR
-      }
-      return record.oauthAccount ?? null
-    } catch {
-      return RUNTIME_OAUTH_ACCOUNT_PARSE_ERROR
-    }
-  }
-
-  private runtimeOauthAccountMatches(managedOauthAccount: unknown): boolean {
-    if (managedOauthAccount === null || managedOauthAccount === undefined) {
-      return false
-    }
-    const currentOauthAccount = this.readRuntimeOauthAccount()
-    if (currentOauthAccount === RUNTIME_OAUTH_ACCOUNT_PARSE_ERROR) {
-      return false
-    }
-    return this.jsonValuesEqual(currentOauthAccount, managedOauthAccount)
-  }
-
-  private writeRuntimeOauthAccount(oauthAccount: unknown): boolean {
-    const configPath = this.pathResolver.getRuntimePaths().configPath
-    const existing = this.readJsonObject(configPath)
-    if (existing === null) {
-      return false
-    }
-    if (oauthAccount === null || oauthAccount === undefined) {
-      delete existing.oauthAccount
-    } else {
-      existing.oauthAccount = oauthAccount
-    }
-    this.writeJson(configPath, existing)
-    return true
-  }
-
-  private jsonValuesEqual(left: unknown, right: unknown): boolean {
-    return (
-      JSON.stringify(this.sortJsonValue(left ?? null)) ===
-      JSON.stringify(this.sortJsonValue(right ?? null))
-    )
-  }
-
-  private sortJsonValue(value: unknown): unknown {
-    if (Array.isArray(value)) {
-      return value.map((item) => this.sortJsonValue(item))
-    }
-    const record = this.asRecord(value)
-    if (!record) {
-      return value
-    }
-    return Object.fromEntries(
-      Object.entries(record)
-        .sort(([leftKey], [rightKey]) => leftKey.localeCompare(rightKey))
-        .map(([key, nestedValue]) => [key, this.sortJsonValue(nestedValue)])
-    )
-  }
-
-  private isSystemDefaultSnapshot(value: unknown): value is ClaudeSystemDefaultSnapshot {
-    const snapshot = this.asRecord(value)
-    return (
-      snapshot !== null &&
-      Object.hasOwn(snapshot, 'credentialsJson') &&
-      this.isOptionalNullableString(snapshot.credentialsJson) &&
-      this.isOptionalNullableString(snapshot.keychainCredentialsJson) &&
-      this.isOptionalNullableString(snapshot.scopedKeychainCredentialsJson) &&
-      this.isOptionalNullableString(snapshot.legacyKeychainCredentialsJson) &&
-      this.isOptionalBoolean(snapshot.scopedKeychainCredentialsCaptured) &&
-      this.isOptionalBoolean(snapshot.legacyKeychainCredentialsCaptured) &&
-      this.hasValidKeychainSnapshotValue(snapshot, 'scoped') &&
-      this.hasValidKeychainSnapshotValue(snapshot, 'legacy') &&
-      (snapshot.capturedAt === undefined || typeof snapshot.capturedAt === 'number')
-    )
-  }
-
-  private isOptionalNullableString(value: unknown): boolean {
-    return value === undefined || value === null || typeof value === 'string'
-  }
-
-  private isOptionalBoolean(value: unknown): boolean {
-    return value === undefined || typeof value === 'boolean'
-  }
-
-  private snapshotKeychainCredentials(
-    credentialsJson: string | null,
-    previousSnapshot: ClaudeSystemDefaultSnapshot | null | undefined,
-    service: 'scoped' | 'legacy',
-    managedCredentialsJson: string | undefined
-  ): string | null {
-    if (managedCredentialsJson && credentialsJson === managedCredentialsJson && previousSnapshot) {
-      const previousValue = this.readKeychainSnapshotValue(previousSnapshot, service)
-      if (previousValue.status === 'captured') {
-        return previousValue.credentialsJson
-      }
-    }
-    return credentialsJson
-  }
-
-  private hasValidKeychainSnapshotValue(
-    snapshot: Record<string, unknown>,
-    service: 'scoped' | 'legacy'
-  ): boolean {
-    const capturedKey =
-      service === 'scoped'
-        ? 'scopedKeychainCredentialsCaptured'
-        : 'legacyKeychainCredentialsCaptured'
-    if (snapshot[capturedKey] === false) {
-      return true
-    }
-    const credentialsKey =
-      service === 'scoped' ? 'scopedKeychainCredentialsJson' : 'legacyKeychainCredentialsJson'
-    return (
-      Object.hasOwn(snapshot, credentialsKey) || Object.hasOwn(snapshot, 'keychainCredentialsJson')
-    )
-  }
-
-  private readKeychainSnapshotValue(
-    snapshot: ClaudeSystemDefaultSnapshot | null,
-    service: 'scoped' | 'legacy'
-  ): ClaudeKeychainSnapshotValue {
-    if (!snapshot) {
-      return { status: 'captured', credentialsJson: null }
-    }
-    const capturedKey =
-      service === 'scoped'
-        ? 'scopedKeychainCredentialsCaptured'
-        : 'legacyKeychainCredentialsCaptured'
-    if (snapshot[capturedKey] === false) {
-      return { status: 'unknown' }
-    }
-    const credentialsKey =
-      service === 'scoped' ? 'scopedKeychainCredentialsJson' : 'legacyKeychainCredentialsJson'
-    if (Object.hasOwn(snapshot, credentialsKey)) {
-      return {
-        status: 'captured',
-        credentialsJson: snapshot[credentialsKey] ?? null
-      }
-    }
-    return { status: 'captured', credentialsJson: snapshot.keychainCredentialsJson }
-  }
-
-  private async readAggregateClaudeKeychainCredentialsBestEffort(
-    configDir: string
-  ): Promise<string | null> {
-    try {
-      return await readActiveClaudeKeychainCredentials(configDir)
-    } catch (error) {
-      console.warn('[claude-runtime-auth] Failed to read Claude Keychain credentials:', error)
-      return null
-    }
-  }
-
-  private async readActiveClaudeKeychainCredentialsBestEffort(
-    configDir?: string
-  ): Promise<string | null> {
-    try {
-      return await readActiveClaudeKeychainCredentialsStrict(configDir)
-    } catch (error) {
-      console.warn('[claude-runtime-auth] Failed to read Claude Keychain credentials:', error)
-      return null
-    }
-  }
-
-  private async readActiveClaudeKeychainCredentialsForSnapshot(
-    configDir?: string
-  ): Promise<ClaudeKeychainReadResult> {
-    try {
-      return {
-        status: 'captured',
-        credentialsJson: await readActiveClaudeKeychainCredentialsStrict(configDir)
-      }
-    } catch (error) {
-      console.warn('[claude-runtime-auth] Failed to read Claude Keychain credentials:', error)
-      return { status: 'failed' }
-    }
-  }
-
-  private writeRuntimeCredentials(contents: string): void {
-    const credentialsPath = this.pathResolver.getRuntimePaths().credentialsPath
-    mkdirSync(dirname(credentialsPath), { recursive: true })
-    // Why: skip unchanged rewrites to dodge Windows EPERM contention (#1507); re-verify the file since another Claude may have rewritten it.
-    if (
-      this.lastWrittenCredentialsJson === contents &&
-      this.fileContentsEqual(credentialsPath, contents)
-    ) {
-      this.ensureOwnerOnlyMode(credentialsPath)
-      return
-    }
-    if (this.fileContentsEqual(credentialsPath, contents)) {
-      this.ensureOwnerOnlyMode(credentialsPath)
-      this.lastWrittenCredentialsJson = contents
-      return
-    }
-    writeFileAtomically(credentialsPath, contents, { mode: 0o600 })
-    this.lastWrittenCredentialsJson = contents
-  }
-
-  private writeJson(targetPath: string, value: unknown): void {
-    const serialized = `${JSON.stringify(value, null, 2)}\n`
-    mkdirSync(dirname(targetPath), { recursive: true })
-    // Why: same Windows contention reason as writeRuntimeCredentials.
-    if (this.fileContentsEqual(targetPath, serialized)) {
-      return
-    }
-    writeFileAtomically(targetPath, serialized, { mode: 0o600 })
-  }
-
-  private fileContentsEqual(targetPath: string, contents: string): boolean {
-    try {
-      return existsSync(targetPath) && readFileSync(targetPath, 'utf-8') === contents
-    } catch {
-      return false
-    }
-  }
-
-  private ensureOwnerOnlyMode(targetPath: string): void {
-    if (process.platform === 'win32') {
-      return
-    }
-    try {
-      chmodSync(targetPath, 0o600)
-    } catch {
-      /* Best effort: the next atomic write will set the restrictive mode. */
-    }
-  }
-
-  private readJsonObject(targetPath: string): Record<string, unknown> | null {
-    if (!existsSync(targetPath)) {
-      return {}
-    }
-    try {
-      const parsed = JSON.parse(readFileSync(targetPath, 'utf-8')) as unknown
-      if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) {
-        return parsed as Record<string, unknown>
-      }
-    } catch {
-      // Why: invalid config is unknown external state; return null so we don't erase user or Claude-owned settings.
-      return null
-    }
-    return null
-  }
-
-  private getRuntimeMetadataDir(): string {
-    const metadataDir = join(app.getPath('userData'), 'claude-runtime-auth')
-    mkdirSync(metadataDir, { recursive: true })
-    return metadataDir
-  }
-
-  private getSystemDefaultSnapshotPath(): string {
-    return join(this.getRuntimeMetadataDir(), 'system-default-auth.json')
-  }
 }
diff --git a/src/main/claude-accounts/runtime-auth/runtime-auth-credential-identity.ts b/src/main/claude-accounts/runtime-auth/runtime-auth-credential-identity.ts
new file mode 100644
index 00000000000..e94801a8eec
--- /dev/null
+++ b/src/main/claude-accounts/runtime-auth/runtime-auth-credential-identity.ts
@@ -0,0 +1,188 @@
+import { ClaudeRuntimeAuthFileStorage } from './runtime-auth-file-storage'
+import type {
+  ClaudeAuthIdentity,
+  ClaudeReadBackMatch,
+  ClaudeRefreshTokenComparison
+} from './runtime-auth-types'
+
+export class ClaudeRuntimeAuthCredentialIdentity extends ClaudeRuntimeAuthFileStorage {
+  protected readIdentityFromCredentials(credentialsJson: string): ClaudeAuthIdentity | null {
+    let parsed: Record<string, unknown>
+    try {
+      parsed = JSON.parse(credentialsJson) as Record<string, unknown>
+    } catch {
+      return null
+    }
+    const oauth = this.asRecord(parsed.claudeAiOauth)
+    return {
+      accountUuid: this.normalizeField(
+        this.readString(oauth, 'accountUuid') ?? this.readString(oauth, 'accountId')
+      ),
+      email: this.normalizeField(this.readString(oauth, 'email')),
+      organizationUuid: this.normalizeField(
+        this.readString(oauth, 'organizationUuid') ?? this.readString(oauth, 'organizationId')
+      )
+    }
+  }
+
+  protected isValidCredentialsJsonObject(credentialsJson: string): boolean {
+    try {
+      const parsed = this.asRecord(JSON.parse(credentialsJson))
+      const oauth = this.asRecord(parsed?.claudeAiOauth)
+      return this.normalizeField(this.readString(oauth, 'accessToken')) !== null
+    } catch {
+      return false
+    }
+  }
+
+  protected runtimeCredentialsAreFresher(
+    runtimeCredentialsJson: string,
+    managedCredentialsJson: string
+  ): boolean {
+    const runtimeFreshness = this.readFreshnessFromCredentials(runtimeCredentialsJson)
+    const managedFreshness = this.readFreshnessFromCredentials(managedCredentialsJson)
+    return (
+      runtimeFreshness !== null && managedFreshness !== null && runtimeFreshness > managedFreshness
+    )
+  }
+
+  protected runtimeCredentialsAreOlder(
+    runtimeCredentialsJson: string,
+    managedCredentialsJson: string
+  ): boolean {
+    const runtimeFreshness = this.readFreshnessFromCredentials(runtimeCredentialsJson)
+    const managedFreshness = this.readFreshnessFromCredentials(managedCredentialsJson)
+    return (
+      runtimeFreshness !== null && managedFreshness !== null && runtimeFreshness < managedFreshness
+    )
+  }
+
+  protected chooseFreshestReadBackCandidate(
+    candidates: {
+      credentialsJson: string
+      match: Extract<ClaudeReadBackMatch, { kind: 'matched' }>
+    }[]
+  ): {
+    credentialsJson: string
+    match: Extract<ClaudeReadBackMatch, { kind: 'matched' }>
+  } {
+    return candidates.reduce((freshest, candidate) => {
+      const candidateFreshness = this.readFreshnessFromCredentials(candidate.credentialsJson)
+      const freshestFreshness = this.readFreshnessFromCredentials(freshest.credentialsJson)
+      if (
+        candidateFreshness !== null &&
+        (freshestFreshness === null || candidateFreshness > freshestFreshness)
+      ) {
+        return candidate
+      }
+      return freshest
+    })
+  }
+
+  protected readFreshnessFromCredentials(credentialsJson: string): number | null {
+    let parsed: Record<string, unknown>
+    try {
+      parsed = JSON.parse(credentialsJson) as Record<string, unknown>
+    } catch {
+      return null
+    }
+    const oauth = this.asRecord(parsed.claudeAiOauth)
+    return (
+      this.readNumber(oauth, 'expiresAt') ??
+      this.readNumber(oauth, 'expires_at') ??
+      this.readNumber(oauth, 'expiry') ??
+      this.readNumber(oauth, 'expires')
+    )
+  }
+
+  protected compareRefreshTokens(
+    runtimeCredentialsJson: string,
+    managedCredentialsJson: string
+  ): ClaudeRefreshTokenComparison {
+    const runtimeRefreshToken = this.readRefreshTokenFromCredentials(runtimeCredentialsJson)
+    const managedRefreshToken = this.readRefreshTokenFromCredentials(managedCredentialsJson)
+    if (!runtimeRefreshToken || !managedRefreshToken) {
+      return 'missing'
+    }
+    return runtimeRefreshToken === managedRefreshToken ? 'same' : 'different'
+  }
+
+  protected readRefreshTokenFromCredentials(credentialsJson: string): string | null {
+    try {
+      const parsed = JSON.parse(credentialsJson) as Record<string, unknown>
+      const oauth = this.asRecord(parsed.claudeAiOauth)
+      return this.normalizeField(this.readString(oauth, 'refreshToken'))
+    } catch {
+      return null
+    }
+  }
+
+  protected readIdentityFromOauthAccount(oauthAccount: unknown): ClaudeAuthIdentity {
+    const oauth = this.asRecord(oauthAccount)
+    return {
+      accountUuid: this.normalizeField(
+        this.readString(oauth, 'accountUuid') ?? this.readString(oauth, 'accountId')
+      ),
+      email: this.normalizeField(
+        this.readString(oauth, 'emailAddress') ?? this.readString(oauth, 'email')
+      ),
+      organizationUuid: this.normalizeField(
+        this.readString(oauth, 'organizationUuid') ?? this.readString(oauth, 'organizationId')
+      )
+    }
+  }
+
+  protected asRecord(value: unknown): Record<string, unknown> | null {
+    if (!value || typeof value !== 'object' || Array.isArray(value)) {
+      return null
+    }
+    return value as Record<string, unknown>
+  }
+
+  protected readString(value: Record<string, unknown> | null, key: string): string | null {
+    const candidate = value?.[key]
+    return typeof candidate === 'string' ? candidate : null
+  }
+
+  protected readNumber(value: Record<string, unknown> | null, key: string): number | null {
+    const candidate = value?.[key]
+    if (typeof candidate === 'number' && Number.isFinite(candidate)) {
+      return candidate
+    }
+    if (typeof candidate === 'string') {
+      const parsed = Number(candidate)
+      return Number.isFinite(parsed) ? parsed : null
+    }
+    return null
+  }
+
+  protected normalizeField(value: string | null | undefined): string | null {
+    if (!value) {
+      return null
+    }
+    const trimmed = value.trim()
+    return trimmed === '' ? null : trimmed
+  }
+
+  protected jsonValuesEqual(left: unknown, right: unknown): boolean {
+    return (
+      JSON.stringify(this.sortJsonValue(left ?? null)) ===
+      JSON.stringify(this.sortJsonValue(right ?? null))
+    )
+  }
+
+  protected sortJsonValue(value: unknown): unknown {
+    if (Array.isArray(value)) {
+      return value.map((item) => this.sortJsonValue(item))
+    }
+    const record = this.asRecord(value)
+    if (!record) {
+      return value
+    }
+    return Object.fromEntries(
+      Object.entries(record)
+        .sort(([leftKey], [rightKey]) => leftKey.localeCompare(rightKey))
+        .map(([key, nestedValue]) => [key, this.sortJsonValue(nestedValue)])
+    )
+  }
+}
diff --git a/src/main/claude-accounts/runtime-auth/runtime-auth-credential-matching.ts b/src/main/claude-accounts/runtime-auth/runtime-auth-credential-matching.ts
new file mode 100644
index 00000000000..390ec57a8b2
--- /dev/null
+++ b/src/main/claude-accounts/runtime-auth/runtime-auth-credential-matching.ts
@@ -0,0 +1,152 @@
+import type { ClaudeManagedAccount } from '../../../shared/managed-account-types'
+import { ClaudeRuntimeAuthRuntimeState } from './runtime-auth-runtime-state'
+import type { ClaudeReadBackMatch } from './runtime-auth-types'
+
+export class ClaudeRuntimeAuthCredentialMatching extends ClaudeRuntimeAuthRuntimeState {
+  protected async findManagedAccountForRuntimeCredentials(
+    runtimeCredentialsJson: string,
+    runtimeOauthAccount: unknown
+  ): Promise<ClaudeReadBackMatch> {
+    const matches: { account: ClaudeManagedAccount; managedCredentialsJson: string }[] = []
+    let unverifiableCount = 0
+    for (const account of this.store.getSettings().claudeManagedAccounts) {
+      const managedCredentialsJson = await this.readManagedCredentials(account)
+      if (!managedCredentialsJson) {
+        continue
+      }
+      const match = this.runtimeCredentialsMatchAccount(
+        runtimeCredentialsJson,
+        runtimeOauthAccount,
+        account,
+        managedCredentialsJson,
+        await this.readManagedOauthAccount(account)
+      )
+      if (match === 'match') {
+        matches.push({ account, managedCredentialsJson })
+      } else if (match === 'unverifiable') {
+        unverifiableCount += 1
+      }
+    }
+
+    if (matches.length === 1 && unverifiableCount === 0) {
+      return { kind: 'matched', ...matches[0] }
+    }
+    return { kind: matches.length === 0 && unverifiableCount === 0 ? 'none' : 'ambiguous' }
+  }
+
+  protected runtimeCredentialsMatchAccount(
+    runtimeCredentialsJson: string,
+    runtimeOauthAccount: unknown,
+    account: ClaudeManagedAccount,
+    managedCredentialsJson: string,
+    managedOauthAccount: unknown
+  ): 'match' | 'mismatch' | 'unverifiable' {
+    const identity = this.readIdentityFromCredentials(runtimeCredentialsJson)
+    if (!identity) {
+      return 'mismatch'
+    }
+    const managedIdentity = this.readIdentityFromCredentials(managedCredentialsJson)
+    const managedOauthIdentity = this.readIdentityFromOauthAccount(managedOauthAccount)
+    const runtimeOauthIdentity = this.readIdentityFromOauthAccount(runtimeOauthAccount)
+    const credentialOauthConflict =
+      (identity.accountUuid &&
+        runtimeOauthIdentity.accountUuid &&
+        identity.accountUuid !== runtimeOauthIdentity.accountUuid) ||
+      (identity.email &&
+        runtimeOauthIdentity.email &&
+        identity.email !== runtimeOauthIdentity.email) ||
+      (identity.organizationUuid &&
+        runtimeOauthIdentity.organizationUuid &&
+        identity.organizationUuid !== runtimeOauthIdentity.organizationUuid)
+    if (credentialOauthConflict) {
+      return 'mismatch'
+    }
+
+    // Why: mirrors the Codex runtime-home guard; don't persist shared runtime creds into the managed account if another login rewrote them.
+    const selectedOrganizationUuid = this.normalizeField(
+      account.organizationUuid ??
+        managedIdentity?.organizationUuid ??
+        managedOauthIdentity.organizationUuid
+    )
+    const oauthAccountMatches =
+      Boolean(managedOauthIdentity.accountUuid) &&
+      managedOauthIdentity.accountUuid === runtimeOauthIdentity.accountUuid &&
+      Boolean(runtimeOauthIdentity.email || runtimeOauthIdentity.organizationUuid)
+    const runtimeEmail = identity.email ?? runtimeOauthIdentity.email
+    const runtimeOrganizationUuid =
+      identity.organizationUuid ?? runtimeOauthIdentity.organizationUuid
+    const refreshTokenComparison = this.compareRefreshTokens(
+      runtimeCredentialsJson,
+      managedCredentialsJson
+    )
+    if (!runtimeEmail) {
+      if (refreshTokenComparison === 'same') {
+        return 'match'
+      }
+      if (identity.organizationUuid) {
+        if (selectedOrganizationUuid && selectedOrganizationUuid !== identity.organizationUuid) {
+          return 'mismatch'
+        }
+        return 'unverifiable'
+      }
+      if (oauthAccountMatches) {
+        return 'match'
+      }
+      if (!runtimeOrganizationUuid && refreshTokenComparison === 'different') {
+        return 'mismatch'
+      }
+      return 'unverifiable'
+    }
+    if (account.email && this.normalizeField(account.email) !== runtimeEmail) {
+      return 'mismatch'
+    }
+    if (selectedOrganizationUuid && !runtimeOrganizationUuid) {
+      return refreshTokenComparison === 'same' || oauthAccountMatches ? 'match' : 'unverifiable'
+    }
+    if (
+      selectedOrganizationUuid &&
+      runtimeOrganizationUuid &&
+      selectedOrganizationUuid !== runtimeOrganizationUuid
+    ) {
+      return 'mismatch'
+    }
+    if (!selectedOrganizationUuid && runtimeOrganizationUuid) {
+      return refreshTokenComparison === 'same' ? 'match' : 'unverifiable'
+    }
+
+    return 'match'
+  }
+
+  protected liveRuntimeCredentialsCanUpdateActiveAccount(
+    runtimeCredentialsJson: string,
+    account: ClaudeManagedAccount,
+    managedCredentialsJson: string,
+    managedOauthAccount: unknown
+  ): boolean {
+    const match = this.runtimeCredentialsMatchAccount(
+      runtimeCredentialsJson,
+      this.readRuntimeOauthAccount(),
+      account,
+      managedCredentialsJson,
+      managedOauthAccount
+    )
+    if (match === 'match') {
+      return true
+    }
+    const identity = this.readIdentityFromCredentials(runtimeCredentialsJson)
+    const managedIdentity = this.readIdentityFromCredentials(managedCredentialsJson)
+    const managedOauthIdentity = this.readIdentityFromOauthAccount(managedOauthAccount)
+    const runtimeOauthIdentity = this.readIdentityFromOauthAccount(this.readRuntimeOauthAccount())
+    const selectedOrganizationUuid = this.normalizeField(
+      account.organizationUuid ??
+        managedIdentity?.organizationUuid ??
+        managedOauthIdentity.organizationUuid
+    )
+    return (
+      match === 'unverifiable' &&
+      Boolean(selectedOrganizationUuid) &&
+      (identity?.organizationUuid ?? runtimeOauthIdentity.organizationUuid) ===
+        selectedOrganizationUuid
+    )
+  }
+}
diff --git a/src/main/claude-accounts/runtime-auth/runtime-auth-file-storage.ts b/src/main/claude-accounts/runtime-auth/runtime-auth-file-storage.ts
new file mode 100644
index 00000000000..8aa33a88c60
--- /dev/null
+++ b/src/main/claude-accounts/runtime-auth/runtime-auth-file-storage.ts
@@ -0,0 +1,82 @@
+import { chmodSync, existsSync, mkdirSync, readFileSync } from 'node:fs'
+import { dirname, join } from 'node:path'
+import { app } from 'electron'
+import { writeFileAtomically } from '../../codex-accounts/fs-utils'
+import { ClaudeRuntimeAuthState } from './runtime-auth-state'
+
+export class ClaudeRuntimeAuthFileStorage extends ClaudeRuntimeAuthState {
+  protected writeRuntimeCredentials(contents: string): void {
+    const credentialsPath = this.pathResolver.getRuntimePaths().credentialsPath
+    mkdirSync(dirname(credentialsPath), { recursive: true })
+    // Why: skip unchanged rewrites to dodge Windows EPERM contention (#1507); re-verify the file since another Claude may have rewritten it.
+    if (
+      this.lastWrittenCredentialsJson === contents &&
+      this.fileContentsEqual(credentialsPath, contents)
+    ) {
+      this.ensureOwnerOnlyMode(credentialsPath)
+      return
+    }
+    if (this.fileContentsEqual(credentialsPath, contents)) {
+      this.ensureOwnerOnlyMode(credentialsPath)
+      this.lastWrittenCredentialsJson = contents
+      return
+    }
+    writeFileAtomically(credentialsPath, contents, { mode: 0o600 })
+    this.lastWrittenCredentialsJson = contents
+  }
+
+  protected writeJson(targetPath: string, value: unknown): void {
+    const serialized = `${JSON.stringify(value, null, 2)}\n`
+    mkdirSync(dirname(targetPath), { recursive: true })
+    // Why: same Windows contention reason as writeRuntimeCredentials.
+    if (this.fileContentsEqual(targetPath, serialized)) {
+      return
+    }
+    writeFileAtomically(targetPath, serialized, { mode: 0o600 })
+  }
+
+  protected fileContentsEqual(targetPath: string, contents: string): boolean {
+    try {
+      return existsSync(targetPath) && readFileSync(targetPath, 'utf-8') === contents
+    } catch {
+      return false
+    }
+  }
+
+  protected ensureOwnerOnlyMode(targetPath: string): void {
+    if (process.platform === 'win32') {
+      return
+    }
+    try {
+      chmodSync(targetPath, 0o600)
+    } catch {
+      /* Best effort: the next atomic write will set the restrictive mode. */
+    }
+  }
+
+  protected readJsonObject(targetPath: string): Record<string, unknown> | null {
+    if (!existsSync(targetPath)) {
+      return {}
+    }
+    try {
+      const parsed = JSON.parse(readFileSync(targetPath, 'utf-8')) as unknown
+      if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) {
+        return parsed as Record<string, unknown>
+      }
+    } catch {
+      // Why: invalid config is unknown external state; return null so we don't erase user or Claude-owned settings.
+      return null
+    }
+    return null
+  }
+
+  protected getRuntimeMetadataDir(): string {
+    const metadataDir = join(app.getPath('userData'), 'claude-runtime-auth')
+    mkdirSync(metadataDir, { recursive: true })
+    return metadataDir
+  }
+
+  protected getSystemDefaultSnapshotPath(): string {
+    return join(this.getRuntimeMetadataDir(), 'system-default-auth.json')
+  }
+}
diff --git a/src/main/claude-accounts/runtime-auth/runtime-auth-keychain-snapshots.ts b/src/main/claude-accounts/runtime-auth/runtime-auth-keychain-snapshots.ts
new file mode 100644
index 00000000000..25afacc9942
--- /dev/null
+++ b/src/main/claude-accounts/runtime-auth/runtime-auth-keychain-snapshots.ts
@@ -0,0 +1,131 @@
+import {
+  readActiveClaudeKeychainCredentials,
+  readActiveClaudeKeychainCredentialsStrict
+} from '../keychain'
+import { ClaudeRuntimeAuthManagedCredentials } from './runtime-auth-managed-credentials'
+import type {
+  ClaudeKeychainReadResult,
+  ClaudeKeychainSnapshotValue,
+  ClaudeSystemDefaultSnapshot
+} from './runtime-auth-types'
+
+export class ClaudeRuntimeAuthKeychainSnapshots extends ClaudeRuntimeAuthManagedCredentials {
+  protected isSystemDefaultSnapshot(value: unknown): value is ClaudeSystemDefaultSnapshot {
+    const snapshot = this.asRecord(value)
+    return (
+      snapshot !== null &&
+      Object.hasOwn(snapshot, 'credentialsJson') &&
+      this.isOptionalNullableString(snapshot.credentialsJson) &&
+      this.isOptionalNullableString(snapshot.keychainCredentialsJson) &&
+      this.isOptionalNullableString(snapshot.scopedKeychainCredentialsJson) &&
+      this.isOptionalNullableString(snapshot.legacyKeychainCredentialsJson) &&
+      this.isOptionalBoolean(snapshot.scopedKeychainCredentialsCaptured) &&
+      this.isOptionalBoolean(snapshot.legacyKeychainCredentialsCaptured) &&
+      this.hasValidKeychainSnapshotValue(snapshot, 'scoped') &&
+      this.hasValidKeychainSnapshotValue(snapshot, 'legacy') &&
+      (snapshot.capturedAt === undefined || typeof snapshot.capturedAt === 'number')
+    )
+  }
+
+  protected isOptionalNullableString(value: unknown): boolean {
+    return value === undefined || value === null || typeof value === 'string'
+  }
+
+  protected isOptionalBoolean(value: unknown): boolean {
+    return value === undefined || typeof value === 'boolean'
+  }
+
+  protected snapshotKeychainCredentials(
+    credentialsJson: string | null,
+    previousSnapshot: ClaudeSystemDefaultSnapshot | null | undefined,
+    service: 'scoped' | 'legacy',
+    managedCredentialsJson: string | undefined
+  ): string | null {
+    if (managedCredentialsJson && credentialsJson === managedCredentialsJson && previousSnapshot) {
+      const previousValue = this.readKeychainSnapshotValue(previousSnapshot, service)
+      if (previousValue.status === 'captured') {
+        return previousValue.credentialsJson
+      }
+    }
+    return credentialsJson
+  }
+
+  protected hasValidKeychainSnapshotValue(
+    snapshot: Record<string, unknown>,
+    service: 'scoped' | 'legacy'
+  ): boolean {
+    const capturedKey =
+      service === 'scoped'
+        ? 'scopedKeychainCredentialsCaptured'
+        : 'legacyKeychainCredentialsCaptured'
+    if (snapshot[capturedKey] === false) {
+      return true
+    }
+    const credentialsKey =
+      service === 'scoped' ? 'scopedKeychainCredentialsJson' : 'legacyKeychainCredentialsJson'
+    return (
+      Object.hasOwn(snapshot, credentialsKey) || Object.hasOwn(snapshot, 'keychainCredentialsJson')
+    )
+  }
+
+  protected readKeychainSnapshotValue(
+    snapshot: ClaudeSystemDefaultSnapshot | null,
+    service: 'scoped' | 'legacy'
+  ): ClaudeKeychainSnapshotValue {
+    if (!snapshot) {
+      return { status: 'captured', credentialsJson: null }
+    }
+    const capturedKey =
+      service === 'scoped'
+        ? 'scopedKeychainCredentialsCaptured'
+        : 'legacyKeychainCredentialsCaptured'
+    if (snapshot[capturedKey] === false) {
+      return { status: 'unknown' }
+    }
+    const credentialsKey =
+      service === 'scoped' ? 'scopedKeychainCredentialsJson' : 'legacyKeychainCredentialsJson'
+    if (Object.hasOwn(snapshot, credentialsKey)) {
+      return {
+        status: 'captured',
+        credentialsJson: snapshot[credentialsKey] ?? null
+      }
+    }
+    return { status: 'captured', credentialsJson: snapshot.keychainCredentialsJson }
+  }
+
+  protected async readAggregateClaudeKeychainCredentialsBestEffort(
+    configDir: string
+  ): Promise<string | null> {
+    try {
+      return await readActiveClaudeKeychainCredentials(configDir)
+    } catch (error) {
+      console.warn('[claude-runtime-auth] Failed to read Claude Keychain credentials:', error)
+      return null
+    }
+  }
+
+  protected async readActiveClaudeKeychainCredentialsBestEffort(
+    configDir?: string
+  ): Promise<string | null> {
+    try {
+      return await readActiveClaudeKeychainCredentialsStrict(configDir)
+    } catch (error) {
+      console.warn('[claude-runtime-auth] Failed to read Claude Keychain credentials:', error)
+      return null
+    }
+  }
+
+  protected async readActiveClaudeKeychainCredentialsForSnapshot(
+    configDir?: string
+  ): Promise<ClaudeKeychainReadResult> {
+    try {
+      return {
+        status: 'captured',
+        credentialsJson: await readActiveClaudeKeychainCredentialsStrict(configDir)
+      }
+    } catch (error) {
+      console.warn('[claude-runtime-auth] Failed to read Claude Keychain credentials:', error)
+      return { status: 'failed' }
+    }
+  }
+}
diff --git a/src/main/claude-accounts/runtime-auth/runtime-auth-managed-credentials.ts b/src/main/claude-accounts/runtime-auth/runtime-auth-managed-credentials.ts
new file mode 100644
index 00000000000..ad68d59eadb
--- /dev/null
+++ b/src/main/claude-accounts/runtime-auth/runtime-auth-managed-credentials.ts
@@ -0,0 +1,144 @@
+import { existsSync } from 'node:fs'
+import type { ClaudeManagedAccount } from '../../../shared/managed-account-types'
+import { parseWslUncPath } from '../../../shared/wsl-paths'
+import { toWindowsWslPath } from '../../wsl'
+import { runWslProcess } from '../../wsl/wsl-runner'
+import {
+  readClaudeManagedAuthFile,
+  resolveOwnedClaudeManagedAuthPath,
+  writeClaudeManagedAuthFile
+} from '../managed-auth-path'
+import { isOauthTokenExpiring, refreshClaudeOauthCredentials } from '../oauth-refresh'
+import {
+  readManagedClaudeKeychainCredentials,
+  writeManagedClaudeKeychainCredentials
+} from '../keychain'
+import { ClaudeRuntimeAuthCredentialIdentity } from './runtime-auth-credential-identity'
+
+const OWNERSHIP_PROBE_TIMEOUT = 'orca-wsl-ownership-probe-timeout'
+
+function shellQuote(value: string): string {
+  return `'${value.replace(/'/g, "'\\''")}'`
+}
+
+export class ClaudeRuntimeAuthManagedCredentials extends ClaudeRuntimeAuthCredentialIdentity {
+  protected async readManagedCredentials(account: ClaudeManagedAccount): Promise<string | null> {
+    const managedAuthPath = await this.getOwnedManagedAuthPath(account)
+    if (!managedAuthPath) {
+      return null
+    }
+    if (process.platform === 'darwin') {
+      return readManagedClaudeKeychainCredentials(account.id)
+    }
+    return readClaudeManagedAuthFile(managedAuthPath, '.credentials.json')
+  }
+
+  protected async writeManagedCredentials(
+    account: ClaudeManagedAccount,
+    credentialsJson: string
+  ): Promise<void> {
+    const managedAuthPath = await this.getOwnedManagedAuthPath(account)
+    if (!managedAuthPath) {
+      throw new Error('Managed Claude auth storage is not owned by Orca.')
+    }
+    if (process.platform === 'darwin') {
+      await writeManagedClaudeKeychainCredentials(account.id, credentialsJson)
+      return
+    }
+    writeClaudeManagedAuthFile(managedAuthPath, '.credentials.json', credentialsJson)
+  }
+
+  /**
+   * Proactively refresh an account's OAuth token and persist the rotation to
+   * managed storage. Returns the refreshed credentials JSON, or null when no
+   * refresh happened (token valid, no refresh token, or network failure).
+   *
+   * Caller guarantees this account isn't the live/active one and runs inside the
+   * serialized mutation queue, so the single-use refresh token can't rotate concurrently.
+   */
+  protected async refreshManagedAccountTokenIfNeeded(
+    account: ClaudeManagedAccount,
+    credentialsJson: string
+  ): Promise<string | null> {
+    if (!isOauthTokenExpiring(credentialsJson)) {
+      return null
+    }
+    const refreshed = await refreshClaudeOauthCredentials(credentialsJson)
+    if (!refreshed || !this.isValidCredentialsJsonObject(refreshed)) {
+      return null
+    }
+    try {
+      await this.writeManagedCredentials(account, refreshed)
+    } catch (error) {
+      console.warn('[claude-runtime-auth] Failed to persist refreshed Claude token:', error)
+      return null
+    }
+    return refreshed
+  }
+
+  protected async readManagedOauthAccount(account: ClaudeManagedAccount): Promise<unknown> {
+    const managedAuthPath = await this.getOwnedManagedAuthPath(account)
+    if (!managedAuthPath) {
+      return null
+    }
+    try {
+      const contents = readClaudeManagedAuthFile(managedAuthPath, 'oauth-account.json')
+      return contents ? (JSON.parse(contents) as unknown) : null
+    } catch {
+      return null
+    }
+  }
+
+  protected async getOwnedManagedAuthPath(account: ClaudeManagedAccount): Promise<string | null> {
+    const wslInfo = parseWslUncPath(account.managedAuthPath)
+    if (wslInfo) {
+      if (
+        !wslInfo.linuxPath.includes('/.local/share/orca/claude-accounts/') ||
+        !wslInfo.linuxPath.endsWith('/auth')
+      ) {
+        return null
+      }
+      if (process.platform === 'win32') {
+        try {
+          const owned = await runWslProcess({
+            distro: wslInfo.distro,
+            loginPath: 'none',
+            shell: 'bash',
+            script: [
+              'set -euo pipefail',
+              `candidate=${shellQuote(wslInfo.linuxPath)}`,
+              'managed_root="${HOME%/}/.local/share/orca/claude-accounts"',
+              'candidate_real=$(readlink -f -- "$candidate")',
+              'managed_root_real=$(readlink -f -- "$managed_root")',
+              'test -f "$candidate_real/.orca-managed-claude-auth"',
+              `test "$(cat "$candidate_real/.orca-managed-claude-auth")" = ${shellQuote(account.id)}`,
+              'case "$candidate_real" in "$managed_root_real"/*/auth) printf "%s\\n" "$candidate_real" ;; *) exit 35 ;; esac'
+            ].join('\n'),
+            timeoutMs: 5000
+          })
+          if (owned.timedOut) {
+            throw new Error(OWNERSHIP_PROBE_TIMEOUT)
+          }
+          if (owned.code !== 0) {
+            return null
+          }
+          const canonicalLinuxPath = owned.stdout.trim()
+          return canonicalLinuxPath ? toWindowsWslPath(canonicalLinuxPath, wslInfo.distro) : null
+        } catch (error) {
+          // Why rethrow a timeout: null means "not owned by Orca", and the
+          // caller persists that -- clearing the user's account selection. A
+          // slow distro must not decide ownership. Swallowing it here is what
+          // made the previous guard dead code.
+          if (error instanceof Error && error.message === OWNERSHIP_PROBE_TIMEOUT) {
+            throw error
+          }
+          return null
+        }
+      }
+      return existsSync(account.managedAuthPath) ? account.managedAuthPath : null
+    }
+    return resolveOwnedClaudeManagedAuthPath(account.id, account.managedAuthPath, {
+      adoptLegacyMarker: true
+    })
+  }
+}
diff --git a/src/main/claude-accounts/runtime-auth/runtime-auth-preparation.ts b/src/main/claude-accounts/runtime-auth/runtime-auth-preparation.ts
new file mode 100644
index 00000000000..ae79c4c7bbb
--- /dev/null
+++ b/src/main/claude-accounts/runtime-auth/runtime-auth-preparation.ts
@@ -0,0 +1,115 @@
+import { join } from 'node:path'
+import type { ClaudeManagedAccount } from '../../../shared/managed-account-types'
+import { resolveLocalAccountRuntimeTarget } from '../../../shared/local-account-runtime'
+import { parseWslUncPath } from '../../../shared/wsl-paths'
+import { getDefaultWslDistro, getWslHome } from '../../wsl'
+import {
+  getSelectedClaudeAccountIdForTarget,
+  normalizeClaudeAccountSelectionTarget,
+  type ClaudeAccountSelectionTarget
+} from '../runtime-selection'
+import { ClaudeRuntimeAuthSnapshotRestore } from './runtime-auth-snapshot-restore'
+import type { ClaudeRuntimeAuthPreparation } from './runtime-auth-types'
+
+export class ClaudeRuntimeAuthPreparationService extends ClaudeRuntimeAuthSnapshotRestore {
+  protected getPreparation(target?: ClaudeAccountSelectionTarget): ClaudeRuntimeAuthPreparation {
+    const settings = this.store.getSettings()
+    const paths = this.pathResolver.getRuntimePaths()
+    const normalizedTarget = this.resolveWslDefaultTarget(
+      target ?? this.getDefaultAccountSelectionTarget(settings)
+    )
+    const activeAccountId = getSelectedClaudeAccountIdForTarget(settings, normalizedTarget)
+    const activeAccount = this.getActiveAccount(settings.claudeManagedAccounts, activeAccountId)
+    if (
+      normalizeClaudeAccountSelectionTarget(normalizedTarget).runtime === 'wsl' &&
+      activeAccount?.managedAuthRuntime === 'wsl' &&
+      activeAccount.wslLinuxAuthPath
+    ) {
+      return {
+        configDir: activeAccount.managedAuthPath,
+        runtime: 'wsl',
+        wslDistro: activeAccount.wslDistro ?? null,
+        wslLinuxConfigDir: activeAccount.wslLinuxAuthPath,
+        envPatch: { CLAUDE_CONFIG_DIR: activeAccount.wslLinuxAuthPath },
+        stripAuthEnv: true,
+        provenance: `managed:${activeAccount.id}:wsl:${activeAccount.wslDistro ?? ''}`
+      }
+    }
+    if (normalizeClaudeAccountSelectionTarget(normalizedTarget).runtime === 'wsl') {
+      const distro =
+        normalizeClaudeAccountSelectionTarget(normalizedTarget).wslDistro ?? getDefaultWslDistro()
+      const wslHome = distro ? getWslHome(distro) : null
+      const wslHomeInfo = wslHome ? parseWslUncPath(wslHome) : null
+      if (distro && wslHome && wslHomeInfo) {
+        const windowsConfigDir = join(wslHome, '.claude')
+        const linuxConfigDir = `${wslHomeInfo.linuxPath.replace(/\/$/, '')}/.claude`
+        return {
+          configDir: windowsConfigDir,
+          runtime: 'wsl',
+          wslDistro: distro,
+          wslLinuxConfigDir: linuxConfigDir,
+          envPatch: {},
+          stripAuthEnv: true,
+          provenance: `wsl:${distro}:system`
+        }
+      }
+      return {
+        configDir: paths.configDir,
+        runtime: 'wsl',
+        wslDistro: normalizeClaudeAccountSelectionTarget(normalizedTarget).wslDistro,
+        wslLinuxConfigDir: null,
+        envPatch: {},
+        stripAuthEnv: true,
+        provenance: `wsl:${normalizeClaudeAccountSelectionTarget(normalizedTarget).wslDistro ?? '__default__'}:system`
+      }
+    }
+    return {
+      configDir: paths.configDir,
+      runtime: 'host',
+      wslDistro: null,
+      wslLinuxConfigDir: null,
+      envPatch: paths.envPatch,
+      stripAuthEnv: Boolean(activeAccountId && activeAccount?.managedAuthRuntime !== 'wsl'),
+      managedRefreshDeferredByLivePty: Boolean(
+        activeAccountId &&
+        activeAccount?.managedAuthRuntime !== 'wsl' &&
+        this.managedRefreshDeferredByLivePtyAccountId === activeAccountId
+      ),
+      provenance:
+        activeAccountId && activeAccount?.managedAuthRuntime !== 'wsl'
+          ? `managed:${activeAccountId}`
+          : 'system'
+    }
+  }
+
+  protected getActiveAccount(
+    accounts: ClaudeManagedAccount[],
+    activeAccountId: string | null
+  ): ClaudeManagedAccount | null {
+    if (!activeAccountId) {
+      return null
+    }
+    return accounts.find((account) => account.id === activeAccountId) ?? null
+  }
+
+  protected getDefaultAccountSelectionTarget(
+    settings = this.store.getSettings()
+  ): ClaudeAccountSelectionTarget {
+    // Why: Windows auth follows the resolved account runtime; stale cross-platform WSL pins must stay local-host.
+    const resolved = resolveLocalAccountRuntimeTarget(settings)
+    if (process.platform === 'win32' && resolved.runtime === 'wsl') {
+      return { runtime: 'wsl', wslDistro: resolved.wslDistro }
+    }
+    return { runtime: 'host' }
+  }
+
+  protected resolveWslDefaultTarget(
+    target?: ClaudeAccountSelectionTarget
+  ): ClaudeAccountSelectionTarget {
+    if (target?.runtime !== 'wsl' || target.wslDistro?.trim()) {
+      return target ?? { runtime: 'host' }
+    }
+    const defaultDistro = getDefaultWslDistro()
+    return defaultDistro ? { runtime: 'wsl', wslDistro: defaultDistro } : target
+  }
+}
diff --git a/src/main/claude-accounts/runtime-auth/runtime-auth-readback.ts b/src/main/claude-accounts/runtime-auth/runtime-auth-readback.ts
new file mode 100644
index 00000000000..77dfea27184
--- /dev/null
+++ b/src/main/claude-accounts/runtime-auth/runtime-auth-readback.ts
@@ -0,0 +1,157 @@
+import { existsSync, readFileSync } from 'node:fs'
+import { writeActiveClaudeKeychainCredentialsForRuntime } from '../keychain'
+import { ClaudeRuntimeAuthCredentialMatching } from './runtime-auth-credential-matching'
+import type {
+  ClaudeReadBackMatch,
+  ClaudeReadBackResult,
+  ClaudeRuntimeCredentialCandidate
+} from './runtime-auth-types'
+
+export class ClaudeRuntimeAuthReadback extends ClaudeRuntimeAuthCredentialMatching {
+  protected async readBackRefreshedTokens(
+    baselineCredentialsJson: string,
+    options: { updateLastWrittenCredentialsJson: boolean }
+  ): Promise<ClaudeReadBackResult> {
+    try {
+      const candidates =
+        await this.readRuntimeCredentialCandidatesForReadBack(baselineCredentialsJson)
+      if (candidates.length === 0) {
+        return { status: 'unchanged' }
+      }
+      const changedCandidates =
+        this.lastWrittenCredentialsJson === null
+          ? candidates
+          : candidates.filter(
+              (candidate) => candidate.credentialsJson !== this.lastWrittenCredentialsJson
+            )
+      if (changedCandidates.length === 0) {
+        return { status: 'unchanged' }
+      }
+
+      const acceptedCandidates: {
+        credentialsJson: string
+        match: Extract<ClaudeReadBackMatch, { kind: 'matched' }>
+      }[] = []
+      const ambiguousCandidates: string[] = []
+      let sawAmbiguousCandidate = false
+      let sawValidChangedCandidate = false
+      for (const runtimeContents of changedCandidates) {
+        if (!this.isValidCredentialsJsonObject(runtimeContents.credentialsJson)) {
+          continue
+        }
+        sawValidChangedCandidate = true
+        const match = await this.findManagedAccountForRuntimeCredentials(
+          runtimeContents.credentialsJson,
+          runtimeContents.runtimeOauthAccount
+        )
+        if (match.kind === 'ambiguous') {
+          sawAmbiguousCandidate = true
+          ambiguousCandidates.push(runtimeContents.credentialsJson)
+          continue
+        }
+        if (match.kind !== 'matched') {
+          continue
+        }
+        // Why: on cold start we can't tell a fresh CLI refresh from stale runtime creds; adopt only when expiry or a rotated refresh token proves runtime is newer than managed.
+        if (this.lastWrittenCredentialsJson === null) {
+          const fresher = this.runtimeCredentialsAreFresher(
+            runtimeContents.credentialsJson,
+            match.managedCredentialsJson
+          )
+          const refreshTokenRotated =
+            this.compareRefreshTokens(
+              runtimeContents.credentialsJson,
+              match.managedCredentialsJson
+            ) === 'different'
+          const older = this.runtimeCredentialsAreOlder(
+            runtimeContents.credentialsJson,
+            match.managedCredentialsJson
+          )
+          if (!fresher && !(refreshTokenRotated && !older)) {
+            continue
+          }
+        } else if (
+          this.runtimeCredentialsAreOlder(
+            runtimeContents.credentialsJson,
+            match.managedCredentialsJson
+          )
+        ) {
+          continue
+        }
+        acceptedCandidates.push({ credentialsJson: runtimeContents.credentialsJson, match })
+      }
+      if (acceptedCandidates.length === 0) {
+        if (sawAmbiguousCandidate) {
+          console.warn('[claude-runtime-auth] Refusing ambiguous Claude auth read-back')
+        }
+        return {
+          status: 'rejected',
+          runtimeCredentialsChanged: true,
+          hasValidChangedRuntimeCredentials: sawValidChangedCandidate,
+          runtimeCredentialsJson:
+            ambiguousCandidates.length === 1 ? ambiguousCandidates[0] : undefined
+        }
+      }
+      const { credentialsJson: runtimeContents, match } =
+        this.chooseFreshestReadBackCandidate(acceptedCandidates)
+
+      await this.writeManagedCredentials(match.account, runtimeContents)
+      if (options.updateLastWrittenCredentialsJson) {
+        this.writeRuntimeCredentials(runtimeContents)
+        this.lastWrittenCredentialsJson = runtimeContents
+        if (process.platform === 'darwin') {
+          const paths = this.pathResolver.getRuntimePaths()
+          await writeActiveClaudeKeychainCredentialsForRuntime(runtimeContents, paths.configDir)
+        }
+      }
+      return { status: 'persisted' }
+    } catch (error) {
+      // Why: read-back is best-effort; a transient fs error must not block forward sync (worst case: one more stale-token cycle).
+      console.warn('[claude-runtime-auth] Failed to read back refreshed tokens:', error)
+      return {
+        status: 'rejected',
+        runtimeCredentialsChanged:
+          this.runtimeCredentialsChangedSinceLastWrite(baselineCredentialsJson),
+        // Why: an fs error hides whether a live session's refresh is present, so err toward preserving runtime state.
+        hasValidChangedRuntimeCredentials: true
+      }
+    }
+  }
+
+  protected async readRuntimeCredentialCandidatesForReadBack(
+    baselineCredentialsJson: string
+  ): Promise<ClaudeRuntimeCredentialCandidate[]> {
+    const paths = this.pathResolver.getRuntimePaths()
+    const fileCredentials = existsSync(paths.credentialsPath)
+      ? readFileSync(paths.credentialsPath, 'utf-8')
+      : null
+    const runtimeOauthAccount = this.readRuntimeOauthAccount()
+    const candidates: ClaudeRuntimeCredentialCandidate[] = []
+    const pushCandidate = (credentialsJson: string | null): void => {
+      if (
+        credentialsJson &&
+        !candidates.some((candidate) => candidate.credentialsJson === credentialsJson)
+      ) {
+        candidates.push({ credentialsJson, runtimeOauthAccount })
+      }
+    }
+    if (process.platform === 'darwin') {
+      const scopedKeychainCredentials = await this.readActiveClaudeKeychainCredentialsBestEffort(
+        paths.configDir
+      )
+      const legacyKeychainCredentials = await this.readActiveClaudeKeychainCredentialsBestEffort()
+      if (this.lastWrittenCredentialsJson === null) {
+        pushCandidate(scopedKeychainCredentials)
+        pushCandidate(legacyKeychainCredentials)
+        pushCandidate(fileCredentials)
+        return candidates.filter(
+          (candidate) => candidate.credentialsJson !== baselineCredentialsJson
+        )
+      }
+      pushCandidate(scopedKeychainCredentials)
+      pushCandidate(legacyKeychainCredentials)
+    }
+    pushCandidate(fileCredentials)
+    return candidates
+  }
+}
diff --git a/src/main/claude-accounts/runtime-auth/runtime-auth-runtime-state.ts b/src/main/claude-accounts/runtime-auth/runtime-auth-runtime-state.ts
new file mode 100644
index 00000000000..d99af570557
--- /dev/null
+++ b/src/main/claude-accounts/runtime-auth/runtime-auth-runtime-state.ts
@@ -0,0 +1,194 @@
+import { existsSync, readFileSync, rmSync } from 'node:fs'
+import type { ClaudeManagedAccount } from '../../../shared/managed-account-types'
+import {
+  deleteActiveClaudeKeychainCredentialsStrict,
+  writeActiveClaudeKeychainCredentials
+} from '../keychain'
+import { ClaudeRuntimeAuthKeychainSnapshots } from './runtime-auth-keychain-snapshots'
+import {
+  RUNTIME_OAUTH_ACCOUNT_PARSE_ERROR,
+  type ClaudeKeychainSnapshotValue
+} from './runtime-auth-types'
+
+export class ClaudeRuntimeAuthRuntimeState extends ClaudeRuntimeAuthKeychainSnapshots {
+  protected readRuntimeCredentialsFile(): string | null {
+    const credentialsPath = this.pathResolver.getRuntimePaths().credentialsPath
+    return existsSync(credentialsPath) ? readFileSync(credentialsPath, 'utf-8') : null
+  }
+
+  protected runtimeCredentialsBelongToAccount(
+    credentialsJson: string | null,
+    account: ClaudeManagedAccount,
+    managedOauthAccount: unknown
+  ): boolean {
+    if (!credentialsJson) {
+      return false
+    }
+    const identity = this.readIdentityFromCredentials(credentialsJson)
+    if (
+      !identity?.email ||
+      (account.email && this.normalizeField(account.email) !== identity.email)
+    ) {
+      return false
+    }
+    const oauthIdentity = this.readIdentityFromOauthAccount(managedOauthAccount)
+    const selectedOrganizationUuid = this.normalizeField(
+      account.organizationUuid ?? oauthIdentity.organizationUuid
+    )
+    if (selectedOrganizationUuid) {
+      return identity.organizationUuid === selectedOrganizationUuid
+    }
+    return !identity.organizationUuid
+  }
+
+  protected clearLastWrittenRuntimeState(): void {
+    this.lastWrittenCredentialsJson = null
+    this.lastWrittenOauthAccount = null
+    this.hasLastWrittenOauthAccount = false
+    this.hasMaterializedRuntimeAuth = false
+  }
+
+  protected hasUnchangedRuntimeCredentials(
+    previouslyWrittenCredentialsJson: string | null
+  ): boolean {
+    if (previouslyWrittenCredentialsJson === null) {
+      return false
+    }
+    const paths = this.pathResolver.getRuntimePaths()
+    const currentCredentialsJson = existsSync(paths.credentialsPath)
+      ? readFileSync(paths.credentialsPath, 'utf-8')
+      : null
+    return currentCredentialsJson === previouslyWrittenCredentialsJson
+  }
+
+  protected runtimeCredentialsChangedSinceLastWrite(baselineCredentialsJson: string): boolean {
+    const paths = this.pathResolver.getRuntimePaths()
+    try {
+      const currentCredentialsJson = existsSync(paths.credentialsPath)
+        ? readFileSync(paths.credentialsPath, 'utf-8')
+        : null
+      return (
+        currentCredentialsJson !== null &&
+        currentCredentialsJson !== (this.lastWrittenCredentialsJson ?? baselineCredentialsJson)
+      )
+    } catch {
+      return false
+    }
+  }
+
+  protected restoreRuntimeCredentials(credentialsJson: string | null): void {
+    const paths = this.pathResolver.getRuntimePaths()
+    if (credentialsJson !== null) {
+      this.writeRuntimeCredentials(credentialsJson)
+    } else {
+      rmSync(paths.credentialsPath, { force: true })
+    }
+  }
+
+  protected restoreRuntimeOauthAccountIfOwned(
+    oauthAccount: unknown,
+    ownedOauthAccount: unknown,
+    options: { allowCredentialSurfaceOwnership: boolean }
+  ): void {
+    const currentOauthAccount = this.readRuntimeOauthAccount()
+    if (currentOauthAccount === RUNTIME_OAUTH_ACCOUNT_PARSE_ERROR) {
+      return
+    }
+    if (options.allowCredentialSurfaceOwnership) {
+      this.writeRuntimeOauthAccount(oauthAccount)
+      return
+    }
+    if (
+      (ownedOauthAccount === null || ownedOauthAccount === undefined) &&
+      !options.allowCredentialSurfaceOwnership
+    ) {
+      return
+    }
+    if (!this.jsonValuesEqual(currentOauthAccount, ownedOauthAccount)) {
+      return
+    }
+    this.writeRuntimeOauthAccount(oauthAccount)
+  }
+
+  protected async hasUnchangedActiveClaudeKeychainCredentials(
+    snapshotValue: ClaudeKeychainSnapshotValue,
+    previouslyWrittenCredentialsJson: string | null,
+    configDir?: string
+  ): Promise<boolean> {
+    if (snapshotValue.status === 'unknown') {
+      return false
+    }
+    const currentCredentialsJson =
+      await this.readActiveClaudeKeychainCredentialsBestEffort(configDir)
+    return (
+      previouslyWrittenCredentialsJson !== null &&
+      currentCredentialsJson === previouslyWrittenCredentialsJson
+    )
+  }
+
+  protected async restoreActiveClaudeKeychainCredentials(
+    credentialsJson: string | null,
+    configDir?: string
+  ): Promise<void> {
+    await (credentialsJson !== null
+      ? writeActiveClaudeKeychainCredentials(credentialsJson, configDir)
+      : deleteActiveClaudeKeychainCredentialsStrict(configDir))
+  }
+
+  protected async hasActiveKeychainCredentialsForAccount(
+    account: ClaudeManagedAccount,
+    managedOauthAccount: unknown,
+    configDir?: string
+  ): Promise<boolean> {
+    const currentCredentialsJson =
+      await this.readActiveClaudeKeychainCredentialsBestEffort(configDir)
+    return this.runtimeCredentialsBelongToAccount(
+      currentCredentialsJson,
+      account,
+      managedOauthAccount
+    )
+  }
+
+  protected readRuntimeOauthAccount(): unknown {
+    const configPath = this.pathResolver.getRuntimePaths().configPath
+    if (!existsSync(configPath)) {
+      return null
+    }
+    try {
+      const parsed = JSON.parse(readFileSync(configPath, 'utf-8')) as unknown
+      const record = this.asRecord(parsed)
+      if (!record) {
+        return RUNTIME_OAUTH_ACCOUNT_PARSE_ERROR
+      }
+      return record.oauthAccount ?? null
+    } catch {
+      return RUNTIME_OAUTH_ACCOUNT_PARSE_ERROR
+    }
+  }
+
+  protected runtimeOauthAccountMatches(managedOauthAccount: unknown): boolean {
+    if (managedOauthAccount === null || managedOauthAccount === undefined) {
+      return false
+    }
+    const currentOauthAccount = this.readRuntimeOauthAccount()
+    if (currentOauthAccount === RUNTIME_OAUTH_ACCOUNT_PARSE_ERROR) {
+      return false
+    }
+    return this.jsonValuesEqual(currentOauthAccount, managedOauthAccount)
+  }
+
+  protected writeRuntimeOauthAccount(oauthAccount: unknown): boolean {
+    const configPath = this.pathResolver.getRuntimePaths().configPath
+    const existing = this.readJsonObject(configPath)
+    if (existing === null) {
+      return false
+    }
+    if (oauthAccount === null || oauthAccount === undefined) {
+      delete existing.oauthAccount
+    } else {
+      existing.oauthAccount = oauthAccount
+    }
+    this.writeJson(configPath, existing)
+    return true
+  }
+}
diff --git a/src/main/claude-accounts/runtime-auth/runtime-auth-snapshot-capture.ts b/src/main/claude-accounts/runtime-auth/runtime-auth-snapshot-capture.ts
new file mode 100644
index 00000000000..eb1aea611e1
--- /dev/null
+++ b/src/main/claude-accounts/runtime-auth/runtime-auth-snapshot-capture.ts
@@ -0,0 +1,119 @@
+import { existsSync, readFileSync, rmSync } from 'node:fs'
+import { ClaudeRuntimeAuthReadback } from './runtime-auth-readback'
+import {
+  RUNTIME_OAUTH_ACCOUNT_PARSE_ERROR,
+  type ClaudeSystemDefaultSnapshot
+} from './runtime-auth-types'
+
+export class ClaudeRuntimeAuthSnapshotCapture extends ClaudeRuntimeAuthReadback {
+  protected async captureSystemDefaultSnapshotForManagedEntry(
+    runtimeCredentialsJson: string | null,
+    managedCredentialsJson: string
+  ): Promise<void> {
+    const snapshotPath = this.getSystemDefaultSnapshotPath()
+    const existingSnapshot = this.readSystemDefaultSnapshot(snapshotPath)
+    if (runtimeCredentialsJson !== managedCredentialsJson) {
+      await this.captureSystemDefaultSnapshot({
+        force: true,
+        previousSnapshot: existingSnapshot,
+        managedCredentialsJson
+      })
+      return
+    }
+    if (existingSnapshot) {
+      await this.captureSystemDefaultSnapshot({
+        force: true,
+        credentialsJsonOverride: existingSnapshot.credentialsJson,
+        previousSnapshot: existingSnapshot,
+        managedCredentialsJson
+      })
+      return
+    }
+    await this.captureSystemDefaultSnapshot({ force: false })
+  }
+
+  protected async captureSystemDefaultSnapshot(options: {
+    force: boolean
+    credentialsJsonOverride?: string | null
+    previousSnapshot?: ClaudeSystemDefaultSnapshot | null
+    managedCredentialsJson?: string
+  }): Promise<void> {
+    const snapshotPath = this.getSystemDefaultSnapshotPath()
+    if (!options.force && existsSync(snapshotPath)) {
+      return
+    }
+
+    const paths = this.pathResolver.getRuntimePaths()
+    const credentialsJson =
+      options.credentialsJsonOverride !== undefined
+        ? options.credentialsJsonOverride
+        : existsSync(paths.credentialsPath)
+          ? readFileSync(paths.credentialsPath, 'utf-8')
+          : null
+    const keychainCredentialsJson = await this.readAggregateClaudeKeychainCredentialsBestEffort(
+      paths.configDir
+    )
+    const scopedKeychainCredentials =
+      process.platform === 'darwin'
+        ? await this.readActiveClaudeKeychainCredentialsForSnapshot(paths.configDir)
+        : ({ status: 'captured', credentialsJson: null } as const)
+    const legacyKeychainCredentialsJson =
+      process.platform === 'darwin'
+        ? await this.readActiveClaudeKeychainCredentialsForSnapshot()
+        : ({ status: 'captured', credentialsJson: null } as const)
+    if (
+      scopedKeychainCredentials.status === 'failed' ||
+      legacyKeychainCredentialsJson.status === 'failed'
+    ) {
+      throw new Error('Cannot capture current Claude Keychain credentials')
+    }
+    const scopedKeychainCredentialsJson =
+      scopedKeychainCredentials.status === 'captured'
+        ? this.snapshotKeychainCredentials(
+            scopedKeychainCredentials.credentialsJson,
+            options.previousSnapshot,
+            'scoped',
+            options.managedCredentialsJson
+          )
+        : undefined
+    const legacyKeychainSnapshotJson =
+      legacyKeychainCredentialsJson.status === 'captured'
+        ? this.snapshotKeychainCredentials(
+            legacyKeychainCredentialsJson.credentialsJson,
+            options.previousSnapshot,
+            'legacy',
+            options.managedCredentialsJson
+          )
+        : undefined
+    const configOauthAccount = this.readRuntimeOauthAccount()
+    const snapshot: ClaudeSystemDefaultSnapshot = {
+      credentialsJson,
+      configOauthAccount:
+        configOauthAccount === RUNTIME_OAUTH_ACCOUNT_PARSE_ERROR ? null : configOauthAccount,
+      keychainCredentialsJson,
+      scopedKeychainCredentialsJson,
+      legacyKeychainCredentialsJson: legacyKeychainSnapshotJson,
+      scopedKeychainCredentialsCaptured: scopedKeychainCredentials.status === 'captured',
+      legacyKeychainCredentialsCaptured: legacyKeychainCredentialsJson.status === 'captured',
+      capturedAt: Date.now()
+    }
+    this.writeJson(snapshotPath, snapshot)
+  }
+
+  protected readSystemDefaultSnapshot(snapshotPath: string): ClaudeSystemDefaultSnapshot | null {
+    if (!existsSync(snapshotPath)) {
+      return null
+    }
+    try {
+      const parsed = JSON.parse(readFileSync(snapshotPath, 'utf-8')) as unknown
+      if (this.isSystemDefaultSnapshot(parsed)) {
+        return parsed
+      }
+      throw new Error('Invalid Claude system-default auth snapshot shape')
+    } catch (error) {
+      console.warn('[claude-runtime-auth] Ignoring invalid system-default auth snapshot:', error)
+      rmSync(snapshotPath, { force: true })
+      return null
+    }
+  }
+}
diff --git a/src/main/claude-accounts/runtime-auth/runtime-auth-snapshot-restore.ts b/src/main/claude-accounts/runtime-auth/runtime-auth-snapshot-restore.ts
new file mode 100644
index 00000000000..76ccd342d84
--- /dev/null
+++ b/src/main/claude-accounts/runtime-auth/runtime-auth-snapshot-restore.ts
@@ -0,0 +1,185 @@
+import { rmSync } from 'node:fs'
+import type { ClaudeManagedAccount } from '../../../shared/managed-account-types'
+import { deleteActiveClaudeKeychainCredentialsStrict } from '../keychain'
+import { ClaudeRuntimeAuthSnapshotCapture } from './runtime-auth-snapshot-capture'
+import type { ClaudeKeychainSnapshotValue } from './runtime-auth-types'
+
+export class ClaudeRuntimeAuthSnapshotRestore extends ClaudeRuntimeAuthSnapshotCapture {
+  protected async restoreSystemDefaultSnapshot(
+    ownedCredentialsJson?: string | null,
+    ownedOauthAccount?: unknown
+  ): Promise<void> {
+    const snapshotPath = this.getSystemDefaultSnapshotPath()
+    const paths = this.pathResolver.getRuntimePaths()
+    const previouslyWrittenCredentialsJson =
+      this.lastWrittenCredentialsJson ?? ownedCredentialsJson ?? null
+    const snapshot = this.readSystemDefaultSnapshot(snapshotPath)
+
+    const fileCredentialsOwned = this.hasUnchangedRuntimeCredentials(
+      previouslyWrittenCredentialsJson
+    )
+    let hasCredentialSurfaceOwnership = fileCredentialsOwned
+    // Why: prove ownership before mutating anything, and restore OAuth first so a failure leaves the credential proof intact for retry.
+    this.lastWrittenCredentialsJson = previouslyWrittenCredentialsJson
+    let scopedSnapshot: ClaudeKeychainSnapshotValue | null = null
+    let legacySnapshot: ClaudeKeychainSnapshotValue | null = null
+    let scopedKeychainOwned = false
+    let legacyKeychainOwned = false
+    if (process.platform === 'darwin') {
+      scopedSnapshot = this.readKeychainSnapshotValue(snapshot, 'scoped')
+      legacySnapshot = this.readKeychainSnapshotValue(snapshot, 'legacy')
+      scopedKeychainOwned = await this.hasUnchangedActiveClaudeKeychainCredentials(
+        scopedSnapshot,
+        previouslyWrittenCredentialsJson,
+        paths.configDir
+      )
+      legacyKeychainOwned = await this.hasUnchangedActiveClaudeKeychainCredentials(
+        legacySnapshot,
+        previouslyWrittenCredentialsJson
+      )
+      hasCredentialSurfaceOwnership =
+        fileCredentialsOwned || scopedKeychainOwned || legacyKeychainOwned
+    }
+    this.restoreRuntimeOauthAccountIfOwned(
+      snapshot?.configOauthAccount ?? null,
+      this.getOwnedRuntimeOauthBaseline(ownedOauthAccount, hasCredentialSurfaceOwnership),
+      { allowCredentialSurfaceOwnership: hasCredentialSurfaceOwnership }
+    )
+    if (fileCredentialsOwned) {
+      this.restoreRuntimeCredentials(snapshot?.credentialsJson ?? null)
+    }
+    if (process.platform === 'darwin') {
+      if (scopedSnapshot?.status === 'captured' && scopedKeychainOwned) {
+        await this.restoreActiveClaudeKeychainCredentials(
+          scopedSnapshot.credentialsJson,
+          paths.configDir
+        )
+      }
+      if (legacySnapshot?.status === 'captured' && legacyKeychainOwned) {
+        await this.restoreActiveClaudeKeychainCredentials(legacySnapshot.credentialsJson)
+      }
+    }
+    this.lastWrittenCredentialsJson = null
+    this.lastWrittenOauthAccount = null
+    this.hasLastWrittenOauthAccount = false
+    this.hasMaterializedRuntimeAuth = false
+  }
+
+  protected getOwnedRuntimeOauthBaseline(
+    ownedOauthAccount: unknown,
+    hasCredentialSurfaceOwnership: boolean
+  ): unknown {
+    if (this.hasLastWrittenOauthAccount) {
+      return this.lastWrittenOauthAccount
+    }
+    // Why: managed metadata hints identity but isn't proof Orca wrote .claude.json; use only after a credential surface proves ownership.
+    if (hasCredentialSurfaceOwnership && ownedOauthAccount !== undefined) {
+      return ownedOauthAccount
+    }
+    return null
+  }
+
+  protected async clearRuntimeAuthForAccount(
+    account: ClaudeManagedAccount,
+    managedOauthAccount: unknown
+  ): Promise<void> {
+    const paths = this.pathResolver.getRuntimePaths()
+    const fileCredentialsOwned = this.runtimeCredentialsBelongToAccount(
+      this.readRuntimeCredentialsFile(),
+      account,
+      managedOauthAccount
+    )
+    let scopedKeychainOwned = false
+    let legacyKeychainOwned = false
+    if (process.platform === 'darwin') {
+      scopedKeychainOwned = await this.hasActiveKeychainCredentialsForAccount(
+        account,
+        managedOauthAccount,
+        paths.configDir
+      )
+      legacyKeychainOwned = await this.hasActiveKeychainCredentialsForAccount(
+        account,
+        managedOauthAccount
+      )
+    }
+    const hasCredentialSurfaceOwnership =
+      fileCredentialsOwned || scopedKeychainOwned || legacyKeychainOwned
+    this.restoreRuntimeOauthAccountIfOwned(
+      null,
+      this.getOwnedRuntimeOauthBaseline(managedOauthAccount, hasCredentialSurfaceOwnership),
+      {
+        allowCredentialSurfaceOwnership: hasCredentialSurfaceOwnership
+      }
+    )
+    if (fileCredentialsOwned) {
+      rmSync(paths.credentialsPath, { force: true })
+    }
+    if (process.platform === 'darwin') {
+      if (scopedKeychainOwned) {
+        await deleteActiveClaudeKeychainCredentialsStrict(paths.configDir)
+      }
+      if (legacyKeychainOwned) {
+        await deleteActiveClaudeKeychainCredentialsStrict()
+      }
+    }
+  }
+
+  protected async restoreSystemDefaultSnapshotForMissingManagedCredentials(
+    account: ClaudeManagedAccount,
+    managedOauthAccount: unknown
+  ): Promise<void> {
+    const snapshot = this.readSystemDefaultSnapshot(this.getSystemDefaultSnapshotPath())
+    if (!snapshot) {
+      await this.clearRuntimeAuthForAccount(account, managedOauthAccount)
+      this.clearLastWrittenRuntimeState()
+      return
+    }
+    const paths = this.pathResolver.getRuntimePaths()
+    const fileCredentialsOwned = this.runtimeCredentialsBelongToAccount(
+      this.readRuntimeCredentialsFile(),
+      account,
+      managedOauthAccount
+    )
+    let scopedSnapshot: ClaudeKeychainSnapshotValue | null = null
+    let legacySnapshot: ClaudeKeychainSnapshotValue | null = null
+    let scopedKeychainOwned = false
+    let legacyKeychainOwned = false
+    if (process.platform === 'darwin') {
+      scopedSnapshot = this.readKeychainSnapshotValue(snapshot, 'scoped')
+      legacySnapshot = this.readKeychainSnapshotValue(snapshot, 'legacy')
+      scopedKeychainOwned = await this.hasActiveKeychainCredentialsForAccount(
+        account,
+        managedOauthAccount,
+        paths.configDir
+      )
+      legacyKeychainOwned = await this.hasActiveKeychainCredentialsForAccount(
+        account,
+        managedOauthAccount
+      )
+    }
+    const hasCredentialSurfaceOwnership =
+      fileCredentialsOwned || scopedKeychainOwned || legacyKeychainOwned
+    this.restoreRuntimeOauthAccountIfOwned(
+      snapshot.configOauthAccount,
+      this.getOwnedRuntimeOauthBaseline(managedOauthAccount, hasCredentialSurfaceOwnership),
+      {
+        allowCredentialSurfaceOwnership: hasCredentialSurfaceOwnership
+      }
+    )
+    if (fileCredentialsOwned) {
+      this.restoreRuntimeCredentials(snapshot.credentialsJson)
+    }
+    if (process.platform === 'darwin') {
+      if (scopedSnapshot?.status === 'captured' && scopedKeychainOwned) {
+        await this.restoreActiveClaudeKeychainCredentials(
+          scopedSnapshot.credentialsJson,
+          paths.configDir
+        )
+      }
+      if (legacySnapshot?.status === 'captured' && legacyKeychainOwned) {
+        await this.restoreActiveClaudeKeychainCredentials(legacySnapshot.credentialsJson)
+      }
+    }
+    this.clearLastWrittenRuntimeState()
+  }
+}
diff --git a/src/main/claude-accounts/runtime-auth/runtime-auth-state.ts b/src/main/claude-accounts/runtime-auth/runtime-auth-state.ts
new file mode 100644
index 00000000000..d25ee84b44a
--- /dev/null
+++ b/src/main/claude-accounts/runtime-auth/runtime-auth-state.ts
@@ -0,0 +1,17 @@
+import type { Store } from '../../persistence'
+import { ClaudeRuntimePathResolver } from '../runtime-paths'
+
+export class ClaudeRuntimeAuthState {
+  protected readonly pathResolver = new ClaudeRuntimePathResolver()
+  protected mutationQueue: Promise<unknown> = Promise.resolve()
+  protected lastSyncedAccountId: string | null = null
+  // Why: creds Orca last wrote to the shared file; a mismatch on managed→default transition means an external login overwrote it, so adopt it as the new default.
+  protected lastWrittenCredentialsJson: string | null = null
+  protected hasMaterializedRuntimeAuth = false
+  protected hasLastWrittenOauthAccount = false
+  protected lastWrittenOauthAccount: unknown = null
+  protected skipNextReadBackForAccountId: string | null = null
+  protected managedRefreshDeferredByLivePtyAccountId: string | null = null
+
+  protected constructor(protected readonly store: Store) {}
+}
diff --git a/src/main/claude-accounts/runtime-auth/runtime-auth-sync.ts b/src/main/claude-accounts/runtime-auth/runtime-auth-sync.ts
new file mode 100644
index 00000000000..f191689a446
--- /dev/null
+++ b/src/main/claude-accounts/runtime-auth/runtime-auth-sync.ts
@@ -0,0 +1,284 @@
+import { existsSync, readFileSync } from 'node:fs'
+import {
+  getSelectedClaudeAccountIdForTarget,
+  normalizeClaudeAccountSelectionTarget,
+  normalizeClaudeRuntimeSelection,
+  setSelectedClaudeAccountIdForTarget,
+  type ClaudeAccountSelectionTarget
+} from '../runtime-selection'
+import { hasLiveClaudePtys } from '../live-pty-gate'
+import { isOauthTokenExpiring } from '../oauth-refresh'
+import { writeActiveClaudeKeychainCredentialsForRuntime } from '../keychain'
+import { ClaudeRuntimeAuthPreparationService } from './runtime-auth-preparation'
+
+export class ClaudeRuntimeAuthSync extends ClaudeRuntimeAuthPreparationService {
+  protected async doSyncForCurrentSelection(target?: ClaudeAccountSelectionTarget): Promise<void> {
+    const settings = this.store.getSettings()
+    const effectiveTarget = this.resolveWslDefaultTarget(target)
+    const normalizedTarget = normalizeClaudeAccountSelectionTarget(effectiveTarget)
+    const activeAccountId = getSelectedClaudeAccountIdForTarget(settings, normalizedTarget)
+    const activeAccount = this.getActiveAccount(settings.claudeManagedAccounts, activeAccountId)
+    const previousAccount = this.getActiveAccount(
+      settings.claudeManagedAccounts,
+      this.lastSyncedAccountId
+    )
+    this.managedRefreshDeferredByLivePtyAccountId = null
+    const previousManagedCredentialsJson = previousAccount
+      ? await this.readManagedCredentials(previousAccount)
+      : null
+    const previousManagedOauthAccount = previousAccount
+      ? await this.readManagedOauthAccount(previousAccount)
+      : null
+    if (previousAccount && previousAccount.id !== activeAccount?.id) {
+      if (previousManagedCredentialsJson) {
+        const outgoingReadBackResult = await this.readBackRefreshedTokens(
+          previousManagedCredentialsJson,
+          {
+            updateLastWrittenCredentialsJson: true
+          }
+        )
+        if (
+          outgoingReadBackResult.status === 'rejected' &&
+          outgoingReadBackResult.runtimeCredentialsChanged &&
+          hasLiveClaudePtys()
+        ) {
+          if (
+            outgoingReadBackResult.runtimeCredentialsJson &&
+            this.liveRuntimeCredentialsCanUpdateActiveAccount(
+              outgoingReadBackResult.runtimeCredentialsJson,
+              previousAccount,
+              previousManagedCredentialsJson,
+              previousManagedOauthAccount
+            )
+          ) {
+            // Why: switching away while Claude is live must preserve verified token refreshes before replacing shared runtime credentials.
+            await this.writeManagedCredentials(
+              previousAccount,
+              outgoingReadBackResult.runtimeCredentialsJson
+            )
+          } else {
+            // Why: the runtime blob may lack identity proof for a live-session refresh; skip persisting it, but still let new terminals move to the account.
+            console.warn(
+              '[claude-runtime-auth] Skipping unverified live Claude auth read-back while switching accounts'
+            )
+          }
+        }
+      }
+    }
+    if (!activeAccount) {
+      if (activeAccountId) {
+        const nextSelection = setSelectedClaudeAccountIdForTarget(
+          normalizeClaudeRuntimeSelection(settings),
+          null,
+          normalizedTarget
+        )
+        this.store.updateSettings({
+          activeClaudeManagedAccountId:
+            normalizedTarget.runtime === 'host' ? null : settings.activeClaudeManagedAccountId,
+          activeClaudeManagedAccountIdsByRuntime: nextSelection
+        })
+      }
+      if (normalizedTarget.runtime === 'wsl') {
+        return
+      }
+      if (this.lastSyncedAccountId !== null) {
+        await (previousAccount
+          ? this.restoreSystemDefaultSnapshot(
+              previousManagedCredentialsJson,
+              previousManagedOauthAccount
+            )
+          : this.restoreSystemDefaultSnapshot(this.lastWrittenCredentialsJson, undefined))
+        this.lastSyncedAccountId = null
+      }
+      return
+    }
+
+    if (activeAccount.managedAuthRuntime === 'wsl') {
+      if (!(await this.getOwnedManagedAuthPath(activeAccount))) {
+        console.warn(
+          '[claude-runtime-auth] Active WSL managed account is not owned by Orca, restoring system default'
+        )
+        const nextSelection = setSelectedClaudeAccountIdForTarget(
+          normalizeClaudeRuntimeSelection(settings),
+          null,
+          normalizedTarget
+        )
+        this.store.updateSettings({
+          activeClaudeManagedAccountId:
+            normalizedTarget.runtime === 'host' ? null : settings.activeClaudeManagedAccountId,
+          activeClaudeManagedAccountIdsByRuntime: nextSelection
+        })
+        return
+      }
+      const credentialsJson = await this.readManagedCredentials(activeAccount)
+      if (!credentialsJson || !this.isValidCredentialsJsonObject(credentialsJson)) {
+        console.warn(
+          '[claude-runtime-auth] Active WSL managed account is missing or has invalid credentials, restoring system default'
+        )
+        const nextSelection = setSelectedClaudeAccountIdForTarget(
+          normalizeClaudeRuntimeSelection(settings),
+          null,
+          normalizedTarget
+        )
+        this.store.updateSettings({
+          activeClaudeManagedAccountId:
+            normalizedTarget.runtime === 'host' ? null : settings.activeClaudeManagedAccountId,
+          activeClaudeManagedAccountIdsByRuntime: nextSelection
+        })
+        return
+      }
+      // Why: WSL managed accounts are isolated by their Linux CLAUDE_CONFIG_DIR; materializing into Windows ~/.claude would mix two auth stores.
+      this.clearLastWrittenRuntimeState()
+      return
+    }
+
+    if (!(await this.getOwnedManagedAuthPath(activeAccount))) {
+      console.warn(
+        '[claude-runtime-auth] Active managed account is not owned by Orca, restoring system default'
+      )
+      if (this.lastSyncedAccountId !== null) {
+        if (
+          previousAccount &&
+          (previousAccount.id !== activeAccount.id ||
+            this.hasMaterializedRuntimeAuth ||
+            this.runtimeOauthAccountMatches(await this.readManagedOauthAccount(previousAccount)))
+        ) {
+          await this.restoreSystemDefaultSnapshotForMissingManagedCredentials(
+            previousAccount,
+            previousManagedOauthAccount
+          )
+        } else if (!previousAccount && this.hasMaterializedRuntimeAuth) {
+          await this.restoreSystemDefaultSnapshot(this.lastWrittenCredentialsJson, undefined)
+        }
+      }
+      this.store.updateSettings({ activeClaudeManagedAccountId: null })
+      this.lastSyncedAccountId = null
+      return
+    }
+
+    let credentialsJson = await this.readManagedCredentials(activeAccount)
+    if (!credentialsJson || !this.isValidCredentialsJsonObject(credentialsJson)) {
+      console.warn(
+        '[claude-runtime-auth] Active managed account is missing or has invalid credentials, restoring system default'
+      )
+      if (this.lastSyncedAccountId !== null) {
+        if (
+          previousAccount &&
+          (previousAccount.id !== activeAccount.id ||
+            this.hasMaterializedRuntimeAuth ||
+            this.runtimeOauthAccountMatches(previousManagedOauthAccount))
+        ) {
+          await this.restoreSystemDefaultSnapshotForMissingManagedCredentials(
+            previousAccount,
+            previousManagedOauthAccount
+          )
+        } else if (!previousAccount && this.hasMaterializedRuntimeAuth) {
+          await this.restoreSystemDefaultSnapshot(this.lastWrittenCredentialsJson, undefined)
+        }
+      }
+      this.store.updateSettings({ activeClaudeManagedAccountId: null })
+      this.lastSyncedAccountId = null
+      return
+    }
+
+    if (this.lastSyncedAccountId === null) {
+      const paths = this.pathResolver.getRuntimePaths()
+      const runtimeCredentialsJson = existsSync(paths.credentialsPath)
+        ? readFileSync(paths.credentialsPath, 'utf-8')
+        : null
+      await this.captureSystemDefaultSnapshotForManagedEntry(
+        runtimeCredentialsJson,
+        credentialsJson
+      )
+    }
+
+    // Why: the CLI writes refreshed tokens to .credentials.json; if runtime differs from our last write, preserve them to managed storage before overwriting.
+    if (this.lastSyncedAccountId === activeAccount.id) {
+      if (this.skipNextReadBackForAccountId === activeAccount.id) {
+        this.skipNextReadBackForAccountId = null
+      } else {
+        const readBackResult = await this.readBackRefreshedTokens(credentialsJson, {
+          updateLastWrittenCredentialsJson: true
+        })
+        if (readBackResult.status === 'persisted') {
+          const updatedCredentialsJson = await this.readManagedCredentials(activeAccount)
+          if (updatedCredentialsJson && this.isValidCredentialsJsonObject(updatedCredentialsJson)) {
+            credentialsJson = updatedCredentialsJson
+          }
+        } else if (
+          readBackResult.status === 'rejected' &&
+          readBackResult.runtimeCredentialsChanged &&
+          // Why: a live Claude that lost a refresh race can wipe its runtime blob (empty tokens); preserving that would log out every new session.
+          readBackResult.hasValidChangedRuntimeCredentials &&
+          hasLiveClaudePtys()
+        ) {
+          if (
+            readBackResult.runtimeCredentialsJson &&
+            this.liveRuntimeCredentialsCanUpdateActiveAccount(
+              readBackResult.runtimeCredentialsJson,
+              activeAccount,
+              credentialsJson,
+              await this.readManagedOauthAccount(activeAccount)
+            )
+          ) {
+            // Why: this Claude launched under the active managed account, but persistence still needs positive account proof.
+            await this.writeManagedCredentials(activeAccount, readBackResult.runtimeCredentialsJson)
+            credentialsJson = readBackResult.runtimeCredentialsJson
+          } else {
+            // Why: while Claude runs, an unknown refresh may belong to a live session; rewriting stale managed auth logs it out.
+            console.warn(
+              '[claude-runtime-auth] Preserving changed Claude runtime credentials while live Claude terminals are running'
+            )
+            this.lastSyncedAccountId = activeAccount.id
+            this.hasMaterializedRuntimeAuth = true
+            return
+          }
+        }
+      }
+    }
+
+    if (this.lastSyncedAccountId !== activeAccount.id) {
+      this.skipNextReadBackForAccountId = null
+    }
+
+    // Why: rotate+persist the single-use token to managed storage before materializing (else runtime gets a stale token that fails invalid_grant); skip while a live PTY owns the creds since refreshing would double-rotate it (invalidating one copy) — read-back preserves its refresh instead.
+    const liveClaudePtys = hasLiveClaudePtys()
+    if (liveClaudePtys && isOauthTokenExpiring(credentialsJson)) {
+      this.managedRefreshDeferredByLivePtyAccountId = activeAccount.id
+    }
+    if (!liveClaudePtys) {
+      const refreshed = await this.refreshManagedAccountTokenIfNeeded(
+        activeAccount,
+        credentialsJson
+      )
+      if (refreshed) {
+        credentialsJson = refreshed
+      }
+    }
+
+    const paths = this.pathResolver.getRuntimePaths()
+    this.writeRuntimeCredentials(credentialsJson)
+    if (process.platform === 'darwin') {
+      // Why: Claude Code 2.1+ reads the scoped service, older builds the legacy unsuffixed one; runtime switching must satisfy both.
+      try {
+        await writeActiveClaudeKeychainCredentialsForRuntime(credentialsJson, paths.configDir)
+      } catch (error) {
+        await this.restoreSystemDefaultSnapshot(
+          credentialsJson,
+          await this.readManagedOauthAccount(activeAccount)
+        )
+        throw error
+      }
+    }
+    const managedOauthAccount = await this.readManagedOauthAccount(activeAccount)
+    if (this.writeRuntimeOauthAccount(managedOauthAccount)) {
+      this.lastWrittenOauthAccount = managedOauthAccount
+      this.hasLastWrittenOauthAccount = true
+    } else {
+      this.lastWrittenOauthAccount = null
+      this.hasLastWrittenOauthAccount = false
+    }
+    this.lastSyncedAccountId = activeAccount.id
+    this.hasMaterializedRuntimeAuth = true
+  }
+}
diff --git a/src/main/claude-accounts/runtime-auth/runtime-auth-types.ts b/src/main/claude-accounts/runtime-auth/runtime-auth-types.ts
new file mode 100644
index 00000000000..77f0394e571
--- /dev/null
+++ b/src/main/claude-accounts/runtime-auth/runtime-auth-types.ts
@@ -0,0 +1,55 @@
+import type { ClaudeManagedAccount } from '../../../shared/managed-account-types'
+import type { ClaudeEnvPatch } from '../environment'
+
+export type ClaudeRuntimeAuthPreparation = {
+  configDir: string
+  runtime?: 'host' | 'wsl'
+  wslDistro?: string | null
+  wslLinuxConfigDir?: string | null
+  envPatch: ClaudeEnvPatch
+  stripAuthEnv: boolean
+  managedRefreshDeferredByLivePty?: boolean
+  provenance: string
+}
+
+export type ClaudeSystemDefaultSnapshot = {
+  credentialsJson: string | null
+  configOauthAccount: unknown
+  keychainCredentialsJson: string | null
+  scopedKeychainCredentialsJson?: string | null
+  legacyKeychainCredentialsJson?: string | null
+  scopedKeychainCredentialsCaptured?: boolean
+  legacyKeychainCredentialsCaptured?: boolean
+  capturedAt: number
+}
+
+export type ClaudeAuthIdentity = {
+  accountUuid: string | null
+  email: string | null
+  organizationUuid: string | null
+}
+
+export type ClaudeReadBackResult =
+  | { status: 'unchanged' | 'persisted' }
+  | {
+      status: 'rejected'
+      runtimeCredentialsChanged: boolean
+      hasValidChangedRuntimeCredentials: boolean
+      runtimeCredentialsJson?: string
+    }
+export type ClaudeReadBackMatch =
+  | { kind: 'matched'; account: ClaudeManagedAccount; managedCredentialsJson: string }
+  | { kind: 'none' | 'ambiguous' }
+export type ClaudeKeychainReadResult =
+  | { status: 'captured'; credentialsJson: string | null }
+  | { status: 'failed' }
+export type ClaudeKeychainSnapshotValue =
+  | { status: 'captured'; credentialsJson: string | null }
+  | { status: 'unknown' }
+export type ClaudeRefreshTokenComparison = 'same' | 'different' | 'missing'
+export type ClaudeRuntimeCredentialCandidate = {
+  credentialsJson: string
+  runtimeOauthAccount: unknown
+}
+
+export const RUNTIME_OAUTH_ACCOUNT_PARSE_ERROR = Symbol('runtime-oauth-account-parse-error')
diff --git a/src/main/claude-usage/claude-model-pricing.test.ts b/src/main/claude-usage/claude-model-pricing.test.ts
index 8c5f317d875..9eb3c2987c7 100644
--- a/src/main/claude-usage/claude-model-pricing.test.ts
+++ b/src/main/claude-usage/claude-model-pricing.test.ts
@@ -33,8 +33,8 @@ describe('estimateCostUsd cache-write TTL rates', () => {
   })
 
   it('never lowers a long-context estimate as writes shift from 5-minute to 1-hour', () => {
-    const costs = [0, 50_000, 100_000, 200_000, 300_000, 400_000].map(
-      (write1h) => estimateCostUsd('claude-sonnet-4-6', 0, 0, 0, 400_000, write1h)!
+    const costs = [0, 50_000, 100_000, 200_000, 300_000, 400_000].map((write1h) =>
+      estimateCostUsd('claude-sonnet-4-6', 0, 0, 0, 400_000, write1h)!
     )
     for (let index = 1; index < costs.length; index++) {
       expect(costs[index]).toBeGreaterThan(costs[index - 1])
diff --git a/src/main/codex-accounts/codex-account-identity-api-key-guard.test.ts b/src/main/codex-accounts/codex-account-identity-api-key-guard.test.ts
new file mode 100644
index 00000000000..c522b892ebc
--- /dev/null
+++ b/src/main/codex-accounts/codex-account-identity-api-key-guard.test.ts
@@ -0,0 +1,89 @@
+import { mkdtempSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { describe, expect, it } from 'vitest'
+import { CodexAccountIdentity } from './codex-account-identity'
+import { readCodexAuthIdentity } from './codex-auth-identity'
+
+/** Encodes a JWT whose payload carries the given claims; only the payload segment is read. */
+function idTokenWithClaims(claims: Record<string, unknown>): string {
+  const payload = Buffer.from(JSON.stringify(claims), 'utf-8').toString('base64url')
+  return `header.${payload}.signature`
+}
+
+function homeWithAuthJson(auth: Record<string, unknown>): string {
+  const home = mkdtempSync(join(tmpdir(), 'codex-identity-'))
+  writeFileSync(join(home, 'auth.json'), JSON.stringify(auth), 'utf-8')
+  return home
+}
+
+describe('managed-home Codex identity', () => {
+  const identity = new CodexAccountIdentity((candidatePath) => candidatePath)
+
+  it('resolves no identity for an API-key login that still holds a stale tokens blob', () => {
+    // Why: the stale OAuth email is not who this credential authenticates as, and it is
+    // the claim used to prove a shared-home auth.json belongs to the selected account.
+    const home = homeWithAuthJson({
+      OPENAI_API_KEY: 'sk-test',
+      tokens: {
+        account_id: 'stale-account',
+        id_token: idTokenWithClaims({ email: 'stale@example.com' })
+      }
+    })
+
+    expect(identity.readFromHome(home, 'account-1')).toEqual({
+      email: null,
+      providerAccountId: null,
+      workspaceLabel: null,
+      workspaceAccountId: null
+    })
+  })
+
+  it('still resolves an OAuth identity when no API key is declared', () => {
+    const home = homeWithAuthJson({
+      tokens: {
+        account_id: 'real-account',
+        id_token: idTokenWithClaims({ email: 'real@example.com' })
+      }
+    })
+
+    expect(identity.readFromHome(home, 'account-1')).toMatchObject({
+      email: 'real@example.com',
+      providerAccountId: 'real-account'
+    })
+  })
+})
+
+describe('readCodexAuthIdentity account-id fallback', () => {
+  it('falls through to the auth claim for providerAccountId when tokens.account_id is blank', () => {
+    // Why: a blank token field must not end the fallback chain — an empty string is not nullish.
+    const contents = JSON.stringify({
+      tokens: {
+        account_id: '   ',
+        id_token: idTokenWithClaims({
+          'https://api.openai.com/auth': { chatgpt_account_id: 'claim-account' }
+        })
+      }
+    })
+
+    expect(readCodexAuthIdentity(contents)).toMatchObject({
+      providerAccountId: 'claim-account',
+      // workspaceAccountId's chain skips the auth claim and ends at the top-level one.
+      workspaceAccountId: null
+    })
+  })
+
+  it('falls through to the top-level claim for workspaceAccountId when tokens.account_id is blank', () => {
+    const contents = JSON.stringify({
+      tokens: {
+        account_id: '',
+        id_token: idTokenWithClaims({ chatgpt_account_id: 'top-level-account' })
+      }
+    })
+
+    expect(readCodexAuthIdentity(contents)).toMatchObject({
+      providerAccountId: 'top-level-account',
+      workspaceAccountId: 'top-level-account'
+    })
+  })
+})
diff --git a/src/main/codex-accounts/codex-account-identity.ts b/src/main/codex-accounts/codex-account-identity.ts
new file mode 100644
index 00000000000..30b42743ef7
--- /dev/null
+++ b/src/main/codex-accounts/codex-account-identity.ts
@@ -0,0 +1,150 @@
+import { readFileSync } from 'node:fs'
+import { homedir } from 'node:os'
+import { join } from 'node:path'
+import { isDefinitiveAbsence } from '../../shared/definitive-filesystem-absence'
+import type { CodexSystemDefaultIdentity } from '../../shared/managed-account-types'
+import { readCodexAuthIdentity, type CodexAuthIdentity } from './codex-auth-identity'
+import { ManagedCodexHomeTemporarilyUnavailableError } from './host-codex-managed-home-ownership'
+
+export type ResolvedCodexIdentity = CodexAuthIdentity
+
+/** API-key logins carry no OAuth identity even when a stale `tokens` blob is still present. */
+function declaresApiKeyCredential(parsed: unknown): boolean {
+  if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+    return false
+  }
+  const apiKey = (parsed as Record<string, unknown>).OPENAI_API_KEY
+  return typeof apiKey === 'string' && apiKey.trim() !== ''
+}
+
+export class CodexAccountIdentity {
+  constructor(
+    private readonly assertManagedHomePath: (
+      candidatePath: string,
+      expectedAccountId?: string
+    ) => string
+  ) {}
+
+  readFromHome(managedHomePath: string, expectedAccountId: string): ResolvedCodexIdentity {
+    const authFilePath = join(
+      this.assertManagedHomePath(managedHomePath, expectedAccountId),
+      'auth.json'
+    )
+    let contents: string
+    try {
+      contents = readFileSync(authFilePath, 'utf-8')
+    } catch (error) {
+      // Why: an unreadable auth.json is not a missing credential. Surfacing it as
+      // a generic failure is what lets the add path's rollback delete a home
+      // holding freshly authenticated bytes.
+      if (isDefinitiveAbsence(error)) {
+        throw error
+      }
+      throw new ManagedCodexHomeTemporarilyUnavailableError(undefined, { cause: error })
+    }
+    let parsed: unknown
+    try {
+      parsed = JSON.parse(contents)
+    } catch {
+      // Why: a raw SyntaxError echoes credential bytes into logs/error UI; a
+      // corrupt auth.json must fail loudly but without them (same sanitization
+      // intent as the system-default identity path, which degrades instead).
+      throw new Error('Codex auth.json is corrupt or not valid JSON')
+    }
+    // Why: API-key-based auth files have no OAuth tokens or JWT identity
+    // claims. Returning nulls causes the caller to fail with a clear
+    // "could not resolve the account email" error rather than crashing
+    // on missing nested token fields.
+    if (declaresApiKeyCredential(parsed)) {
+      return {
+        email: null,
+        providerAccountId: null,
+        workspaceLabel: null,
+        workspaceAccountId: null
+      }
+    }
+    const identity = readCodexAuthIdentity(contents)
+    if (!identity) {
+      return {
+        email: null,
+        providerAccountId: null,
+        workspaceLabel: null,
+        workspaceAccountId: null
+      }
+    }
+    return identity
+  }
+
+  // Why: the system-default (activeAccountId:null) account has no stored
+  // identity — its effective login is whatever the real ~/.codex/auth.json is
+  // right now. Read it live and read-only so the switcher can display who the
+  // system default is and attribute usage, without ever mutating ~/.codex.
+  resolveSystemDefault(): CodexSystemDefaultIdentity {
+    let contents: string
+    try {
+      // Why: a single read avoids an exists/read race and halves filesystem
+      // probes whenever an accounts snapshot resolves this live identity.
+      contents = readFileSync(join(homedir(), '.codex', 'auth.json'), 'utf-8')
+    } catch (error) {
+      const code = (error as NodeJS.ErrnoException | null)?.code
+      if (code === 'ENOENT' || code === 'ENOTDIR') {
+        // Why: no auth.json means either a signed-out home or an env-key/custom
+        // provider that authenticates via OPENAI_API_KEY instead of a token file.
+        return this.systemDefaultIdentity(false, this.hasEnvApiKey() ? 'api-key' : 'none')
+      }
+      console.warn(
+        '[codex-accounts] Failed to read system-default Codex identity',
+        code ?? 'unknown-error'
+      )
+      return this.systemDefaultIdentity(true, 'none')
+    }
+
+    let parsed: unknown
+    try {
+      parsed = JSON.parse(contents)
+    } catch {
+      // Why: SyntaxError messages can echo malformed input; never let auth
+      // contents or token fragments reach logs while degrading safely.
+      console.warn('[codex-accounts] System-default Codex auth is not valid JSON')
+      return this.systemDefaultIdentity(true, 'none')
+    }
+    if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+      // Why: valid JSON can still have the wrong shape; account listing must
+      // degrade to an unknown identity instead of crashing the settings pane.
+      console.warn('[codex-accounts] System-default Codex auth has an unexpected format')
+      return this.systemDefaultIdentity(true, 'none')
+    }
+    if (declaresApiKeyCredential(parsed)) {
+      // Why: API-key/custom-provider logins carry no OAuth identity or ChatGPT
+      // usage. Surface them as a custom provider, not a blank/broken row.
+      return this.systemDefaultIdentity(true, 'api-key')
+    }
+
+    const identity = readCodexAuthIdentity(contents)
+    return {
+      hasAuth: true,
+      authKind: 'oauth',
+      email: identity?.email ?? null,
+      providerAccountId: identity?.providerAccountId ?? null,
+      workspaceLabel: identity?.workspaceLabel ?? null
+    }
+  }
+
+  private systemDefaultIdentity(
+    hasAuth: boolean,
+    authKind: CodexSystemDefaultIdentity['authKind']
+  ): CodexSystemDefaultIdentity {
+    return {
+      hasAuth,
+      authKind,
+      email: null,
+      providerAccountId: null,
+      workspaceLabel: null
+    }
+  }
+
+  private hasEnvApiKey(): boolean {
+    const key = process.env.OPENAI_API_KEY
+    return typeof key === 'string' && key.trim() !== ''
+  }
+}
diff --git a/src/main/codex-accounts/codex-account-registration.ts b/src/main/codex-accounts/codex-account-registration.ts
new file mode 100644
index 00000000000..fbdf0db1a68
--- /dev/null
+++ b/src/main/codex-accounts/codex-account-registration.ts
@@ -0,0 +1,232 @@
+import { randomUUID } from 'node:crypto'
+import type {
+  CodexManagedAccount,
+  CodexRateLimitAccountsState
+} from '../../shared/managed-account-types'
+import type { Store } from '../persistence'
+import type { RateLimitService } from '../rate-limits/service'
+import type { CodexRuntimeHomeService } from './runtime-home-service'
+import type { ResolvedCodexIdentity } from './codex-account-identity'
+import type {
+  CodexAccountAddTarget,
+  CodexAccountReauthenticateOptions,
+  ManagedCodexHomeLocation
+} from './codex-account-service-types'
+import type { CodexAccountSelection } from './codex-account-selection'
+import type { CodexConfigMirror } from './codex-config-mirror'
+import type { CodexManagedHomeLifecycle } from './codex-managed-home-lifecycle'
+import type { CodexManagedHomePath } from './codex-managed-home-path'
+import {
+  getCodexSelectionTargetForAccount,
+  getSelectedCodexAccountIdForTarget,
+  normalizeCodexRuntimeSelection,
+  setSelectedCodexAccountIdForTarget,
+  type CodexAccountSelectionTarget
+} from './runtime-selection'
+
+type CodexAccountRegistrationDependencies = {
+  store: Store
+  rateLimits: RateLimitService
+  runtimeHome: CodexRuntimeHomeService
+  readIdentityFromHome: (
+    managedHomePath: string,
+    expectedAccountId: string
+  ) => ResolvedCodexIdentity
+  selection: CodexAccountSelection
+  configMirror: CodexConfigMirror
+  managedHomePaths: CodexManagedHomePath
+  managedHomes: CodexManagedHomeLifecycle
+  login: (managedHomePath: string) => Promise<void>
+}
+
+export class CodexAccountRegistration {
+  constructor(private readonly dependencies: CodexAccountRegistrationDependencies) {}
+
+  async add(target?: CodexAccountAddTarget): Promise<CodexRateLimitAccountsState> {
+    const accountId = randomUUID()
+    const managedHome = await this.dependencies.managedHomes.create(accountId, target)
+    const { managedHomePath } = managedHome
+    try {
+      this.prepareManagedHomeForLogin(managedHomePath, accountId)
+      await this.dependencies.login(managedHomePath)
+      return await this.persistCapturedAccount(accountId, managedHome)
+    } catch (error) {
+      this.dependencies.managedHomes.removeUnlessUnproven(error, managedHomePath, accountId)
+      throw error
+    }
+  }
+
+  async addFromHome(
+    sourceHome: string,
+    target?: CodexAccountAddTarget
+  ): Promise<CodexRateLimitAccountsState> {
+    const accountId = randomUUID()
+    const managedHome = await this.dependencies.managedHomes.create(accountId, target)
+    const { managedHomePath } = managedHome
+    try {
+      this.prepareManagedHomeForLogin(managedHomePath, accountId)
+      this.dependencies.managedHomes.importAuthFromHome(sourceHome, managedHomePath, accountId)
+      return await this.persistCapturedAccount(accountId, managedHome)
+    } catch (error) {
+      this.dependencies.managedHomes.removeUnlessUnproven(error, managedHomePath, accountId)
+      throw error
+    }
+  }
+
+  async reauthenticate(
+    accountId: string,
+    options?: CodexAccountReauthenticateOptions
+  ): Promise<CodexRateLimitAccountsState> {
+    const account = this.dependencies.selection.requireAccount(accountId)
+    const managedHomePath =
+      await this.dependencies.managedHomePaths.ensureForReauthentication(account)
+    const accountTarget = getCodexSelectionTargetForAccount(account)
+    const selectedAccountId = getSelectedCodexAccountIdForTarget(
+      this.dependencies.store.getSettings(),
+      accountTarget
+    )
+    // Why: decided from the pre-login capture, never a post-login read — the
+    // runtime-home poll runs outside the mutation queue and can clear this lane
+    // while OAuth is open, which would look like an empty selection to activate.
+    const activateAfterLogin =
+      options?.activateIfSelectionWasEmpty === true && selectedAccountId === null
+
+    this.dependencies.configMirror.safeSyncIntoManagedHome(managedHomePath, undefined, account.id)
+    await this.dependencies.login(managedHomePath)
+    const identity = this.dependencies.readIdentityFromHome(managedHomePath, account.id)
+    if (!identity.email) {
+      throw new Error('Codex login completed, but Orca could not resolve the account email.')
+    }
+
+    const settings = this.dependencies.store.getSettings()
+    const now = Date.now()
+    const updatedAccounts = settings.codexManagedAccounts.map((entry) =>
+      entry.id === accountId
+        ? {
+            ...entry,
+            email: identity.email!,
+            providerAccountId: identity.providerAccountId,
+            workspaceLabel: identity.workspaceLabel,
+            workspaceAccountId: identity.workspaceAccountId,
+            updatedAt: now,
+            lastAuthenticatedAt: now
+          }
+        : entry
+    )
+    const activeSelection = setSelectedCodexAccountIdForTarget(
+      normalizeCodexRuntimeSelection(settings),
+      activateAfterLogin ? accountId : selectedAccountId,
+      accountTarget
+    )
+
+    // Why: login can transiently clear this runtime's selection; unrelated runtime validation must remain authoritative.
+    this.dependencies.store.updateSettings({
+      codexManagedAccounts: updatedAccounts,
+      activeCodexManagedAccountId: activeSelection.host,
+      activeCodexManagedAccountIdsByRuntime: activeSelection
+    })
+    this.dependencies.configMirror.safeSyncToManagedHomes()
+    this.dependencies.runtimeHome.clearLastWrittenAuthJson(accountId)
+    this.dependencies.runtimeHome.syncForCurrentSelection(accountTarget)
+    // Why: re-auth can change the underlying Codex identity, so force a fresh read to avoid showing stale quota.
+    this.startQuotaRefresh(undefined, accountTarget)
+    return this.dependencies.selection.snapshot()
+  }
+
+  private prepareManagedHomeForLogin(managedHomePath: string, accountId: string): void {
+    const canonicalConfig = this.dependencies.configMirror.readForManagedHome(managedHomePath)
+    this.dependencies.configMirror.assertOAuthAccountAddAllowed(canonicalConfig)
+    this.dependencies.configMirror.safeSyncIntoManagedHome(
+      managedHomePath,
+      canonicalConfig,
+      accountId
+    )
+  }
+
+  private async persistCapturedAccount(
+    accountId: string,
+    managedHome: ManagedCodexHomeLocation
+  ): Promise<CodexRateLimitAccountsState> {
+    const identity = this.dependencies.readIdentityFromHome(managedHome.managedHomePath, accountId)
+    if (!identity.email) {
+      throw new Error('Codex login completed, but Orca could not resolve the account email.')
+    }
+    const now = Date.now()
+    const account: CodexManagedAccount = {
+      id: accountId,
+      email: identity.email,
+      managedHomePath: managedHome.managedHomePath,
+      managedHomeRuntime: managedHome.managedHomeRuntime,
+      wslDistro: managedHome.wslDistro,
+      wslLinuxHomePath: managedHome.wslLinuxHomePath,
+      providerAccountId: identity.providerAccountId,
+      workspaceLabel: identity.workspaceLabel,
+      workspaceAccountId: identity.workspaceAccountId,
+      createdAt: now,
+      updatedAt: now,
+      lastAuthenticatedAt: now
+    }
+
+    const settings = this.dependencies.store.getSettings()
+    const selection = normalizeCodexRuntimeSelection(settings)
+    const targetSelection = getCodexSelectionTargetForAccount(account)
+    this.dependencies.store.updateSettings({
+      codexManagedAccounts: [...settings.codexManagedAccounts, account],
+      activeCodexManagedAccountId: targetSelection.runtime === 'host' ? account.id : selection.host,
+      activeCodexManagedAccountIdsByRuntime: setSelectedCodexAccountIdForTarget(
+        selection,
+        account.id,
+        targetSelection
+      )
+    })
+    try {
+      this.dependencies.configMirror.safeSyncToManagedHomes()
+      this.dependencies.runtimeHome.clearLastWrittenAuthJson(account.id)
+      // Why: pass the account's selection target so a WSL account syncs the WSL
+      // runtime home instead of the default host target.
+      this.dependencies.runtimeHome.syncForCurrentSelection(targetSelection)
+    } catch (error) {
+      // Why: settings were already written; if a post-write step fails, restore the
+      // previous account/selection so the caller's managed-home cleanup cannot leave
+      // a dangling, broken managed account behind in settings.
+      this.dependencies.store.updateSettings({
+        codexManagedAccounts: settings.codexManagedAccounts,
+        activeCodexManagedAccountId: settings.activeCodexManagedAccountId,
+        activeCodexManagedAccountIdsByRuntime: settings.activeCodexManagedAccountIdsByRuntime
+      })
+      // Why: a failed post-write step must restore both persisted selection and
+      // the runtime home it drives before the new managed home is removed.
+      try {
+        this.dependencies.runtimeHome.syncForCurrentSelection(targetSelection)
+      } catch (rollbackError) {
+        console.warn(
+          '[codex-accounts] Failed to restore runtime home during rollback:',
+          rollbackError
+        )
+      }
+      throw error
+    }
+
+    const outgoingAccountId = getSelectedCodexAccountIdForTarget(settings, targetSelection)
+    // Why: switching activates the new account, so cache the outgoing account's usage for the
+    // switcher — in the background, since the probe must never block or fail a durable add.
+    this.startQuotaRefresh(outgoingAccountId, targetSelection)
+    return this.dependencies.selection.snapshot()
+  }
+
+  private startQuotaRefresh(
+    outgoingAccountId: string | null | undefined,
+    target: CodexAccountSelectionTarget | undefined
+  ): void {
+    // Why: quota probes against a cold per-account CODEX_HOME can take 10–25s
+    // (RPC + PTY fallback) and queue behind an in-flight global usage refresh.
+    // The refresh synchronously flips usage to "fetching" before its first await,
+    // so the switcher updates immediately; the probe itself must never block or
+    // fail the already-durable account mutation.
+    void this.dependencies.rateLimits
+      .refreshForCodexAccountChange(outgoingAccountId, target)
+      .catch((error) => {
+        console.error('[codex-accounts] Quota refresh after account change failed:', error)
+      })
+  }
+}
diff --git a/src/main/codex-accounts/codex-account-selection.ts b/src/main/codex-accounts/codex-account-selection.ts
new file mode 100644
index 00000000000..ad97d80696b
--- /dev/null
+++ b/src/main/codex-accounts/codex-account-selection.ts
@@ -0,0 +1,176 @@
+import type {
+  CodexManagedAccount,
+  CodexRateLimitAccountsState,
+  CodexSystemDefaultIdentity
+} from '../../shared/managed-account-types'
+import type { Store } from '../persistence'
+import type { RateLimitService } from '../rate-limits/service'
+import type { CodexRuntimeHomeService } from './runtime-home-service'
+import type { CodexConfigMirror } from './codex-config-mirror'
+import type { CodexAccountServiceLifecycle } from './codex-account-service-types'
+import { toCodexManagedAccountSummary } from './codex-account-service-types'
+import {
+  getCodexSelectionTargetForAccount,
+  getSelectedCodexAccountIdForTarget,
+  normalizeCodexAccountSelectionTarget,
+  normalizeCodexRuntimeSelection,
+  pruneInvalidCodexRuntimeSelection,
+  removeCodexAccountIdFromSelection,
+  setSelectedCodexAccountIdForTarget,
+  type CodexAccountSelectionTarget
+} from './runtime-selection'
+
+type CodexAccountSelectionDependencies = {
+  store: Store
+  rateLimits: RateLimitService
+  runtimeHome: CodexRuntimeHomeService
+  configMirror: CodexConfigMirror
+  lifecycle: CodexAccountServiceLifecycle
+  resolveSystemDefault: () => CodexSystemDefaultIdentity
+  removeManagedHome: (candidatePath: string, expectedAccountId: string) => void
+  discardResetAttempts: (accountId: string) => void
+}
+
+export class CodexAccountSelection {
+  constructor(private readonly dependencies: CodexAccountSelectionDependencies) {}
+
+  list(): CodexRateLimitAccountsState {
+    this.normalizeActiveSelection()
+    return this.snapshot()
+  }
+
+  snapshot(): CodexRateLimitAccountsState {
+    const settings = this.dependencies.store.getSettings()
+    return {
+      accounts: settings.codexManagedAccounts
+        .map(toCodexManagedAccountSummary)
+        .sort((a, b) => b.updatedAt - a.updatedAt),
+      activeAccountId: normalizeCodexRuntimeSelection(settings).host,
+      activeAccountIdsByRuntime: normalizeCodexRuntimeSelection(settings),
+      systemDefault: this.dependencies.resolveSystemDefault()
+    }
+  }
+
+  requireAccount(accountId: string): CodexManagedAccount {
+    const account = this.dependencies.store
+      .getSettings()
+      .codexManagedAccounts.find((entry) => entry.id === accountId)
+    if (!account) {
+      throw new Error('That Codex rate limit account no longer exists.')
+    }
+    return account
+  }
+
+  async remove(accountId: string): Promise<CodexRateLimitAccountsState> {
+    const account = this.requireAccount(accountId)
+    const settings = this.dependencies.store.getSettings()
+    const nextAccounts = settings.codexManagedAccounts.filter((entry) => entry.id !== accountId)
+    const nextSelection = removeCodexAccountIdFromSelection(
+      normalizeCodexRuntimeSelection(settings),
+      accountId
+    )
+    const nextActiveId =
+      settings.activeCodexManagedAccountId === accountId ? null : nextSelection.host
+
+    this.dependencies.store.updateSettings({
+      codexManagedAccounts: nextAccounts,
+      activeCodexManagedAccountId: nextActiveId,
+      activeCodexManagedAccountIdsByRuntime: nextSelection
+    })
+    this.dependencies.runtimeHome.syncForCurrentSelection()
+    if (account.managedHomeRuntime === 'host' && nextSelection.host === null) {
+      this.dependencies.lifecycle.onHostSystemDefaultSelected?.()
+    }
+
+    this.dependencies.removeManagedHome(account.managedHomePath, account.id)
+    // Why: a removed account can no longer appear in the switcher dropdown,
+    // so purge its cached usage to avoid stale entries.
+    this.dependencies.rateLimits.evictInactiveCodexCache(accountId)
+    this.dependencies.discardResetAttempts(accountId)
+    const accountTarget = getCodexSelectionTargetForAccount(account)
+    this.startQuotaRefresh(
+      getSelectedCodexAccountIdForTarget(settings, accountTarget) === accountId
+        ? accountId
+        : undefined,
+      accountTarget
+    )
+    return this.snapshot()
+  }
+
+  async select(
+    accountId: string | null,
+    target?: CodexAccountSelectionTarget
+  ): Promise<CodexRateLimitAccountsState> {
+    let effectiveTarget = target
+    if (accountId !== null) {
+      const accountTarget = getCodexSelectionTargetForAccount(this.requireAccount(accountId))
+      const requestedTarget = normalizeCodexAccountSelectionTarget(target ?? accountTarget)
+      const normalizedAccountTarget = normalizeCodexAccountSelectionTarget(accountTarget)
+      if (
+        requestedTarget.runtime !== normalizedAccountTarget.runtime ||
+        (requestedTarget.wslDistro !== null &&
+          requestedTarget.wslDistro !== normalizedAccountTarget.wslDistro)
+      ) {
+        throw new Error('That Codex account belongs to a different runtime.')
+      }
+      effectiveTarget = accountTarget
+    }
+
+    const previousSettings = this.dependencies.store.getSettings()
+    const outgoingAccountId = getSelectedCodexAccountIdForTarget(previousSettings, effectiveTarget)
+    const nextSelection = setSelectedCodexAccountIdForTarget(
+      normalizeCodexRuntimeSelection(previousSettings),
+      accountId,
+      effectiveTarget
+    )
+    this.dependencies.store.updateSettings({
+      activeCodexManagedAccountId:
+        effectiveTarget?.runtime === 'wsl' ? nextSelection.host : accountId,
+      activeCodexManagedAccountIdsByRuntime: nextSelection
+    })
+    this.dependencies.configMirror.safeSyncToManagedHomes()
+    this.dependencies.runtimeHome.syncForCurrentSelection(effectiveTarget)
+    if (
+      accountId === null &&
+      normalizeCodexAccountSelectionTarget(effectiveTarget).runtime === 'host'
+    ) {
+      this.dependencies.lifecycle.onHostSystemDefaultSelected?.()
+    }
+
+    this.startQuotaRefresh(outgoingAccountId, effectiveTarget)
+    return this.snapshot()
+  }
+
+  private normalizeActiveSelection(): void {
+    const settings = this.dependencies.store.getSettings()
+    const selection = normalizeCodexRuntimeSelection(settings)
+    const nextSelection = pruneInvalidCodexRuntimeSelection(
+      selection,
+      settings.codexManagedAccounts
+    )
+    const changed =
+      nextSelection.host !== selection.host ||
+      JSON.stringify(nextSelection.wsl) !== JSON.stringify(selection.wsl)
+    if (!changed) {
+      return
+    }
+    this.dependencies.store.updateSettings({
+      activeCodexManagedAccountId: nextSelection.host,
+      activeCodexManagedAccountIdsByRuntime: nextSelection
+    })
+    if (selection.host !== null && nextSelection.host === null) {
+      this.dependencies.lifecycle.onHostSystemDefaultSelected?.()
+    }
+  }
+
+  private startQuotaRefresh(
+    outgoingAccountId: string | null | undefined,
+    target: CodexAccountSelectionTarget | undefined
+  ): void {
+    void this.dependencies.rateLimits
+      .refreshForCodexAccountChange(outgoingAccountId, target)
+      .catch((error) => {
+        console.error('[codex-accounts] Quota refresh after account change failed:', error)
+      })
+  }
+}
diff --git a/src/main/codex-accounts/codex-account-service-types.ts b/src/main/codex-accounts/codex-account-service-types.ts
new file mode 100644
index 00000000000..a4088db4a83
--- /dev/null
+++ b/src/main/codex-accounts/codex-account-service-types.ts
@@ -0,0 +1,77 @@
+import type {
+  CodexManagedAccount,
+  CodexRateLimitAccountsState,
+  CodexManagedAccountSummary
+} from '../../shared/managed-account-types'
+import type { CodexResetCreditExpectedScope } from '../../shared/codex-reset-credit-scope'
+import type { CodexRateLimitResetOutcome, RateLimitState } from '../../shared/rate-limit-types'
+
+export type CodexAccountAddTarget = {
+  runtime?: 'host' | 'wsl'
+  wslDistro?: string | null
+}
+
+export type CodexAccountReauthenticateOptions = {
+  /**
+   * Local-only intent from the status bar's "Sign in to see usage" action: when
+   * this account's runtime lane had no selection before login, activate the
+   * account that just signed in instead of restoring the empty selection.
+   */
+  activateIfSelectionWasEmpty?: boolean
+}
+
+export type CodexAccountServiceLifecycle = {
+  onHostSystemDefaultSelected?: () => void
+}
+
+export type ManagedCodexHomeLocation = {
+  managedHomePath: string
+  managedHomeRuntime: 'host' | 'wsl'
+  wslDistro: string | null
+  wslLinuxHomePath: string | null
+}
+
+export type CodexResetCreditRejectedBeforeProviderReason =
+  | 'targetChanged'
+  | 'accountChanged'
+  | 'accountRevisionChanged'
+  | 'accountRuntimeChanged'
+  | 'offerUnavailable'
+  | 'offerChanged'
+
+export type CodexResetCreditConsumedResult = {
+  outcome: CodexRateLimitResetOutcome
+  scope: CodexResetCreditExpectedScope
+  codex: CodexRateLimitAccountsState
+  rateLimits: RateLimitState
+}
+
+export type CodexResetCreditRejectedBeforeProviderResult = {
+  status: 'rejectedBeforeProvider'
+  retryDisposition: 'discardAttempt'
+  reason: CodexResetCreditRejectedBeforeProviderReason
+  scope: CodexResetCreditExpectedScope
+  codex: CodexRateLimitAccountsState
+  rateLimits: RateLimitState
+}
+
+export type CodexResetCreditConsumeResult =
+  | CodexResetCreditConsumedResult
+  | CodexResetCreditRejectedBeforeProviderResult
+
+export function toCodexManagedAccountSummary(
+  account: CodexManagedAccount
+): CodexManagedAccountSummary {
+  return {
+    id: account.id,
+    email: account.email,
+    managedHomeRuntime: account.managedHomeRuntime ?? 'host',
+    wslDistro: account.wslDistro ?? null,
+    providerAccountId: account.providerAccountId ?? null,
+    workspaceLabel: account.workspaceLabel ?? null,
+    workspaceAccountId: account.workspaceAccountId ?? null,
+    createdAt: account.createdAt,
+    updatedAt: account.updatedAt,
+    lastAuthenticatedAt: account.lastAuthenticatedAt
+  }
+}
diff --git a/src/main/codex-accounts/codex-auth-identity.ts b/src/main/codex-accounts/codex-auth-identity.ts
index 2bad1469536..0455b5e481f 100644
--- a/src/main/codex-accounts/codex-auth-identity.ts
+++ b/src/main/codex-accounts/codex-auth-identity.ts
@@ -1,11 +1,14 @@
 import type { CodexManagedAccount } from '../../shared/managed-account-types'
 
-type CodexAuthIdentity = {
+export type CodexAuthIdentity = {
   email: string | null
   providerAccountId: string | null
+  workspaceLabel: string | null
   workspaceAccountId: string | null
 }
 
+type CodexAuthOwnershipIdentity = Omit<CodexAuthIdentity, 'workspaceLabel'>
+
 // Why: stale shared-home PTYs can write after an account switch, so read-back
 // needs a positive claim match instead of trusting the selected path alone.
 export function codexAuthMatchesManagedAccount(
@@ -13,13 +16,11 @@ export function codexAuthMatchesManagedAccount(
   account: CodexManagedAccount,
   managedAuthContents: string | null
 ): boolean {
-  const identity = readIdentityFromAuthContents(runtimeAuthContents)
+  const identity = readCodexAuthIdentity(runtimeAuthContents)
   if (!identity) {
     return false
   }
-  const managedIdentity = managedAuthContents
-    ? readIdentityFromAuthContents(managedAuthContents)
-    : null
+  const managedIdentity = managedAuthContents ? readCodexAuthIdentity(managedAuthContents) : null
   const selectedEmail = firstNonNull(normalizeField(account.email), managedIdentity?.email)
   const selectedProviderId = firstNonNull(
     normalizeField(account.providerAccountId),
@@ -65,7 +66,7 @@ export function codexAuthCouldBelongToManagedAccount(
   runtimeAuthContents: string,
   account: CodexManagedAccount
 ): boolean {
-  const identity = readIdentityFromAuthContents(runtimeAuthContents)
+  const identity = readCodexAuthIdentity(runtimeAuthContents)
   return (
     !identity ||
     !identityContradictsSelection(
@@ -85,8 +86,8 @@ export function codexAuthMatchesSystemDefaultIdentity(
   runtimeAuthContents: string,
   systemDefaultAuthContents: string
 ): boolean {
-  const runtimeIdentity = readIdentityFromAuthContents(runtimeAuthContents)
-  const systemDefaultIdentity = readIdentityFromAuthContents(systemDefaultAuthContents)
+  const runtimeIdentity = readCodexAuthIdentity(runtimeAuthContents)
+  const systemDefaultIdentity = readCodexAuthIdentity(systemDefaultAuthContents)
   if (!runtimeIdentity || !systemDefaultIdentity) {
     return false
   }
@@ -154,7 +155,7 @@ export function codexAuthIsFresher(
   return compareCodexAuthFreshness(candidateAuthContents, baselineAuthContents) === 1
 }
 
-function readIdentityFromAuthContents(contents: string): CodexAuthIdentity | null {
+export function readCodexAuthIdentity(contents: string): CodexAuthIdentity | null {
   const raw = parseJsonRecord(contents)
   if (!raw) {
     return null
@@ -166,21 +167,28 @@ function readIdentityFromAuthContents(contents: string): CodexAuthIdentity | nul
   const payload = idToken ? parseJwtPayload(idToken) : null
   const authClaims = readRecordClaim(payload, 'https://api.openai.com/auth')
   const profileClaims = readRecordClaim(payload, 'https://api.openai.com/profile')
+  // Why: normalize before the fallback chains, not after — a blank tokens.account_id
+  // must fall through to the JWT claims rather than ending the chain on an empty string.
+  const tokenAccountId = normalizeField(
+    readStringClaim(tokens, 'account_id') ?? readStringClaim(tokens, 'accountId')
+  )
 
   return {
     email: normalizeField(
       readStringClaim(payload, 'email') ?? readStringClaim(profileClaims, 'email')
     ),
     providerAccountId: normalizeField(
-      readStringClaim(tokens, 'account_id') ??
-        readStringClaim(tokens, 'accountId') ??
+      tokenAccountId ??
         readStringClaim(authClaims, 'chatgpt_account_id') ??
         readStringClaim(payload, 'chatgpt_account_id')
     ),
+    workspaceLabel: normalizeField(
+      readStringClaim(authClaims, 'workspace_name') ??
+        readStringClaim(profileClaims, 'workspace_name')
+    ),
     workspaceAccountId: normalizeField(
       readStringClaim(authClaims, 'workspace_account_id') ??
-        readStringClaim(tokens, 'account_id') ??
-        readStringClaim(tokens, 'accountId') ??
+        tokenAccountId ??
         readStringClaim(payload, 'chatgpt_account_id')
     )
   }
@@ -274,8 +282,8 @@ function identityFieldMatches(selectedField: string | null, runtimeField: string
 // no identity claims (api key, PAT, bedrock) contradicts nothing. A ChatGPT
 // rename leaves the record email stale, so a matching account id outranks it.
 function identityContradictsSelection(
-  selected: CodexAuthIdentity,
-  identity: CodexAuthIdentity
+  selected: CodexAuthOwnershipIdentity,
+  identity: CodexAuthOwnershipIdentity
 ): boolean {
   if (
     identityFieldsConflict(selected.providerAccountId, identity.providerAccountId) ||
diff --git a/src/main/codex-accounts/codex-config-mirror.ts b/src/main/codex-accounts/codex-config-mirror.ts
new file mode 100644
index 00000000000..252ffb06d33
--- /dev/null
+++ b/src/main/codex-accounts/codex-config-mirror.ts
@@ -0,0 +1,134 @@
+import { existsSync, readFileSync } from 'node:fs'
+import { homedir } from 'node:os'
+import { join } from 'node:path'
+import { parseWslUncPath } from '../../shared/wsl-paths'
+import { syncSystemConfigIntoManagedCodexHome } from '../codex/codex-config-mirror'
+import { readCodexTopLevelModelProvider } from '../codex/codex-model-provider-config'
+import type { Store } from '../persistence'
+import { toWindowsWslPath } from '../wsl'
+
+export type CanonicalCodexConfig = {
+  contents: string
+  /** Host-readable source home; the mirror resolves WSL UNC paths to their Linux spelling. */
+  sourceHomePath: string
+  /** Preserve Linux path semantics when WSL $HOME is under /mnt/<drive>. */
+  sourceConfigDir?: string
+}
+
+export class CodexConfigMirror {
+  constructor(
+    private readonly store: Store,
+    private readonly assertManagedHomePath: (
+      candidatePath: string,
+      expectedAccountId?: string
+    ) => string
+  ) {}
+
+  safeSyncToManagedHomes(): void {
+    try {
+      this.syncToManagedHomes()
+    } catch (error) {
+      console.warn('[codex-accounts] Failed to sync canonical config:', error)
+    }
+  }
+
+  safeSyncIntoManagedHome(
+    managedHomePath: string,
+    canonicalConfig?: CanonicalCodexConfig | null,
+    expectedAccountId?: string
+  ): void {
+    try {
+      this.syncIntoManagedHome(managedHomePath, canonicalConfig, expectedAccountId)
+    } catch (error) {
+      console.warn('[codex-accounts] Failed to seed managed config:', error)
+    }
+  }
+
+  readForManagedHome(managedHomePath: string): CanonicalCodexConfig | null {
+    const wslInfo = parseWslUncPath(managedHomePath)
+    if (!wslInfo) {
+      return this.readHostConfig()
+    }
+
+    const managedRootMarker = '/.local/share/orca/codex-accounts/'
+    const markerIndex = wslInfo.linuxPath.indexOf(managedRootMarker)
+    if (markerIndex === -1) {
+      return null
+    }
+    const wslHome = wslInfo.linuxPath.slice(0, markerIndex)
+    const configPath = toWindowsWslPath(`${wslHome}/.codex/config.toml`, wslInfo.distro)
+    if (!existsSync(configPath)) {
+      return null
+    }
+
+    try {
+      // Why: the config is read over UNC but consumed by Codex inside WSL, so
+      // path rewrites must anchor to the Linux-side ~/.codex, not the UNC path.
+      return {
+        contents: readFileSync(configPath, 'utf-8'),
+        sourceHomePath: toWindowsWslPath(`${wslHome}/.codex`, wslInfo.distro),
+        sourceConfigDir: `${wslHome}/.codex`
+      }
+    } catch (error) {
+      console.warn('[codex-accounts] Failed to read WSL canonical config:', error)
+      return null
+    }
+  }
+
+  assertOAuthAccountAddAllowed(canonicalConfig: CanonicalCodexConfig | null): void {
+    const modelProvider = canonicalConfig
+      ? readCodexTopLevelModelProvider(canonicalConfig.contents)
+      : null
+    if (!modelProvider || modelProvider === 'openai') {
+      return
+    }
+
+    // Why: mirroring a custom-provider pin into an OAuth managed home makes
+    // the new OAuth credentials inert; fail before login and leave user config intact.
+    throw new Error(
+      `Orca cannot add a Codex OAuth account while ~/.codex/config.toml pins the custom provider ${JSON.stringify(modelProvider)}. Keep using the system-default account for this provider, or remove model_provider (or set it to "openai") before adding an OAuth account. Orca left your config unchanged.`
+    )
+  }
+
+  private syncToManagedHomes(): void {
+    for (const account of this.store.getSettings().codexManagedAccounts) {
+      try {
+        this.syncIntoManagedHome(account.managedHomePath, undefined, account.id)
+      } catch (error) {
+        console.warn('[codex-accounts] Failed to sync managed config:', error)
+      }
+    }
+  }
+
+  private syncIntoManagedHome(
+    managedHomePath: string,
+    canonicalConfig = this.readForManagedHome(managedHomePath),
+    expectedAccountId?: string
+  ): void {
+    if (canonicalConfig === null) {
+      return
+    }
+    const trustedManagedHomePath = this.assertManagedHomePath(managedHomePath, expectedAccountId)
+    // Why: every account home is Codex's own CODEX_HOME. Preserve trust Codex
+    // granted there while refreshing ordinary settings from the lane's source.
+    syncSystemConfigIntoManagedCodexHome({
+      runtimeHomePath: trustedManagedHomePath,
+      systemHomePath: canonicalConfig.sourceHomePath,
+      systemConfigDir: canonicalConfig.sourceConfigDir
+    })
+  }
+
+  private readHostConfig(): CanonicalCodexConfig | null {
+    const sourceHomePath = join(homedir(), '.codex')
+    const primaryConfigPath = join(sourceHomePath, 'config.toml')
+    if (!existsSync(primaryConfigPath)) {
+      return null
+    }
+    try {
+      return { contents: readFileSync(primaryConfigPath, 'utf-8'), sourceHomePath }
+    } catch (error) {
+      console.warn('[codex-accounts] Failed to read canonical config:', error)
+      return null
+    }
+  }
+}
diff --git a/src/main/codex-accounts/codex-login-session.ts b/src/main/codex-accounts/codex-login-session.ts
new file mode 100644
index 00000000000..6df83c05e18
--- /dev/null
+++ b/src/main/codex-accounts/codex-login-session.ts
@@ -0,0 +1,281 @@
+import { readFileSync } from 'node:fs'
+import { join } from 'node:path'
+import type { WindowsHostInteractiveLoginSpawn } from '../../shared/windows-interactive-login-spawn'
+import { buildWindowsHostInteractiveLoginSpawn } from '../../shared/windows-interactive-login-spawn'
+import { withCliRuntimeOnPath } from '../../shared/node-cli-command-resolution'
+import { parseWslUncPath } from '../../shared/wsl-paths'
+import { resolveCodexCommand } from '../codex-cli/command'
+import { getSpawnArgsForWindows } from '../win32-utils'
+import { runWslProcess } from '../wsl/wsl-runner'
+import {
+  buildWslCodexAvailabilityScript,
+  buildWslCodexLoginArgs,
+  WSL_CODEX_AVAILABILITY_TIMEOUT_MS
+} from './wsl-codex-command'
+
+const LOGIN_TIMEOUT_MS = 120_000
+const MAX_LOGIN_OUTPUT_CHARS = 4_000
+const WINDOWS_LOGIN_AUTH_POLL_INTERVAL_MS = 500
+const WINDOWS_LOGIN_POST_AUTH_EXIT_GRACE_MS = 5_000
+
+type LoginOutputStream = {
+  on(event: 'data', listener: (chunk: Buffer) => void): unknown
+  off(event: 'data', listener: (chunk: Buffer) => void): unknown
+}
+
+export type CodexLoginChild = {
+  stdout: LoginOutputStream | null
+  stderr: LoginOutputStream | null
+  pid?: number
+  exitCode: number | null
+  signalCode: string | null
+  kill(): boolean
+  on(event: 'error', listener: (error: Error) => void): unknown
+  on(event: 'close', listener: (code: number | null) => void): unknown
+  off(event: 'error', listener: (error: Error) => void): unknown
+  off(event: 'close', listener: (code: number | null) => void): unknown
+}
+
+export type CodexLoginSpawnRequest = {
+  command: string
+  args: string[]
+  env: NodeJS.ProcessEnv
+  stdio: WindowsHostInteractiveLoginSpawn['stdio'] | ['ignore', 'pipe', 'pipe']
+}
+
+type CodexLoginSessionDependencies = {
+  wslCommand: string
+  spawn: (request: CodexLoginSpawnRequest) => CodexLoginChild
+  killProcessTree: (
+    child: CodexLoginChild,
+    interactiveLogin?: WindowsHostInteractiveLoginSpawn | null
+  ) => void
+}
+
+function readLoginAuthSnapshot(authJsonPath: string): string | null | undefined {
+  try {
+    return readFileSync(authJsonPath, 'utf-8')
+  } catch (error) {
+    const code = (error as NodeJS.ErrnoException).code
+    if (code === 'ENOENT' || code === 'ENOTDIR') {
+      return null
+    }
+    // Why: codex can atomically replace auth.json while the poll runs; a later
+    // poll will observe the stable credential. An unreadable initial file must
+    // disable the shortcut rather than look like a fresh login.
+    return undefined
+  }
+}
+
+function loginAuthChanged(
+  initial: string | null | undefined,
+  current: string | null | undefined
+): boolean {
+  // Why: metadata-only touches can happen before OAuth finishes. Requiring new
+  // credential bytes prevents reauthentication from being killed prematurely.
+  return initial !== undefined && current !== undefined && current !== null && current !== initial
+}
+
+export async function runCodexLoginSession(
+  managedHomePath: string,
+  dependencies: CodexLoginSessionDependencies
+): Promise<void> {
+  const wslInfo = parseWslUncPath(managedHomePath)
+  if (wslInfo) {
+    await assertWslCodexCliAvailable(wslInfo)
+  }
+  // Why: reauthentication starts with an existing auth.json. Only new auth
+  // bytes prove this login completed; existence alone would kill the
+  // Windows OAuth flow five seconds after it opened.
+  const initialAuthSnapshot = wslInfo
+    ? null
+    : readLoginAuthSnapshot(join(managedHomePath, 'auth.json'))
+
+  await new Promise<void>((resolvePromise, rejectPromise) => {
+    const spawnConfig = wslInfo
+      ? {
+          command: dependencies.wslCommand,
+          args: buildWslCodexLoginArgs(wslInfo.distro, wslInfo.linuxPath),
+          env: process.env,
+          codexCommand: 'codex',
+          interactiveLogin: null
+        }
+      : createHostLoginSpawn(managedHomePath)
+    const child = dependencies.spawn({
+      command: spawnConfig.command,
+      args: spawnConfig.args,
+      env: spawnConfig.env,
+      stdio: spawnConfig.interactiveLogin
+        ? spawnConfig.interactiveLogin.stdio
+        : ['ignore', 'pipe', 'pipe']
+    })
+
+    let settled = false
+    let output = ''
+    const appendOutput = (chunk: Buffer): void => {
+      output = `${output}${chunk.toString()}`
+      if (output.length > MAX_LOGIN_OUTPUT_CHARS) {
+        output = output.slice(-MAX_LOGIN_OUTPUT_CHARS)
+      }
+    }
+
+    let timeout: ReturnType<typeof setTimeout> | null = null
+    let authWatchInterval: ReturnType<typeof setInterval> | null = null
+    let postAuthExitTimeout: ReturnType<typeof setTimeout> | null = null
+    let loginTreeKilledAfterAuth = false
+    const authJsonPath = join(managedHomePath, 'auth.json')
+    const cleanupListeners = (): void => {
+      if (timeout) {
+        clearTimeout(timeout)
+        timeout = null
+      }
+      if (authWatchInterval) {
+        clearInterval(authWatchInterval)
+        authWatchInterval = null
+      }
+      if (postAuthExitTimeout) {
+        clearTimeout(postAuthExitTimeout)
+        postAuthExitTimeout = null
+      }
+      child.stdout?.off('data', appendOutput)
+      child.stderr?.off('data', appendOutput)
+      child.off('error', onError)
+      child.off('close', onClose)
+      spawnConfig.interactiveLogin?.cleanup?.()
+    }
+
+    const settle = (callback: () => void): void => {
+      if (settled) {
+        return
+      }
+      settled = true
+      cleanupListeners()
+      callback()
+    }
+
+    const timeoutError = new Error('Codex sign-in took too long to finish. Please try again.')
+    timeout = setTimeout(() => {
+      dependencies.killProcessTree(child, spawnConfig.interactiveLogin)
+      settle(() => rejectPromise(timeoutError))
+    }, LOGIN_TIMEOUT_MS)
+
+    // Why: on Windows the codex login CLI can linger after writing auth.json,
+    // and its open handles on the managed home (log/codex-login.log) make the
+    // post-login file operations fail with ENOTEMPTY. Once auth.json exists,
+    // give the tree a short grace period to exit, then force it down.
+    if (process.platform === 'win32' && !wslInfo) {
+      authWatchInterval = setInterval(() => {
+        if (!loginAuthChanged(initialAuthSnapshot, readLoginAuthSnapshot(authJsonPath))) {
+          return
+        }
+        if (authWatchInterval) {
+          clearInterval(authWatchInterval)
+          authWatchInterval = null
+        }
+        postAuthExitTimeout = setTimeout(() => {
+          loginTreeKilledAfterAuth = true
+          dependencies.killProcessTree(child, spawnConfig.interactiveLogin)
+        }, WINDOWS_LOGIN_POST_AUTH_EXIT_GRACE_MS)
+      }, WINDOWS_LOGIN_AUTH_POLL_INTERVAL_MS)
+    }
+
+    const onError = (error: Error): void => {
+      settle(() => {
+        const isEnoent = (error as NodeJS.ErrnoException).code === 'ENOENT'
+        // Why: ENOENT is ambiguous — missing codex binary or missing node in PATH; a resolved full path implies node is missing.
+        const isBareCommand = spawnConfig.codexCommand === 'codex'
+        const message = isEnoent
+          ? isBareCommand
+            ? 'Codex CLI not found.'
+            : 'Codex CLI found but could not run — Node.js may not be in your PATH.'
+          : error.message
+        rejectPromise(new Error(message))
+      })
+    }
+
+    const onClose = (code: number | null): void => {
+      settle(() => {
+        // Why: the post-auth tree kill is a success path — auth.json already
+        // exists and codex only failed to exit on its own, so the forced
+        // non-zero exit must not surface as a login failure.
+        // Why: the kill only arms after the watcher observed new credential
+        // bytes, so an unreadable auth.json here is a lock, not a failed login.
+        // Only a definitive absence may revoke that verdict — reading a lock as
+        // failure sends the caller's rollback at a home that just authenticated.
+        if (
+          code === 0 ||
+          (loginTreeKilledAfterAuth && readLoginAuthSnapshot(authJsonPath) !== null)
+        ) {
+          resolvePromise()
+          return
+        }
+        const trimmedOutput = output.trim()
+        rejectPromise(
+          new Error(
+            trimmedOutput
+              ? `Codex login failed: ${trimmedOutput}`
+              : `Codex login exited with code ${code ?? 'unknown'}.`
+          )
+        )
+      })
+    }
+
+    child.stdout?.on('data', appendOutput)
+    child.stderr?.on('data', appendOutput)
+    child.on('error', onError)
+    child.on('close', onClose)
+  })
+}
+
+function createHostLoginSpawn(managedHomePath: string): {
+  command: string
+  args: string[]
+  env: NodeJS.ProcessEnv
+  codexCommand: string
+  interactiveLogin: WindowsHostInteractiveLoginSpawn | null
+} {
+  const codexCommand = resolveCodexCommand()
+  // Why: Windows host login needs a real console; otherwise inherit/hide
+  // leaves the child unable to read a paste-code / device-auth prompt.
+  const interactiveLogin =
+    process.platform === 'win32'
+      ? buildWindowsHostInteractiveLoginSpawn(codexCommand, ['login'])
+      : null
+  const { spawnCmd, spawnArgs } = interactiveLogin
+    ? { spawnCmd: interactiveLogin.command, spawnArgs: interactiveLogin.args }
+    : getSpawnArgsForWindows(codexCommand, ['login'])
+  return {
+    command: spawnCmd,
+    args: spawnArgs,
+    env: withCliRuntimeOnPath(codexCommand, { ...process.env, CODEX_HOME: managedHomePath }),
+    codexCommand,
+    interactiveLogin
+  }
+}
+
+async function assertWslCodexCliAvailable(wslInfo: {
+  distro: string
+  linuxPath: string
+}): Promise<void> {
+  // This is a PATH lookup, so it needs the login PATH: an nvm-installed codex
+  // lives nowhere else. Marking it 'none' reports a working install as absent.
+  const result = await runWslProcess({
+    distro: wslInfo.distro,
+    loginPath: 'preferred',
+    script: buildWslCodexAvailabilityScript(),
+    // POSIX command lookup; declared because the payload is opaque here.
+    shell: 'sh',
+    timeoutMs: WSL_CODEX_AVAILABILITY_TIMEOUT_MS
+  })
+  if (result.code !== 0 && !result.environmentResolved) {
+    // A miss without the login PATH is "we could not check", not "not
+    // installed" -- claiming absence here is #9725.
+    throw new Error('Could not check the Codex CLI in WSL. Try again.')
+  }
+  if (result.code !== 0 || result.timedOut) {
+    throw new Error(
+      `Codex CLI is not available in WSL ${wslInfo.distro}. Install Codex in that distro or switch Account location to Windows.`,
+      { cause: new Error(result.stderr.trim() || `codex lookup exited with ${result.code}`) }
+    )
+  }
+}
diff --git a/src/main/codex-accounts/codex-managed-home-lifecycle.ts b/src/main/codex-accounts/codex-managed-home-lifecycle.ts
new file mode 100644
index 00000000000..b86a65762a1
--- /dev/null
+++ b/src/main/codex-accounts/codex-managed-home-lifecycle.ts
@@ -0,0 +1,225 @@
+import { mkdirSync, readFileSync, realpathSync, rmSync, writeFileSync } from 'node:fs'
+import { dirname, join, resolve, sep } from 'node:path'
+import { isDefinitiveAbsence } from '../../shared/definitive-filesystem-absence'
+import { quotePosixShell } from '../../shared/wsl-login-shell-command'
+import { parseWslUncPath } from '../../shared/wsl-paths'
+import { toWindowsWslPath } from '../wsl'
+import { runWslProcess } from '../wsl/wsl-runner'
+import type { CodexAccountAddTarget, ManagedCodexHomeLocation } from './codex-account-service-types'
+import { writeFileAtomically } from './fs-utils'
+import { ManagedCodexHomeTemporarilyUnavailableError } from './host-codex-managed-home-ownership'
+import type { CodexManagedHomePath } from './codex-managed-home-path'
+
+// Why: mirrors the Windows rm retry policy in local-worktree-filesystem — a
+// just-terminated codex login can briefly keep handles inside a managed home.
+const WINDOWS_RM_MAX_RETRIES = 8
+const WINDOWS_RM_RETRY_DELAY_MS = 150
+const WSL_MANAGED_HOME_TIMEOUT_MS = 5_000
+
+function removeManagedHomeTreeSync(targetPath: string): void {
+  // Why: codex login descendants can briefly keep Windows handles on files in
+  // the managed home (e.g. log/codex-login.log); bounded retries absorb the
+  // transient lock instead of failing with ENOTEMPTY and orphaning the home.
+  rmSync(targetPath, {
+    recursive: true,
+    force: true,
+    maxRetries: WINDOWS_RM_MAX_RETRIES,
+    retryDelay: WINDOWS_RM_RETRY_DELAY_MS
+  })
+}
+
+export class CodexManagedHomeLifecycle {
+  constructor(private readonly paths: CodexManagedHomePath) {}
+
+  async create(
+    accountId: string,
+    target?: CodexAccountAddTarget
+  ): Promise<ManagedCodexHomeLocation> {
+    const wslHome = await this.tryCreateWslHome(accountId, target)
+    if (wslHome) {
+      return wslHome
+    }
+
+    const managedHomePath = join(this.paths.getRoot(), accountId, 'home')
+    mkdirSync(managedHomePath, { recursive: true })
+    // Why: marker lets future cleanup prove the path belongs to Orca before deleting anything.
+    writeFileSync(join(managedHomePath, '.orca-managed-home'), `${accountId}\n`, 'utf-8')
+    return {
+      managedHomePath: this.paths.assert(managedHomePath, accountId),
+      managedHomeRuntime: 'host',
+      wslDistro: null,
+      wslLinuxHomePath: null
+    }
+  }
+
+  // Why: copy the auth.json from an already-authenticated CODEX_HOME (e.g. a temp
+  // dir the CLI ran `codex login` into) into the managed home. Mirrors the login
+  // step of doAddAccount without spawning an interactive browser flow.
+  importAuthFromHome(sourceHome: string, managedHomePath: string, accountId: string): void {
+    const trimmed = sourceHome.trim()
+    if (!trimmed) {
+      throw new Error('A Codex home directory path is required.')
+    }
+    const resolvedSourceHome = resolve(trimmed)
+    let sourceAuthContents: string
+    try {
+      sourceAuthContents = readFileSync(join(resolvedSourceHome, 'auth.json'), 'utf-8')
+    } catch (error) {
+      // Why: "no credentials here, run codex login" is only true for a definitive
+      // absence. A locked source file used to produce that advice, which sends the
+      // user to re-run a login they had already completed.
+      if (!isDefinitiveAbsence(error)) {
+        throw new ManagedCodexHomeTemporarilyUnavailableError(undefined, { cause: error })
+      }
+      throw new Error(
+        `No Codex credentials found in ${resolvedSourceHome}. Run \`codex login\` into this directory first.`
+      )
+    }
+    const trustedHome = this.paths.assert(managedHomePath, accountId)
+    writeFileAtomically(join(trustedHome, 'auth.json'), sourceAuthContents, { mode: 0o600 })
+  }
+
+  /**
+   * Rollback deletes the managed home, so it may only run on a *proven* failure.
+   * An unreadable credential file means the login may well have succeeded, and a
+   * kept home is a recoverable leak where a deleted one is permanent data loss.
+   */
+  removeUnlessUnproven(error: unknown, managedHomePath: string, accountId: string): void {
+    if (error instanceof ManagedCodexHomeTemporarilyUnavailableError) {
+      return
+    }
+    this.safeRemove(managedHomePath, accountId)
+  }
+
+  safeRemove(candidatePath: string, expectedAccountId: string): void {
+    let managedHomePath: string
+    try {
+      managedHomePath = this.paths.assert(candidatePath, expectedAccountId)
+    } catch (error) {
+      console.warn('[codex-accounts] Refusing to remove untrusted managed home:', error)
+      return
+    }
+
+    try {
+      removeManagedHomeTreeSync(managedHomePath)
+    } catch (error) {
+      // Why: this runs from error-cleanup paths; a still-held Windows handle
+      // must not mask the original failure with an ENOTEMPTY from rmSync.
+      console.warn('[codex-accounts] Failed to remove managed home:', error)
+      return
+    }
+
+    if (parseWslUncPath(managedHomePath)) {
+      try {
+        removeManagedHomeTreeSync(dirname(managedHomePath))
+      } catch {
+        // Best-effort cleanup
+      }
+      return
+    }
+
+    // Why: homes live at <accounts-root>/<uuid>/home; removing the home/ leaf leaves an empty <uuid>/ behind.
+    try {
+      const parentDir = resolve(managedHomePath, '..')
+      // Why: canonicalize the root too so the prefix check works on macOS where userData resolves through /private/var.
+      const root = realpathSync(this.paths.getRoot())
+      if (parentDir.startsWith(root + sep) && parentDir !== root) {
+        removeManagedHomeTreeSync(parentDir)
+      }
+    } catch {
+      // Best-effort cleanup
+    }
+  }
+
+  private async tryCreateWslHome(
+    accountId: string,
+    target?: CodexAccountAddTarget
+  ): Promise<ManagedCodexHomeLocation | null> {
+    if (process.platform !== 'win32' || target?.runtime !== 'wsl') {
+      return null
+    }
+    const requestedDistro = target.wslDistro?.trim() || undefined
+    const info = await runWslProcess({
+      distro: requestedDistro,
+      loginPath: 'none',
+      script: 'printf "%s\\n%s\\n" "$WSL_DISTRO_NAME" "$HOME"',
+      shell: 'bash',
+      timeoutMs: WSL_MANAGED_HOME_TIMEOUT_MS
+    })
+    if (info.code !== 0 || info.timedOut) {
+      throw new Error('Could not resolve the active WSL home directory for Codex login.')
+    }
+    const [rawDistro, rawHome] = info.stdout
+      .replaceAll(String.fromCharCode(0), '')
+      .split(/\r?\n/)
+      .map((line) => line.trim())
+    const distro = requestedDistro || rawDistro
+    const home = rawHome
+    if (!distro || !home?.startsWith('/')) {
+      throw new Error('Could not resolve the active WSL home directory for Codex login.')
+    }
+
+    const linuxPath = `${home.replace(/\/$/, '')}/.local/share/orca/codex-accounts/${accountId}/home`
+    const markerPath = `${linuxPath}/.orca-managed-home`
+    const created = await runWslProcess({
+      distro,
+      loginPath: 'none',
+      script: `mkdir -p ${quotePosixShell(linuxPath)} && printf '%s\\n' ${quotePosixShell(accountId)} > ${quotePosixShell(markerPath)}`,
+      shell: 'bash',
+      timeoutMs: WSL_MANAGED_HOME_TIMEOUT_MS
+    })
+    if (created.code !== 0 || created.timedOut) {
+      throw new Error('Could not create the managed Codex home inside WSL.')
+    }
+
+    const managedHomePath = toWindowsWslPath(linuxPath, distro)
+    try {
+      return {
+        managedHomePath: this.paths.assert(managedHomePath, accountId),
+        managedHomeRuntime: 'wsl',
+        wslDistro: distro,
+        wslLinuxHomePath: linuxPath
+      }
+    } catch (error) {
+      await this.safeRemoveWslCandidate(distro, linuxPath, accountId)
+      throw error
+    }
+  }
+
+  private async safeRemoveWslCandidate(
+    distro: string,
+    linuxHomePath: string,
+    expectedAccountId: string
+  ): Promise<void> {
+    // Why: creation can fail after mkdir/marker but before trust, so cleanup must verify the marker/account ID inside WSL.
+    try {
+      const result = await runWslProcess({
+        distro,
+        loginPath: 'none',
+        script: [
+          'set -euo pipefail',
+          `candidate=${quotePosixShell(linuxHomePath)}`,
+          `expected_marker=${quotePosixShell(expectedAccountId)}`,
+          'managed_root="${HOME%/}/.local/share/orca/codex-accounts"',
+          'candidate_real=$(readlink -f -- "$candidate" 2>/dev/null || true)',
+          'managed_root_real=$(readlink -f -- "$managed_root" 2>/dev/null || true)',
+          'test -n "$candidate_real"',
+          'test -n "$managed_root_real"',
+          'case "$candidate_real" in "$managed_root_real"/*/home) ;; *) exit 0 ;; esac',
+          'test -f "$candidate_real/.orca-managed-home"',
+          'test "$(cat "$candidate_real/.orca-managed-home")" = "$expected_marker"',
+          'rm -rf -- "$candidate_real"',
+          'parent_dir=$(dirname -- "$candidate_real")',
+          'case "$parent_dir" in "$managed_root_real"/*) rmdir -- "$parent_dir" 2>/dev/null || true ;; esac'
+        ].join('\n'),
+        shell: 'bash',
+        timeoutMs: WSL_MANAGED_HOME_TIMEOUT_MS
+      })
+      if (result.code !== 0 || result.timedOut) {
+        throw new Error(`WSL cleanup exited with ${result.timedOut ? 'a timeout' : result.code}`)
+      }
+    } catch (error) {
+      console.warn('[codex-accounts] Failed to clean up WSL managed home candidate:', error)
+    }
+  }
+}
diff --git a/src/main/codex-accounts/codex-managed-home-path.ts b/src/main/codex-accounts/codex-managed-home-path.ts
new file mode 100644
index 00000000000..012ef943aa4
--- /dev/null
+++ b/src/main/codex-accounts/codex-managed-home-path.ts
@@ -0,0 +1,200 @@
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs'
+import { join, resolve } from 'node:path'
+import { app } from 'electron'
+import { quotePosixShell } from '../../shared/wsl-login-shell-command'
+import { parseWslUncPath } from '../../shared/wsl-paths'
+import type { CodexManagedAccount } from '../../shared/managed-account-types'
+import { getSystemCodexHomePath } from '../codex/codex-home-paths'
+import { toWindowsWslPath } from '../wsl'
+import { runWslProcess } from '../wsl/wsl-runner'
+import { assertOwnedHostCodexManagedHomePath } from './host-codex-managed-home-ownership'
+
+const WSL_MANAGED_HOME_TIMEOUT_MS = 5_000
+
+export class CodexManagedHomePath {
+  constructor(private readonly validateWslPath: (distro: string, script: string) => string) {}
+
+  getRoot(): string {
+    const root = join(app.getPath('userData'), 'codex-accounts')
+    mkdirSync(root, { recursive: true })
+    return root
+  }
+
+  assertHostOwnership(candidatePath: string, expectedAccountId: string): string {
+    return assertOwnedHostCodexManagedHomePath({
+      candidatePath,
+      managedAccountsRoot: join(app.getPath('userData'), 'codex-accounts'),
+      systemCodexHomePath: getSystemCodexHomePath(),
+      expectedAccountId
+    })
+  }
+
+  async ensureForReauthentication(account: CodexManagedAccount): Promise<string> {
+    const wslInfo = parseWslUncPath(account.managedHomePath)
+    if (wslInfo && process.platform === 'win32') {
+      await this.ensureExpectedWslHome(account, wslInfo)
+      return this.assert(account.managedHomePath, account.id)
+    }
+
+    try {
+      return this.assert(account.managedHomePath, account.id)
+    } catch (error) {
+      if (!this.isMissingHomeError(error)) {
+        throw error
+      }
+      return this.recreateExpectedHostHome(account, error)
+    }
+  }
+
+  assert(candidatePath: string, expectedAccountId?: string): string {
+    const wslInfo = parseWslUncPath(candidatePath)
+    if (!wslInfo) {
+      return assertOwnedHostCodexManagedHomePath({
+        candidatePath,
+        managedAccountsRoot: this.getRoot(),
+        systemCodexHomePath: getSystemCodexHomePath(),
+        expectedAccountId
+      })
+    }
+    if (
+      !wslInfo.linuxPath.includes('/.local/share/orca/codex-accounts/') ||
+      !wslInfo.linuxPath.endsWith('/home')
+    ) {
+      throw new Error('Managed WSL Codex home is outside Orca account storage.')
+    }
+    if (
+      expectedAccountId !== undefined &&
+      !wslInfo.linuxPath.endsWith(`/.local/share/orca/codex-accounts/${expectedAccountId}/home`)
+    ) {
+      throw new Error('Managed WSL Codex home does not match its persisted account ID.')
+    }
+    if (process.platform === 'win32') {
+      return this.assertWindowsWslPath(wslInfo, expectedAccountId)
+    }
+    return this.assertMountedWslPath(candidatePath, wslInfo.linuxPath, expectedAccountId)
+  }
+
+  private recreateExpectedHostHome(account: CodexManagedAccount, originalError: unknown): string {
+    const expectedPath = join(this.getRoot(), account.id, 'home')
+    if (!this.pathsEqual(account.managedHomePath, expectedPath)) {
+      throw originalError
+    }
+    // Why: re-auth may recreate a lost empty home, but only at the exact Orca-owned path persisted for this account.
+    mkdirSync(expectedPath, { recursive: true })
+    writeFileSync(join(expectedPath, '.orca-managed-home'), `${account.id}\n`, 'utf-8')
+    return this.assert(expectedPath, account.id)
+  }
+
+  private async ensureExpectedWslHome(
+    account: CodexManagedAccount,
+    wslInfo: { distro: string; linuxPath: string }
+  ): Promise<void> {
+    if (
+      account.managedHomeRuntime !== 'wsl' ||
+      account.wslDistro !== wslInfo.distro ||
+      account.wslLinuxHomePath !== wslInfo.linuxPath ||
+      !wslInfo.linuxPath.endsWith(`/.local/share/orca/codex-accounts/${account.id}/home`)
+    ) {
+      return
+    }
+    const result = await runWslProcess({
+      distro: wslInfo.distro,
+      loginPath: 'none',
+      script: [
+        'set -euo pipefail',
+        `candidate=${quotePosixShell(wslInfo.linuxPath)}`,
+        `expected_marker=${quotePosixShell(account.id)}`,
+        'marker="$candidate/.orca-managed-home"',
+        'if [ -e "$candidate" ] && [ ! -f "$marker" ]; then exit 41; fi',
+        'if [ -f "$marker" ] && [ "$(cat "$marker")" != "$expected_marker" ]; then exit 42; fi',
+        'mkdir -p -- "$candidate"',
+        'printf "%s\\n" "$expected_marker" > "$marker"'
+      ].join('\n'),
+      shell: 'bash',
+      timeoutMs: WSL_MANAGED_HOME_TIMEOUT_MS
+    })
+    // Why: 41/42 mean the path is not this account's home; re-auth must refuse
+    // rather than write credentials into someone else's directory.
+    if (result.code !== 0 || result.timedOut) {
+      throw new Error(
+        `Could not prepare the managed Codex home in WSL ${wslInfo.distro} for re-authentication.`
+      )
+    }
+  }
+
+  private assertWindowsWslPath(
+    wslInfo: { distro: string; linuxPath: string },
+    expectedAccountId?: string
+  ): string {
+    try {
+      const canonicalLinuxPath = this.validateWslPath(
+        wslInfo.distro,
+        [
+          'set -euo pipefail',
+          `candidate=${quotePosixShell(wslInfo.linuxPath)}`,
+          'managed_root="${HOME%/}/.local/share/orca/codex-accounts"',
+          'candidate_real=$(readlink -f -- "$candidate")',
+          'managed_root_real=$(readlink -f -- "$managed_root")',
+          'test -f "$candidate_real/.orca-managed-home"',
+          ...(expectedAccountId === undefined
+            ? [
+                'case "$candidate_real" in "$managed_root_real"/*/home) printf "%s\\n" "$candidate_real" ;; *) exit 35 ;; esac'
+              ]
+            : [
+                `expected_marker=${quotePosixShell(expectedAccountId)}`,
+                'test "$candidate_real" = "$managed_root_real/$expected_marker/home"',
+                'test "$(cat "$candidate_real/.orca-managed-home")" = "$expected_marker"',
+                'printf "%s\\n" "$candidate_real"'
+              ])
+        ].join('\n')
+      ).trim()
+      if (!canonicalLinuxPath) {
+        throw new Error('Managed Codex home directory does not exist on disk.')
+      }
+      return toWindowsWslPath(canonicalLinuxPath, wslInfo.distro)
+    } catch (error) {
+      throw new Error('Managed WSL Codex home is outside Orca account storage.', {
+        cause: error
+      })
+    }
+  }
+
+  private assertMountedWslPath(
+    candidatePath: string,
+    linuxPath: string,
+    expectedAccountId?: string
+  ): string {
+    if (linuxPath.split('/').includes('..')) {
+      throw new Error('Managed WSL Codex home is outside Orca account storage.')
+    }
+    if (!existsSync(candidatePath)) {
+      throw new Error('Managed Codex home directory does not exist on disk.')
+    }
+    const markerPath = join(candidatePath, '.orca-managed-home')
+    if (!existsSync(markerPath)) {
+      throw new Error('Managed Codex home is missing Orca ownership marker.')
+    }
+    if (
+      expectedAccountId !== undefined &&
+      readFileSync(markerPath, 'utf-8').trim() !== expectedAccountId
+    ) {
+      throw new Error('Managed WSL Codex home ownership marker does not match its account ID.')
+    }
+    return candidatePath
+  }
+
+  private isMissingHomeError(error: unknown): boolean {
+    return (
+      error instanceof Error &&
+      error.message === 'Managed Codex home directory does not exist on disk.'
+    )
+  }
+
+  private pathsEqual(left: string, right: string): boolean {
+    const resolvedLeft = resolve(left)
+    const resolvedRight = resolve(right)
+    return process.platform === 'win32'
+      ? resolvedLeft.toLowerCase() === resolvedRight.toLowerCase()
+      : resolvedLeft === resolvedRight
+  }
+}
diff --git a/src/main/codex-accounts/codex-reset-credit-coordinator.ts b/src/main/codex-accounts/codex-reset-credit-coordinator.ts
new file mode 100644
index 00000000000..5d6233d46eb
--- /dev/null
+++ b/src/main/codex-accounts/codex-reset-credit-coordinator.ts
@@ -0,0 +1,248 @@
+import { randomUUID } from 'node:crypto'
+import type {
+  CodexManagedAccount,
+  CodexManagedAccountSummary,
+  CodexRateLimitAccountsState
+} from '../../shared/managed-account-types'
+import {
+  buildCodexResetCreditExpectedScope,
+  type CodexResetCreditExpectedScope
+} from '../../shared/codex-reset-credit-scope'
+import type {
+  CodexRateLimitResetResult,
+  RateLimitState,
+  RateLimitRuntimeTarget
+} from '../../shared/rate-limit-types'
+import type { Store } from '../persistence'
+import type { RateLimitService } from '../rate-limits/service'
+import type { CodexRuntimeHomeService } from './runtime-home-service'
+import { getSelectedCodexAccountIdForTarget } from './runtime-selection'
+import { ManagedCodexHomeTemporarilyUnavailableError } from './host-codex-managed-home-ownership'
+import type {
+  CodexResetCreditConsumeResult,
+  CodexResetCreditConsumedResult
+} from './codex-account-service-types'
+import type { CodexManagedHomePath } from './codex-managed-home-path'
+import {
+  CodexResetCreditLedger,
+  resetAccountScopeKey,
+  resetScopeKey,
+  type CodexResetCreditAttempt
+} from './codex-reset-credit-ledger'
+import {
+  CodexResetCreditScopeRejection,
+  validateCodexResetCreditScope,
+  type CodexResetCreditScopeValidation
+} from './codex-reset-credit-scope-validation'
+
+function sameTarget(left: RateLimitRuntimeTarget, right: RateLimitRuntimeTarget): boolean {
+  return left.runtime === right.runtime && left.wslDistro === right.wslDistro
+}
+
+type CodexResetCreditCoordinatorDependencies = {
+  store: Store
+  rateLimits: RateLimitService
+  runtimeHome: CodexRuntimeHomeService
+  managedHomePaths: CodexManagedHomePath
+  serializeMutation: <T>(operation: () => Promise<T>) => Promise<T>
+  getSnapshot: () => CodexRateLimitAccountsState
+  toSummary: (account: CodexManagedAccount) => CodexManagedAccountSummary
+}
+
+export class CodexResetCreditCoordinator {
+  private readonly ledger: CodexResetCreditLedger
+
+  constructor(private readonly dependencies: CodexResetCreditCoordinatorDependencies) {
+    this.ledger = new CodexResetCreditLedger(dependencies.store)
+  }
+
+  consume(
+    idempotencyKey: string,
+    expectedScope: CodexResetCreditExpectedScope
+  ): Promise<CodexResetCreditConsumeResult> {
+    if (this.ledger.error) {
+      return Promise.reject(this.ledger.error)
+    }
+    const scopeKey = resetScopeKey(expectedScope)
+    const accountScopeKey = resetAccountScopeKey(expectedScope)
+    const existing = this.ledger.get(idempotencyKey)
+    if (existing) {
+      if (existing.scopeKey !== scopeKey) {
+        return Promise.reject(new Error('That idempotency key belongs to a different reset scope.'))
+      }
+      if (existing.state === 'settled' && existing.settledOutcome) {
+        return this.dependencies.serializeMutation(async () => {
+          const { rateLimits } = this.validateScope(expectedScope, { kind: 'settledReplay' })
+          return {
+            outcome: existing.settledOutcome!,
+            scope: existing.expectedScope,
+            codex: this.dependencies.getSnapshot(),
+            rateLimits
+          }
+        })
+      }
+      if (existing.promise) {
+        return existing.promise as Promise<CodexResetCreditConsumeResult>
+      }
+      return this.startAttempt(idempotencyKey, expectedScope, existing)
+    }
+
+    const unresolvedKey = this.ledger.getUnresolvedKey(accountScopeKey)
+    if (unresolvedKey && unresolvedKey !== idempotencyKey) {
+      return Promise.reject(
+        new Error('A previous reset attempt for this account still has an unknown outcome.')
+      )
+    }
+    const claimedKey = this.ledger.getClaimedKey(scopeKey)
+    if (claimedKey && claimedKey !== idempotencyKey) {
+      return Promise.reject(new Error('That reset-credit offer was already attempted.'))
+    }
+    return this.startAttempt(
+      idempotencyKey,
+      expectedScope,
+      this.ledger.createFresh(idempotencyKey, expectedScope)
+    )
+  }
+
+  async consumeCurrent(): Promise<CodexRateLimitResetResult> {
+    if (this.ledger.error) {
+      throw this.ledger.error
+    }
+    const initialRateLimits = this.dependencies.rateLimits.getState()
+    const initialTarget = { ...initialRateLimits.codexTarget }
+    const initialSettings = this.dependencies.store.getSettings()
+    const selectedAccountId = getSelectedCodexAccountIdForTarget(initialSettings, initialTarget)
+    if (selectedAccountId) {
+      const account = initialSettings.codexManagedAccounts.find(
+        (candidate) => candidate.id === selectedAccountId
+      )
+      const pendingAttempt = account
+        ? this.ledger.getPendingForAccount(initialTarget, account)
+        : null
+      const expectedScope =
+        pendingAttempt?.expectedScope ??
+        (account
+          ? buildCodexResetCreditExpectedScope({
+              target: initialTarget,
+              account: this.dependencies.toSummary(account),
+              limits: initialRateLimits.codex
+            })
+          : null)
+      if (!expectedScope) {
+        throw new Error('The managed Codex reset-credit offer is no longer available.')
+      }
+      // Why: do not enter the mutation queue first; the coordinator owns that
+      // queue and nested serialization would deadlock behind this operation.
+      const result = await this.consume(
+        pendingAttempt?.idempotencyKey ?? randomUUID(),
+        expectedScope
+      )
+      if ('status' in result) {
+        throw new Error('The Codex account or reset offer changed before reset.')
+      }
+      return { outcome: result.outcome, state: result.rateLimits }
+    }
+
+    return this.dependencies.serializeMutation(async () => {
+      if (this.ledger.error) {
+        throw this.ledger.error
+      }
+      const target = this.dependencies.rateLimits.getState().codexTarget
+      if (!sameTarget(target, initialTarget)) {
+        throw new Error('The active Codex rate-limit target changed before reset.')
+      }
+      if (getSelectedCodexAccountIdForTarget(this.dependencies.store.getSettings(), target)) {
+        throw new Error('The selected Codex account changed before reset.')
+      }
+      if (this.ledger.hasPendingForTarget(target)) {
+        throw new Error('A previous reset attempt for this target still has an unknown outcome.')
+      }
+      const homeResolution = this.dependencies.runtimeHome.prepareForRateLimitFetch(target)
+      // Why: reject before the provider mutation — a skip must never be spent
+      // against the system-default home (#STA-4422).
+      if (homeResolution.kind === 'skip') {
+        throw new ManagedCodexHomeTemporarilyUnavailableError()
+      }
+      return this.dependencies.rateLimits.consumeCodexRateLimitResetCredit({
+        idempotencyKey: randomUUID(),
+        target,
+        codexHomePath: homeResolution.codexHomePath
+      })
+    })
+  }
+
+  discardForRemovedAccount(accountId: string): void {
+    this.ledger.discardForRemovedAccount(accountId)
+  }
+
+  private startAttempt(
+    idempotencyKey: string,
+    expectedScope: CodexResetCreditExpectedScope,
+    attempt: CodexResetCreditAttempt
+  ): Promise<CodexResetCreditConsumeResult> {
+    const promise = this.dependencies.serializeMutation(
+      async (): Promise<CodexResetCreditConsumeResult> => {
+        const isFresh = attempt.state === 'fresh'
+        let validation: { managedHomePath: string; rateLimits: RateLimitState }
+        try {
+          validation = this.validateScope(expectedScope, {
+            kind: 'providerMutation',
+            requireCurrentOffer: isFresh
+          })
+        } catch (error) {
+          if (isFresh && error instanceof CodexResetCreditScopeRejection) {
+            this.ledger.releaseFresh(idempotencyKey, attempt)
+            return {
+              status: 'rejectedBeforeProvider',
+              retryDisposition: 'discardAttempt',
+              reason: error.reason,
+              scope: expectedScope,
+              codex: this.dependencies.getSnapshot(),
+              rateLimits: error.rateLimits
+            }
+          }
+          throw error
+        }
+        if (isFresh) {
+          this.ledger.markProviderPending(idempotencyKey, attempt)
+        }
+        const { outcome, state } =
+          await this.dependencies.rateLimits.consumeCodexRateLimitResetCredit({
+            idempotencyKey,
+            target: expectedScope.target,
+            codexHomePath: validation.managedHomePath
+          })
+        // Why: queued account selection may start as soon as this mutation resolves;
+        // capture both account selection and usage before releasing the queue.
+        const result: CodexResetCreditConsumedResult = {
+          outcome,
+          scope: expectedScope,
+          codex: this.dependencies.getSnapshot(),
+          rateLimits: state
+        }
+        this.ledger.markSettled(idempotencyKey, attempt, outcome)
+        return result
+      }
+    )
+    attempt.promise = promise
+    void promise.then(
+      () => {
+        attempt.promise = null
+      },
+      () => {
+        attempt.promise = null
+        if (attempt.state === 'fresh') {
+          this.ledger.releaseFresh(idempotencyKey, attempt)
+        }
+      }
+    )
+    return promise
+  }
+
+  private validateScope(
+    expectedScope: CodexResetCreditExpectedScope,
+    validation: CodexResetCreditScopeValidation
+  ): { managedHomePath: string; rateLimits: RateLimitState } {
+    return validateCodexResetCreditScope(expectedScope, validation, this.dependencies)
+  }
+}
diff --git a/src/main/codex-accounts/codex-reset-credit-ledger.ts b/src/main/codex-accounts/codex-reset-credit-ledger.ts
new file mode 100644
index 00000000000..625731f7d38
--- /dev/null
+++ b/src/main/codex-accounts/codex-reset-credit-ledger.ts
@@ -0,0 +1,227 @@
+import type { CodexManagedAccount } from '../../shared/managed-account-types'
+import type {
+  CodexResetCreditAttemptLedger,
+  DurableCodexResetCreditAttempt
+} from '../../shared/codex-reset-credit-attempt-ledger'
+import type { CodexResetCreditExpectedScope } from '../../shared/codex-reset-credit-scope'
+import type {
+  CodexRateLimitResetOutcome,
+  RateLimitRuntimeTarget
+} from '../../shared/rate-limit-types'
+import type { Store } from '../persistence'
+
+export type CodexResetCreditAttempt = {
+  expectedScope: CodexResetCreditExpectedScope
+  scopeKey: string
+  accountScopeKey: string
+  state: 'fresh' | 'providerPending' | 'settled'
+  promise: Promise<unknown> | null
+  settledOutcome: CodexRateLimitResetOutcome | null
+}
+
+export function resetScopeKey(scope: CodexResetCreditExpectedScope): string {
+  return JSON.stringify([
+    scope.target.runtime,
+    scope.target.wslDistro,
+    scope.accountId,
+    scope.accountRevision,
+    scope.offerRevision
+  ])
+}
+
+export function resetAccountScopeKey(
+  scope: Pick<CodexResetCreditExpectedScope, 'target' | 'accountId' | 'accountRevision'>
+): string {
+  return JSON.stringify([
+    scope.target.runtime,
+    scope.target.wslDistro,
+    scope.accountId,
+    scope.accountRevision
+  ])
+}
+
+export class CodexResetCreditLedger {
+  private readonly attemptsByKey = new Map<string, CodexResetCreditAttempt>()
+  private readonly attemptKeyByOffer = new Map<string, string>()
+  private readonly unresolvedKeyByAccountScope = new Map<string, string>()
+  private durableLedger: CodexResetCreditAttemptLedger | null = null
+  private loadError: Error | null = null
+
+  constructor(private readonly store: Store) {
+    this.hydrate()
+  }
+
+  get error(): Error | null {
+    return this.loadError
+  }
+
+  get(idempotencyKey: string): CodexResetCreditAttempt | undefined {
+    return this.attemptsByKey.get(idempotencyKey)
+  }
+
+  getUnresolvedKey(accountScopeKey: string): string | undefined {
+    return this.unresolvedKeyByAccountScope.get(accountScopeKey)
+  }
+
+  getClaimedKey(scopeKey: string): string | undefined {
+    return this.attemptKeyByOffer.get(scopeKey)
+  }
+
+  createFresh(
+    idempotencyKey: string,
+    expectedScope: CodexResetCreditExpectedScope
+  ): CodexResetCreditAttempt {
+    const attempt: CodexResetCreditAttempt = {
+      expectedScope,
+      scopeKey: resetScopeKey(expectedScope),
+      accountScopeKey: resetAccountScopeKey(expectedScope),
+      state: 'fresh',
+      promise: null,
+      settledOutcome: null
+    }
+    this.attemptsByKey.set(idempotencyKey, attempt)
+    this.attemptKeyByOffer.set(attempt.scopeKey, idempotencyKey)
+    return attempt
+  }
+
+  getPendingForAccount(
+    target: RateLimitRuntimeTarget,
+    account: CodexManagedAccount
+  ): { idempotencyKey: string; expectedScope: CodexResetCreditExpectedScope } | null {
+    const accountScopeKey = resetAccountScopeKey({
+      target,
+      accountId: account.id,
+      accountRevision: account.updatedAt
+    })
+    const idempotencyKey = this.unresolvedKeyByAccountScope.get(accountScopeKey)
+    if (!idempotencyKey) {
+      return null
+    }
+    const attempt = this.attemptsByKey.get(idempotencyKey)
+    if (attempt?.state !== 'providerPending') {
+      throw new Error('Codex reset-credit attempt state is inconsistent.')
+    }
+    // Why: a durable providerPending attempt can only be resolved with its original key.
+    return { idempotencyKey, expectedScope: attempt.expectedScope }
+  }
+
+  hasPendingForTarget(target: RateLimitRuntimeTarget): boolean {
+    return [...this.attemptsByKey.values()].some(
+      (attempt) =>
+        attempt.state === 'providerPending' &&
+        attempt.expectedScope.target.runtime === target.runtime &&
+        attempt.expectedScope.target.wslDistro === target.wslDistro
+    )
+  }
+
+  markProviderPending(idempotencyKey: string, attempt: CodexResetCreditAttempt): void {
+    this.persist({ idempotencyKey, expectedScope: attempt.expectedScope, state: 'providerPending' })
+    attempt.state = 'providerPending'
+    this.unresolvedKeyByAccountScope.set(attempt.accountScopeKey, idempotencyKey)
+  }
+
+  markSettled(
+    idempotencyKey: string,
+    attempt: CodexResetCreditAttempt,
+    outcome: CodexRateLimitResetOutcome
+  ): void {
+    this.persist({
+      idempotencyKey,
+      expectedScope: attempt.expectedScope,
+      state: 'settled',
+      outcome
+    })
+    attempt.state = 'settled'
+    attempt.settledOutcome = outcome
+    if (this.unresolvedKeyByAccountScope.get(attempt.accountScopeKey) === idempotencyKey) {
+      this.unresolvedKeyByAccountScope.delete(attempt.accountScopeKey)
+    }
+  }
+
+  releaseFresh(idempotencyKey: string, attempt: CodexResetCreditAttempt): void {
+    if (attempt.state !== 'fresh') {
+      return
+    }
+    this.attemptsByKey.delete(idempotencyKey)
+    if (this.attemptKeyByOffer.get(attempt.scopeKey) === idempotencyKey) {
+      this.attemptKeyByOffer.delete(attempt.scopeKey)
+    }
+  }
+
+  // Why: a removed account's managed home is gone, so its unresolved providerPending
+  // attempt can never validate or be replayed; drop it so a target-scoped default reset
+  // is not wedged forever by hasPendingResetForTarget matching the orphan.
+  discardForRemovedAccount(accountId: string): void {
+    const staleAttempts = [...this.attemptsByKey].filter(
+      ([, attempt]) => attempt.expectedScope.accountId === accountId
+    )
+    if (staleAttempts.length === 0) {
+      return
+    }
+    const staleKeySet = new Set(staleAttempts.map(([idempotencyKey]) => idempotencyKey))
+    if (this.durableLedger) {
+      const attempts = this.durableLedger.attempts.filter(
+        (attempt) => !staleKeySet.has(attempt.idempotencyKey)
+      )
+      if (attempts.length !== this.durableLedger.attempts.length) {
+        const nextLedger: CodexResetCreditAttemptLedger = { version: 1, attempts }
+        // Persist first so a failed durability barrier leaves the in-memory
+        // fail-closed guards aligned with the ledger that will reload.
+        this.store.replaceCodexResetCreditAttemptLedgerAndFlush(nextLedger)
+        this.durableLedger = structuredClone(nextLedger)
+      }
+    }
+    for (const [idempotencyKey, attempt] of staleAttempts) {
+      this.attemptsByKey.delete(idempotencyKey)
+      if (this.attemptKeyByOffer.get(attempt.scopeKey) === idempotencyKey) {
+        this.attemptKeyByOffer.delete(attempt.scopeKey)
+      }
+      if (this.unresolvedKeyByAccountScope.get(attempt.accountScopeKey) === idempotencyKey) {
+        this.unresolvedKeyByAccountScope.delete(attempt.accountScopeKey)
+      }
+    }
+  }
+
+  private hydrate(): void {
+    try {
+      const ledger = this.store.getCodexResetCreditAttemptLedger()
+      this.durableLedger = ledger
+      for (const durable of ledger.attempts) {
+        const attempt: CodexResetCreditAttempt = {
+          expectedScope: durable.expectedScope,
+          scopeKey: resetScopeKey(durable.expectedScope),
+          accountScopeKey: resetAccountScopeKey(durable.expectedScope),
+          state: durable.state,
+          promise: null,
+          settledOutcome: durable.state === 'settled' ? durable.outcome : null
+        }
+        this.attemptsByKey.set(durable.idempotencyKey, attempt)
+        this.attemptKeyByOffer.set(attempt.scopeKey, durable.idempotencyKey)
+        if (durable.state === 'providerPending') {
+          this.unresolvedKeyByAccountScope.set(attempt.accountScopeKey, durable.idempotencyKey)
+        }
+      }
+    } catch (error) {
+      this.loadError =
+        error instanceof Error ? error : new Error('Codex reset-credit attempt ledger is corrupt')
+    }
+  }
+
+  private persist(nextAttempt: DurableCodexResetCreditAttempt): void {
+    if (!this.durableLedger) {
+      throw this.loadError ?? new Error('Codex reset-credit attempt ledger is unavailable')
+    }
+    const index = this.durableLedger.attempts.findIndex(
+      (attempt) => attempt.idempotencyKey === nextAttempt.idempotencyKey
+    )
+    const attempts = [...this.durableLedger.attempts]
+    if (index === -1) {
+      attempts.push(nextAttempt)
+    } else {
+      attempts[index] = nextAttempt
+    }
+    const nextLedger: CodexResetCreditAttemptLedger = { version: 1, attempts }
+    this.store.replaceCodexResetCreditAttemptLedgerAndFlush(nextLedger)
+    this.durableLedger = structuredClone(nextLedger)
+  }
+}
diff --git a/src/main/codex-accounts/codex-reset-credit-scope-validation.ts b/src/main/codex-accounts/codex-reset-credit-scope-validation.ts
new file mode 100644
index 00000000000..50abc472d26
--- /dev/null
+++ b/src/main/codex-accounts/codex-reset-credit-scope-validation.ts
@@ -0,0 +1,115 @@
+import type {
+  CodexManagedAccount,
+  CodexManagedAccountSummary
+} from '../../shared/managed-account-types'
+import {
+  buildCodexResetCreditExpectedScope,
+  type CodexResetCreditExpectedScope
+} from '../../shared/codex-reset-credit-scope'
+import type { RateLimitState, RateLimitRuntimeTarget } from '../../shared/rate-limit-types'
+import type { Store } from '../persistence'
+import type { RateLimitService } from '../rate-limits/service'
+import type { CodexResetCreditRejectedBeforeProviderReason } from './codex-account-service-types'
+import type { CodexManagedHomePath } from './codex-managed-home-path'
+import { resetScopeKey } from './codex-reset-credit-ledger'
+import {
+  getCodexSelectionTargetForAccount,
+  getSelectedCodexAccountIdForTarget,
+  normalizeCodexAccountSelectionTarget
+} from './runtime-selection'
+
+export type CodexResetCreditScopeValidation =
+  | { kind: 'settledReplay' }
+  | { kind: 'providerMutation'; requireCurrentOffer: boolean }
+
+export class CodexResetCreditScopeRejection extends Error {
+  constructor(
+    readonly reason: CodexResetCreditRejectedBeforeProviderReason,
+    readonly rateLimits: RateLimitState,
+    message: string
+  ) {
+    super(message)
+    this.name = 'CodexResetCreditScopeRejection'
+  }
+}
+
+type CodexResetCreditScopeDependencies = {
+  store: Store
+  rateLimits: RateLimitService
+  managedHomePaths: CodexManagedHomePath
+  toSummary: (account: CodexManagedAccount) => CodexManagedAccountSummary
+}
+
+function sameTarget(left: RateLimitRuntimeTarget, right: RateLimitRuntimeTarget): boolean {
+  return left.runtime === right.runtime && left.wslDistro === right.wslDistro
+}
+
+export function validateCodexResetCreditScope(
+  expectedScope: CodexResetCreditExpectedScope,
+  validation: CodexResetCreditScopeValidation,
+  dependencies: CodexResetCreditScopeDependencies
+): { managedHomePath: string; rateLimits: RateLimitState } {
+  const rateLimitState = dependencies.rateLimits.getState()
+  if (!sameTarget(rateLimitState.codexTarget, expectedScope.target)) {
+    throw new CodexResetCreditScopeRejection(
+      'targetChanged',
+      rateLimitState,
+      'The active Codex rate-limit target changed before reset.'
+    )
+  }
+  const settings = dependencies.store.getSettings()
+  if (
+    getSelectedCodexAccountIdForTarget(settings, expectedScope.target) !== expectedScope.accountId
+  ) {
+    throw new CodexResetCreditScopeRejection(
+      'accountChanged',
+      rateLimitState,
+      'The selected Codex account changed before reset.'
+    )
+  }
+  const account = settings.codexManagedAccounts.find(
+    (candidate) => candidate.id === expectedScope.accountId
+  )
+  if (!account || account.updatedAt !== expectedScope.accountRevision) {
+    throw new CodexResetCreditScopeRejection(
+      'accountRevisionChanged',
+      rateLimitState,
+      'The selected Codex account was updated before reset.'
+    )
+  }
+  const accountTarget = normalizeCodexAccountSelectionTarget(
+    getCodexSelectionTargetForAccount(account)
+  )
+  if (!sameTarget(accountTarget, expectedScope.target)) {
+    throw new CodexResetCreditScopeRejection(
+      'accountRuntimeChanged',
+      rateLimitState,
+      'The selected Codex account belongs to a different runtime.'
+    )
+  }
+  if (validation.kind === 'providerMutation' && validation.requireCurrentOffer) {
+    const currentScope = buildCodexResetCreditExpectedScope({
+      target: rateLimitState.codexTarget,
+      account: dependencies.toSummary(account),
+      limits: rateLimitState.codex
+    })
+    if (!currentScope) {
+      throw new CodexResetCreditScopeRejection(
+        'offerUnavailable',
+        rateLimitState,
+        'The Codex reset-credit offer is no longer available.'
+      )
+    }
+    if (resetScopeKey(expectedScope) !== resetScopeKey(currentScope)) {
+      throw new CodexResetCreditScopeRejection(
+        'offerChanged',
+        rateLimitState,
+        'The Codex reset-credit offer changed before reset.'
+      )
+    }
+  }
+  if (validation.kind === 'providerMutation' && expectedScope.target.runtime === 'host') {
+    dependencies.managedHomePaths.assertHostOwnership(account.managedHomePath, account.id)
+  }
+  return { managedHomePath: account.managedHomePath, rateLimits: rateLimitState }
+}
diff --git a/src/main/codex-accounts/service-test-harness.ts b/src/main/codex-accounts/service-test-harness.ts
index adc1f4304dd..9afd6a8ba5e 100644
--- a/src/main/codex-accounts/service-test-harness.ts
+++ b/src/main/codex-accounts/service-test-harness.ts
@@ -205,9 +205,10 @@ export function createRuntimeHome(): RuntimeHomeStub {
   return {
     syncForCurrentSelection: vi.fn(),
     clearLastWrittenAuthJson: vi.fn(),
-    prepareForRateLimitFetch: vi.fn(
-      (): CodexRateLimitHomeResolution => ({ kind: 'ready', codexHomePath: null })
-    )
+    prepareForRateLimitFetch: vi.fn((): CodexRateLimitHomeResolution => ({
+      kind: 'ready',
+      codexHomePath: null
+    }))
   }
 }
 
diff --git a/src/main/codex-accounts/service.ts b/src/main/codex-accounts/service.ts
index 97a3985c701..663b49acf21 100644
--- a/src/main/codex-accounts/service.ts
+++ b/src/main/codex-accounts/service.ts
@@ -1,220 +1,47 @@
-/* eslint-disable max-lines -- Why: keeps Codex account lifecycle, path safety, login, and identity parsing in one audited main-process module. */
-import { randomUUID } from 'node:crypto'
-import { execFileSync, spawn, type ChildProcess } from 'node:child_process'
-import { existsSync, mkdirSync, readFileSync, realpathSync, rmSync, writeFileSync } from 'node:fs'
-import { dirname, join, resolve, sep } from 'node:path'
-import { homedir } from 'node:os'
-import { app } from 'electron'
-import { getSpawnArgsForWindows } from '../win32-utils'
-import {
-  buildWindowsHostInteractiveLoginSpawn,
-  type WindowsHostInteractiveLoginSpawn
-} from '../../shared/windows-interactive-login-spawn'
+import { execFileSync, spawn } from 'node:child_process'
+import type { WindowsHostInteractiveLoginSpawn } from '../../shared/windows-interactive-login-spawn'
 import type {
   CodexManagedAccount,
   CodexManagedAccountSummary,
   CodexRateLimitAccountsState,
   CodexSystemDefaultIdentity
 } from '../../shared/managed-account-types'
-import type {
-  CodexRateLimitResetOutcome,
-  CodexRateLimitResetResult,
-  RateLimitState,
-  RateLimitRuntimeTarget
-} from '../../shared/rate-limit-types'
-import {
-  buildCodexResetCreditExpectedScope,
-  type CodexResetCreditExpectedScope
-} from '../../shared/codex-reset-credit-scope'
-import type {
-  CodexResetCreditAttemptLedger,
-  DurableCodexResetCreditAttempt
-} from '../../shared/codex-reset-credit-attempt-ledger'
+import type { CodexRateLimitResetResult } from '../../shared/rate-limit-types'
+import type { CodexResetCreditExpectedScope } from '../../shared/codex-reset-credit-scope'
 import type { CodexRuntimeHomeService } from './runtime-home-service'
-import { writeFileAtomically } from './fs-utils'
-import { syncSystemConfigIntoManagedCodexHome } from '../codex/codex-config-mirror'
-import { getSystemCodexHomePath } from '../codex/codex-home-paths'
-import { readCodexTopLevelModelProvider } from '../codex/codex-model-provider-config'
-import { resolveCodexCommand } from '../codex-cli/command'
-import { withCliRuntimeOnPath } from '../../shared/node-cli-command-resolution'
 import type { Store } from '../persistence'
 import type { RateLimitService } from '../rate-limits/service'
-import { parseWslUncPath } from '../../shared/wsl-paths'
-import { toWindowsWslPath } from '../wsl'
 import { buildEncodedWslBashCommand } from '../wsl-bash-command'
-import { runWslProcess } from '../wsl/wsl-runner'
-import {
-  buildWslCodexAvailabilityScript,
-  buildWslCodexLoginArgs,
-  WSL_CODEX_AVAILABILITY_TIMEOUT_MS
-} from './wsl-codex-command'
-import {
-  getCodexSelectionTargetForAccount,
-  getSelectedCodexAccountIdForTarget,
-  normalizeCodexAccountSelectionTarget,
-  normalizeCodexRuntimeSelection,
-  pruneInvalidCodexRuntimeSelection,
-  removeCodexAccountIdFromSelection,
-  setSelectedCodexAccountIdForTarget,
-  type CodexAccountSelectionTarget
-} from './runtime-selection'
-import {
-  assertOwnedHostCodexManagedHomePath,
-  ManagedCodexHomeTemporarilyUnavailableError
-} from './host-codex-managed-home-ownership'
-import { isDefinitiveAbsence } from '../../shared/definitive-filesystem-absence'
+import type { CodexAccountSelectionTarget } from './runtime-selection'
+import { CodexAccountIdentity, type ResolvedCodexIdentity } from './codex-account-identity'
+import { CodexConfigMirror } from './codex-config-mirror'
+import { runCodexLoginSession, type CodexLoginChild } from './codex-login-session'
+import { CodexManagedHomePath } from './codex-managed-home-path'
+import { CodexManagedHomeLifecycle } from './codex-managed-home-lifecycle'
+import { CodexResetCreditCoordinator } from './codex-reset-credit-coordinator'
+import { CodexAccountSelection } from './codex-account-selection'
+import { CodexAccountRegistration } from './codex-account-registration'
+import type {
+  CodexAccountAddTarget,
+  CodexAccountReauthenticateOptions,
+  CodexAccountServiceLifecycle,
+  CodexResetCreditConsumeResult
+} from './codex-account-service-types'
+import { toCodexManagedAccountSummary } from './codex-account-service-types'
+export type {
+  CodexAccountAddTarget,
+  CodexAccountReauthenticateOptions,
+  CodexAccountServiceLifecycle,
+  CodexResetCreditConsumeResult,
+  CodexResetCreditConsumedResult,
+  CodexResetCreditRejectedBeforeProviderReason,
+  CodexResetCreditRejectedBeforeProviderResult
+} from './codex-account-service-types'
 
-const LOGIN_TIMEOUT_MS = 120_000
-const MAX_LOGIN_OUTPUT_CHARS = 4_000
-// Why: mirrors the Windows rm retry policy in local-worktree-filesystem — a
-// just-terminated codex login can briefly keep handles inside a managed home.
-const WINDOWS_RM_MAX_RETRIES = 8
-const WINDOWS_RM_RETRY_DELAY_MS = 150
-const WINDOWS_LOGIN_AUTH_POLL_INTERVAL_MS = 500
-const WINDOWS_LOGIN_POST_AUTH_EXIT_GRACE_MS = 5_000
 const WINDOWS_LOGIN_TREE_KILL_TIMEOUT_MS = 5_000
-const WSL_MANAGED_HOME_TIMEOUT_MS = 5_000
-
-type CodexOAuthCredentials = {
-  idToken: string | null
-  accountId: string | null
-}
-
-type ResolvedCodexIdentity = {
-  email: string | null
-  providerAccountId: string | null
-  workspaceLabel: string | null
-  workspaceAccountId: string | null
-}
-
-type CanonicalCodexConfig = {
-  contents: string
-  /** Host-readable source home; the mirror resolves WSL UNC paths to their Linux spelling. */
-  sourceHomePath: string
-  /** Preserve Linux path semantics when WSL $HOME is under /mnt/<drive>. */
-  sourceConfigDir?: string
-}
-
-export type CodexAccountAddTarget = {
-  runtime?: 'host' | 'wsl'
-  wslDistro?: string | null
-}
-
-export type CodexAccountReauthenticateOptions = {
-  /**
-   * Local-only intent from the status bar's "Sign in to see usage" action: when
-   * this account's runtime lane had no selection before login, activate the
-   * account that just signed in instead of restoring the empty selection.
-   */
-  activateIfSelectionWasEmpty?: boolean
-}
-
-export type CodexAccountServiceLifecycle = {
-  onHostSystemDefaultSelected?: () => void
-}
-
-type ManagedHomeLocation = {
-  managedHomePath: string
-  managedHomeRuntime: 'host' | 'wsl'
-  wslDistro: string | null
-  wslLinuxHomePath: string | null
-}
-
-export type CodexResetCreditRejectedBeforeProviderReason =
-  | 'targetChanged'
-  | 'accountChanged'
-  | 'accountRevisionChanged'
-  | 'accountRuntimeChanged'
-  | 'offerUnavailable'
-  | 'offerChanged'
-
-export type CodexResetCreditConsumedResult = {
-  outcome: CodexRateLimitResetOutcome
-  scope: CodexResetCreditExpectedScope
-  codex: CodexRateLimitAccountsState
-  rateLimits: RateLimitState
-}
-
-export type CodexResetCreditRejectedBeforeProviderResult = {
-  status: 'rejectedBeforeProvider'
-  retryDisposition: 'discardAttempt'
-  reason: CodexResetCreditRejectedBeforeProviderReason
-  scope: CodexResetCreditExpectedScope
-  codex: CodexRateLimitAccountsState
-  rateLimits: RateLimitState
-}
-
-export type CodexResetCreditConsumeResult =
-  | CodexResetCreditConsumedResult
-  | CodexResetCreditRejectedBeforeProviderResult
-
-type CodexResetCreditAttempt = {
-  expectedScope: CodexResetCreditExpectedScope
-  scopeKey: string
-  accountScopeKey: string
-  state: 'fresh' | 'providerPending' | 'settled'
-  promise: Promise<CodexResetCreditConsumeResult> | null
-  settledOutcome: CodexRateLimitResetOutcome | null
-}
-
-type CodexResetCreditScopeValidation =
-  | { kind: 'settledReplay' }
-  | { kind: 'providerMutation'; requireCurrentOffer: boolean }
-
-class CodexResetCreditScopeRejection extends Error {
-  constructor(
-    readonly reason: CodexResetCreditRejectedBeforeProviderReason,
-    readonly rateLimits: RateLimitState,
-    message: string
-  ) {
-    super(message)
-    this.name = 'CodexResetCreditScopeRejection'
-  }
-}
-
-function resetScopeKey(scope: CodexResetCreditExpectedScope): string {
-  return JSON.stringify([
-    scope.target.runtime,
-    scope.target.wslDistro,
-    scope.accountId,
-    scope.accountRevision,
-    scope.offerRevision
-  ])
-}
-
-function resetAccountScopeKey(
-  scope: Pick<CodexResetCreditExpectedScope, 'target' | 'accountId' | 'accountRevision'>
-): string {
-  return JSON.stringify([
-    scope.target.runtime,
-    scope.target.wslDistro,
-    scope.accountId,
-    scope.accountRevision
-  ])
-}
-
-function sameRateLimitTarget(left: RateLimitRuntimeTarget, right: RateLimitRuntimeTarget): boolean {
-  return left.runtime === right.runtime && left.wslDistro === right.wslDistro
-}
-
-function shellQuote(value: string): string {
-  return `'${value.replace(/'/g, "'\\''")}'`
-}
-
-function removeManagedHomeTreeSync(targetPath: string): void {
-  // Why: codex login descendants can briefly keep Windows handles on files in
-  // the managed home (e.g. log/codex-login.log); bounded retries absorb the
-  // transient lock instead of failing with ENOTEMPTY and orphaning the home.
-  rmSync(targetPath, {
-    recursive: true,
-    force: true,
-    maxRetries: WINDOWS_RM_MAX_RETRIES,
-    retryDelay: WINDOWS_RM_RETRY_DELAY_MS
-  })
-}
 
 function killLoginProcessTree(
-  child: ChildProcess,
+  child: CodexLoginChild,
   interactiveLogin?: WindowsHostInteractiveLoginSpawn | null
 ): void {
   const terminationPid = interactiveLogin?.getTerminationPid?.() ?? child.pid
@@ -242,47 +69,68 @@ function killLoginProcessTree(
   child.kill()
 }
 
-function readLoginAuthSnapshot(authJsonPath: string): string | null | undefined {
-  try {
-    return readFileSync(authJsonPath, 'utf-8')
-  } catch (error) {
-    const code = (error as NodeJS.ErrnoException).code
-    if (code === 'ENOENT' || code === 'ENOTDIR') {
-      return null
-    }
-    // Why: codex can atomically replace auth.json while the poll runs; a later
-    // poll will observe the stable credential. An unreadable initial file must
-    // disable the shortcut rather than look like a fresh login.
-    return undefined
-  }
-}
-
-function loginAuthChanged(
-  initial: string | null | undefined,
-  current: string | null | undefined
-): boolean {
-  // Why: metadata-only touches can happen before OAuth finishes. Requiring new
-  // credential bytes prevents reauthentication from being killed prematurely.
-  return initial !== undefined && current !== undefined && current !== null && current !== initial
-}
-
 export class CodexAccountService {
   // Why: serialize the read-modify-write of settings; overlapping calls (e.g. double-click Add) would lose updates.
   private mutationQueue: Promise<unknown> = Promise.resolve()
-  private readonly resetAttemptsByKey = new Map<string, CodexResetCreditAttempt>()
-  private readonly resetAttemptKeyByOffer = new Map<string, string>()
-  private readonly unresolvedResetKeyByAccountScope = new Map<string, string>()
-  private durableResetLedger: CodexResetCreditAttemptLedger | null = null
-  private resetLedgerLoadError: Error | null = null
+  private readonly identity: CodexAccountIdentity
+  private readonly configMirror: CodexConfigMirror
+  private readonly managedHomePaths: CodexManagedHomePath
+  private readonly managedHomes: CodexManagedHomeLifecycle
+  private readonly resetCredits: CodexResetCreditCoordinator
+  private readonly selection: CodexAccountSelection
+  private readonly registration: CodexAccountRegistration
 
   constructor(
-    private readonly store: Store,
-    private readonly rateLimits: RateLimitService,
+    store: Store,
+    rateLimits: RateLimitService,
     private readonly runtimeHome: CodexRuntimeHomeService,
-    private readonly lifecycle: CodexAccountServiceLifecycle = {}
+    lifecycle: CodexAccountServiceLifecycle = {}
   ) {
-    this.hydrateResetCreditAttempts()
-    this.safeSyncCanonicalConfigToManagedHomes()
+    this.managedHomePaths = new CodexManagedHomePath((distro, script) =>
+      execFileSync(
+        'wsl.exe',
+        ['-d', distro, '--exec', 'bash', '-lc', buildEncodedWslBashCommand(script)],
+        { windowsHide: true, encoding: 'utf-8', timeout: 5000 }
+      )
+    )
+    this.managedHomes = new CodexManagedHomeLifecycle(this.managedHomePaths)
+    this.identity = new CodexAccountIdentity((path, accountId) =>
+      this.managedHomePaths.assert(path, accountId)
+    )
+    this.configMirror = new CodexConfigMirror(store, (path, accountId) =>
+      this.managedHomePaths.assert(path, accountId)
+    )
+    this.resetCredits = new CodexResetCreditCoordinator({
+      store,
+      rateLimits,
+      runtimeHome,
+      managedHomePaths: this.managedHomePaths,
+      serializeMutation: (operation) => this.serializeMutation(operation),
+      getSnapshot: () => this.getSnapshot(),
+      toSummary: (account) => this.toSummary(account)
+    })
+    this.selection = new CodexAccountSelection({
+      store,
+      rateLimits,
+      runtimeHome,
+      configMirror: this.configMirror,
+      lifecycle,
+      resolveSystemDefault: () => this.resolveSystemDefaultIdentity(),
+      removeManagedHome: (path, accountId) => this.safeRemoveManagedHome(path, accountId),
+      discardResetAttempts: (accountId) => this.resetCredits.discardForRemovedAccount(accountId)
+    })
+    this.registration = new CodexAccountRegistration({
+      store,
+      rateLimits,
+      runtimeHome,
+      readIdentityFromHome: (path, accountId) => this.readIdentityFromHome(path, accountId),
+      selection: this.selection,
+      configMirror: this.configMirror,
+      managedHomePaths: this.managedHomePaths,
+      managedHomes: this.managedHomes,
+      login: (managedHomePath) => this.runCodexLogin(managedHomePath)
+    })
+    this.configMirror.safeSyncToManagedHomes()
   }
 
   /**
@@ -301,12 +149,11 @@ export class CodexAccountService {
   }
 
   listAccounts(): CodexRateLimitAccountsState {
-    this.normalizeActiveSelection()
-    return this.getSnapshot()
+    return this.selection.list()
   }
 
   async addAccount(target?: CodexAccountAddTarget): Promise<CodexRateLimitAccountsState> {
-    return this.serializeMutation(() => this.doAddAccount(target))
+    return this.serializeMutation(() => this.registration.add(target))
   }
 
   /**
@@ -319,1674 +166,76 @@ export class CodexAccountService {
     sourceHome: string,
     target?: CodexAccountAddTarget
   ): Promise<CodexRateLimitAccountsState> {
-    return this.serializeMutation(() => this.doAddAccountFromHome(sourceHome, target))
+    return this.serializeMutation(() => this.registration.addFromHome(sourceHome, target))
   }
 
   async reauthenticateAccount(
     accountId: string,
     options?: CodexAccountReauthenticateOptions
   ): Promise<CodexRateLimitAccountsState> {
-    return this.serializeMutation(() => this.doReauthenticateAccount(accountId, options))
+    return this.serializeMutation(() => this.registration.reauthenticate(accountId, options))
   }
 
   async removeAccount(accountId: string): Promise<CodexRateLimitAccountsState> {
-    return this.serializeMutation(() => this.doRemoveAccount(accountId))
+    return this.serializeMutation(() => this.selection.remove(accountId))
   }
 
   async selectAccount(accountId: string | null): Promise<CodexRateLimitAccountsState> {
-    return this.serializeMutation(() => this.doSelectAccount(accountId))
+    return this.serializeMutation(() => this.selection.select(accountId))
   }
 
   async selectAccountForTarget(
     accountId: string | null,
     target?: CodexAccountSelectionTarget
   ): Promise<CodexRateLimitAccountsState> {
-    return this.serializeMutation(() => this.doSelectAccount(accountId, target))
+    return this.serializeMutation(() => this.selection.select(accountId, target))
   }
 
   consumeRateLimitResetCredit(
     idempotencyKey: string,
     expectedScope: CodexResetCreditExpectedScope
   ): Promise<CodexResetCreditConsumeResult> {
-    if (this.resetLedgerLoadError) {
-      return Promise.reject(this.resetLedgerLoadError)
-    }
-    const scopeKey = resetScopeKey(expectedScope)
-    const accountScopeKey = resetAccountScopeKey(expectedScope)
-    const existing = this.resetAttemptsByKey.get(idempotencyKey)
-    if (existing) {
-      if (existing.scopeKey !== scopeKey) {
-        return Promise.reject(new Error('That idempotency key belongs to a different reset scope.'))
-      }
-      if (existing.state === 'settled' && existing.settledOutcome) {
-        return this.serializeMutation(async () => {
-          const { rateLimits } = this.validateResetCreditScope(expectedScope, {
-            kind: 'settledReplay'
-          })
-          return {
-            outcome: existing.settledOutcome!,
-            scope: existing.expectedScope,
-            codex: this.getSnapshot(),
-            rateLimits
-          }
-        })
-      }
-      if (existing.promise) {
-        return existing.promise
-      }
-      return this.startResetCreditAttempt(idempotencyKey, expectedScope, existing)
-    }
-
-    const unresolvedKey = this.unresolvedResetKeyByAccountScope.get(accountScopeKey)
-    if (unresolvedKey && unresolvedKey !== idempotencyKey) {
-      return Promise.reject(
-        new Error('A previous reset attempt for this account still has an unknown outcome.')
-      )
-    }
-    const claimedKey = this.resetAttemptKeyByOffer.get(scopeKey)
-    if (claimedKey && claimedKey !== idempotencyKey) {
-      return Promise.reject(new Error('That reset-credit offer was already attempted.'))
-    }
-
-    const attempt: CodexResetCreditAttempt = {
-      expectedScope,
-      scopeKey,
-      accountScopeKey,
-      state: 'fresh',
-      promise: null,
-      settledOutcome: null
-    }
-    this.resetAttemptsByKey.set(idempotencyKey, attempt)
-    this.resetAttemptKeyByOffer.set(scopeKey, idempotencyKey)
-    return this.startResetCreditAttempt(idempotencyKey, expectedScope, attempt)
+    return this.resetCredits.consume(idempotencyKey, expectedScope)
   }
 
   async consumeCurrentRateLimitResetCredit(): Promise<CodexRateLimitResetResult> {
-    if (this.resetLedgerLoadError) {
-      throw this.resetLedgerLoadError
-    }
-    const initialRateLimits = this.rateLimits.getState()
-    const initialTarget = { ...initialRateLimits.codexTarget }
-    const initialSettings = this.store.getSettings()
-    const selectedAccountId = getSelectedCodexAccountIdForTarget(initialSettings, initialTarget)
-    if (selectedAccountId) {
-      const account = initialSettings.codexManagedAccounts.find(
-        (candidate) => candidate.id === selectedAccountId
-      )
-      const pendingAttempt = account
-        ? this.getPendingResetAttemptForAccount(initialTarget, account)
-        : null
-      const expectedScope =
-        pendingAttempt?.expectedScope ??
-        (account
-          ? buildCodexResetCreditExpectedScope({
-              target: initialTarget,
-              account: this.toSummary(account),
-              limits: initialRateLimits.codex
-            })
-          : null)
-      if (!expectedScope) {
-        throw new Error('The managed Codex reset-credit offer is no longer available.')
-      }
-      // Why: do not enter the mutation queue first; the coordinator owns that
-      // queue and nested serialization would deadlock behind this operation.
-      const result = await this.consumeRateLimitResetCredit(
-        pendingAttempt?.idempotencyKey ?? randomUUID(),
-        expectedScope
-      )
-      if ('status' in result) {
-        throw new Error('The Codex account or reset offer changed before reset.')
-      }
-      return { outcome: result.outcome, state: result.rateLimits }
-    }
-
-    return this.serializeMutation(async () => {
-      if (this.resetLedgerLoadError) {
-        throw this.resetLedgerLoadError
-      }
-      const target = this.rateLimits.getState().codexTarget
-      if (!sameRateLimitTarget(target, initialTarget)) {
-        throw new Error('The active Codex rate-limit target changed before reset.')
-      }
-      if (getSelectedCodexAccountIdForTarget(this.store.getSettings(), target)) {
-        throw new Error('The selected Codex account changed before reset.')
-      }
-      if (this.hasPendingResetForTarget(target)) {
-        throw new Error('A previous reset attempt for this target still has an unknown outcome.')
-      }
-      const homeResolution = this.runtimeHome.prepareForRateLimitFetch(target)
-      // Why: reject before the provider mutation — a skip must never be spent
-      // against the system-default home (#STA-4422).
-      if (homeResolution.kind === 'skip') {
-        throw new ManagedCodexHomeTemporarilyUnavailableError()
-      }
-      const codexHomePath = homeResolution.codexHomePath
-      return this.rateLimits.consumeCodexRateLimitResetCredit({
-        idempotencyKey: randomUUID(),
-        target,
-        codexHomePath
-      })
-    })
-  }
-
-  private getPendingResetAttemptForAccount(
-    target: RateLimitRuntimeTarget,
-    account: CodexManagedAccount
-  ): { idempotencyKey: string; expectedScope: CodexResetCreditExpectedScope } | null {
-    const accountScopeKey = resetAccountScopeKey({
-      target,
-      accountId: account.id,
-      accountRevision: account.updatedAt
-    })
-    const idempotencyKey = this.unresolvedResetKeyByAccountScope.get(accountScopeKey)
-    if (!idempotencyKey) {
-      return null
-    }
-    const attempt = this.resetAttemptsByKey.get(idempotencyKey)
-    if (attempt?.state !== 'providerPending') {
-      throw new Error('Codex reset-credit attempt state is inconsistent.')
-    }
-    // Why: a durable providerPending attempt can only be resolved with its original key.
-    return { idempotencyKey, expectedScope: attempt.expectedScope }
-  }
-
-  private hasPendingResetForTarget(target: RateLimitRuntimeTarget): boolean {
-    return [...this.resetAttemptsByKey.values()].some(
-      (attempt) =>
-        attempt.state === 'providerPending' &&
-        sameRateLimitTarget(attempt.expectedScope.target, target)
-    )
-  }
-
-  private startResetCreditAttempt(
-    idempotencyKey: string,
-    expectedScope: CodexResetCreditExpectedScope,
-    attempt: CodexResetCreditAttempt
-  ): Promise<CodexResetCreditConsumeResult> {
-    const promise = this.serializeMutation(async (): Promise<CodexResetCreditConsumeResult> => {
-      const isFresh = attempt.state === 'fresh'
-      let validation: { managedHomePath: string; rateLimits: RateLimitState }
-      try {
-        validation = this.validateResetCreditScope(expectedScope, {
-          kind: 'providerMutation',
-          requireCurrentOffer: isFresh
-        })
-      } catch (error) {
-        if (isFresh && error instanceof CodexResetCreditScopeRejection) {
-          this.releaseFreshResetAttempt(idempotencyKey, attempt)
-          return {
-            status: 'rejectedBeforeProvider',
-            retryDisposition: 'discardAttempt',
-            reason: error.reason,
-            scope: expectedScope,
-            codex: this.getSnapshot(),
-            rateLimits: error.rateLimits
-          }
-        }
-        throw error
-      }
-      if (isFresh) {
-        this.persistResetAttempt({
-          idempotencyKey,
-          expectedScope,
-          state: 'providerPending'
-        })
-        attempt.state = 'providerPending'
-        this.unresolvedResetKeyByAccountScope.set(attempt.accountScopeKey, idempotencyKey)
-      }
-      const { outcome, state } = await this.rateLimits.consumeCodexRateLimitResetCredit({
-        idempotencyKey,
-        target: expectedScope.target,
-        codexHomePath: validation.managedHomePath
-      })
-      // Why: queued account selection may start as soon as this mutation resolves;
-      // capture both account selection and usage before releasing the queue.
-      const result: CodexResetCreditConsumedResult = {
-        outcome,
-        scope: expectedScope,
-        codex: this.getSnapshot(),
-        rateLimits: state
-      }
-      this.persistResetAttempt({
-        idempotencyKey,
-        expectedScope,
-        state: 'settled',
-        outcome
-      })
-      attempt.state = 'settled'
-      attempt.settledOutcome = outcome
-      if (this.unresolvedResetKeyByAccountScope.get(attempt.accountScopeKey) === idempotencyKey) {
-        this.unresolvedResetKeyByAccountScope.delete(attempt.accountScopeKey)
-      }
-      return result
-    })
-    attempt.promise = promise
-    void promise.then(
-      () => {
-        attempt.promise = null
-      },
-      () => {
-        attempt.promise = null
-        if (attempt.state === 'fresh') {
-          this.releaseFreshResetAttempt(idempotencyKey, attempt)
-        }
-      }
-    )
-    return promise
-  }
-
-  private validateResetCreditScope(
-    expectedScope: CodexResetCreditExpectedScope,
-    validation: CodexResetCreditScopeValidation
-  ): { managedHomePath: string; rateLimits: RateLimitState } {
-    const rateLimitState = this.rateLimits.getState()
-    if (!sameRateLimitTarget(rateLimitState.codexTarget, expectedScope.target)) {
-      throw new CodexResetCreditScopeRejection(
-        'targetChanged',
-        rateLimitState,
-        'The active Codex rate-limit target changed before reset.'
-      )
-    }
-
-    const settings = this.store.getSettings()
-    if (
-      getSelectedCodexAccountIdForTarget(settings, expectedScope.target) !== expectedScope.accountId
-    ) {
-      throw new CodexResetCreditScopeRejection(
-        'accountChanged',
-        rateLimitState,
-        'The selected Codex account changed before reset.'
-      )
-    }
-    const account = settings.codexManagedAccounts.find(
-      (candidate) => candidate.id === expectedScope.accountId
-    )
-    if (!account || account.updatedAt !== expectedScope.accountRevision) {
-      throw new CodexResetCreditScopeRejection(
-        'accountRevisionChanged',
-        rateLimitState,
-        'The selected Codex account was updated before reset.'
-      )
-    }
-    const normalizedAccountTarget = normalizeCodexAccountSelectionTarget(
-      getCodexSelectionTargetForAccount(account)
-    )
-    if (!sameRateLimitTarget(normalizedAccountTarget, expectedScope.target)) {
-      throw new CodexResetCreditScopeRejection(
-        'accountRuntimeChanged',
-        rateLimitState,
-        'The selected Codex account belongs to a different runtime.'
-      )
-    }
-
-    if (validation.kind === 'providerMutation' && validation.requireCurrentOffer) {
-      const currentScope = buildCodexResetCreditExpectedScope({
-        target: rateLimitState.codexTarget,
-        account: this.toSummary(account),
-        limits: rateLimitState.codex
-      })
-      if (!currentScope) {
-        throw new CodexResetCreditScopeRejection(
-          'offerUnavailable',
-          rateLimitState,
-          'The Codex reset-credit offer is no longer available.'
-        )
-      }
-      if (resetScopeKey(expectedScope) !== resetScopeKey(currentScope)) {
-        throw new CodexResetCreditScopeRejection(
-          'offerChanged',
-          rateLimitState,
-          'The Codex reset-credit offer changed before reset.'
-        )
-      }
-    }
-
-    if (validation.kind === 'providerMutation' && expectedScope.target.runtime === 'host') {
-      assertOwnedHostCodexManagedHomePath({
-        candidatePath: account.managedHomePath,
-        managedAccountsRoot: join(app.getPath('userData'), 'codex-accounts'),
-        systemCodexHomePath: getSystemCodexHomePath(),
-        expectedAccountId: account.id
-      })
-    }
-
-    return { managedHomePath: account.managedHomePath, rateLimits: rateLimitState }
-  }
-
-  private hydrateResetCreditAttempts(): void {
-    try {
-      const ledger = this.store.getCodexResetCreditAttemptLedger()
-      this.durableResetLedger = ledger
-      for (const durable of ledger.attempts) {
-        const scopeKey = resetScopeKey(durable.expectedScope)
-        const accountScopeKey = resetAccountScopeKey(durable.expectedScope)
-        this.resetAttemptsByKey.set(durable.idempotencyKey, {
-          expectedScope: durable.expectedScope,
-          scopeKey,
-          accountScopeKey,
-          state: durable.state,
-          promise: null,
-          settledOutcome: durable.state === 'settled' ? durable.outcome : null
-        })
-        this.resetAttemptKeyByOffer.set(scopeKey, durable.idempotencyKey)
-        if (durable.state === 'providerPending') {
-          this.unresolvedResetKeyByAccountScope.set(accountScopeKey, durable.idempotencyKey)
-        }
-      }
-    } catch (error) {
-      this.resetLedgerLoadError =
-        error instanceof Error ? error : new Error('Codex reset-credit attempt ledger is corrupt')
-    }
-  }
-
-  private persistResetAttempt(nextAttempt: DurableCodexResetCreditAttempt): void {
-    if (!this.durableResetLedger) {
-      throw (
-        this.resetLedgerLoadError ?? new Error('Codex reset-credit attempt ledger is unavailable')
-      )
-    }
-    const index = this.durableResetLedger.attempts.findIndex(
-      (attempt) => attempt.idempotencyKey === nextAttempt.idempotencyKey
-    )
-    const attempts = [...this.durableResetLedger.attempts]
-    if (index === -1) {
-      attempts.push(nextAttempt)
-    } else {
-      attempts[index] = nextAttempt
-    }
-    const nextLedger: CodexResetCreditAttemptLedger = { version: 1, attempts }
-    this.store.replaceCodexResetCreditAttemptLedgerAndFlush(nextLedger)
-    this.durableResetLedger = structuredClone(nextLedger)
-  }
-
-  private releaseFreshResetAttempt(idempotencyKey: string, attempt: CodexResetCreditAttempt): void {
-    if (attempt.state !== 'fresh') {
-      return
-    }
-    this.resetAttemptsByKey.delete(idempotencyKey)
-    if (this.resetAttemptKeyByOffer.get(attempt.scopeKey) === idempotencyKey) {
-      this.resetAttemptKeyByOffer.delete(attempt.scopeKey)
-    }
-  }
-
-  // Why: a removed account's managed home is gone, so its unresolved providerPending
-  // attempt can never validate or be replayed; drop it so a target-scoped default reset
-  // is not wedged forever by hasPendingResetForTarget matching the orphan.
-  private discardResetAttemptsForRemovedAccount(accountId: string): void {
-    const staleAttempts: [string, CodexResetCreditAttempt][] = []
-    for (const [idempotencyKey, attempt] of this.resetAttemptsByKey) {
-      if (attempt.expectedScope.accountId === accountId) {
-        staleAttempts.push([idempotencyKey, attempt])
-      }
-    }
-    if (staleAttempts.length === 0) {
-      return
-    }
-    const staleKeySet = new Set(staleAttempts.map(([idempotencyKey]) => idempotencyKey))
-    if (this.durableResetLedger) {
-      const attempts = this.durableResetLedger.attempts.filter(
-        (attempt) => !staleKeySet.has(attempt.idempotencyKey)
-      )
-      if (attempts.length !== this.durableResetLedger.attempts.length) {
-        const nextLedger: CodexResetCreditAttemptLedger = { version: 1, attempts }
-        // Persist first so a failed durability barrier leaves the in-memory
-        // fail-closed guards aligned with the ledger that will reload.
-        this.store.replaceCodexResetCreditAttemptLedgerAndFlush(nextLedger)
-        this.durableResetLedger = structuredClone(nextLedger)
-      }
-    }
-    for (const [idempotencyKey, attempt] of staleAttempts) {
-      this.resetAttemptsByKey.delete(idempotencyKey)
-      if (this.resetAttemptKeyByOffer.get(attempt.scopeKey) === idempotencyKey) {
-        this.resetAttemptKeyByOffer.delete(attempt.scopeKey)
-      }
-      if (this.unresolvedResetKeyByAccountScope.get(attempt.accountScopeKey) === idempotencyKey) {
-        this.unresolvedResetKeyByAccountScope.delete(attempt.accountScopeKey)
-      }
-    }
-  }
-
-  // Why: quota probes against a cold per-account CODEX_HOME can take 10–25s
-  // (RPC + PTY fallback) and queue behind an in-flight global usage refresh.
-  // The refresh synchronously flips usage to "fetching" before its first await,
-  // so the switcher updates immediately; the probe itself must never block or
-  // fail the already-durable account mutation.
-  private startQuotaRefreshInBackground(
-    outgoingAccountId: string | null | undefined,
-    target: CodexAccountSelectionTarget | undefined
-  ): void {
-    void this.rateLimits.refreshForCodexAccountChange(outgoingAccountId, target).catch((error) => {
-      console.error('[codex-accounts] Quota refresh after account change failed:', error)
-    })
-  }
-
-  private async doAddAccount(target?: CodexAccountAddTarget): Promise<CodexRateLimitAccountsState> {
-    const accountId = randomUUID()
-    const managedHome = await this.createManagedHome(accountId, target)
-    const { managedHomePath } = managedHome
-    try {
-      const canonicalConfig = this.readCanonicalConfigForManagedHome(managedHomePath)
-      this.assertOAuthAccountAddAllowed(canonicalConfig)
-      this.safeSyncCanonicalConfigIntoManagedHome(managedHomePath, canonicalConfig, accountId)
-      await this.runCodexLogin(managedHomePath)
-      return await this.persistCapturedCodexAccount(accountId, managedHome)
-    } catch (error) {
-      this.removeManagedHomeUnlessUnproven(error, managedHomePath, accountId)
-      throw error
-    }
-  }
-
-  private async doAddAccountFromHome(
-    sourceHome: string,
-    target?: CodexAccountAddTarget
-  ): Promise<CodexRateLimitAccountsState> {
-    const accountId = randomUUID()
-    const managedHome = await this.createManagedHome(accountId, target)
-    const { managedHomePath } = managedHome
-    try {
-      const canonicalConfig = this.readCanonicalConfigForManagedHome(managedHomePath)
-      this.assertOAuthAccountAddAllowed(canonicalConfig)
-      this.safeSyncCanonicalConfigIntoManagedHome(managedHomePath, canonicalConfig, accountId)
-      this.importCodexAuthFromHome(sourceHome, managedHomePath, accountId)
-      return await this.persistCapturedCodexAccount(accountId, managedHome)
-    } catch (error) {
-      this.removeManagedHomeUnlessUnproven(error, managedHomePath, accountId)
-      throw error
-    }
-  }
-
-  // Why: copy the auth.json from an already-authenticated CODEX_HOME (e.g. a temp
-  // dir the CLI ran `codex login` into) into the managed home. Mirrors the login
-  // step of doAddAccount without spawning an interactive browser flow.
-  private importCodexAuthFromHome(
-    sourceHome: string,
-    managedHomePath: string,
-    accountId: string
-  ): void {
-    const trimmed = sourceHome.trim()
-    if (!trimmed) {
-      throw new Error('A Codex home directory path is required.')
-    }
-    const authPath = join(resolve(trimmed), 'auth.json')
-    let sourceAuthContents: string
-    try {
-      sourceAuthContents = readFileSync(authPath, 'utf-8')
-    } catch (error) {
-      // Why: "no credentials here, run codex login" is only true for a definitive
-      // absence. A locked source file used to produce that advice, which sends the
-      // user to re-run a login they had already completed.
-      if (!isDefinitiveAbsence(error)) {
-        throw new ManagedCodexHomeTemporarilyUnavailableError(undefined, { cause: error })
-      }
-      throw new Error(
-        `No Codex credentials found in ${resolve(trimmed)}. Run \`codex login\` into this directory first.`
-      )
-    }
-    const trustedHome = this.assertManagedHomePath(managedHomePath, accountId)
-    writeFileAtomically(join(trustedHome, 'auth.json'), sourceAuthContents, {
-      mode: 0o600
-    })
-  }
-
-  private async persistCapturedCodexAccount(
-    accountId: string,
-    managedHome: ManagedHomeLocation
-  ): Promise<CodexRateLimitAccountsState> {
-    const identity = this.readIdentityFromHome(managedHome.managedHomePath, accountId)
-    if (!identity.email) {
-      throw new Error('Codex login completed, but Orca could not resolve the account email.')
-    }
-
-    const now = Date.now()
-    const account: CodexManagedAccount = {
-      id: accountId,
-      email: identity.email,
-      managedHomePath: managedHome.managedHomePath,
-      managedHomeRuntime: managedHome.managedHomeRuntime,
-      wslDistro: managedHome.wslDistro,
-      wslLinuxHomePath: managedHome.wslLinuxHomePath,
-      providerAccountId: identity.providerAccountId,
-      workspaceLabel: identity.workspaceLabel,
-      workspaceAccountId: identity.workspaceAccountId,
-      createdAt: now,
-      updatedAt: now,
-      lastAuthenticatedAt: now
-    }
-
-    const settings = this.store.getSettings()
-    const selection = normalizeCodexRuntimeSelection(settings)
-    const targetSelection = getCodexSelectionTargetForAccount(account)
-    this.store.updateSettings({
-      codexManagedAccounts: [...settings.codexManagedAccounts, account],
-      activeCodexManagedAccountId: targetSelection.runtime === 'host' ? account.id : selection.host,
-      activeCodexManagedAccountIdsByRuntime: setSelectedCodexAccountIdForTarget(
-        selection,
-        account.id,
-        targetSelection
-      )
-    })
-    try {
-      this.safeSyncCanonicalConfigToManagedHomes()
-      this.runtimeHome.clearLastWrittenAuthJson(account.id)
-      // Why: pass the account's selection target so a WSL account syncs the WSL
-      // runtime home instead of the default host target.
-      this.runtimeHome.syncForCurrentSelection(targetSelection)
-    } catch (error) {
-      // Why: settings were already written; if a post-write step fails, restore the
-      // previous account/selection so the caller's managed-home cleanup cannot leave
-      // a dangling, broken managed account behind in settings.
-      this.store.updateSettings({
-        codexManagedAccounts: settings.codexManagedAccounts,
-        activeCodexManagedAccountId: settings.activeCodexManagedAccountId,
-        activeCodexManagedAccountIdsByRuntime: settings.activeCodexManagedAccountIdsByRuntime
-      })
-      // Why: a failed post-write step must restore both persisted selection and
-      // the runtime home it drives before the new managed home is removed.
-      try {
-        this.runtimeHome.syncForCurrentSelection(targetSelection)
-      } catch (rollbackError) {
-        console.warn(
-          '[codex-accounts] Failed to restore runtime home during rollback:',
-          rollbackError
-        )
-      }
-      throw error
-    }
-
-    // Why: switching activates the new account, so cache the outgoing account's usage for the
-    // switcher — in the background, since the probe must never block or fail a durable add.
-    const outgoingAccountId = getSelectedCodexAccountIdForTarget(settings, targetSelection)
-    this.startQuotaRefreshInBackground(outgoingAccountId, targetSelection)
-    return this.getSnapshot()
-  }
-
-  private async doReauthenticateAccount(
-    accountId: string,
-    options?: CodexAccountReauthenticateOptions
-  ): Promise<CodexRateLimitAccountsState> {
-    const account = this.requireAccount(accountId)
-    const managedHomePath = await this.ensureManagedHomeForReauthentication(account)
-    const accountTarget = getCodexSelectionTargetForAccount(account)
-    const selectedAccountId = getSelectedCodexAccountIdForTarget(
-      this.store.getSettings(),
-      accountTarget
-    )
-    // Why: decided from the pre-login capture, never a post-login read — the
-    // runtime-home poll runs outside the mutation queue and can clear this lane
-    // while OAuth is open, which would look like an empty selection to activate.
-    const activateAfterLogin =
-      options?.activateIfSelectionWasEmpty === true && selectedAccountId === null
-
-    this.safeSyncCanonicalConfigIntoManagedHome(managedHomePath, undefined, account.id)
-    await this.runCodexLogin(managedHomePath)
-    const identity = this.readIdentityFromHome(managedHomePath, account.id)
-    if (!identity.email) {
-      throw new Error('Codex login completed, but Orca could not resolve the account email.')
-    }
-
-    const settings = this.store.getSettings()
-    const now = Date.now()
-    const updatedAccounts = settings.codexManagedAccounts.map((entry) =>
-      entry.id === accountId
-        ? {
-            ...entry,
-            email: identity.email!,
-            providerAccountId: identity.providerAccountId,
-            workspaceLabel: identity.workspaceLabel,
-            workspaceAccountId: identity.workspaceAccountId,
-            updatedAt: now,
-            lastAuthenticatedAt: now
-          }
-        : entry
-    )
-    const activeSelection = setSelectedCodexAccountIdForTarget(
-      normalizeCodexRuntimeSelection(settings),
-      activateAfterLogin ? accountId : selectedAccountId,
-      accountTarget
-    )
-
-    // Why: login can transiently clear this runtime's selection; unrelated runtime validation must remain authoritative.
-    this.store.updateSettings({
-      codexManagedAccounts: updatedAccounts,
-      activeCodexManagedAccountId: activeSelection.host,
-      activeCodexManagedAccountIdsByRuntime: activeSelection
-    })
-    this.safeSyncCanonicalConfigToManagedHomes()
-    this.runtimeHome.clearLastWrittenAuthJson(accountId)
-    this.runtimeHome.syncForCurrentSelection(accountTarget)
-
-    // Why: re-auth can change the underlying Codex identity, so force a fresh read to avoid showing stale quota.
-    this.startQuotaRefreshInBackground(undefined, accountTarget)
-    return this.getSnapshot()
-  }
-
-  private async doRemoveAccount(accountId: string): Promise<CodexRateLimitAccountsState> {
-    const account = this.requireAccount(accountId)
-    const settings = this.store.getSettings()
-    const nextAccounts = settings.codexManagedAccounts.filter((entry) => entry.id !== accountId)
-    const nextSelection = removeCodexAccountIdFromSelection(
-      normalizeCodexRuntimeSelection(settings),
-      accountId
-    )
-    const nextActiveId =
-      settings.activeCodexManagedAccountId === accountId ? null : nextSelection.host
-
-    this.store.updateSettings({
-      codexManagedAccounts: nextAccounts,
-      activeCodexManagedAccountId: nextActiveId,
-      activeCodexManagedAccountIdsByRuntime: nextSelection
-    })
-    this.runtimeHome.syncForCurrentSelection()
-    if (account.managedHomeRuntime === 'host' && nextSelection.host === null) {
-      this.lifecycle.onHostSystemDefaultSelected?.()
-    }
-
-    this.safeRemoveManagedHome(account.managedHomePath, account.id)
-    // Why: a removed account can no longer appear in the switcher dropdown,
-    // so purge its cached usage to avoid stale entries.
-    this.rateLimits.evictInactiveCodexCache(accountId)
-    this.discardResetAttemptsForRemovedAccount(accountId)
-    this.startQuotaRefreshInBackground(
-      getSelectedCodexAccountIdForTarget(settings, getCodexSelectionTargetForAccount(account)) ===
-        accountId
-        ? accountId
-        : undefined,
-      getCodexSelectionTargetForAccount(account)
-    )
-    return this.getSnapshot()
-  }
-
-  private async doSelectAccount(
-    accountId: string | null,
-    target?: CodexAccountSelectionTarget
-  ): Promise<CodexRateLimitAccountsState> {
-    let effectiveTarget = target
-    if (accountId !== null) {
-      const account = this.requireAccount(accountId)
-      const accountTarget = getCodexSelectionTargetForAccount(account)
-      const requestedTarget = normalizeCodexAccountSelectionTarget(target ?? accountTarget)
-      const normalizedAccountTarget = normalizeCodexAccountSelectionTarget(accountTarget)
-      if (
-        requestedTarget.runtime !== normalizedAccountTarget.runtime ||
-        (requestedTarget.wslDistro !== null &&
-          requestedTarget.wslDistro !== normalizedAccountTarget.wslDistro)
-      ) {
-        throw new Error('That Codex account belongs to a different runtime.')
-      }
-      effectiveTarget = accountTarget
-    }
-
-    const previousSettings = this.store.getSettings()
-    const selection = normalizeCodexRuntimeSelection(previousSettings)
-    const outgoingAccountId = getSelectedCodexAccountIdForTarget(previousSettings, effectiveTarget)
-    const nextSelection = setSelectedCodexAccountIdForTarget(selection, accountId, effectiveTarget)
-
-    this.store.updateSettings({
-      activeCodexManagedAccountId:
-        effectiveTarget?.runtime === 'wsl' ? nextSelection.host : accountId,
-      activeCodexManagedAccountIdsByRuntime: nextSelection
-    })
-    this.safeSyncCanonicalConfigToManagedHomes()
-    this.runtimeHome.syncForCurrentSelection(effectiveTarget)
-    if (
-      accountId === null &&
-      normalizeCodexAccountSelectionTarget(effectiveTarget).runtime === 'host'
-    ) {
-      this.lifecycle.onHostSystemDefaultSelected?.()
-    }
-
-    this.startQuotaRefreshInBackground(outgoingAccountId, effectiveTarget)
-    return this.getSnapshot()
+    return this.resetCredits.consumeCurrent()
   }
 
   private getSnapshot(): CodexRateLimitAccountsState {
-    const settings = this.store.getSettings()
-    return {
-      accounts: settings.codexManagedAccounts
-        .map((account) => this.toSummary(account))
-        .sort((a, b) => b.updatedAt - a.updatedAt),
-      activeAccountId: normalizeCodexRuntimeSelection(settings).host,
-      activeAccountIdsByRuntime: normalizeCodexRuntimeSelection(settings),
-      systemDefault: this.resolveSystemDefaultIdentity()
-    }
+    return this.selection.snapshot()
   }
 
-  // Why: the system-default (activeAccountId:null) account has no stored
-  // identity — its effective login is whatever the real ~/.codex/auth.json is
-  // right now. Read it live and read-only so the switcher can display who the
-  // system default is and attribute usage, without ever mutating ~/.codex.
   private resolveSystemDefaultIdentity(): CodexSystemDefaultIdentity {
-    const authFilePath = join(homedir(), '.codex', 'auth.json')
-    let contents: string
-    try {
-      // Why: a single read avoids an exists/read race and halves filesystem
-      // probes whenever an accounts snapshot resolves this live identity.
-      contents = readFileSync(authFilePath, 'utf-8')
-    } catch (error) {
-      const code = (error as NodeJS.ErrnoException | null)?.code
-      if (code === 'ENOENT' || code === 'ENOTDIR') {
-        // Why: no auth.json means either a signed-out home or an env-key/custom
-        // provider that authenticates via OPENAI_API_KEY instead of a token file.
-        return {
-          hasAuth: false,
-          authKind: this.hasEnvApiKey() ? 'api-key' : 'none',
-          email: null,
-          providerAccountId: null,
-          workspaceLabel: null
-        }
-      }
-      console.warn(
-        '[codex-accounts] Failed to read system-default Codex identity',
-        code ?? 'unknown-error'
-      )
-      return {
-        hasAuth: true,
-        authKind: 'none',
-        email: null,
-        providerAccountId: null,
-        workspaceLabel: null
-      }
-    }
-
-    let parsed: unknown
-    try {
-      parsed = JSON.parse(contents)
-    } catch {
-      // Why: SyntaxError messages can echo malformed input; never let auth
-      // contents or token fragments reach logs while degrading safely.
-      console.warn('[codex-accounts] System-default Codex auth is not valid JSON')
-      return {
-        hasAuth: true,
-        authKind: 'none',
-        email: null,
-        providerAccountId: null,
-        workspaceLabel: null
-      }
-    }
-    if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
-      // Why: valid JSON can still have the wrong shape; account listing must
-      // degrade to an unknown identity instead of crashing the settings pane.
-      console.warn('[codex-accounts] System-default Codex auth has an unexpected format')
-      return {
-        hasAuth: true,
-        authKind: 'none',
-        email: null,
-        providerAccountId: null,
-        workspaceLabel: null
-      }
-    }
-    const raw = parsed as Record<string, unknown>
-
-    if (typeof raw.OPENAI_API_KEY === 'string' && raw.OPENAI_API_KEY.trim() !== '') {
-      // Why: API-key/custom-provider logins carry no OAuth identity or ChatGPT
-      // usage. Surface them as a custom provider, not a blank/broken row.
-      return {
-        hasAuth: true,
-        authKind: 'api-key',
-        email: null,
-        providerAccountId: null,
-        workspaceLabel: null
-      }
-    }
-
-    const identity = this.resolveIdentityFromCredentials(this.extractOAuthCredentials(raw))
-    return {
-      hasAuth: true,
-      authKind: 'oauth',
-      email: identity.email,
-      providerAccountId: identity.providerAccountId,
-      workspaceLabel: identity.workspaceLabel
-    }
-  }
-
-  private hasEnvApiKey(): boolean {
-    const key = process.env.OPENAI_API_KEY
-    return typeof key === 'string' && key.trim() !== ''
-  }
-
-  private toSummary(account: CodexManagedAccount): CodexManagedAccountSummary {
-    return {
-      id: account.id,
-      email: account.email,
-      managedHomeRuntime: account.managedHomeRuntime ?? 'host',
-      wslDistro: account.wslDistro ?? null,
-      providerAccountId: account.providerAccountId ?? null,
-      workspaceLabel: account.workspaceLabel ?? null,
-      workspaceAccountId: account.workspaceAccountId ?? null,
-      createdAt: account.createdAt,
-      updatedAt: account.updatedAt,
-      lastAuthenticatedAt: account.lastAuthenticatedAt
-    }
-  }
-
-  private requireAccount(accountId: string): CodexManagedAccount {
-    const settings = this.store.getSettings()
-    const account = settings.codexManagedAccounts.find((entry) => entry.id === accountId)
-    if (!account) {
-      throw new Error('That Codex rate limit account no longer exists.')
-    }
-    return account
-  }
-
-  private normalizeActiveSelection(): void {
-    const settings = this.store.getSettings()
-    const selection = normalizeCodexRuntimeSelection(settings)
-    const nextSelection = pruneInvalidCodexRuntimeSelection(
-      selection,
-      settings.codexManagedAccounts
-    )
-    const changed =
-      nextSelection.host !== selection.host ||
-      JSON.stringify(nextSelection.wsl) !== JSON.stringify(selection.wsl)
-    if (changed) {
-      this.store.updateSettings({
-        activeCodexManagedAccountId: nextSelection.host,
-        activeCodexManagedAccountIdsByRuntime: nextSelection
-      })
-      if (selection.host !== null && nextSelection.host === null) {
-        this.lifecycle.onHostSystemDefaultSelected?.()
-      }
-    }
-  }
-
-  private async createManagedHome(
-    accountId: string,
-    target?: CodexAccountAddTarget
-  ): Promise<ManagedHomeLocation> {
-    const wslHome = await this.tryCreateWslManagedHome(accountId, target)
-    if (wslHome) {
-      return wslHome
-    }
-
-    const managedHomePath = join(this.getManagedAccountsRoot(), accountId, 'home')
-    mkdirSync(managedHomePath, { recursive: true })
-    // Why: marker lets future cleanup prove the path belongs to Orca before deleting anything.
-    writeFileSync(join(managedHomePath, '.orca-managed-home'), `${accountId}\n`, 'utf-8')
-    return {
-      managedHomePath: this.assertManagedHomePath(managedHomePath, accountId),
-      managedHomeRuntime: 'host',
-      wslDistro: null,
-      wslLinuxHomePath: null
-    }
-  }
-
-  private async tryCreateWslManagedHome(
-    accountId: string,
-    target?: CodexAccountAddTarget
-  ): Promise<ManagedHomeLocation | null> {
-    if (process.platform !== 'win32' || target?.runtime !== 'wsl') {
-      return null
-    }
-
-    const requestedDistro = target.wslDistro?.trim() || undefined
-    const info = await runWslProcess({
-      distro: requestedDistro,
-      loginPath: 'none',
-      script: 'printf "%s\\n%s\\n" "$WSL_DISTRO_NAME" "$HOME"',
-      shell: 'bash',
-      timeoutMs: WSL_MANAGED_HOME_TIMEOUT_MS
-    })
-    if (info.code !== 0 || info.timedOut) {
-      throw new Error('Could not resolve the active WSL home directory for Codex login.')
-    }
-    const [rawDistro, rawHome] = info.stdout
-      .replaceAll(String.fromCharCode(0), '')
-      .split(/\r?\n/)
-      .map((line) => line.trim())
-    const distro = requestedDistro || rawDistro
-    const home = rawHome
-    if (!distro || !home?.startsWith('/')) {
-      throw new Error('Could not resolve the active WSL home directory for Codex login.')
-    }
-
-    const wslLinuxHomePath = `${home.replace(/\/$/, '')}/.local/share/orca/codex-accounts/${accountId}/home`
-    const markerPath = `${wslLinuxHomePath}/.orca-managed-home`
-    const created = await runWslProcess({
-      distro,
-      loginPath: 'none',
-      script: `mkdir -p ${shellQuote(wslLinuxHomePath)} && printf '%s\\n' ${shellQuote(accountId)} > ${shellQuote(markerPath)}`,
-      shell: 'bash',
-      timeoutMs: WSL_MANAGED_HOME_TIMEOUT_MS
-    })
-    if (created.code !== 0 || created.timedOut) {
-      throw new Error('Could not create the managed Codex home inside WSL.')
-    }
-
-    const managedHomePath = toWindowsWslPath(wslLinuxHomePath, distro)
-    let trustedManagedHomePath: string
-    try {
-      trustedManagedHomePath = this.assertManagedHomePath(managedHomePath, accountId)
-    } catch (error) {
-      await this.safeRemoveWslManagedHomeCandidate(distro, wslLinuxHomePath, accountId)
-      throw error
-    }
-
-    return {
-      managedHomePath: trustedManagedHomePath,
-      managedHomeRuntime: 'wsl',
-      wslDistro: distro,
-      wslLinuxHomePath
-    }
-  }
-
-  private safeSyncCanonicalConfigToManagedHomes(): void {
-    try {
-      this.syncCanonicalConfigToManagedHomes()
-    } catch (error) {
-      console.warn('[codex-accounts] Failed to sync canonical config:', error)
-    }
-  }
-
-  private safeSyncCanonicalConfigIntoManagedHome(
-    managedHomePath: string,
-    canonicalConfig?: CanonicalCodexConfig | null,
-    expectedAccountId?: string
-  ): void {
-    try {
-      this.syncCanonicalConfigIntoManagedHome(managedHomePath, canonicalConfig, expectedAccountId)
-    } catch (error) {
-      console.warn('[codex-accounts] Failed to seed managed config:', error)
-    }
-  }
-
-  private syncCanonicalConfigToManagedHomes(): void {
-    const settings = this.store.getSettings()
-    for (const account of settings.codexManagedAccounts) {
-      try {
-        this.syncCanonicalConfigIntoManagedHome(account.managedHomePath, undefined, account.id)
-      } catch (error) {
-        console.warn('[codex-accounts] Failed to sync managed config:', error)
-      }
-    }
-  }
-
-  private syncCanonicalConfigIntoManagedHome(
-    managedHomePath: string,
-    canonicalConfig = this.readCanonicalConfigForManagedHome(managedHomePath),
-    expectedAccountId?: string
-  ): void {
-    if (canonicalConfig === null) {
-      return
-    }
-
-    const trustedManagedHomePath = this.assertManagedHomePath(managedHomePath, expectedAccountId)
-    // Why: every account home is Codex's own CODEX_HOME. Preserve trust Codex
-    // granted there while refreshing ordinary settings from the lane's source.
-    syncSystemConfigIntoManagedCodexHome({
-      runtimeHomePath: trustedManagedHomePath,
-      systemHomePath: canonicalConfig.sourceHomePath,
-      systemConfigDir: canonicalConfig.sourceConfigDir
-    })
-  }
-
-  private readCanonicalConfig(): CanonicalCodexConfig | null {
-    const sourceHomePath = join(homedir(), '.codex')
-    const primaryConfigPath = join(sourceHomePath, 'config.toml')
-    if (!existsSync(primaryConfigPath)) {
-      return null
-    }
-
-    try {
-      return {
-        contents: readFileSync(primaryConfigPath, 'utf-8'),
-        sourceHomePath
-      }
-    } catch (error) {
-      console.warn('[codex-accounts] Failed to read canonical config:', error)
-      return null
-    }
-  }
-
-  private readCanonicalConfigForManagedHome(managedHomePath: string): CanonicalCodexConfig | null {
-    const wslInfo = parseWslUncPath(managedHomePath)
-    if (!wslInfo) {
-      return this.readCanonicalConfig()
-    }
-
-    const managedRootMarker = '/.local/share/orca/codex-accounts/'
-    const markerIndex = wslInfo.linuxPath.indexOf(managedRootMarker)
-    if (markerIndex === -1) {
-      return null
-    }
-    const wslHome = wslInfo.linuxPath.slice(0, markerIndex)
-    const configPath = toWindowsWslPath(`${wslHome}/.codex/config.toml`, wslInfo.distro)
-    if (!existsSync(configPath)) {
-      return null
-    }
-
-    try {
-      // Why: the config is read over UNC but consumed by Codex inside WSL, so
-      // path rewrites must anchor to the Linux-side ~/.codex, not the UNC path.
-      return {
-        contents: readFileSync(configPath, 'utf-8'),
-        sourceHomePath: toWindowsWslPath(`${wslHome}/.codex`, wslInfo.distro),
-        sourceConfigDir: `${wslHome}/.codex`
-      }
-    } catch (error) {
-      console.warn('[codex-accounts] Failed to read WSL canonical config:', error)
-      return null
-    }
-  }
-
-  private assertOAuthAccountAddAllowed(canonicalConfig: CanonicalCodexConfig | null): void {
-    const modelProvider = canonicalConfig
-      ? readCodexTopLevelModelProvider(canonicalConfig.contents)
-      : null
-    if (!modelProvider || modelProvider === 'openai') {
-      return
-    }
-
-    // Why: mirroring a custom-provider pin into an OAuth managed home makes
-    // the new OAuth credentials inert; fail before login and leave user config intact.
-    throw new Error(
-      `Orca cannot add a Codex OAuth account while ~/.codex/config.toml pins the custom provider ${JSON.stringify(modelProvider)}. Keep using the system-default account for this provider, or remove model_provider (or set it to "openai") before adding an OAuth account. Orca left your config unchanged.`
-    )
-  }
-
-  private getManagedAccountsRoot(): string {
-    const root = join(app.getPath('userData'), 'codex-accounts')
-    mkdirSync(root, { recursive: true })
-    return root
-  }
-
-  private async ensureManagedHomeForReauthentication(
-    account: CodexManagedAccount
-  ): Promise<string> {
-    const wslInfo = parseWslUncPath(account.managedHomePath)
-    if (wslInfo && process.platform === 'win32') {
-      await this.ensureExpectedWslManagedHomeForReauthentication(account, wslInfo)
-      return this.assertManagedHomePath(account.managedHomePath, account.id)
-    }
-
-    try {
-      return this.assertManagedHomePath(account.managedHomePath, account.id)
-    } catch (error) {
-      if (!this.isMissingManagedHomeError(error)) {
-        throw error
-      }
-      return this.recreateExpectedHostManagedHomeForReauthentication(account, error)
-    }
-  }
-
-  private recreateExpectedHostManagedHomeForReauthentication(
-    account: CodexManagedAccount,
-    originalError: unknown
-  ): string {
-    const expectedManagedHomePath = join(this.getManagedAccountsRoot(), account.id, 'home')
-    if (!this.pathsEqual(account.managedHomePath, expectedManagedHomePath)) {
-      throw originalError
-    }
-
-    // Why: re-auth may recreate a lost empty home, but only at the exact Orca-owned path persisted for this account.
-    mkdirSync(expectedManagedHomePath, { recursive: true })
-    writeFileSync(join(expectedManagedHomePath, '.orca-managed-home'), `${account.id}\n`, 'utf-8')
-    return this.assertManagedHomePath(expectedManagedHomePath, account.id)
-  }
-
-  private async ensureExpectedWslManagedHomeForReauthentication(
-    account: CodexManagedAccount,
-    wslInfo: { distro: string; linuxPath: string }
-  ): Promise<void> {
-    if (
-      account.managedHomeRuntime !== 'wsl' ||
-      account.wslDistro !== wslInfo.distro ||
-      account.wslLinuxHomePath !== wslInfo.linuxPath ||
-      !wslInfo.linuxPath.endsWith(`/.local/share/orca/codex-accounts/${account.id}/home`)
-    ) {
-      return
-    }
-
-    const result = await runWslProcess({
-      distro: wslInfo.distro,
-      loginPath: 'none',
-      script: [
-        'set -euo pipefail',
-        `candidate=${shellQuote(wslInfo.linuxPath)}`,
-        `expected_marker=${shellQuote(account.id)}`,
-        'marker="$candidate/.orca-managed-home"',
-        'if [ -e "$candidate" ] && [ ! -f "$marker" ]; then exit 41; fi',
-        'if [ -f "$marker" ] && [ "$(cat "$marker")" != "$expected_marker" ]; then exit 42; fi',
-        'mkdir -p -- "$candidate"',
-        'printf "%s\\n" "$expected_marker" > "$marker"'
-      ].join('\n'),
-      shell: 'bash',
-      timeoutMs: WSL_MANAGED_HOME_TIMEOUT_MS
-    })
-    // Why: 41/42 mean the path is not this account's home; re-auth must refuse
-    // rather than write credentials into someone else's directory.
-    if (result.code !== 0 || result.timedOut) {
-      throw new Error(
-        `Could not prepare the managed Codex home in WSL ${wslInfo.distro} for re-authentication.`
-      )
-    }
-  }
-
-  private isMissingManagedHomeError(error: unknown): boolean {
-    return (
-      error instanceof Error &&
-      error.message === 'Managed Codex home directory does not exist on disk.'
-    )
-  }
-
-  private pathsEqual(left: string, right: string): boolean {
-    const resolvedLeft = resolve(left)
-    const resolvedRight = resolve(right)
-    if (process.platform === 'win32') {
-      return resolvedLeft.toLowerCase() === resolvedRight.toLowerCase()
-    }
-    return resolvedLeft === resolvedRight
-  }
-
-  private assertManagedHomePath(candidatePath: string, expectedAccountId?: string): string {
-    const wslInfo = parseWslUncPath(candidatePath)
-    if (wslInfo) {
-      if (
-        !wslInfo.linuxPath.includes('/.local/share/orca/codex-accounts/') ||
-        !wslInfo.linuxPath.endsWith('/home')
-      ) {
-        throw new Error('Managed WSL Codex home is outside Orca account storage.')
-      }
-      if (
-        expectedAccountId !== undefined &&
-        !wslInfo.linuxPath.endsWith(`/.local/share/orca/codex-accounts/${expectedAccountId}/home`)
-      ) {
-        throw new Error('Managed WSL Codex home does not match its persisted account ID.')
-      }
-
-      if (process.platform === 'win32') {
-        try {
-          const canonicalLinuxPath = execFileSync(
-            'wsl.exe',
-            [
-              '-d',
-              wslInfo.distro,
-              '--exec',
-              'bash',
-              '-lc',
-              buildEncodedWslBashCommand(
-                [
-                  'set -euo pipefail',
-                  `candidate=${shellQuote(wslInfo.linuxPath)}`,
-                  'managed_root="${HOME%/}/.local/share/orca/codex-accounts"',
-                  'candidate_real=$(readlink -f -- "$candidate")',
-                  'managed_root_real=$(readlink -f -- "$managed_root")',
-                  'test -f "$candidate_real/.orca-managed-home"',
-                  ...(expectedAccountId === undefined
-                    ? [
-                        'case "$candidate_real" in "$managed_root_real"/*/home) printf "%s\\n" "$candidate_real" ;; *) exit 35 ;; esac'
-                      ]
-                    : [
-                        `expected_marker=${shellQuote(expectedAccountId)}`,
-                        'test "$candidate_real" = "$managed_root_real/$expected_marker/home"',
-                        'test "$(cat "$candidate_real/.orca-managed-home")" = "$expected_marker"',
-                        'printf "%s\\n" "$candidate_real"'
-                      ])
-                ].join('\n')
-              )
-            ],
-            { windowsHide: true, encoding: 'utf-8', timeout: 5000 }
-          ).trim()
-          if (!canonicalLinuxPath) {
-            throw new Error('Managed Codex home directory does not exist on disk.')
-          }
-          return toWindowsWslPath(canonicalLinuxPath, wslInfo.distro)
-        } catch (error) {
-          throw new Error('Managed WSL Codex home is outside Orca account storage.', {
-            cause: error
-          })
-        }
-      }
-
-      if (wslInfo.linuxPath.split('/').includes('..')) {
-        throw new Error('Managed WSL Codex home is outside Orca account storage.')
-      }
-      if (!existsSync(candidatePath)) {
-        throw new Error('Managed Codex home directory does not exist on disk.')
-      }
-      if (!existsSync(join(candidatePath, '.orca-managed-home'))) {
-        throw new Error('Managed Codex home is missing Orca ownership marker.')
-      }
-      if (
-        expectedAccountId !== undefined &&
-        readFileSync(join(candidatePath, '.orca-managed-home'), 'utf-8').trim() !==
-          expectedAccountId
-      ) {
-        throw new Error('Managed WSL Codex home ownership marker does not match its account ID.')
-      }
-      return candidatePath
-    }
-
-    return assertOwnedHostCodexManagedHomePath({
-      candidatePath,
-      managedAccountsRoot: this.getManagedAccountsRoot(),
-      systemCodexHomePath: getSystemCodexHomePath(),
-      expectedAccountId
-    })
-  }
-
-  private async safeRemoveWslManagedHomeCandidate(
-    distro: string,
-    linuxHomePath: string,
-    expectedAccountId: string
-  ): Promise<void> {
-    // Why: creation can fail after mkdir/marker but before trust, so cleanup must verify the marker/account ID inside WSL.
-    try {
-      const result = await runWslProcess({
-        distro,
-        loginPath: 'none',
-        script: [
-          'set -euo pipefail',
-          `candidate=${shellQuote(linuxHomePath)}`,
-          `expected_marker=${shellQuote(expectedAccountId)}`,
-          'managed_root="${HOME%/}/.local/share/orca/codex-accounts"',
-          'candidate_real=$(readlink -f -- "$candidate" 2>/dev/null || true)',
-          'managed_root_real=$(readlink -f -- "$managed_root" 2>/dev/null || true)',
-          'test -n "$candidate_real"',
-          'test -n "$managed_root_real"',
-          'case "$candidate_real" in "$managed_root_real"/*/home) ;; *) exit 0 ;; esac',
-          'test -f "$candidate_real/.orca-managed-home"',
-          'test "$(cat "$candidate_real/.orca-managed-home")" = "$expected_marker"',
-          'rm -rf -- "$candidate_real"',
-          'parent_dir=$(dirname -- "$candidate_real")',
-          'case "$parent_dir" in "$managed_root_real"/*) rmdir -- "$parent_dir" 2>/dev/null || true ;; esac'
-        ].join('\n'),
-        shell: 'bash',
-        timeoutMs: WSL_MANAGED_HOME_TIMEOUT_MS
-      })
-      if (result.code !== 0 || result.timedOut) {
-        throw new Error(`WSL cleanup exited with ${result.timedOut ? 'a timeout' : result.code}`)
-      }
-    } catch (error) {
-      console.warn('[codex-accounts] Failed to clean up WSL managed home candidate:', error)
-    }
-  }
-
-  /**
-   * Rollback deletes the managed home, so it may only run on a *proven* failure.
-   * An unreadable credential file means the login may well have succeeded, and a
-   * kept home is a recoverable leak where a deleted one is permanent data loss.
-   */
-  private removeManagedHomeUnlessUnproven(
-    error: unknown,
-    managedHomePath: string,
-    accountId: string
-  ): void {
-    if (error instanceof ManagedCodexHomeTemporarilyUnavailableError) {
-      return
-    }
-    this.safeRemoveManagedHome(managedHomePath, accountId)
-  }
-
-  private safeRemoveManagedHome(candidatePath: string, expectedAccountId: string): void {
-    let managedHomePath: string
-    try {
-      managedHomePath = this.assertManagedHomePath(candidatePath, expectedAccountId)
-    } catch (error) {
-      console.warn('[codex-accounts] Refusing to remove untrusted managed home:', error)
-      return
-    }
-
-    try {
-      removeManagedHomeTreeSync(managedHomePath)
-    } catch (error) {
-      // Why: this runs from error-cleanup paths; a still-held Windows handle
-      // must not mask the original failure with an ENOTEMPTY from rmSync.
-      console.warn('[codex-accounts] Failed to remove managed home:', error)
-      return
-    }
-
-    if (parseWslUncPath(managedHomePath)) {
-      try {
-        removeManagedHomeTreeSync(dirname(managedHomePath))
-      } catch {
-        // Best-effort cleanup
-      }
-      return
-    }
-
-    // Why: homes live at <accounts-root>/<uuid>/home; removing the home/ leaf leaves an empty <uuid>/ behind.
-    try {
-      const parentDir = resolve(managedHomePath, '..')
-      // Why: canonicalize the root too so the prefix check works on macOS where userData resolves through /private/var.
-      const root = realpathSync(this.getManagedAccountsRoot())
-      if (parentDir.startsWith(root + sep) && parentDir !== root) {
-        removeManagedHomeTreeSync(parentDir)
-      }
-    } catch {
-      // Best-effort cleanup
-    }
-  }
-
-  private async runCodexLogin(managedHomePath: string): Promise<void> {
-    const wslInfo = parseWslUncPath(managedHomePath)
-    if (wslInfo) {
-      await this.assertWslCodexCliAvailable(wslInfo)
-    }
-    // Why: reauthentication starts with an existing auth.json. Only new auth
-    // bytes prove this login completed; existence alone would kill the
-    // Windows OAuth flow five seconds after it opened.
-    const initialAuthSnapshot = wslInfo
-      ? null
-      : readLoginAuthSnapshot(join(managedHomePath, 'auth.json'))
-
-    await new Promise<void>((resolvePromise, rejectPromise) => {
-      const spawnConfig = wslInfo
-        ? {
-            command: 'wsl.exe',
-            args: buildWslCodexLoginArgs(wslInfo.distro, wslInfo.linuxPath),
-            env: process.env,
-            codexCommand: 'codex',
-            interactiveLogin: null
-          }
-        : (() => {
-            const codexCommand = resolveCodexCommand()
-            // Why: Windows host login needs a real console; otherwise inherit/hide
-            // leaves the child unable to read a paste-code / device-auth prompt.
-            const interactiveLogin =
-              process.platform === 'win32'
-                ? buildWindowsHostInteractiveLoginSpawn(codexCommand, ['login'])
-                : null
-            const { spawnCmd, spawnArgs } = interactiveLogin
-              ? { spawnCmd: interactiveLogin.command, spawnArgs: interactiveLogin.args }
-              : getSpawnArgsForWindows(codexCommand, ['login'])
-            return {
-              command: spawnCmd,
-              args: spawnArgs,
-              env: withCliRuntimeOnPath(codexCommand, {
-                ...process.env,
-                CODEX_HOME: managedHomePath
-              }),
-              codexCommand,
-              interactiveLogin
-            }
-          })()
-      const child = spawn(spawnConfig.command, spawnConfig.args, {
-        stdio: spawnConfig.interactiveLogin
-          ? spawnConfig.interactiveLogin.stdio
-          : ['ignore', 'pipe', 'pipe'],
-        // Why: hide the outer wrapper only. A dedicated login console stays visible.
-        windowsHide: true,
-        env: spawnConfig.env
-      })
-
-      let settled = false
-      let output = ''
-      const appendOutput = (chunk: Buffer): void => {
-        output = `${output}${chunk.toString()}`
-        if (output.length > MAX_LOGIN_OUTPUT_CHARS) {
-          output = output.slice(-MAX_LOGIN_OUTPUT_CHARS)
-        }
-      }
-
-      let timeout: ReturnType<typeof setTimeout> | null = null
-      let authWatchInterval: ReturnType<typeof setInterval> | null = null
-      let postAuthExitTimeout: ReturnType<typeof setTimeout> | null = null
-      let loginTreeKilledAfterAuth = false
-      const authJsonPath = join(managedHomePath, 'auth.json')
-      const cleanupListeners = (): void => {
-        if (timeout) {
-          clearTimeout(timeout)
-          timeout = null
-        }
-        if (authWatchInterval) {
-          clearInterval(authWatchInterval)
-          authWatchInterval = null
-        }
-        if (postAuthExitTimeout) {
-          clearTimeout(postAuthExitTimeout)
-          postAuthExitTimeout = null
-        }
-        child.stdout?.off('data', appendOutput)
-        child.stderr?.off('data', appendOutput)
-        child.off('error', onError)
-        child.off('close', onClose)
-        spawnConfig.interactiveLogin?.cleanup?.()
-      }
-
-      const settle = (callback: () => void): void => {
-        if (settled) {
-          return
-        }
-        settled = true
-        cleanupListeners()
-        callback()
-      }
-
-      const timeoutError = new Error('Codex sign-in took too long to finish. Please try again.')
-      timeout = setTimeout(() => {
-        killLoginProcessTree(child, spawnConfig.interactiveLogin)
-        settle(() => {
-          rejectPromise(timeoutError)
-        })
-      }, LOGIN_TIMEOUT_MS)
-
-      // Why: on Windows the codex login CLI can linger after writing auth.json,
-      // and its open handles on the managed home (log/codex-login.log) make the
-      // post-login file operations fail with ENOTEMPTY. Once auth.json exists,
-      // give the tree a short grace period to exit, then force it down.
-      if (process.platform === 'win32' && !wslInfo) {
-        authWatchInterval = setInterval(() => {
-          if (!loginAuthChanged(initialAuthSnapshot, readLoginAuthSnapshot(authJsonPath))) {
-            return
-          }
-          if (authWatchInterval) {
-            clearInterval(authWatchInterval)
-            authWatchInterval = null
-          }
-          postAuthExitTimeout = setTimeout(() => {
-            loginTreeKilledAfterAuth = true
-            killLoginProcessTree(child, spawnConfig.interactiveLogin)
-          }, WINDOWS_LOGIN_POST_AUTH_EXIT_GRACE_MS)
-        }, WINDOWS_LOGIN_AUTH_POLL_INTERVAL_MS)
-      }
-
-      const onError = (error: Error): void => {
-        settle(() => {
-          const isEnoent = (error as NodeJS.ErrnoException).code === 'ENOENT'
-          // Why: ENOENT is ambiguous — missing codex binary or missing node in PATH; a resolved full path implies node is missing.
-          const isBareCommand = spawnConfig.codexCommand === 'codex'
-          const message = isEnoent
-            ? isBareCommand
-              ? 'Codex CLI not found.'
-              : 'Codex CLI found but could not run — Node.js may not be in your PATH.'
-            : error.message
-          rejectPromise(new Error(message))
-        })
-      }
-
-      const onClose = (code: number | null): void => {
-        settle(() => {
-          // Why: the post-auth tree kill is a success path — auth.json already
-          // exists and codex only failed to exit on its own, so the forced
-          // non-zero exit must not surface as a login failure.
-          // Why: the kill only arms after the watcher observed new credential
-          // bytes, so an unreadable auth.json here is a lock, not a failed login.
-          // Only a definitive absence may revoke that verdict — reading a lock as
-          // failure sends the caller's rollback at a home that just authenticated.
-          if (
-            code === 0 ||
-            (loginTreeKilledAfterAuth && readLoginAuthSnapshot(authJsonPath) !== null)
-          ) {
-            resolvePromise()
-            return
-          }
-          const trimmedOutput = output.trim()
-          rejectPromise(
-            new Error(
-              trimmedOutput
-                ? `Codex login failed: ${trimmedOutput}`
-                : `Codex login exited with code ${code ?? 'unknown'}.`
-            )
-          )
-        })
-      }
-
-      child.stdout?.on('data', appendOutput)
-      child.stderr?.on('data', appendOutput)
-      child.on('error', onError)
-      child.on('close', onClose)
-    })
-  }
-
-  private async assertWslCodexCliAvailable(wslInfo: {
-    distro: string
-    linuxPath: string
-  }): Promise<void> {
-    // This is a PATH lookup, so it needs the login PATH: an nvm-installed codex
-    // lives nowhere else. Marking it 'none' reports a working install as absent.
-    const result = await runWslProcess({
-      distro: wslInfo.distro,
-      loginPath: 'preferred',
-      script: buildWslCodexAvailabilityScript(),
-      // POSIX command lookup; declared because the payload is opaque here.
-      shell: 'sh',
-      timeoutMs: WSL_CODEX_AVAILABILITY_TIMEOUT_MS
-    })
-    if (result.code !== 0 && !result.environmentResolved) {
-      // A miss without the login PATH is "we could not check", not "not
-      // installed" -- claiming absence here is #9725.
-      throw new Error('Could not check the Codex CLI in WSL. Try again.')
-    }
-    if (result.code !== 0 || result.timedOut) {
-      throw new Error(
-        `Codex CLI is not available in WSL ${wslInfo.distro}. Install Codex in that distro or switch Account location to Windows.`,
-        { cause: new Error(result.stderr.trim() || `codex lookup exited with ${result.code}`) }
-      )
-    }
+    return this.identity.resolveSystemDefault()
   }
 
   private readIdentityFromHome(
     managedHomePath: string,
     expectedAccountId: string
   ): ResolvedCodexIdentity {
-    return this.resolveIdentityFromCredentials(
-      this.loadOAuthCredentials(managedHomePath, expectedAccountId)
-    )
+    return this.identity.readFromHome(managedHomePath, expectedAccountId)
   }
 
-  private resolveIdentityFromCredentials(
-    credentials: CodexOAuthCredentials
-  ): ResolvedCodexIdentity {
-    const payload = credentials.idToken ? this.parseJwtPayload(credentials.idToken) : null
-    const authClaims = this.readRecordClaim(payload, 'https://api.openai.com/auth')
-    const profileClaims = this.readRecordClaim(payload, 'https://api.openai.com/profile')
-
-    return {
-      email: this.normalizeField(
-        this.readStringClaim(payload, 'email') ?? this.readStringClaim(profileClaims, 'email')
-      ),
-      providerAccountId: this.normalizeField(
-        credentials.accountId ??
-          this.readStringClaim(authClaims, 'chatgpt_account_id') ??
-          this.readStringClaim(payload, 'chatgpt_account_id')
-      ),
-      workspaceLabel: this.normalizeField(
-        this.readStringClaim(authClaims, 'workspace_name') ??
-          this.readStringClaim(profileClaims, 'workspace_name')
-      ),
-      workspaceAccountId: this.normalizeField(
-        this.readStringClaim(authClaims, 'workspace_account_id') ??
-          credentials.accountId ??
-          this.readStringClaim(payload, 'chatgpt_account_id')
-      )
-    }
+  private toSummary(account: CodexManagedAccount): CodexManagedAccountSummary {
+    return toCodexManagedAccountSummary(account)
   }
 
-  private loadOAuthCredentials(
-    managedHomePath: string,
-    expectedAccountId: string
-  ): CodexOAuthCredentials {
-    const authFilePath = join(
-      this.assertManagedHomePath(managedHomePath, expectedAccountId),
-      'auth.json'
-    )
-    let authFileContents: string
-    try {
-      authFileContents = readFileSync(authFilePath, 'utf-8')
-    } catch (error) {
-      // Why: an unreadable auth.json is not a missing credential. Surfacing it as
-      // a generic failure is what lets the add path's rollback delete a home
-      // holding freshly authenticated bytes.
-      if (isDefinitiveAbsence(error)) {
-        throw error
-      }
-      throw new ManagedCodexHomeTemporarilyUnavailableError(undefined, { cause: error })
-    }
-    let parsed: Record<string, unknown>
-    try {
-      parsed = JSON.parse(authFileContents) as Record<string, unknown>
-    } catch {
-      // Why: a raw SyntaxError echoes credential bytes into logs/error UI; a
-      // corrupt auth.json must fail loudly but without them (same sanitization
-      // intent as the system-default identity path, which degrades instead).
-      throw new Error('Codex auth.json is corrupt or not valid JSON')
-    }
-    return this.extractOAuthCredentials(parsed)
+  private safeRemoveManagedHome(candidatePath: string, expectedAccountId: string): void {
+    this.managedHomes.safeRemove(candidatePath, expectedAccountId)
   }
 
-  private extractOAuthCredentials(raw: Record<string, unknown>): CodexOAuthCredentials {
-    // Why: API-key-based auth files have no OAuth tokens or JWT identity
-    // claims. Returning nulls causes the caller to fail with a clear
-    // "could not resolve the account email" error rather than crashing
-    // on missing nested token fields.
-    if (typeof raw.OPENAI_API_KEY === 'string' && raw.OPENAI_API_KEY.trim() !== '') {
-      return {
-        idToken: null,
-        accountId: null
-      }
-    }
-
-    const tokens = this.readRecordClaim(raw, 'tokens')
-    return {
-      idToken: this.normalizeField(
-        this.readStringClaim(tokens, 'id_token') ?? this.readStringClaim(tokens, 'idToken')
-      ),
-      accountId: this.normalizeField(
-        this.readStringClaim(tokens, 'account_id') ?? this.readStringClaim(tokens, 'accountId')
-      )
-    }
-  }
-
-  private parseJwtPayload(token: string): Record<string, unknown> | null {
-    const parts = token.split('.')
-    if (parts.length < 2) {
-      return null
-    }
-
-    let payload = parts[1].replace(/-/g, '+').replace(/_/g, '/')
-    while (payload.length % 4 !== 0) {
-      payload += '='
-    }
-
-    try {
-      const json = Buffer.from(payload, 'base64').toString('utf-8')
-      return JSON.parse(json) as Record<string, unknown>
-    } catch {
-      return null
-    }
-  }
-
-  private readRecordClaim(
-    value: Record<string, unknown> | null,
-    key: string
-  ): Record<string, unknown> | null {
-    const claim = value?.[key]
-    if (!claim || typeof claim !== 'object' || Array.isArray(claim)) {
-      return null
-    }
-    return claim as Record<string, unknown>
-  }
-
-  private readStringClaim(value: Record<string, unknown> | null, key: string): string | null {
-    const claim = value?.[key]
-    return typeof claim === 'string' ? claim : null
-  }
-
-  private normalizeField(value: string | null | undefined): string | null {
-    if (!value) {
-      return null
-    }
-    const trimmed = value.trim()
-    return trimmed === '' ? null : trimmed
+  private async runCodexLogin(managedHomePath: string): Promise<void> {
+    await runCodexLoginSession(managedHomePath, {
+      wslCommand: 'wsl.exe',
+      spawn: ({ command, args, env, stdio }) =>
+        spawn(command, args, {
+          stdio,
+          // Why: hide the outer wrapper only. A dedicated login console stays visible.
+          windowsHide: true,
+          env
+        }),
+      killProcessTree: killLoginProcessTree
+    })
   }
 }
diff --git a/src/main/codex/codex-hook-definition.ts b/src/main/codex/codex-hook-definition.ts
new file mode 100644
index 00000000000..6f03bc0aabe
--- /dev/null
+++ b/src/main/codex/codex-hook-definition.ts
@@ -0,0 +1,111 @@
+import { join } from 'node:path'
+import {
+  getSharedManagedScriptPath,
+  wrapPosixHookCommand,
+  wrapWindowsCmdHookCommand,
+  writeHooksJson,
+  type HookDefinition
+} from '../agent-hooks/installer-utils'
+import { POSIX_HOOK_STDIN_DRAIN_COMMAND } from '../agent-hooks/hook-stdin-contract'
+import { getOrcaManagedCodexHomePath, getSystemCodexHomePath } from './codex-home-paths'
+import { CODEX_HOOK_EVENT_LABEL, getCodexManagedScriptFileName } from './codex-hook-identity'
+import { getManagedScript } from './codex-hook-script'
+import type { CodexEventLabel } from './config-toml-trust'
+
+// Why: Pre/PostToolUse feed the live in-flight-tool readout; PermissionRequest exits with no decision so Codex still shows its approval UI while Orca flips the pane to waiting.
+export const CODEX_EVENTS = [
+  'SessionStart',
+  'UserPromptSubmit',
+  'PreToolUse',
+  'PermissionRequest',
+  'PostToolUse',
+  'SubagentStart',
+  'SubagentStop',
+  'Stop'
+] as const
+
+export function getConfigPath(runtimeHomePath: string = getOrcaManagedCodexHomePath()): string {
+  return join(runtimeHomePath, 'hooks.json')
+}
+
+export function writeCodexHooksJson(
+  configPath: string,
+  hooks: Record<string, HookDefinition[]>
+): void {
+  // Why: Codex rejects unknown top-level hooks.json fields, so plugin bookkeeping like `_managed` must not survive Orca's rewrite.
+  writeHooksJson(configPath, { hooks })
+}
+
+export function getCodexConfigTomlPath(
+  runtimeHomePath: string = getOrcaManagedCodexHomePath()
+): string {
+  return join(runtimeHomePath, 'config.toml')
+}
+
+// Why: managed-event subset of the shared label map; full mapping lives in codex-hook-identity.ts so promotion can't drift.
+export const CODEX_EVENT_LABEL: Record<(typeof CODEX_EVENTS)[number], CodexEventLabel> = {
+  SessionStart: CODEX_HOOK_EVENT_LABEL.SessionStart!,
+  UserPromptSubmit: CODEX_HOOK_EVENT_LABEL.UserPromptSubmit!,
+  PreToolUse: CODEX_HOOK_EVENT_LABEL.PreToolUse!,
+  PermissionRequest: CODEX_HOOK_EVENT_LABEL.PermissionRequest!,
+  PostToolUse: CODEX_HOOK_EVENT_LABEL.PostToolUse!,
+  SubagentStart: CODEX_HOOK_EVENT_LABEL.SubagentStart!,
+  SubagentStop: CODEX_HOOK_EVENT_LABEL.SubagentStop!,
+  Stop: CODEX_HOOK_EVENT_LABEL.Stop!
+}
+
+export const CODEX_MANAGED_EVENT_LABELS = new Set<CodexEventLabel>(
+  CODEX_EVENTS.map((eventName) => CODEX_EVENT_LABEL[eventName])
+)
+
+export const CODEX_PLUGIN_ONLY_HOOK_PLACEHOLDERS = [
+  '${CLAUDE_PLUGIN_ROOT}',
+  '${CLAUDE_PLUGIN_DATA}',
+  '${PLUGIN_ROOT}',
+  '${PLUGIN_DATA}'
+] as const
+
+export function getManagedScriptPath(): string {
+  return getSharedManagedScriptPath(getCodexManagedScriptFileName())
+}
+
+export function getManagedCommand(scriptPath: string): string {
+  return process.platform === 'win32'
+    ? wrapWindowsCmdHookCommand(scriptPath)
+    : wrapPosixHookCommand(scriptPath)
+}
+
+export type CodexManagedHookInstallMaterial = {
+  events: readonly (typeof CODEX_EVENTS)[number][]
+  eventLabel: Record<(typeof CODEX_EVENTS)[number], CodexEventLabel>
+  scriptPath: string
+  command: string
+  script: string
+}
+
+// Why: the real-home installer must byte-match the managed lane's events,
+// command, and script, or trust signatures diverge between the two homes.
+export function getCodexManagedHookInstallMaterial(): CodexManagedHookInstallMaterial {
+  const scriptPath = getManagedScriptPath()
+  return {
+    events: CODEX_EVENTS,
+    eventLabel: CODEX_EVENT_LABEL,
+    scriptPath,
+    command: getManagedCommand(scriptPath),
+    script: getManagedScript()
+  }
+}
+
+export function wrapReadablePosixHookCommand(scriptPath: string): string {
+  const quoted = `'${scriptPath.replaceAll("'", "'\\''")}'`
+  // Why: WSL hooks are written from Windows over UNC where the exec bit is unreliable; a missing script must still own stdin.
+  return `if [ -f ${quoted} ] && [ -r ${quoted} ]; then /bin/sh ${quoted}; else ${POSIX_HOOK_STDIN_DRAIN_COMMAND}; fi`
+}
+
+export function getSystemConfigPath(): string {
+  return join(getSystemCodexHomePath(), 'hooks.json')
+}
+
+export function getSystemCodexConfigTomlPath(): string {
+  return join(getSystemCodexHomePath(), 'config.toml')
+}
diff --git a/src/main/codex/codex-hook-legacy-cleanup.ts b/src/main/codex/codex-hook-legacy-cleanup.ts
new file mode 100644
index 00000000000..3177fdaa5a1
--- /dev/null
+++ b/src/main/codex/codex-hook-legacy-cleanup.ts
@@ -0,0 +1,196 @@
+import { existsSync, readFileSync, statSync, unlinkSync } from 'node:fs'
+import { join } from 'node:path'
+import {
+  createManagedCommandMatcher,
+  hookDefinitionHasManagedCommand,
+  readHooksJsonWithRaw,
+  removeManagedCommands,
+  writeHooksJson
+} from '../agent-hooks/installer-utils'
+import { resolveHooksJsonWritePath } from '../agent-hooks/hook-config-write-path'
+import { writeFileAtomically } from '../codex-accounts/fs-utils'
+import { writeConfigAtomically, type CodexTrustEntry } from './config-toml-trust'
+import {
+  getConfigPath,
+  getSystemCodexConfigTomlPath,
+  getSystemConfigPath
+} from './codex-hook-definition'
+import { getCodexManagedScriptFileName } from './codex-hook-identity'
+import { getSystemCodexHomePath } from './codex-home-paths'
+import {
+  collectManagedTrustEntries,
+  removeSelfComputedMatchingTrustEntries,
+  removeSystemManagedHookTrustEntries
+} from './codex-hook-trust-cleanup'
+import { readCodexTrustGrantLedgerHomeForReconciliation } from './codex-managed-trust-reconciliation'
+import { runExclusivelyForCodexTrustConfig } from './codex-trust-config-mutation-queue'
+import { mutateRealHomeHooksPreservingUserTrust } from './codex-user-hook-trust-rebase'
+
+const LEGACY_ORCA_PROFILE_NAME = 'orca-agent-status'
+const LEGACY_ORCA_PROFILE_BLOCK_START = '# BEGIN ORCA AGENT STATUS HOOKS'
+const LEGACY_ORCA_PROFILE_BLOCK_END = '# END ORCA AGENT STATUS HOOKS'
+
+// Why: when the real-home lane owns ~/.codex/hooks.json (system-default flag ON
+// with hooks enabled), the legacy system-home sweep must stand down or every
+// managed install would delete the entry the real-home installer just wrote.
+// Injected as a gate because this module is bundled into plain-node CLI entries
+// that have no settings store; the CLI default keeps the sweep active.
+let systemCodexHomeHookSweepSuppressed: () => boolean = () => false
+
+export function setSystemCodexHomeHookSweepSuppressed(gate: () => boolean): void {
+  systemCodexHomeHookSweepSuppressed = gate
+}
+
+function getLegacyCodexProfileTomlPath(): string {
+  return join(getSystemCodexHomePath(), `${LEGACY_ORCA_PROFILE_NAME}.config.toml`)
+}
+
+export function cleanupLegacySystemManagedHooks(): Promise<void> {
+  // Why: shares the real-home lane with ensureRealHomeCodexHookState — both
+  // capture, mutate and roll back the user's ~/.codex/config.toml.
+  return runExclusivelyForCodexTrustConfig(
+    getSystemCodexConfigTomlPath(),
+    sweepLegacySystemManagedHooks
+  )
+}
+
+async function sweepLegacySystemManagedHooks(): Promise<void> {
+  if (systemCodexHomeHookSweepSuppressed()) {
+    return
+  }
+  const legacyConfigPath = getSystemConfigPath()
+  const runtimeConfigPath = getConfigPath()
+  if (legacyConfigPath === runtimeConfigPath) {
+    return
+  }
+
+  const systemHomePath = getSystemCodexHomePath()
+  const hasRecordedRealHomeGrant =
+    readCodexTrustGrantLedgerHomeForReconciliation(systemHomePath) !== null
+  // Why: the pre-write guard below compares against these bytes; a separate
+  // later read would let a concurrent save land between parse and snapshot.
+  const { raw: previousRaw, config } = readHooksJsonWithRaw(legacyConfigPath)
+  // Why: `config === null` with no raw is the "could not read" answer, not the
+  // "no hooks here" one — the branch below removes managed trust entries AND
+  // their grant-ledger record, so acting on it would discard approvals over a
+  // read that merely failed. A genuine absence still returns `config: {}`.
+  if (config === null && previousRaw === null) {
+    return
+  }
+  if (!config?.hooks || previousRaw === null) {
+    if (hasRecordedRealHomeGrant) {
+      removeSystemManagedHookTrustEntries(systemHomePath, legacyConfigPath)
+    }
+    return
+  }
+
+  const isManagedCommand = createManagedCommandMatcher(getCodexManagedScriptFileName())
+  const nextHooks = { ...config.hooks }
+  const trustEntries: CodexTrustEntry[] = []
+  let removedManagedHook = false
+  for (const [eventName, definitions] of Object.entries(nextHooks)) {
+    if (!Array.isArray(definitions)) {
+      continue
+    }
+    const eventTrustEntries = collectManagedTrustEntries(
+      legacyConfigPath,
+      eventName,
+      definitions,
+      isManagedCommand
+    )
+    // Why: user hook configs can be large; avoid the argument limit from push(...entries).
+    for (const entry of eventTrustEntries) {
+      trustEntries.push(entry)
+    }
+    const cleaned = removeManagedCommands(definitions, isManagedCommand)
+    removedManagedHook ||= definitions.some((definition) =>
+      hookDefinitionHasManagedCommand(definition, isManagedCommand)
+    )
+    if (cleaned.length === 0) {
+      delete nextHooks[eventName]
+    } else {
+      nextHooks[eventName] = cleaned
+    }
+  }
+
+  // Why: Codex hooks moved to Orca's managed CODEX_HOME; stale ~/.codex entries would keep external Codex sessions reporting into Orca.
+  if (removedManagedHook) {
+    // Why: this is the user's system hooks file, not Orca's runtime copy.
+    // Remove only stale Orca hook entries and preserve other managers' metadata.
+    const hooksWritePath = resolveHooksJsonWritePath(legacyConfigPath)
+    const previousMode = statSync(hooksWritePath).mode
+    await mutateRealHomeHooksPreservingUserTrust({
+      sourcePath: legacyConfigPath,
+      runtimeHomePath: systemHomePath,
+      tomlPath: getSystemCodexConfigTomlPath(),
+      beforeHooks: config.hooks,
+      afterHooks: nextHooks,
+      writeHooks: () => {
+        if (
+          readFileSync(legacyConfigPath, 'utf-8') !== previousRaw ||
+          resolveHooksJsonWritePath(legacyConfigPath) !== hooksWritePath
+        ) {
+          // Why: the pre-mutation RPC may overlap a user save; downgrade must
+          // never replace that newer dotfiles generation with our stale parse.
+          throw new Error('System Codex hooks changed during trust repair')
+        }
+        writeHooksJson(hooksWritePath, { ...config, hooks: nextHooks }, { preserveMode: true })
+      },
+      restoreHooks: () => writeFileAtomically(hooksWritePath, previousRaw, { mode: previousMode })
+    })
+    // Why: stale dev/version entries can reference an older managed script
+    // path that is not represented by the current grant ledger.
+    removeSelfComputedMatchingTrustEntries(getSystemCodexConfigTomlPath(), trustEntries)
+  }
+  if (removedManagedHook || hasRecordedRealHomeGrant) {
+    // Why: the ledger recognizes Codex-computed hashes and remains a retry
+    // marker if a prior cleanup removed hooks.json but could not update TOML.
+    removeSystemManagedHookTrustEntries(systemHomePath, legacyConfigPath)
+  }
+}
+
+function stripLegacyManagedProfileBlock(content: string): string {
+  const start = content.indexOf(LEGACY_ORCA_PROFILE_BLOCK_START)
+  if (start === -1) {
+    return content
+  }
+  const endMarker = content.indexOf(LEGACY_ORCA_PROFILE_BLOCK_END, start)
+  const end = endMarker === -1 ? content.length : endMarker + LEGACY_ORCA_PROFILE_BLOCK_END.length
+  const before = content.slice(0, start).replace(/[ \t]*(?:\r?\n)*$/, '')
+  const after = content.slice(end).replace(/^(?:\r?\n)+/, '')
+  if (!before) {
+    return after
+  }
+  if (!after) {
+    return before.endsWith('\n') ? before : `${before}\n`
+  }
+  return `${before}\n\n${after}`
+}
+
+function cleanupLegacyCodexProfileHooks(): void {
+  const profilePath = getLegacyCodexProfileTomlPath()
+  if (!existsSync(profilePath)) {
+    return
+  }
+
+  const existing = readFileSync(profilePath, 'utf-8')
+  const next = stripLegacyManagedProfileBlock(existing)
+  if (next === existing) {
+    return
+  }
+  // Why: #2778 wrote Orca hooks into a Codex profile file; runtime CODEX_HOME supersedes it, so remove only Orca's marked block.
+  if (next.trim().length === 0) {
+    unlinkSync(profilePath)
+  } else {
+    writeConfigAtomically(profilePath, next)
+  }
+}
+
+export async function cleanupLegacyManagedHookRepresentations(): Promise<void> {
+  try {
+    await cleanupLegacySystemManagedHooks()
+    cleanupLegacyCodexProfileHooks()
+  } catch (error) {
+    console.warn('[codex-hook-service] failed to clean legacy Codex hooks', error)
+  }
+}
diff --git a/src/main/codex/codex-hook-local-install.ts b/src/main/codex/codex-hook-local-install.ts
new file mode 100644
index 00000000000..be3582d3879
--- /dev/null
+++ b/src/main/codex/codex-hook-local-install.ts
@@ -0,0 +1,185 @@
+import type { AgentHookInstallStatus } from '../../shared/agent-hook-types'
+import {
+  buildManagedCommandHook,
+  createManagedCommandMatcher,
+  MANAGED_HOOK_TIMEOUT_SECONDS,
+  readHooksJson,
+  removeManagedCommands,
+  writeManagedScript,
+  type HookDefinition
+} from '../agent-hooks/installer-utils'
+import { syncSystemConfigIntoManagedCodexHome } from './codex-config-mirror'
+import {
+  getCodexExplicitHomeHookSourcePath,
+  upsertHookTrustEntries,
+  type CodexTrustEntry
+} from './config-toml-trust'
+import {
+  CODEX_EVENTS,
+  CODEX_EVENT_LABEL,
+  getCodexConfigTomlPath,
+  getConfigPath,
+  getManagedCommand,
+  getManagedScriptPath,
+  writeCodexHooksJson
+} from './codex-hook-definition'
+import { getCodexManagedScriptFileName } from './codex-hook-identity'
+import { cleanupLegacyManagedHookRepresentations } from './codex-hook-legacy-cleanup'
+import { getManagedScript } from './codex-hook-script'
+import { grantManagedCodexHookTrust } from './codex-hook-trust-grant'
+import { removeStaleRuntimeHookTrustEntries } from './codex-hook-trust-cleanup'
+import {
+  promoteCodexRuntimeHookApprovalsToSystem,
+  snapshotCodexRuntimeHookTrustProvenance
+} from './hook-trust-promotion'
+import {
+  applyMirroredRuntimeUserHookTrustStates,
+  getRuntimeHooksWithSystemUserHooks,
+  moveMirroredRuntimeUserTrustAfterManagedStatusHook
+} from './codex-hook-user-mirroring'
+import { getSystemCodexHomePath } from './codex-home-paths'
+
+export async function installCodexHooksExclusively(
+  runtimeHomePath: string,
+  getStatusAfterInstall: (
+    recentGrantEntries: readonly CodexTrustEntry[],
+    runtimeHomePath: string
+  ) => AgentHookInstallStatus
+): Promise<AgentHookInstallStatus> {
+  const configPath = getConfigPath(runtimeHomePath)
+  const scriptPath = getManagedScriptPath()
+  // Why: must run before this install rewrites hooks.json/config.toml —
+  // approvals the user made inside Orca-launched Codex are keyed to the
+  // previous launch's runtime layout, and stale-trust cleanup below would
+  // delete them once the system config stops backing them.
+  promoteCodexRuntimeHookApprovalsToSystem(runtimeHomePath)
+  const config = readHooksJson(configPath)
+  if (!config) {
+    return {
+      agent: 'codex',
+      state: 'error',
+      configPath,
+      managedHooksPresent: false,
+      detail: 'Could not parse Codex hooks.json'
+    }
+  }
+
+  // Why: match by script filename (not exact command) so a fresh install sweeps stale entries from older builds or a different userData path.
+  const isManagedCommand = createManagedCommandMatcher(getCodexManagedScriptFileName())
+  const command = getManagedCommand(scriptPath)
+  const hookPlan = getRuntimeHooksWithSystemUserHooks(config.hooks, isManagedCommand, configPath)
+  if (!hookPlan) {
+    return {
+      agent: 'codex',
+      state: 'error',
+      configPath,
+      managedHooksPresent: false,
+      detail: 'Could not read system Codex hooks.json'
+    }
+  }
+  const nextHooks = hookPlan.hooks
+  const managedEvents = new Set<string>(CODEX_EVENTS)
+
+  // Why: sweep managed entries from events we no longer subscribe to (e.g. a prior install's PreToolUse), else they keep firing stale hooks after upgrade.
+  for (const [eventName, definitions] of Object.entries(nextHooks)) {
+    if (managedEvents.has(eventName)) {
+      continue
+    }
+    if (!Array.isArray(definitions)) {
+      // Why: a non-array event value would make removeManagedCommands throw; skip the unparsable entry, managed events below still install.
+      continue
+    }
+    const cleaned = removeManagedCommands(definitions, isManagedCommand)
+    if (cleaned.length === 0) {
+      delete nextHooks[eventName]
+    } else {
+      nextHooks[eventName] = cleaned
+    }
+  }
+
+  // Why: Codex 0.129+ requires a per-hook config.toml trust entry or the hook needs manual /hooks-approve; precompute the hash to avoid that.
+  const mirroredUserTrustEntries = moveMirroredRuntimeUserTrustAfterManagedStatusHook(
+    hookPlan.trustEntries
+  )
+  const mirroredTrustEntries: CodexTrustEntry[] = mirroredUserTrustEntries.map(({ entry }) => entry)
+  const managedTrustEntries: CodexTrustEntry[] = []
+  const trustSourcePath = getCodexExplicitHomeHookSourcePath(configPath)
+  for (const eventName of CODEX_EVENTS) {
+    const current = Array.isArray(nextHooks[eventName]) ? nextHooks[eventName] : []
+    const cleaned = removeManagedCommands(current, isManagedCommand)
+    const definition: HookDefinition = {
+      hooks: [buildManagedCommandHook(command)]
+    }
+    nextHooks[eventName] = [definition, ...cleaned]
+    // Why: the status hook must run before user hooks so a slow
+    // PostToolUse/Stop hook cannot leave the sidebar stuck on the previous
+    // state while Codex visibly reports that hooks are still running.
+    // timeoutSec mirrors the hook's `timeout` so the trust hash matches the
+    // entry actually written to hooks.json.
+    managedTrustEntries.push({
+      sourcePath: trustSourcePath,
+      eventLabel: CODEX_EVENT_LABEL[eventName],
+      groupIndex: 0,
+      handlerIndex: 0,
+      command,
+      timeoutSec: MANAGED_HOOK_TIMEOUT_SECONDS
+    })
+  }
+  const trustEntries: CodexTrustEntry[] = [...mirroredTrustEntries, ...managedTrustEntries]
+  let recentGrantEntries: readonly CodexTrustEntry[] = []
+
+  config.hooks = nextHooks
+  writeManagedScript(scriptPath, getManagedScript())
+  writeCodexHooksJson(configPath, nextHooks)
+  // Why: trust entries write last so a half-write can't leave a hash pointing at a nonexistent hook.
+  // Why: surface trust-write failures — otherwise getStatus reports green for a hook Codex won't fire.
+  try {
+    const tomlPath = getCodexConfigTomlPath(runtimeHomePath)
+    syncSystemConfigIntoManagedCodexHome({
+      runtimeHomePath,
+      systemHomePath: getSystemCodexHomePath()
+    })
+    // Why: Codex is the only authority on its trust-hash algorithm, so the
+    // managed entries are granted through codex app-server RPCs (verified by
+    // re-list) whenever the installed CLI supports them; the granted entries
+    // then carry Codex's verbatim hashes into stale cleanup so it cannot
+    // delete what Codex just wrote. Mirrored user trust keeps its existing
+    // verbatim-carry lane either way.
+    const grant = await grantManagedCodexHookTrust({
+      runtimeHomePath,
+      tomlPath,
+      managedCommand: command,
+      managedEntries: managedTrustEntries,
+      host: { kind: 'native' },
+      telemetryLane: 'managed'
+    })
+    if (grant.lane === 'rpc') {
+      recentGrantEntries = grant.entries
+      upsertHookTrustEntries(tomlPath, mirroredTrustEntries)
+      removeStaleRuntimeHookTrustEntries(tomlPath, configPath, [
+        ...mirroredTrustEntries,
+        ...grant.entries
+      ])
+    } else {
+      // Why: system user hook approvals are mirrored into runtime CODEX_HOME.
+      // If the user later revokes approval in ~/.codex/config.toml, preserving
+      // all old runtime [hooks.state.*] blocks would keep Orca Codex trusted.
+      // Upsert first so duplicate repair can preserve a disabled managed copy
+      // before stale cleanup removes old managed hook keys.
+      upsertHookTrustEntries(tomlPath, trustEntries)
+      removeStaleRuntimeHookTrustEntries(tomlPath, configPath, trustEntries)
+    }
+    applyMirroredRuntimeUserHookTrustStates(tomlPath, mirroredUserTrustEntries)
+  } catch (error) {
+    return {
+      agent: 'codex',
+      state: 'error',
+      configPath,
+      managedHooksPresent: true,
+      detail: `Hooks installed but trust entries could not be written: ${error instanceof Error ? error.message : String(error)}. Run /hooks in Codex to approve.`
+    }
+  }
+  snapshotCodexRuntimeHookTrustProvenance(runtimeHomePath)
+  await cleanupLegacyManagedHookRepresentations()
+  return getStatusAfterInstall(recentGrantEntries, runtimeHomePath)
+}
diff --git a/src/main/codex/codex-hook-local-maintenance.ts b/src/main/codex/codex-hook-local-maintenance.ts
new file mode 100644
index 00000000000..8b45049e516
--- /dev/null
+++ b/src/main/codex/codex-hook-local-maintenance.ts
@@ -0,0 +1,135 @@
+import { existsSync } from 'node:fs'
+import type { AgentHookInstallStatus } from '../../shared/agent-hook-types'
+import {
+  createManagedCommandMatcher,
+  readHooksJson,
+  removeManagedCommands
+} from '../agent-hooks/installer-utils'
+import { syncSystemConfigIntoManagedCodexHome } from './codex-config-mirror'
+import { upsertHookTrustEntries } from './config-toml-trust'
+import { getCodexConfigTomlPath, getConfigPath, writeCodexHooksJson } from './codex-hook-definition'
+import { getCodexManagedScriptFileName } from './codex-hook-identity'
+import { cleanupLegacyManagedHookRepresentations } from './codex-hook-legacy-cleanup'
+import {
+  removeRuntimeManagedHookTrustEntries,
+  removeStaleRuntimeHookTrustEntries
+} from './codex-hook-trust-cleanup'
+import {
+  applyMirroredRuntimeUserHookTrustStates,
+  getRuntimeHooksWithSystemUserHooks
+} from './codex-hook-user-mirroring'
+import { getSystemCodexHomePath } from './codex-home-paths'
+import {
+  promoteCodexRuntimeHookApprovalsToSystem,
+  snapshotCodexRuntimeHookTrustProvenance
+} from './hook-trust-promotion'
+
+export async function refreshCodexRuntimeUserHooksExclusively(
+  runtimeHomePath: string,
+  getStatus: (runtimeHomePath: string) => AgentHookInstallStatus
+): Promise<AgentHookInstallStatus> {
+  const configPath = getConfigPath(runtimeHomePath)
+  // Why: same as install() — capture in-Orca approvals before this refresh
+  // rewrites the runtime files they are keyed against.
+  promoteCodexRuntimeHookApprovalsToSystem(runtimeHomePath)
+  const config = readHooksJson(configPath)
+  if (!config) {
+    // Why: disabled launch prep once called remove(); preserve that legacy cleanup even when runtime hooks.json is malformed.
+    await cleanupLegacyManagedHookRepresentations()
+    return {
+      agent: 'codex',
+      state: 'error',
+      configPath,
+      managedHooksPresent: false,
+      detail: 'Could not parse Codex hooks.json'
+    }
+  }
+
+  const isManagedCommand = createManagedCommandMatcher(getCodexManagedScriptFileName())
+  const hookPlan = getRuntimeHooksWithSystemUserHooks(config.hooks, isManagedCommand, configPath)
+  if (!hookPlan) {
+    return {
+      agent: 'codex',
+      state: 'error',
+      configPath,
+      managedHooksPresent: false,
+      detail: 'Could not read system Codex hooks.json'
+    }
+  }
+  config.hooks = hookPlan.hooks
+  writeCodexHooksJson(configPath, hookPlan.hooks)
+
+  try {
+    const tomlPath = getCodexConfigTomlPath(runtimeHomePath)
+    const trustEntries = hookPlan.trustEntries.map(({ entry }) => entry)
+    syncSystemConfigIntoManagedCodexHome({
+      runtimeHomePath,
+      systemHomePath: getSystemCodexHomePath()
+    })
+    // Why: this path is used when Orca status hooks are disabled. The
+    // runtime CODEX_HOME should keep user hooks, but not Orca-managed trust.
+    // Write current mirrored user trust first so stale cleanup compares
+    // against current hashes while deleting old managed hook keys.
+    upsertHookTrustEntries(tomlPath, trustEntries)
+    removeStaleRuntimeHookTrustEntries(tomlPath, configPath, trustEntries)
+    applyMirroredRuntimeUserHookTrustStates(tomlPath, hookPlan.trustEntries)
+  } catch (error) {
+    return {
+      agent: 'codex',
+      state: 'error',
+      configPath,
+      managedHooksPresent: false,
+      detail: `User hooks refreshed but trust entries could not be written: ${error instanceof Error ? error.message : String(error)}. Run /hooks in Codex to approve.`
+    }
+  }
+  snapshotCodexRuntimeHookTrustProvenance(runtimeHomePath)
+
+  await cleanupLegacyManagedHookRepresentations()
+  return getStatus(runtimeHomePath)
+}
+
+export async function removeCodexHooksExclusively(
+  getStatus: () => AgentHookInstallStatus
+): Promise<AgentHookInstallStatus> {
+  const configPath = getConfigPath()
+  const configExists = existsSync(configPath)
+  const config = readHooksJson(configPath)
+  if (!config) {
+    // Why: a malformed hooks.json shouldn't strand old hooks in ~/.codex or the legacy profile after disabling.
+    await cleanupLegacyManagedHookRepresentations()
+    return {
+      agent: 'codex',
+      state: 'error',
+      configPath,
+      managedHooksPresent: false,
+      detail: 'Could not parse Codex hooks.json'
+    }
+  }
+
+  const nextHooks = { ...config.hooks }
+  // Why: same broad matcher as install() so stale entries from older builds get cleaned even if scriptPath moved.
+  const isManagedCommand = createManagedCommandMatcher(getCodexManagedScriptFileName())
+  for (const [eventName, definitions] of Object.entries(nextHooks)) {
+    if (!Array.isArray(definitions)) {
+      // Why: a non-array event value would make removeManagedCommands throw; skip it.
+      continue
+    }
+    const cleaned = removeManagedCommands(definitions, isManagedCommand)
+    if (cleaned.length === 0) {
+      delete nextHooks[eventName]
+    } else {
+      nextHooks[eventName] = cleaned
+    }
+  }
+  if (configExists) {
+    // Why: remove() may be the only repair path for a file whose top-level plugin metadata makes Codex reject hooks.json.
+    writeCodexHooksJson(configPath, nextHooks)
+  }
+
+  // Why: drop trust entries so config.toml doesn't accumulate dead [hooks.state] blocks across install/remove cycles.
+  removeRuntimeManagedHookTrustEntries(configPath)
+
+  await cleanupLegacyManagedHookRepresentations()
+
+  return getStatus()
+}
diff --git a/src/main/codex/codex-hook-remote-install.ts b/src/main/codex/codex-hook-remote-install.ts
new file mode 100644
index 00000000000..2b6105cdc3d
--- /dev/null
+++ b/src/main/codex/codex-hook-remote-install.ts
@@ -0,0 +1,143 @@
+import type { SFTPWrapper } from 'ssh2'
+import type { AgentHookInstallStatus } from '../../shared/agent-hook-types'
+import {
+  buildManagedCommandHook,
+  createManagedCommandMatcher,
+  MANAGED_HOOK_TIMEOUT_SECONDS,
+  removeManagedCommands,
+  wrapPosixHookCommand,
+  type HookDefinition
+} from '../agent-hooks/installer-utils'
+import {
+  readHooksJsonRemote,
+  readTextFileRemote,
+  writeHooksJsonRemote,
+  writeManagedScriptRemote,
+  writeTextFileRemoteAtomic
+} from '../agent-hooks/installer-utils-remote'
+import { upsertHookTrustEntriesInContent, type CodexTrustEntry } from './config-toml-trust'
+import {
+  CODEX_EVENTS,
+  CODEX_EVENT_LABEL,
+  wrapReadablePosixHookCommand
+} from './codex-hook-definition'
+import { getManagedScript } from './codex-hook-script'
+
+export async function installCodexHooksRemote(
+  sftp: SFTPWrapper,
+  remoteHome: string,
+  options?: { codexHomeDir?: string; deferTrustUntilConfigToml?: boolean }
+): Promise<AgentHookInstallStatus> {
+  const codexHomeBase =
+    options?.codexHomeDir?.replace(/\/$/, '') ?? `${remoteHome.replace(/\/$/, '')}/.codex`
+  const remoteConfigPath = `${codexHomeBase}/hooks.json`
+  const remoteTomlPath = `${codexHomeBase}/config.toml`
+  // Redirected WSL homes must use the same script location and command shape
+  // as the runtime installer; two representations of one hooks.json race
+  // into stale trust keys. Plain SSH keeps its guest-home script contract.
+  const redirectedCodexHome = options?.codexHomeDir?.replace(/\/$/, '')
+  const remoteScriptPath = redirectedCodexHome
+    ? `${redirectedCodexHome}/.orca/agent-hooks/codex-hook.sh`
+    : `${remoteHome.replace(/\/$/, '')}/.orca/agent-hooks/codex-hook.sh`
+  try {
+    const config = await readHooksJsonRemote(sftp, remoteConfigPath)
+    if (!config) {
+      return {
+        agent: 'codex',
+        state: 'error',
+        configPath: remoteConfigPath,
+        managedHooksPresent: false,
+        detail: 'Could not parse remote Codex hooks.json'
+      }
+    }
+
+    const command = redirectedCodexHome
+      ? wrapReadablePosixHookCommand(remoteScriptPath)
+      : wrapPosixHookCommand(remoteScriptPath)
+    const nextHooks = { ...config.hooks }
+    const managedEvents = new Set<string>(CODEX_EVENTS)
+    const isManagedCommand = createManagedCommandMatcher('codex-hook.sh')
+
+    for (const [eventName, definitions] of Object.entries(nextHooks)) {
+      if (managedEvents.has(eventName) || !Array.isArray(definitions)) {
+        continue
+      }
+      const cleaned = removeManagedCommands(definitions, isManagedCommand)
+      if (cleaned.length === 0) {
+        delete nextHooks[eventName]
+      } else {
+        nextHooks[eventName] = cleaned
+      }
+    }
+
+    const trustEntries: CodexTrustEntry[] = []
+    for (const eventName of CODEX_EVENTS) {
+      const current = Array.isArray(nextHooks[eventName]) ? nextHooks[eventName] : []
+      const cleaned = removeManagedCommands(current, isManagedCommand)
+      const definition: HookDefinition = {
+        hooks: [buildManagedCommandHook(command)]
+      }
+      nextHooks[eventName] = redirectedCodexHome
+        ? [definition, ...cleaned]
+        : [...cleaned, definition]
+      trustEntries.push({
+        sourcePath: remoteConfigPath,
+        eventLabel: CODEX_EVENT_LABEL[eventName],
+        groupIndex: redirectedCodexHome ? 0 : cleaned.length,
+        handlerIndex: 0,
+        command,
+        timeoutSec: MANAGED_HOOK_TIMEOUT_SECONDS
+      })
+    }
+
+    config.hooks = nextHooks
+    // Why: write script/settings before trust TOML; a partial trust write leaves Codex asking approval instead of running a missing script.
+    // Why: SSH remotes use POSIX `.sh` paths even when Orca runs on Windows; never derive remote script syntax from local OS.
+    await writeManagedScriptRemote(sftp, remoteScriptPath, getManagedScript('posix'))
+    // Why: SSH edits the user's remote ~/.codex/hooks.json directly, so preserve non-Orca top-level metadata while replacing the hooks tree.
+    await writeHooksJsonRemote(sftp, remoteConfigPath, { ...config, hooks: nextHooks })
+    try {
+      const existingTomlRaw = await readTextFileRemote(sftp, remoteTomlPath)
+      if (existingTomlRaw === null && options?.deferTrustUntilConfigToml === true) {
+        return {
+          agent: 'codex',
+          state: 'installed',
+          configPath: remoteConfigPath,
+          managedHooksPresent: true,
+          detail: 'Trust entries deferred until config.toml is seeded by the launch path'
+        }
+      }
+      const existingToml = existingTomlRaw ?? ''
+      const updatedToml = upsertHookTrustEntriesInContent(existingToml, trustEntries)
+      if (updatedToml !== existingToml) {
+        await writeTextFileRemoteAtomic(sftp, remoteTomlPath, updatedToml)
+      }
+    } catch (error) {
+      return {
+        agent: 'codex',
+        state: 'error',
+        configPath: remoteConfigPath,
+        managedHooksPresent: true,
+        detail: `Hooks installed but trust entries could not be written: ${
+          error instanceof Error ? error.message : String(error)
+        }. Run /hooks in Codex on the remote host to approve.`
+      }
+    }
+
+    return {
+      agent: 'codex',
+      state: 'installed',
+      configPath: remoteConfigPath,
+      managedHooksPresent: true,
+      detail: null
+    }
+  } catch (err) {
+    return {
+      agent: 'codex',
+      state: 'error',
+      configPath: remoteConfigPath,
+      managedHooksPresent: false,
+      detail: err instanceof Error ? err.message : String(err)
+    }
+  }
+}
diff --git a/src/main/codex/codex-hook-script.ts b/src/main/codex/codex-hook-script.ts
new file mode 100644
index 00000000000..7bbf6f7bab7
--- /dev/null
+++ b/src/main/codex/codex-hook-script.ts
@@ -0,0 +1,90 @@
+import { buildPosixAgentHookPostCommand } from '../agent-hooks/hook-post-command'
+import {
+  buildPosixHookPayloadCapture,
+  buildPosixHookSpoolLines,
+  buildWindowsHookEnvironmentGuardLines,
+  buildWindowsHookStdinDrainEpilogue
+} from '../agent-hooks/hook-stdin-contract'
+import { buildWindowsAgentHookCurlPostCommand } from '../agent-hooks/installer-utils'
+
+export function getManagedScript(target: 'local' | 'posix' = 'local'): string {
+  if (target === 'local' && process.platform === 'win32') {
+    return [
+      '@echo off',
+      'setlocal',
+      // Why: the endpoint file holds this install's live port/token; sourcing it lets a surviving PTY reach the current server (see claude/hook-service.ts).
+      'if defined ORCA_AGENT_HOOK_ENDPOINT if exist "%ORCA_AGENT_HOOK_ENDPOINT%" call "%ORCA_AGENT_HOOK_ENDPOINT%" 2>nul',
+      ...buildWindowsHookEnvironmentGuardLines(),
+      buildWindowsAgentHookCurlPostCommand('codex'),
+      'exit /b 0',
+      ...buildWindowsHookStdinDrainEpilogue(),
+      ''
+    ].join('\r\n')
+  }
+
+  return [
+    '#!/bin/sh',
+    ...buildPosixHookPayloadCapture(),
+    ...buildPosixHookSpoolLines('codex'),
+    // Why: sourcing refreshes PORT/TOKEN/ENV/VERSION from the current Orca so a surviving PTY keeps reporting after a restart (see claude/hook-service.ts).
+    'load_hook_endpoint() {',
+    '  endpoint_path="$1"',
+    '  unset ORCA_AGENT_HOOK_TRANSPORT',
+    '  case "$endpoint_path" in',
+    '    *.cmd)',
+    // Why: Windows passes endpoint.cmd into WSL via WSLENV; parse only Orca's known assignments since cmd.exe `set` lines aren't shell syntax.
+    '      endpoint_cr=$(printf "\\r")',
+    '      while IFS= read -r endpoint_line || [ -n "$endpoint_line" ]; do',
+    '        endpoint_line=${endpoint_line%"$endpoint_cr"}',
+    '        case "$endpoint_line" in',
+    '          "set ORCA_AGENT_HOOK_PORT="*) ORCA_AGENT_HOOK_PORT=${endpoint_line#*=} ;;',
+    '          "set ORCA_AGENT_HOOK_TOKEN="*) ORCA_AGENT_HOOK_TOKEN=${endpoint_line#*=} ;;',
+    '          "set ORCA_AGENT_HOOK_ENV="*) ORCA_AGENT_HOOK_ENV=${endpoint_line#*=} ;;',
+    '          "set ORCA_AGENT_HOOK_VERSION="*) ORCA_AGENT_HOOK_VERSION=${endpoint_line#*=} ;;',
+    '          "set ORCA_AGENT_HOOK_TRANSPORT="*) ORCA_AGENT_HOOK_TRANSPORT=${endpoint_line#*=} ;;',
+    '        esac',
+    '      done < "$endpoint_path"',
+    '      ;;',
+    '    *)',
+    '      . "$endpoint_path" 2>/dev/null || :',
+    '      ;;',
+    '  esac',
+    '}',
+    'if [ -n "$ORCA_AGENT_HOOK_ENDPOINT" ] && [ -r "$ORCA_AGENT_HOOK_ENDPOINT" ]; then',
+    '  load_hook_endpoint "$ORCA_AGENT_HOOK_ENDPOINT"',
+    'fi',
+    'if [ -z "$ORCA_AGENT_HOOK_PORT" ] || [ -z "$ORCA_AGENT_HOOK_TOKEN" ] || [ -z "$ORCA_PANE_KEY" ]; then',
+    '  spool_hook_event',
+    '  exit 0',
+    'fi',
+    'post_codex_hook() {',
+    '  curl_bin="$1"',
+    '  connect_timeout="${2:-0.5}"',
+    '  max_time="${3:-1.5}"',
+    // Why: keep full hook JSON off the command line and avoid URL-encoding paths/commands into IDS-friendly traversal signatures.
+    ...buildPosixAgentHookPostCommand('codex', {
+      curlCommand: '"$curl_bin"',
+      indent: '    '
+    }).map((line) => `  ${line}`),
+    '}',
+    'is_wsl_runtime() {',
+    '  [ -n "$WSL_DISTRO_NAME" ] && return 0',
+    '  grep -qiE "microsoft|wsl" /proc/sys/kernel/osrelease /proc/version 2>/dev/null',
+    '}',
+    'if post_codex_hook curl >/dev/null 2>&1; then',
+    '  exit 0',
+    'fi',
+    'if is_wsl_runtime; then',
+    '  windows_curl=$(command -v curl.exe 2>/dev/null || true)',
+    '  if [ -n "$windows_curl" ] && [ -x "$windows_curl" ]; then',
+    '    if post_codex_hook "$windows_curl" 3 5 >/dev/null 2>&1; then',
+    '      exit 0',
+    '    fi',
+    '    # post_codex_hook "$windows_curl" 3 5 >/dev/null 2>&1 || true',
+    '  fi',
+    'fi',
+    'spool_hook_event',
+    'exit 0',
+    ''
+  ].join('\n')
+}
diff --git a/src/main/codex/codex-hook-service-implementation.ts b/src/main/codex/codex-hook-service-implementation.ts
new file mode 100644
index 00000000000..a5c40495bd6
--- /dev/null
+++ b/src/main/codex/codex-hook-service-implementation.ts
@@ -0,0 +1,228 @@
+import { win32 as pathWin32 } from 'node:path'
+import type { SFTPWrapper } from 'ssh2'
+import type { AgentHookInstallStatus } from '../../shared/agent-hook-types'
+import { refreshManagedScriptIfPresent } from '../agent-hooks/managed-hook-script-refresh'
+import { getOrcaManagedCodexHomePath } from './codex-home-paths'
+import { getManagedScriptPath } from './codex-hook-definition'
+import { installCodexHooksExclusively } from './codex-hook-local-install'
+import {
+  refreshCodexRuntimeUserHooksExclusively,
+  removeCodexHooksExclusively
+} from './codex-hook-local-maintenance'
+import { installCodexHooksRemote } from './codex-hook-remote-install'
+import { getManagedScript } from './codex-hook-script'
+import { getCodexHookStatusAfterInstall } from './codex-hook-status'
+import { removeStaleWslRuntimeManagedHookTrustEntries } from './codex-hook-trust-cleanup'
+import { runExclusivelyForRuntimeAndSystemTrustConfig } from './codex-hook-trust-queue'
+import {
+  getWslHookReconciliationAction,
+  getWslReconciliationKey,
+  installManagedHooksIntoWslRuntime,
+  refreshWslRuntimeUserHooks
+} from './codex-hook-wsl-runtime'
+import {
+  createCodexWslRuntimeHookInstallPlan,
+  type CodexWslRuntimeHookTarget,
+  type WslCanonicalPathSettlement
+} from './codex-wsl-hook-install-plan'
+import type { CodexTrustEntry } from './config-toml-trust'
+
+export class CodexHookService {
+  async refreshManagedScripts(): Promise<void> {
+    await refreshManagedScriptIfPresent(getManagedScriptPath(), getManagedScript())
+  }
+
+  private readonly wslReconciliationGeneration = new Map<string, number>()
+  private readonly wslInstallsInFlight = new Map<string, Promise<AgentHookInstallStatus | null>>()
+
+  private supersedeWslReconciliation(runtimeHomePath: string | null | undefined): number {
+    if (!runtimeHomePath) {
+      return 0
+    }
+    const key = getWslReconciliationKey(runtimeHomePath)
+    const generation = (this.wslReconciliationGeneration.get(key) ?? 0) + 1
+    this.wslReconciliationGeneration.set(key, generation)
+    return generation
+  }
+
+  async installForRuntimeHome(
+    runtimeHomePath: string | null | undefined,
+    target?: CodexWslRuntimeHookTarget
+  ): Promise<AgentHookInstallStatus | null> {
+    const generation = this.supersedeWslReconciliation(runtimeHomePath)
+    let installedTrustConfigPath: string | null = null
+    let installSucceeded = false
+    // Why: the install below now awaits a codex app-server session, so a
+    // settlement callback can land mid-install. This gate keeps reconciliation
+    // reading the finished install's flags, as it did when the install was
+    // synchronous and no callback could interleave with it.
+    let markPrimaryInstallSettled!: () => void
+    let reconciliationChain = new Promise<void>((resolve) => {
+      markPrimaryInstallSettled = resolve
+    })
+    const reconcileSettledWslCanonicalPath = async (
+      settlement: WslCanonicalPathSettlement
+    ): Promise<void> => {
+      if (!runtimeHomePath) {
+        return
+      }
+      const key = getWslReconciliationKey(runtimeHomePath)
+      const resolvedPlan =
+        settlement.status === 'resolved'
+          ? createCodexWslRuntimeHookInstallPlan(
+              runtimeHomePath,
+              target,
+              () => settlement.canonicalPath
+            )
+          : null
+      const action = getWslHookReconciliationAction({
+        settlement,
+        isCurrentGeneration: this.wslReconciliationGeneration.get(key) === generation,
+        installedTrustConfigPath,
+        resolvedTrustConfigPath: resolvedPlan?.trustConfigPath ?? null,
+        installSucceeded
+      })
+      if (action === 'none') {
+        return
+      }
+      if (action === 'remove') {
+        try {
+          removeStaleWslRuntimeManagedHookTrustEntries(
+            pathWin32.join(runtimeHomePath, 'config.toml'),
+            []
+          )
+        } catch (error) {
+          console.warn('[codex-hook-service] failed to revoke stale WSL hook trust', error)
+        }
+        return
+      }
+      if (!resolvedPlan) {
+        return
+      }
+      const status = await installManagedHooksIntoWslRuntime(resolvedPlan)
+      if (status.state === 'error') {
+        console.warn('[codex-hook-service] failed to reconcile WSL hook path', status.detail)
+        return
+      }
+      installedTrustConfigPath = resolvedPlan.trustConfigPath
+      installSucceeded = status.state === 'installed'
+    }
+    const onCanonicalPathSettled = (settlement: WslCanonicalPathSettlement): void => {
+      const run = (): Promise<void> => reconcileSettledWslCanonicalPath(settlement)
+      reconciliationChain = reconciliationChain.then(run, run)
+      void reconciliationChain.catch((error: unknown) => {
+        console.warn('[codex-hook-service] failed to reconcile WSL hook path', error)
+      })
+    }
+    const wslPlan = createCodexWslRuntimeHookInstallPlan(
+      runtimeHomePath,
+      target,
+      undefined,
+      onCanonicalPathSettled
+    )
+    installedTrustConfigPath = wslPlan?.trustConfigPath ?? null
+    try {
+      const status = wslPlan ? await installManagedHooksIntoWslRuntime(wslPlan) : null
+      installSucceeded = status?.state === 'installed'
+      return status
+    } finally {
+      markPrimaryInstallSettled()
+    }
+  }
+
+  installForRuntimeHomeSerialized(
+    runtimeHomePath: string | null | undefined,
+    target?: CodexWslRuntimeHookTarget
+  ): Promise<AgentHookInstallStatus | null> {
+    if (!runtimeHomePath) {
+      return Promise.resolve(null)
+    }
+    const targetKey = target?.runtime === 'wsl' ? target.wslDistro?.trim().toLowerCase() : ''
+    const key = `${getWslReconciliationKey(runtimeHomePath)}\0${targetKey ?? ''}`
+    const active = this.wslInstallsInFlight.get(key)
+    if (active) {
+      return active
+    }
+    const install = this.installForRuntimeHome(runtimeHomePath, target)
+    this.wslInstallsInFlight.set(key, install)
+    const clear = (): void => {
+      if (this.wslInstallsInFlight.get(key) === install) {
+        this.wslInstallsInFlight.delete(key)
+      }
+    }
+    void install.then(clear, clear)
+    return install
+  }
+
+  refreshRuntimeUserHooksForRuntimeHome(
+    runtimeHomePath: string | null | undefined,
+    target?: CodexWslRuntimeHookTarget
+  ): AgentHookInstallStatus | null {
+    this.supersedeWslReconciliation(runtimeHomePath)
+    const wslPlan = createCodexWslRuntimeHookInstallPlan(runtimeHomePath, target)
+    return wslPlan ? refreshWslRuntimeUserHooks(wslPlan) : null
+  }
+
+  getStatus(runtimeHomePath: string = getOrcaManagedCodexHomePath()): AgentHookInstallStatus {
+    return this.getStatusAfterInstall(null, runtimeHomePath)
+  }
+
+  private getStatusAfterInstall(
+    recentGrantEntries: readonly CodexTrustEntry[] | null,
+    runtimeHomePath: string = getOrcaManagedCodexHomePath()
+  ): AgentHookInstallStatus {
+    return getCodexHookStatusAfterInstall(recentGrantEntries, runtimeHomePath)
+  }
+
+  // Why: runtimeHomePath defaults to the shared managed mirror, but a managed
+  // account launching against its own self-contained CODEX_HOME passes that
+  // per-account home so hooks.json/config.toml/trust land where codex reads.
+  install(
+    runtimeHomePath: string = getOrcaManagedCodexHomePath()
+  ): Promise<AgentHookInstallStatus> {
+    // Why: same lane as the grant it performs — see installManagedHooksIntoWslRuntime.
+    return runExclusivelyForRuntimeAndSystemTrustConfig(runtimeHomePath, () =>
+      this.installExclusively(runtimeHomePath)
+    )
+  }
+
+  private installExclusively(runtimeHomePath: string): Promise<AgentHookInstallStatus> {
+    return installCodexHooksExclusively(runtimeHomePath, (recentGrantEntries, homePath) =>
+      this.getStatusAfterInstall(recentGrantEntries, homePath)
+    )
+  }
+
+  installRemote(
+    sftp: SFTPWrapper,
+    remoteHome: string,
+    options?: { codexHomeDir?: string; deferTrustUntilConfigToml?: boolean }
+  ): Promise<AgentHookInstallStatus> {
+    return installCodexHooksRemote(sftp, remoteHome, options)
+  }
+
+  refreshRuntimeUserHooks(
+    runtimeHomePath: string = getOrcaManagedCodexHomePath()
+  ): Promise<AgentHookInstallStatus> {
+    return runExclusivelyForRuntimeAndSystemTrustConfig(runtimeHomePath, () =>
+      this.refreshRuntimeUserHooksExclusively(runtimeHomePath)
+    )
+  }
+
+  private refreshRuntimeUserHooksExclusively(
+    runtimeHomePath: string
+  ): Promise<AgentHookInstallStatus> {
+    return refreshCodexRuntimeUserHooksExclusively(runtimeHomePath, (homePath) =>
+      this.getStatus(homePath)
+    )
+  }
+
+  remove(): Promise<AgentHookInstallStatus> {
+    return runExclusivelyForRuntimeAndSystemTrustConfig(getOrcaManagedCodexHomePath(), () =>
+      this.removeExclusively()
+    )
+  }
+
+  private removeExclusively(): Promise<AgentHookInstallStatus> {
+    return removeCodexHooksExclusively(() => this.getStatus())
+  }
+}
diff --git a/src/main/codex/codex-hook-status.ts b/src/main/codex/codex-hook-status.ts
new file mode 100644
index 00000000000..33619c52df3
--- /dev/null
+++ b/src/main/codex/codex-hook-status.ts
@@ -0,0 +1,161 @@
+import type { AgentHookInstallState, AgentHookInstallStatus } from '../../shared/agent-hook-types'
+import { MANAGED_HOOK_TIMEOUT_SECONDS, readHooksJson } from '../agent-hooks/installer-utils'
+import {
+  computeTrustKey,
+  computeTrustedHash,
+  getCodexExplicitHomeHookSourcePath,
+  normalizeHookTrustKeyForLookup,
+  readHookTrustEntries,
+  type CodexHookTrustState,
+  type CodexTrustEntry
+} from './config-toml-trust'
+import {
+  CODEX_EVENTS,
+  CODEX_EVENT_LABEL,
+  getCodexConfigTomlPath,
+  getConfigPath,
+  getManagedCommand,
+  getManagedScriptPath
+} from './codex-hook-definition'
+import { getCodexHookTrustSignature } from './codex-hook-identity'
+import { getCodexLedgerTrustedHash } from './codex-managed-trust-reconciliation'
+import { readCurrentNativeCodexTrustGrantLedgerHome } from './codex-trust-grant-host'
+import { getOrcaManagedCodexHomePath } from './codex-home-paths'
+
+export function getCodexHookStatusAfterInstall(
+  recentGrantEntries: readonly CodexTrustEntry[] | null,
+  runtimeHomePath: string = getOrcaManagedCodexHomePath()
+): AgentHookInstallStatus {
+  const configPath = getConfigPath(runtimeHomePath)
+  const scriptPath = getManagedScriptPath()
+  const config = readHooksJson(configPath)
+  if (!config) {
+    return {
+      agent: 'codex',
+      state: 'error',
+      configPath,
+      managedHooksPresent: false,
+      detail: 'Could not parse Codex hooks.json'
+    }
+  }
+
+  // Why: Codex 0.129+ silently drops untrusted hooks, so report `partial` when managed events OR their trust entries are missing/stale.
+  const command = getManagedCommand(scriptPath)
+  const tomlPath = getCodexConfigTomlPath(runtimeHomePath)
+  // Why: an unreadable config.toml (EACCES/EIO) is distinct from "file
+  // absent" (which returns an empty Map without throwing). Hooks.json may
+  // still be fine, so report partial with a specific reason rather than
+  // collapsing to a generic error or masking it as universally-stale trust.
+  let trustEntries: Map<string, CodexHookTrustState>
+  let trustReadError: string | null = null
+  try {
+    trustEntries = readHookTrustEntries(tomlPath)
+  } catch (error) {
+    trustEntries = new Map()
+    trustReadError = error instanceof Error ? error.message : String(error)
+  }
+  // Why: RPC-granted entries store Codex's own hash, which is authoritative
+  // even when it differs from computeTrustedHash — that difference is the
+  // drift bug class this lane exists to absorb, not a stale entry.
+  // Why: install() already resolved the binary and either verified Codex's
+  // hashes or wrote fallback hashes. Re-resolving PATH here doubles sync launch work.
+  const ledgerHome =
+    recentGrantEntries === null ? readCurrentNativeCodexTrustGrantLedgerHome(runtimeHomePath) : null
+  const recentGrantHashes = new Map<string, { signature: string; trustedHash: string }>()
+  for (const entry of recentGrantEntries ?? []) {
+    if (entry.trustedHash) {
+      recentGrantHashes.set(normalizeHookTrustKeyForLookup(computeTrustKey(entry)), {
+        signature: getCodexHookTrustSignature(entry),
+        trustedHash: entry.trustedHash
+      })
+    }
+  }
+
+  const missing: string[] = []
+  const trustMissing: string[] = []
+  const disabled: string[] = []
+  const trustSourcePath = getCodexExplicitHomeHookSourcePath(configPath)
+  let presentCount = 0
+  for (const eventName of CODEX_EVENTS) {
+    const definitions = Array.isArray(config.hooks?.[eventName]) ? config.hooks![eventName]! : []
+    // Why: older installs appended, current ones prepend; last-match keeps status repair conservative when stale duplicate definitions survive.
+    let foundGroupIndex = -1
+    let foundHandlerIndex = -1
+    definitions.forEach((definition, idx) => {
+      const hooks = definition.hooks ?? []
+      // Why: last-match-wins at the group level — if merged hook arrays repeat our command, the surviving runtime entry is the last one.
+      const handlerIdx = hooks.findLastIndex((hook) => hook.command === command)
+      if (handlerIdx !== -1) {
+        foundGroupIndex = idx
+        foundHandlerIndex = handlerIdx
+      }
+    })
+    if (foundGroupIndex === -1) {
+      missing.push(eventName)
+      continue
+    }
+    presentCount += 1
+    // Why: a stale hash blocks firing like a missing entry, so compare against the canonical hash we would write.
+    // Why: Codex's hook_key is positional, so hardcoding handlerIndex 0 misreports trust for user-merged hook arrays.
+    // Why: hash the same `timeout` install() writes, since Codex folds it into the trust hash or every managed hook reports stale-trust.
+    const trustInput: CodexTrustEntry = {
+      sourcePath: trustSourcePath,
+      eventLabel: CODEX_EVENT_LABEL[eventName],
+      groupIndex: foundGroupIndex,
+      handlerIndex: foundHandlerIndex,
+      command,
+      timeoutSec: MANAGED_HOOK_TIMEOUT_SECONDS
+    }
+    const trustKey = computeTrustKey(trustInput)
+    const validHashes = new Set([computeTrustedHash(trustInput)])
+    const grantedHash = getCodexLedgerTrustedHash(ledgerHome, trustKey, trustInput)
+    if (grantedHash) {
+      validHashes.add(grantedHash)
+    }
+    const recentGrant = recentGrantHashes.get(normalizeHookTrustKeyForLookup(trustKey))
+    if (
+      recentGrant?.signature === getCodexHookTrustSignature(trustInput) &&
+      recentGrant.trustedHash
+    ) {
+      validHashes.add(recentGrant.trustedHash)
+    }
+    const actualState = trustEntries.get(trustKey)
+    if (!actualState?.trustedHash || !validHashes.has(actualState.trustedHash)) {
+      trustMissing.push(eventName)
+    } else if (actualState?.enabled === false) {
+      disabled.push(eventName)
+    }
+  }
+  const managedHooksPresent = presentCount > 0
+  let state: AgentHookInstallState
+  let detail: string | null
+  if (presentCount === 0) {
+    state = 'not_installed'
+    // Why: surface the trust read error even when not_installed, so a broken config.toml gives actionable info.
+    detail = trustReadError !== null ? `Trust entries unverifiable: ${trustReadError}` : null
+  } else if (
+    missing.length === 0 &&
+    trustMissing.length === 0 &&
+    disabled.length === 0 &&
+    trustReadError === null
+  ) {
+    state = 'installed'
+    detail = null
+  } else {
+    state = 'partial'
+    const parts: string[] = []
+    if (missing.length > 0) {
+      parts.push(`Managed hook missing for events: ${missing.join(', ')}`)
+    }
+    if (trustReadError !== null) {
+      parts.push(`Trust entries unverifiable: ${trustReadError}`)
+    } else if (trustMissing.length > 0) {
+      parts.push(`Trust entry missing or stale for events: ${trustMissing.join(', ')}`)
+    }
+    if (disabled.length > 0) {
+      parts.push(`Managed hook disabled for events: ${disabled.join(', ')}`)
+    }
+    detail = parts.join('; ')
+  }
+  return { agent: 'codex', state, configPath, managedHooksPresent, detail }
+}
diff --git a/src/main/codex/codex-hook-system-trust.ts b/src/main/codex/codex-hook-system-trust.ts
new file mode 100644
index 00000000000..e93a6328fbc
--- /dev/null
+++ b/src/main/codex/codex-hook-system-trust.ts
@@ -0,0 +1,119 @@
+import type { HookDefinition } from '../agent-hooks/installer-utils'
+import {
+  codexHookSourcePathsEqual,
+  computeTrustKey,
+  computeTrustedHash,
+  normalizeCodexHookSourcePath,
+  parseTrustKey,
+  readHookTrustEntries,
+  type CodexEventLabel,
+  type CodexHookTrustState,
+  type CodexTrustEntry
+} from './config-toml-trust'
+import { createCodexHookTrustEntry, getCodexHookTrustSignature } from './codex-hook-identity'
+import { getSystemCodexConfigTomlPath } from './codex-hook-definition'
+
+export type TrustedSystemHookSignatureState = {
+  enabled: boolean
+  trustedHash: string
+}
+
+export function getTrustedSystemUserHookSignatures(
+  systemConfigPath: string,
+  systemHooks: Record<string, HookDefinition[]>,
+  isManagedCommand: (command: string | undefined) => boolean
+): Map<string, TrustedSystemHookSignatureState> {
+  const signatures = new Map<string, TrustedSystemHookSignatureState>()
+  let trustEntries: Map<string, CodexHookTrustState>
+  try {
+    trustEntries = readHookTrustEntries(getSystemCodexConfigTomlPath())
+  } catch (error) {
+    // Why: a hand-broken system config.toml should only disable user-hook trust mirroring, not block Orca's managed runtime hooks.
+    console.warn('[codex-hook-service] failed to read system hook trust entries', error)
+    return signatures
+  }
+  const trustedHashesByEvent = getTrustedSystemHookHashesByEvent(systemConfigPath, trustEntries)
+  for (const [eventName, definitions] of Object.entries(systemHooks)) {
+    if (!Array.isArray(definitions)) {
+      continue
+    }
+    definitions.forEach((definition, groupIndex) => {
+      const hooks = Array.isArray(definition.hooks) ? definition.hooks : []
+      hooks.forEach((hook, handlerIndex) => {
+        if (isManagedCommand(hook.command)) {
+          return
+        }
+        const entry = createCodexHookTrustEntry(
+          systemConfigPath,
+          eventName,
+          groupIndex,
+          handlerIndex,
+          definition,
+          hook
+        )
+        if (!entry) {
+          return
+        }
+        const state = resolveTrustedSystemHookState(entry, trustEntries, trustedHashesByEvent)
+        if (!state) {
+          return
+        }
+        const signature = getCodexHookTrustSignature(entry)
+        // Why: runtime deduping collapses identical definitions; if any duplicate stays enabled, keep the mirrored hook enabled.
+        if (state.enabled || !signatures.has(signature)) {
+          signatures.set(signature, state)
+        }
+      })
+    })
+  }
+  return signatures
+}
+
+function resolveTrustedSystemHookState(
+  entry: CodexTrustEntry,
+  trustEntries: ReadonlyMap<string, CodexHookTrustState>,
+  trustedHashesByEvent: ReadonlyMap<CodexEventLabel, Map<string, boolean>>
+): TrustedSystemHookSignatureState | null {
+  const expectedHash = computeTrustedHash(entry)
+  const state = trustEntries.get(computeTrustKey(entry))
+  if (state?.trustedHash === expectedHash) {
+    return { enabled: state.enabled !== false, trustedHash: expectedHash }
+  }
+  const reorderedEnabled = trustedHashesByEvent.get(entry.eventLabel)?.get(expectedHash)
+  if (reorderedEnabled !== undefined) {
+    return { enabled: reorderedEnabled, trustedHash: expectedHash }
+  }
+  if (state?.trustedHash) {
+    // Why: carry a key-matched system hash verbatim — recomputing caused #7110 re-approval loops since Codex owns its hash algorithm.
+    return { enabled: state.enabled !== false, trustedHash: state.trustedHash }
+  }
+  return null
+}
+
+function getTrustedSystemHookHashesByEvent(
+  systemConfigPath: string,
+  trustEntries: ReadonlyMap<string, CodexHookTrustState>
+): Map<CodexEventLabel, Map<string, boolean>> {
+  const trustedHashesByEvent = new Map<CodexEventLabel, Map<string, boolean>>()
+  const canonicalSystemConfigPath = normalizeCodexHookSourcePath(systemConfigPath)
+  for (const [key, state] of trustEntries) {
+    const parsed = parseTrustKey(key)
+    if (!parsed || !state.trustedHash) {
+      continue
+    }
+    if (!codexHookSourcePathsEqual(parsed.sourcePath, canonicalSystemConfigPath)) {
+      continue
+    }
+    let hashes = trustedHashesByEvent.get(parsed.eventLabel)
+    if (!hashes) {
+      hashes = new Map()
+      trustedHashesByEvent.set(parsed.eventLabel, hashes)
+    }
+    const enabled = state.enabled !== false
+    // Why: Codex trust keys include hook indices, but the hash still proves the same event+command identity was approved after a reorder.
+    if (enabled || !hashes.has(state.trustedHash)) {
+      hashes.set(state.trustedHash, enabled)
+    }
+  }
+  return trustedHashesByEvent
+}
diff --git a/src/main/codex/codex-hook-trust-cleanup.ts b/src/main/codex/codex-hook-trust-cleanup.ts
new file mode 100644
index 00000000000..cd64594d5af
--- /dev/null
+++ b/src/main/codex/codex-hook-trust-cleanup.ts
@@ -0,0 +1,172 @@
+import { win32 as pathWin32 } from 'node:path'
+import { MANAGED_HOOK_TIMEOUT_SECONDS, type HookDefinition } from '../agent-hooks/installer-utils'
+import {
+  codexHookSourcePathsEqual,
+  computeTrustKey,
+  computeTrustedHash,
+  getCodexExplicitHomeHookSourcePath,
+  normalizeHookTrustKeyForLookup,
+  parseTrustKey,
+  readHookTrustEntries,
+  removeHookTrustEntries,
+  type CodexTrustEntry
+} from './config-toml-trust'
+import { createCodexHookTrustEntry } from './codex-hook-identity'
+import {
+  CODEX_MANAGED_EVENT_LABELS,
+  getCodexConfigTomlPath,
+  getManagedCommand,
+  getManagedScriptPath,
+  getSystemCodexConfigTomlPath,
+  wrapReadablePosixHookCommand
+} from './codex-hook-definition'
+import { getOrcaManagedCodexHomePath } from './codex-home-paths'
+import {
+  removeCodexManagedHookTrustEntries,
+  removeStaleWslCodexManagedHookTrustEntries
+} from './codex-managed-trust-reconciliation'
+import type { CodexTrustGrantLedgerHome } from './codex-trust-grant-ledger'
+import type { CodexWslRuntimeHookInstallPlan } from './codex-wsl-hook-install-plan'
+
+export function collectManagedTrustEntries(
+  sourcePath: string,
+  eventName: string,
+  definitions: readonly HookDefinition[],
+  isManagedCommand: (command: string | undefined) => boolean
+): CodexTrustEntry[] {
+  const entries: CodexTrustEntry[] = []
+  definitions.forEach((definition, groupIndex) => {
+    const hooks = Array.isArray(definition.hooks) ? definition.hooks : []
+    hooks.forEach((hook, handlerIndex) => {
+      if (!isManagedCommand(hook.command)) {
+        return
+      }
+      const entry = createCodexHookTrustEntry(
+        sourcePath,
+        eventName,
+        groupIndex,
+        handlerIndex,
+        definition,
+        hook
+      )
+      if (entry) {
+        entries.push(entry)
+      }
+    })
+  })
+  return entries
+}
+
+export function removeSelfComputedMatchingTrustEntries(
+  configPath: string,
+  entries: readonly CodexTrustEntry[]
+): void {
+  if (entries.length === 0) {
+    return
+  }
+
+  const existingEntries = readHookTrustEntries(configPath)
+  const ownedKeys = entries
+    .map((entry) => {
+      const key = computeTrustKey(entry)
+      return existingEntries.get(key)?.trustedHash === computeTrustedHash(entry) ? key : null
+    })
+    .filter((key): key is string => key !== null)
+  if (ownedKeys.length > 0) {
+    removeHookTrustEntries(configPath, ownedKeys)
+  }
+}
+
+export function removeStaleRuntimeHookTrustEntries(
+  tomlPath: string,
+  runtimeHooksPath: string,
+  expectedEntries: readonly CodexTrustEntry[]
+): void {
+  const expectedHashes = new Map(
+    expectedEntries.map((entry) => [
+      normalizeHookTrustKeyForLookup(computeTrustKey(entry)),
+      entry.trustedHash ?? computeTrustedHash(entry)
+    ])
+  )
+  const canonicalRuntimeHooksPath = getCodexExplicitHomeHookSourcePath(runtimeHooksPath)
+  const staleKeys: string[] = []
+  for (const [key, state] of readHookTrustEntries(tomlPath)) {
+    const parsed = parseTrustKey(key)
+    if (!parsed || !codexHookSourcePathsEqual(parsed.sourcePath, canonicalRuntimeHooksPath)) {
+      continue
+    }
+    if (expectedHashes.get(normalizeHookTrustKeyForLookup(key)) === state.trustedHash) {
+      continue
+    }
+    staleKeys.push(key)
+  }
+  if (staleKeys.length > 0) {
+    removeHookTrustEntries(tomlPath, staleKeys)
+  }
+}
+
+export function removeSystemManagedHookTrustEntries(
+  systemHomePath: string,
+  hooksJsonPath: string
+): void {
+  removeCodexManagedHookTrustEntries({
+    tomlPath: getSystemCodexConfigTomlPath(),
+    runtimeHomePath: systemHomePath,
+    sourcePath: hooksJsonPath,
+    command: getManagedCommand(getManagedScriptPath()),
+    managedEventLabels: CODEX_MANAGED_EVENT_LABELS,
+    timeoutSec: MANAGED_HOOK_TIMEOUT_SECONDS
+  })
+}
+
+export function removeRuntimeManagedHookTrustEntries(configPath: string): void {
+  try {
+    removeCodexManagedHookTrustEntries({
+      tomlPath: getCodexConfigTomlPath(),
+      runtimeHomePath: getOrcaManagedCodexHomePath(),
+      sourcePath: configPath,
+      command: getManagedCommand(getManagedScriptPath()),
+      managedEventLabels: CODEX_MANAGED_EVENT_LABELS,
+      timeoutSec: MANAGED_HOOK_TIMEOUT_SECONDS,
+      sourceUsesExplicitCodexHome: true
+    })
+  } catch (error) {
+    // Best effort — stale trust is harmless once hooks.json no longer references the hook; log so a programmer error isn't silent.
+    console.warn('[codex-hook-service] failed to clean trust entries', error)
+  }
+}
+
+export function removeWslRuntimeManagedHookTrustEntries(
+  plan: CodexWslRuntimeHookInstallPlan
+): void {
+  try {
+    removeCodexManagedHookTrustEntries({
+      tomlPath: plan.tomlPath,
+      runtimeHomePath: pathWin32.dirname(plan.tomlPath),
+      sourcePath: plan.trustConfigPath,
+      command: wrapReadablePosixHookCommand(plan.commandScriptPath),
+      managedEventLabels: CODEX_MANAGED_EVENT_LABELS,
+      timeoutSec: MANAGED_HOOK_TIMEOUT_SECONDS
+    })
+  } catch (error) {
+    // Why: best-effort like host cleanup; stale trust is inert once hooks.json no longer points at us.
+    console.warn('[codex-hook-service] failed to clean WSL trust entries', error)
+  }
+}
+
+export function removeStaleWslRuntimeManagedHookTrustEntries(
+  tomlPath: string,
+  desiredEntries: readonly CodexTrustEntry[],
+  priorLedgerHomes: readonly CodexTrustGrantLedgerHome[] = []
+): void {
+  removeStaleWslCodexManagedHookTrustEntries({
+    tomlPath,
+    runtimeHomePath: pathWin32.dirname(tomlPath),
+    desiredEntries,
+    managedEventLabels: CODEX_MANAGED_EVENT_LABELS,
+    timeoutSec: MANAGED_HOOK_TIMEOUT_SECONDS,
+    buildManagedCommand: (linuxRuntimeHome) =>
+      wrapReadablePosixHookCommand(`${linuxRuntimeHome}/.orca/agent-hooks/codex-hook.sh`),
+    priorLedgerHomes
+  })
+}
diff --git a/src/main/codex/codex-hook-trust-queue.ts b/src/main/codex/codex-hook-trust-queue.ts
new file mode 100644
index 00000000000..58213071a2d
--- /dev/null
+++ b/src/main/codex/codex-hook-trust-queue.ts
@@ -0,0 +1,16 @@
+import { runExclusivelyForCodexTrustConfig } from './codex-trust-config-mutation-queue'
+import { getCodexConfigTomlPath, getSystemCodexConfigTomlPath } from './codex-hook-definition'
+
+// Why (#16441): these sequences mutate the runtime config.toml *and* the
+// system one — approval promotion, the system-config sync and the legacy sweep
+// all touch ~/.codex/config.toml — so holding only the runtime lane still lets
+// a real-home grant's capture->restore window swallow their writes. Lock order
+// is always runtime-before-system; every other holder acquires it that way too.
+export function runExclusivelyForRuntimeAndSystemTrustConfig<T>(
+  runtimeHomePath: string,
+  run: () => Promise<T>
+): Promise<T> {
+  return runExclusivelyForCodexTrustConfig(getCodexConfigTomlPath(runtimeHomePath), () =>
+    runExclusivelyForCodexTrustConfig(getSystemCodexConfigTomlPath(), run)
+  )
+}
diff --git a/src/main/codex/codex-hook-user-mirroring.ts b/src/main/codex/codex-hook-user-mirroring.ts
new file mode 100644
index 00000000000..c257819cf09
--- /dev/null
+++ b/src/main/codex/codex-hook-user-mirroring.ts
@@ -0,0 +1,219 @@
+import { existsSync, readFileSync } from 'node:fs'
+import {
+  readHooksJsonWithRaw,
+  removeManagedCommands,
+  type HookDefinition
+} from '../agent-hooks/installer-utils'
+import {
+  computeTrustKey,
+  escapeTomlString,
+  getCodexExplicitHomeHookSourcePath,
+  parseTrustKey,
+  writeConfigAtomically,
+  type CodexTrustEntry
+} from './config-toml-trust'
+import { createCodexHookTrustEntry, getCodexHookTrustSignature } from './codex-hook-identity'
+import {
+  CODEX_MANAGED_EVENT_LABELS,
+  CODEX_PLUGIN_ONLY_HOOK_PLACEHOLDERS,
+  getConfigPath,
+  getSystemConfigPath
+} from './codex-hook-definition'
+import {
+  getTrustedSystemUserHookSignatures,
+  type TrustedSystemHookSignatureState
+} from './codex-hook-system-trust'
+
+type MirroredRuntimeUserHookTrustEntry = {
+  entry: CodexTrustEntry
+  enabled: boolean
+}
+
+function commandUsesCodexPluginOnlyPlaceholder(command: string | undefined): boolean {
+  return (
+    typeof command === 'string' &&
+    CODEX_PLUGIN_ONLY_HOOK_PLACEHOLDERS.some((placeholder) => command.includes(placeholder))
+  )
+}
+
+function removeCodexPluginEnvironmentCommands(definitions: HookDefinition[]): HookDefinition[] {
+  // Why: plugin placeholders only resolve for Codex plugin hook sources; mirroring them into a plain runtime hooks.json turns them into 127s.
+  return removeManagedCommands(definitions, commandUsesCodexPluginOnlyPlaceholder)
+}
+
+export function getRuntimeHooksWithSystemUserHooks(
+  runtimeHooks: Record<string, HookDefinition[]> | undefined,
+  isManagedCommand: (command: string | undefined) => boolean,
+  runtimeConfigPath: string = getConfigPath()
+): {
+  hooks: Record<string, HookDefinition[]>
+  trustEntries: MirroredRuntimeUserHookTrustEntry[]
+} | null {
+  const systemConfigPath = getSystemConfigPath()
+  if (systemConfigPath === runtimeConfigPath) {
+    return { hooks: { ...runtimeHooks }, trustEntries: [] }
+  }
+
+  const { raw: systemRaw, config: systemConfig } = readHooksJsonWithRaw(systemConfigPath)
+  if (!systemConfig && systemRaw === null) {
+    // Why: rebuilding from an unreadable source drops the last-known user hooks
+    // from the managed runtime; let launch prep retry without changing it.
+    return null
+  }
+  if (!systemConfig?.hooks) {
+    return { hooks: {}, trustEntries: [] }
+  }
+
+  const nextHooks: Record<string, HookDefinition[]> = {}
+  const trustedSystemHookSignatures = getTrustedSystemUserHookSignatures(
+    systemConfigPath,
+    systemConfig.hooks,
+    isManagedCommand
+  )
+  for (const [eventName, systemDefinitions] of Object.entries(systemConfig.hooks)) {
+    if (!Array.isArray(systemDefinitions)) {
+      continue
+    }
+
+    const systemUserDefinitions = removeCodexPluginEnvironmentCommands(
+      removeManagedCommands(systemDefinitions, isManagedCommand)
+    )
+    if (systemUserDefinitions.length === 0) {
+      continue
+    }
+
+    // Why: rebuild from system hooks; reusing old runtime copies would keep deleted/edited ~/.codex/hooks.json entries alive for new sessions.
+    nextHooks[eventName] = dedupeHookDefinitions(systemUserDefinitions)
+  }
+
+  return {
+    hooks: nextHooks,
+    trustEntries: collectMirroredRuntimeUserHookTrustEntries(
+      runtimeConfigPath,
+      nextHooks,
+      trustedSystemHookSignatures,
+      isManagedCommand
+    )
+  }
+}
+
+function collectMirroredRuntimeUserHookTrustEntries(
+  runtimeConfigPath: string,
+  runtimeHooks: Record<string, HookDefinition[]>,
+  trustedSystemHookSignatures: ReadonlyMap<string, TrustedSystemHookSignatureState>,
+  isManagedCommand: (command: string | undefined) => boolean
+): MirroredRuntimeUserHookTrustEntry[] {
+  if (trustedSystemHookSignatures.size === 0) {
+    return []
+  }
+
+  const entries: MirroredRuntimeUserHookTrustEntry[] = []
+  const trustSourcePath = getCodexExplicitHomeHookSourcePath(runtimeConfigPath)
+  for (const [eventName, definitions] of Object.entries(runtimeHooks)) {
+    if (!Array.isArray(definitions)) {
+      continue
+    }
+    definitions.forEach((definition, groupIndex) => {
+      const hooks = Array.isArray(definition.hooks) ? definition.hooks : []
+      hooks.forEach((hook, handlerIndex) => {
+        if (isManagedCommand(hook.command)) {
+          return
+        }
+        const entry = createCodexHookTrustEntry(
+          trustSourcePath,
+          eventName,
+          groupIndex,
+          handlerIndex,
+          definition,
+          hook
+        )
+        if (!entry) {
+          return
+        }
+        const signature = getCodexHookTrustSignature(entry)
+        const state = trustedSystemHookSignatures.get(signature)
+        if (state !== undefined) {
+          entries.push({
+            entry: { ...entry, trustedHash: state.trustedHash },
+            enabled: state.enabled
+          })
+        }
+      })
+    })
+  }
+  return entries
+}
+
+export function moveMirroredRuntimeUserTrustAfterManagedStatusHook(
+  entries: readonly MirroredRuntimeUserHookTrustEntry[]
+): MirroredRuntimeUserHookTrustEntry[] {
+  return entries.map(({ entry, enabled }) => {
+    if (!CODEX_MANAGED_EVENT_LABELS.has(entry.eventLabel)) {
+      return { entry, enabled }
+    }
+    return {
+      entry: { ...entry, groupIndex: entry.groupIndex + 1 },
+      enabled
+    }
+  })
+}
+
+function escapeRegex(value: string): string {
+  return value.replaceAll(/[.*+?^${}()|[\]\\]/g, '\\$&')
+}
+
+function buildHookTrustHeaderKeyPattern(key: string): string {
+  const keyVariants = [key]
+  const parsed = parseTrustKey(key)
+  if (parsed && /^[A-Za-z]:[\\/]|^\\\\/.test(parsed.sourcePath)) {
+    const suffix = `:${parsed.eventLabel}:${parsed.groupIndex}:${parsed.handlerIndex}`
+    keyVariants.push(
+      `${parsed.sourcePath.replace(/\\/g, '/')}${suffix}`,
+      `${parsed.sourcePath.replace(/\//g, '\\')}${suffix}`
+    )
+  }
+  const alternatives = [...new Set(keyVariants)].flatMap((variant) => {
+    const quoted = [`"${escapeRegex(escapeTomlString(variant))}"`]
+    if (!variant.includes("'")) {
+      // Why: tolerate raw-backslash literal keys from Codex/manual approval while repairing mirrored runtime trust across both Windows variants.
+      quoted.push(`'${escapeRegex(variant)}'`)
+    }
+    return quoted
+  })
+  return `(?:${alternatives.join('|')})`
+}
+
+export function applyMirroredRuntimeUserHookTrustStates(
+  tomlPath: string,
+  entries: readonly MirroredRuntimeUserHookTrustEntry[]
+): void {
+  if (entries.length === 0 || !existsSync(tomlPath)) {
+    return
+  }
+
+  const existing = readFileSync(tomlPath, 'utf-8')
+  let updated = existing
+  for (const { entry, enabled } of entries) {
+    const headerKeyPattern = buildHookTrustHeaderKeyPattern(computeTrustKey(entry))
+    const pattern = new RegExp(
+      `(\\[hooks\\.state\\.${headerKeyPattern}\\]\\r?\\n[ \\t]*enabled[ \\t]*=[ \\t]*)(true|false)`,
+      'g'
+    )
+    updated = updated.replace(pattern, `$1${enabled}`)
+  }
+  if (updated !== existing) {
+    writeConfigAtomically(tomlPath, updated)
+  }
+}
+
+function dedupeHookDefinitions(definitions: readonly HookDefinition[]): HookDefinition[] {
+  const seen = new Set<string>()
+  return definitions.filter((definition) => {
+    const key = JSON.stringify(definition)
+    if (seen.has(key)) {
+      return false
+    }
+    seen.add(key)
+    return true
+  })
+}
diff --git a/src/main/codex/codex-hook-wsl-runtime.ts b/src/main/codex/codex-hook-wsl-runtime.ts
new file mode 100644
index 00000000000..03a893880da
--- /dev/null
+++ b/src/main/codex/codex-hook-wsl-runtime.ts
@@ -0,0 +1,221 @@
+import { win32 as pathWin32 } from 'node:path'
+import type { AgentHookInstallStatus } from '../../shared/agent-hook-types'
+import {
+  buildManagedCommandHook,
+  createManagedCommandMatcher,
+  MANAGED_HOOK_TIMEOUT_SECONDS,
+  readHooksJson,
+  removeManagedCommands,
+  writeManagedScript,
+  type HookDefinition
+} from '../agent-hooks/installer-utils'
+import {
+  normalizeCodexProjectPathForLookup,
+  upsertHookTrustEntries,
+  type CodexTrustEntry
+} from './config-toml-trust'
+import {
+  CODEX_EVENTS,
+  CODEX_EVENT_LABEL,
+  wrapReadablePosixHookCommand,
+  writeCodexHooksJson
+} from './codex-hook-definition'
+import { grantManagedCodexHookTrust } from './codex-hook-trust-grant'
+import { getManagedScript } from './codex-hook-script'
+import {
+  removeStaleWslRuntimeManagedHookTrustEntries,
+  removeWslRuntimeManagedHookTrustEntries
+} from './codex-hook-trust-cleanup'
+import { readCodexTrustGrantLedgerHomeForReconciliation } from './codex-managed-trust-reconciliation'
+import { runExclusivelyForCodexTrustConfig } from './codex-trust-config-mutation-queue'
+import type {
+  CodexWslRuntimeHookInstallPlan,
+  WslCanonicalPathSettlement
+} from './codex-wsl-hook-install-plan'
+
+// Why (#16441): the grant inside awaits a codex app-server session, so a
+// concurrent pane launch could write this config.toml between this run's
+// capture and its restore. One lane per file keeps the sequence atomic.
+export function installManagedHooksIntoWslRuntime(
+  plan: CodexWslRuntimeHookInstallPlan
+): Promise<AgentHookInstallStatus> {
+  return runExclusivelyForCodexTrustConfig(plan.tomlPath, () =>
+    installManagedHooksIntoWslRuntimeExclusively(plan)
+  )
+}
+
+async function installManagedHooksIntoWslRuntimeExclusively(
+  plan: CodexWslRuntimeHookInstallPlan
+): Promise<AgentHookInstallStatus> {
+  const config = readHooksJson(plan.configPath)
+  if (!config) {
+    return {
+      agent: 'codex',
+      state: 'error',
+      configPath: plan.configPath,
+      managedHooksPresent: false,
+      detail: 'Could not parse Codex hooks.json'
+    }
+  }
+
+  const isManagedCommand = createManagedCommandMatcher('codex-hook.sh')
+  const command = wrapReadablePosixHookCommand(plan.commandScriptPath)
+  const nextHooks = { ...config.hooks }
+  const managedEvents = new Set<string>(CODEX_EVENTS)
+  for (const [eventName, definitions] of Object.entries(nextHooks)) {
+    if (managedEvents.has(eventName) || !Array.isArray(definitions)) {
+      continue
+    }
+    const cleaned = removeManagedCommands(definitions, isManagedCommand)
+    if (cleaned.length === 0) {
+      delete nextHooks[eventName]
+    } else {
+      nextHooks[eventName] = cleaned
+    }
+  }
+
+  const trustEntries: CodexTrustEntry[] = []
+  for (const eventName of CODEX_EVENTS) {
+    const current = Array.isArray(nextHooks[eventName]) ? nextHooks[eventName] : []
+    const cleaned = removeManagedCommands(current, isManagedCommand)
+    const definition: HookDefinition = {
+      hooks: [buildManagedCommandHook(command)]
+    }
+    nextHooks[eventName] = [definition, ...cleaned]
+    trustEntries.push({
+      sourcePath: plan.trustConfigPath,
+      eventLabel: CODEX_EVENT_LABEL[eventName],
+      groupIndex: 0,
+      handlerIndex: 0,
+      command,
+      timeoutSec: MANAGED_HOOK_TIMEOUT_SECONDS
+    })
+  }
+
+  config.hooks = nextHooks
+  writeManagedScript(plan.scriptPath, getManagedScript('posix'))
+  writeCodexHooksJson(plan.configPath, nextHooks)
+  try {
+    // Why: same grant-then-fallback split as the host install — codex runs
+    // inside the distro so the hash authority matches the codex the pane runs.
+    const runtimeHomePath = pathWin32.dirname(plan.tomlPath)
+    // Why: a successful re-grant replaces the ledger. Keep the previous
+    // records long enough to prove ownership of stale canonical-path keys.
+    const previousLedgerHome = readCodexTrustGrantLedgerHomeForReconciliation(runtimeHomePath)
+    // Why: Codex's verified RPC write must be the final config mutation. A
+    // host-side rewrite after verification can race or invalidate that grant.
+    removeStaleWslRuntimeManagedHookTrustEntries(
+      plan.tomlPath,
+      trustEntries,
+      previousLedgerHome ? [previousLedgerHome] : []
+    )
+    const grant = await grantManagedCodexHookTrust({
+      runtimeHomePath,
+      tomlPath: plan.tomlPath,
+      managedCommand: command,
+      managedEntries: trustEntries,
+      host: { kind: 'wsl', distro: plan.wslDistro, linuxRuntimeHome: plan.linuxRuntimeHome },
+      telemetryLane: 'managed'
+    })
+    if (grant.lane === 'fallback') {
+      // Why: WSL runtime homes may carry user hook approvals we did not rebuild
+      // here; only upsert Orca's entries instead of sweeping the whole source.
+      upsertHookTrustEntries(plan.tomlPath, trustEntries)
+    }
+  } catch (error) {
+    return {
+      agent: 'codex',
+      state: 'error',
+      configPath: plan.configPath,
+      managedHooksPresent: true,
+      detail: `Hooks installed but trust entries could not be written: ${error instanceof Error ? error.message : String(error)}. Run /hooks in Codex to approve.`
+    }
+  }
+
+  return {
+    agent: 'codex',
+    state: 'installed',
+    configPath: plan.configPath,
+    managedHooksPresent: true,
+    detail: null
+  }
+}
+
+export function refreshWslRuntimeUserHooks(
+  plan: CodexWslRuntimeHookInstallPlan
+): AgentHookInstallStatus {
+  const config = readHooksJson(plan.configPath)
+  if (!config) {
+    return {
+      agent: 'codex',
+      state: 'error',
+      configPath: plan.configPath,
+      managedHooksPresent: false,
+      detail: 'Could not parse Codex hooks.json'
+    }
+  }
+
+  const isManagedCommand = createManagedCommandMatcher('codex-hook.sh')
+  const nextHooks = { ...config.hooks }
+  for (const [eventName, definitions] of Object.entries(nextHooks)) {
+    if (!Array.isArray(definitions)) {
+      continue
+    }
+    const cleaned = removeManagedCommands(definitions, isManagedCommand)
+    if (cleaned.length === 0) {
+      delete nextHooks[eventName]
+    } else {
+      nextHooks[eventName] = cleaned
+    }
+  }
+  writeCodexHooksJson(plan.configPath, nextHooks)
+  removeWslRuntimeManagedHookTrustEntries(plan)
+  try {
+    // Why: the disabled path may run after the WSL mount root changed, so cleanup can't be scoped to the plan's current source path.
+    removeStaleWslRuntimeManagedHookTrustEntries(plan.tomlPath, [])
+  } catch (error) {
+    console.warn('[codex-hook-service] failed to clean stale WSL trust entries', error)
+  }
+  return {
+    agent: 'codex',
+    state: 'not_installed',
+    configPath: plan.configPath,
+    managedHooksPresent: false,
+    detail: null
+  }
+}
+
+// Why: transport failures preserve last known-good identity; a successful absence probe is strong enough to revoke trust immediately.
+export function getWslHookReconciliationAction(args: {
+  settlement: WslCanonicalPathSettlement
+  isCurrentGeneration: boolean
+  installedTrustConfigPath: string | null
+  resolvedTrustConfigPath: string | null
+  /** Whether the synchronous install for this generation wrote trust. */
+  installSucceeded: boolean
+}): 'none' | 'remove' | 'reinstall' {
+  if (!args.isCurrentGeneration) {
+    return 'none'
+  }
+  if (args.settlement.status === 'missing') {
+    // Why: a `missing` directory probe right after a verified install/grant is
+    // a false negative — the RPC (or fallback) just wrote and read trust in
+    // that home, so it exists. Revoking here would delete the fresh grant the
+    // launching pane needs, resurfacing "hooks need review". A genuinely moved
+    // home resolves to a different path and takes the `reinstall` branch below.
+    return args.installSucceeded ? 'none' : 'remove'
+  }
+  if (
+    args.settlement.status !== 'resolved' ||
+    !args.resolvedTrustConfigPath ||
+    args.resolvedTrustConfigPath === args.installedTrustConfigPath
+  ) {
+    return 'none'
+  }
+  return 'reinstall'
+}
+
+// Why: fold only the Windows-case-insensitive portion; a full lowercase would let case-distinct WSL homes share one reconciliation slot.
+export function getWslReconciliationKey(runtimeHomePath: string): string {
+  return normalizeCodexProjectPathForLookup(runtimeHomePath)
+}
diff --git a/src/main/codex/codex-state-db-backfill-recovery.test.ts b/src/main/codex/codex-state-db-backfill-recovery.test.ts
index 981fa74c1bc..1986ccbdae9 100644
--- a/src/main/codex/codex-state-db-backfill-recovery.test.ts
+++ b/src/main/codex/codex-state-db-backfill-recovery.test.ts
@@ -191,13 +191,11 @@ describe('Codex state DB backfill recovery', () => {
 
     const summary = await runCodexStateDbBackfillRecovery('/managed-home', controller.signal, {
       spawnProcess: spawnProcess as never,
-      readStatus: vi.fn(
-        (): CodexStateDbBackfillStatus => ({
-          kind: 'incomplete',
-          stateDbPath: '/state.sqlite',
-          status: 'running'
-        })
-      ),
+      readStatus: vi.fn((): CodexStateDbBackfillStatus => ({
+        kind: 'incomplete',
+        stateDbPath: '/state.sqlite',
+        status: 'running'
+      })),
       terminate,
       sleep,
       now: () => now
@@ -270,15 +268,14 @@ describe('Codex state DB backfill recovery', () => {
       new AbortController().signal,
       {
         spawnProcess: spawnProcess as never,
-        readStatus: vi.fn(
-          (): CodexStateDbBackfillStatus =>
-            spawnProcess.mock.calls.length >= 3
-              ? { kind: 'complete', stateDbPath: '/state.sqlite' }
-              : {
-                  kind: 'incomplete',
-                  stateDbPath: '/state.sqlite',
-                  status: 'running'
-                }
+        readStatus: vi.fn((): CodexStateDbBackfillStatus =>
+          spawnProcess.mock.calls.length >= 3
+            ? { kind: 'complete', stateDbPath: '/state.sqlite' }
+            : {
+                kind: 'incomplete',
+                stateDbPath: '/state.sqlite',
+                status: 'running'
+              }
         ),
         terminate: terminate as never,
         sleep,
@@ -328,11 +325,10 @@ describe('Codex state DB backfill recovery', () => {
     await expect(
       runCodexStateDbBackfillRecovery('/managed-home', new AbortController().signal, {
         spawnProcess: spawnProcess as never,
-        readStatus: vi.fn(
-          (): CodexStateDbBackfillStatus =>
-            spawnCount >= 2
-              ? { kind: 'complete', stateDbPath: '/state.sqlite' }
-              : { kind: 'incomplete', stateDbPath: '/state.sqlite', status: 'running' }
+        readStatus: vi.fn((): CodexStateDbBackfillStatus =>
+          spawnCount >= 2
+            ? { kind: 'complete', stateDbPath: '/state.sqlite' }
+            : { kind: 'incomplete', stateDbPath: '/state.sqlite', status: 'running' }
         ),
         terminate,
         sleep: vi.fn(async (ms: number) => {
@@ -427,11 +423,10 @@ describe('Codex state DB backfill recovery', () => {
       }
       return child
     })
-    const readStatus = vi.fn(
-      (): CodexStateDbBackfillStatus =>
-        spawnCount >= 2
-          ? { kind: 'complete', stateDbPath: '/state.sqlite' }
-          : { kind: 'incomplete', stateDbPath: '/state.sqlite', status: 'running' }
+    const readStatus = vi.fn((): CodexStateDbBackfillStatus =>
+      spawnCount >= 2
+        ? { kind: 'complete', stateDbPath: '/state.sqlite' }
+        : { kind: 'incomplete', stateDbPath: '/state.sqlite', status: 'running' }
     )
 
     await expect(
diff --git a/src/main/codex/hook-service.ts b/src/main/codex/hook-service.ts
index 4e58f947dee..dbd6a515922 100644
--- a/src/main/codex/hook-service.ts
+++ b/src/main/codex/hook-service.ts
@@ -1,1747 +1,21 @@
-/* eslint-disable max-lines -- Why: getStatus + install + remove all share the managed-command and trust-key derivation. Splitting would hide that the three operations must agree on group index, event label, and command bytes. */
-import { existsSync, readFileSync, statSync, unlinkSync } from 'node:fs'
-import { join, win32 as pathWin32 } from 'node:path'
-import type { SFTPWrapper } from 'ssh2'
-import type { AgentHookInstallState, AgentHookInstallStatus } from '../../shared/agent-hook-types'
-import {
-  buildManagedCommandHook,
-  createManagedCommandMatcher,
-  buildWindowsAgentHookCurlPostCommand,
-  getSharedManagedScriptPath,
-  hookDefinitionHasManagedCommand,
-  MANAGED_HOOK_TIMEOUT_SECONDS,
-  readHooksJson,
-  readHooksJsonWithRaw,
-  removeManagedCommands,
-  wrapPosixHookCommand,
-  wrapWindowsCmdHookCommand,
-  writeHooksJson,
-  writeManagedScript,
-  type HookDefinition
-} from '../agent-hooks/installer-utils'
-import { buildPosixAgentHookPostCommand } from '../agent-hooks/hook-post-command'
-import { refreshManagedScriptIfPresent } from '../agent-hooks/managed-hook-script-refresh'
-import { resolveHooksJsonWritePath } from '../agent-hooks/hook-config-write-path'
-import { writeFileAtomically } from '../codex-accounts/fs-utils'
-import {
-  readHooksJsonRemote,
-  readTextFileRemote,
-  writeHooksJsonRemote,
-  writeManagedScriptRemote,
-  writeTextFileRemoteAtomic
-} from '../agent-hooks/installer-utils-remote'
-import {
-  buildPosixHookPayloadCapture,
-  buildPosixHookSpoolLines,
-  buildWindowsHookEnvironmentGuardLines,
-  buildWindowsHookStdinDrainEpilogue,
-  POSIX_HOOK_STDIN_DRAIN_COMMAND
-} from '../agent-hooks/hook-stdin-contract'
-import {
-  codexHookSourcePathsEqual,
-  computeTrustKey,
-  computeTrustedHash,
-  escapeTomlString,
-  getCodexExplicitHomeHookSourcePath,
-  normalizeCodexHookSourcePath,
-  normalizeCodexProjectPathForLookup,
-  normalizeHookTrustKeyForLookup,
-  parseTrustKey,
-  readHookTrustEntries,
-  removeHookTrustEntries,
-  upsertHookTrustEntriesInContent,
-  upsertHookTrustEntries,
-  writeConfigAtomically,
-  type CodexEventLabel,
-  type CodexHookTrustState,
-  type CodexTrustEntry
-} from './config-toml-trust'
-import { getOrcaManagedCodexHomePath, getSystemCodexHomePath } from './codex-home-paths'
-import { syncSystemConfigIntoManagedCodexHome } from './codex-config-mirror'
+import { CodexHookService } from './codex-hook-service-implementation'
+import { cleanupLegacySystemManagedHooks } from './codex-hook-legacy-cleanup'
+import { getManagedScript } from './codex-hook-script'
+import { removeStaleWslRuntimeManagedHookTrustEntries } from './codex-hook-trust-cleanup'
 import {
+  getWslHookReconciliationAction,
+  installManagedHooksIntoWslRuntime,
+  refreshWslRuntimeUserHooks
+} from './codex-hook-wsl-runtime'
+
+export type { CodexManagedHookInstallMaterial } from './codex-hook-definition'
+export { getCodexManagedHookInstallMaterial } from './codex-hook-definition'
+export { setSystemCodexHomeHookSweepSuppressed } from './codex-hook-legacy-cleanup'
+export { CodexHookService }
+export {
   createCodexWslRuntimeHookInstallPlan,
-  type CodexWslRuntimeHookInstallPlan,
-  type CodexWslRuntimeHookTarget,
-  type WslCanonicalPathSettlement
+  type CodexWslRuntimeHookInstallPlan
 } from './codex-wsl-hook-install-plan'
-import {
-  CODEX_HOOK_EVENT_LABEL,
-  createCodexHookTrustEntry,
-  getCodexHookTrustSignature,
-  getCodexManagedScriptFileName
-} from './codex-hook-identity'
-import {
-  promoteCodexRuntimeHookApprovalsToSystem,
-  snapshotCodexRuntimeHookTrustProvenance
-} from './hook-trust-promotion'
-import { grantManagedCodexHookTrust } from './codex-hook-trust-grant'
-import { runExclusivelyForCodexTrustConfig } from './codex-trust-config-mutation-queue'
-import { readCurrentNativeCodexTrustGrantLedgerHome } from './codex-trust-grant-host'
-import {
-  getCodexLedgerTrustedHash,
-  readCodexTrustGrantLedgerHomeForReconciliation,
-  removeCodexManagedHookTrustEntries,
-  removeStaleWslCodexManagedHookTrustEntries
-} from './codex-managed-trust-reconciliation'
-import type { CodexTrustGrantLedgerHome } from './codex-trust-grant-ledger'
-import { mutateRealHomeHooksPreservingUserTrust } from './codex-user-hook-trust-rebase'
-
-// Why: Pre/PostToolUse feed the live in-flight-tool readout; PermissionRequest exits with no decision so Codex still shows its approval UI while Orca flips the pane to waiting.
-const CODEX_EVENTS = [
-  'SessionStart',
-  'UserPromptSubmit',
-  'PreToolUse',
-  'PermissionRequest',
-  'PostToolUse',
-  'SubagentStart',
-  'SubagentStop',
-  'Stop'
-] as const
-
-function getConfigPath(runtimeHomePath: string = getOrcaManagedCodexHomePath()): string {
-  return join(runtimeHomePath, 'hooks.json')
-}
-
-function writeCodexHooksJson(configPath: string, hooks: Record<string, HookDefinition[]>): void {
-  // Why: Codex rejects unknown top-level hooks.json fields, so plugin bookkeeping like `_managed` must not survive Orca's rewrite.
-  writeHooksJson(configPath, { hooks })
-}
-
-function getCodexConfigTomlPath(runtimeHomePath: string = getOrcaManagedCodexHomePath()): string {
-  return join(runtimeHomePath, 'config.toml')
-}
-
-// Why: managed-event subset of the shared label map; full mapping lives in codex-hook-identity.ts so promotion can't drift.
-const CODEX_EVENT_LABEL: Record<(typeof CODEX_EVENTS)[number], CodexEventLabel> = {
-  SessionStart: CODEX_HOOK_EVENT_LABEL.SessionStart!,
-  UserPromptSubmit: CODEX_HOOK_EVENT_LABEL.UserPromptSubmit!,
-  PreToolUse: CODEX_HOOK_EVENT_LABEL.PreToolUse!,
-  PermissionRequest: CODEX_HOOK_EVENT_LABEL.PermissionRequest!,
-  PostToolUse: CODEX_HOOK_EVENT_LABEL.PostToolUse!,
-  SubagentStart: CODEX_HOOK_EVENT_LABEL.SubagentStart!,
-  SubagentStop: CODEX_HOOK_EVENT_LABEL.SubagentStop!,
-  Stop: CODEX_HOOK_EVENT_LABEL.Stop!
-}
-
-const CODEX_MANAGED_EVENT_LABELS = new Set<CodexEventLabel>(
-  CODEX_EVENTS.map((eventName) => CODEX_EVENT_LABEL[eventName])
-)
-
-const CODEX_PLUGIN_ONLY_HOOK_PLACEHOLDERS = [
-  '${CLAUDE_PLUGIN_ROOT}',
-  '${CLAUDE_PLUGIN_DATA}',
-  '${PLUGIN_ROOT}',
-  '${PLUGIN_DATA}'
-] as const
-
-const LEGACY_ORCA_PROFILE_NAME = 'orca-agent-status'
-const LEGACY_ORCA_PROFILE_BLOCK_START = '# BEGIN ORCA AGENT STATUS HOOKS'
-const LEGACY_ORCA_PROFILE_BLOCK_END = '# END ORCA AGENT STATUS HOOKS'
-
-type MirroredRuntimeUserHookTrustEntry = {
-  entry: CodexTrustEntry
-  enabled: boolean
-}
-
-function getManagedScriptPath(): string {
-  return getSharedManagedScriptPath(getCodexManagedScriptFileName())
-}
-
-function getManagedCommand(scriptPath: string): string {
-  return process.platform === 'win32'
-    ? wrapWindowsCmdHookCommand(scriptPath)
-    : wrapPosixHookCommand(scriptPath)
-}
-
-export type CodexManagedHookInstallMaterial = {
-  events: readonly (typeof CODEX_EVENTS)[number][]
-  eventLabel: Record<(typeof CODEX_EVENTS)[number], CodexEventLabel>
-  scriptPath: string
-  command: string
-  script: string
-}
-
-// Why: the real-home installer must byte-match the managed lane's events,
-// command, and script, or trust signatures diverge between the two homes.
-export function getCodexManagedHookInstallMaterial(): CodexManagedHookInstallMaterial {
-  const scriptPath = getManagedScriptPath()
-  return {
-    events: CODEX_EVENTS,
-    eventLabel: CODEX_EVENT_LABEL,
-    scriptPath,
-    command: getManagedCommand(scriptPath),
-    script: getManagedScript()
-  }
-}
-
-// Why: when the real-home lane owns ~/.codex/hooks.json (system-default flag ON
-// with hooks enabled), the legacy system-home sweep must stand down or every
-// managed install would delete the entry the real-home installer just wrote.
-// Injected as a gate because this module is bundled into plain-node CLI entries
-// that have no settings store; the CLI default keeps the sweep active.
-let systemCodexHomeHookSweepSuppressed: () => boolean = () => false
-
-export function setSystemCodexHomeHookSweepSuppressed(gate: () => boolean): void {
-  systemCodexHomeHookSweepSuppressed = gate
-}
-
-export { createCodexWslRuntimeHookInstallPlan }
-export type { CodexWslRuntimeHookInstallPlan }
-
-function wrapReadablePosixHookCommand(scriptPath: string): string {
-  const quoted = `'${scriptPath.replaceAll("'", "'\\''")}'`
-  // Why: WSL hooks are written from Windows over UNC where the exec bit is unreliable; a missing script must still own stdin.
-  return `if [ -f ${quoted} ] && [ -r ${quoted} ]; then /bin/sh ${quoted}; else ${POSIX_HOOK_STDIN_DRAIN_COMMAND}; fi`
-}
-
-function getSystemConfigPath(): string {
-  return join(getSystemCodexHomePath(), 'hooks.json')
-}
-
-function getSystemCodexConfigTomlPath(): string {
-  return join(getSystemCodexHomePath(), 'config.toml')
-}
-
-function getLegacyCodexProfileTomlPath(): string {
-  return join(getSystemCodexHomePath(), `${LEGACY_ORCA_PROFILE_NAME}.config.toml`)
-}
-
-function collectManagedTrustEntries(
-  sourcePath: string,
-  eventName: string,
-  definitions: readonly HookDefinition[],
-  isManagedCommand: (command: string | undefined) => boolean
-): CodexTrustEntry[] {
-  const entries: CodexTrustEntry[] = []
-  definitions.forEach((definition, groupIndex) => {
-    const hooks = Array.isArray(definition.hooks) ? definition.hooks : []
-    hooks.forEach((hook, handlerIndex) => {
-      if (!isManagedCommand(hook.command)) {
-        return
-      }
-      const entry = createCodexHookTrustEntry(
-        sourcePath,
-        eventName,
-        groupIndex,
-        handlerIndex,
-        definition,
-        hook
-      )
-      if (entry) {
-        entries.push(entry)
-      }
-    })
-  })
-  return entries
-}
-
-function removeSelfComputedMatchingTrustEntries(
-  configPath: string,
-  entries: readonly CodexTrustEntry[]
-): void {
-  if (entries.length === 0) {
-    return
-  }
-
-  const existingEntries = readHookTrustEntries(configPath)
-  const ownedKeys = entries
-    .map((entry) => {
-      const key = computeTrustKey(entry)
-      return existingEntries.get(key)?.trustedHash === computeTrustedHash(entry) ? key : null
-    })
-    .filter((key): key is string => key !== null)
-  if (ownedKeys.length > 0) {
-    removeHookTrustEntries(configPath, ownedKeys)
-  }
-}
-
-function removeStaleRuntimeHookTrustEntries(
-  tomlPath: string,
-  runtimeHooksPath: string,
-  expectedEntries: readonly CodexTrustEntry[]
-): void {
-  const expectedHashes = new Map(
-    expectedEntries.map((entry) => [
-      normalizeHookTrustKeyForLookup(computeTrustKey(entry)),
-      entry.trustedHash ?? computeTrustedHash(entry)
-    ])
-  )
-  const canonicalRuntimeHooksPath = getCodexExplicitHomeHookSourcePath(runtimeHooksPath)
-  const staleKeys: string[] = []
-  for (const [key, state] of readHookTrustEntries(tomlPath)) {
-    const parsed = parseTrustKey(key)
-    if (!parsed || !codexHookSourcePathsEqual(parsed.sourcePath, canonicalRuntimeHooksPath)) {
-      continue
-    }
-    if (expectedHashes.get(normalizeHookTrustKeyForLookup(key)) === state.trustedHash) {
-      continue
-    }
-    staleKeys.push(key)
-  }
-  if (staleKeys.length > 0) {
-    removeHookTrustEntries(tomlPath, staleKeys)
-  }
-}
-
-function commandUsesCodexPluginOnlyPlaceholder(command: string | undefined): boolean {
-  return (
-    typeof command === 'string' &&
-    CODEX_PLUGIN_ONLY_HOOK_PLACEHOLDERS.some((placeholder) => command.includes(placeholder))
-  )
-}
-
-function removeCodexPluginEnvironmentCommands(definitions: HookDefinition[]): HookDefinition[] {
-  // Why: plugin placeholders only resolve for Codex plugin hook sources; mirroring them into a plain runtime hooks.json turns them into 127s.
-  return removeManagedCommands(definitions, commandUsesCodexPluginOnlyPlaceholder)
-}
-
-function getRuntimeHooksWithSystemUserHooks(
-  runtimeHooks: Record<string, HookDefinition[]> | undefined,
-  isManagedCommand: (command: string | undefined) => boolean,
-  runtimeConfigPath: string = getConfigPath()
-): {
-  hooks: Record<string, HookDefinition[]>
-  trustEntries: MirroredRuntimeUserHookTrustEntry[]
-} | null {
-  const systemConfigPath = getSystemConfigPath()
-  if (systemConfigPath === runtimeConfigPath) {
-    return { hooks: { ...runtimeHooks }, trustEntries: [] }
-  }
-
-  const { raw: systemRaw, config: systemConfig } = readHooksJsonWithRaw(systemConfigPath)
-  if (!systemConfig && systemRaw === null) {
-    // Why: rebuilding from an unreadable source drops the last-known user hooks
-    // from the managed runtime; let launch prep retry without changing it.
-    return null
-  }
-  if (!systemConfig?.hooks) {
-    return { hooks: {}, trustEntries: [] }
-  }
-
-  const nextHooks: Record<string, HookDefinition[]> = {}
-  const trustedSystemHookSignatures = getTrustedSystemUserHookSignatures(
-    systemConfigPath,
-    systemConfig.hooks,
-    isManagedCommand
-  )
-  for (const [eventName, systemDefinitions] of Object.entries(systemConfig.hooks)) {
-    if (!Array.isArray(systemDefinitions)) {
-      continue
-    }
-
-    const systemUserDefinitions = removeCodexPluginEnvironmentCommands(
-      removeManagedCommands(systemDefinitions, isManagedCommand)
-    )
-    if (systemUserDefinitions.length === 0) {
-      continue
-    }
-
-    // Why: rebuild from system hooks; reusing old runtime copies would keep deleted/edited ~/.codex/hooks.json entries alive for new sessions.
-    nextHooks[eventName] = dedupeHookDefinitions(systemUserDefinitions)
-  }
-
-  return {
-    hooks: nextHooks,
-    trustEntries: collectMirroredRuntimeUserHookTrustEntries(
-      runtimeConfigPath,
-      nextHooks,
-      trustedSystemHookSignatures,
-      isManagedCommand
-    )
-  }
-}
-
-type TrustedSystemHookSignatureState = {
-  enabled: boolean
-  trustedHash: string
-}
-
-function getTrustedSystemUserHookSignatures(
-  systemConfigPath: string,
-  systemHooks: Record<string, HookDefinition[]>,
-  isManagedCommand: (command: string | undefined) => boolean
-): Map<string, TrustedSystemHookSignatureState> {
-  const signatures = new Map<string, TrustedSystemHookSignatureState>()
-  let trustEntries: Map<string, CodexHookTrustState>
-  try {
-    trustEntries = readHookTrustEntries(getSystemCodexConfigTomlPath())
-  } catch (error) {
-    // Why: a hand-broken system config.toml should only disable user-hook trust mirroring, not block Orca's managed runtime hooks.
-    console.warn('[codex-hook-service] failed to read system hook trust entries', error)
-    return signatures
-  }
-  const trustedHashesByEvent = getTrustedSystemHookHashesByEvent(systemConfigPath, trustEntries)
-  for (const [eventName, definitions] of Object.entries(systemHooks)) {
-    if (!Array.isArray(definitions)) {
-      continue
-    }
-    definitions.forEach((definition, groupIndex) => {
-      const hooks = Array.isArray(definition.hooks) ? definition.hooks : []
-      hooks.forEach((hook, handlerIndex) => {
-        if (isManagedCommand(hook.command)) {
-          return
-        }
-        const entry = createCodexHookTrustEntry(
-          systemConfigPath,
-          eventName,
-          groupIndex,
-          handlerIndex,
-          definition,
-          hook
-        )
-        if (!entry) {
-          return
-        }
-        const state = resolveTrustedSystemHookState(entry, trustEntries, trustedHashesByEvent)
-        if (!state) {
-          return
-        }
-        const signature = getCodexHookTrustSignature(entry)
-        // Why: runtime deduping collapses identical definitions; if any duplicate stays enabled, keep the mirrored hook enabled.
-        if (state.enabled || !signatures.has(signature)) {
-          signatures.set(signature, state)
-        }
-      })
-    })
-  }
-  return signatures
-}
-
-function resolveTrustedSystemHookState(
-  entry: CodexTrustEntry,
-  trustEntries: ReadonlyMap<string, CodexHookTrustState>,
-  trustedHashesByEvent: ReadonlyMap<CodexEventLabel, Map<string, boolean>>
-): TrustedSystemHookSignatureState | null {
-  const expectedHash = computeTrustedHash(entry)
-  const state = trustEntries.get(computeTrustKey(entry))
-  if (state?.trustedHash === expectedHash) {
-    return { enabled: state.enabled !== false, trustedHash: expectedHash }
-  }
-  const reorderedEnabled = trustedHashesByEvent.get(entry.eventLabel)?.get(expectedHash)
-  if (reorderedEnabled !== undefined) {
-    return { enabled: reorderedEnabled, trustedHash: expectedHash }
-  }
-  if (state?.trustedHash) {
-    // Why: carry a key-matched system hash verbatim — recomputing caused #7110 re-approval loops since Codex owns its hash algorithm.
-    return { enabled: state.enabled !== false, trustedHash: state.trustedHash }
-  }
-  return null
-}
-
-function getTrustedSystemHookHashesByEvent(
-  systemConfigPath: string,
-  trustEntries: ReadonlyMap<string, CodexHookTrustState>
-): Map<CodexEventLabel, Map<string, boolean>> {
-  const trustedHashesByEvent = new Map<CodexEventLabel, Map<string, boolean>>()
-  const canonicalSystemConfigPath = normalizeCodexHookSourcePath(systemConfigPath)
-  for (const [key, state] of trustEntries) {
-    const parsed = parseTrustKey(key)
-    if (!parsed || !state.trustedHash) {
-      continue
-    }
-    if (!codexHookSourcePathsEqual(parsed.sourcePath, canonicalSystemConfigPath)) {
-      continue
-    }
-    let hashes = trustedHashesByEvent.get(parsed.eventLabel)
-    if (!hashes) {
-      hashes = new Map()
-      trustedHashesByEvent.set(parsed.eventLabel, hashes)
-    }
-    const enabled = state.enabled !== false
-    // Why: Codex trust keys include hook indices, but the hash still proves the same event+command identity was approved after a reorder.
-    if (enabled || !hashes.has(state.trustedHash)) {
-      hashes.set(state.trustedHash, enabled)
-    }
-  }
-  return trustedHashesByEvent
-}
-
-function collectMirroredRuntimeUserHookTrustEntries(
-  runtimeConfigPath: string,
-  runtimeHooks: Record<string, HookDefinition[]>,
-  trustedSystemHookSignatures: ReadonlyMap<string, TrustedSystemHookSignatureState>,
-  isManagedCommand: (command: string | undefined) => boolean
-): MirroredRuntimeUserHookTrustEntry[] {
-  if (trustedSystemHookSignatures.size === 0) {
-    return []
-  }
-
-  const entries: MirroredRuntimeUserHookTrustEntry[] = []
-  const trustSourcePath = getCodexExplicitHomeHookSourcePath(runtimeConfigPath)
-  for (const [eventName, definitions] of Object.entries(runtimeHooks)) {
-    if (!Array.isArray(definitions)) {
-      continue
-    }
-    definitions.forEach((definition, groupIndex) => {
-      const hooks = Array.isArray(definition.hooks) ? definition.hooks : []
-      hooks.forEach((hook, handlerIndex) => {
-        if (isManagedCommand(hook.command)) {
-          return
-        }
-        const entry = createCodexHookTrustEntry(
-          trustSourcePath,
-          eventName,
-          groupIndex,
-          handlerIndex,
-          definition,
-          hook
-        )
-        if (!entry) {
-          return
-        }
-        const signature = getCodexHookTrustSignature(entry)
-        const state = trustedSystemHookSignatures.get(signature)
-        if (state !== undefined) {
-          entries.push({
-            entry: { ...entry, trustedHash: state.trustedHash },
-            enabled: state.enabled
-          })
-        }
-      })
-    })
-  }
-  return entries
-}
-
-function moveMirroredRuntimeUserTrustAfterManagedStatusHook(
-  entries: readonly MirroredRuntimeUserHookTrustEntry[]
-): MirroredRuntimeUserHookTrustEntry[] {
-  return entries.map(({ entry, enabled }) => {
-    if (!CODEX_MANAGED_EVENT_LABELS.has(entry.eventLabel)) {
-      return { entry, enabled }
-    }
-    return {
-      entry: { ...entry, groupIndex: entry.groupIndex + 1 },
-      enabled
-    }
-  })
-}
-
-function escapeRegex(value: string): string {
-  return value.replaceAll(/[.*+?^${}()|[\]\\]/g, '\\$&')
-}
-
-function buildHookTrustHeaderKeyPattern(key: string): string {
-  const keyVariants = [key]
-  const parsed = parseTrustKey(key)
-  if (parsed && /^[A-Za-z]:[\\/]|^\\\\/.test(parsed.sourcePath)) {
-    const suffix = `:${parsed.eventLabel}:${parsed.groupIndex}:${parsed.handlerIndex}`
-    keyVariants.push(
-      `${parsed.sourcePath.replace(/\\/g, '/')}${suffix}`,
-      `${parsed.sourcePath.replace(/\//g, '\\')}${suffix}`
-    )
-  }
-  const alternatives = [...new Set(keyVariants)].flatMap((variant) => {
-    const quoted = [`"${escapeRegex(escapeTomlString(variant))}"`]
-    if (!variant.includes("'")) {
-      // Why: tolerate raw-backslash literal keys from Codex/manual approval while repairing mirrored runtime trust across both Windows variants.
-      quoted.push(`'${escapeRegex(variant)}'`)
-    }
-    return quoted
-  })
-  return `(?:${alternatives.join('|')})`
-}
-
-function applyMirroredRuntimeUserHookTrustStates(
-  tomlPath: string,
-  entries: readonly MirroredRuntimeUserHookTrustEntry[]
-): void {
-  if (entries.length === 0 || !existsSync(tomlPath)) {
-    return
-  }
-
-  const existing = readFileSync(tomlPath, 'utf-8')
-  let updated = existing
-  for (const { entry, enabled } of entries) {
-    const headerKeyPattern = buildHookTrustHeaderKeyPattern(computeTrustKey(entry))
-    const pattern = new RegExp(
-      `(\\[hooks\\.state\\.${headerKeyPattern}\\]\\r?\\n[ \\t]*enabled[ \\t]*=[ \\t]*)(true|false)`,
-      'g'
-    )
-    updated = updated.replace(pattern, `$1${enabled}`)
-  }
-  if (updated !== existing) {
-    writeConfigAtomically(tomlPath, updated)
-  }
-}
-
-function dedupeHookDefinitions(definitions: readonly HookDefinition[]): HookDefinition[] {
-  const seen = new Set<string>()
-  return definitions.filter((definition) => {
-    const key = JSON.stringify(definition)
-    if (seen.has(key)) {
-      return false
-    }
-    seen.add(key)
-    return true
-  })
-}
-
-function removeSystemManagedHookTrustEntries(systemHomePath: string, hooksJsonPath: string): void {
-  removeCodexManagedHookTrustEntries({
-    tomlPath: getSystemCodexConfigTomlPath(),
-    runtimeHomePath: systemHomePath,
-    sourcePath: hooksJsonPath,
-    command: getManagedCommand(getManagedScriptPath()),
-    managedEventLabels: CODEX_MANAGED_EVENT_LABELS,
-    timeoutSec: MANAGED_HOOK_TIMEOUT_SECONDS
-  })
-}
-
-// Why (#16441): these sequences mutate the runtime config.toml *and* the
-// system one — approval promotion, the system-config sync and the legacy sweep
-// all touch ~/.codex/config.toml — so holding only the runtime lane still lets
-// a real-home grant's capture->restore window swallow their writes. Lock order
-// is always runtime-before-system; every other holder acquires it that way too.
-function runExclusivelyForRuntimeAndSystemTrustConfig<T>(
-  runtimeHomePath: string,
-  run: () => Promise<T>
-): Promise<T> {
-  return runExclusivelyForCodexTrustConfig(getCodexConfigTomlPath(runtimeHomePath), () =>
-    runExclusivelyForCodexTrustConfig(getSystemCodexConfigTomlPath(), run)
-  )
-}
-
-function cleanupLegacySystemManagedHooks(): Promise<void> {
-  // Why: shares the real-home lane with ensureRealHomeCodexHookState — both
-  // capture, mutate and roll back the user's ~/.codex/config.toml.
-  return runExclusivelyForCodexTrustConfig(
-    getSystemCodexConfigTomlPath(),
-    sweepLegacySystemManagedHooks
-  )
-}
-
-async function sweepLegacySystemManagedHooks(): Promise<void> {
-  if (systemCodexHomeHookSweepSuppressed()) {
-    return
-  }
-  const legacyConfigPath = getSystemConfigPath()
-  const runtimeConfigPath = getConfigPath()
-  if (legacyConfigPath === runtimeConfigPath) {
-    return
-  }
-
-  const systemHomePath = getSystemCodexHomePath()
-  const hasRecordedRealHomeGrant =
-    readCodexTrustGrantLedgerHomeForReconciliation(systemHomePath) !== null
-  // Why: the pre-write guard below compares against these bytes; a separate
-  // later read would let a concurrent save land between parse and snapshot.
-  const { raw: previousRaw, config } = readHooksJsonWithRaw(legacyConfigPath)
-  // Why: `config === null` with no raw is the "could not read" answer, not the
-  // "no hooks here" one — the branch below removes managed trust entries AND
-  // their grant-ledger record, so acting on it would discard approvals over a
-  // read that merely failed. A genuine absence still returns `config: {}`.
-  if (config === null && previousRaw === null) {
-    return
-  }
-  if (!config?.hooks || previousRaw === null) {
-    if (hasRecordedRealHomeGrant) {
-      removeSystemManagedHookTrustEntries(systemHomePath, legacyConfigPath)
-    }
-    return
-  }
-
-  const isManagedCommand = createManagedCommandMatcher(getCodexManagedScriptFileName())
-  const nextHooks = { ...config.hooks }
-  const trustEntries: CodexTrustEntry[] = []
-  let removedManagedHook = false
-  for (const [eventName, definitions] of Object.entries(nextHooks)) {
-    if (!Array.isArray(definitions)) {
-      continue
-    }
-    const eventTrustEntries = collectManagedTrustEntries(
-      legacyConfigPath,
-      eventName,
-      definitions,
-      isManagedCommand
-    )
-    // Why: user hook configs can be large; avoid the argument limit from push(...entries).
-    for (const entry of eventTrustEntries) {
-      trustEntries.push(entry)
-    }
-    const cleaned = removeManagedCommands(definitions, isManagedCommand)
-    removedManagedHook ||= definitions.some((definition) =>
-      hookDefinitionHasManagedCommand(definition, isManagedCommand)
-    )
-    if (cleaned.length === 0) {
-      delete nextHooks[eventName]
-    } else {
-      nextHooks[eventName] = cleaned
-    }
-  }
-
-  // Why: Codex hooks moved to Orca's managed CODEX_HOME; stale ~/.codex entries would keep external Codex sessions reporting into Orca.
-  if (removedManagedHook) {
-    // Why: this is the user's system hooks file, not Orca's runtime copy.
-    // Remove only stale Orca hook entries and preserve other managers' metadata.
-    const hooksWritePath = resolveHooksJsonWritePath(legacyConfigPath)
-    const previousMode = statSync(hooksWritePath).mode
-    await mutateRealHomeHooksPreservingUserTrust({
-      sourcePath: legacyConfigPath,
-      runtimeHomePath: systemHomePath,
-      tomlPath: getSystemCodexConfigTomlPath(),
-      beforeHooks: config.hooks,
-      afterHooks: nextHooks,
-      writeHooks: () => {
-        if (
-          readFileSync(legacyConfigPath, 'utf-8') !== previousRaw ||
-          resolveHooksJsonWritePath(legacyConfigPath) !== hooksWritePath
-        ) {
-          // Why: the pre-mutation RPC may overlap a user save; downgrade must
-          // never replace that newer dotfiles generation with our stale parse.
-          throw new Error('System Codex hooks changed during trust repair')
-        }
-        writeHooksJson(hooksWritePath, { ...config, hooks: nextHooks }, { preserveMode: true })
-      },
-      restoreHooks: () => writeFileAtomically(hooksWritePath, previousRaw, { mode: previousMode })
-    })
-    // Why: stale dev/version entries can reference an older managed script
-    // path that is not represented by the current grant ledger.
-    removeSelfComputedMatchingTrustEntries(getSystemCodexConfigTomlPath(), trustEntries)
-  }
-  if (removedManagedHook || hasRecordedRealHomeGrant) {
-    // Why: the ledger recognizes Codex-computed hashes and remains a retry
-    // marker if a prior cleanup removed hooks.json but could not update TOML.
-    removeSystemManagedHookTrustEntries(systemHomePath, legacyConfigPath)
-  }
-}
-
-function stripLegacyManagedProfileBlock(content: string): string {
-  const start = content.indexOf(LEGACY_ORCA_PROFILE_BLOCK_START)
-  if (start === -1) {
-    return content
-  }
-  const endMarker = content.indexOf(LEGACY_ORCA_PROFILE_BLOCK_END, start)
-  const end = endMarker === -1 ? content.length : endMarker + LEGACY_ORCA_PROFILE_BLOCK_END.length
-  const before = content.slice(0, start).replace(/[ \t]*(?:\r?\n)*$/, '')
-  const after = content.slice(end).replace(/^(?:\r?\n)+/, '')
-  if (!before) {
-    return after
-  }
-  if (!after) {
-    return before.endsWith('\n') ? before : `${before}\n`
-  }
-  return `${before}\n\n${after}`
-}
-
-function cleanupLegacyCodexProfileHooks(): void {
-  const profilePath = getLegacyCodexProfileTomlPath()
-  if (!existsSync(profilePath)) {
-    return
-  }
-
-  const existing = readFileSync(profilePath, 'utf-8')
-  const next = stripLegacyManagedProfileBlock(existing)
-  if (next === existing) {
-    return
-  }
-  // Why: #2778 wrote Orca hooks into a Codex profile file; runtime CODEX_HOME supersedes it, so remove only Orca's marked block.
-  if (next.trim().length === 0) {
-    unlinkSync(profilePath)
-  } else {
-    writeConfigAtomically(profilePath, next)
-  }
-}
-
-async function cleanupLegacyManagedHookRepresentations(): Promise<void> {
-  try {
-    await cleanupLegacySystemManagedHooks()
-    cleanupLegacyCodexProfileHooks()
-  } catch (error) {
-    console.warn('[codex-hook-service] failed to clean legacy Codex hooks', error)
-  }
-}
-
-function removeRuntimeManagedHookTrustEntries(configPath: string): void {
-  try {
-    removeCodexManagedHookTrustEntries({
-      tomlPath: getCodexConfigTomlPath(),
-      runtimeHomePath: getOrcaManagedCodexHomePath(),
-      sourcePath: configPath,
-      command: getManagedCommand(getManagedScriptPath()),
-      managedEventLabels: CODEX_MANAGED_EVENT_LABELS,
-      timeoutSec: MANAGED_HOOK_TIMEOUT_SECONDS,
-      sourceUsesExplicitCodexHome: true
-    })
-  } catch (error) {
-    // Best effort — stale trust is harmless once hooks.json no longer references the hook; log so a programmer error isn't silent.
-    console.warn('[codex-hook-service] failed to clean trust entries', error)
-  }
-}
-
-function removeWslRuntimeManagedHookTrustEntries(plan: CodexWslRuntimeHookInstallPlan): void {
-  try {
-    removeCodexManagedHookTrustEntries({
-      tomlPath: plan.tomlPath,
-      runtimeHomePath: pathWin32.dirname(plan.tomlPath),
-      sourcePath: plan.trustConfigPath,
-      command: wrapReadablePosixHookCommand(plan.commandScriptPath),
-      managedEventLabels: CODEX_MANAGED_EVENT_LABELS,
-      timeoutSec: MANAGED_HOOK_TIMEOUT_SECONDS
-    })
-  } catch (error) {
-    // Why: best-effort like host cleanup; stale trust is inert once hooks.json no longer points at us.
-    console.warn('[codex-hook-service] failed to clean WSL trust entries', error)
-  }
-}
-
-function removeStaleWslRuntimeManagedHookTrustEntries(
-  tomlPath: string,
-  desiredEntries: readonly CodexTrustEntry[],
-  priorLedgerHomes: readonly CodexTrustGrantLedgerHome[] = []
-): void {
-  removeStaleWslCodexManagedHookTrustEntries({
-    tomlPath,
-    runtimeHomePath: pathWin32.dirname(tomlPath),
-    desiredEntries,
-    managedEventLabels: CODEX_MANAGED_EVENT_LABELS,
-    timeoutSec: MANAGED_HOOK_TIMEOUT_SECONDS,
-    buildManagedCommand: (linuxRuntimeHome) =>
-      wrapReadablePosixHookCommand(`${linuxRuntimeHome}/.orca/agent-hooks/codex-hook.sh`),
-    priorLedgerHomes
-  })
-}
-
-function getManagedScript(target: 'local' | 'posix' = 'local'): string {
-  if (target === 'local' && process.platform === 'win32') {
-    return [
-      '@echo off',
-      'setlocal',
-      // Why: the endpoint file holds this install's live port/token; sourcing it lets a surviving PTY reach the current server (see claude/hook-service.ts).
-      'if defined ORCA_AGENT_HOOK_ENDPOINT if exist "%ORCA_AGENT_HOOK_ENDPOINT%" call "%ORCA_AGENT_HOOK_ENDPOINT%" 2>nul',
-      ...buildWindowsHookEnvironmentGuardLines(),
-      buildWindowsAgentHookCurlPostCommand('codex'),
-      'exit /b 0',
-      ...buildWindowsHookStdinDrainEpilogue(),
-      ''
-    ].join('\r\n')
-  }
-
-  return [
-    '#!/bin/sh',
-    ...buildPosixHookPayloadCapture(),
-    ...buildPosixHookSpoolLines('codex'),
-    // Why: sourcing refreshes PORT/TOKEN/ENV/VERSION from the current Orca so a surviving PTY keeps reporting after a restart (see claude/hook-service.ts).
-    'load_hook_endpoint() {',
-    '  endpoint_path="$1"',
-    '  unset ORCA_AGENT_HOOK_TRANSPORT',
-    '  case "$endpoint_path" in',
-    '    *.cmd)',
-    // Why: Windows passes endpoint.cmd into WSL via WSLENV; parse only Orca's known assignments since cmd.exe `set` lines aren't shell syntax.
-    '      endpoint_cr=$(printf "\\r")',
-    '      while IFS= read -r endpoint_line || [ -n "$endpoint_line" ]; do',
-    '        endpoint_line=${endpoint_line%"$endpoint_cr"}',
-    '        case "$endpoint_line" in',
-    '          "set ORCA_AGENT_HOOK_PORT="*) ORCA_AGENT_HOOK_PORT=${endpoint_line#*=} ;;',
-    '          "set ORCA_AGENT_HOOK_TOKEN="*) ORCA_AGENT_HOOK_TOKEN=${endpoint_line#*=} ;;',
-    '          "set ORCA_AGENT_HOOK_ENV="*) ORCA_AGENT_HOOK_ENV=${endpoint_line#*=} ;;',
-    '          "set ORCA_AGENT_HOOK_VERSION="*) ORCA_AGENT_HOOK_VERSION=${endpoint_line#*=} ;;',
-    '          "set ORCA_AGENT_HOOK_TRANSPORT="*) ORCA_AGENT_HOOK_TRANSPORT=${endpoint_line#*=} ;;',
-    '        esac',
-    '      done < "$endpoint_path"',
-    '      ;;',
-    '    *)',
-    '      . "$endpoint_path" 2>/dev/null || :',
-    '      ;;',
-    '  esac',
-    '}',
-    'if [ -n "$ORCA_AGENT_HOOK_ENDPOINT" ] && [ -r "$ORCA_AGENT_HOOK_ENDPOINT" ]; then',
-    '  load_hook_endpoint "$ORCA_AGENT_HOOK_ENDPOINT"',
-    'fi',
-    'if [ -z "$ORCA_AGENT_HOOK_PORT" ] || [ -z "$ORCA_AGENT_HOOK_TOKEN" ] || [ -z "$ORCA_PANE_KEY" ]; then',
-    '  spool_hook_event',
-    '  exit 0',
-    'fi',
-    'post_codex_hook() {',
-    '  curl_bin="$1"',
-    '  connect_timeout="${2:-0.5}"',
-    '  max_time="${3:-1.5}"',
-    // Why: keep full hook JSON off the command line and avoid URL-encoding paths/commands into IDS-friendly traversal signatures.
-    ...buildPosixAgentHookPostCommand('codex', {
-      curlCommand: '"$curl_bin"',
-      indent: '    '
-    }).map((line) => `  ${line}`),
-    '}',
-    'is_wsl_runtime() {',
-    '  [ -n "$WSL_DISTRO_NAME" ] && return 0',
-    '  grep -qiE "microsoft|wsl" /proc/sys/kernel/osrelease /proc/version 2>/dev/null',
-    '}',
-    'if post_codex_hook curl >/dev/null 2>&1; then',
-    '  exit 0',
-    'fi',
-    'if is_wsl_runtime; then',
-    '  windows_curl=$(command -v curl.exe 2>/dev/null || true)',
-    '  if [ -n "$windows_curl" ] && [ -x "$windows_curl" ]; then',
-    '    if post_codex_hook "$windows_curl" 3 5 >/dev/null 2>&1; then',
-    '      exit 0',
-    '    fi',
-    '    # post_codex_hook "$windows_curl" 3 5 >/dev/null 2>&1 || true',
-    '  fi',
-    'fi',
-    'spool_hook_event',
-    'exit 0',
-    ''
-  ].join('\n')
-}
-
-// Why (#16441): the grant inside awaits a codex app-server session, so a
-// concurrent pane launch could write this config.toml between this run's
-// capture and its restore. One lane per file keeps the sequence atomic.
-function installManagedHooksIntoWslRuntime(
-  plan: CodexWslRuntimeHookInstallPlan
-): Promise<AgentHookInstallStatus> {
-  return runExclusivelyForCodexTrustConfig(plan.tomlPath, () =>
-    installManagedHooksIntoWslRuntimeExclusively(plan)
-  )
-}
-
-async function installManagedHooksIntoWslRuntimeExclusively(
-  plan: CodexWslRuntimeHookInstallPlan
-): Promise<AgentHookInstallStatus> {
-  const config = readHooksJson(plan.configPath)
-  if (!config) {
-    return {
-      agent: 'codex',
-      state: 'error',
-      configPath: plan.configPath,
-      managedHooksPresent: false,
-      detail: 'Could not parse Codex hooks.json'
-    }
-  }
-
-  const isManagedCommand = createManagedCommandMatcher('codex-hook.sh')
-  const command = wrapReadablePosixHookCommand(plan.commandScriptPath)
-  const nextHooks = { ...config.hooks }
-  const managedEvents = new Set<string>(CODEX_EVENTS)
-  for (const [eventName, definitions] of Object.entries(nextHooks)) {
-    if (managedEvents.has(eventName) || !Array.isArray(definitions)) {
-      continue
-    }
-    const cleaned = removeManagedCommands(definitions, isManagedCommand)
-    if (cleaned.length === 0) {
-      delete nextHooks[eventName]
-    } else {
-      nextHooks[eventName] = cleaned
-    }
-  }
-
-  const trustEntries: CodexTrustEntry[] = []
-  for (const eventName of CODEX_EVENTS) {
-    const current = Array.isArray(nextHooks[eventName]) ? nextHooks[eventName] : []
-    const cleaned = removeManagedCommands(current, isManagedCommand)
-    const definition: HookDefinition = {
-      hooks: [buildManagedCommandHook(command)]
-    }
-    nextHooks[eventName] = [definition, ...cleaned]
-    trustEntries.push({
-      sourcePath: plan.trustConfigPath,
-      eventLabel: CODEX_EVENT_LABEL[eventName],
-      groupIndex: 0,
-      handlerIndex: 0,
-      command,
-      timeoutSec: MANAGED_HOOK_TIMEOUT_SECONDS
-    })
-  }
-
-  config.hooks = nextHooks
-  writeManagedScript(plan.scriptPath, getManagedScript('posix'))
-  writeCodexHooksJson(plan.configPath, nextHooks)
-  try {
-    // Why: same grant-then-fallback split as the host install — codex runs
-    // inside the distro so the hash authority matches the codex the pane runs.
-    const runtimeHomePath = pathWin32.dirname(plan.tomlPath)
-    // Why: a successful re-grant replaces the ledger. Keep the previous
-    // records long enough to prove ownership of stale canonical-path keys.
-    const previousLedgerHome = readCodexTrustGrantLedgerHomeForReconciliation(runtimeHomePath)
-    // Why: Codex's verified RPC write must be the final config mutation. A
-    // host-side rewrite after verification can race or invalidate that grant.
-    removeStaleWslRuntimeManagedHookTrustEntries(
-      plan.tomlPath,
-      trustEntries,
-      previousLedgerHome ? [previousLedgerHome] : []
-    )
-    const grant = await grantManagedCodexHookTrust({
-      runtimeHomePath,
-      tomlPath: plan.tomlPath,
-      managedCommand: command,
-      managedEntries: trustEntries,
-      host: { kind: 'wsl', distro: plan.wslDistro, linuxRuntimeHome: plan.linuxRuntimeHome },
-      telemetryLane: 'managed'
-    })
-    if (grant.lane === 'fallback') {
-      // Why: WSL runtime homes may carry user hook approvals we did not rebuild
-      // here; only upsert Orca's entries instead of sweeping the whole source.
-      upsertHookTrustEntries(plan.tomlPath, trustEntries)
-    }
-  } catch (error) {
-    return {
-      agent: 'codex',
-      state: 'error',
-      configPath: plan.configPath,
-      managedHooksPresent: true,
-      detail: `Hooks installed but trust entries could not be written: ${error instanceof Error ? error.message : String(error)}. Run /hooks in Codex to approve.`
-    }
-  }
-
-  return {
-    agent: 'codex',
-    state: 'installed',
-    configPath: plan.configPath,
-    managedHooksPresent: true,
-    detail: null
-  }
-}
-
-function refreshWslRuntimeUserHooks(plan: CodexWslRuntimeHookInstallPlan): AgentHookInstallStatus {
-  const config = readHooksJson(plan.configPath)
-  if (!config) {
-    return {
-      agent: 'codex',
-      state: 'error',
-      configPath: plan.configPath,
-      managedHooksPresent: false,
-      detail: 'Could not parse Codex hooks.json'
-    }
-  }
-
-  const isManagedCommand = createManagedCommandMatcher('codex-hook.sh')
-  const nextHooks = { ...config.hooks }
-  for (const [eventName, definitions] of Object.entries(nextHooks)) {
-    if (!Array.isArray(definitions)) {
-      continue
-    }
-    const cleaned = removeManagedCommands(definitions, isManagedCommand)
-    if (cleaned.length === 0) {
-      delete nextHooks[eventName]
-    } else {
-      nextHooks[eventName] = cleaned
-    }
-  }
-  writeCodexHooksJson(plan.configPath, nextHooks)
-  removeWslRuntimeManagedHookTrustEntries(plan)
-  try {
-    // Why: the disabled path may run after the WSL mount root changed, so cleanup can't be scoped to the plan's current source path.
-    removeStaleWslRuntimeManagedHookTrustEntries(plan.tomlPath, [])
-  } catch (error) {
-    console.warn('[codex-hook-service] failed to clean stale WSL trust entries', error)
-  }
-  return {
-    agent: 'codex',
-    state: 'not_installed',
-    configPath: plan.configPath,
-    managedHooksPresent: false,
-    detail: null
-  }
-}
-
-// Why: transport failures preserve last known-good identity; a successful absence probe is strong enough to revoke trust immediately.
-function getWslHookReconciliationAction(args: {
-  settlement: WslCanonicalPathSettlement
-  isCurrentGeneration: boolean
-  installedTrustConfigPath: string | null
-  resolvedTrustConfigPath: string | null
-  /** Whether the synchronous install for this generation wrote trust. */
-  installSucceeded: boolean
-}): 'none' | 'remove' | 'reinstall' {
-  if (!args.isCurrentGeneration) {
-    return 'none'
-  }
-  if (args.settlement.status === 'missing') {
-    // Why: a `missing` directory probe right after a verified install/grant is
-    // a false negative — the RPC (or fallback) just wrote and read trust in
-    // that home, so it exists. Revoking here would delete the fresh grant the
-    // launching pane needs, resurfacing "hooks need review". A genuinely moved
-    // home resolves to a different path and takes the `reinstall` branch below.
-    return args.installSucceeded ? 'none' : 'remove'
-  }
-  if (
-    args.settlement.status !== 'resolved' ||
-    !args.resolvedTrustConfigPath ||
-    args.resolvedTrustConfigPath === args.installedTrustConfigPath
-  ) {
-    return 'none'
-  }
-  return 'reinstall'
-}
-
-// Why: fold only the Windows-case-insensitive portion; a full lowercase would let case-distinct WSL homes share one reconciliation slot.
-function getWslReconciliationKey(runtimeHomePath: string): string {
-  return normalizeCodexProjectPathForLookup(runtimeHomePath)
-}
-
-export class CodexHookService {
-  async refreshManagedScripts(): Promise<void> {
-    await refreshManagedScriptIfPresent(getManagedScriptPath(), getManagedScript())
-  }
-
-  private readonly wslReconciliationGeneration = new Map<string, number>()
-  private readonly wslInstallsInFlight = new Map<string, Promise<AgentHookInstallStatus | null>>()
-
-  private supersedeWslReconciliation(runtimeHomePath: string | null | undefined): number {
-    if (!runtimeHomePath) {
-      return 0
-    }
-    const key = getWslReconciliationKey(runtimeHomePath)
-    const generation = (this.wslReconciliationGeneration.get(key) ?? 0) + 1
-    this.wslReconciliationGeneration.set(key, generation)
-    return generation
-  }
-
-  async installForRuntimeHome(
-    runtimeHomePath: string | null | undefined,
-    target?: CodexWslRuntimeHookTarget
-  ): Promise<AgentHookInstallStatus | null> {
-    const generation = this.supersedeWslReconciliation(runtimeHomePath)
-    let installedTrustConfigPath: string | null = null
-    let installSucceeded = false
-    // Why: the install below now awaits a codex app-server session, so a
-    // settlement callback can land mid-install. This gate keeps reconciliation
-    // reading the finished install's flags, as it did when the install was
-    // synchronous and no callback could interleave with it.
-    let markPrimaryInstallSettled!: () => void
-    let reconciliationChain = new Promise<void>((resolve) => {
-      markPrimaryInstallSettled = resolve
-    })
-    const reconcileSettledWslCanonicalPath = async (
-      settlement: WslCanonicalPathSettlement
-    ): Promise<void> => {
-      if (!runtimeHomePath) {
-        return
-      }
-      const key = getWslReconciliationKey(runtimeHomePath)
-      const resolvedPlan =
-        settlement.status === 'resolved'
-          ? createCodexWslRuntimeHookInstallPlan(
-              runtimeHomePath,
-              target,
-              () => settlement.canonicalPath
-            )
-          : null
-      const action = getWslHookReconciliationAction({
-        settlement,
-        isCurrentGeneration: this.wslReconciliationGeneration.get(key) === generation,
-        installedTrustConfigPath,
-        resolvedTrustConfigPath: resolvedPlan?.trustConfigPath ?? null,
-        installSucceeded
-      })
-      if (action === 'none') {
-        return
-      }
-      if (action === 'remove') {
-        try {
-          removeStaleWslRuntimeManagedHookTrustEntries(
-            pathWin32.join(runtimeHomePath, 'config.toml'),
-            []
-          )
-        } catch (error) {
-          console.warn('[codex-hook-service] failed to revoke stale WSL hook trust', error)
-        }
-        return
-      }
-      if (!resolvedPlan) {
-        return
-      }
-      const status = await installManagedHooksIntoWslRuntime(resolvedPlan)
-      if (status.state === 'error') {
-        console.warn('[codex-hook-service] failed to reconcile WSL hook path', status.detail)
-        return
-      }
-      installedTrustConfigPath = resolvedPlan.trustConfigPath
-      installSucceeded = status.state === 'installed'
-    }
-    const onCanonicalPathSettled = (settlement: WslCanonicalPathSettlement): void => {
-      const run = (): Promise<void> => reconcileSettledWslCanonicalPath(settlement)
-      reconciliationChain = reconciliationChain.then(run, run)
-      void reconciliationChain.catch((error: unknown) => {
-        console.warn('[codex-hook-service] failed to reconcile WSL hook path', error)
-      })
-    }
-    const wslPlan = createCodexWslRuntimeHookInstallPlan(
-      runtimeHomePath,
-      target,
-      undefined,
-      onCanonicalPathSettled
-    )
-    installedTrustConfigPath = wslPlan?.trustConfigPath ?? null
-    try {
-      const status = wslPlan ? await installManagedHooksIntoWslRuntime(wslPlan) : null
-      installSucceeded = status?.state === 'installed'
-      return status
-    } finally {
-      markPrimaryInstallSettled()
-    }
-  }
-
-  installForRuntimeHomeSerialized(
-    runtimeHomePath: string | null | undefined,
-    target?: CodexWslRuntimeHookTarget
-  ): Promise<AgentHookInstallStatus | null> {
-    if (!runtimeHomePath) {
-      return Promise.resolve(null)
-    }
-    const targetKey = target?.runtime === 'wsl' ? target.wslDistro?.trim().toLowerCase() : ''
-    const key = `${getWslReconciliationKey(runtimeHomePath)}\0${targetKey ?? ''}`
-    const active = this.wslInstallsInFlight.get(key)
-    if (active) {
-      return active
-    }
-    const install = this.installForRuntimeHome(runtimeHomePath, target)
-    this.wslInstallsInFlight.set(key, install)
-    const clear = (): void => {
-      if (this.wslInstallsInFlight.get(key) === install) {
-        this.wslInstallsInFlight.delete(key)
-      }
-    }
-    void install.then(clear, clear)
-    return install
-  }
-
-  refreshRuntimeUserHooksForRuntimeHome(
-    runtimeHomePath: string | null | undefined,
-    target?: CodexWslRuntimeHookTarget
-  ): AgentHookInstallStatus | null {
-    this.supersedeWslReconciliation(runtimeHomePath)
-    const wslPlan = createCodexWslRuntimeHookInstallPlan(runtimeHomePath, target)
-    return wslPlan ? refreshWslRuntimeUserHooks(wslPlan) : null
-  }
-
-  getStatus(runtimeHomePath: string = getOrcaManagedCodexHomePath()): AgentHookInstallStatus {
-    return this.getStatusAfterInstall(null, runtimeHomePath)
-  }
-
-  private getStatusAfterInstall(
-    recentGrantEntries: readonly CodexTrustEntry[] | null,
-    runtimeHomePath: string = getOrcaManagedCodexHomePath()
-  ): AgentHookInstallStatus {
-    const configPath = getConfigPath(runtimeHomePath)
-    const scriptPath = getManagedScriptPath()
-    const config = readHooksJson(configPath)
-    if (!config) {
-      return {
-        agent: 'codex',
-        state: 'error',
-        configPath,
-        managedHooksPresent: false,
-        detail: 'Could not parse Codex hooks.json'
-      }
-    }
-
-    // Why: Codex 0.129+ silently drops untrusted hooks, so report `partial` when managed events OR their trust entries are missing/stale.
-    const command = getManagedCommand(scriptPath)
-    const tomlPath = getCodexConfigTomlPath(runtimeHomePath)
-    // Why: an unreadable config.toml (EACCES/EIO) is distinct from "file
-    // absent" (which returns an empty Map without throwing). Hooks.json may
-    // still be fine, so report partial with a specific reason rather than
-    // collapsing to a generic error or masking it as universally-stale trust.
-    let trustEntries: Map<string, CodexHookTrustState>
-    let trustReadError: string | null = null
-    try {
-      trustEntries = readHookTrustEntries(tomlPath)
-    } catch (error) {
-      trustEntries = new Map()
-      trustReadError = error instanceof Error ? error.message : String(error)
-    }
-    // Why: RPC-granted entries store Codex's own hash, which is authoritative
-    // even when it differs from computeTrustedHash — that difference is the
-    // drift bug class this lane exists to absorb, not a stale entry.
-    // Why: install() already resolved the binary and either verified Codex's
-    // hashes or wrote fallback hashes. Re-resolving PATH here doubles sync launch work.
-    const ledgerHome =
-      recentGrantEntries === null
-        ? readCurrentNativeCodexTrustGrantLedgerHome(runtimeHomePath)
-        : null
-    const recentGrantHashes = new Map<string, { signature: string; trustedHash: string }>()
-    for (const entry of recentGrantEntries ?? []) {
-      if (entry.trustedHash) {
-        recentGrantHashes.set(normalizeHookTrustKeyForLookup(computeTrustKey(entry)), {
-          signature: getCodexHookTrustSignature(entry),
-          trustedHash: entry.trustedHash
-        })
-      }
-    }
-
-    const missing: string[] = []
-    const trustMissing: string[] = []
-    const disabled: string[] = []
-    const trustSourcePath = getCodexExplicitHomeHookSourcePath(configPath)
-    let presentCount = 0
-    for (const eventName of CODEX_EVENTS) {
-      const definitions = Array.isArray(config.hooks?.[eventName]) ? config.hooks![eventName]! : []
-      // Why: older installs appended, current ones prepend; last-match keeps status repair conservative when stale duplicate definitions survive.
-      let foundGroupIndex = -1
-      let foundHandlerIndex = -1
-      definitions.forEach((definition, idx) => {
-        const hooks = definition.hooks ?? []
-        // Why: last-match-wins at the group level — if merged hook arrays repeat our command, the surviving runtime entry is the last one.
-        const handlerIdx = hooks.findLastIndex((hook) => hook.command === command)
-        if (handlerIdx !== -1) {
-          foundGroupIndex = idx
-          foundHandlerIndex = handlerIdx
-        }
-      })
-      if (foundGroupIndex === -1) {
-        missing.push(eventName)
-        continue
-      }
-      presentCount += 1
-      // Why: a stale hash blocks firing like a missing entry, so compare against the canonical hash we would write.
-      // Why: Codex's hook_key is positional, so hardcoding handlerIndex 0 misreports trust for user-merged hook arrays.
-      // Why: hash the same `timeout` install() writes, since Codex folds it into the trust hash or every managed hook reports stale-trust.
-      const trustInput: CodexTrustEntry = {
-        sourcePath: trustSourcePath,
-        eventLabel: CODEX_EVENT_LABEL[eventName],
-        groupIndex: foundGroupIndex,
-        handlerIndex: foundHandlerIndex,
-        command,
-        timeoutSec: MANAGED_HOOK_TIMEOUT_SECONDS
-      }
-      const trustKey = computeTrustKey(trustInput)
-      const validHashes = new Set([computeTrustedHash(trustInput)])
-      const grantedHash = getCodexLedgerTrustedHash(ledgerHome, trustKey, trustInput)
-      if (grantedHash) {
-        validHashes.add(grantedHash)
-      }
-      const recentGrant = recentGrantHashes.get(normalizeHookTrustKeyForLookup(trustKey))
-      if (
-        recentGrant?.signature === getCodexHookTrustSignature(trustInput) &&
-        recentGrant.trustedHash
-      ) {
-        validHashes.add(recentGrant.trustedHash)
-      }
-      const actualState = trustEntries.get(trustKey)
-      if (!actualState?.trustedHash || !validHashes.has(actualState.trustedHash)) {
-        trustMissing.push(eventName)
-      } else if (actualState?.enabled === false) {
-        disabled.push(eventName)
-      }
-    }
-    const managedHooksPresent = presentCount > 0
-    let state: AgentHookInstallState
-    let detail: string | null
-    if (presentCount === 0) {
-      state = 'not_installed'
-      // Why: surface the trust read error even when not_installed, so a broken config.toml gives actionable info.
-      detail = trustReadError !== null ? `Trust entries unverifiable: ${trustReadError}` : null
-    } else if (
-      missing.length === 0 &&
-      trustMissing.length === 0 &&
-      disabled.length === 0 &&
-      trustReadError === null
-    ) {
-      state = 'installed'
-      detail = null
-    } else {
-      state = 'partial'
-      const parts: string[] = []
-      if (missing.length > 0) {
-        parts.push(`Managed hook missing for events: ${missing.join(', ')}`)
-      }
-      if (trustReadError !== null) {
-        parts.push(`Trust entries unverifiable: ${trustReadError}`)
-      } else if (trustMissing.length > 0) {
-        parts.push(`Trust entry missing or stale for events: ${trustMissing.join(', ')}`)
-      }
-      if (disabled.length > 0) {
-        parts.push(`Managed hook disabled for events: ${disabled.join(', ')}`)
-      }
-      detail = parts.join('; ')
-    }
-    return { agent: 'codex', state, configPath, managedHooksPresent, detail }
-  }
-
-  // Why: runtimeHomePath defaults to the shared managed mirror, but a managed
-  // account launching against its own self-contained CODEX_HOME passes that
-  // per-account home so hooks.json/config.toml/trust land where codex reads.
-  install(
-    runtimeHomePath: string = getOrcaManagedCodexHomePath()
-  ): Promise<AgentHookInstallStatus> {
-    // Why: same lane as the grant it performs — see installManagedHooksIntoWslRuntime.
-    return runExclusivelyForRuntimeAndSystemTrustConfig(runtimeHomePath, () =>
-      this.installExclusively(runtimeHomePath)
-    )
-  }
-
-  private async installExclusively(runtimeHomePath: string): Promise<AgentHookInstallStatus> {
-    const configPath = getConfigPath(runtimeHomePath)
-    const scriptPath = getManagedScriptPath()
-    // Why: must run before this install rewrites hooks.json/config.toml —
-    // approvals the user made inside Orca-launched Codex are keyed to the
-    // previous launch's runtime layout, and stale-trust cleanup below would
-    // delete them once the system config stops backing them.
-    promoteCodexRuntimeHookApprovalsToSystem(runtimeHomePath)
-    const config = readHooksJson(configPath)
-    if (!config) {
-      return {
-        agent: 'codex',
-        state: 'error',
-        configPath,
-        managedHooksPresent: false,
-        detail: 'Could not parse Codex hooks.json'
-      }
-    }
-
-    // Why: match by script filename (not exact command) so a fresh install sweeps stale entries from older builds or a different userData path.
-    const isManagedCommand = createManagedCommandMatcher(getCodexManagedScriptFileName())
-    const command = getManagedCommand(scriptPath)
-    const hookPlan = getRuntimeHooksWithSystemUserHooks(config.hooks, isManagedCommand, configPath)
-    if (!hookPlan) {
-      return {
-        agent: 'codex',
-        state: 'error',
-        configPath,
-        managedHooksPresent: false,
-        detail: 'Could not read system Codex hooks.json'
-      }
-    }
-    const nextHooks = hookPlan.hooks
-    const managedEvents = new Set<string>(CODEX_EVENTS)
-
-    // Why: sweep managed entries from events we no longer subscribe to (e.g. a prior install's PreToolUse), else they keep firing stale hooks after upgrade.
-    for (const [eventName, definitions] of Object.entries(nextHooks)) {
-      if (managedEvents.has(eventName)) {
-        continue
-      }
-      if (!Array.isArray(definitions)) {
-        // Why: a non-array event value would make removeManagedCommands throw; skip the unparsable entry, managed events below still install.
-        continue
-      }
-      const cleaned = removeManagedCommands(definitions, isManagedCommand)
-      if (cleaned.length === 0) {
-        delete nextHooks[eventName]
-      } else {
-        nextHooks[eventName] = cleaned
-      }
-    }
-
-    // Why: Codex 0.129+ requires a per-hook config.toml trust entry or the hook needs manual /hooks-approve; precompute the hash to avoid that.
-    const mirroredUserTrustEntries = moveMirroredRuntimeUserTrustAfterManagedStatusHook(
-      hookPlan.trustEntries
-    )
-    const mirroredTrustEntries: CodexTrustEntry[] = mirroredUserTrustEntries.map(
-      ({ entry }) => entry
-    )
-    const managedTrustEntries: CodexTrustEntry[] = []
-    const trustSourcePath = getCodexExplicitHomeHookSourcePath(configPath)
-    for (const eventName of CODEX_EVENTS) {
-      const current = Array.isArray(nextHooks[eventName]) ? nextHooks[eventName] : []
-      const cleaned = removeManagedCommands(current, isManagedCommand)
-      const definition: HookDefinition = {
-        hooks: [buildManagedCommandHook(command)]
-      }
-      nextHooks[eventName] = [definition, ...cleaned]
-      // Why: the status hook must run before user hooks so a slow
-      // PostToolUse/Stop hook cannot leave the sidebar stuck on the previous
-      // state while Codex visibly reports that hooks are still running.
-      // timeoutSec mirrors the hook's `timeout` so the trust hash matches the
-      // entry actually written to hooks.json.
-      managedTrustEntries.push({
-        sourcePath: trustSourcePath,
-        eventLabel: CODEX_EVENT_LABEL[eventName],
-        groupIndex: 0,
-        handlerIndex: 0,
-        command,
-        timeoutSec: MANAGED_HOOK_TIMEOUT_SECONDS
-      })
-    }
-    const trustEntries: CodexTrustEntry[] = [...mirroredTrustEntries, ...managedTrustEntries]
-    let recentGrantEntries: readonly CodexTrustEntry[] = []
-
-    config.hooks = nextHooks
-    writeManagedScript(scriptPath, getManagedScript())
-    writeCodexHooksJson(configPath, nextHooks)
-    // Why: trust entries write last so a half-write can't leave a hash pointing at a nonexistent hook.
-    // Why: surface trust-write failures — otherwise getStatus reports green for a hook Codex won't fire.
-    try {
-      const tomlPath = getCodexConfigTomlPath(runtimeHomePath)
-      syncSystemConfigIntoManagedCodexHome({
-        runtimeHomePath,
-        systemHomePath: getSystemCodexHomePath()
-      })
-      // Why: Codex is the only authority on its trust-hash algorithm, so the
-      // managed entries are granted through codex app-server RPCs (verified by
-      // re-list) whenever the installed CLI supports them; the granted entries
-      // then carry Codex's verbatim hashes into stale cleanup so it cannot
-      // delete what Codex just wrote. Mirrored user trust keeps its existing
-      // verbatim-carry lane either way.
-      const grant = await grantManagedCodexHookTrust({
-        runtimeHomePath,
-        tomlPath,
-        managedCommand: command,
-        managedEntries: managedTrustEntries,
-        host: { kind: 'native' },
-        telemetryLane: 'managed'
-      })
-      if (grant.lane === 'rpc') {
-        recentGrantEntries = grant.entries
-        upsertHookTrustEntries(tomlPath, mirroredTrustEntries)
-        removeStaleRuntimeHookTrustEntries(tomlPath, configPath, [
-          ...mirroredTrustEntries,
-          ...grant.entries
-        ])
-      } else {
-        // Why: system user hook approvals are mirrored into runtime CODEX_HOME.
-        // If the user later revokes approval in ~/.codex/config.toml, preserving
-        // all old runtime [hooks.state.*] blocks would keep Orca Codex trusted.
-        // Upsert first so duplicate repair can preserve a disabled managed copy
-        // before stale cleanup removes old managed hook keys.
-        upsertHookTrustEntries(tomlPath, trustEntries)
-        removeStaleRuntimeHookTrustEntries(tomlPath, configPath, trustEntries)
-      }
-      applyMirroredRuntimeUserHookTrustStates(tomlPath, mirroredUserTrustEntries)
-    } catch (error) {
-      return {
-        agent: 'codex',
-        state: 'error',
-        configPath,
-        managedHooksPresent: true,
-        detail: `Hooks installed but trust entries could not be written: ${error instanceof Error ? error.message : String(error)}. Run /hooks in Codex to approve.`
-      }
-    }
-    snapshotCodexRuntimeHookTrustProvenance(runtimeHomePath)
-    await cleanupLegacyManagedHookRepresentations()
-    return this.getStatusAfterInstall(recentGrantEntries, runtimeHomePath)
-  }
-
-  async installRemote(
-    sftp: SFTPWrapper,
-    remoteHome: string,
-    options?: { codexHomeDir?: string; deferTrustUntilConfigToml?: boolean }
-  ): Promise<AgentHookInstallStatus> {
-    const codexHomeBase =
-      options?.codexHomeDir?.replace(/\/$/, '') ?? `${remoteHome.replace(/\/$/, '')}/.codex`
-    const remoteConfigPath = `${codexHomeBase}/hooks.json`
-    const remoteTomlPath = `${codexHomeBase}/config.toml`
-    // Redirected WSL homes must use the same script location and command shape
-    // as the runtime installer; two representations of one hooks.json race
-    // into stale trust keys. Plain SSH keeps its guest-home script contract.
-    const redirectedCodexHome = options?.codexHomeDir?.replace(/\/$/, '')
-    const remoteScriptPath = redirectedCodexHome
-      ? `${redirectedCodexHome}/.orca/agent-hooks/codex-hook.sh`
-      : `${remoteHome.replace(/\/$/, '')}/.orca/agent-hooks/codex-hook.sh`
-    try {
-      const config = await readHooksJsonRemote(sftp, remoteConfigPath)
-      if (!config) {
-        return {
-          agent: 'codex',
-          state: 'error',
-          configPath: remoteConfigPath,
-          managedHooksPresent: false,
-          detail: 'Could not parse remote Codex hooks.json'
-        }
-      }
-
-      const command = redirectedCodexHome
-        ? wrapReadablePosixHookCommand(remoteScriptPath)
-        : wrapPosixHookCommand(remoteScriptPath)
-      const nextHooks = { ...config.hooks }
-      const managedEvents = new Set<string>(CODEX_EVENTS)
-      const isManagedCommand = createManagedCommandMatcher('codex-hook.sh')
-
-      for (const [eventName, definitions] of Object.entries(nextHooks)) {
-        if (managedEvents.has(eventName) || !Array.isArray(definitions)) {
-          continue
-        }
-        const cleaned = removeManagedCommands(definitions, isManagedCommand)
-        if (cleaned.length === 0) {
-          delete nextHooks[eventName]
-        } else {
-          nextHooks[eventName] = cleaned
-        }
-      }
-
-      const trustEntries: CodexTrustEntry[] = []
-      for (const eventName of CODEX_EVENTS) {
-        const current = Array.isArray(nextHooks[eventName]) ? nextHooks[eventName] : []
-        const cleaned = removeManagedCommands(current, isManagedCommand)
-        const definition: HookDefinition = {
-          hooks: [buildManagedCommandHook(command)]
-        }
-        nextHooks[eventName] = redirectedCodexHome
-          ? [definition, ...cleaned]
-          : [...cleaned, definition]
-        trustEntries.push({
-          sourcePath: remoteConfigPath,
-          eventLabel: CODEX_EVENT_LABEL[eventName],
-          groupIndex: redirectedCodexHome ? 0 : cleaned.length,
-          handlerIndex: 0,
-          command,
-          timeoutSec: MANAGED_HOOK_TIMEOUT_SECONDS
-        })
-      }
-
-      config.hooks = nextHooks
-      // Why: write script/settings before trust TOML; a partial trust write leaves Codex asking approval instead of running a missing script.
-      // Why: SSH remotes use POSIX `.sh` paths even when Orca runs on Windows; never derive remote script syntax from local OS.
-      await writeManagedScriptRemote(sftp, remoteScriptPath, getManagedScript('posix'))
-      // Why: SSH edits the user's remote ~/.codex/hooks.json directly, so preserve non-Orca top-level metadata while replacing the hooks tree.
-      await writeHooksJsonRemote(sftp, remoteConfigPath, { ...config, hooks: nextHooks })
-      try {
-        const existingTomlRaw = await readTextFileRemote(sftp, remoteTomlPath)
-        if (existingTomlRaw === null && options?.deferTrustUntilConfigToml === true) {
-          return {
-            agent: 'codex',
-            state: 'installed',
-            configPath: remoteConfigPath,
-            managedHooksPresent: true,
-            detail: 'Trust entries deferred until config.toml is seeded by the launch path'
-          }
-        }
-        const existingToml = existingTomlRaw ?? ''
-        const updatedToml = upsertHookTrustEntriesInContent(existingToml, trustEntries)
-        if (updatedToml !== existingToml) {
-          await writeTextFileRemoteAtomic(sftp, remoteTomlPath, updatedToml)
-        }
-      } catch (error) {
-        return {
-          agent: 'codex',
-          state: 'error',
-          configPath: remoteConfigPath,
-          managedHooksPresent: true,
-          detail: `Hooks installed but trust entries could not be written: ${
-            error instanceof Error ? error.message : String(error)
-          }. Run /hooks in Codex on the remote host to approve.`
-        }
-      }
-
-      return {
-        agent: 'codex',
-        state: 'installed',
-        configPath: remoteConfigPath,
-        managedHooksPresent: true,
-        detail: null
-      }
-    } catch (err) {
-      return {
-        agent: 'codex',
-        state: 'error',
-        configPath: remoteConfigPath,
-        managedHooksPresent: false,
-        detail: err instanceof Error ? err.message : String(err)
-      }
-    }
-  }
-
-  refreshRuntimeUserHooks(
-    runtimeHomePath: string = getOrcaManagedCodexHomePath()
-  ): Promise<AgentHookInstallStatus> {
-    return runExclusivelyForRuntimeAndSystemTrustConfig(runtimeHomePath, () =>
-      this.refreshRuntimeUserHooksExclusively(runtimeHomePath)
-    )
-  }
-
-  private async refreshRuntimeUserHooksExclusively(
-    runtimeHomePath: string
-  ): Promise<AgentHookInstallStatus> {
-    const configPath = getConfigPath(runtimeHomePath)
-    // Why: same as install() — capture in-Orca approvals before this refresh
-    // rewrites the runtime files they are keyed against.
-    promoteCodexRuntimeHookApprovalsToSystem(runtimeHomePath)
-    const config = readHooksJson(configPath)
-    if (!config) {
-      // Why: disabled launch prep once called remove(); preserve that legacy cleanup even when runtime hooks.json is malformed.
-      await cleanupLegacyManagedHookRepresentations()
-      return {
-        agent: 'codex',
-        state: 'error',
-        configPath,
-        managedHooksPresent: false,
-        detail: 'Could not parse Codex hooks.json'
-      }
-    }
-
-    const isManagedCommand = createManagedCommandMatcher(getCodexManagedScriptFileName())
-    const hookPlan = getRuntimeHooksWithSystemUserHooks(config.hooks, isManagedCommand, configPath)
-    if (!hookPlan) {
-      return {
-        agent: 'codex',
-        state: 'error',
-        configPath,
-        managedHooksPresent: false,
-        detail: 'Could not read system Codex hooks.json'
-      }
-    }
-    config.hooks = hookPlan.hooks
-    writeCodexHooksJson(configPath, hookPlan.hooks)
-
-    try {
-      const tomlPath = getCodexConfigTomlPath(runtimeHomePath)
-      const trustEntries = hookPlan.trustEntries.map(({ entry }) => entry)
-      syncSystemConfigIntoManagedCodexHome({
-        runtimeHomePath,
-        systemHomePath: getSystemCodexHomePath()
-      })
-      // Why: this path is used when Orca status hooks are disabled. The
-      // runtime CODEX_HOME should keep user hooks, but not Orca-managed trust.
-      // Write current mirrored user trust first so stale cleanup compares
-      // against current hashes while deleting old managed hook keys.
-      upsertHookTrustEntries(tomlPath, trustEntries)
-      removeStaleRuntimeHookTrustEntries(tomlPath, configPath, trustEntries)
-      applyMirroredRuntimeUserHookTrustStates(tomlPath, hookPlan.trustEntries)
-    } catch (error) {
-      return {
-        agent: 'codex',
-        state: 'error',
-        configPath,
-        managedHooksPresent: false,
-        detail: `User hooks refreshed but trust entries could not be written: ${error instanceof Error ? error.message : String(error)}. Run /hooks in Codex to approve.`
-      }
-    }
-    snapshotCodexRuntimeHookTrustProvenance(runtimeHomePath)
-
-    await cleanupLegacyManagedHookRepresentations()
-    return this.getStatus(runtimeHomePath)
-  }
-
-  remove(): Promise<AgentHookInstallStatus> {
-    return runExclusivelyForRuntimeAndSystemTrustConfig(getOrcaManagedCodexHomePath(), () =>
-      this.removeExclusively()
-    )
-  }
-
-  private async removeExclusively(): Promise<AgentHookInstallStatus> {
-    const configPath = getConfigPath()
-    const configExists = existsSync(configPath)
-    const config = readHooksJson(configPath)
-    if (!config) {
-      // Why: a malformed hooks.json shouldn't strand old hooks in ~/.codex or the legacy profile after disabling.
-      await cleanupLegacyManagedHookRepresentations()
-      return {
-        agent: 'codex',
-        state: 'error',
-        configPath,
-        managedHooksPresent: false,
-        detail: 'Could not parse Codex hooks.json'
-      }
-    }
-
-    const nextHooks = { ...config.hooks }
-    // Why: same broad matcher as install() so stale entries from older builds get cleaned even if scriptPath moved.
-    const isManagedCommand = createManagedCommandMatcher(getCodexManagedScriptFileName())
-    for (const [eventName, definitions] of Object.entries(nextHooks)) {
-      if (!Array.isArray(definitions)) {
-        // Why: a non-array event value would make removeManagedCommands throw; skip it.
-        continue
-      }
-      const cleaned = removeManagedCommands(definitions, isManagedCommand)
-      if (cleaned.length === 0) {
-        delete nextHooks[eventName]
-      } else {
-        nextHooks[eventName] = cleaned
-      }
-    }
-    if (configExists) {
-      // Why: remove() may be the only repair path for a file whose top-level plugin metadata makes Codex reject hooks.json.
-      writeCodexHooksJson(configPath, nextHooks)
-    }
-
-    // Why: drop trust entries so config.toml doesn't accumulate dead [hooks.state] blocks across install/remove cycles.
-    removeRuntimeManagedHookTrustEntries(configPath)
-
-    await cleanupLegacyManagedHookRepresentations()
-
-    return this.getStatus()
-  }
-}
 
 export const codexHookService = new CodexHookService()
 
diff --git a/src/main/crash-reporting/expected-teardown-state.test.ts b/src/main/crash-reporting/expected-teardown-state.test.ts
index 17a296bb582..ccfc729092b 100644
--- a/src/main/crash-reporting/expected-teardown-state.test.ts
+++ b/src/main/crash-reporting/expected-teardown-state.test.ts
@@ -13,6 +13,7 @@ import {
 
 function shouldRecordKilledRenderer(expectedTeardown: 'none' | 'renderer-reload' | 'app-shutdown') {
   return shouldRecordProcessGoneCrash({
+    platform: 'win32',
     source: 'renderer',
     processType: 'renderer',
     reason: 'killed',
diff --git a/src/main/crash-reporting/gpu-crash-fallback-field-sessions.test.ts b/src/main/crash-reporting/gpu-crash-fallback-field-sessions.test.ts
index 3df9849505d..aec22e2e446 100644
--- a/src/main/crash-reporting/gpu-crash-fallback-field-sessions.test.ts
+++ b/src/main/crash-reporting/gpu-crash-fallback-field-sessions.test.ts
@@ -66,7 +66,13 @@ const FIELD_GPU_EVENT = {
 describe('1.4.190 win32 GPU-child crash cluster', () => {
   it('does not let process_gone_suppressed gate the fallback candidate check', () => {
     // The GPU death is suppressed as recoverable churn (no user-facing report)...
-    expect(shouldRecordProcessGoneCrash({ ...FIELD_GPU_EVENT, exitCode: -2147483645 })).toBe(false)
+    expect(
+      shouldRecordProcessGoneCrash({
+        ...FIELD_GPU_EVENT,
+        platform: 'win32',
+        exitCode: -2147483645
+      })
+    ).toBe(false)
     // ...but the fallback path reads the raw child-process-gone event, so the
     // suppression cannot hide a broken driver from recovery.
     expect(
diff --git a/src/main/crash-reporting/process-gone-classification.test.ts b/src/main/crash-reporting/process-gone-classification.test.ts
index 78522b76617..c26d3385406 100644
--- a/src/main/crash-reporting/process-gone-classification.test.ts
+++ b/src/main/crash-reporting/process-gone-classification.test.ts
@@ -1,9 +1,20 @@
 import { describe, expect, it } from 'vitest'
 import {
-  shouldRecordProcessGoneCrash,
+  shouldRecordProcessGoneCrash as classifyProcessGoneCrash,
   shouldRecoverRendererAfterProcessGone
 } from './process-gone-classification'
 
+type ProcessGoneClassificationInput = Parameters<typeof classifyProcessGoneCrash>[0]
+
+function shouldRecordProcessGoneCrash({
+  platform = 'darwin',
+  ...event
+}: Omit<ProcessGoneClassificationInput, 'platform'> & {
+  platform?: NodeJS.Platform
+}): boolean {
+  return classifyProcessGoneCrash({ platform, ...event })
+}
+
 describe('shouldRecordProcessGoneCrash', () => {
   it('suppresses killed process exits during expected lifecycle teardown', () => {
     expect(
@@ -258,15 +269,36 @@ describe('shouldRecordProcessGoneCrash', () => {
     ).toBe(true)
   })
 
-  it('still records renderer kills from the recent Linux crash-report cluster', () => {
+  it('suppresses namespace-encoded SIGTERM kills from the recent Linux cluster', () => {
     expect(
       shouldRecordProcessGoneCrash({
+        platform: 'linux',
         source: 'renderer',
         processType: 'renderer',
         reason: 'killed',
         exitCode: 61696,
         expectedTeardown: 'none'
       })
+    ).toBe(false)
+  })
+
+  it('keeps wait status 61696 reportable outside the exact Linux killed boundary', () => {
+    const processGone = {
+      source: 'renderer' as const,
+      processType: 'renderer',
+      reason: 'killed',
+      exitCode: 61696,
+      expectedTeardown: 'none' as const
+    }
+
+    expect(shouldRecordProcessGoneCrash({ ...processGone, platform: 'darwin' })).toBe(true)
+    expect(shouldRecordProcessGoneCrash({ ...processGone, platform: 'win32' })).toBe(true)
+    expect(
+      shouldRecordProcessGoneCrash({
+        ...processGone,
+        platform: 'linux',
+        reason: 'abnormal-exit'
+      })
     ).toBe(true)
   })
 
@@ -285,6 +317,7 @@ describe('shouldRecordProcessGoneCrash', () => {
   it('records non-SIGTERM killed process exits outside expected lifecycle teardown', () => {
     expect(
       shouldRecordProcessGoneCrash({
+        platform: 'linux',
         source: 'renderer',
         processType: 'renderer',
         reason: 'killed',
@@ -339,6 +372,15 @@ describe('shouldRecordProcessGoneCrash', () => {
 })
 
 describe('shouldRecoverRendererAfterProcessGone', () => {
+  it('recovers unexpected killed renderers', () => {
+    expect(
+      shouldRecoverRendererAfterProcessGone({
+        reason: 'killed',
+        expectedTeardown: 'none'
+      })
+    ).toBe(true)
+  })
+
   it('does not recover expected renderer reload teardown', () => {
     expect(
       shouldRecoverRendererAfterProcessGone({
diff --git a/src/main/crash-reporting/process-gone-classification.ts b/src/main/crash-reporting/process-gone-classification.ts
index d3f363d1332..ee6dcdc868d 100644
--- a/src/main/crash-reporting/process-gone-classification.ts
+++ b/src/main/crash-reporting/process-gone-classification.ts
@@ -2,6 +2,8 @@ export type ProcessGoneSource = 'renderer' | 'child'
 export type ExpectedTeardownScope = 'none' | 'renderer-reload' | 'app-shutdown'
 
 const WINDOWS_CONTROL_TERMINATION_EXIT_CODES = new Set([0xc000013a, 0x40010004])
+// Chromium's PID-namespace SIGTERM handler exits 241; waitpid reports 241 << 8.
+const LINUX_NAMESPACE_SIGTERM_WAIT_STATUS = 0xf100
 const RECOVERABLE_CHILD_PROCESS_TYPES = new Set(['gpu'])
 const RECOVERABLE_UTILITY_SERVICE_NAMES = new Set([
   'audio.mojom.AudioService',
@@ -49,6 +51,7 @@ function isRecoverableChromiumChildProcess({
 }
 
 export function shouldRecordProcessGoneCrash({
+  platform,
   source,
   processType,
   serviceName,
@@ -56,6 +59,7 @@ export function shouldRecordProcessGoneCrash({
   exitCode,
   expectedTeardown
 }: {
+  platform: NodeJS.Platform
   source: ProcessGoneSource
   processType?: string
   serviceName?: string
@@ -76,7 +80,11 @@ export function shouldRecordProcessGoneCrash({
   // Why: Electron reports expected Chromium teardown during reload/update as
   // `killed` + SIGTERM or Windows control termination statuses. Treat real
   // crash reasons as reportable, but skip these normal termination shapes.
-  if (exitCode === 15 || isWindowsControlTerminationExitCode(exitCode)) {
+  if (
+    exitCode === 15 ||
+    isWindowsControlTerminationExitCode(exitCode) ||
+    (platform === 'linux' && exitCode === LINUX_NAMESPACE_SIGTERM_WAIT_STATUS)
+  ) {
     return false
   }
   if (expectedTeardown === 'app-shutdown') {
diff --git a/src/main/crash-reporting/process-gone-recorder.test.ts b/src/main/crash-reporting/process-gone-recorder.test.ts
index 95dbd992401..6c5962f688e 100644
--- a/src/main/crash-reporting/process-gone-recorder.test.ts
+++ b/src/main/crash-reporting/process-gone-recorder.test.ts
@@ -117,6 +117,41 @@ describe('recordProcessGoneCrash', () => {
     expect(sink.flushMock).toHaveBeenCalledOnce()
   })
 
+  it('durably suppresses a Linux namespace-encoded renderer SIGTERM', () => {
+    const record = vi.fn()
+
+    withStubbedPlatform('linux', () => {
+      recordProcessGoneCrash(
+        { record } as never,
+        event({ reason: 'killed', exitCode: 61696 }),
+        new ProcessGoneDedupe()
+      )
+    })
+
+    expect(record).not.toHaveBeenCalled()
+    expect(getCrashBreadcrumbSnapshot()).toEqual([
+      expect.objectContaining({
+        name: 'process_gone_suppressed',
+        data: expect.objectContaining({
+          source: 'renderer',
+          reason: 'killed',
+          exitCode: 61696,
+          expectedTeardown: 'none'
+        })
+      })
+    ])
+    expect(sink.records).toEqual([
+      expect.objectContaining({
+        name: 'crash.breadcrumb',
+        attributes: expect.objectContaining({
+          'breadcrumb.name': 'process_gone_suppressed',
+          'breadcrumb.data': expect.objectContaining({ exitCode: 61696 })
+        })
+      })
+    ])
+    expect(sink.flushMock).toHaveBeenCalledOnce()
+  })
+
   it('keeps suppressed renderer evidence scoped to its renderer', () => {
     const dedupe = new ProcessGoneDedupe()
     const suppressed = (webContentsId: number) =>
@@ -475,10 +510,10 @@ describe('recordProcessGoneCrash', () => {
     }
   }
 
-  // Why child kills: the decode gate is source-agnostic and reads
+  // Why child exits: the decode gate is source-agnostic and reads
   // process.platform synchronously at record time, so the platform stub is
   // still in force when it runs.
-  const nonRecoverableChildKill = (
+  const nonRecoverableChildExit = (
     overrides: Partial<ProcessGoneCrashEvent>
   ): ProcessGoneCrashEvent =>
     event({
@@ -494,7 +529,7 @@ describe('recordProcessGoneCrash', () => {
     withStubbedPlatform('linux', () => {
       recordProcessGoneCrash(
         { record } as never,
-        nonRecoverableChildKill({ reason: 'killed', exitCode: 61696 }),
+        nonRecoverableChildExit({ reason: 'abnormal-exit', exitCode: 61696 }),
         new ProcessGoneDedupe()
       )
     })
@@ -518,14 +553,14 @@ describe('recordProcessGoneCrash', () => {
     withStubbedPlatform('win32', () => {
       recordProcessGoneCrash(
         { record } as never,
-        nonRecoverableChildKill({ reason: 'killed', exitCode: 1 }),
+        nonRecoverableChildExit({ reason: 'killed', exitCode: 1 }),
         new ProcessGoneDedupe()
       )
     })
     withStubbedPlatform('linux', () => {
       recordProcessGoneCrash(
         { record } as never,
-        nonRecoverableChildKill({ reason: 'launch-failed', exitCode: 18 }),
+        nonRecoverableChildExit({ reason: 'launch-failed', exitCode: 18 }),
         new ProcessGoneDedupe()
       )
     })
diff --git a/src/main/crash-reporting/process-gone-recorder.ts b/src/main/crash-reporting/process-gone-recorder.ts
index 47ac561c4a7..acb33c71b7e 100644
--- a/src/main/crash-reporting/process-gone-recorder.ts
+++ b/src/main/crash-reporting/process-gone-recorder.ts
@@ -80,10 +80,6 @@ const captureProcessMinidump: MinidumpCapture = (crashedAtMs, expectedProcessTyp
 // one here would weaken the other 30s coalescers. Stay uniform with them.
 const SUPPRESSED_PROCESS_GONE_COALESCE_MS = 30_000
 
-function processGoneBreadcrumbData(event: ProcessGoneCrashEvent) {
-  return buildSuppressedProcessGoneBreadcrumbData(event)
-}
-
 function processGoneRendererOrigin(event: ProcessGoneCrashEvent): string | undefined {
   return event.webContentsId === undefined
     ? undefined
@@ -122,7 +118,7 @@ function persistFailureData(event: ProcessGoneCrashEvent, error: unknown) {
       ? error.code
       : undefined
   return {
-    ...processGoneBreadcrumbData(event),
+    ...buildSuppressedProcessGoneBreadcrumbData(event),
     errorName: error instanceof Error ? error.name : typeof error,
     errorMessage: sanitizeCrashReportString(error instanceof Error ? error.message : String(error)),
     ...(errorCode ? { errorCode } : {})
@@ -194,6 +190,7 @@ export function recordProcessGoneCrash(
   scheduleCrashpadDumpPrune()
   if (
     !shouldRecordProcessGoneCrash({
+      platform: process.platform,
       source: event.source,
       processType: event.processType,
       serviceName,
@@ -205,7 +202,7 @@ export function recordProcessGoneCrash(
     // Why: Chromium can crash-loop a recoverable child (network service seen at
     // 1459/min) and each suppressed event costs a span plus a forced disk flush,
     // which both floods the 30-entry ring and evicts the real pre-crash trail.
-    const suppressedData = processGoneBreadcrumbData(event)
+    const suppressedData = buildSuppressedProcessGoneBreadcrumbData(event)
     const origin = processGoneRendererOrigin(event)
     recordCoalescedDurableCrashBreadcrumb({
       name: 'process_gone_suppressed',
@@ -221,7 +218,7 @@ export function recordProcessGoneCrash(
   if (!store) {
     recordDurableCrashBreadcrumb(
       'crash_report_store_unavailable',
-      processGoneBreadcrumbData(event),
+      buildSuppressedProcessGoneBreadcrumbData(event),
       'Crash report store unavailable',
       processGoneRendererOrigin(event)
     )
@@ -305,7 +302,7 @@ export function recordProcessGoneCrash(
     siblingDeaths,
     (reportId, details) => store.attachDetails(reportId, details),
     recorded,
-    processGoneBreadcrumbData(event),
+    buildSuppressedProcessGoneBreadcrumbData(event),
     processGoneRendererOrigin(event)
   )
   void recorded
@@ -322,7 +319,7 @@ export function recordProcessGoneCrash(
         console.error('[crash-reporting] Failed to attach minidump signature:', error)
         recordDurableCrashBreadcrumb(
           'minidump_signature_attach_failed',
-          processGoneBreadcrumbData(event),
+          buildSuppressedProcessGoneBreadcrumbData(event),
           error instanceof Error ? error.message : String(error),
           processGoneRendererOrigin(event)
         )
diff --git a/src/main/daemon/daemon-endpoint-adoption.ts b/src/main/daemon/daemon-endpoint-adoption.ts
new file mode 100644
index 00000000000..4973fffeaee
--- /dev/null
+++ b/src/main/daemon/daemon-endpoint-adoption.ts
@@ -0,0 +1,171 @@
+import { readFileSync } from 'node:fs'
+import { DaemonClient } from './client'
+import type { DaemonEndpointIdentity } from './daemon-hello-protocol'
+import type { DaemonPtyAdapter } from './daemon-pty-adapter'
+import { readDaemonProcessIncarnation } from './daemon-ready-identity'
+import type { DaemonPidFile, DaemonProcessHandle, DaemonSpawner } from './daemon-spawner'
+import { replaceDaemonPidFile } from './daemon-spawner'
+
+export class DaemonEndpointOwnershipError extends Error {}
+
+/**
+ * The one method the ownership checks need from a connected client.
+ *
+ * Why: naming the capability instead of casting DaemonClient to Partial keeps a rename from
+ * silently turning the fence into a no-op — the compiler now rejects a client without it.
+ */
+type DaemonEndpointIdentityReader = {
+  getDaemonIdentity?: () => DaemonEndpointIdentity | null
+}
+
+function readDaemonEndpointIdentity(
+  client: DaemonEndpointIdentityReader
+): DaemonEndpointIdentity | null {
+  return client.getDaemonIdentity?.() ?? null
+}
+
+export async function holdDaemonAdoptionLease(
+  handle: DaemonProcessHandle,
+  socketPath: string,
+  tokenPath: string,
+  connectedClient?: DaemonClient,
+  expectedIdentity?: DaemonEndpointIdentity,
+  pidPath?: string
+): Promise<DaemonProcessHandle> {
+  const client = connectedClient ?? new DaemonClient({ socketPath, tokenPath })
+  try {
+    await client.ensureConnected()
+    if (expectedIdentity) {
+      const actualIdentity = readDaemonEndpointIdentity(client)
+      if (
+        !actualIdentity ||
+        actualIdentity.pid !== expectedIdentity.pid ||
+        actualIdentity.startedAtMs !== expectedIdentity.startedAtMs ||
+        actualIdentity.launchNonce !== expectedIdentity.launchNonce
+      ) {
+        throw new DaemonEndpointOwnershipError('Daemon endpoint ownership changed during startup')
+      }
+    }
+    await reconcileDaemonPidOwnership(client, pidPath)
+  } catch (error) {
+    client.disconnect()
+    throw error
+  }
+  handle.releaseAdoptionLease = () => client.disconnect()
+  return handle
+}
+
+export async function reconcileDaemonPidOwnership(
+  client: DaemonEndpointIdentityReader,
+  pidPath?: string
+): Promise<void> {
+  const endpointIdentity = readDaemonEndpointIdentity(client)
+  if (!pidPath || !endpointIdentity || pidRecordMatchesEndpoint(pidPath, endpointIdentity)) {
+    return
+  }
+  // Why: the mismatched record's metadata describes a different daemon and must not be copied
+  // onto this one. Re-derive it from the authenticated owner instead, so the repaired record
+  // keeps the fields freshness, host pinning and pid-recycle detection depend on.
+  const { pid, startedAtMs, launchNonce } = endpointIdentity
+  const ownerMetadata = await readDaemonOwnerMetadata(endpointIdentity)
+  if (!replaceDaemonPidFile(pidPath, { pid, startedAtMs, launchNonce, ...ownerMetadata })) {
+    // Why: fail open. A record that disagrees with the endpoint is a diagnosable nuisance;
+    // abandoning a healthy adoptable daemon over a failed file write costs the user every
+    // persistent terminal on the machine.
+    console.warn(
+      '[daemon] Could not repair daemon PID ownership; adopting the authenticated endpoint anyway'
+    )
+    return
+  }
+  console.warn('[daemon] Repaired daemon PID ownership to match the authenticated endpoint')
+}
+
+/**
+ * Recovers the owning daemon's launch metadata.
+ *
+ * Why: `entryPath`/`appVersion` gate bundle-freshness and (on Windows) which relocated daemon
+ * host directories are pinned against pruning, and the Linux pair gates pid-recycle detection.
+ * Publishing a repaired record without them makes a healthy daemon look permanently stale.
+ * The values come from the authenticated hello rather than the owner's command line: a command
+ * line is a single space-joined string, so any install path containing a space (`C:\Program
+ * Files\...`, `/Applications/Orca 2.app/...`) cannot be split back into argv unambiguously.
+ */
+async function readDaemonOwnerMetadata(
+  identity: DaemonEndpointIdentity
+): Promise<Partial<DaemonPidFile>> {
+  const metadata: Partial<DaemonPidFile> = {}
+  if (identity.entryPath) {
+    metadata.entryPath = identity.entryPath
+  }
+  if (identity.appVersion) {
+    metadata.appVersion = identity.appVersion
+  }
+  if (identity.spawnerExecPath) {
+    metadata.spawnerExecPath = identity.spawnerExecPath
+  }
+  const incarnation = await readDaemonProcessIncarnation(identity.pid)
+  if (incarnation) {
+    metadata.linuxStartTicks = incarnation.linuxStartTicks
+    metadata.bootId = incarnation.bootId
+  }
+  return metadata
+}
+
+function pidRecordMatchesEndpoint(pidPath: string, identity: DaemonEndpointIdentity): boolean {
+  try {
+    const record = JSON.parse(readFileSync(pidPath, 'utf8')) as {
+      pid?: unknown
+      startedAtMs?: unknown
+      launchNonce?: unknown
+    }
+    return (
+      record.pid === identity.pid &&
+      record.startedAtMs === identity.startedAtMs &&
+      record.launchNonce === identity.launchNonce
+    )
+  } catch {
+    return false
+  }
+}
+
+export function releaseDaemonAdoptionLease(handle: DaemonProcessHandle | null): void {
+  takeDaemonAdoptionLeaseRelease(handle)?.()
+}
+
+export function takeDaemonAdoptionLeaseRelease(
+  handle: DaemonProcessHandle | null
+): (() => void) | undefined {
+  const release = handle?.releaseAdoptionLease
+  if (!release || !handle) {
+    return undefined
+  }
+  delete handle.releaseAdoptionLease
+  return release
+}
+
+export async function cleanupFailedDaemonAdoption(
+  failedSpawner: DaemonSpawner,
+  current: DaemonPtyAdapter,
+  legacy: DaemonPtyAdapter[] = []
+): Promise<void> {
+  const handle = failedSpawner.getHandle()
+  const results = await Promise.allSettled([
+    Promise.resolve().then(() => releaseDaemonAdoptionLease(handle)),
+    ...legacy.map((entry) => entry.disconnectOnly()),
+    (async () => {
+      try {
+        // Why: other authenticated clients may win, so only daemon-side shutdownIfIdle can prove a failed adoption is killable.
+        await current.disconnectOnly()
+      } catch (error) {
+        current.dispose()
+        throw error
+      }
+    })()
+  ])
+  const failures = results.flatMap((result) =>
+    result.status === 'rejected' ? [result.reason] : []
+  )
+  if (failures.length > 0) {
+    throw new AggregateError(failures, 'Daemon adoption cleanup failed')
+  }
+}
diff --git a/src/main/daemon/daemon-init.ts b/src/main/daemon/daemon-init.ts
index 0c09836f7fe..918547d8b79 100644
--- a/src/main/daemon/daemon-init.ts
+++ b/src/main/daemon/daemon-init.ts
@@ -1,1401 +1,20 @@
-/* eslint-disable max-lines -- Why: owns the full daemon lifecycle (init, launch, adapter wiring,
-restart, teardown); the "swap the provider atomically" invariant keeps restart + singletons co-located. */
-import { randomUUID } from 'node:crypto'
-import { getAppEnvironment } from '../../shared/app-environment'
-import { readFileSync, unlinkSync } from 'node:fs'
-import { fork, type ChildProcess } from 'node:child_process'
-import {
-  DaemonSpawner,
-  getDaemonPidPath,
-  getDaemonSocketPath,
-  getDaemonTokenPath,
-  replaceDaemonPidFile,
-  unlinkOwnedDaemonPidFile,
-  type DaemonLauncher,
-  type DaemonPidFile,
-  type DaemonProcessHandle
-} from './daemon-spawner'
-import { DAEMON_EXIT_ENDPOINT_OCCUPIED } from './daemon-endpoint-ownership'
-import { DaemonPtyAdapter } from './daemon-pty-adapter'
-import type { DaemonRespawnReason } from './daemon-pty-runtime-state'
-import { DaemonPtyRouter } from './daemon-pty-router'
-import { DaemonClient } from './client'
-import {
-  CLEAN_DISCONNECT_PROTOCOL_VERSION,
-  PREVIOUS_DAEMON_PROTOCOL_VERSIONS,
-  PROTOCOL_VERSION,
-  type ListSessionsResult
-} from './types'
-import { getMacDaemonSystemResolverHealth, checkDaemonHealth } from './daemon-health'
-import {
-  getMacDaemonTccAttributionHealth,
-  type MacDaemonTccAttributionHealth
-} from './daemon-tcc-attribution'
-import { getDaemonLaunchIdentity } from './daemon-pid-identity'
-import { isDaemonStaleForCurrentBundle } from './daemon-bundle-staleness'
-import { killStaleDaemon } from './daemon-stale-kill'
-import { parseDaemonPidFile, type ParsedDaemonPid } from './daemon-pid-file-parse'
-import {
-  collectPinnedDaemonVersions,
-  materializeRelocatedDaemonHost,
-  pruneOldDaemonHosts
-} from './daemon-host-relocation'
-import { DegradedDaemonPtyProvider } from './degraded-daemon-pty-provider'
-import { trackDaemonReplaced, trackDaemonRetired } from './daemon-lifecycle-event'
-import type { DaemonReplaceReason } from '../../shared/daemon-lifecycle-telemetry'
-import {
-  getLocalPtyProvider,
-  setLocalPtyProvider,
-  unbindLocalProviderListeners,
-  rebindLocalProviderListeners
-} from '../ipc/pty'
-import { isStartupDiagnosticsEnabled, logStartupDiagnostic } from '../startup/startup-diagnostics'
-import {
-  confirmSeededClaudeLivePtys,
-  hasSeededUnconfirmedClaudePtys
-} from '../claude-accounts/live-pty-gate'
-import { parseDaemonReadyIdentity, readDaemonProcessIncarnation } from './daemon-ready-identity'
-import type { DaemonEndpointIdentity } from './daemon-hello-protocol'
-import {
-  daemonLogArgs,
-  getAliveDaemonSessionCount,
-  getDaemonEntryPath,
-  getDaemonHistoryDir as getHistoryDir,
-  getDaemonRuntimeDir as getRuntimeDir,
-  probeDaemonSocket as probeSocket,
-  resolvePackagedDarwinAppVersion
-} from './daemon-launch-paths'
-
-// Why: daemon init runs concurrent with window load, so an in-process t timestamp (not harness stderr timing) measures cold-start.
-function logDaemonMilestone(event: string, details: Record<string, unknown> = {}): void {
-  if (isStartupDiagnosticsEnabled()) {
-    logStartupDiagnostic(event, {
-      t: Math.round(performance.now()),
-      ...details
-    })
-  }
-}
-
-// Why: extra hello+listSessions probes (~5s each) giving a wedged-but-connectable daemon ~60s grace to answer and keep its live sessions before a permanent wedge (#8689) is replaced; raise only alongside the fail-open cap.
-export const WEDGED_DAEMON_GRACE_RETRIES = 11
-const DAEMON_SELF_SHUTDOWN_WAIT_MS = 5_000
-const DAEMON_CHILD_TERMINATION_GRACE_MS = 5_000
-const DAEMON_CHILD_FORCE_EXIT_WAIT_MS = 1_000
-
-class DaemonEndpointOwnershipError extends Error {}
-
-/**
- * The one method the ownership checks need from a connected client.
- *
- * Why: naming the capability instead of casting DaemonClient to Partial keeps a rename from
- * silently turning the fence into a no-op — the compiler now rejects a client without it.
- */
-type DaemonEndpointIdentityReader = {
-  getDaemonIdentity?: () => DaemonEndpointIdentity | null
-}
-
-function readDaemonEndpointIdentity(
-  client: DaemonEndpointIdentityReader
-): DaemonEndpointIdentity | null {
-  return client.getDaemonIdentity?.() ?? null
-}
-
-let spawner: DaemonSpawner | null = null
-type DaemonProvider = DaemonPtyRouter | DaemonPtyAdapter | DegradedDaemonPtyProvider
-
-let adapter: DaemonProvider | null = null
-// Why: coalesce concurrent restartDaemon() calls so two entries can't race the 7-step sequence against a half-spawned replacement.
-let restartInFlight: Promise<RestartDaemonResult> | null = null
-
-function createPreservedDaemonHandle(
-  runtimeDir: string,
-  protocolVersion = PROTOCOL_VERSION,
-  mode?: 'degraded-new-pty-fallback'
-): DaemonProcessHandle {
-  const handle: DaemonProcessHandle = {
-    shutdown: async () => {
-      await cleanupDaemonForProtocol(runtimeDir, protocolVersion)
-    }
-  }
-  if (mode) {
-    handle.mode = mode
-  }
-  return handle
-}
-
-async function holdDaemonAdoptionLease(
-  handle: DaemonProcessHandle,
-  socketPath: string,
-  tokenPath: string,
-  connectedClient?: DaemonClient,
-  expectedIdentity?: DaemonEndpointIdentity,
-  pidPath?: string
-): Promise<DaemonProcessHandle> {
-  const client = connectedClient ?? new DaemonClient({ socketPath, tokenPath })
-  try {
-    await client.ensureConnected()
-    if (expectedIdentity) {
-      const actualIdentity = readDaemonEndpointIdentity(client)
-      if (
-        !actualIdentity ||
-        actualIdentity.pid !== expectedIdentity.pid ||
-        actualIdentity.startedAtMs !== expectedIdentity.startedAtMs ||
-        actualIdentity.launchNonce !== expectedIdentity.launchNonce
-      ) {
-        throw new DaemonEndpointOwnershipError('Daemon endpoint ownership changed during startup')
-      }
-    }
-    await reconcileDaemonPidOwnership(client, pidPath)
-  } catch (error) {
-    client.disconnect()
-    throw error
-  }
-  handle.releaseAdoptionLease = () => client.disconnect()
-  return handle
-}
-
-async function reconcileDaemonPidOwnership(
-  client: DaemonEndpointIdentityReader,
-  pidPath?: string
-): Promise<void> {
-  const endpointIdentity = readDaemonEndpointIdentity(client)
-  if (!pidPath || !endpointIdentity || pidRecordMatchesEndpoint(pidPath, endpointIdentity)) {
-    return
-  }
-  // Why: the mismatched record's metadata describes a different daemon and must not be copied
-  // onto this one. Re-derive it from the authenticated owner instead, so the repaired record
-  // keeps the fields freshness, host pinning and pid-recycle detection depend on.
-  const { pid, startedAtMs, launchNonce } = endpointIdentity
-  const ownerMetadata = await readDaemonOwnerMetadata(endpointIdentity)
-  if (!replaceDaemonPidFile(pidPath, { pid, startedAtMs, launchNonce, ...ownerMetadata })) {
-    // Why: fail open. A record that disagrees with the endpoint is a diagnosable nuisance;
-    // abandoning a healthy adoptable daemon over a failed file write costs the user every
-    // persistent terminal on the machine.
-    console.warn(
-      '[daemon] Could not repair daemon PID ownership; adopting the authenticated endpoint anyway'
-    )
-    return
-  }
-  console.warn('[daemon] Repaired daemon PID ownership to match the authenticated endpoint')
-}
-
-/**
- * Recovers the owning daemon's launch metadata.
- *
- * Why: `entryPath`/`appVersion` gate bundle-freshness and (on Windows) which relocated daemon
- * host directories are pinned against pruning, and the Linux pair gates pid-recycle detection.
- * Publishing a repaired record without them makes a healthy daemon look permanently stale.
- * The values come from the authenticated hello rather than the owner's command line: a command
- * line is a single space-joined string, so any install path containing a space (`C:\Program
- * Files\...`, `/Applications/Orca 2.app/...`) cannot be split back into argv unambiguously.
- */
-async function readDaemonOwnerMetadata(
-  identity: DaemonEndpointIdentity
-): Promise<Partial<DaemonPidFile>> {
-  const metadata: Partial<DaemonPidFile> = {}
-  if (identity.entryPath) {
-    metadata.entryPath = identity.entryPath
-  }
-  if (identity.appVersion) {
-    metadata.appVersion = identity.appVersion
-  }
-  if (identity.spawnerExecPath) {
-    metadata.spawnerExecPath = identity.spawnerExecPath
-  }
-  const incarnation = await readDaemonProcessIncarnation(identity.pid)
-  if (incarnation) {
-    metadata.linuxStartTicks = incarnation.linuxStartTicks
-    metadata.bootId = incarnation.bootId
-  }
-  return metadata
-}
-
-function pidRecordMatchesEndpoint(pidPath: string, identity: DaemonEndpointIdentity): boolean {
-  try {
-    const record = JSON.parse(readFileSync(pidPath, 'utf8')) as {
-      pid?: unknown
-      startedAtMs?: unknown
-      launchNonce?: unknown
-    }
-    return (
-      record.pid === identity.pid &&
-      record.startedAtMs === identity.startedAtMs &&
-      record.launchNonce === identity.launchNonce
-    )
-  } catch {
-    return false
-  }
-}
-
-function releaseDaemonAdoptionLease(handle: DaemonProcessHandle | null): void {
-  takeDaemonAdoptionLeaseRelease(handle)?.()
-}
-
-function takeDaemonAdoptionLeaseRelease(
-  handle: DaemonProcessHandle | null
-): (() => void) | undefined {
-  const release = handle?.releaseAdoptionLease
-  if (!release || !handle) {
-    return undefined
-  }
-  delete handle.releaseAdoptionLease
-  return release
-}
-
-async function cleanupFailedDaemonAdoption(
-  failedSpawner: DaemonSpawner,
-  current: DaemonPtyAdapter,
-  legacy: DaemonPtyAdapter[] = []
-): Promise<void> {
-  const handle = failedSpawner.getHandle()
-  const results = await Promise.allSettled([
-    Promise.resolve().then(() => releaseDaemonAdoptionLease(handle)),
-    ...legacy.map((entry) => entry.disconnectOnly()),
-    (async () => {
-      try {
-        // Why: other authenticated clients may win, so only daemon-side shutdownIfIdle can prove a failed adoption is killable.
-        await current.disconnectOnly()
-      } catch (error) {
-        current.dispose()
-        throw error
-      }
-    })()
-  ])
-  const failures = results.flatMap((result) =>
-    result.status === 'rejected' ? [result.reason] : []
-  )
-  if (failures.length > 0) {
-    throw new AggregateError(failures, 'Daemon adoption cleanup failed')
-  }
-}
-
-async function terminateLaunchedDaemonChild(child: ChildProcess): Promise<void> {
-  try {
-    if (
-      (child.exitCode !== null && child.exitCode !== undefined) ||
-      (child.signalCode !== null && child.signalCode !== undefined)
-    ) {
-      return
-    }
-    await new Promise<void>((resolve, reject) => {
-      let gracefulTimer: ReturnType<typeof setTimeout>
-      let forcedTimer: ReturnType<typeof setTimeout> | undefined
-      let settled = false
-      const finish = (error?: unknown): void => {
-        if (settled) {
-          return
-        }
-        settled = true
-        clearTimeout(gracefulTimer)
-        if (forcedTimer) {
-          clearTimeout(forcedTimer)
-        }
-        child.off('exit', onExit)
-        if (error) {
-          reject(error)
-        } else {
-          resolve()
-        }
-      }
-      const onExit = (): void => finish()
-      child.on('exit', onExit)
-      gracefulTimer = setTimeout(() => {
-        if (child.pid) {
-          try {
-            process.kill(child.pid, 'SIGKILL')
-          } catch (error) {
-            finish(isNoSuchProcessError(error) ? undefined : error)
-            return
-          }
-        }
-        if (!settled) {
-          forcedTimer = setTimeout(
-            () => finish(new Error('Daemon did not exit after SIGKILL')),
-            DAEMON_CHILD_FORCE_EXIT_WAIT_MS
-          )
-        }
-      }, DAEMON_CHILD_TERMINATION_GRACE_MS)
-      if (child.pid) {
-        try {
-          process.kill(child.pid, 'SIGTERM')
-        } catch (error) {
-          finish(isNoSuchProcessError(error) ? undefined : error)
-        }
-      } else {
-        finish()
-      }
-    })
-  } finally {
-    if (child.connected) {
-      child.disconnect()
-    }
-    child.unref()
-  }
-}
-
-function isNoSuchProcessError(error: unknown): boolean {
-  return typeof error === 'object' && error !== null && 'code' in error && error.code === 'ESRCH'
-}
-
-async function shouldPreserveDaemonWithLiveSessions(
-  socketPath: string,
-  tokenPath: string,
-  replacementLabel: string
-): Promise<boolean> {
-  const liveSessionCount = await getAliveDaemonSessionCount(socketPath, tokenPath)
-  if (liveSessionCount === 0) {
-    return false
-  }
-  console.warn(
-    liveSessionCount === null
-      ? `[daemon] Preserving daemon ${replacementLabel} because live session state could not be verified`
-      : `[daemon] Preserving daemon ${replacementLabel} because it owns ${liveSessionCount} live session${liveSessionCount === 1 ? '' : 's'}`
-  )
-  return true
-}
-
-// Why: the adapter decides a runtime resolver replacement, but the launcher completes it — and by
-// then the daemon has usually self-retired (dropping its last authenticated client is enough), so
-// there is nothing left to kill and the launcher's own confirmed-kill gate would report nothing.
-// The adapter hands the reason across so the launch it triggers reports what actually drove it.
-let attributedReplaceReason: DaemonReplaceReason | null = null
-
-function createOutOfProcessLauncher(
-  runtimeDir: string,
-  macosLoginSessionWatch = false
-): DaemonLauncher {
-  return async (socketPath, tokenPath, suppliedPidPath, suppliedLaunchNonce) => {
-    const entryPath = getDaemonEntryPath()
-    const pidPath = suppliedPidPath ?? getDaemonPidPath(runtimeDir)
-    const launchNonce = suppliedLaunchNonce ?? randomUUID()
-    // One-shot: whichever launch consumes it owns the attribution, so a later unrelated launch can't
-    // reuse it. The write in the respawn closure reaches here without an intervening await, which is
-    // what makes a bare module-scoped slot safe — keep it that way or a concurrent launch can steal it.
-    const attributedReason = attributedReplaceReason
-    attributedReplaceReason = null
-    let pendingReplacement:
-      | {
-          reason: Parameters<typeof trackDaemonReplaced>[0]
-          liveSessionCount: number | null
-        }
-      | undefined
-    let confirmedReplacement = false
-    let adoptionClient: DaemonClient | null = new DaemonClient({
-      socketPath,
-      tokenPath
-    })
-    try {
-      // Why: acquire the full pair before control-only probes so an expired inherited deadline can't fire in the probe-to-adoption gap.
-      await adoptionClient.ensureConnected()
-      await reconcileDaemonPidOwnership(adoptionClient, pidPath)
-    } catch {
-      adoptionClient.disconnect()
-      adoptionClient = null
-    }
-    const preserveDaemon = async (
-      mode?: 'degraded-new-pty-fallback'
-    ): Promise<DaemonProcessHandle> => {
-      const connectedClient = adoptionClient ?? undefined
-      adoptionClient = null
-      return holdDaemonAdoptionLease(
-        createPreservedDaemonHandle(runtimeDir, PROTOCOL_VERSION, mode),
-        socketPath,
-        tokenPath,
-        connectedClient,
-        undefined,
-        pidPath
-      )
-    }
-    try {
-      const health = await checkDaemonHealth(socketPath, tokenPath)
-      if (health === 'healthy') {
-        const resolverHealth = await getMacDaemonSystemResolverHealth(socketPath, tokenPath)
-        if (resolverHealth === 'unhealthy') {
-          const liveSessionCount = await getAliveDaemonSessionCount(socketPath, tokenPath)
-          if (liveSessionCount !== 0) {
-            console.warn(
-              liveSessionCount === null
-                ? '[daemon] Preserving daemon with unavailable macOS system resolver because live session state could not be verified'
-                : `[daemon] Preserving daemon with unavailable macOS system resolver because it owns ${liveSessionCount} live session${liveSessionCount === 1 ? '' : 's'}`
-            )
-            return preserveDaemon()
-          }
-          console.warn('[daemon] Replacing daemon with unavailable macOS system resolver')
-          pendingReplacement = {
-            reason: 'unhealthy_resolver',
-            liveSessionCount
-          }
-          confirmedReplacement = (await cleanupDaemonForProtocol(runtimeDir, PROTOCOL_VERSION))
-            .cleaned
-        } else {
-          // Why: a protocol-healthy daemon can outlive its launching app bundle (dev worktree rebuild, or packaged update replacing the app path).
-          const identity = await getDaemonLaunchIdentity(
-            runtimeDir,
-            socketPath,
-            tokenPath,
-            entryPath
-          )
-          const stalePackagedBundle =
-            getAppEnvironment().isPackaged() &&
-            (await isDaemonStaleForCurrentBundle(
-              runtimeDir,
-              socketPath,
-              tokenPath,
-              getAppEnvironment().getVersion()
-            ))
-          if (identity === 'mismatch' || stalePackagedBundle) {
-            // Why: replacing a healthy daemon kills its child PTYs; defer code freshness until no live sessions would be lost.
-            const replacementLabel = stalePackagedBundle
-              ? 'launched before the current app bundle was installed'
-              : 'launched from a different app path'
-            if (
-              await shouldPreserveDaemonWithLiveSessions(socketPath, tokenPath, replacementLabel)
-            ) {
-              return preserveDaemon()
-            }
-            console.warn(
-              stalePackagedBundle
-                ? '[daemon] Replacing daemon launched before the current app bundle was installed'
-                : '[daemon] Replacing daemon launched from a different app path'
-            )
-            // liveSessionCount is 0: shouldPreserveDaemonWithLiveSessions() only falls through at exactly 0.
-            pendingReplacement = {
-              reason: stalePackagedBundle ? 'stale_bundle' : 'different_app_path',
-              liveSessionCount: 0
-            }
-            confirmedReplacement = (await cleanupDaemonForProtocol(runtimeDir, PROTOCOL_VERSION))
-              .cleaned
-          } else {
-            const attributionHealth = await getMacDaemonTccAttributionHealth(
-              runtimeDir,
-              socketPath,
-              tokenPath
-            )
-            if (attributionHealth === 'severed') {
-              // Why: replacing with live sessions would kill them; Settings → Developer
-              // Permissions surfaces the Manage Sessions → Restart remedy instead.
-              const liveSessionCount = await getAliveDaemonSessionCount(socketPath, tokenPath)
-              if (liveSessionCount === 0) {
-                console.warn(
-                  '[daemon] Replacing daemon whose macOS TCC attribution is severed (spawning app binary no longer exists)'
-                )
-                pendingReplacement = { reason: 'severed_tcc_attribution', liveSessionCount }
-                confirmedReplacement = (
-                  await cleanupDaemonForProtocol(runtimeDir, PROTOCOL_VERSION)
-                ).cleaned
-              } else {
-                return preserveDaemon()
-              }
-            } else {
-              // Why: healthy daemon from a previous session answered a protocol ping — safe to reuse.
-              return preserveDaemon()
-            }
-          }
-        }
-      } else {
-        // Why: a busy machine can time out the health check on a live daemon; re-verify with a session list before killing its sessions.
-        let liveSessionCount = await getAliveDaemonSessionCount(socketPath, tokenPath)
-        // Why: a wedged-but-connectable daemon (Windows update relaunch) may still own live sessions, so grace-retry before replacing; a permanent wedge (#8689) exhausts the grace, and 'rejected' skips it (handshake refused = never adoptable).
-        let graceRetry = 0
-        while (
-          liveSessionCount === null &&
-          health !== 'rejected' &&
-          graceRetry < WEDGED_DAEMON_GRACE_RETRIES &&
-          (await probeSocket(socketPath))
-        ) {
-          liveSessionCount = await getAliveDaemonSessionCount(socketPath, tokenPath)
-          graceRetry++
-        }
-        if (liveSessionCount !== null && liveSessionCount > 0) {
-          if (health === 'pty-spawn-unhealthy') {
-            console.warn(
-              `[daemon] DEGRADED MODE: preserving daemon that failed the PTY spawn health check because it owns ${liveSessionCount} live session${liveSessionCount === 1 ? '' : 's'}. Existing sessions keep working; fresh terminals run on the local provider WITHOUT daemon persistence until you restart the daemon (Manage Sessions → Restart).`
-            )
-            return preserveDaemon('degraded-new-pty-fallback')
-          }
-          console.warn(
-            `[daemon] Preserving daemon that failed the health check because it owns ${liveSessionCount} live session${liveSessionCount === 1 ? '' : 's'}`
-          )
-          return preserveDaemon()
-        }
-        // Why: the sibling replace branches announce themselves, but this one used
-        // to kill a daemon silently — leaving no way to tell a replacement apart
-        // from an adoption after the fact. A cold start also lands here with
-        // nothing to replace, so only speak up once something actually answered:
-        // a probe that returned a count, a socket that survived a grace retry, or
-        // a refused hello.
-        if (liveSessionCount !== null || graceRetry > 0 || health === 'rejected') {
-          console.warn(
-            `[daemon] Replacing daemon that failed the health check (health=${health}, liveSessions=${liveSessionCount ?? 'unverifiable'}, graceRetries=${graceRetry})`
-          )
-        }
-        // Why: unlike the log above, telemetry gates on confirmedReplacement below — the
-        // post-kill truth — so a cold start that killed nothing never reports a replacement.
-        pendingReplacement = {
-          reason: 'failed_health_check',
-          liveSessionCount
-        }
-      }
-
-      // Why: a raw socket can outlive a broken daemon; kill by PID before respawn so the new daemon doesn't race the stale one.
-      adoptionClient?.disconnect()
-      adoptionClient = null
-      const killOutcome = await killStaleDaemon(runtimeDir, socketPath, tokenPath)
-      if (killOutcome.liveOwnerSurvived) {
-        // Why: forking beside a daemon we could not prove dead is precisely how the endpoint
-        // owner and the session host diverge. But refusing outright would leave the user with
-        // no daemon at all, and we have just proved something still answers the endpoint —
-        // so adopt it in degraded mode: existing sessions keep working, new PTYs run locally.
-        console.warn(
-          '[daemon] DEGRADED MODE: adopting a daemon that could not be confirmed stopped. Existing sessions keep working; fresh terminals run on the local provider WITHOUT daemon persistence until you restart the daemon (Manage Sessions → Restart).'
-        )
-        try {
-          return await preserveDaemon('degraded-new-pty-fallback')
-        } catch {
-          // It died between the probe and the adoption; the endpoint is genuinely free now.
-          throw new DaemonEndpointOwnershipError(
-            'Daemon replacement aborted: the existing daemon could not be confirmed stopped'
-          )
-        }
-      }
-      confirmedReplacement = killOutcome.killed || confirmedReplacement
-      // Why: rank by how well each reason is evidenced. A confirmed kill whose reason positively
-      // identified the daemon outranks the attribution, so a stale bundle caught here is not billed
-      // to the resolver. failed_health_check is the residual "couldn't tell" bucket though — it also
-      // absorbs wedges and crashes — so the adapter's attribution beats it. That case is not exotic:
-      // the same dead login session that fails the resolver also fails the PTY spawn probe, and with
-      // zero live sessions that lands here rather than in the degraded preserve above.
-      const identifiedReplacement =
-        pendingReplacement &&
-        confirmedReplacement &&
-        pendingReplacement.reason !== 'failed_health_check'
-          ? pendingReplacement
-          : null
-      if (identifiedReplacement) {
-        trackDaemonReplaced(identifiedReplacement.reason, identifiedReplacement.liveSessionCount)
-      } else if (attributedReason) {
-        trackDaemonReplaced(attributedReason, 0)
-      } else if (pendingReplacement && confirmedReplacement) {
-        trackDaemonReplaced(pendingReplacement.reason, pendingReplacement.liveSessionCount)
-      }
-
-      const userDataPath = getAppEnvironment().getPath('userData')
-      // Why: on win32 packaged, stage a daemon-host copy in userData so its image escapes the NSIS updater's kill zone; lazy so it's off first-paint. Fail-open: null → in-dir host.
-      const relocatedHost = materializeRelocatedDaemonHost()
-      // Fork the relocated entry when available; otherwise the install-dir entry.
-      const forkEntryPath = relocatedHost ? relocatedHost.entryPath : entryPath
-      const child = fork(
-        forkEntryPath,
-        [
-          '--socket',
-          socketPath,
-          '--token',
-          tokenPath,
-          '--pid-record',
-          pidPath,
-          '--launch-nonce',
-          launchNonce,
-          '--entry-path',
-          entryPath,
-          '--app-version',
-          getAppEnvironment().getVersion(),
-          '--spawner-exec-path',
-          process.execPath,
-          ...(macosLoginSessionWatch ? ['--login-session-watch'] : []),
-          ...daemonLogArgs()
-        ],
-        {
-          // Why: detached daemons outlive dev worktrees; userData keeps process.cwd() valid after a repo/worktree is deleted.
-          cwd: userDataPath,
-          // Why: detached+unref outlives Electron; stdout 'ignore' (else blocks exit), stderr 'pipe' captures startup crashes lost in v1.4.129-rc.1.
-          detached: true,
-          stdio: ['ignore', 'ignore', 'pipe', 'ipc'],
-          // Why: run the byte-identical relocated Orca.exe so the image path sits outside the updater's kill zone.
-          ...(relocatedHost ? { execPath: relocatedHost.execPath } : {}),
-          // Why: run the fork as plain Node so Electron's GPU/display init can't interfere with node-pty's posix_spawn of the spawn-helper.
-          env: {
-            ...process.env,
-            ELECTRON_RUN_AS_NODE: '1',
-            // Why: the detached plain-Node daemon has no AppEnvironment, but shell rcfiles must live outside swept tmp.
-            ORCA_USER_DATA_PATH: userDataPath
-          }
-        }
-      )
-
-      // Why: keep only the startup-window stderr tail so a crash cause is visible without unbounded memory.
-      const STARTUP_STDERR_MAX_BYTES = 8192
-      let startupStderr = ''
-      let collectingStderr = true
-      const onStartupStderr = (chunk: Buffer): void => {
-        if (!collectingStderr) {
-          return
-        }
-        startupStderr += chunk.toString('utf8')
-        if (startupStderr.length > STARTUP_STDERR_MAX_BYTES) {
-          startupStderr = startupStderr.slice(-STARTUP_STDERR_MAX_BYTES)
-        }
-      }
-      child.stderr?.on('data', onStartupStderr)
-      // Why: release the detached daemon's stderr once up/failed — a live piped stream refs the parent loop and blocks Electron exit.
-      const releaseStderr = (): void => {
-        collectingStderr = false
-        child.stderr?.off('data', onStartupStderr)
-        child.stderr?.destroy()
-      }
-
-      // Wait for the daemon to signal readiness via IPC
-      let launchedIdentity: DaemonEndpointIdentity | null = null
-      let endpointUnavailableReason: string | null = null
-      const startupSignal = new Promise<void>((resolve, reject) => {
-        let timer: ReturnType<typeof setTimeout> | undefined
-        let settled = false
-        function cleanupStartupListeners(): void {
-          if (timer) {
-            clearTimeout(timer)
-          }
-          child.off('message', onReadyMessage)
-          child.off('error', onStartupError)
-          child.off('exit', onStartupExit)
-        }
-        async function fail(error: Error): Promise<void> {
-          if (settled) {
-            return
-          }
-          settled = true
-          cleanupStartupListeners()
-          // Why: attach the captured stderr tail to the thrown error and log it so a startup crash isn't just "exited with code 1".
-          const stderrTail = startupStderr.trim()
-          if (stderrTail) {
-            console.warn(`[daemon] startup failed; captured stderr tail:\n${stderrTail}`)
-          }
-          releaseStderr()
-          const startupError = stderrTail
-            ? new Error(`${error.message}\nDaemon stderr (tail):\n${stderrTail}`)
-            : error
-          try {
-            await terminateLaunchedDaemonChild(child)
-          } catch (cleanupError) {
-            reject(
-              new AggregateError(
-                [startupError, cleanupError],
-                'Daemon startup and child cleanup both failed'
-              )
-            )
-            return
-          }
-          if (Number.isSafeInteger(child.pid) && (child.pid as number) > 0) {
-            unlinkOwnedDaemonPidFile(pidPath, child.pid as number, launchNonce)
-          }
-          reject(startupError)
-        }
-        function onReadyMessage(msg: unknown): void {
-          if (
-            msg &&
-            typeof msg === 'object' &&
-            (msg as { type?: string }).type === 'endpoint-unavailable'
-          ) {
-            // Why: the child lost the endpoint race rather than crashing. Record it so the
-            // launcher can adopt the winner instead of reporting a generic startup failure.
-            endpointUnavailableReason = (msg as { reason?: string }).reason ?? 'occupied'
-            void fail(new Error(`Daemon could not take the endpoint: ${endpointUnavailableReason}`))
-            return
-          }
-          if (msg && typeof msg === 'object' && (msg as { type?: string }).type === 'ready') {
-            if (settled) {
-              return
-            }
-            const readyIdentity = parseDaemonReadyIdentity(msg)
-            if (!Number.isSafeInteger(child.pid) || (child.pid as number) <= 0 || !readyIdentity) {
-              void fail(new Error('Daemon readiness identity is incomplete'))
-              return
-            }
-            launchedIdentity = {
-              pid: child.pid as number,
-              ...readyIdentity,
-              launchNonce
-            }
-            settled = true
-            // Why: daemon is detached after readiness; detach startup listeners so the launch promise closure isn't retained.
-            cleanupStartupListeners()
-            // Why: release IPC/stderr and unref so Electron can exit without waiting; the daemon keeps running detached.
-            releaseStderr()
-            child.disconnect()
-            child.unref()
-            resolve()
-          }
-        }
-
-        function onStartupError(err: Error): void {
-          void fail(err)
-        }
-
-        function onStartupExit(code: number | null): void {
-          if (code === DAEMON_EXIT_ENDPOINT_OCCUPIED) {
-            // Why here and not only on the IPC message: the exit is the event this wait settles
-            // on, so keying off it cannot lose to a notification still in the channel.
-            endpointUnavailableReason = 'occupied'
-          }
-          void fail(new Error(`Daemon exited during startup with code ${code}`))
-        }
-
-        timer = setTimeout(() => {
-          void fail(new Error('Daemon startup timed out'))
-        }, 10000)
-
-        child.on('message', onReadyMessage)
-        child.on('error', onStartupError)
-        child.on('exit', onStartupExit)
-      })
-
-      try {
-        await startupSignal
-      } catch (error) {
-        if (endpointUnavailableReason !== 'occupied') {
-          throw error
-        }
-        // Why adopt rather than retry: another daemon proved it owns the endpoint and is
-        // answering on it. Forking again would lose the same race, and reporting a startup
-        // failure strands this app on local non-persistent PTYs beside a healthy daemon.
-        console.warn(
-          '[daemon] Endpoint was taken by another daemon during startup — adopting it instead'
-        )
-        // Why pidPath: adopting reconciles the PID record against the identity the daemon
-        // reports over hello, repairing a record that names the wrong incarnation. Every other
-        // adoption path passes it; this one skipped it, so the incumbent we adopt here was the
-        // only one whose record never got that repair.
-        return await holdDaemonAdoptionLease(
-          createPreservedDaemonHandle(runtimeDir),
-          socketPath,
-          tokenPath,
-          undefined,
-          undefined,
-          pidPath
-        )
-      }
-
-      try {
-        if (!launchedIdentity) {
-          throw new Error('Daemon readiness identity is incomplete')
-        }
-        return await holdDaemonAdoptionLease(
-          {
-            shutdown: () => terminateLaunchedDaemonChild(child)
-          },
-          socketPath,
-          tokenPath,
-          undefined,
-          launchedIdentity,
-          pidPath
-        )
-      } catch (error) {
-        if (error instanceof DaemonEndpointOwnershipError) {
-          await terminateLaunchedDaemonChild(child)
-          unlinkOwnedDaemonPidFile(pidPath, child.pid as number, launchNonce)
-          throw error
-        }
-        // Why: another client may have adopted this live process; keep its pid record until exit, but remove one published after an early exit.
-        let pidRecordRemoved = false
-        const removeExitedPidRecord = (): void => {
-          if (pidRecordRemoved) {
-            return
-          }
-          pidRecordRemoved = true
-          unlinkOwnedDaemonPidFile(pidPath, child.pid as number, launchNonce)
-        }
-        child.once('exit', removeExitedPidRecord)
-        if (
-          (child.exitCode !== null && child.exitCode !== undefined) ||
-          (child.signalCode !== null && child.signalCode !== undefined)
-        ) {
-          child.off('exit', removeExitedPidRecord)
-          removeExitedPidRecord()
-        }
-        throw error
-      }
-    } catch (error) {
-      adoptionClient?.disconnect()
-      adoptionClient = null
-      // Why: the launcher may now fork onto an endpoint it could not classify, because the
-      // publisher is the real guard — and that guard works by refusing to overwrite what it
-      // cannot prove dead, so the child exits instead of splitting the brain. Correct, but
-      // giving up here costs the user every persistent session for the whole run. Something
-      // answering the endpoint now is a daemon worth adopting, not a reason to fall back to
-      // local PTYs.
-      if (await probeSocket(socketPath)) {
-        console.warn(
-          '[daemon] DEGRADED MODE: adopting the daemon that owns the endpoint after a replacement could not publish onto it. Existing sessions keep working; fresh terminals run on the local provider WITHOUT daemon persistence until you restart the daemon (Manage Sessions → Restart).'
-        )
-        try {
-          return await preserveDaemon('degraded-new-pty-fallback')
-        } catch {
-          // It stopped answering between the probe and the adoption; report the launch failure.
-        }
-      }
-      throw error
-    }
-  }
-}
-
-export async function initDaemonPtyProvider(
-  signal?: AbortSignal,
-  options: { macosLoginSessionWatch?: boolean } = {}
-): Promise<void> {
-  logDaemonMilestone('daemon-init-start')
-  // Why: e2e coverage for the startup PTY gate (#5232) needs a daemon init that deterministically outlasts the first-window timeout.
-  const e2eInitDelayMs = Number(process.env.ORCA_E2E_DAEMON_INIT_DELAY_MS)
-  if (Number.isFinite(e2eInitDelayMs) && e2eInitDelayMs > 0) {
-    await new Promise((resolve) => setTimeout(resolve, e2eInitDelayMs))
-  }
-  const runtimeDir = getRuntimeDir()
-
-  const newSpawner = new DaemonSpawner({
-    runtimeDir,
-    launcher: createOutOfProcessLauncher(runtimeDir, options.macosLoginSessionWatch ?? false)
-  })
-
-  // Why: assign the module-level spawner/adapter only after both succeed, so a failed ensureRunning() leaves no stale spawner.
-  const info = await newSpawner.ensureRunning()
-  // Why: reclaim superseded daemon-host copies on EVERY launch (spawns are rare), keeping current + live-daemon-pinned versions.
-  pruneOldDaemonHosts(collectPinnedDaemonVersions(runtimeDir))
-  const launchMode = newSpawner.getHandle()?.mode
-  logDaemonMilestone('daemon-current-ready')
-  if (signal?.aborted) {
-    // Why: fail-open may already have spawned fallback PTYs; don't install late, but retire an empty daemon (live sessions reject it and survive).
-    const abortedStartupAdapter = new DaemonPtyAdapter({
-      socketPath: info.socketPath,
-      tokenPath: info.tokenPath,
-      pidPath: getDaemonPidPath(runtimeDir),
-      profileScope: runtimeDir,
-      runtimeDir
-    })
-    releaseDaemonAdoptionLease(newSpawner.getHandle())
-    await abortedStartupAdapter.disconnectOnly()
-    return
-  }
-
-  const newAdapter = new DaemonPtyAdapter({
-    socketPath: info.socketPath,
-    tokenPath: info.tokenPath,
-    pidPath: getDaemonPidPath(runtimeDir),
-    profileScope: runtimeDir,
-    runtimeDir,
-    packagedAppVersion: resolvePackagedDarwinAppVersion(),
-    historyPath: getHistoryDir(),
-    // Why: on daemon death, ensureConnected() detects the dead socket and calls this to fork a replacement before retrying.
-    respawn: async (reason: DaemonRespawnReason) => {
-      // Why: attribute rather than emit — the launcher below is the one that completes the
-      // replacement, and emitting here would fire before the outcome is known.
-      // Caveat: a wedged-but-alive daemon (#8689) can still report died_respawn here and
-      // failed_health_check from the launcher — the app cannot tell wedged from dead at this point.
-      if (reason === 'daemon_died') {
-        console.warn('[daemon] Daemon process died — respawning')
-        // Why: a manual restart tears the daemon down under a still-live adapter, so a pane
-        // respawning on its synthetic exit would bill a user action to the crash bucket.
-        if (!restartInFlight) {
-          trackDaemonRetired('died_respawn')
-        }
-      } else {
-        // Must reach the launcher below without an await in between; see the consume site.
-        attributedReplaceReason = reason
-      }
-      newSpawner.resetHandle()
-      await newSpawner.ensureRunning()
-      return takeDaemonAdoptionLeaseRelease(newSpawner.getHandle())
-    }
-  })
-  let legacyAdapters: DaemonPtyAdapter[] = []
-  let routedAdapter: DaemonProvider = newAdapter
-  try {
-    // Why: the launcher's temporary pair closes only after this permanent pair is established, leaving no adoption gap.
-    await newAdapter.establishLifecycleLease()
-    releaseDaemonAdoptionLease(newSpawner.getHandle())
-
-    legacyAdapters = await createLegacyDaemonAdapters(runtimeDir)
-    routedAdapter =
-      launchMode === 'degraded-new-pty-fallback'
-        ? new DegradedDaemonPtyProvider({
-            current: newAdapter,
-            legacy: legacyAdapters,
-            fallback: getLocalPtyProvider(),
-            probeCurrentDaemonSpawn: async () =>
-              (await checkDaemonHealth(info.socketPath, info.tokenPath)) === 'healthy'
-          })
-        : legacyAdapters.length > 0
-          ? new DaemonPtyRouter({
-              current: newAdapter,
-              legacy: legacyAdapters
-            })
-          : newAdapter
-    if (routedAdapter instanceof DegradedDaemonPtyProvider) {
-      // Why: preserved daemon can't create fresh terminals; discover its live session ids so only they route to it (fresh panes fall back locally).
-      await routedAdapter.discoverDaemonSessions()
-    } else if (routedAdapter instanceof DaemonPtyRouter) {
-      await routedAdapter.discoverLegacySessions()
-    }
-    if (signal?.aborted) {
-      // Why: same late-swap guard after legacy discovery; release uninstalled adapter leases without killing live sessions.
-      await routedAdapter.disconnectOnly()
-      return
-    }
-  } catch (error) {
-    try {
-      await cleanupFailedDaemonAdoption(newSpawner, newAdapter, legacyAdapters)
-    } catch (cleanupError) {
-      throw new AggregateError([error, cleanupError], 'Daemon adoption and cleanup both failed')
-    }
-    throw error
-  }
-  spawner = newSpawner
-  adapter = routedAdapter
-  setLocalPtyProvider(routedAdapter)
-  // Why: the first window may register PTY listeners before daemon init finishes; rebind so daemon PTYs still fan out events.
-  rebindLocalProviderListeners()
-  logDaemonMilestone('daemon-init-done', {
-    legacyAdapters: legacyAdapters.length
-  })
-  await reconcileSeededClaudeLivePtys(routedAdapter)
-}
-
-// Why: release gate ids only for daemon-confirmed-dead sessions; keep seeds on listing failure since releasing early can rotate a live CLI's refresh token.
-async function reconcileSeededClaudeLivePtys(provider: DaemonProvider): Promise<void> {
-  if (!hasSeededUnconfirmedClaudePtys()) {
-    return
-  }
-  try {
-    const adapters =
-      provider instanceof DaemonPtyRouter || provider instanceof DegradedDaemonPtyProvider
-        ? provider.getAllAdapters()
-        : [provider]
-    const results = await Promise.allSettled(adapters.map((entry) => entry.listSessions()))
-    if (results.some((result) => result.status === 'rejected')) {
-      console.warn('[daemon] Keeping seeded Claude live-PTY gate — session listing failed')
-      return
-    }
-    confirmSeededClaudeLivePtys(
-      results.flatMap((result) =>
-        result.status === 'fulfilled' ? result.value.map((session) => session.sessionId) : []
-      )
-    )
-  } catch (error) {
-    // Why: gate bookkeeping must never fail daemon init; stale seeds only defer a usage refresh until next restart.
-    console.warn('[daemon] Failed to reconcile seeded Claude live-PTY gate:', error)
-  }
-}
-
-// Why: a narrow getter (not a raw export) keeps the "swap on restart" invariant in one place (replaceDaemonProvider).
-/**
- * Whether the installed provider is a daemon that will own FRESH terminals too.
- *
- * Why not `getDaemonProvider() !== null`: DegradedDaemonPtyProvider routes the daemon's
- * EXISTING sessions to the daemon but spawns new ones on the in-process local provider, so
- * those die with this process. A host that answered "I can recover persistent local PTYs"
- * from that state would be advertising recovery for terminals that cannot be recovered.
- */
-export function daemonOwnsFreshPersistentPtys(): boolean {
-  return adapter !== null && !(adapter instanceof DegradedDaemonPtyProvider)
-}
-
-/** Endpoint coordinates of the daemon this process installed, for out-of-band health probes. */
-export type DaemonEndpointFacts = {
-  runtimeDir: string
-  socketPath: string
-  tokenPath: string
-  pidPath: string
-  protocolVersion: number
-}
-
-export function getDaemonEndpointFacts(): DaemonEndpointFacts | null {
-  if (!adapter) {
-    return null
-  }
-  const runtimeDir = getRuntimeDir()
-  return {
-    runtimeDir,
-    socketPath: getDaemonSocketPath(runtimeDir),
-    tokenPath: getDaemonTokenPath(runtimeDir),
-    pidPath: getDaemonPidPath(runtimeDir),
-    protocolVersion: PROTOCOL_VERSION
-  }
-}
-
-/**
- * What the live daemon's own PID record says about the build it was forked from.
- *
- * Why the record and not this process's version: the daemon deliberately outlives the
- * runtime, so after an update the two can legitimately disagree — and a health surface that
- * reported orcad's version for both would hide exactly that.
- */
-export function readDaemonPidRecord(): ParsedDaemonPid | null {
-  const facts = getDaemonEndpointFacts()
-  if (!facts) {
-    return null
-  }
-  try {
-    return parseDaemonPidFile(readFileSync(facts.pidPath, 'utf8'))
-  } catch {
-    return null
-  }
-}
-
-export function getDaemonProvider(): DaemonProvider | null {
-  return adapter
-}
-
-// Why: computed from the pid record on demand (not cached at adoption) so the Settings
-// remedy surface always reflects the daemon actually serving terminals right now.
-export async function getCurrentDaemonMacTccAttributionHealth(): Promise<MacDaemonTccAttributionHealth> {
-  const runtimeDir = getRuntimeDir()
-  return getMacDaemonTccAttributionHealth(
-    runtimeDir,
-    getDaemonSocketPath(runtimeDir),
-    getDaemonTokenPath(runtimeDir)
-  )
-}
-
-/** Returns null unless every daemon generation supplied an authoritative inventory. */
-export async function listLiveDaemonPtyIds(): Promise<string[] | null> {
-  if (!adapter) {
-    return null
-  }
-  const adapters =
-    adapter instanceof DaemonPtyRouter || adapter instanceof DegradedDaemonPtyProvider
-      ? adapter.getAllAdapters()
-      : [adapter]
-  const inventories = await Promise.allSettled(
-    adapters.map((daemonAdapter) => daemonAdapter.listProcesses())
-  )
-  if (inventories.some((inventory) => inventory.status === 'rejected')) {
-    return null
-  }
-  return inventories.flatMap((inventory) =>
-    inventory.status === 'fulfilled' ? inventory.value.map((process) => process.id) : []
-  )
-}
-
-// Why: keep the module-level adapter and ipc/pty.ts's localProvider in sync so app-quit can't dispose a stale reference.
-export function replaceDaemonProvider(newAdapter: DaemonProvider): void {
-  adapter = newAdapter
-  setLocalPtyProvider(newAdapter)
-}
-
-function getCurrentDaemonAdapter(provider: DaemonProvider): DaemonPtyAdapter {
-  if (provider instanceof DaemonPtyRouter || provider instanceof DegradedDaemonPtyProvider) {
-    return provider.getCurrentAdapter()
-  }
-  return provider
-}
-
-function getLegacyDaemonAdapters(provider: DaemonProvider): DaemonPtyAdapter[] {
-  if (provider instanceof DaemonPtyRouter || provider instanceof DegradedDaemonPtyProvider) {
-    return [...provider.getLegacyAdapters()]
-  }
-  return []
-}
-
-function disposeProviderSubscriptionsOnly(provider: DaemonProvider): void {
-  if (provider instanceof DaemonPtyRouter) {
-    provider.disposeRouterOnly()
-    return
-  }
-  if (provider instanceof DegradedDaemonPtyProvider) {
-    provider.disposeProviderOnly()
-  }
-}
-
-export type RestartDaemonResult = {
-  killedCount: number
-}
-
-// Why: the 7-step restart sequence from docs/daemon-staleness-ux.md §Phase 1; current-protocol only (legacy adapters preserved).
-export async function restartDaemon(): Promise<RestartDaemonResult> {
-  if (restartInFlight) {
-    return restartInFlight
-  }
-  restartInFlight = runRestartDaemon().finally(() => {
-    restartInFlight = null
-  })
-  return restartInFlight
-}
-
-async function runRestartDaemon(): Promise<RestartDaemonResult> {
-  const currentSpawner = spawner
-  const currentAdapter = adapter
-  if (!currentSpawner || !currentAdapter) {
-    throw new Error('restartDaemon called before initDaemonPtyProvider')
-  }
-
-  const runtimeDir = getRuntimeDir()
-  // An operator asking for a restart is the deliberate "try again" that clears crash-loop
-  // containment; without this a wedged host could never be recovered from the UI.
-  currentSpawner.resetRespawnWindow()
-  const currentOnly = getCurrentDaemonAdapter(currentAdapter)
-  const legacyAdapters = getLegacyDaemonAdapters(currentAdapter)
-
-  // Step 1: synthesize pty:exit for every active session BEFORE teardown — the daemon's shutdown path never fans onExit to clients (session.ts:246-252), so the renderer would otherwise never see exits.
-  const fallbackKilledCount =
-    currentAdapter instanceof DegradedDaemonPtyProvider
-      ? await currentAdapter.shutdownFallbackSessions()
-      : 0
-  const currentDaemonSessionIds =
-    currentAdapter instanceof DegradedDaemonPtyProvider
-      ? currentAdapter.getCurrentDaemonSessionIds()
-      : []
-  const killedCount =
-    new Set([...currentOnly.getActiveSessionIds(), ...currentDaemonSessionIds]).size +
-    fallbackKilledCount
-  currentOnly.fanoutSyntheticExits(-1)
-  if (currentAdapter instanceof DegradedDaemonPtyProvider) {
-    currentAdapter.fanoutCurrentDaemonSyntheticExits(-1)
-  }
-
-  // Step 2: detach renderer listeners — after step 1 (so synthesized exits land) and before step 6 (no stale binding).
-  unbindLocalProviderListeners()
-
-  // Step 3: kill the current-protocol daemon process; legacy adapters untouched.
-  let info: Awaited<ReturnType<DaemonSpawner['ensureRunning']>>
-  try {
-    await cleanupDaemonForProtocol(runtimeDir, PROTOCOL_VERSION)
-
-    // Step 4: reuse the existing spawner so the respawn closure baked into long-lived adapters stays valid (do NOT new one).
-    currentSpawner.resetHandle()
-    info = await currentSpawner.ensureRunning()
-  } catch (error) {
-    // Why: old provider stays authoritative until the final swap; rebind since relaunch failed after teardown.
-    rebindLocalProviderListeners()
-    throw error
-  }
-
-  // Step 5: build a fresh current adapter against the respawned daemon.
-  const newCurrent = new DaemonPtyAdapter({
-    socketPath: info.socketPath,
-    tokenPath: info.tokenPath,
-    pidPath: getDaemonPidPath(runtimeDir),
-    profileScope: runtimeDir,
-    runtimeDir,
-    packagedAppVersion: resolvePackagedDarwinAppVersion(),
-    historyPath: getHistoryDir(),
-    respawn: async (reason: DaemonRespawnReason) => {
-      // Why: attribute rather than emit — the launcher below is the one that completes the
-      // replacement, and emitting here would fire before the outcome is known.
-      // Caveat: a wedged-but-alive daemon (#8689) can still report died_respawn here and
-      // failed_health_check from the launcher — the app cannot tell wedged from dead at this point.
-      if (reason === 'daemon_died') {
-        console.warn('[daemon] Daemon process died — respawning')
-        // Why: a manual restart tears the daemon down under a still-live adapter, so a pane
-        // respawning on its synthetic exit would bill a user action to the crash bucket.
-        if (!restartInFlight) {
-          trackDaemonRetired('died_respawn')
-        }
-      } else {
-        // Must reach the launcher below without an await in between; see the consume site.
-        attributedReplaceReason = reason
-      }
-      currentSpawner.resetHandle()
-      await currentSpawner.ensureRunning()
-      return takeDaemonAdoptionLeaseRelease(currentSpawner.getHandle())
-    }
-  })
-  let newProvider: DaemonProvider = newCurrent
-  try {
-    // Temporary launcher lease overlaps this permanent pair so a manual restart can't strand a newly spawned daemon during adoption.
-    await newCurrent.establishLifecycleLease()
-    releaseDaemonAdoptionLease(currentSpawner.getHandle())
-
-    // Re-wrap in a router only if legacy adapters exist; they're preserved by reference and still route to their pre-upgrade daemons.
-    newProvider =
-      legacyAdapters.length > 0
-        ? new DaemonPtyRouter({ current: newCurrent, legacy: legacyAdapters })
-        : newCurrent
-    if (newProvider instanceof DaemonPtyRouter) {
-      await newProvider.discoverLegacySessions()
-    }
-  } catch (error) {
-    let cleanupError: unknown
-    try {
-      if (newProvider instanceof DaemonPtyRouter) {
-        newProvider.disposeRouterOnly()
-      }
-      await cleanupFailedDaemonAdoption(currentSpawner, newCurrent)
-    } catch (caught) {
-      cleanupError = caught
-    }
-    // Previous provider stays module-authoritative until the swap; restore its renderer bindings when adoption fails.
-    rebindLocalProviderListeners()
-    if (cleanupError) {
-      throw new AggregateError([error, cleanupError], 'Daemon restart and cleanup both failed')
-    }
-    throw error
-  }
-
-  // Drain the old router's subscriptions via the router-only variant (plain dispose() would tear down the shared legacy adapters), after the new provider exists (no unhandled events) and before the swap (atomic for the renderer).
-  disposeProviderSubscriptionsOnly(currentAdapter)
-
-  // Step 6: swap module state (adapter + localProvider) atomically.
-  replaceDaemonProvider(newProvider)
-
-  // Step 7: rebind renderer listeners against the new provider.
-  rebindLocalProviderListeners()
-
-  return { killedCount }
-}
-
-// Disconnect without killing: the daemon survives app quit so sessions stay warm for reattach.
-// Leave history sessions marked "unclean" so a daemon crash while Orca is closed stays recoverable.
-export async function disconnectDaemon(): Promise<void> {
-  await adapter?.disconnectOnly()
-  adapter = null
-}
-
-/** Kill the daemon and all its sessions. Use for full cleanup only. */
-export async function shutdownDaemon(): Promise<void> {
-  adapter?.dispose()
-  adapter = null
-  await spawner?.shutdown()
-  spawner = null
-}
-
-export type OrphanedDaemonCleanupResult = {
-  /** True when a live daemon socket was found and torn down; false when none was running. */
-  cleaned: boolean
-  /** Number of live PTY sessions killed during cleanup (surfaced to the user). */
-  killedCount: number
-}
-
-export async function cleanupDaemonForProtocol(
-  runtimeDir: string,
-  protocolVersion: number
-): Promise<OrphanedDaemonCleanupResult> {
-  const socketPath = getDaemonSocketPath(runtimeDir, protocolVersion)
-  const tokenPath = getDaemonTokenPath(runtimeDir, protocolVersion)
-  const pidPath = getDaemonPidPath(runtimeDir, protocolVersion)
-
-  const alive = await probeSocket(socketPath)
-  if (!alive) {
-    if (protocolVersion >= CLEAN_DISCONNECT_PROTOCOL_VERSION) {
-      // Endpoint absence doesn't prove the PID record belongs to the current protocol; leave artifact cleanup to the owning daemon.
-      return { cleaned: false, killedCount: 0 }
-    }
-    try {
-      unlinkSync(pidPath)
-    } catch {
-      // Best-effort
-    }
-    return { cleaned: false, killedCount: 0 }
-  }
-
-  const client = new DaemonClient({ socketPath, tokenPath, protocolVersion })
-  let killedCount = 0
-  let didRequestShutdown = false
-  let didKillStaleDaemon = false
-  try {
-    await client.ensureConnected()
-    const sessions = await client
-      .request<ListSessionsResult>('listSessions', undefined)
-      .catch(() => ({ sessions: [] }))
-    killedCount = sessions.sessions.filter((s) => s.isAlive).length
-
-    // Use the single-shot `shutdown` RPC (kills all sessions then exits) to avoid racing per-session `kill` calls against the daemon exiting.
-    await client.request('shutdown', { killSessions: true }).catch(() => {
-      // Daemon exits immediately after the RPC, so the socket may close before the reply arrives; treat as success.
-    })
-    didRequestShutdown = true
-  } catch {
-    // Previous-protocol daemons may be wedged or too old for the RPC path; fall back to PID cleanup (only unlinks a live socket after proving the process is killed).
-    const killOutcome = await killStaleDaemon(runtimeDir, socketPath, tokenPath, protocolVersion)
-    didKillStaleDaemon = killOutcome.killed
-    if (killOutcome.liveOwnerSurvived) {
-      // Why: something still owns the endpoint. Returning as if it were cleaned lets restart
-      // fork a replacement that cannot publish onto the held name, leaving the user with no
-      // daemon instead of the one still running.
-      throw new DaemonEndpointOwnershipError(
-        'Daemon cleanup aborted: the existing daemon could not be confirmed stopped'
-      )
-    }
-  } finally {
-    client.disconnect()
-  }
-
-  if (didRequestShutdown && protocolVersion >= CLEAN_DISCONNECT_PROTOCOL_VERSION) {
-    if (!(await waitForDaemonEndpointExit(socketPath))) {
-      // Never fork a replacement while the old incarnation may still own the endpoint or be disposing terminal children.
-      throw new Error('Timed out waiting for daemon self-shutdown')
-    }
-    return { cleaned: true, killedCount }
-  }
-
-  try {
-    unlinkSync(pidPath)
-  } catch {
-    // Best-effort
-  }
-
-  return { cleaned: didRequestShutdown || didKillStaleDaemon, killedCount }
-}
-
-async function waitForDaemonEndpointExit(socketPath: string): Promise<boolean> {
-  const deadline = Date.now() + DAEMON_SELF_SHUTDOWN_WAIT_MS
-  while (Date.now() < deadline) {
-    if (!(await probeSocket(socketPath))) {
-      return true
-    }
-    await new Promise((resolve) => setTimeout(resolve, 50))
-  }
-  return !(await probeSocket(socketPath))
-}
-
-function legacyDaemonProcessMayBeAlive(runtimeDir: string, protocolVersion: number): boolean {
-  try {
-    const parsed = parseDaemonPidFile(
-      readFileSync(getDaemonPidPath(runtimeDir, protocolVersion), 'utf8')
-    )
-    if (!parsed) {
-      return false
-    }
-    process.kill(parsed.pid, 0)
-    return true
-  } catch {
-    return false
-  }
-}
-
-// Why: callers that own an isolated runtime namespace must keep discovery history out of app userData.
-export async function createLegacyDaemonAdapters(
-  runtimeDir: string,
-  historyPath = getHistoryDir()
-): Promise<DaemonPtyAdapter[]> {
-  const adapters: DaemonPtyAdapter[] = []
-  for (const protocolVersion of PREVIOUS_DAEMON_PROTOCOL_VERSIONS) {
-    const socketPath = getDaemonSocketPath(runtimeDir, protocolVersion)
-    const tokenPath = getDaemonTokenPath(runtimeDir, protocolVersion)
-    if (!(await probeSocket(socketPath))) {
-      // Why: a recycled stale pid later turns an identity check into a PowerShell spawn, so delete leaked pid/token files — but only when the pid-process is provably gone (a live daemon can transiently fail the probe, and dropping its token makes its sessions permanently unadoptable).
-      if (!legacyDaemonProcessMayBeAlive(runtimeDir, protocolVersion)) {
-        for (const stalePath of [
-          getDaemonPidPath(runtimeDir, protocolVersion),
-          getDaemonTokenPath(runtimeDir, protocolVersion)
-        ]) {
-          try {
-            unlinkSync(stalePath)
-          } catch {
-            // Best-effort
-          }
-        }
-      }
-      continue
-    }
-    // Keep old-protocol PTYs routed to their original daemon during upgrade; legacy adapters never respawn (new code would recreate stale env semantics).
-    // historyPath is still needed for cleanup — without it a later v4 session reusing the same ID could false-restore stale scrollback.bin.
-    adapters.push(
-      new DaemonPtyAdapter({
-        socketPath,
-        tokenPath,
-        pidPath: getDaemonPidPath(runtimeDir, protocolVersion),
-        profileScope: runtimeDir,
-        runtimeDir,
-        protocolVersion,
-        historyPath
-      })
-    )
-  }
-  return adapters
-}
+export { createLegacyDaemonAdapters } from './daemon-legacy-adapters'
+export { initDaemonPtyProvider } from './daemon-provider-init'
+export { restartDaemon, type RestartDaemonResult } from './daemon-provider-restart'
+export {
+  daemonOwnsFreshPersistentPtys,
+  disconnectDaemon,
+  getCurrentDaemonMacTccAttributionHealth,
+  getDaemonEndpointFacts,
+  getDaemonProvider,
+  listLiveDaemonPtyIds,
+  readDaemonPidRecord,
+  replaceDaemonProvider,
+  shutdownDaemon,
+  type DaemonEndpointFacts
+} from './daemon-provider-state'
+export {
+  cleanupDaemonForProtocol,
+  type OrphanedDaemonCleanupResult
+} from './daemon-protocol-cleanup'
+export { WEDGED_DAEMON_GRACE_RETRIES } from './daemon-replacement-preflight'
diff --git a/src/main/daemon/daemon-launched-child.ts b/src/main/daemon/daemon-launched-child.ts
new file mode 100644
index 00000000000..f9f245897f6
--- /dev/null
+++ b/src/main/daemon/daemon-launched-child.ts
@@ -0,0 +1,295 @@
+import { fork, type ChildProcess } from 'node:child_process'
+import { getAppEnvironment } from '../../shared/app-environment'
+import { DAEMON_EXIT_ENDPOINT_OCCUPIED } from './daemon-endpoint-ownership'
+import type { DaemonEndpointIdentity } from './daemon-hello-protocol'
+import { daemonLogArgs } from './daemon-launch-paths'
+import { parseDaemonReadyIdentity } from './daemon-ready-identity'
+import { unlinkOwnedDaemonPidFile } from './daemon-spawner'
+
+const DAEMON_CHILD_TERMINATION_GRACE_MS = 5_000
+const DAEMON_CHILD_FORCE_EXIT_WAIT_MS = 1_000
+const STARTUP_STDERR_MAX_BYTES = 8192
+
+export class DaemonEndpointUnavailableError extends Error {
+  constructor(
+    readonly reason: string,
+    options?: ErrorOptions
+  ) {
+    super(`Daemon could not take the endpoint: ${reason}`, options)
+  }
+}
+
+export type LaunchedDaemonChild = {
+  child: ChildProcess
+  identity: DaemonEndpointIdentity
+}
+
+type LaunchDaemonChildOptions = {
+  entryPath: string
+  forkEntryPath: string
+  relocatedExecPath?: string
+  userDataPath: string
+  socketPath: string
+  tokenPath: string
+  pidPath: string
+  launchNonce: string
+  macosLoginSessionWatch: boolean
+}
+
+export async function launchDaemonChild(
+  options: LaunchDaemonChildOptions
+): Promise<LaunchedDaemonChild> {
+  const {
+    entryPath,
+    forkEntryPath,
+    relocatedExecPath,
+    userDataPath,
+    socketPath,
+    tokenPath,
+    pidPath,
+    launchNonce,
+    macosLoginSessionWatch
+  } = options
+  const child = fork(
+    forkEntryPath,
+    [
+      '--socket',
+      socketPath,
+      '--token',
+      tokenPath,
+      '--pid-record',
+      pidPath,
+      '--launch-nonce',
+      launchNonce,
+      '--entry-path',
+      entryPath,
+      '--app-version',
+      getAppEnvironment().getVersion(),
+      '--spawner-exec-path',
+      process.execPath,
+      ...(macosLoginSessionWatch ? ['--login-session-watch'] : []),
+      ...daemonLogArgs()
+    ],
+    {
+      // Why: detached daemons outlive dev worktrees; userData keeps process.cwd() valid after a repo/worktree is deleted.
+      cwd: userDataPath,
+      // Why: detached+unref outlives Electron; stdout 'ignore' (else blocks exit), stderr 'pipe' captures startup crashes lost in v1.4.129-rc.1.
+      detached: true,
+      stdio: ['ignore', 'ignore', 'pipe', 'ipc'],
+      // Why: run the byte-identical relocated Orca.exe so the image path sits outside the updater's kill zone.
+      ...(relocatedExecPath ? { execPath: relocatedExecPath } : {}),
+      // Why: run the fork as plain Node so Electron's GPU/display init can't interfere with node-pty's posix_spawn of the spawn-helper.
+      env: {
+        ...process.env,
+        ELECTRON_RUN_AS_NODE: '1',
+        // Why: the detached plain-Node daemon has no AppEnvironment, but shell rcfiles must live outside swept tmp.
+        ORCA_USER_DATA_PATH: userDataPath
+      }
+    }
+  )
+
+  // Why: keep only the startup-window stderr tail so a crash cause is visible without unbounded memory.
+  let startupStderr = ''
+  let collectingStderr = true
+  const onStartupStderr = (chunk: Buffer): void => {
+    if (!collectingStderr) {
+      return
+    }
+    startupStderr += chunk.toString('utf8')
+    if (startupStderr.length > STARTUP_STDERR_MAX_BYTES) {
+      startupStderr = startupStderr.slice(-STARTUP_STDERR_MAX_BYTES)
+    }
+  }
+  child.stderr?.on('data', onStartupStderr)
+  // Why: release the detached daemon's stderr once up/failed — a live piped stream refs the parent loop and blocks Electron exit.
+  const releaseStderr = (): void => {
+    collectingStderr = false
+    child.stderr?.off('data', onStartupStderr)
+    child.stderr?.destroy()
+  }
+
+  // Wait for the daemon to signal readiness via IPC
+  let launchedIdentity: DaemonEndpointIdentity | null = null
+  let endpointUnavailableReason: string | null = null
+  const startupSignal = new Promise<void>((resolve, reject) => {
+    let timer: ReturnType<typeof setTimeout> | undefined
+    let settled = false
+    function cleanupStartupListeners(): void {
+      if (timer) {
+        clearTimeout(timer)
+      }
+      child.off('message', onReadyMessage)
+      child.off('error', onStartupError)
+      child.off('exit', onStartupExit)
+    }
+    async function fail(error: Error): Promise<void> {
+      if (settled) {
+        return
+      }
+      settled = true
+      cleanupStartupListeners()
+      // Why: attach the captured stderr tail to the thrown error and log it so a startup crash isn't just "exited with code 1".
+      const stderrTail = startupStderr.trim()
+      if (stderrTail) {
+        console.warn(`[daemon] startup failed; captured stderr tail:\n${stderrTail}`)
+      }
+      releaseStderr()
+      const startupError = stderrTail
+        ? new Error(`${error.message}\nDaemon stderr (tail):\n${stderrTail}`)
+        : error
+      try {
+        await terminateLaunchedDaemonChild(child)
+      } catch (cleanupError) {
+        reject(
+          new AggregateError(
+            [startupError, cleanupError],
+            'Daemon startup and child cleanup both failed'
+          )
+        )
+        return
+      }
+      if (Number.isSafeInteger(child.pid) && (child.pid as number) > 0) {
+        unlinkOwnedDaemonPidFile(pidPath, child.pid as number, launchNonce)
+      }
+      reject(startupError)
+    }
+    function onReadyMessage(msg: unknown): void {
+      if (
+        msg &&
+        typeof msg === 'object' &&
+        (msg as { type?: string }).type === 'endpoint-unavailable'
+      ) {
+        // Why: the child lost the endpoint race rather than crashing. Record it so the
+        // launcher can adopt the winner instead of reporting a generic startup failure.
+        endpointUnavailableReason = (msg as { reason?: string }).reason ?? 'occupied'
+        void fail(new Error(`Daemon could not take the endpoint: ${endpointUnavailableReason}`))
+        return
+      }
+      if (msg && typeof msg === 'object' && (msg as { type?: string }).type === 'ready') {
+        if (settled) {
+          return
+        }
+        const readyIdentity = parseDaemonReadyIdentity(msg)
+        if (!Number.isSafeInteger(child.pid) || (child.pid as number) <= 0 || !readyIdentity) {
+          void fail(new Error('Daemon readiness identity is incomplete'))
+          return
+        }
+        launchedIdentity = {
+          pid: child.pid as number,
+          ...readyIdentity,
+          launchNonce
+        }
+        settled = true
+        // Why: daemon is detached after readiness; detach startup listeners so the launch promise closure isn't retained.
+        cleanupStartupListeners()
+        // Why: release IPC/stderr and unref so Electron can exit without waiting; the daemon keeps running detached.
+        releaseStderr()
+        child.disconnect()
+        child.unref()
+        resolve()
+      }
+    }
+
+    function onStartupError(err: Error): void {
+      void fail(err)
+    }
+
+    function onStartupExit(code: number | null): void {
+      if (code === DAEMON_EXIT_ENDPOINT_OCCUPIED) {
+        // Why here and not only on the IPC message: the exit is the event this wait settles
+        // on, so keying off it cannot lose to a notification still in the channel.
+        endpointUnavailableReason = 'occupied'
+      }
+      void fail(new Error(`Daemon exited during startup with code ${code}`))
+    }
+
+    timer = setTimeout(() => {
+      void fail(new Error('Daemon startup timed out'))
+    }, 10000)
+
+    child.on('message', onReadyMessage)
+    child.on('error', onStartupError)
+    child.on('exit', onStartupExit)
+  })
+
+  try {
+    await startupSignal
+  } catch (error) {
+    if (endpointUnavailableReason === 'occupied') {
+      throw new DaemonEndpointUnavailableError('occupied', { cause: error })
+    }
+    throw error
+  }
+  if (!launchedIdentity) {
+    throw new Error('Daemon readiness identity is incomplete')
+  }
+  return { child, identity: launchedIdentity }
+}
+
+export async function terminateLaunchedDaemonChild(child: ChildProcess): Promise<void> {
+  try {
+    if (
+      (child.exitCode !== null && child.exitCode !== undefined) ||
+      (child.signalCode !== null && child.signalCode !== undefined)
+    ) {
+      return
+    }
+    await new Promise<void>((resolve, reject) => {
+      let gracefulTimer: ReturnType<typeof setTimeout>
+      let forcedTimer: ReturnType<typeof setTimeout> | undefined
+      let settled = false
+      const finish = (error?: unknown): void => {
+        if (settled) {
+          return
+        }
+        settled = true
+        clearTimeout(gracefulTimer)
+        if (forcedTimer) {
+          clearTimeout(forcedTimer)
+        }
+        child.off('exit', onExit)
+        if (error) {
+          reject(error)
+        } else {
+          resolve()
+        }
+      }
+      const onExit = (): void => finish()
+      child.on('exit', onExit)
+      gracefulTimer = setTimeout(() => {
+        if (child.pid) {
+          try {
+            process.kill(child.pid, 'SIGKILL')
+          } catch (error) {
+            finish(isNoSuchProcessError(error) ? undefined : error)
+            return
+          }
+        }
+        if (!settled) {
+          forcedTimer = setTimeout(
+            () => finish(new Error('Daemon did not exit after SIGKILL')),
+            DAEMON_CHILD_FORCE_EXIT_WAIT_MS
+          )
+        }
+      }, DAEMON_CHILD_TERMINATION_GRACE_MS)
+      if (child.pid) {
+        try {
+          process.kill(child.pid, 'SIGTERM')
+        } catch (error) {
+          finish(isNoSuchProcessError(error) ? undefined : error)
+        }
+      } else {
+        finish()
+      }
+    })
+  } finally {
+    if (child.connected) {
+      child.disconnect()
+    }
+    child.unref()
+  }
+}
+
+function isNoSuchProcessError(error: unknown): boolean {
+  return typeof error === 'object' && error !== null && 'code' in error && error.code === 'ESRCH'
+}
diff --git a/src/main/daemon/daemon-legacy-adapters.ts b/src/main/daemon/daemon-legacy-adapters.ts
new file mode 100644
index 00000000000..160ddd64c64
--- /dev/null
+++ b/src/main/daemon/daemon-legacy-adapters.ts
@@ -0,0 +1,66 @@
+import { readFileSync, unlinkSync } from 'node:fs'
+import {
+  getDaemonHistoryDir as getHistoryDir,
+  probeDaemonSocket as probeSocket
+} from './daemon-launch-paths'
+import { parseDaemonPidFile } from './daemon-pid-file-parse'
+import { DaemonPtyAdapter } from './daemon-pty-adapter'
+import { getDaemonPidPath, getDaemonSocketPath, getDaemonTokenPath } from './daemon-spawner'
+import { PREVIOUS_DAEMON_PROTOCOL_VERSIONS } from './types'
+
+function legacyDaemonProcessMayBeAlive(runtimeDir: string, protocolVersion: number): boolean {
+  try {
+    const parsed = parseDaemonPidFile(
+      readFileSync(getDaemonPidPath(runtimeDir, protocolVersion), 'utf8')
+    )
+    if (!parsed) {
+      return false
+    }
+    process.kill(parsed.pid, 0)
+    return true
+  } catch {
+    return false
+  }
+}
+
+// Why: callers that own an isolated runtime namespace must keep discovery history out of app userData.
+export async function createLegacyDaemonAdapters(
+  runtimeDir: string,
+  historyPath = getHistoryDir()
+): Promise<DaemonPtyAdapter[]> {
+  const adapters: DaemonPtyAdapter[] = []
+  for (const protocolVersion of PREVIOUS_DAEMON_PROTOCOL_VERSIONS) {
+    const socketPath = getDaemonSocketPath(runtimeDir, protocolVersion)
+    const tokenPath = getDaemonTokenPath(runtimeDir, protocolVersion)
+    if (!(await probeSocket(socketPath))) {
+      // Why: a recycled stale pid later turns an identity check into a PowerShell spawn, so delete leaked pid/token files — but only when the pid-process is provably gone (a live daemon can transiently fail the probe, and dropping its token makes its sessions permanently unadoptable).
+      if (!legacyDaemonProcessMayBeAlive(runtimeDir, protocolVersion)) {
+        for (const stalePath of [
+          getDaemonPidPath(runtimeDir, protocolVersion),
+          getDaemonTokenPath(runtimeDir, protocolVersion)
+        ]) {
+          try {
+            unlinkSync(stalePath)
+          } catch {
+            // Best-effort
+          }
+        }
+      }
+      continue
+    }
+    // Keep old-protocol PTYs routed to their original daemon during upgrade; legacy adapters never respawn (new code would recreate stale env semantics).
+    // historyPath is still needed for cleanup — without it a later v4 session reusing the same ID could false-restore stale scrollback.bin.
+    adapters.push(
+      new DaemonPtyAdapter({
+        socketPath,
+        tokenPath,
+        pidPath: getDaemonPidPath(runtimeDir, protocolVersion),
+        profileScope: runtimeDir,
+        runtimeDir,
+        protocolVersion,
+        historyPath
+      })
+    )
+  }
+  return adapters
+}
diff --git a/src/main/daemon/daemon-out-of-process-launcher.ts b/src/main/daemon/daemon-out-of-process-launcher.ts
new file mode 100644
index 00000000000..e5b14aa8cb0
--- /dev/null
+++ b/src/main/daemon/daemon-out-of-process-launcher.ts
@@ -0,0 +1,209 @@
+import { randomUUID } from 'node:crypto'
+import { getAppEnvironment } from '../../shared/app-environment'
+import type { DaemonReplaceReason } from '../../shared/daemon-lifecycle-telemetry'
+import { DaemonClient } from './client'
+import {
+  DaemonEndpointOwnershipError,
+  holdDaemonAdoptionLease,
+  reconcileDaemonPidOwnership
+} from './daemon-endpoint-adoption'
+import {
+  DaemonEndpointUnavailableError,
+  launchDaemonChild,
+  terminateLaunchedDaemonChild
+} from './daemon-launched-child'
+import { getDaemonEntryPath, probeDaemonSocket as probeSocket } from './daemon-launch-paths'
+import { materializeRelocatedDaemonHost } from './daemon-host-relocation'
+import { cleanupDaemonForProtocol } from './daemon-protocol-cleanup'
+import {
+  getDaemonPidPath,
+  type DaemonLauncher,
+  type DaemonProcessHandle,
+  unlinkOwnedDaemonPidFile
+} from './daemon-spawner'
+import { PROTOCOL_VERSION } from './types'
+import { prepareDaemonReplacement } from './daemon-replacement-preflight'
+
+// Why: the adapter decides a runtime resolver replacement, but the launcher completes it — and by
+// then the daemon has usually self-retired (dropping its last authenticated client is enough), so
+// there is nothing left to kill and the launcher's own confirmed-kill gate would report nothing.
+// The adapter hands the reason across so the launch it triggers reports what actually drove it.
+let attributedReplaceReason: DaemonReplaceReason | null = null
+
+export function attributeNextDaemonReplacement(reason: DaemonReplaceReason): void {
+  attributedReplaceReason = reason
+}
+
+function createPreservedDaemonHandle(
+  runtimeDir: string,
+  protocolVersion = PROTOCOL_VERSION,
+  mode?: 'degraded-new-pty-fallback'
+): DaemonProcessHandle {
+  const handle: DaemonProcessHandle = {
+    shutdown: async () => {
+      await cleanupDaemonForProtocol(runtimeDir, protocolVersion)
+    }
+  }
+  if (mode) {
+    handle.mode = mode
+  }
+  return handle
+}
+
+export function createOutOfProcessLauncher(
+  runtimeDir: string,
+  macosLoginSessionWatch = false
+): DaemonLauncher {
+  return async (socketPath, tokenPath, suppliedPidPath, suppliedLaunchNonce) => {
+    const entryPath = getDaemonEntryPath()
+    const pidPath = suppliedPidPath ?? getDaemonPidPath(runtimeDir)
+    const launchNonce = suppliedLaunchNonce ?? randomUUID()
+    // One-shot: whichever launch consumes it owns the attribution, so a later unrelated launch can't
+    // reuse it. The write in the respawn closure reaches here without an intervening await, which is
+    // what makes a bare module-scoped slot safe — keep it that way or a concurrent launch can steal it.
+    const attributedReason = attributedReplaceReason
+    attributedReplaceReason = null
+    let adoptionClient: DaemonClient | null = new DaemonClient({
+      socketPath,
+      tokenPath
+    })
+    try {
+      // Why: acquire the full pair before control-only probes so an expired inherited deadline can't fire in the probe-to-adoption gap.
+      await adoptionClient.ensureConnected()
+      await reconcileDaemonPidOwnership(adoptionClient, pidPath)
+    } catch {
+      adoptionClient.disconnect()
+      adoptionClient = null
+    }
+    const releaseAdoptionClient = (): void => {
+      adoptionClient?.disconnect()
+      adoptionClient = null
+    }
+    const preserveDaemon = async (
+      mode?: 'degraded-new-pty-fallback'
+    ): Promise<DaemonProcessHandle> => {
+      const connectedClient = adoptionClient ?? undefined
+      adoptionClient = null
+      return holdDaemonAdoptionLease(
+        createPreservedDaemonHandle(runtimeDir, PROTOCOL_VERSION, mode),
+        socketPath,
+        tokenPath,
+        connectedClient,
+        undefined,
+        pidPath
+      )
+    }
+    try {
+      const preservedHandle = await prepareDaemonReplacement({
+        runtimeDir,
+        socketPath,
+        tokenPath,
+        entryPath,
+        attributedReason,
+        releaseAdoptionClient,
+        preserveDaemon
+      })
+      if (preservedHandle) {
+        return preservedHandle
+      }
+
+      const userDataPath = getAppEnvironment().getPath('userData')
+      // Why: on win32 packaged, stage a daemon-host copy in userData so its image escapes the NSIS updater's kill zone; lazy so it's off first-paint. Fail-open: null → in-dir host.
+      const relocatedHost = materializeRelocatedDaemonHost()
+      // Fork the relocated entry when available; otherwise the install-dir entry.
+      const forkEntryPath = relocatedHost ? relocatedHost.entryPath : entryPath
+      let launched
+      try {
+        launched = await launchDaemonChild({
+          entryPath,
+          forkEntryPath,
+          relocatedExecPath: relocatedHost?.execPath,
+          userDataPath,
+          socketPath,
+          tokenPath,
+          pidPath,
+          launchNonce,
+          macosLoginSessionWatch
+        })
+      } catch (error) {
+        if (!(error instanceof DaemonEndpointUnavailableError) || error.reason !== 'occupied') {
+          throw error
+        }
+        // Why adopt rather than retry: another daemon proved it owns the endpoint and is
+        // answering on it. Forking again would lose the same race, and reporting a startup
+        // failure strands this app on local non-persistent PTYs beside a healthy daemon.
+        console.warn(
+          '[daemon] Endpoint was taken by another daemon during startup — adopting it instead'
+        )
+        // Why pidPath: adopting reconciles the PID record against the identity the daemon
+        // reports over hello, repairing a record that names the wrong incarnation. Every other
+        // adoption path passes it; this one skipped it, so the incumbent we adopt here was the
+        // only one whose record never got that repair.
+        return await holdDaemonAdoptionLease(
+          createPreservedDaemonHandle(runtimeDir),
+          socketPath,
+          tokenPath,
+          undefined,
+          undefined,
+          pidPath
+        )
+      }
+
+      try {
+        return await holdDaemonAdoptionLease(
+          {
+            shutdown: () => terminateLaunchedDaemonChild(launched.child)
+          },
+          socketPath,
+          tokenPath,
+          undefined,
+          launched.identity,
+          pidPath
+        )
+      } catch (error) {
+        if (error instanceof DaemonEndpointOwnershipError) {
+          await terminateLaunchedDaemonChild(launched.child)
+          unlinkOwnedDaemonPidFile(pidPath, launched.child.pid as number, launchNonce)
+          throw error
+        }
+        // Why: another client may have adopted this live process; keep its pid record until exit, but remove one published after an early exit.
+        let pidRecordRemoved = false
+        const removeExitedPidRecord = (): void => {
+          if (pidRecordRemoved) {
+            return
+          }
+          pidRecordRemoved = true
+          unlinkOwnedDaemonPidFile(pidPath, launched.child.pid as number, launchNonce)
+        }
+        launched.child.once('exit', removeExitedPidRecord)
+        if (
+          (launched.child.exitCode !== null && launched.child.exitCode !== undefined) ||
+          (launched.child.signalCode !== null && launched.child.signalCode !== undefined)
+        ) {
+          launched.child.off('exit', removeExitedPidRecord)
+          removeExitedPidRecord()
+        }
+        throw error
+      }
+    } catch (error) {
+      releaseAdoptionClient()
+      // Why: the launcher may now fork onto an endpoint it could not classify, because the
+      // publisher is the real guard — and that guard works by refusing to overwrite what it
+      // cannot prove dead, so the child exits instead of splitting the brain. Correct, but
+      // giving up here costs the user every persistent session for the whole run. Something
+      // answering the endpoint now is a daemon worth adopting, not a reason to fall back to
+      // local PTYs.
+      if (await probeSocket(socketPath)) {
+        console.warn(
+          '[daemon] DEGRADED MODE: adopting the daemon that owns the endpoint after a replacement could not publish onto it. Existing sessions keep working; fresh terminals run on the local provider WITHOUT daemon persistence until you restart the daemon (Manage Sessions → Restart).'
+        )
+        try {
+          return await preserveDaemon('degraded-new-pty-fallback')
+        } catch {
+          // It stopped answering between the probe and the adoption; report the launch failure.
+        }
+      }
+      throw error
+    }
+  }
+}
diff --git a/src/main/daemon/daemon-protocol-cleanup.ts b/src/main/daemon/daemon-protocol-cleanup.ts
new file mode 100644
index 00000000000..69808ac5716
--- /dev/null
+++ b/src/main/daemon/daemon-protocol-cleanup.ts
@@ -0,0 +1,98 @@
+import { unlinkSync } from 'node:fs'
+import { DaemonClient } from './client'
+import { DaemonEndpointOwnershipError } from './daemon-endpoint-adoption'
+import { probeDaemonSocket as probeSocket } from './daemon-launch-paths'
+import { getDaemonPidPath, getDaemonSocketPath, getDaemonTokenPath } from './daemon-spawner'
+import { killStaleDaemon } from './daemon-stale-kill'
+import { CLEAN_DISCONNECT_PROTOCOL_VERSION, type ListSessionsResult } from './types'
+
+const DAEMON_SELF_SHUTDOWN_WAIT_MS = 5_000
+
+export type OrphanedDaemonCleanupResult = {
+  /** True when a live daemon socket was found and torn down; false when none was running. */
+  cleaned: boolean
+  /** Number of live PTY sessions killed during cleanup (surfaced to the user). */
+  killedCount: number
+}
+
+export async function cleanupDaemonForProtocol(
+  runtimeDir: string,
+  protocolVersion: number
+): Promise<OrphanedDaemonCleanupResult> {
+  const socketPath = getDaemonSocketPath(runtimeDir, protocolVersion)
+  const tokenPath = getDaemonTokenPath(runtimeDir, protocolVersion)
+  const pidPath = getDaemonPidPath(runtimeDir, protocolVersion)
+
+  const alive = await probeSocket(socketPath)
+  if (!alive) {
+    if (protocolVersion >= CLEAN_DISCONNECT_PROTOCOL_VERSION) {
+      // Endpoint absence doesn't prove the PID record belongs to the current protocol; leave artifact cleanup to the owning daemon.
+      return { cleaned: false, killedCount: 0 }
+    }
+    try {
+      unlinkSync(pidPath)
+    } catch {
+      // Best-effort
+    }
+    return { cleaned: false, killedCount: 0 }
+  }
+
+  const client = new DaemonClient({ socketPath, tokenPath, protocolVersion })
+  let killedCount = 0
+  let didRequestShutdown = false
+  let didKillStaleDaemon = false
+  try {
+    await client.ensureConnected()
+    const sessions = await client
+      .request<ListSessionsResult>('listSessions', undefined)
+      .catch(() => ({ sessions: [] }))
+    killedCount = sessions.sessions.filter((s) => s.isAlive).length
+
+    // Use the single-shot `shutdown` RPC (kills all sessions then exits) to avoid racing per-session `kill` calls against the daemon exiting.
+    await client.request('shutdown', { killSessions: true }).catch(() => {
+      // Daemon exits immediately after the RPC, so the socket may close before the reply arrives; treat as success.
+    })
+    didRequestShutdown = true
+  } catch {
+    // Previous-protocol daemons may be wedged or too old for the RPC path; fall back to PID cleanup (only unlinks a live socket after proving the process is killed).
+    const killOutcome = await killStaleDaemon(runtimeDir, socketPath, tokenPath, protocolVersion)
+    didKillStaleDaemon = killOutcome.killed
+    if (killOutcome.liveOwnerSurvived) {
+      // Why: something still owns the endpoint. Returning as if it were cleaned lets restart
+      // fork a replacement that cannot publish onto the held name, leaving the user with no
+      // daemon instead of the one still running.
+      throw new DaemonEndpointOwnershipError(
+        'Daemon cleanup aborted: the existing daemon could not be confirmed stopped'
+      )
+    }
+  } finally {
+    client.disconnect()
+  }
+
+  if (didRequestShutdown && protocolVersion >= CLEAN_DISCONNECT_PROTOCOL_VERSION) {
+    if (!(await waitForDaemonEndpointExit(socketPath))) {
+      // Never fork a replacement while the old incarnation may still own the endpoint or be disposing terminal children.
+      throw new Error('Timed out waiting for daemon self-shutdown')
+    }
+    return { cleaned: true, killedCount }
+  }
+
+  try {
+    unlinkSync(pidPath)
+  } catch {
+    // Best-effort
+  }
+
+  return { cleaned: didRequestShutdown || didKillStaleDaemon, killedCount }
+}
+
+async function waitForDaemonEndpointExit(socketPath: string): Promise<boolean> {
+  const deadline = Date.now() + DAEMON_SELF_SHUTDOWN_WAIT_MS
+  while (Date.now() < deadline) {
+    if (!(await probeSocket(socketPath))) {
+      return true
+    }
+    await new Promise((resolve) => setTimeout(resolve, 50))
+  }
+  return !(await probeSocket(socketPath))
+}
diff --git a/src/main/daemon/daemon-provider-init.ts b/src/main/daemon/daemon-provider-init.ts
new file mode 100644
index 00000000000..1881e276e97
--- /dev/null
+++ b/src/main/daemon/daemon-provider-init.ts
@@ -0,0 +1,186 @@
+import { getLocalPtyProvider, rebindLocalProviderListeners } from '../ipc/pty'
+import {
+  confirmSeededClaudeLivePtys,
+  hasSeededUnconfirmedClaudePtys
+} from '../claude-accounts/live-pty-gate'
+import { isStartupDiagnosticsEnabled, logStartupDiagnostic } from '../startup/startup-diagnostics'
+import { checkDaemonHealth } from './daemon-health'
+import { collectPinnedDaemonVersions, pruneOldDaemonHosts } from './daemon-host-relocation'
+import {
+  cleanupFailedDaemonAdoption,
+  releaseDaemonAdoptionLease,
+  takeDaemonAdoptionLeaseRelease
+} from './daemon-endpoint-adoption'
+import { createLegacyDaemonAdapters } from './daemon-legacy-adapters'
+import {
+  getDaemonHistoryDir as getHistoryDir,
+  getDaemonRuntimeDir as getRuntimeDir,
+  resolvePackagedDarwinAppVersion
+} from './daemon-launch-paths'
+import {
+  attributeNextDaemonReplacement,
+  createOutOfProcessLauncher
+} from './daemon-out-of-process-launcher'
+import type { DaemonProvider } from './daemon-provider-routing'
+import { installDaemonProvider } from './daemon-provider-state'
+import { DegradedDaemonPtyProvider } from './degraded-daemon-pty-provider'
+import { trackDaemonRetired } from './daemon-lifecycle-event'
+import { DaemonPtyAdapter } from './daemon-pty-adapter'
+import type { DaemonRespawnReason } from './daemon-pty-runtime-state'
+import { DaemonPtyRouter } from './daemon-pty-router'
+import { isDaemonRestartInFlight } from './daemon-restart-state'
+import { DaemonSpawner, getDaemonPidPath } from './daemon-spawner'
+
+// Why: daemon init runs concurrent with window load, so an in-process t timestamp (not harness stderr timing) measures cold-start.
+function logDaemonMilestone(event: string, details: Record<string, unknown> = {}): void {
+  if (isStartupDiagnosticsEnabled()) {
+    logStartupDiagnostic(event, {
+      t: Math.round(performance.now()),
+      ...details
+    })
+  }
+}
+
+export async function initDaemonPtyProvider(
+  signal?: AbortSignal,
+  options: { macosLoginSessionWatch?: boolean } = {}
+): Promise<void> {
+  logDaemonMilestone('daemon-init-start')
+  // Why: e2e coverage for the startup PTY gate (#5232) needs a daemon init that deterministically outlasts the first-window timeout.
+  const e2eInitDelayMs = Number(process.env.ORCA_E2E_DAEMON_INIT_DELAY_MS)
+  if (Number.isFinite(e2eInitDelayMs) && e2eInitDelayMs > 0) {
+    await new Promise((resolve) => setTimeout(resolve, e2eInitDelayMs))
+  }
+  const runtimeDir = getRuntimeDir()
+
+  const newSpawner = new DaemonSpawner({
+    runtimeDir,
+    launcher: createOutOfProcessLauncher(runtimeDir, options.macosLoginSessionWatch ?? false)
+  })
+
+  // Why: assign the module-level spawner/adapter only after both succeed, so a failed ensureRunning() leaves no stale spawner.
+  const info = await newSpawner.ensureRunning()
+  // Why: reclaim superseded daemon-host copies on EVERY launch (spawns are rare), keeping current + live-daemon-pinned versions.
+  pruneOldDaemonHosts(collectPinnedDaemonVersions(runtimeDir))
+  const launchMode = newSpawner.getHandle()?.mode
+  logDaemonMilestone('daemon-current-ready')
+  if (signal?.aborted) {
+    // Why: fail-open may already have spawned fallback PTYs; don't install late, but retire an empty daemon (live sessions reject it and survive).
+    const abortedStartupAdapter = new DaemonPtyAdapter({
+      socketPath: info.socketPath,
+      tokenPath: info.tokenPath,
+      pidPath: getDaemonPidPath(runtimeDir),
+      profileScope: runtimeDir,
+      runtimeDir
+    })
+    releaseDaemonAdoptionLease(newSpawner.getHandle())
+    await abortedStartupAdapter.disconnectOnly()
+    return
+  }
+
+  const newAdapter = new DaemonPtyAdapter({
+    socketPath: info.socketPath,
+    tokenPath: info.tokenPath,
+    pidPath: getDaemonPidPath(runtimeDir),
+    profileScope: runtimeDir,
+    runtimeDir,
+    packagedAppVersion: resolvePackagedDarwinAppVersion(),
+    historyPath: getHistoryDir(),
+    // Why: on daemon death, ensureConnected() detects the dead socket and calls this to fork a replacement before retrying.
+    respawn: async (reason: DaemonRespawnReason) => {
+      // Why: attribute rather than emit — the launcher below is the one that completes the
+      // replacement, and emitting here would fire before the outcome is known.
+      // Caveat: a wedged-but-alive daemon (#8689) can still report died_respawn here and
+      // failed_health_check from the launcher — the app cannot tell wedged from dead at this point.
+      if (reason === 'daemon_died') {
+        console.warn('[daemon] Daemon process died — respawning')
+        // Why: a manual restart tears the daemon down under a still-live adapter, so a pane
+        // respawning on its synthetic exit would bill a user action to the crash bucket.
+        if (!isDaemonRestartInFlight()) {
+          trackDaemonRetired('died_respawn')
+        }
+      } else {
+        // Must reach the launcher below without an await in between; see the consume site.
+        attributeNextDaemonReplacement(reason)
+      }
+      newSpawner.resetHandle()
+      await newSpawner.ensureRunning()
+      return takeDaemonAdoptionLeaseRelease(newSpawner.getHandle())
+    }
+  })
+  let legacyAdapters: DaemonPtyAdapter[] = []
+  let routedAdapter: DaemonProvider = newAdapter
+  try {
+    // Why: the launcher's temporary pair closes only after this permanent pair is established, leaving no adoption gap.
+    await newAdapter.establishLifecycleLease()
+    releaseDaemonAdoptionLease(newSpawner.getHandle())
+
+    legacyAdapters = await createLegacyDaemonAdapters(runtimeDir)
+    routedAdapter =
+      launchMode === 'degraded-new-pty-fallback'
+        ? new DegradedDaemonPtyProvider({
+            current: newAdapter,
+            legacy: legacyAdapters,
+            fallback: getLocalPtyProvider(),
+            probeCurrentDaemonSpawn: async () =>
+              (await checkDaemonHealth(info.socketPath, info.tokenPath)) === 'healthy'
+          })
+        : legacyAdapters.length > 0
+          ? new DaemonPtyRouter({
+              current: newAdapter,
+              legacy: legacyAdapters
+            })
+          : newAdapter
+    if (routedAdapter instanceof DegradedDaemonPtyProvider) {
+      // Why: preserved daemon can't create fresh terminals; discover its live session ids so only they route to it (fresh panes fall back locally).
+      await routedAdapter.discoverDaemonSessions()
+    } else if (routedAdapter instanceof DaemonPtyRouter) {
+      await routedAdapter.discoverLegacySessions()
+    }
+    if (signal?.aborted) {
+      // Why: same late-swap guard after legacy discovery; release uninstalled adapter leases without killing live sessions.
+      await routedAdapter.disconnectOnly()
+      return
+    }
+  } catch (error) {
+    try {
+      await cleanupFailedDaemonAdoption(newSpawner, newAdapter, legacyAdapters)
+    } catch (cleanupError) {
+      throw new AggregateError([error, cleanupError], 'Daemon adoption and cleanup both failed')
+    }
+    throw error
+  }
+  installDaemonProvider(newSpawner, routedAdapter)
+  // Why: the first window may register PTY listeners before daemon init finishes; rebind so daemon PTYs still fan out events.
+  rebindLocalProviderListeners()
+  logDaemonMilestone('daemon-init-done', {
+    legacyAdapters: legacyAdapters.length
+  })
+  await reconcileSeededClaudeLivePtys(routedAdapter)
+}
+
+// Why: release gate ids only for daemon-confirmed-dead sessions; keep seeds on listing failure since releasing early can rotate a live CLI's refresh token.
+async function reconcileSeededClaudeLivePtys(provider: DaemonProvider): Promise<void> {
+  if (!hasSeededUnconfirmedClaudePtys()) {
+    return
+  }
+  try {
+    const adapters =
+      provider instanceof DaemonPtyRouter || provider instanceof DegradedDaemonPtyProvider
+        ? provider.getAllAdapters()
+        : [provider]
+    const results = await Promise.allSettled(adapters.map((entry) => entry.listSessions()))
+    if (results.some((result) => result.status === 'rejected')) {
+      console.warn('[daemon] Keeping seeded Claude live-PTY gate — session listing failed')
+      return
+    }
+    confirmSeededClaudeLivePtys(
+      results.flatMap((result) =>
+        result.status === 'fulfilled' ? result.value.map((session) => session.sessionId) : []
+      )
+    )
+  } catch (error) {
+    // Why: gate bookkeeping must never fail daemon init; stale seeds only defer a usage refresh until next restart.
+    console.warn('[daemon] Failed to reconcile seeded Claude live-PTY gate:', error)
+  }
+}
diff --git a/src/main/daemon/daemon-provider-restart.ts b/src/main/daemon/daemon-provider-restart.ts
new file mode 100644
index 00000000000..7cc2ffa7fd1
--- /dev/null
+++ b/src/main/daemon/daemon-provider-restart.ts
@@ -0,0 +1,161 @@
+import { rebindLocalProviderListeners, unbindLocalProviderListeners } from '../ipc/pty'
+import { DegradedDaemonPtyProvider } from './degraded-daemon-pty-provider'
+import {
+  cleanupFailedDaemonAdoption,
+  releaseDaemonAdoptionLease,
+  takeDaemonAdoptionLeaseRelease
+} from './daemon-endpoint-adoption'
+import {
+  getDaemonHistoryDir as getHistoryDir,
+  getDaemonRuntimeDir as getRuntimeDir,
+  resolvePackagedDarwinAppVersion
+} from './daemon-launch-paths'
+import { trackDaemonRetired } from './daemon-lifecycle-event'
+import { attributeNextDaemonReplacement } from './daemon-out-of-process-launcher'
+import {
+  disposeProviderSubscriptionsOnly,
+  getCurrentDaemonAdapter,
+  getLegacyDaemonAdapters,
+  type DaemonProvider
+} from './daemon-provider-routing'
+import { getDaemonProvider, getDaemonSpawner, replaceDaemonProvider } from './daemon-provider-state'
+import { DaemonPtyAdapter } from './daemon-pty-adapter'
+import type { DaemonRespawnReason } from './daemon-pty-runtime-state'
+import { DaemonPtyRouter } from './daemon-pty-router'
+import { cleanupDaemonForProtocol } from './daemon-protocol-cleanup'
+import {
+  isDaemonRestartInFlight,
+  runCoalescedDaemonRestart,
+  type RestartDaemonResult
+} from './daemon-restart-state'
+import { getDaemonPidPath, type DaemonSpawner } from './daemon-spawner'
+import { PROTOCOL_VERSION } from './types'
+
+export type { RestartDaemonResult } from './daemon-restart-state'
+
+// Why: the 7-step restart sequence from docs/daemon-staleness-ux.md §Phase 1; current-protocol only (legacy adapters preserved).
+export async function restartDaemon(): Promise<RestartDaemonResult> {
+  return runCoalescedDaemonRestart(runRestartDaemon)
+}
+
+async function runRestartDaemon(): Promise<RestartDaemonResult> {
+  const currentSpawner = getDaemonSpawner()
+  const currentAdapter = getDaemonProvider()
+  if (!currentSpawner || !currentAdapter) {
+    throw new Error('restartDaemon called before initDaemonPtyProvider')
+  }
+
+  const runtimeDir = getRuntimeDir()
+  // An operator asking for a restart is the deliberate "try again" that clears crash-loop
+  // containment; without this a wedged host could never be recovered from the UI.
+  currentSpawner.resetRespawnWindow()
+  const currentOnly = getCurrentDaemonAdapter(currentAdapter)
+  const legacyAdapters = getLegacyDaemonAdapters(currentAdapter)
+
+  // Step 1: synthesize pty:exit for every active session BEFORE teardown — the daemon's shutdown path never fans onExit to clients (session.ts:246-252), so the renderer would otherwise never see exits.
+  const fallbackKilledCount =
+    currentAdapter instanceof DegradedDaemonPtyProvider
+      ? await currentAdapter.shutdownFallbackSessions()
+      : 0
+  const currentDaemonSessionIds =
+    currentAdapter instanceof DegradedDaemonPtyProvider
+      ? currentAdapter.getCurrentDaemonSessionIds()
+      : []
+  const killedCount =
+    new Set([...currentOnly.getActiveSessionIds(), ...currentDaemonSessionIds]).size +
+    fallbackKilledCount
+  currentOnly.fanoutSyntheticExits(-1)
+  if (currentAdapter instanceof DegradedDaemonPtyProvider) {
+    currentAdapter.fanoutCurrentDaemonSyntheticExits(-1)
+  }
+
+  // Step 2: detach renderer listeners — after step 1 (so synthesized exits land) and before step 6 (no stale binding).
+  unbindLocalProviderListeners()
+
+  // Step 3: kill the current-protocol daemon process; legacy adapters untouched.
+  let info: Awaited<ReturnType<DaemonSpawner['ensureRunning']>>
+  try {
+    await cleanupDaemonForProtocol(runtimeDir, PROTOCOL_VERSION)
+
+    // Step 4: reuse the existing spawner so the respawn closure baked into long-lived adapters stays valid (do NOT new one).
+    currentSpawner.resetHandle()
+    info = await currentSpawner.ensureRunning()
+  } catch (error) {
+    // Why: old provider stays authoritative until the final swap; rebind since relaunch failed after teardown.
+    rebindLocalProviderListeners()
+    throw error
+  }
+
+  // Step 5: build a fresh current adapter against the respawned daemon.
+  const newCurrent = new DaemonPtyAdapter({
+    socketPath: info.socketPath,
+    tokenPath: info.tokenPath,
+    pidPath: getDaemonPidPath(runtimeDir),
+    profileScope: runtimeDir,
+    runtimeDir,
+    packagedAppVersion: resolvePackagedDarwinAppVersion(),
+    historyPath: getHistoryDir(),
+    respawn: async (reason: DaemonRespawnReason) => {
+      // Why: attribute rather than emit — the launcher below is the one that completes the
+      // replacement, and emitting here would fire before the outcome is known.
+      // Caveat: a wedged-but-alive daemon (#8689) can still report died_respawn here and
+      // failed_health_check from the launcher — the app cannot tell wedged from dead at this point.
+      if (reason === 'daemon_died') {
+        console.warn('[daemon] Daemon process died — respawning')
+        // Why: a manual restart tears the daemon down under a still-live adapter, so a pane
+        // respawning on its synthetic exit would bill a user action to the crash bucket.
+        if (!isDaemonRestartInFlight()) {
+          trackDaemonRetired('died_respawn')
+        }
+      } else {
+        // Must reach the launcher below without an await in between; see the consume site.
+        attributeNextDaemonReplacement(reason)
+      }
+      currentSpawner.resetHandle()
+      await currentSpawner.ensureRunning()
+      return takeDaemonAdoptionLeaseRelease(currentSpawner.getHandle())
+    }
+  })
+  let newProvider: DaemonProvider = newCurrent
+  try {
+    // Temporary launcher lease overlaps this permanent pair so a manual restart can't strand a newly spawned daemon during adoption.
+    await newCurrent.establishLifecycleLease()
+    releaseDaemonAdoptionLease(currentSpawner.getHandle())
+
+    // Re-wrap in a router only if legacy adapters exist; they're preserved by reference and still route to their pre-upgrade daemons.
+    newProvider =
+      legacyAdapters.length > 0
+        ? new DaemonPtyRouter({ current: newCurrent, legacy: legacyAdapters })
+        : newCurrent
+    if (newProvider instanceof DaemonPtyRouter) {
+      await newProvider.discoverLegacySessions()
+    }
+  } catch (error) {
+    let cleanupError: unknown
+    try {
+      if (newProvider instanceof DaemonPtyRouter) {
+        newProvider.disposeRouterOnly()
+      }
+      await cleanupFailedDaemonAdoption(currentSpawner, newCurrent)
+    } catch (caught) {
+      cleanupError = caught
+    }
+    // Previous provider stays module-authoritative until the swap; restore its renderer bindings when adoption fails.
+    rebindLocalProviderListeners()
+    if (cleanupError) {
+      throw new AggregateError([error, cleanupError], 'Daemon restart and cleanup both failed')
+    }
+    throw error
+  }
+
+  // Drain the old router's subscriptions via the router-only variant (plain dispose() would tear down the shared legacy adapters), after the new provider exists (no unhandled events) and before the swap (atomic for the renderer).
+  disposeProviderSubscriptionsOnly(currentAdapter)
+
+  // Step 6: swap module state (adapter + localProvider) atomically.
+  replaceDaemonProvider(newProvider)
+
+  // Step 7: rebind renderer listeners against the new provider.
+  rebindLocalProviderListeners()
+
+  return { killedCount }
+}
diff --git a/src/main/daemon/daemon-provider-routing.ts b/src/main/daemon/daemon-provider-routing.ts
new file mode 100644
index 00000000000..0198bf2893c
--- /dev/null
+++ b/src/main/daemon/daemon-provider-routing.ts
@@ -0,0 +1,29 @@
+import { DegradedDaemonPtyProvider } from './degraded-daemon-pty-provider'
+import type { DaemonPtyAdapter } from './daemon-pty-adapter'
+import { DaemonPtyRouter } from './daemon-pty-router'
+
+export type DaemonProvider = DaemonPtyRouter | DaemonPtyAdapter | DegradedDaemonPtyProvider
+
+export function getCurrentDaemonAdapter(provider: DaemonProvider): DaemonPtyAdapter {
+  if (provider instanceof DaemonPtyRouter || provider instanceof DegradedDaemonPtyProvider) {
+    return provider.getCurrentAdapter()
+  }
+  return provider
+}
+
+export function getLegacyDaemonAdapters(provider: DaemonProvider): DaemonPtyAdapter[] {
+  if (provider instanceof DaemonPtyRouter || provider instanceof DegradedDaemonPtyProvider) {
+    return [...provider.getLegacyAdapters()]
+  }
+  return []
+}
+
+export function disposeProviderSubscriptionsOnly(provider: DaemonProvider): void {
+  if (provider instanceof DaemonPtyRouter) {
+    provider.disposeRouterOnly()
+    return
+  }
+  if (provider instanceof DegradedDaemonPtyProvider) {
+    provider.disposeProviderOnly()
+  }
+}
diff --git a/src/main/daemon/daemon-provider-state.ts b/src/main/daemon/daemon-provider-state.ts
new file mode 100644
index 00000000000..412dda3af83
--- /dev/null
+++ b/src/main/daemon/daemon-provider-state.ts
@@ -0,0 +1,137 @@
+import { readFileSync } from 'node:fs'
+import { setLocalPtyProvider } from '../ipc/pty'
+import { DegradedDaemonPtyProvider } from './degraded-daemon-pty-provider'
+import { getDaemonRuntimeDir as getRuntimeDir } from './daemon-launch-paths'
+import { parseDaemonPidFile, type ParsedDaemonPid } from './daemon-pid-file-parse'
+import type { DaemonProvider } from './daemon-provider-routing'
+import { DaemonPtyRouter } from './daemon-pty-router'
+import { getDaemonPidPath, getDaemonSocketPath, getDaemonTokenPath } from './daemon-spawner'
+import type { DaemonSpawner } from './daemon-spawner'
+import {
+  getMacDaemonTccAttributionHealth,
+  type MacDaemonTccAttributionHealth
+} from './daemon-tcc-attribution'
+import { PROTOCOL_VERSION } from './types'
+
+let spawner: DaemonSpawner | null = null
+let adapter: DaemonProvider | null = null
+
+export function installDaemonProvider(newSpawner: DaemonSpawner, newAdapter: DaemonProvider): void {
+  spawner = newSpawner
+  replaceDaemonProvider(newAdapter)
+}
+
+export function getDaemonSpawner(): DaemonSpawner | null {
+  return spawner
+}
+
+// Why: a narrow getter (not a raw export) keeps the "swap on restart" invariant in one place (replaceDaemonProvider).
+/**
+ * Whether the installed provider is a daemon that will own FRESH terminals too.
+ *
+ * Why not `getDaemonProvider() !== null`: DegradedDaemonPtyProvider routes the daemon's
+ * EXISTING sessions to the daemon but spawns new ones on the in-process local provider, so
+ * those die with this process. A host that answered "I can recover persistent local PTYs"
+ * from that state would be advertising recovery for terminals that cannot be recovered.
+ */
+export function daemonOwnsFreshPersistentPtys(): boolean {
+  return adapter !== null && !(adapter instanceof DegradedDaemonPtyProvider)
+}
+
+/** Endpoint coordinates of the daemon this process installed, for out-of-band health probes. */
+export type DaemonEndpointFacts = {
+  runtimeDir: string
+  socketPath: string
+  tokenPath: string
+  pidPath: string
+  protocolVersion: number
+}
+
+export function getDaemonEndpointFacts(): DaemonEndpointFacts | null {
+  if (!adapter) {
+    return null
+  }
+  const runtimeDir = getRuntimeDir()
+  return {
+    runtimeDir,
+    socketPath: getDaemonSocketPath(runtimeDir),
+    tokenPath: getDaemonTokenPath(runtimeDir),
+    pidPath: getDaemonPidPath(runtimeDir),
+    protocolVersion: PROTOCOL_VERSION
+  }
+}
+
+/**
+ * What the live daemon's own PID record says about the build it was forked from.
+ *
+ * Why the record and not this process's version: the daemon deliberately outlives the
+ * runtime, so after an update the two can legitimately disagree — and a health surface that
+ * reported orcad's version for both would hide exactly that.
+ */
+export function readDaemonPidRecord(): ParsedDaemonPid | null {
+  const facts = getDaemonEndpointFacts()
+  if (!facts) {
+    return null
+  }
+  try {
+    return parseDaemonPidFile(readFileSync(facts.pidPath, 'utf8'))
+  } catch {
+    return null
+  }
+}
+
+export function getDaemonProvider(): DaemonProvider | null {
+  return adapter
+}
+
+// Why: computed from the pid record on demand (not cached at adoption) so the Settings
+// remedy surface always reflects the daemon actually serving terminals right now.
+export async function getCurrentDaemonMacTccAttributionHealth(): Promise<MacDaemonTccAttributionHealth> {
+  const runtimeDir = getRuntimeDir()
+  return getMacDaemonTccAttributionHealth(
+    runtimeDir,
+    getDaemonSocketPath(runtimeDir),
+    getDaemonTokenPath(runtimeDir)
+  )
+}
+
+/** Returns null unless every daemon generation supplied an authoritative inventory. */
+export async function listLiveDaemonPtyIds(): Promise<string[] | null> {
+  if (!adapter) {
+    return null
+  }
+  const adapters =
+    adapter instanceof DaemonPtyRouter || adapter instanceof DegradedDaemonPtyProvider
+      ? adapter.getAllAdapters()
+      : [adapter]
+  const inventories = await Promise.allSettled(
+    adapters.map((daemonAdapter) => daemonAdapter.listProcesses())
+  )
+  if (inventories.some((inventory) => inventory.status === 'rejected')) {
+    return null
+  }
+  return inventories.flatMap((inventory) =>
+    inventory.status === 'fulfilled' ? inventory.value.map((process) => process.id) : []
+  )
+}
+
+// Why: keep the module-level adapter and ipc/pty.ts's localProvider in sync so app-quit can't dispose a stale reference.
+export function replaceDaemonProvider(newAdapter: DaemonProvider): void {
+  adapter = newAdapter
+  setLocalPtyProvider(newAdapter)
+}
+
+// Disconnect without killing: the daemon survives app quit so sessions stay warm for reattach.
+// Leave history sessions marked "unclean" so a daemon crash while Orca is closed stays recoverable.
+export async function disconnectDaemon(): Promise<void> {
+  await adapter?.disconnectOnly()
+  adapter = null
+}
+
+/** Kill the daemon and all its sessions. Use for full cleanup only. */
+export async function shutdownDaemon(): Promise<void> {
+  adapter?.dispose()
+  adapter = null
+  await spawner?.shutdown()
+  spawner = null
+}
diff --git a/src/main/daemon/daemon-replacement-preflight.ts b/src/main/daemon/daemon-replacement-preflight.ts
new file mode 100644
index 00000000000..b6f9d7d395c
--- /dev/null
+++ b/src/main/daemon/daemon-replacement-preflight.ts
@@ -0,0 +1,228 @@
+import { getAppEnvironment } from '../../shared/app-environment'
+import type { DaemonReplaceReason } from '../../shared/daemon-lifecycle-telemetry'
+import { isDaemonStaleForCurrentBundle } from './daemon-bundle-staleness'
+import { DaemonEndpointOwnershipError } from './daemon-endpoint-adoption'
+import { checkDaemonHealth, getMacDaemonSystemResolverHealth } from './daemon-health'
+import { getAliveDaemonSessionCount, probeDaemonSocket as probeSocket } from './daemon-launch-paths'
+import { trackDaemonReplaced } from './daemon-lifecycle-event'
+import { getDaemonLaunchIdentity } from './daemon-pid-identity'
+import { cleanupDaemonForProtocol } from './daemon-protocol-cleanup'
+import type { DaemonProcessHandle } from './daemon-spawner'
+import { killStaleDaemon } from './daemon-stale-kill'
+import { getMacDaemonTccAttributionHealth } from './daemon-tcc-attribution'
+import { PROTOCOL_VERSION } from './types'
+
+// Why: extra hello+listSessions probes (~5s each) giving a wedged-but-connectable daemon ~60s grace to answer and keep its live sessions before a permanent wedge (#8689) is replaced; raise only alongside the fail-open cap.
+export const WEDGED_DAEMON_GRACE_RETRIES = 11
+
+type PreserveDaemon = (mode?: 'degraded-new-pty-fallback') => Promise<DaemonProcessHandle>
+
+type ReplacementPreflightOptions = {
+  runtimeDir: string
+  socketPath: string
+  tokenPath: string
+  entryPath: string
+  attributedReason: DaemonReplaceReason | null
+  releaseAdoptionClient: () => void
+  preserveDaemon: PreserveDaemon
+}
+
+export async function prepareDaemonReplacement(
+  options: ReplacementPreflightOptions
+): Promise<DaemonProcessHandle | null> {
+  const {
+    runtimeDir,
+    socketPath,
+    tokenPath,
+    entryPath,
+    attributedReason,
+    releaseAdoptionClient,
+    preserveDaemon
+  } = options
+  let pendingReplacement:
+    | {
+        reason: Parameters<typeof trackDaemonReplaced>[0]
+        liveSessionCount: number | null
+      }
+    | undefined
+  let confirmedReplacement = false
+  const health = await checkDaemonHealth(socketPath, tokenPath)
+  if (health === 'healthy') {
+    const resolverHealth = await getMacDaemonSystemResolverHealth(socketPath, tokenPath)
+    if (resolverHealth === 'unhealthy') {
+      const liveSessionCount = await getAliveDaemonSessionCount(socketPath, tokenPath)
+      if (liveSessionCount !== 0) {
+        console.warn(
+          liveSessionCount === null
+            ? '[daemon] Preserving daemon with unavailable macOS system resolver because live session state could not be verified'
+            : `[daemon] Preserving daemon with unavailable macOS system resolver because it owns ${liveSessionCount} live session${liveSessionCount === 1 ? '' : 's'}`
+        )
+        return preserveDaemon()
+      }
+      console.warn('[daemon] Replacing daemon with unavailable macOS system resolver')
+      pendingReplacement = {
+        reason: 'unhealthy_resolver',
+        liveSessionCount
+      }
+      confirmedReplacement = (await cleanupDaemonForProtocol(runtimeDir, PROTOCOL_VERSION)).cleaned
+    } else {
+      // Why: a protocol-healthy daemon can outlive its launching app bundle (dev worktree rebuild, or packaged update replacing the app path).
+      const identity = await getDaemonLaunchIdentity(runtimeDir, socketPath, tokenPath, entryPath)
+      const stalePackagedBundle =
+        getAppEnvironment().isPackaged() &&
+        (await isDaemonStaleForCurrentBundle(
+          runtimeDir,
+          socketPath,
+          tokenPath,
+          getAppEnvironment().getVersion()
+        ))
+      if (identity === 'mismatch' || stalePackagedBundle) {
+        // Why: replacing a healthy daemon kills its child PTYs; defer code freshness until no live sessions would be lost.
+        const replacementLabel = stalePackagedBundle
+          ? 'launched before the current app bundle was installed'
+          : 'launched from a different app path'
+        if (await shouldPreserveDaemonWithLiveSessions(socketPath, tokenPath, replacementLabel)) {
+          return preserveDaemon()
+        }
+        console.warn(
+          stalePackagedBundle
+            ? '[daemon] Replacing daemon launched before the current app bundle was installed'
+            : '[daemon] Replacing daemon launched from a different app path'
+        )
+        // liveSessionCount is 0: shouldPreserveDaemonWithLiveSessions() only falls through at exactly 0.
+        pendingReplacement = {
+          reason: stalePackagedBundle ? 'stale_bundle' : 'different_app_path',
+          liveSessionCount: 0
+        }
+        confirmedReplacement = (await cleanupDaemonForProtocol(runtimeDir, PROTOCOL_VERSION))
+          .cleaned
+      } else {
+        const attributionHealth = await getMacDaemonTccAttributionHealth(
+          runtimeDir,
+          socketPath,
+          tokenPath
+        )
+        if (attributionHealth === 'severed') {
+          // Why: replacing with live sessions would kill them; Settings → Developer
+          // Permissions surfaces the Manage Sessions → Restart remedy instead.
+          const liveSessionCount = await getAliveDaemonSessionCount(socketPath, tokenPath)
+          if (liveSessionCount === 0) {
+            console.warn(
+              '[daemon] Replacing daemon whose macOS TCC attribution is severed (spawning app binary no longer exists)'
+            )
+            pendingReplacement = { reason: 'severed_tcc_attribution', liveSessionCount }
+            confirmedReplacement = (await cleanupDaemonForProtocol(runtimeDir, PROTOCOL_VERSION))
+              .cleaned
+          } else {
+            return preserveDaemon()
+          }
+        } else {
+          // Why: healthy daemon from a previous session answered a protocol ping — safe to reuse.
+          return preserveDaemon()
+        }
+      }
+    }
+  } else {
+    // Why: a busy machine can time out the health check on a live daemon; re-verify with a session list before killing its sessions.
+    let liveSessionCount = await getAliveDaemonSessionCount(socketPath, tokenPath)
+    // Why: a wedged-but-connectable daemon (Windows update relaunch) may still own live sessions, so grace-retry before replacing; a permanent wedge (#8689) exhausts the grace, and 'rejected' skips it (handshake refused = never adoptable).
+    let graceRetry = 0
+    while (
+      liveSessionCount === null &&
+      health !== 'rejected' &&
+      graceRetry < WEDGED_DAEMON_GRACE_RETRIES &&
+      (await probeSocket(socketPath))
+    ) {
+      liveSessionCount = await getAliveDaemonSessionCount(socketPath, tokenPath)
+      graceRetry++
+    }
+    if (liveSessionCount !== null && liveSessionCount > 0) {
+      if (health === 'pty-spawn-unhealthy') {
+        console.warn(
+          `[daemon] DEGRADED MODE: preserving daemon that failed the PTY spawn health check because it owns ${liveSessionCount} live session${liveSessionCount === 1 ? '' : 's'}. Existing sessions keep working; fresh terminals run on the local provider WITHOUT daemon persistence until you restart the daemon (Manage Sessions → Restart).`
+        )
+        return preserveDaemon('degraded-new-pty-fallback')
+      }
+      console.warn(
+        `[daemon] Preserving daemon that failed the health check because it owns ${liveSessionCount} live session${liveSessionCount === 1 ? '' : 's'}`
+      )
+      return preserveDaemon()
+    }
+    // Why: the sibling replace branches announce themselves, but this one used
+    // to kill a daemon silently — leaving no way to tell a replacement apart
+    // from an adoption after the fact. A cold start also lands here with
+    // nothing to replace, so only speak up once something actually answered:
+    // a probe that returned a count, a socket that survived a grace retry, or
+    // a refused hello.
+    if (liveSessionCount !== null || graceRetry > 0 || health === 'rejected') {
+      console.warn(
+        `[daemon] Replacing daemon that failed the health check (health=${health}, liveSessions=${liveSessionCount ?? 'unverifiable'}, graceRetries=${graceRetry})`
+      )
+    }
+    // Why: unlike the log above, telemetry gates on confirmedReplacement below — the
+    // post-kill truth — so a cold start that killed nothing never reports a replacement.
+    pendingReplacement = {
+      reason: 'failed_health_check',
+      liveSessionCount
+    }
+  }
+
+  // Why: a raw socket can outlive a broken daemon; kill by PID before respawn so the new daemon doesn't race the stale one.
+  releaseAdoptionClient()
+  const killOutcome = await killStaleDaemon(runtimeDir, socketPath, tokenPath)
+  if (killOutcome.liveOwnerSurvived) {
+    // Why: forking beside a daemon we could not prove dead is precisely how the endpoint
+    // owner and the session host diverge. But refusing outright would leave the user with
+    // no daemon at all, and we have just proved something still answers the endpoint —
+    // so adopt it in degraded mode: existing sessions keep working, new PTYs run locally.
+    console.warn(
+      '[daemon] DEGRADED MODE: adopting a daemon that could not be confirmed stopped. Existing sessions keep working; fresh terminals run on the local provider WITHOUT daemon persistence until you restart the daemon (Manage Sessions → Restart).'
+    )
+    try {
+      return await preserveDaemon('degraded-new-pty-fallback')
+    } catch {
+      // It died between the probe and the adoption; the endpoint is genuinely free now.
+      throw new DaemonEndpointOwnershipError(
+        'Daemon replacement aborted: the existing daemon could not be confirmed stopped'
+      )
+    }
+  }
+  confirmedReplacement = killOutcome.killed || confirmedReplacement
+  // Why: rank by how well each reason is evidenced. A confirmed kill whose reason positively
+  // identified the daemon outranks the attribution, so a stale bundle caught here is not billed
+  // to the resolver. failed_health_check is the residual "couldn't tell" bucket though — it also
+  // absorbs wedges and crashes — so the adapter's attribution beats it. That case is not exotic:
+  // the same dead login session that fails the resolver also fails the PTY spawn probe, and with
+  // zero live sessions that lands here rather than in the degraded preserve above.
+  const identifiedReplacement =
+    pendingReplacement &&
+    confirmedReplacement &&
+    pendingReplacement.reason !== 'failed_health_check'
+      ? pendingReplacement
+      : null
+  if (identifiedReplacement) {
+    trackDaemonReplaced(identifiedReplacement.reason, identifiedReplacement.liveSessionCount)
+  } else if (attributedReason) {
+    trackDaemonReplaced(attributedReason, 0)
+  } else if (pendingReplacement && confirmedReplacement) {
+    trackDaemonReplaced(pendingReplacement.reason, pendingReplacement.liveSessionCount)
+  }
+  return null
+}
+
+async function shouldPreserveDaemonWithLiveSessions(
+  socketPath: string,
+  tokenPath: string,
+  replacementLabel: string
+): Promise<boolean> {
+  const liveSessionCount = await getAliveDaemonSessionCount(socketPath, tokenPath)
+  if (liveSessionCount === 0) {
+    return false
+  }
+  console.warn(
+    liveSessionCount === null
+      ? `[daemon] Preserving daemon ${replacementLabel} because live session state could not be verified`
+      : `[daemon] Preserving daemon ${replacementLabel} because it owns ${liveSessionCount} live session${liveSessionCount === 1 ? '' : 's'}`
+  )
+  return true
+}
diff --git a/src/main/daemon/daemon-restart-state.ts b/src/main/daemon/daemon-restart-state.ts
new file mode 100644
index 00000000000..e37fad69709
--- /dev/null
+++ b/src/main/daemon/daemon-restart-state.ts
@@ -0,0 +1,22 @@
+export type RestartDaemonResult = {
+  killedCount: number
+}
+
+// Why: coalesce concurrent restartDaemon() calls so two entries can't race the 7-step sequence against a half-spawned replacement.
+let restartInFlight: Promise<RestartDaemonResult> | null = null
+
+export function isDaemonRestartInFlight(): boolean {
+  return restartInFlight !== null
+}
+
+export function runCoalescedDaemonRestart(
+  run: () => Promise<RestartDaemonResult>
+): Promise<RestartDaemonResult> {
+  if (restartInFlight) {
+    return restartInFlight
+  }
+  restartInFlight = run().finally(() => {
+    restartInFlight = null
+  })
+  return restartInFlight
+}
diff --git a/src/main/emulator/emulator-start-lease-registry.test.ts b/src/main/emulator/emulator-start-lease-registry.test.ts
index f0b0e927569..e08490932c6 100644
--- a/src/main/emulator/emulator-start-lease-registry.test.ts
+++ b/src/main/emulator/emulator-start-lease-registry.test.ts
@@ -13,15 +13,13 @@ function makeBackend(): {
   const resolveDeviceId = vi.fn(async () => {
     throw new Error('shutdown AVD cannot resolve before boot')
   })
-  const startSession = vi.fn(
-    async (): Promise<EmulatorSessionInfo> => ({
-      deviceUdid: 'emulator-5554',
-      streamUrl: 'scrcpy://emulator-5554',
-      wsUrl: '',
-      streamCodec: 'h264',
-      backend: 'android'
-    })
-  )
+  const startSession = vi.fn(async (): Promise<EmulatorSessionInfo> => ({
+    deviceUdid: 'emulator-5554',
+    streamUrl: 'scrcpy://emulator-5554',
+    wsUrl: '',
+    streamCodec: 'h264',
+    backend: 'android'
+  }))
   const stopHelperForDevice = vi.fn(async () => {})
   const shutdownDevice = vi.fn(async () => {})
   const backend: EmulatorBackend = {
diff --git a/src/main/git/repo-base-ref-search.ts b/src/main/git/repo-base-ref-search.ts
index 5ea01a7ec1c..213868fe5a7 100644
--- a/src/main/git/repo-base-ref-search.ts
+++ b/src/main/git/repo-base-ref-search.ts
@@ -218,6 +218,21 @@ export function parseAndFilterSearchRefDetails(
     .slice(0, Math.max(0, limit))
 }
 
+export function resolveConfiguredRemoteBranchName(
+  fullRef: string,
+  longestFirstRemoteNames: readonly string[]
+): string | null {
+  const remoteRefPrefix = 'refs/remotes/'
+  if (!fullRef.startsWith(remoteRefPrefix)) {
+    return null
+  }
+  const remoteAndBranch = fullRef.slice(remoteRefPrefix.length)
+  const remote = longestFirstRemoteNames.find((candidate) =>
+    remoteAndBranch.startsWith(`${candidate}/`)
+  )
+  return remote ? remoteAndBranch.slice(remote.length + 1) || null : null
+}
+
 export function resolveLocalBranchName(
   fullRef: string,
   shortRef: string,
@@ -227,11 +242,11 @@ export function resolveLocalBranchName(
   if (!fullRef.startsWith(remoteRefPrefix)) {
     return shortRef
   }
-  const remoteAndBranch = fullRef.slice(remoteRefPrefix.length)
-  const remote = remotes.find((candidate) => remoteAndBranch.startsWith(`${candidate}/`))
-  if (remote) {
-    return remoteAndBranch.slice(remote.length + 1)
+  const configuredBranch = resolveConfiguredRemoteBranchName(fullRef, remotes)
+  if (configuredBranch) {
+    return configuredBranch
   }
+  const remoteAndBranch = fullRef.slice(remoteRefPrefix.length)
   return remoteAndBranch.split('/').slice(1).join('/') || shortRef
 }
 
diff --git a/src/main/git/repo-branch-conflict.ts b/src/main/git/repo-branch-conflict.ts
index dbadf254d11..fcb6d8dc101 100644
--- a/src/main/git/repo-branch-conflict.ts
+++ b/src/main/git/repo-branch-conflict.ts
@@ -1,45 +1,50 @@
-import { listRemoteNames, resolveLocalBranchName } from './repo-base-ref-search'
-import { gitExecOptions, type LocalGitExecOptions } from './repo-default-base-ref'
+import { resolveConfiguredRemoteBranchName } from './repo-base-ref-search'
+import { gitExecOptions, type GitExec, type LocalGitExecOptions } from './repo-default-base-ref'
 import { gitExecFileAsync } from './runner'
 
 export type BranchConflictKind = 'local' | 'remote'
 
-async function hasGitRefAsync(
-  path: string,
-  ref: string,
-  options: LocalGitExecOptions = {}
-): Promise<boolean> {
+async function hasGitRefAsync(exec: GitExec, ref: string): Promise<boolean> {
   try {
-    await gitExecFileAsync(['rev-parse', '--verify', ref], gitExecOptions(path, options))
-    return true
+    const { stdout } = await exec(['rev-parse', '--verify', ref])
+    return stdout.trim().length > 0
   } catch {
     return false
   }
 }
 
-export async function getBranchConflictKind(
-  path: string,
+async function listRemoteNamesViaExec(exec: GitExec): Promise<string[]> {
+  try {
+    const { stdout } = await exec(['remote'])
+    return stdout
+      .split(/\r?\n/)
+      .map((line) => line.trim())
+      .filter(Boolean)
+      .sort((a, b) => b.length - a.length)
+  } catch {
+    return []
+  }
+}
+
+/** Run branch-conflict policy through the host that owns Git execution. */
+export async function getBranchConflictKindViaExec(
+  exec: GitExec,
   branchName: string,
-  allowedBaseRef?: string,
-  options: LocalGitExecOptions = {}
+  allowedBaseRef?: string
 ): Promise<BranchConflictKind | null> {
-  if (await hasGitRefAsync(path, `refs/heads/${branchName}`, options)) {
+  if (await hasGitRefAsync(exec, `refs/heads/${branchName}`)) {
     return 'local'
   }
 
   try {
-    const remoteNames = (await listRemoteNames(path, options)).sort((a, b) => b.length - a.length)
-    const { stdout } = await gitExecFileAsync(
-      ['for-each-ref', '--format=%(refname)', 'refs/remotes'],
-      gitExecOptions(path, options)
-    )
-    const hasRemoteConflict = stdout.split('\n').some((ref) => {
+    const remoteNames = await listRemoteNamesViaExec(exec)
+    const { stdout } = await exec(['for-each-ref', '--format=%(refname)', 'refs/remotes'])
+    const hasRemoteConflict = stdout.split(/\r?\n/).some((ref) => {
       const trimmed = ref.trim()
       if (isAllowedRemoteBaseRef(trimmed, allowedBaseRef)) {
         return false
       }
-      const shortRef = trimmed.replace(/^refs\/remotes\//, '')
-      return resolveLocalBranchName(trimmed, shortRef, remoteNames) === branchName
+      return resolveConfiguredRemoteBranchName(trimmed, remoteNames) === branchName
     })
 
     return hasRemoteConflict ? 'remote' : null
@@ -48,6 +53,20 @@ export async function getBranchConflictKind(
   }
 }
 
+export function getBranchConflictKind(
+  path: string,
+  branchName: string,
+  allowedBaseRef?: string,
+  options: LocalGitExecOptions = {}
+): Promise<BranchConflictKind | null> {
+  const execOptions = gitExecOptions(path, options)
+  return getBranchConflictKindViaExec(
+    (argv) => gitExecFileAsync(argv, execOptions),
+    branchName,
+    allowedBaseRef
+  )
+}
+
 function isAllowedRemoteBaseRef(refName: string, allowedBaseRef: string | undefined): boolean {
   if (!allowedBaseRef) {
     return false
diff --git a/src/main/git/repo.test.ts b/src/main/git/repo.test.ts
index 90199d1c69b..7500735d72f 100644
--- a/src/main/git/repo.test.ts
+++ b/src/main/git/repo.test.ts
@@ -215,6 +215,7 @@ describe('searchBaseRefs (widened glob)', () => {
 
   it('allows creating a local branch from the selected matching remote base ref', async () => {
     const sha = getHeadSha(tmpDir)
+    git(tmpDir, ['remote', 'add', 'origin', 'https://example.invalid/repo.git'])
     createRemoteRef(tmpDir, 'origin/feature/something', sha)
 
     const result = await getBranchConflictKind(
@@ -228,6 +229,10 @@ describe('searchBaseRefs (widened glob)', () => {
 
   it('still reports a remote conflict for a different tracking ref with the same branch name', async () => {
     const sha = getHeadSha(tmpDir)
+    // Why register both: a ref only tracks a branch when a remote actually owns its
+    // prefix, and this case is about a second *tracking* ref, not an orphan.
+    git(tmpDir, ['remote', 'add', 'origin', 'https://example.invalid/repo.git'])
+    git(tmpDir, ['remote', 'add', 'upstream', 'https://example.invalid/upstream.git'])
     createRemoteRef(tmpDir, 'origin/feature/something', sha)
     createRemoteRef(tmpDir, 'upstream/feature/something', sha)
 
@@ -236,6 +241,38 @@ describe('searchBaseRefs (widened glob)', () => {
     ).toBe('remote')
   })
 
+  it('ignores a ref whose prefix matches no configured remote', async () => {
+    const sha = getHeadSha(tmpDir)
+    git(tmpDir, ['remote', 'add', 'origin', 'https://example.invalid/repo.git'])
+    createRemoteRef(tmpDir, 'mimic-fork/my-task', sha)
+
+    expect(await getBranchConflictKind(tmpDir, 'my-task', 'origin/main')).toBeNull()
+  })
+
+  it('stops treating leftover refs from a removed remote as conflicts', async () => {
+    const sha = getHeadSha(tmpDir)
+    git(tmpDir, ['remote', 'add', 'origin', 'https://example.invalid/repo.git'])
+    git(tmpDir, ['remote', 'add', 'fork', 'https://example.invalid/fork.git'])
+    createRemoteRef(tmpDir, 'fork/my-task', sha)
+    expect(await getBranchConflictKind(tmpDir, 'my-task', 'origin/main')).toBe('remote')
+
+    // Why not `remote remove`: that prunes the tracking refs too, which would pass
+    // with or without the ownership guard. Dropping only the config leaves the
+    // orphan ref behind, which is the state this guard exists for.
+    git(tmpDir, ['config', '--remove-section', 'remote.fork'])
+
+    expect(await getBranchConflictKind(tmpDir, 'my-task', 'origin/main')).toBeNull()
+  })
+
+  it('still reports a local conflict when an unrelated ref shares the name', async () => {
+    const sha = getHeadSha(tmpDir)
+    git(tmpDir, ['remote', 'add', 'origin', 'https://example.invalid/repo.git'])
+    createRemoteRef(tmpDir, 'mimic-fork/my-task', sha)
+    git(tmpDir, ['branch', 'my-task'])
+
+    expect(await getBranchConflictKind(tmpDir, 'my-task', 'origin/main')).toBe('local')
+  })
+
   it('reports remote conflicts when the remote name contains a slash', async () => {
     const sha = getHeadSha(tmpDir)
     git(tmpDir, ['remote', 'add', 'foo/bar', 'https://example.invalid/repo.git'])
diff --git a/src/main/git/worktree-add.ts b/src/main/git/worktree-add.ts
new file mode 100644
index 00000000000..4110a4bda0b
--- /dev/null
+++ b/src/main/git/worktree-add.ts
@@ -0,0 +1,193 @@
+import { resolveWorktreeAddBaseRef } from '../../shared/worktree/base-ref'
+import type {
+  LocalBaseRefRefreshResult,
+  LocalBaseRefUpdateSuggestion
+} from '../../shared/worktree/base-ref-drift-types'
+import { windowsLongPathGitArgs } from '../../shared/windows-long-path-git-args'
+import { gitExecFileAsync } from './runner'
+import { runWithGitReadCacheInvalidation } from './status'
+import {
+  getLocalBaseRefUpdateSuggestionForWorktreeCreate,
+  refreshLocalBaseRefForWorktreeCreate
+} from './worktree-base-refresh'
+import { hasWorktreeBaseCommitRef } from './worktree-base-ref-probe'
+import type {
+  AddWorktreeOptions,
+  AddWorktreeResult,
+  GitWorktreeExecOptions
+} from './worktree-operation-options'
+import { gitExecOptions, resolveWorktreeAddTimeoutMs } from './worktree-operation-options'
+import { bumpWorktreeScanGeneration } from './worktree-scan-cache'
+
+async function persistWorktreeCreationBase(
+  worktreePath: string,
+  branch: string,
+  effectiveBase: string,
+  options: GitWorktreeExecOptions = {}
+): Promise<void> {
+  const configKey = `branch.${branch}.base`
+  try {
+    await gitExecFileAsync(['config', '--local', '--replace-all', configKey, effectiveBase], {
+      ...gitExecOptions(worktreePath, options)
+    })
+  } catch (error) {
+    console.warn(`addWorktree: failed to set ${configKey} for ${worktreePath}`, error)
+    try {
+      // Why: reused branch names may carry stale base metadata; if replacement fails, unset it so consumers don't trust stale lineage.
+      await gitExecFileAsync(['config', '--local', '--unset-all', configKey], {
+        ...gitExecOptions(worktreePath, options)
+      })
+    } catch (unsetError) {
+      console.warn(
+        `addWorktree: failed to unset stale ${configKey} for ${worktreePath}`,
+        unsetError
+      )
+    }
+  }
+}
+
+export async function unsetWorktreeCreationBase(
+  worktreePath: string,
+  branch: string,
+  options: GitWorktreeExecOptions = {}
+): Promise<void> {
+  try {
+    await gitExecFileAsync(['config', '--local', '--unset-all', `branch.${branch}.base`], {
+      ...gitExecOptions(worktreePath, options)
+    })
+  } catch {
+    // Best-effort cleanup; leave the original sparse-setup error as the actionable failure.
+  }
+}
+
+/**
+ * Create a new worktree.
+ * @param repoPath - Path to the main repo (or bare repo)
+ * @param worktreePath - Absolute path where the worktree will be created
+ * @param branch - Branch name for the new worktree
+ * @param baseBranch - Optional base branch to create from (defaults to HEAD)
+ * @remarks Side effects (best-effort, warn-only): passes `--no-track`, writes
+ * `branch.<branch>.base` for new-branch worktrees with a base ref, and may
+ * write `push.autoSetupRemote=true` to the repo's shared config.
+ */
+export async function addWorktree(
+  repoPath: string,
+  worktreePath: string,
+  branch: string,
+  baseBranch?: string,
+  refreshLocalBaseRef = false,
+  noCheckout = false,
+  options: AddWorktreeOptions = {}
+): Promise<AddWorktreeResult> {
+  try {
+    return await runWithGitReadCacheInvalidation(() =>
+      performAddWorktree(
+        repoPath,
+        worktreePath,
+        branch,
+        baseBranch,
+        refreshLocalBaseRef,
+        noCheckout,
+        options
+      )
+    )
+  } finally {
+    bumpWorktreeScanGeneration(repoPath)
+  }
+}
+
+async function performAddWorktree(
+  repoPath: string,
+  worktreePath: string,
+  branch: string,
+  baseBranch?: string,
+  refreshLocalBaseRef = false,
+  noCheckout = false,
+  options: AddWorktreeOptions = {}
+): Promise<AddWorktreeResult> {
+  let localBaseRefRefresh: LocalBaseRefRefreshResult | undefined
+  let localBaseRefUpdateSuggestion: LocalBaseRefUpdateSuggestion | undefined
+  // Why: enable long paths for this Windows checkout without changing user Git config.
+  const args = [...windowsLongPathGitArgs(repoPath), 'worktree', 'add']
+  let effectiveBase: string | undefined
+  if (noCheckout) {
+    args.push('--no-checkout')
+  }
+  if (options.checkoutExistingBranch) {
+    // Why: -b would create a new branch instead of checking out the selected one.
+    args.push(worktreePath, branch)
+  } else {
+    // Why: --no-track avoids inheriting the base's upstream so `git status` won't misreport "behind by N" pre-publish; first push sets it (see push.autoSetupRemote below).
+    args.push('--no-track', '-b', branch, worktreePath)
+    if (baseBranch) {
+      effectiveBase = await resolveWorktreeAddBaseRef(baseBranch, (qualifiedRef) =>
+        hasWorktreeBaseCommitRef(repoPath, qualifiedRef, options)
+      )
+      // Why: resolve the creation base first to distinguish remote-tracking refs from slash-containing local branches (mutation gated behind the explicit setting).
+      if (refreshLocalBaseRef) {
+        localBaseRefRefresh = await refreshLocalBaseRefForWorktreeCreate(
+          repoPath,
+          baseBranch,
+          effectiveBase,
+          options.remoteTrackingBase,
+          options
+        )
+      } else if (options.suggestLocalBaseRefUpdate) {
+        localBaseRefUpdateSuggestion = await getLocalBaseRefUpdateSuggestionForWorktreeCreate(
+          repoPath,
+          baseBranch,
+          effectiveBase,
+          options.remoteTrackingBase,
+          options
+        )
+      }
+      args.push(effectiveBase)
+    }
+  }
+  await gitExecFileAsync(args, {
+    ...gitExecOptions(repoPath, options),
+    // Why: resolve per call — hoisting this to a module const would freeze the override at import.
+    timeout: resolveWorktreeAddTimeoutMs()
+  })
+
+  if (options.checkoutExistingBranch) {
+    return localBaseRefRefresh ? { localBaseRefRefresh } : {}
+  }
+
+  if (effectiveBase) {
+    await persistWorktreeCreationBase(worktreePath, branch, effectiveBase, options)
+  }
+
+  // SSH parity: relay's addWorktreeOp (src/relay/git-handler-worktree-ops.ts) mirrors this — change both in lockstep.
+  // Why: --no-track leaves no upstream until first push; push.autoSetupRemote=true lets a plain
+  // `git push` create+set origin/<branch> (git >=2.37; older clients ignore it). `--local` on a
+  // linked worktree writes the shared common-dir config (whole repo) — intentional and idempotent,
+  // so it's warn-only and not rolled back on failure.
+  try {
+    // Why: `--get` (not `--local --get`) so a value at any scope counts as "user already chose" and isn't overwritten.
+    let alreadySet = false
+    try {
+      await gitExecFileAsync(['config', '--get', 'push.autoSetupRemote'], {
+        ...gitExecOptions(worktreePath, options)
+      })
+      alreadySet = true
+    } catch (readError) {
+      // Why: `git config --get` exits 1 only when unset at every scope; any other code is a real read failure — rethrow rather than overwrite the user's value.
+      const code = (readError as { code?: unknown })?.code
+      if (code !== 1) {
+        throw readError
+      }
+    }
+    if (!alreadySet) {
+      await gitExecFileAsync(['config', '--local', 'push.autoSetupRemote', 'true'], {
+        ...gitExecOptions(worktreePath, options)
+      })
+    }
+  } catch (error) {
+    console.warn(`addWorktree: failed to set push.autoSetupRemote for ${worktreePath}`, error)
+  }
+  return {
+    ...(localBaseRefRefresh ? { localBaseRefRefresh } : {}),
+    ...(localBaseRefUpdateSuggestion ? { localBaseRefUpdateSuggestion } : {})
+  }
+}
diff --git a/src/main/git/worktree-base-refresh-analysis.ts b/src/main/git/worktree-base-refresh-analysis.ts
new file mode 100644
index 00000000000..bcf014db1e1
--- /dev/null
+++ b/src/main/git/worktree-base-refresh-analysis.ts
@@ -0,0 +1,210 @@
+import { parseGitRevListAheadBehindCounts } from '../../shared/git-rev-list-output'
+import type {
+  LocalBaseRefRefreshResult,
+  LocalBaseRefUpdateSuggestion
+} from '../../shared/worktree/base-ref-drift-types'
+import { gitExecFileAsync, translateWslOutputPaths } from './runner'
+import { probeWorktreeBaseRefPresence } from './worktree-base-ref-probe'
+import { parseWorktreeList } from './worktree-list-parser'
+import type { AddWorktreeOptions, GitWorktreeExecOptions } from './worktree-operation-options'
+import { gitExecOptions } from './worktree-operation-options'
+
+type LocalBaseRefRefreshability =
+  | {
+      refreshable: true
+      baseRef: string
+      localBranch: string
+      fullRef: string
+      remoteTrackingRef: string
+      localOid: string
+      remoteOid: string
+      behind: number
+      ownerWorktreePath?: string
+    }
+  | {
+      refreshable: false
+      result: LocalBaseRefRefreshResult
+    }
+
+function parseRemoteTrackingLocalBaseRef(
+  baseBranch: string,
+  remoteTrackingRef: string,
+  remoteTrackingBase?: AddWorktreeOptions['remoteTrackingBase']
+): { baseRef: string; localBranch: string; fullRef: string } | undefined {
+  if (remoteTrackingBase?.ref === remoteTrackingRef) {
+    return {
+      baseRef: remoteTrackingBase.base,
+      localBranch: remoteTrackingBase.branch,
+      fullRef: `refs/heads/${remoteTrackingBase.branch}`
+    }
+  }
+
+  const remoteRefPrefix = 'refs/remotes/'
+  if (!remoteTrackingRef.startsWith(remoteRefPrefix)) {
+    return undefined
+  }
+
+  // Why: only proven remote-tracking refs get refresh status; slash-containing local branches (release/2026) must not fake a "not refreshed" warning.
+  const shortRemoteRef = remoteTrackingRef.slice(remoteRefPrefix.length)
+  const slashIndex = shortRemoteRef.indexOf('/')
+  if (slashIndex <= 0) {
+    return undefined
+  }
+
+  const localBranch = shortRemoteRef.slice(slashIndex + 1)
+  return {
+    baseRef: baseBranch,
+    localBranch,
+    fullRef: `refs/heads/${localBranch}`
+  }
+}
+
+function parseRevListDrift(output: string): { ahead: number; behind: number } | null {
+  const counts = parseGitRevListAheadBehindCounts(output)
+  return counts.status === 'ok' ? { ahead: counts.ahead, behind: counts.behind } : null
+}
+
+export async function evaluateLocalBaseRefRefreshability(
+  repoPath: string,
+  baseBranch: string,
+  remoteTrackingRef: string,
+  remoteTrackingBase?: AddWorktreeOptions['remoteTrackingBase'],
+  options: GitWorktreeExecOptions = {},
+  shouldInspectOwner: (behind: number) => boolean = () => true
+): Promise<LocalBaseRefRefreshability | undefined> {
+  const parsed = parseRemoteTrackingLocalBaseRef(baseBranch, remoteTrackingRef, remoteTrackingBase)
+  if (!parsed) {
+    return undefined
+  }
+
+  const resultBase = { baseRef: parsed.baseRef, localBranch: parsed.localBranch }
+
+  let drift: { ahead: number; behind: number }
+  let localOid = ''
+  let remoteOid = ''
+  try {
+    // Why: advisory and mutating paths must agree on "safe to fast-forward"; `rev-list A...B` proves no local-only commits and how far behind.
+    const { stdout } = await gitExecFileAsync(
+      ['rev-list', '--left-right', '--count', `${parsed.fullRef}...${remoteTrackingRef}`],
+      gitExecOptions(repoPath, options)
+    )
+    const parsedDrift = parseRevListDrift(stdout)
+    if (!parsedDrift || parsedDrift.ahead !== 0) {
+      return { refreshable: false, result: { ...resultBase, status: 'skipped_not_fast_forward' } }
+    }
+    if (!shouldInspectOwner(parsedDrift.behind)) {
+      // Why: a current local ref yields no update suggestion, so the advisory path skips OID resolution and owner inspection.
+      return undefined
+    }
+    const { stdout: localOidOutput } = await gitExecFileAsync(
+      ['rev-parse', '--verify', `${parsed.fullRef}^{commit}`],
+      gitExecOptions(repoPath, options)
+    )
+    localOid = localOidOutput.trim()
+    if (!localOid) {
+      return { refreshable: false, result: { ...resultBase, status: 'skipped_not_fast_forward' } }
+    }
+    const { stdout: remoteOidOutput } = await gitExecFileAsync(
+      ['rev-parse', '--verify', `${remoteTrackingRef}^{commit}`],
+      gitExecOptions(repoPath, options)
+    )
+    remoteOid = remoteOidOutput.trim()
+    if (!remoteOid) {
+      return { refreshable: false, result: { ...resultBase, status: 'skipped_not_fast_forward' } }
+    }
+    await gitExecFileAsync(
+      ['merge-base', '--is-ancestor', localOid, remoteOid],
+      gitExecOptions(repoPath, options)
+    )
+    drift = parsedDrift
+  } catch {
+    // Why (#15331): the probes above also fail when refs/heads/<branch> is simply absent; a branch that
+    // does not exist yet cannot be stale, so report nothing instead of a bogus divergence warning.
+    // Only a proven absence suppresses: an unusable repo leaves the warning alone.
+    const presence = await probeWorktreeBaseRefPresence(
+      (args) => gitExecFileAsync(args, gitExecOptions(repoPath, options)),
+      parsed.fullRef
+    )
+    if (presence === 'absent') {
+      return undefined
+    }
+    return { refreshable: false, result: { ...resultBase, status: 'skipped_not_fast_forward' } }
+  }
+
+  try {
+    // Why: if the local base branch is checked out, only update it when that owner worktree is clean.
+    const { stdout: worktreeListOutput } = await gitExecFileAsync(
+      ['worktree', 'list', '--porcelain'],
+      gitExecOptions(repoPath, options)
+    )
+    const worktrees = parseWorktreeList(
+      translateWslOutputPaths(worktreeListOutput, repoPath, options)
+    )
+    const ownerWorktree = worktrees.find((wt) => wt.branch === parsed.fullRef)
+
+    if (ownerWorktree) {
+      const { stdout: status } = await gitExecFileAsync(
+        ['status', '--porcelain', '--untracked-files=no'],
+        gitExecOptions(ownerWorktree.path, options)
+      )
+      if (status.trim()) {
+        return {
+          refreshable: false,
+          result: {
+            ...resultBase,
+            status: 'skipped_dirty_worktree',
+            ownerWorktreePath: ownerWorktree.path
+          }
+        }
+      }
+      return {
+        refreshable: true,
+        ...resultBase,
+        fullRef: parsed.fullRef,
+        remoteTrackingRef,
+        localOid,
+        remoteOid,
+        behind: drift.behind,
+        ownerWorktreePath: ownerWorktree.path
+      }
+    }
+
+    // Why: localBranch isn't checked out anywhere, so a bare-ref fast-forward is safe; omitting ownerWorktreePath signals the mutating path to take it.
+    return {
+      refreshable: true,
+      ...resultBase,
+      fullRef: parsed.fullRef,
+      remoteTrackingRef,
+      localOid,
+      remoteOid,
+      behind: drift.behind
+    }
+  } catch {
+    return { refreshable: false, result: { ...resultBase, status: 'skipped_error' } }
+  }
+}
+
+export async function getLocalBaseRefUpdateSuggestionForWorktreeCreate(
+  repoPath: string,
+  baseBranch: string,
+  remoteTrackingRef: string,
+  remoteTrackingBase?: AddWorktreeOptions['remoteTrackingBase'],
+  options: GitWorktreeExecOptions = {}
+): Promise<LocalBaseRefUpdateSuggestion | undefined> {
+  const evaluation = await evaluateLocalBaseRefRefreshability(
+    repoPath,
+    baseBranch,
+    remoteTrackingRef,
+    remoteTrackingBase,
+    options,
+    (behind) => behind > 0
+  )
+  if (!evaluation?.refreshable || evaluation.behind <= 0) {
+    return undefined
+  }
+  return {
+    baseRef: evaluation.baseRef,
+    localBranch: evaluation.localBranch,
+    behind: evaluation.behind
+  }
+}
diff --git a/src/main/git/worktree-base-refresh.ts b/src/main/git/worktree-base-refresh.ts
new file mode 100644
index 00000000000..c85e4063e3b
--- /dev/null
+++ b/src/main/git/worktree-base-refresh.ts
@@ -0,0 +1,76 @@
+import type { LocalBaseRefRefreshResult } from '../../shared/worktree/base-ref-drift-types'
+import { gitExecFileAsync, translateWslOutputPaths } from './runner'
+import {
+  evaluateLocalBaseRefRefreshability,
+  getLocalBaseRefUpdateSuggestionForWorktreeCreate
+} from './worktree-base-refresh-analysis'
+import { parseWorktreeList } from './worktree-list-parser'
+import type { AddWorktreeOptions, GitWorktreeExecOptions } from './worktree-operation-options'
+import { gitExecOptions } from './worktree-operation-options'
+
+export { getLocalBaseRefUpdateSuggestionForWorktreeCreate }
+
+export async function refreshLocalBaseRefForWorktreeCreate(
+  repoPath: string,
+  baseBranch: string,
+  remoteTrackingRef: string,
+  remoteTrackingBase?: AddWorktreeOptions['remoteTrackingBase'],
+  options: GitWorktreeExecOptions = {}
+): Promise<LocalBaseRefRefreshResult | undefined> {
+  const evaluation = await evaluateLocalBaseRefRefreshability(
+    repoPath,
+    baseBranch,
+    remoteTrackingRef,
+    remoteTrackingBase,
+    options
+  )
+  if (!evaluation) {
+    return undefined
+  }
+  if (!evaluation.refreshable) {
+    return evaluation.result
+  }
+
+  const resultBase = { baseRef: evaluation.baseRef, localBranch: evaluation.localBranch }
+  try {
+    if (evaluation.ownerWorktreePath) {
+      const { stdout: worktreeListOutput } = await gitExecFileAsync(
+        ['worktree', 'list', '--porcelain'],
+        gitExecOptions(repoPath, options)
+      )
+      const worktrees = parseWorktreeList(
+        translateWslOutputPaths(worktreeListOutput, repoPath, options)
+      )
+      const currentOwner = worktrees.find((wt) => wt.branch === evaluation.fullRef)
+      if (!currentOwner || currentOwner.path !== evaluation.ownerWorktreePath) {
+        return { ...resultBase, status: 'skipped_error' }
+      }
+      const { stdout: status } = await gitExecFileAsync(
+        ['status', '--porcelain', '--untracked-files=no'],
+        gitExecOptions(currentOwner.path, options)
+      )
+      if (status.trim()) {
+        return {
+          ...resultBase,
+          status: 'skipped_dirty_worktree',
+          ownerWorktreePath: currentOwner.path
+        }
+      }
+      await gitExecFileAsync(
+        ['reset', '--hard', evaluation.remoteOid],
+        gitExecOptions(currentOwner.path, options)
+      )
+      return { ...resultBase, status: 'updated', ownerWorktreePath: currentOwner.path }
+    }
+
+    // Why: no owner worktree — fast-forward the bare ref; the expected-old-OID form is a no-op-safe CAS if the ref moved since evaluation.
+    await gitExecFileAsync(
+      ['update-ref', evaluation.fullRef, evaluation.remoteOid, evaluation.localOid],
+      gitExecOptions(repoPath, options)
+    )
+    return { ...resultBase, status: 'updated' }
+  } catch {
+    // update-ref/reset can fail on locked refs or odd worktree states; worktree creation should still proceed.
+    return { ...resultBase, status: 'skipped_error' }
+  }
+}
diff --git a/src/main/git/worktree-branch-removal.ts b/src/main/git/worktree-branch-removal.ts
new file mode 100644
index 00000000000..5e64b4a582d
--- /dev/null
+++ b/src/main/git/worktree-branch-removal.ts
@@ -0,0 +1,188 @@
+import {
+  branchHasNoUnmergedChangesWithLazyTargetRefresh,
+  getBranchCleanupTargetRefs
+} from '../../shared/git-branch-cleanup'
+import type { RemoveWorktreeResult } from '../../shared/worktree/create-types'
+import { withLocalGitCapabilityCacheForExecution } from './git-capability-state'
+import { gitExecFileAsync } from './runner'
+import { parseWorktreeList } from './worktree-list-parser'
+import type { GitWorktreeExecOptions, RemoveWorktreeOptions } from './worktree-operation-options'
+import {
+  gitExecOptions,
+  isBranchCheckedOutInWorktreeError,
+  normalizeLocalBranchRef
+} from './worktree-operation-options'
+
+export async function deleteBranchAfterWorktreeRemoval(
+  repoPath: string,
+  branchName: string,
+  branchHead: string,
+  options: RemoveWorktreeOptions
+): Promise<RemoveWorktreeResult> {
+  try {
+    // Why: also drop the now-orphaned branch so delete-worktree leaves none; `-d` (not `-D`) preserves
+    // unmerged work, and forceBranchDelete opts into `-D` for failed-creation rollback.
+    const branchDeleteResult = await deleteLocalBranchAfterWorktreeRemoval(
+      repoPath,
+      branchName,
+      options.forceBranchDelete === true,
+      options
+    )
+    if (branchDeleteResult === 'checked-out') {
+      return {}
+    }
+    return {}
+  } catch (error) {
+    if (!options.forceBranchDelete && branchHead) {
+      try {
+        if (
+          await deleteAlreadyMergedBranchAfterSafeDeleteFailure(
+            repoPath,
+            branchName,
+            branchHead,
+            options
+          )
+        ) {
+          return {}
+        }
+      } catch (alreadyMergedDeleteError) {
+        // Why: worktree is already gone; a raced branch cleanup should degrade to preserved-branch recovery, not fail delete.
+        console.warn(
+          `[git] Failed to delete already-merged local branch "${branchName}" after removing worktree`,
+          alreadyMergedDeleteError
+        )
+      }
+    }
+    // Keep an unmerged/unpublished branch: deleting a worktree must never silently discard commits.
+    console.warn(
+      `[git] Preserved local branch "${branchName}" after removing worktree (not fully merged)`,
+      error
+    )
+    return { preservedBranch: { branchName, ...(branchHead ? { head: branchHead } : {}) } }
+  }
+}
+
+async function deleteLocalBranchAfterWorktreeRemoval(
+  repoPath: string,
+  branchName: string,
+  forceBranchDelete: boolean,
+  options: GitWorktreeExecOptions = {}
+): Promise<'deleted' | 'checked-out'> {
+  const deleteFlag = forceBranchDelete ? '-D' : '-d'
+  try {
+    await gitExecFileAsync(
+      ['branch', deleteFlag, '--', branchName],
+      gitExecOptions(repoPath, options)
+    )
+    return 'deleted'
+  } catch (error) {
+    if (!isBranchCheckedOutInWorktreeError(error)) {
+      throw error
+    }
+  }
+
+  try {
+    // Why: only pay for `worktree prune` when a stale admin record may be blocking `branch -d`.
+    await gitExecFileAsync(['worktree', 'prune'], gitExecOptions(repoPath, options))
+  } catch (error) {
+    console.warn(`[git] Failed to prune worktrees before deleting branch "${branchName}"`, error)
+    return 'checked-out'
+  }
+
+  try {
+    await gitExecFileAsync(
+      ['branch', deleteFlag, '--', branchName],
+      gitExecOptions(repoPath, options)
+    )
+    return 'deleted'
+  } catch (error) {
+    if (isBranchCheckedOutInWorktreeError(error)) {
+      return 'checked-out'
+    }
+    throw error
+  }
+}
+
+async function deleteAlreadyMergedBranchAfterSafeDeleteFailure(
+  repoPath: string,
+  branchName: string,
+  branchHead: string,
+  options: GitWorktreeExecOptions = {}
+): Promise<boolean> {
+  const runGit = (args: string[], execOptions?: { stdin?: string }) =>
+    gitExecFileAsync(args, {
+      ...gitExecOptions(repoPath, options),
+      ...(execOptions?.stdin !== undefined ? { stdin: execOptions.stdin } : {})
+    })
+  const targetRefs = await getBranchCleanupTargetRefs(runGit, branchName)
+  // Why: squash merges rewrite commit IDs, so `branch -d` rejects already-merged branches; delete only when Git proves no unmerged tree changes.
+  const hasNoUnmergedChanges = await withLocalGitCapabilityCacheForExecution(
+    { cwd: repoPath, wslDistro: options.wslDistro, signal: options.signal },
+    (capabilities) =>
+      branchHasNoUnmergedChangesWithLazyTargetRefresh(runGit, branchName, targetRefs, capabilities)
+  )
+  if (!hasNoUnmergedChanges) {
+    return false
+  }
+  await forceDeleteLocalBranch(repoPath, branchName, branchHead, (args, cwd) =>
+    gitExecFileAsync(args, gitExecOptions(cwd, options))
+  )
+  return true
+}
+
+export async function forceDeleteLocalBranch(
+  repoPath: string,
+  branchName: string,
+  expectedHead: string,
+  runGit: (args: string[], cwd: string) => Promise<{ stdout: string; stderr: string }> = (
+    args,
+    cwd
+  ) => gitExecFileAsync(args, { cwd })
+): Promise<void> {
+  if (!branchName || branchName.includes('\0')) {
+    throw new Error('Invalid branch name')
+  }
+  if (!expectedHead) {
+    throw new Error(
+      `Cannot force-delete local branch "${branchName}" without the commit Git preserved.`
+    )
+  }
+  if (await isLocalBranchCheckedOut(repoPath, branchName, runGit)) {
+    throw new Error(`Local branch "${branchName}" is checked out in another worktree.`)
+  }
+  // Why: stale toast actions must not delete a branch that moved; `update-ref -d` deletes only if the ref still == expectedHead.
+  try {
+    await runGit(['update-ref', '-d', `refs/heads/${branchName}`, expectedHead], repoPath)
+  } catch {
+    throw new Error(
+      `Local branch "${branchName}" changed after the workspace was deleted. Review it before deleting it.`
+    )
+  }
+  if (await isLocalBranchCheckedOut(repoPath, branchName, runGit)) {
+    try {
+      await runGit(['update-ref', `refs/heads/${branchName}`, expectedHead, ''], repoPath)
+    } catch (restoreError) {
+      console.warn(
+        `[git] Failed to restore local branch "${branchName}" after concurrent checkout`,
+        restoreError
+      )
+    }
+    throw new Error(`Local branch "${branchName}" is checked out in another worktree.`)
+  }
+  try {
+    await runGit(['config', '--remove-section', `branch.${branchName}`], repoPath)
+  } catch {
+    // Best-effort parity with `git branch -D`; stale config is harmless.
+  }
+}
+
+async function isLocalBranchCheckedOut(
+  repoPath: string,
+  branchName: string,
+  runGit: (args: string[], cwd: string) => Promise<{ stdout: string; stderr: string }>
+): Promise<boolean> {
+  const { stdout } = await runGit(['worktree', 'list', '--porcelain'], repoPath)
+  return parseWorktreeList(stdout).some(
+    (worktree) => normalizeLocalBranchRef(worktree.branch) === branchName
+  )
+}
diff --git a/src/main/git/worktree-list-parser.ts b/src/main/git/worktree-list-parser.ts
new file mode 100644
index 00000000000..34589015d24
--- /dev/null
+++ b/src/main/git/worktree-list-parser.ts
@@ -0,0 +1,103 @@
+import { decodeGitCQuotedPath } from '../../shared/git-cquoted-path'
+import type { GitWorktreeInfo } from '../../shared/worktree/types'
+
+/**
+ * Parse the porcelain output of `git worktree list --porcelain`.
+ */
+export function parseWorktreeList(
+  output: string,
+  options: { nulDelimited?: boolean } = {}
+): GitWorktreeInfo[] {
+  const worktrees: GitWorktreeInfo[] = []
+  const blocks = options.nulDelimited ? splitNulWorktreeList(output) : splitLineWorktreeList(output)
+
+  for (const lines of blocks) {
+    if (lines.length === 0) {
+      continue
+    }
+
+    let path = ''
+    let head = ''
+    let branch = ''
+    let isBare = false
+    let isSparse = false
+    let locked = false
+    let lockReason = ''
+    let prunable = false
+    let prunableReason = ''
+
+    for (const line of lines) {
+      if (line.startsWith('worktree ')) {
+        path = line.slice('worktree '.length)
+      } else if (line.startsWith('HEAD ')) {
+        head = line.slice('HEAD '.length)
+      } else if (line.startsWith('branch ')) {
+        branch = line.slice('branch '.length)
+      } else if (line === 'bare') {
+        isBare = true
+      } else if (line === 'sparse') {
+        isSparse = true
+      } else if (line === 'locked' || line.startsWith('locked ')) {
+        locked = true
+        const rawReason = line.slice('locked'.length).trim()
+        lockReason = options.nulDelimited ? rawReason : decodeGitCQuotedPath(rawReason)
+      } else if (line === 'prunable' || line.startsWith('prunable ')) {
+        // Why: Git ≥2.36 flags registrations whose directory is gone; ignoring it shows the stale worktree as live (#8389).
+        prunable = true
+        const rawReason = line.slice('prunable'.length).trim()
+        prunableReason = options.nulDelimited ? rawReason : decodeGitCQuotedPath(rawReason)
+      }
+    }
+
+    if (path) {
+      // `git worktree list` always emits the main working tree first.
+      worktrees.push({
+        path,
+        head,
+        branch,
+        isBare,
+        ...(isSparse ? { isSparse } : {}),
+        ...(locked ? { locked: true } : {}),
+        ...(lockReason ? { lockReason } : {}),
+        ...(prunable ? { prunable: true } : {}),
+        ...(prunableReason ? { prunableReason } : {}),
+        isMainWorktree: worktrees.length === 0
+      })
+    }
+  }
+
+  return worktrees
+}
+
+function splitLineWorktreeList(output: string): string[][] {
+  return output
+    .trim()
+    .split(/\r?\n\r?\n/)
+    .map((block) => block.trim().split(/\r?\n/))
+}
+
+function splitNulWorktreeList(output: string): string[][] {
+  if (!output.includes('\0')) {
+    return splitLineWorktreeList(output)
+  }
+
+  const blocks: string[][] = []
+  let currentBlock: string[] = []
+
+  for (const field of output.split('\0')) {
+    if (field) {
+      currentBlock.push(field)
+      continue
+    }
+    if (currentBlock.length > 0) {
+      blocks.push(currentBlock)
+      currentBlock = []
+    }
+  }
+
+  if (currentBlock.length > 0) {
+    blocks.push(currentBlock)
+  }
+
+  return blocks
+}
diff --git a/src/main/git/worktree-list-reader.ts b/src/main/git/worktree-list-reader.ts
new file mode 100644
index 00000000000..1b17cfd17c4
--- /dev/null
+++ b/src/main/git/worktree-list-reader.ts
@@ -0,0 +1,205 @@
+import { stat } from 'node:fs/promises'
+import type { GitWorktreeInfo } from '../../shared/worktree/types'
+import { parseWslUncPath } from '../../shared/wsl-paths'
+import {
+  hasUnsupportedRevParsePathFormatEcho,
+  isUnsupportedRevParsePathFormatError,
+  isUnsupportedWorktreeListZError
+} from '../../shared/git-worktree-command-capabilities'
+import { withLocalGitCapabilityCacheForExecution } from './git-capability-state'
+import { parseWorktreeList } from './worktree-list-parser'
+import type { GitWorktreeExecOptions } from './worktree-operation-options'
+import {
+  WORKTREE_LIST_TIMEOUT_MS,
+  getErrorCode,
+  gitExecOptions
+} from './worktree-operation-options'
+import {
+  areWorktreePathsEqual,
+  resolveRevParsePath,
+  translateWorktreePath
+} from './worktree-path-comparison'
+import { gitExecFileAsync } from './runner'
+
+const PRUNABLE_EXISTENCE_PROBE_CONCURRENCY = 8
+
+type RepoLocation = { topLevel: string; commonDir: string }
+
+function parseRepoLocation(repoPath: string, output: string): RepoLocation | undefined {
+  // Old git echoes the unrecognized `--path-format` flag and exits 0, so drop `-`-prefixed lines and
+  // read the last two path lines (toplevel, git-common-dir); strip only trailing CR — paths may have edge spaces.
+  const lines = output
+    .split('\n')
+    .map((line) => (line.endsWith('\r') ? line.slice(0, -1) : line))
+    .filter((line) => line.length > 0 && !line.startsWith('-'))
+  if (lines.length < 2) {
+    return undefined
+  }
+  const [topLevel, commonDir] = lines.slice(-2)
+  return {
+    topLevel: resolveRevParsePath(repoPath, topLevel),
+    commonDir: resolveRevParsePath(repoPath, commonDir)
+  }
+}
+
+async function readRepoLocation(
+  repoPath: string,
+  resolveBasePath: string,
+  options: GitWorktreeExecOptions = {}
+): Promise<RepoLocation | undefined> {
+  try {
+    return await withLocalGitCapabilityCacheForExecution(
+      { cwd: repoPath, wslDistro: options.wslDistro, signal: options.signal },
+      (capabilities) =>
+        capabilities.runWithFallback(
+          'rev-parse-path-format',
+          async () => {
+            const { stdout } = await gitExecFileAsync(
+              ['rev-parse', '--path-format=absolute', '--show-toplevel', '--git-common-dir'],
+              gitExecOptions(repoPath, options)
+            )
+            if (hasUnsupportedRevParsePathFormatEcho(stdout)) {
+              // Why: some old Git echoes the unknown option and exits zero; remember that compat signal even though parsing recovers.
+              capabilities.rememberUnsupported('rev-parse-path-format')
+            }
+            return parseRepoLocation(resolveBasePath, stdout)
+          },
+          async () => {
+            const { stdout } = await gitExecFileAsync(
+              ['rev-parse', '--show-toplevel', '--git-common-dir'],
+              gitExecOptions(repoPath, options)
+            )
+            return parseRepoLocation(resolveBasePath, stdout)
+          },
+          isUnsupportedRevParsePathFormatError
+        )
+    )
+  } catch {
+    return undefined
+  }
+}
+
+async function normalizeMainWorktreePath(
+  repoPath: string,
+  worktrees: GitWorktreeInfo[],
+  options: GitWorktreeExecOptions = {}
+): Promise<GitWorktreeInfo[]> {
+  const mainIndex = worktrees.findIndex((worktree) => worktree.isMainWorktree)
+  const mainWorktree = worktrees[mainIndex]
+  // Why: under WSL, porcelain/rev-parse paths are Linux but repoPath is UNC; compare in Git-output
+  // space so the early-return matches and we skip a needless rev-parse per poll (runner still gets repoPath).
+  const wslRepo = parseWslUncPath(repoPath)
+  const comparablePath = wslRepo ? wslRepo.linuxPath : repoPath
+  if (!mainWorktree || areWorktreePathsEqual(mainWorktree.path, comparablePath)) {
+    return worktrees
+  }
+
+  const location = await readRepoLocation(repoPath, comparablePath, options)
+  if (!location) {
+    return worktrees
+  }
+
+  // Why: only a separate-git-dir/submodule main worktree reports git-common-dir as its path; gate on
+  // that equality so we don't overwrite a linked worktree's real working root with its own toplevel.
+  if (!areWorktreePathsEqual(mainWorktree.path, location.commonDir)) {
+    return worktrees
+  }
+
+  const normalized = [...worktrees]
+  normalized[mainIndex] = { ...mainWorktree, path: location.topLevel }
+  return normalized
+}
+
+export async function readWorktreeList(
+  repoPath: string,
+  options: GitWorktreeExecOptions = {}
+): Promise<GitWorktreeInfo[]> {
+  const execOptions = {
+    cwd: repoPath,
+    ...options,
+    timeout: options.timeout ?? WORKTREE_LIST_TIMEOUT_MS
+  }
+  return withLocalGitCapabilityCacheForExecution(
+    { cwd: repoPath, wslDistro: options.wslDistro, signal: options.signal },
+    (capabilities) =>
+      capabilities.runWithFallback(
+        'worktree-list-z',
+        async () => {
+          const { stdout } = await gitExecFileAsync(
+            ['worktree', 'list', '--porcelain', '-z'],
+            execOptions
+          )
+          return normalizeMainWorktreePath(
+            repoPath,
+            parseWorktreeList(stdout, { nulDelimited: true }),
+            options
+          )
+        },
+        async () => {
+          // Why: `-z` preserves worktree paths with newlines but Git <2.36 rejects it; fall back to the line parser.
+          const { stdout } = await gitExecFileAsync(
+            ['worktree', 'list', '--porcelain'],
+            execOptions
+          )
+          const normalized = await normalizeMainWorktreePath(
+            repoPath,
+            parseWorktreeList(stdout),
+            options
+          )
+          // Why: Git <2.31 emits no `prunable`, so probe each linked path for existence instead of trusting
+          // stale registrations; a harmless backstop on 2.31–2.35 where parseWorktreeList already set it (#8389).
+          return annotatePrunableByExistence(normalized, repoPath, options)
+        },
+        isUnsupportedWorktreeListZError
+      )
+  )
+}
+
+async function annotatePrunableByExistence(
+  worktrees: GitWorktreeInfo[],
+  repoPath: string,
+  options: GitWorktreeExecOptions = {}
+): Promise<GitWorktreeInfo[]> {
+  const annotated = [...worktrees]
+  let nextIndex = 0
+
+  async function probeNext(): Promise<void> {
+    while (nextIndex < worktrees.length) {
+      const index = nextIndex
+      nextIndex += 1
+      const worktree = worktrees[index]
+      // Git only prunes linked worktrees, never locked ones (a lock shields a missing dir; `locked`
+      // parses only on Git >=2.31). A missing main worktree is handled by the repo-level ENOENT paths.
+      if (
+        !worktree ||
+        worktree.isMainWorktree ||
+        worktree.isBare ||
+        worktree.locked ||
+        worktree.prunable
+      ) {
+        continue
+      }
+      try {
+        await stat(translateWorktreePath(worktree.path, repoPath, options))
+      } catch (err) {
+        if (getErrorCode(err) === 'ENOENT') {
+          annotated[index] = { ...worktree, prunable: true }
+        }
+      }
+    }
+  }
+
+  const workerCount = Math.min(PRUNABLE_EXISTENCE_PROBE_CONCURRENCY, worktrees.length)
+  await Promise.all(Array.from({ length: workerCount }, () => probeNext()))
+  return annotated
+}
+
+export async function readTranslatedWorktreeGraph(
+  repoPath: string,
+  options: GitWorktreeExecOptions = {}
+): Promise<GitWorktreeInfo[]> {
+  return (await readWorktreeList(repoPath, options)).map((worktree) => {
+    const translatedPath = translateWorktreePath(worktree.path, repoPath, options)
+    return translatedPath === worktree.path ? worktree : { ...worktree, path: translatedPath }
+  })
+}
diff --git a/src/main/git/worktree-listing.ts b/src/main/git/worktree-listing.ts
new file mode 100644
index 00000000000..dd6ee20765f
--- /dev/null
+++ b/src/main/git/worktree-listing.ts
@@ -0,0 +1,99 @@
+import { stat } from 'node:fs/promises'
+import type { GitWorktreeInfo } from '../../shared/worktree/types'
+import { readTranslatedWorktreeGraph, readWorktreeList } from './worktree-list-reader'
+import type { GitWorktreeExecOptions } from './worktree-operation-options'
+import { getErrorCode, isNotGitRepositoryError } from './worktree-operation-options'
+import { translateWorktreePath } from './worktree-path-comparison'
+import { detectSparseCheckout } from './worktree-sparse-state'
+
+const SPARSE_CHECKOUT_DETECTION_CONCURRENCY = 8
+
+export async function listWorktreeGraph(
+  repoPath: string,
+  options: GitWorktreeExecOptions = {}
+): Promise<GitWorktreeInfo[]> {
+  try {
+    return await readTranslatedWorktreeGraph(repoPath, options)
+  } catch (err) {
+    if (getErrorCode(err) === 'ENOENT') {
+      try {
+        await stat(repoPath)
+      } catch (statErr) {
+        if (getErrorCode(statErr) === 'ENOENT') {
+          console.warn(`[git/worktree] repo path missing; skipping worktree list: ${repoPath}`)
+          return []
+        }
+      }
+    }
+    if (isNotGitRepositoryError(err)) {
+      return []
+    }
+    console.warn(`[git/worktree] listWorktreeGraph failed for ${repoPath}:`, err)
+    return []
+  }
+}
+
+export async function listWorktreesUnshared(
+  repoPath: string,
+  options: GitWorktreeExecOptions = {}
+): Promise<GitWorktreeInfo[]> {
+  try {
+    const worktrees = await readTranslatedWorktreeGraph(repoPath, options)
+    return annotateSparseCheckoutStatus(worktrees)
+  } catch (err) {
+    if (getErrorCode(err) === 'ENOENT') {
+      try {
+        await stat(repoPath)
+      } catch (statErr) {
+        if (getErrorCode(statErr) === 'ENOENT') {
+          console.warn(`[git/worktree] repo path missing; skipping worktree list: ${repoPath}`)
+          return []
+        }
+      }
+    }
+    if (isNotGitRepositoryError(err)) {
+      return []
+    }
+    // Why: don't swallow git-compat/repo-state failures — else they resurface as opaque "created but not found in listing" errors.
+    console.warn(`[git/worktree] listWorktrees failed for ${repoPath}:`, err)
+    return []
+  }
+}
+
+export async function listWorktreesStrict(
+  repoPath: string,
+  options: GitWorktreeExecOptions = {}
+): Promise<GitWorktreeInfo[]> {
+  const worktrees = (await readWorktreeList(repoPath, options)).map((worktree) => {
+    const translatedPath = translateWorktreePath(worktree.path, repoPath, options)
+    return translatedPath === worktree.path ? worktree : { ...worktree, path: translatedPath }
+  })
+  return annotateSparseCheckoutStatus(worktrees)
+}
+
+async function annotateSparseCheckoutStatus(
+  worktrees: GitWorktreeInfo[]
+): Promise<GitWorktreeInfo[]> {
+  const annotated = [...worktrees]
+  let nextIndex = 0
+
+  async function detectNext(): Promise<void> {
+    while (nextIndex < worktrees.length) {
+      const index = nextIndex
+      nextIndex += 1
+      const worktree = worktrees[index]
+      if (!worktree || worktree.isBare || worktree.isSparse) {
+        continue
+      }
+      const isSparse = await detectSparseCheckout(worktree.path)
+      if (isSparse) {
+        annotated[index] = { ...worktree, isSparse }
+      }
+    }
+  }
+
+  // Why: cap concurrency so status-poll refreshes don't fan out many sparse-checkout filesystem probes at once.
+  const workerCount = Math.min(SPARSE_CHECKOUT_DETECTION_CONCURRENCY, worktrees.length)
+  await Promise.all(Array.from({ length: workerCount }, () => detectNext()))
+  return annotated
+}
diff --git a/src/main/git/worktree-move.ts b/src/main/git/worktree-move.ts
new file mode 100644
index 00000000000..d90569ecb47
--- /dev/null
+++ b/src/main/git/worktree-move.ts
@@ -0,0 +1,23 @@
+import { gitExecFileAsync } from './runner'
+import { runWithGitReadCacheInvalidation } from './status'
+import { bumpWorktreeScanGeneration } from './worktree-scan-cache'
+
+/**
+ * Move a worktree with `git worktree move` (not `fs.rename`, which corrupts the
+ * `.git` file and the `.git/worktrees/<name>/gitdir` back-pointer). Local-only,
+ * so there is no relay parity handler. Caller owns migrating Orca's
+ * path-derived worktree identity and pre-checks that the destination is free.
+ */
+export async function moveWorktree(
+  repoPath: string,
+  oldPath: string,
+  newPath: string
+): Promise<void> {
+  try {
+    await runWithGitReadCacheInvalidation(() =>
+      gitExecFileAsync(['worktree', 'move', oldPath, newPath], { cwd: repoPath })
+    )
+  } finally {
+    bumpWorktreeScanGeneration(repoPath)
+  }
+}
diff --git a/src/main/git/worktree-operation-options.ts b/src/main/git/worktree-operation-options.ts
new file mode 100644
index 00000000000..c88c246be9c
--- /dev/null
+++ b/src/main/git/worktree-operation-options.ts
@@ -0,0 +1,125 @@
+import type {
+  LocalBaseRefRefreshResult,
+  LocalBaseRefUpdateSuggestion
+} from '../../shared/worktree/base-ref-drift-types'
+import type { RemoveWorktreeResult } from '../../shared/worktree/create-types'
+import type { GitWorktreeInfo } from '../../shared/worktree/types'
+
+export type AddWorktreeResult = {
+  localBaseRefRefresh?: LocalBaseRefRefreshResult
+  localBaseRefUpdateSuggestion?: LocalBaseRefUpdateSuggestion
+}
+
+export type SparseWorktreeCreateError = Error & {
+  cleanupFailed?: boolean
+}
+
+export type GitWorktreeExecOptions = {
+  wslDistro?: string
+  signal?: AbortSignal
+  timeout?: number
+}
+
+export type WorktreeRemovalPreflightOptions = GitWorktreeExecOptions & {
+  ignoredUntrackedPaths?: readonly string[]
+}
+
+export type AddWorktreeOptions = GitWorktreeExecOptions & {
+  checkoutExistingBranch?: boolean
+  suggestLocalBaseRefUpdate?: boolean
+  remoteTrackingBase?: {
+    base: string
+    branch: string
+    ref: string
+  }
+}
+
+export type RemoveWorktreeOptions = GitWorktreeExecOptions & {
+  deleteBranch?: boolean
+  forceBranchDelete?: boolean
+  knownRemovedWorktree?: Pick<GitWorktreeInfo, 'branch' | 'head' | 'locked' | 'lockReason'>
+}
+
+// Why: bound `git worktree add` so a OneDrive cloud-placeholder stall fails fast (STA-1292); ample for an ordinary large checkout, but not one behind a slow content filter (#12696).
+// Doubles as the floor for ORCA_WORKTREE_ADD_TIMEOUT_MS — lowering it to fail faster also lowers the minimum any override can request.
+export const WORKTREE_ADD_TIMEOUT_MS = 180_000
+// Why: ceiling for ORCA_WORKTREE_ADD_TIMEOUT_MS (#12696) — ~8x the slowest reported checkout (3.5 min). The cost is that a genuine stall now blocks a create for up to 30 min instead of 3.
+export const WORKTREE_ADD_TIMEOUT_MAX_MS = 30 * 60_000
+export const WORKTREE_REMOVAL_PREFLIGHT_TIMEOUT_MS = 30_000
+export const WORKTREE_REMOVAL_REGISTRATION_TIMEOUT_MS = 30_000
+// Why: one wedged shared scan otherwise hangs every later list, including create's post-add re-list.
+export const WORKTREE_LIST_TIMEOUT_MS = 30_000
+
+/**
+ * `ORCA_WORKTREE_ADD_TIMEOUT_MS` clamped into [{@link WORKTREE_ADD_TIMEOUT_MS},
+ * {@link WORKTREE_ADD_TIMEOUT_MAX_MS}]; unset, blank, or unparseable yields the default.
+ * Warns when a non-blank value is rejected or clamped; trimming and fractional truncation are silent.
+ * `env` is injectable for tests.
+ */
+export function resolveWorktreeAddTimeoutMs(env: NodeJS.ProcessEnv = process.env): number {
+  const raw = env.ORCA_WORKTREE_ADD_TIMEOUT_MS?.trim()
+  const requested = Math.floor(Number(raw))
+  // Why: `=300` reads as seconds to most operators, so clamp rather than obey.
+  const resolved = Number.isNaN(requested)
+    ? WORKTREE_ADD_TIMEOUT_MS
+    : Math.min(Math.max(requested, WORKTREE_ADD_TIMEOUT_MS), WORKTREE_ADD_TIMEOUT_MAX_MS)
+  // Why: an `isNaN` guard here would delete the unparseable-value warning — comparing against NaN is unequal, and that is what catches it.
+  if (raw && resolved !== requested) {
+    const problem = Number.isNaN(requested)
+      ? // Why: `600_000` copied out of this file is NaN, not out of range — say which.
+        'is not a number'
+      : `is outside [${WORKTREE_ADD_TIMEOUT_MS}, ${WORKTREE_ADD_TIMEOUT_MAX_MS}]ms`
+    console.warn(
+      `[git/worktree] ORCA_WORKTREE_ADD_TIMEOUT_MS="${raw}" ${problem}; using ${resolved}ms`
+    )
+  }
+  return resolved
+}
+
+export function gitExecOptions(
+  cwd: string,
+  options: GitWorktreeExecOptions = {}
+): { cwd: string; wslDistro?: string; signal?: AbortSignal; timeout?: number } {
+  return {
+    cwd,
+    ...(options.wslDistro ? { wslDistro: options.wslDistro } : {}),
+    ...(options.signal ? { signal: options.signal } : {}),
+    ...(options.timeout ? { timeout: options.timeout } : {})
+  }
+}
+
+export function getErrorCode(error: unknown): string | undefined {
+  return typeof error === 'object' && error !== null && 'code' in error
+    ? String((error as { code?: unknown }).code)
+    : undefined
+}
+
+function getErrorText(error: unknown): string {
+  if (typeof error === 'object' && error !== null) {
+    const parts: string[] = []
+    if ('message' in error && typeof error.message === 'string') {
+      parts.push(error.message)
+    }
+    if ('stderr' in error && typeof error.stderr === 'string') {
+      parts.push(error.stderr)
+    }
+    return parts.join('\n')
+  }
+  return String(error)
+}
+
+export function isNotGitRepositoryError(error: unknown): boolean {
+  return /not a git repository/i.test(getErrorText(error))
+}
+
+export function isBranchCheckedOutInWorktreeError(error: unknown): boolean {
+  return /cannot delete branch .*(?:used by worktree|checked out)|branch .*is checked out/i.test(
+    getErrorText(error)
+  )
+}
+
+export function normalizeLocalBranchRef(branch: string): string {
+  return branch.replace(/^refs\/heads\//, '')
+}
+
+export type { LocalBaseRefRefreshResult, LocalBaseRefUpdateSuggestion, RemoveWorktreeResult }
diff --git a/src/main/git/worktree-path-comparison.ts b/src/main/git/worktree-path-comparison.ts
new file mode 100644
index 00000000000..6bd8fd7aacb
--- /dev/null
+++ b/src/main/git/worktree-path-comparison.ts
@@ -0,0 +1,41 @@
+import { posix, win32 } from 'node:path'
+import type { GitWorktreeExecOptions } from './worktree-operation-options'
+import { translateWslOutputPaths } from './runner'
+
+export function areWorktreePathsEqual(
+  leftPath: string,
+  rightPath: string,
+  platform = process.platform
+): boolean {
+  if (platform === 'win32' || looksLikeWindowsPath(leftPath) || looksLikeWindowsPath(rightPath)) {
+    return (
+      win32.normalize(win32.resolve(leftPath)).toLowerCase() ===
+      win32.normalize(win32.resolve(rightPath)).toLowerCase()
+    )
+  }
+  return posix.normalize(posix.resolve(leftPath)) === posix.normalize(posix.resolve(rightPath))
+}
+
+function looksLikeWindowsPath(pathValue: string): boolean {
+  return /^[A-Za-z]:[\\/]/.test(pathValue) || pathValue.startsWith('\\\\')
+}
+
+export function resolveRevParsePath(repoPath: string, value: string): string {
+  if (posix.isAbsolute(value) || win32.isAbsolute(value)) {
+    return value
+  }
+  // Old git ignores `--path-format=absolute`, so resolve a relative toplevel/git-dir against the scanned repo path.
+  return looksLikeWindowsPath(repoPath)
+    ? win32.resolve(repoPath, value)
+    : posix.resolve(repoPath, value)
+}
+
+export function translateWorktreePath(
+  worktreePath: string,
+  repoPath: string,
+  options: GitWorktreeExecOptions = {}
+): string {
+  const prefix = 'worktree '
+  const translated = translateWslOutputPaths(`${prefix}${worktreePath}`, repoPath, options)
+  return translated.startsWith(prefix) ? translated.slice(prefix.length) : worktreePath
+}
diff --git a/src/main/git/worktree-removal-preflight.ts b/src/main/git/worktree-removal-preflight.ts
new file mode 100644
index 00000000000..1e3ee3e8c3d
--- /dev/null
+++ b/src/main/git/worktree-removal-preflight.ts
@@ -0,0 +1,68 @@
+import { gitExecFileAsync } from './runner'
+import type { WorktreeRemovalPreflightOptions } from './worktree-operation-options'
+import { WORKTREE_REMOVAL_PREFLIGHT_TIMEOUT_MS, gitExecOptions } from './worktree-operation-options'
+
+/**
+ * Assert a worktree is clean enough for non-force removal.
+ */
+export async function assertWorktreeCleanForRemoval(
+  worktreePath: string,
+  force = false,
+  options: WorktreeRemovalPreflightOptions = {}
+): Promise<void> {
+  if (force) {
+    return
+  }
+
+  const { ignoredUntrackedPaths = [], ...gitOptions } = options
+  const useNullTerminatedStatus = ignoredUntrackedPaths.length > 0
+  const { stdout } = await gitExecFileAsync(
+    ['status', '--porcelain', ...(useNullTerminatedStatus ? ['-z'] : []), '--untracked-files=all'],
+    {
+      ...gitExecOptions(worktreePath, gitOptions),
+      timeout: gitOptions.timeout ?? WORKTREE_REMOVAL_PREFLIGHT_TIMEOUT_MS
+    }
+  )
+  // Why one parse feeds both: the clean verdict and the error text must never
+  // disagree about which entries block removal.
+  const blockingEntries = useNullTerminatedStatus
+    ? getBlockingUntrackedStatusEntries(stdout, ignoredUntrackedPaths)
+    : null
+  if (blockingEntries ? blockingEntries.length === 0 : !stdout.trim()) {
+    return
+  }
+
+  const error = new Error('Worktree has uncommitted or untracked changes.')
+  // Why not the raw stdout: `-z` output is NUL-delimited and `.trim()` leaves
+  // interior NULs, so attaching it verbatim put raw control bytes into the
+  // user-facing removal error — and listed the tolerated shared link, the one
+  // entry that is not the user's work and cannot be committed away.
+  ;(error as Error & { stdout?: string }).stdout = blockingEntries
+    ? blockingEntries.join('\n')
+    : stdout
+  throw error
+}
+
+/** The `git status --porcelain -z` entries that genuinely block removal:
+ *  everything except the untracked shared links the caller tolerates. */
+function getBlockingUntrackedStatusEntries(
+  status: string,
+  ignoredUntrackedPaths: readonly string[]
+): string[] {
+  const ignored = new Set(
+    ignoredUntrackedPaths
+      .map((entry) =>
+        entry
+          .trim()
+          .replace(/^[\\/]+/, '')
+          .replace(/\\/g, '/')
+      )
+      .filter((entry) => entry && !entry.split('/').includes('..'))
+  )
+  return status
+    .split('\0')
+    .filter(Boolean)
+    .filter(
+      (entry) => !(entry.startsWith('?? ') && ignored.has(entry.slice(3).replace(/\\/g, '/')))
+    )
+}
diff --git a/src/main/git/worktree-removal.ts b/src/main/git/worktree-removal.ts
new file mode 100644
index 00000000000..ebb96ac1d90
--- /dev/null
+++ b/src/main/git/worktree-removal.ts
@@ -0,0 +1,173 @@
+import type { RemoveWorktreeResult } from '../../shared/worktree/create-types'
+import { assertWorktreeUnlockedForRemoval } from '../../shared/worktree/removal'
+import { isSubmoduleWorktreeRemovalRefusal } from '../../shared/worktree/submodule-removal'
+import { withWorktreeRemoveStageSpan } from '../observability/instrumentation'
+import { withSpan } from '../observability/tracer'
+import {
+  moveWorktreeDirectoryToTrash,
+  restoreWorktreeDirectoryFromTrash,
+  scheduleWorktreeTrashDeletion
+} from '../worktree-trash'
+import { parseWslPath } from '../wsl'
+import { gitExecFileAsync } from './runner'
+import { runWithGitReadCacheInvalidation } from './status'
+import { deleteBranchAfterWorktreeRemoval } from './worktree-branch-removal'
+import { listWorktreesStrict } from './worktree-listing'
+import type { RemoveWorktreeOptions } from './worktree-operation-options'
+import {
+  WORKTREE_REMOVAL_REGISTRATION_TIMEOUT_MS,
+  gitExecOptions,
+  normalizeLocalBranchRef
+} from './worktree-operation-options'
+import { areWorktreePathsEqual } from './worktree-path-comparison'
+import { assertWorktreeCleanForRemoval } from './worktree-removal-preflight'
+import { bumpWorktreeScanGeneration, listWorktrees } from './worktree-scan-cache'
+
+/**
+ * Remove a worktree.
+ */
+export async function removeWorktree(
+  repoPath: string,
+  worktreePath: string,
+  force = false,
+  // forceBranchDelete: for failed-creation rollback (fresh branch, no user work); user deletes leave it false so unmerged commits survive.
+  options: RemoveWorktreeOptions = {}
+): Promise<RemoveWorktreeResult> {
+  try {
+    return await runWithGitReadCacheInvalidation(() =>
+      performRemoveWorktree(repoPath, worktreePath, force, options)
+    )
+  } finally {
+    bumpWorktreeScanGeneration(repoPath)
+  }
+}
+
+async function performRemoveWorktree(
+  repoPath: string,
+  worktreePath: string,
+  force = false,
+  options: RemoveWorktreeOptions = {}
+): Promise<RemoveWorktreeResult> {
+  const removedWorktree =
+    options.knownRemovedWorktree ??
+    (await listWorktrees(repoPath, options)).find((worktree) =>
+      areWorktreePathsEqual(worktree.path, worktreePath)
+    )
+  const branchName = normalizeLocalBranchRef(removedWorktree?.branch ?? '')
+  const branchHead = removedWorktree?.head ?? ''
+
+  // Why: callers outside the IPC/runtime preflight must not bypass Git's lock contract or rely on localized stderr after side effects.
+  assertWorktreeUnlockedForRemoval(removedWorktree)
+
+  if (
+    !(await tryRemoveWorktreeWithDeferredDirectoryDeletion(repoPath, worktreePath, force, options))
+  ) {
+    const args = ['worktree', 'remove']
+    if (force) {
+      args.push('--force')
+    }
+    args.push(worktreePath)
+    try {
+      await gitExecFileAsync(args, gitExecOptions(repoPath, options))
+    } catch (error) {
+      if (force || !isSubmoduleWorktreeRemovalRefusal(error)) {
+        throw error
+      }
+      // Why: Git refuses non-force removal of a worktree with an initialised submodule even when clean; re-prove cleanliness, then --force.
+      await assertWorktreeCleanForRemoval(worktreePath, false, options)
+      await gitExecFileAsync(
+        ['worktree', 'remove', '--force', worktreePath],
+        gitExecOptions(repoPath, options)
+      )
+    }
+  }
+
+  if (!branchName) {
+    return {}
+  }
+  if (options.deleteBranch === false) {
+    return {}
+  }
+
+  // Why its own span: branch cleanup can reach the network (`fetch --prune`), so a stall here reads as
+  // `git worktree remove` being slow unless it is timed separately.
+  return withSpan('worktree.remove.branch_delete', () =>
+    deleteBranchAfterWorktreeRemoval(repoPath, branchName, branchHead, options)
+  )
+}
+
+/**
+ * Rename the checkout into a sibling trash directory and clear Git's registration for the
+ * now-missing path, so the multi-GB recursive delete runs after this removal has returned.
+ * Returns false when the caller must let `git worktree remove` delete the directory inline.
+ */
+async function tryRemoveWorktreeWithDeferredDirectoryDeletion(
+  repoPath: string,
+  worktreePath: string,
+  force: boolean,
+  options: RemoveWorktreeOptions
+): Promise<boolean> {
+  // Why: WSL-owned checkouts are deleted inside the distro, so Node on Windows must not rename them.
+  if (options.wslDistro || parseWslPath(worktreePath)) {
+    return false
+  }
+  if (!force) {
+    try {
+      // Why: `git worktree remove` re-checks cleanliness as it removes; prove the same thing here or leave removal to Git.
+      await assertWorktreeCleanForRemoval(worktreePath, false, options)
+    } catch {
+      return false
+    }
+  }
+
+  const trashPath = await withWorktreeRemoveStageSpan('trash_rename', 'local', () =>
+    moveWorktreeDirectoryToTrash(worktreePath)
+  )
+  if (!trashPath) {
+    return false
+  }
+  try {
+    await clearGitRegistrationForMissingWorktree(repoPath, worktreePath, options)
+  } catch (error) {
+    // Why: put the checkout back so the in-place removal below still sees the worktree Git registered.
+    if (await restoreWorktreeDirectoryFromTrash(trashPath, worktreePath)) {
+      return false
+    }
+    throw error
+  }
+  scheduleWorktreeTrashDeletion(trashPath)
+  return true
+}
+
+async function clearGitRegistrationForMissingWorktree(
+  repoPath: string,
+  worktreePath: string,
+  options: RemoveWorktreeOptions
+): Promise<void> {
+  const registrationOptions = {
+    ...options,
+    timeout: options.timeout ?? WORKTREE_REMOVAL_REGISTRATION_TIMEOUT_MS
+  }
+  try {
+    // Removing an already-missing directory is accepted back to the Git 2.25 baseline and touches only this entry.
+    await gitExecFileAsync(
+      ['worktree', 'remove', '--force', worktreePath],
+      gitExecOptions(repoPath, registrationOptions)
+    )
+    return
+  } catch (error) {
+    console.warn(
+      `[git] Failed to deregister the moved worktree "${worktreePath}"; pruning instead`,
+      error
+    )
+  }
+
+  await gitExecFileAsync(['worktree', 'prune'], gitExecOptions(repoPath, registrationOptions))
+  // Strict (not the shared scan): an unreadable repo must not read as proof that the row is gone.
+  const stillRegistered = (await listWorktreesStrict(repoPath, registrationOptions)).some(
+    (worktree) => areWorktreePathsEqual(worktree.path, worktreePath)
+  )
+  if (stillRegistered) {
+    throw new Error(`Git still reports a registration for "${worktreePath}" after pruning it.`)
+  }
+}
diff --git a/src/main/git/worktree-scan-cache-sharing.test.ts b/src/main/git/worktree-scan-cache-sharing.test.ts
index cee700b8597..14fd5e86a90 100644
--- a/src/main/git/worktree-scan-cache-sharing.test.ts
+++ b/src/main/git/worktree-scan-cache-sharing.test.ts
@@ -30,6 +30,7 @@ import {
   _getWorktreeScanCacheSizesForTests,
   _resetWorktreeScanCacheForTests,
   listWorktrees,
+  listWorktreesStrict,
   moveWorktree,
   removeWorktree,
   WORKTREE_LIST_TIMEOUT_MS
@@ -120,6 +121,19 @@ describe('listWorktrees in-flight sharing', () => {
     }
   })
 
+  it('distinguishes fail-soft empty results from strict scan failures', async () => {
+    const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => undefined)
+    try {
+      const failure = new Error('git spawn timed out')
+      gitExecFileAsyncMock.mockRejectedValue(failure)
+
+      await expect(listWorktrees('/repo')).resolves.toEqual([])
+      await expect(listWorktreesStrict('/repo')).rejects.toBe(failure)
+    } finally {
+      warnSpy.mockRestore()
+    }
+  })
+
   it('does not share scans across different repos', async () => {
     gitExecFileAsyncMock.mockImplementation((_args: string[], options: { cwd: string }) =>
       Promise.resolve({
diff --git a/src/main/git/worktree-scan-cache.ts b/src/main/git/worktree-scan-cache.ts
new file mode 100644
index 00000000000..2320ecd3fb0
--- /dev/null
+++ b/src/main/git/worktree-scan-cache.ts
@@ -0,0 +1,80 @@
+import type { GitWorktreeInfo } from '../../shared/worktree/types'
+import { listWorktreesUnshared } from './worktree-listing'
+import type { GitWorktreeExecOptions } from './worktree-operation-options'
+import { WORKTREE_LIST_TIMEOUT_MS } from './worktree-operation-options'
+
+// Why: share concurrent `git worktree list` scans, which are expensive on Windows.
+const inFlightWorktreeScans = new Map<string, Promise<GitWorktreeInfo[]>>()
+
+// Why: mutation generations prevent listings from joining stale scans.
+const worktreeScanGenerations = new Map<string, number>()
+
+function hasInFlightWorktreeScanForRepo(repoPath: string): boolean {
+  const keyPrefix = `${repoPath}\0`
+  for (const key of inFlightWorktreeScans.keys()) {
+    if (key.startsWith(keyPrefix)) {
+      return true
+    }
+  }
+  return false
+}
+
+export function bumpWorktreeScanGeneration(repoPath: string): void {
+  // Why: generations only prevent joining a pre-mutation scan; with no active scan, keeping the repo path just leaks completed mutation keys.
+  if (!hasInFlightWorktreeScanForRepo(repoPath)) {
+    return
+  }
+  worktreeScanGenerations.set(repoPath, (worktreeScanGenerations.get(repoPath) ?? 0) + 1)
+}
+
+function pruneWorktreeScanGeneration(repoPath: string): void {
+  // Why: keep ordinary scan settlement O(1); only repos invalidated during an active scan need the cross-generation check.
+  if (!worktreeScanGenerations.has(repoPath)) {
+    return
+  }
+  if (!hasInFlightWorktreeScanForRepo(repoPath)) {
+    worktreeScanGenerations.delete(repoPath)
+  }
+}
+
+export function _getWorktreeScanCacheSizesForTests(): { inFlight: number; generations: number } {
+  return {
+    inFlight: inFlightWorktreeScans.size,
+    generations: worktreeScanGenerations.size
+  }
+}
+
+export function _resetWorktreeScanCacheForTests(): void {
+  inFlightWorktreeScans.clear()
+  worktreeScanGenerations.clear()
+}
+
+/**
+ * List all worktrees for a git repo at the given path. Concurrent calls for
+ * the same repo share one scan (unless the caller passes an AbortSignal,
+ * which must only cancel its own scan).
+ */
+export function listWorktrees(
+  repoPath: string,
+  options: GitWorktreeExecOptions = {}
+): Promise<GitWorktreeInfo[]> {
+  if (options.signal) {
+    return listWorktreesUnshared(repoPath, options)
+  }
+  const generation = worktreeScanGenerations.get(repoPath) ?? 0
+  const timeout = options.timeout ?? WORKTREE_LIST_TIMEOUT_MS
+  // Why: callers with different deadlines cannot safely share which timeout wins the scan.
+  const key = `${repoPath}\0${options.wslDistro ?? ''}\0${timeout}\0${generation}`
+  const inFlight = inFlightWorktreeScans.get(key)
+  if (inFlight) {
+    return inFlight
+  }
+  const scan = listWorktreesUnshared(repoPath, options).finally(() => {
+    if (inFlightWorktreeScans.get(key) === scan) {
+      inFlightWorktreeScans.delete(key)
+    }
+    pruneWorktreeScanGeneration(repoPath)
+  })
+  inFlightWorktreeScans.set(key, scan)
+  return scan
+}
diff --git a/src/main/git/worktree-sparse-add.ts b/src/main/git/worktree-sparse-add.ts
new file mode 100644
index 00000000000..43d13a89fe6
--- /dev/null
+++ b/src/main/git/worktree-sparse-add.ts
@@ -0,0 +1,79 @@
+import { windowsLongPathGitArgs } from '../../shared/windows-long-path-git-args'
+import { gitExecFileAsync } from './runner'
+import { addWorktree, unsetWorktreeCreationBase } from './worktree-add'
+import type {
+  AddWorktreeOptions,
+  AddWorktreeResult,
+  SparseWorktreeCreateError
+} from './worktree-operation-options'
+import { gitExecOptions } from './worktree-operation-options'
+import { removeWorktree } from './worktree-removal'
+
+export async function addSparseWorktree(
+  repoPath: string,
+  worktreePath: string,
+  branch: string,
+  directories: string[],
+  baseBranch?: string,
+  refreshLocalBaseRef = false,
+  options: AddWorktreeOptions = {}
+): Promise<AddWorktreeResult> {
+  let created = false
+  let addResult: AddWorktreeResult = {}
+  try {
+    addResult = await addWorktree(
+      repoPath,
+      worktreePath,
+      branch,
+      baseBranch,
+      refreshLocalBaseRef,
+      true,
+      options
+    )
+    created = true
+    // Why: `worktree add --no-checkout` writes no files, so these are the calls that
+    // actually materialize the deep path and need the long-path escape hatch.
+    const longPathArgs = windowsLongPathGitArgs(worktreePath)
+    await gitExecFileAsync(
+      ['sparse-checkout', 'init', '--cone'],
+      gitExecOptions(worktreePath, options)
+    )
+    await gitExecFileAsync(
+      [...longPathArgs, 'sparse-checkout', 'set', '--', ...directories],
+      gitExecOptions(worktreePath, options)
+    )
+    await gitExecFileAsync(
+      [...longPathArgs, 'checkout', branch],
+      gitExecOptions(worktreePath, options)
+    )
+    return addResult
+  } catch (error) {
+    const wrapped: SparseWorktreeCreateError =
+      error instanceof Error ? (error as SparseWorktreeCreateError) : new Error(String(error))
+    if (created) {
+      if (!options.checkoutExistingBranch) {
+        try {
+          await unsetWorktreeCreationBase(worktreePath, branch, options)
+        } catch (cleanupError) {
+          console.warn(
+            `addSparseWorktree: failed to clear creation base for ${worktreePath}`,
+            cleanupError
+          )
+        }
+      }
+      try {
+        await removeWorktree(repoPath, worktreePath, true, {
+          deleteBranch: !options.checkoutExistingBranch,
+          // Why: failed-creation rollback — the fresh branch has no user commits, so force-delete rather than orphan it.
+          forceBranchDelete: !options.checkoutExistingBranch,
+          ...(options.wslDistro ? { wslDistro: options.wslDistro } : {})
+        })
+      } catch {
+        wrapped.cleanupFailed = true
+        // Why: surface that manual cleanup may be needed, else a half-created worktree lingers silently on disk.
+        wrapped.message = `${wrapped.message} (cleanup also failed — the partially created worktree at "${worktreePath}" may need manual removal)`
+      }
+    }
+    throw wrapped
+  }
+}
diff --git a/src/main/git/worktree-sparse-state.ts b/src/main/git/worktree-sparse-state.ts
new file mode 100644
index 00000000000..1cf55fe712f
--- /dev/null
+++ b/src/main/git/worktree-sparse-state.ts
@@ -0,0 +1,137 @@
+import { readFile, stat } from 'node:fs/promises'
+import { isAbsolute, join, resolve } from 'node:path'
+import { resolveGitDir } from './status'
+
+export async function detectSparseCheckout(worktreePath: string): Promise<boolean> {
+  // Why: fs.stat the per-worktree gitdir's sparse-checkout pattern file instead of a per-poll `git sparse-checkout list` subprocess that regressed responsiveness (PR #1290);
+  // this is the cheap fast-path gate before the enabled check below.
+  try {
+    const gitDir = await resolveGitDir(worktreePath)
+    const stats = await stat(join(gitDir, 'info', 'sparse-checkout'))
+    if (!stats.isFile() || stats.size === 0) {
+      return false
+    }
+    // Why the extra config read: `git sparse-checkout disable` restores every file to the
+    // working tree and sets core.sparseCheckout=false, but it deliberately LEAVES
+    // <gitdir>/info/sparse-checkout in place so the checkout can be re-enabled with the same
+    // patterns. A non-empty pattern file is therefore necessary but not sufficient — without
+    // confirming core.sparseCheckout is actually on we would flag a fully-populated worktree as
+    // sparse and show a misleading "files are not on disk" badge. This runs only for the rare
+    // worktree that still has a non-empty pattern file, so it does not reintroduce the per-poll
+    // subprocess fan-out PR #1290 removed, and it reads git's config files directly (no
+    // subprocess) so it stays cheap and needs no exec options.
+    return await isSparseCheckoutEnabled(gitDir)
+  } catch {
+    return false
+  }
+}
+
+// Resolve the shared common gitdir for a (possibly linked) worktree gitdir. A linked worktree's
+// gitdir holds a `commondir` file pointing at the repo's main `.git`; the main worktree's gitdir
+// is itself the common dir.
+async function resolveGitCommonDir(gitDir: string): Promise<string> {
+  try {
+    const raw = (await readFile(join(gitDir, 'commondir'), 'utf-8')).trim()
+    if (raw.length > 0) {
+      return isAbsolute(raw) ? raw : resolve(gitDir, raw)
+    }
+  } catch {
+    // No `commondir` file: this gitdir is already the common dir.
+  }
+  return gitDir
+}
+
+// Whether core.sparseCheckout is actually enabled for this worktree. The value can live in the
+// shared repo config or, when extensions.worktreeConfig is on, in the worktree-local
+// `config.worktree`; later files override earlier ones, matching git's config precedence.
+async function isSparseCheckoutEnabled(gitDir: string): Promise<boolean> {
+  const commonDir = await resolveGitCommonDir(gitDir)
+  const sharedConfig = await readGitConfigText(join(commonDir, 'config'))
+  const sharedFlag = parseCoreSparseCheckoutFlag(sharedConfig)
+  // Git reads `config.worktree` only while extensions.worktreeConfig is on; without that gate a
+  // stale worktree config left behind by an earlier sparse checkout overrides the real repo value.
+  if (parseGitConfigFlag(sharedConfig, 'extensions', 'worktreeconfig') !== true) {
+    return sharedFlag ?? false
+  }
+  const worktreeConfig = await readGitConfigText(join(gitDir, 'config.worktree'))
+  return parseCoreSparseCheckoutFlag(worktreeConfig) ?? sharedFlag ?? false
+}
+
+async function readGitConfigText(configPath: string): Promise<string> {
+  try {
+    return await readFile(configPath, 'utf-8')
+  } catch {
+    return ''
+  }
+}
+
+// Read the effective `core.sparseCheckout` boolean from one git config file's text, or `undefined`
+// when the plain `[core]` section does not set it. Kept as a pure, exported function so the
+// git-config parsing edge cases can be unit tested without touching the filesystem. Only the last
+// assignment wins, and a `[core "subsection"]` header is intentionally not treated as `[core]`.
+export function parseCoreSparseCheckoutFlag(configContent: string): boolean | undefined {
+  return parseGitConfigFlag(configContent, 'core', 'sparsecheckout')
+}
+
+// A section header may be followed on the same line by further headers and then one assignment
+// (`[core] sparseCheckout = true` is legal git config); the value runs to end of line, so at most
+// one assignment can share a line and the last header before it decides the section.
+const GIT_CONFIG_SECTION_HEADER = /^\[\s*([A-Za-z0-9.-]+)(\s+"(?:[^"\\]|\\.)*")?\s*\]/
+const GIT_CONFIG_ASSIGNMENT = /^([A-Za-z][A-Za-z0-9-]*)\s*(?:=\s*(.*))?$/
+
+// `section` and `key` must be lowercase: git config names are case-insensitive.
+function parseGitConfigFlag(
+  configContent: string,
+  section: string,
+  key: string
+): boolean | undefined {
+  let inSection = false
+  let value: boolean | undefined
+  for (const rawLine of configContent.split(/\r?\n/)) {
+    let rest = stripGitConfigComment(rawLine).trim()
+    for (
+      let header = rest.match(GIT_CONFIG_SECTION_HEADER);
+      header;
+      header = rest.match(GIT_CONFIG_SECTION_HEADER)
+    ) {
+      inSection = header[1].toLowerCase() === section && header[2] === undefined
+      rest = rest.slice(header[0].length).trim()
+    }
+    if (!inSection || rest.length === 0) {
+      continue
+    }
+    const assignment = rest.match(GIT_CONFIG_ASSIGNMENT)
+    if (!assignment || assignment[1].toLowerCase() !== key) {
+      continue
+    }
+    value = parseGitConfigBoolean(assignment[2])
+  }
+  return value
+}
+
+// Drop a trailing `#`/`;` comment that is not inside a double-quoted value.
+function stripGitConfigComment(line: string): string {
+  let inQuotes = false
+  for (let index = 0; index < line.length; index += 1) {
+    const char = line[index]
+    if (char === '"' && line[index - 1] !== '\\') {
+      inQuotes = !inQuotes
+    } else if ((char === '#' || char === ';') && !inQuotes) {
+      return line.slice(0, index)
+    }
+  }
+  return line
+}
+
+// Git treats a valueless boolean (`sparseCheckout` with no `=`) as true and only true/yes/on/1 as
+// true otherwise; everything else (including the disable-written `false`) is false.
+function parseGitConfigBoolean(raw: string | undefined): boolean {
+  if (raw === undefined) {
+    return true
+  }
+  const value = raw
+    .trim()
+    .replace(/^"(.*)"$/, '$1')
+    .toLowerCase()
+  return value === 'true' || value === 'yes' || value === 'on' || value === '1'
+}
diff --git a/src/main/git/worktree.ts b/src/main/git/worktree.ts
index 55c5d33cf79..da9cb42e898 100644
--- a/src/main/git/worktree.ts
+++ b/src/main/git/worktree.ts
@@ -1,1693 +1,28 @@
-/* eslint-disable max-lines -- Why: this file keeps git worktree create/remove behavior together so local cleanup and creation invariants stay in one place. */
-import { readFile, stat } from 'node:fs/promises'
-import { isAbsolute, join, posix, resolve, win32 } from 'node:path'
-import {
-  branchHasNoUnmergedChangesWithLazyTargetRefresh,
-  getBranchCleanupTargetRefs
-} from '../../shared/git-branch-cleanup'
-import { resolveWorktreeAddBaseRef } from '../../shared/worktree/base-ref'
-import { withSpan } from '../observability/tracer'
-import { withWorktreeRemoveStageSpan } from '../observability/instrumentation'
-import {
-  moveWorktreeDirectoryToTrash,
-  restoreWorktreeDirectoryFromTrash,
-  scheduleWorktreeTrashDeletion
-} from '../worktree-trash'
-import { parseWslPath } from '../wsl'
-import { windowsLongPathGitArgs } from '../../shared/windows-long-path-git-args'
-import type {
-  LocalBaseRefRefreshResult,
-  LocalBaseRefUpdateSuggestion
-} from '../../shared/worktree/base-ref-drift-types'
-import type { RemoveWorktreeResult } from '../../shared/worktree/create-types'
-import type { GitWorktreeInfo } from '../../shared/worktree/types'
-import { assertWorktreeUnlockedForRemoval } from '../../shared/worktree/removal'
-import { isSubmoduleWorktreeRemovalRefusal } from '../../shared/worktree/submodule-removal'
-import { decodeGitCQuotedPath } from '../../shared/git-cquoted-path'
-import { parseGitRevListAheadBehindCounts } from '../../shared/git-rev-list-output'
-import { parseWslUncPath } from '../../shared/wsl-paths'
-import {
-  hasUnsupportedRevParsePathFormatEcho,
-  isUnsupportedRevParsePathFormatError,
-  isUnsupportedWorktreeListZError
-} from '../../shared/git-worktree-command-capabilities'
-import { withLocalGitCapabilityCacheForExecution } from './git-capability-state'
-import { gitExecFileAsync, translateWslOutputPaths } from './runner'
-import { resolveGitDir, runWithGitReadCacheInvalidation } from './status'
-import { hasWorktreeBaseCommitRef, probeWorktreeBaseRefPresence } from './worktree-base-ref-probe'
-
-export type AddWorktreeResult = {
-  localBaseRefRefresh?: LocalBaseRefRefreshResult
-  localBaseRefUpdateSuggestion?: LocalBaseRefUpdateSuggestion
-}
-
-type SparseWorktreeCreateError = Error & {
-  cleanupFailed?: boolean
-}
-
-export type GitWorktreeExecOptions = {
-  wslDistro?: string
-  signal?: AbortSignal
-  timeout?: number
-}
-
-type WorktreeRemovalPreflightOptions = GitWorktreeExecOptions & {
-  ignoredUntrackedPaths?: readonly string[]
-}
-
-export type AddWorktreeOptions = GitWorktreeExecOptions & {
-  checkoutExistingBranch?: boolean
-  suggestLocalBaseRefUpdate?: boolean
-  remoteTrackingBase?: {
-    base: string
-    branch: string
-    ref: string
-  }
-}
-
-export type RemoveWorktreeOptions = GitWorktreeExecOptions & {
-  deleteBranch?: boolean
-  forceBranchDelete?: boolean
-  knownRemovedWorktree?: Pick<GitWorktreeInfo, 'branch' | 'head' | 'locked' | 'lockReason'>
-}
-
-type LocalBaseRefRefreshability =
-  | {
-      refreshable: true
-      baseRef: string
-      localBranch: string
-      fullRef: string
-      remoteTrackingRef: string
-      localOid: string
-      remoteOid: string
-      behind: number
-      ownerWorktreePath?: string
-    }
-  | {
-      refreshable: false
-      result: LocalBaseRefRefreshResult
-    }
-
-const SPARSE_CHECKOUT_DETECTION_CONCURRENCY = 8
-
-const PRUNABLE_EXISTENCE_PROBE_CONCURRENCY = 8
-
-// Why: bound `git worktree add` so a OneDrive cloud-placeholder stall fails fast (STA-1292); ample for an ordinary large checkout, but not one behind a slow content filter (#12696).
-// Doubles as the floor for ORCA_WORKTREE_ADD_TIMEOUT_MS — lowering it to fail faster also lowers the minimum any override can request.
-export const WORKTREE_ADD_TIMEOUT_MS = 180_000
-// Why: ceiling for ORCA_WORKTREE_ADD_TIMEOUT_MS (#12696) — ~8x the slowest reported checkout (3.5 min). The cost is that a genuine stall now blocks a create for up to 30 min instead of 3.
-export const WORKTREE_ADD_TIMEOUT_MAX_MS = 30 * 60_000
-export const WORKTREE_REMOVAL_PREFLIGHT_TIMEOUT_MS = 30_000
-export const WORKTREE_REMOVAL_REGISTRATION_TIMEOUT_MS = 30_000
-// Why: one wedged shared scan otherwise hangs every later list, including create's post-add re-list.
-export const WORKTREE_LIST_TIMEOUT_MS = 30_000
-
-/**
- * `ORCA_WORKTREE_ADD_TIMEOUT_MS` clamped into [{@link WORKTREE_ADD_TIMEOUT_MS},
- * {@link WORKTREE_ADD_TIMEOUT_MAX_MS}]; unset, blank, or unparseable yields the default.
- * Warns when a non-blank value is rejected or clamped; trimming and fractional truncation are silent.
- * `env` is injectable for tests.
- */
-export function resolveWorktreeAddTimeoutMs(env: NodeJS.ProcessEnv = process.env): number {
-  const raw = env.ORCA_WORKTREE_ADD_TIMEOUT_MS?.trim()
-  const requested = Math.floor(Number(raw))
-  // Why: `=300` reads as seconds to most operators, so clamp rather than obey.
-  const resolved = Number.isNaN(requested)
-    ? WORKTREE_ADD_TIMEOUT_MS
-    : Math.min(Math.max(requested, WORKTREE_ADD_TIMEOUT_MS), WORKTREE_ADD_TIMEOUT_MAX_MS)
-  // Why: an `isNaN` guard here would delete the unparseable-value warning — comparing against NaN is unequal, and that is what catches it.
-  if (raw && resolved !== requested) {
-    const problem = Number.isNaN(requested)
-      ? // Why: `600_000` copied out of this file is NaN, not out of range — say which.
-        'is not a number'
-      : `is outside [${WORKTREE_ADD_TIMEOUT_MS}, ${WORKTREE_ADD_TIMEOUT_MAX_MS}]ms`
-    console.warn(
-      `[git/worktree] ORCA_WORKTREE_ADD_TIMEOUT_MS="${raw}" ${problem}; using ${resolved}ms`
-    )
-  }
-  return resolved
-}
-
-function gitExecOptions(
-  cwd: string,
-  options: GitWorktreeExecOptions = {}
-): { cwd: string; wslDistro?: string; signal?: AbortSignal; timeout?: number } {
-  return {
-    cwd,
-    ...(options.wslDistro ? { wslDistro: options.wslDistro } : {}),
-    ...(options.signal ? { signal: options.signal } : {}),
-    ...(options.timeout ? { timeout: options.timeout } : {})
-  }
-}
-
-function getErrorCode(error: unknown): string | undefined {
-  return typeof error === 'object' && error !== null && 'code' in error
-    ? String((error as { code?: unknown }).code)
-    : undefined
-}
-
-function getErrorText(error: unknown): string {
-  if (typeof error === 'object' && error !== null) {
-    const parts: string[] = []
-    if ('message' in error && typeof error.message === 'string') {
-      parts.push(error.message)
-    }
-    if ('stderr' in error && typeof error.stderr === 'string') {
-      parts.push(error.stderr)
-    }
-    return parts.join('\n')
-  }
-  return String(error)
-}
-
-function isNotGitRepositoryError(error: unknown): boolean {
-  return /not a git repository/i.test(getErrorText(error))
-}
-
-function isBranchCheckedOutInWorktreeError(error: unknown): boolean {
-  return /cannot delete branch .*(?:used by worktree|checked out)|branch .*is checked out/i.test(
-    getErrorText(error)
-  )
-}
-
-function normalizeLocalBranchRef(branch: string): string {
-  return branch.replace(/^refs\/heads\//, '')
-}
-
-function parseRemoteTrackingLocalBaseRef(
-  baseBranch: string,
-  remoteTrackingRef: string,
-  remoteTrackingBase?: AddWorktreeOptions['remoteTrackingBase']
-): { baseRef: string; localBranch: string; fullRef: string } | undefined {
-  if (remoteTrackingBase?.ref === remoteTrackingRef) {
-    return {
-      baseRef: remoteTrackingBase.base,
-      localBranch: remoteTrackingBase.branch,
-      fullRef: `refs/heads/${remoteTrackingBase.branch}`
-    }
-  }
-
-  const remoteRefPrefix = 'refs/remotes/'
-  if (!remoteTrackingRef.startsWith(remoteRefPrefix)) {
-    return undefined
-  }
-
-  // Why: only proven remote-tracking refs get refresh status; slash-containing local branches (release/2026) must not fake a "not refreshed" warning.
-  const shortRemoteRef = remoteTrackingRef.slice(remoteRefPrefix.length)
-  const slashIndex = shortRemoteRef.indexOf('/')
-  if (slashIndex <= 0) {
-    return undefined
-  }
-
-  const localBranch = shortRemoteRef.slice(slashIndex + 1)
-  return {
-    baseRef: baseBranch,
-    localBranch,
-    fullRef: `refs/heads/${localBranch}`
-  }
-}
-
-function parseRevListDrift(output: string): { ahead: number; behind: number } | null {
-  const counts = parseGitRevListAheadBehindCounts(output)
-  return counts.status === 'ok' ? { ahead: counts.ahead, behind: counts.behind } : null
-}
-
-async function evaluateLocalBaseRefRefreshability(
-  repoPath: string,
-  baseBranch: string,
-  remoteTrackingRef: string,
-  remoteTrackingBase?: AddWorktreeOptions['remoteTrackingBase'],
-  options: GitWorktreeExecOptions = {},
-  shouldInspectOwner: (behind: number) => boolean = () => true
-): Promise<LocalBaseRefRefreshability | undefined> {
-  const parsed = parseRemoteTrackingLocalBaseRef(baseBranch, remoteTrackingRef, remoteTrackingBase)
-  if (!parsed) {
-    return undefined
-  }
-
-  const resultBase = { baseRef: parsed.baseRef, localBranch: parsed.localBranch }
-
-  let drift: { ahead: number; behind: number }
-  let localOid = ''
-  let remoteOid = ''
-  try {
-    // Why: advisory and mutating paths must agree on "safe to fast-forward"; `rev-list A...B` proves no local-only commits and how far behind.
-    const { stdout } = await gitExecFileAsync(
-      ['rev-list', '--left-right', '--count', `${parsed.fullRef}...${remoteTrackingRef}`],
-      gitExecOptions(repoPath, options)
-    )
-    const parsedDrift = parseRevListDrift(stdout)
-    if (!parsedDrift || parsedDrift.ahead !== 0) {
-      return { refreshable: false, result: { ...resultBase, status: 'skipped_not_fast_forward' } }
-    }
-    if (!shouldInspectOwner(parsedDrift.behind)) {
-      // Why: a current local ref yields no update suggestion, so the advisory path skips OID resolution and owner inspection.
-      return undefined
-    }
-    const { stdout: localOidOutput } = await gitExecFileAsync(
-      ['rev-parse', '--verify', `${parsed.fullRef}^{commit}`],
-      gitExecOptions(repoPath, options)
-    )
-    localOid = localOidOutput.trim()
-    if (!localOid) {
-      return { refreshable: false, result: { ...resultBase, status: 'skipped_not_fast_forward' } }
-    }
-    const { stdout: remoteOidOutput } = await gitExecFileAsync(
-      ['rev-parse', '--verify', `${remoteTrackingRef}^{commit}`],
-      gitExecOptions(repoPath, options)
-    )
-    remoteOid = remoteOidOutput.trim()
-    if (!remoteOid) {
-      return { refreshable: false, result: { ...resultBase, status: 'skipped_not_fast_forward' } }
-    }
-    await gitExecFileAsync(
-      ['merge-base', '--is-ancestor', localOid, remoteOid],
-      gitExecOptions(repoPath, options)
-    )
-    drift = parsedDrift
-  } catch {
-    // Why (#15331): the probes above also fail when refs/heads/<branch> is simply absent; a branch that
-    // does not exist yet cannot be stale, so report nothing instead of a bogus divergence warning.
-    // Only a proven absence suppresses: an unusable repo leaves the warning alone.
-    const presence = await probeWorktreeBaseRefPresence(
-      (args) => gitExecFileAsync(args, gitExecOptions(repoPath, options)),
-      parsed.fullRef
-    )
-    if (presence === 'absent') {
-      return undefined
-    }
-    return { refreshable: false, result: { ...resultBase, status: 'skipped_not_fast_forward' } }
-  }
-
-  try {
-    // Why: if the local base branch is checked out, only update it when that owner worktree is clean.
-    const { stdout: worktreeListOutput } = await gitExecFileAsync(
-      ['worktree', 'list', '--porcelain'],
-      gitExecOptions(repoPath, options)
-    )
-    const worktrees = parseWorktreeList(
-      translateWslOutputPaths(worktreeListOutput, repoPath, options)
-    )
-    const ownerWorktree = worktrees.find((wt) => wt.branch === parsed.fullRef)
-
-    if (ownerWorktree) {
-      const { stdout: status } = await gitExecFileAsync(
-        ['status', '--porcelain', '--untracked-files=no'],
-        gitExecOptions(ownerWorktree.path, options)
-      )
-      if (status.trim()) {
-        return {
-          refreshable: false,
-          result: {
-            ...resultBase,
-            status: 'skipped_dirty_worktree',
-            ownerWorktreePath: ownerWorktree.path
-          }
-        }
-      }
-      return {
-        refreshable: true,
-        ...resultBase,
-        fullRef: parsed.fullRef,
-        remoteTrackingRef,
-        localOid,
-        remoteOid,
-        behind: drift.behind,
-        ownerWorktreePath: ownerWorktree.path
-      }
-    }
-
-    // Why: localBranch isn't checked out anywhere, so a bare-ref fast-forward is safe; omitting ownerWorktreePath signals the mutating path to take it.
-    return {
-      refreshable: true,
-      ...resultBase,
-      fullRef: parsed.fullRef,
-      remoteTrackingRef,
-      localOid,
-      remoteOid,
-      behind: drift.behind
-    }
-  } catch {
-    return { refreshable: false, result: { ...resultBase, status: 'skipped_error' } }
-  }
-}
-
-async function getLocalBaseRefUpdateSuggestionForWorktreeCreate(
-  repoPath: string,
-  baseBranch: string,
-  remoteTrackingRef: string,
-  remoteTrackingBase?: AddWorktreeOptions['remoteTrackingBase'],
-  options: GitWorktreeExecOptions = {}
-): Promise<LocalBaseRefUpdateSuggestion | undefined> {
-  const evaluation = await evaluateLocalBaseRefRefreshability(
-    repoPath,
-    baseBranch,
-    remoteTrackingRef,
-    remoteTrackingBase,
-    options,
-    (behind) => behind > 0
-  )
-  if (!evaluation?.refreshable || evaluation.behind <= 0) {
-    return undefined
-  }
-  return {
-    baseRef: evaluation.baseRef,
-    localBranch: evaluation.localBranch,
-    behind: evaluation.behind
-  }
-}
-
-async function persistWorktreeCreationBase(
-  worktreePath: string,
-  branch: string,
-  effectiveBase: string,
-  options: GitWorktreeExecOptions = {}
-): Promise<void> {
-  const configKey = `branch.${branch}.base`
-  try {
-    await gitExecFileAsync(['config', '--local', '--replace-all', configKey, effectiveBase], {
-      ...gitExecOptions(worktreePath, options)
-    })
-  } catch (error) {
-    console.warn(`addWorktree: failed to set ${configKey} for ${worktreePath}`, error)
-    try {
-      // Why: reused branch names may carry stale base metadata; if replacement fails, unset it so consumers don't trust stale lineage.
-      await gitExecFileAsync(['config', '--local', '--unset-all', configKey], {
-        ...gitExecOptions(worktreePath, options)
-      })
-    } catch (unsetError) {
-      console.warn(
-        `addWorktree: failed to unset stale ${configKey} for ${worktreePath}`,
-        unsetError
-      )
-    }
-  }
-}
-
-async function unsetWorktreeCreationBase(
-  worktreePath: string,
-  branch: string,
-  options: GitWorktreeExecOptions = {}
-): Promise<void> {
-  try {
-    await gitExecFileAsync(['config', '--local', '--unset-all', `branch.${branch}.base`], {
-      ...gitExecOptions(worktreePath, options)
-    })
-  } catch {
-    // Best-effort cleanup; leave the original sparse-setup error as the actionable failure.
-  }
-}
-
-function areWorktreePathsEqual(
-  leftPath: string,
-  rightPath: string,
-  platform = process.platform
-): boolean {
-  if (platform === 'win32' || looksLikeWindowsPath(leftPath) || looksLikeWindowsPath(rightPath)) {
-    return (
-      win32.normalize(win32.resolve(leftPath)).toLowerCase() ===
-      win32.normalize(win32.resolve(rightPath)).toLowerCase()
-    )
-  }
-  return posix.normalize(posix.resolve(leftPath)) === posix.normalize(posix.resolve(rightPath))
-}
-
-function looksLikeWindowsPath(pathValue: string): boolean {
-  return /^[A-Za-z]:[\\/]/.test(pathValue) || pathValue.startsWith('\\\\')
-}
-
-function resolveRevParsePath(repoPath: string, value: string): string {
-  if (posix.isAbsolute(value) || win32.isAbsolute(value)) {
-    return value
-  }
-  // Old git ignores `--path-format=absolute`, so resolve a relative toplevel/git-dir against the scanned repo path.
-  return looksLikeWindowsPath(repoPath)
-    ? win32.resolve(repoPath, value)
-    : posix.resolve(repoPath, value)
-}
-
-type RepoLocation = { topLevel: string; commonDir: string }
-
-function parseRepoLocation(repoPath: string, output: string): RepoLocation | undefined {
-  // Old git echoes the unrecognized `--path-format` flag and exits 0, so drop `-`-prefixed lines and
-  // read the last two path lines (toplevel, git-common-dir); strip only trailing CR — paths may have edge spaces.
-  const lines = output
-    .split('\n')
-    .map((line) => (line.endsWith('\r') ? line.slice(0, -1) : line))
-    .filter((line) => line.length > 0 && !line.startsWith('-'))
-  if (lines.length < 2) {
-    return undefined
-  }
-  const [topLevel, commonDir] = lines.slice(-2)
-  return {
-    topLevel: resolveRevParsePath(repoPath, topLevel),
-    commonDir: resolveRevParsePath(repoPath, commonDir)
-  }
-}
-
-async function readRepoLocation(
-  repoPath: string,
-  resolveBasePath: string,
-  options: GitWorktreeExecOptions = {}
-): Promise<RepoLocation | undefined> {
-  try {
-    return await withLocalGitCapabilityCacheForExecution(
-      { cwd: repoPath, wslDistro: options.wslDistro, signal: options.signal },
-      (capabilities) =>
-        capabilities.runWithFallback(
-          'rev-parse-path-format',
-          async () => {
-            const { stdout } = await gitExecFileAsync(
-              ['rev-parse', '--path-format=absolute', '--show-toplevel', '--git-common-dir'],
-              gitExecOptions(repoPath, options)
-            )
-            if (hasUnsupportedRevParsePathFormatEcho(stdout)) {
-              // Why: some old Git echoes the unknown option and exits zero; remember that compat signal even though parsing recovers.
-              capabilities.rememberUnsupported('rev-parse-path-format')
-            }
-            return parseRepoLocation(resolveBasePath, stdout)
-          },
-          async () => {
-            const { stdout } = await gitExecFileAsync(
-              ['rev-parse', '--show-toplevel', '--git-common-dir'],
-              gitExecOptions(repoPath, options)
-            )
-            return parseRepoLocation(resolveBasePath, stdout)
-          },
-          isUnsupportedRevParsePathFormatError
-        )
-    )
-  } catch {
-    return undefined
-  }
-}
-
-async function normalizeMainWorktreePath(
-  repoPath: string,
-  worktrees: GitWorktreeInfo[],
-  options: GitWorktreeExecOptions = {}
-): Promise<GitWorktreeInfo[]> {
-  const mainIndex = worktrees.findIndex((worktree) => worktree.isMainWorktree)
-  const mainWorktree = worktrees[mainIndex]
-  // Why: under WSL, porcelain/rev-parse paths are Linux but repoPath is UNC; compare in Git-output
-  // space so the early-return matches and we skip a needless rev-parse per poll (runner still gets repoPath).
-  const wslRepo = parseWslUncPath(repoPath)
-  const comparablePath = wslRepo ? wslRepo.linuxPath : repoPath
-  if (!mainWorktree || areWorktreePathsEqual(mainWorktree.path, comparablePath)) {
-    return worktrees
-  }
-
-  const location = await readRepoLocation(repoPath, comparablePath, options)
-  if (!location) {
-    return worktrees
-  }
-
-  // Why: only a separate-git-dir/submodule main worktree reports git-common-dir as its path; gate on
-  // that equality so we don't overwrite a linked worktree's real working root with its own toplevel.
-  if (!areWorktreePathsEqual(mainWorktree.path, location.commonDir)) {
-    return worktrees
-  }
-
-  const normalized = [...worktrees]
-  normalized[mainIndex] = { ...mainWorktree, path: location.topLevel }
-  return normalized
-}
-
-/**
- * Parse the porcelain output of `git worktree list --porcelain`.
- */
-export function parseWorktreeList(
-  output: string,
-  options: { nulDelimited?: boolean } = {}
-): GitWorktreeInfo[] {
-  const worktrees: GitWorktreeInfo[] = []
-  const blocks = options.nulDelimited ? splitNulWorktreeList(output) : splitLineWorktreeList(output)
-
-  for (const lines of blocks) {
-    if (lines.length === 0) {
-      continue
-    }
-
-    let path = ''
-    let head = ''
-    let branch = ''
-    let isBare = false
-    let isSparse = false
-    let locked = false
-    let lockReason = ''
-    let prunable = false
-    let prunableReason = ''
-
-    for (const line of lines) {
-      if (line.startsWith('worktree ')) {
-        path = line.slice('worktree '.length)
-      } else if (line.startsWith('HEAD ')) {
-        head = line.slice('HEAD '.length)
-      } else if (line.startsWith('branch ')) {
-        branch = line.slice('branch '.length)
-      } else if (line === 'bare') {
-        isBare = true
-      } else if (line === 'sparse') {
-        isSparse = true
-      } else if (line === 'locked' || line.startsWith('locked ')) {
-        locked = true
-        const rawReason = line.slice('locked'.length).trim()
-        lockReason = options.nulDelimited ? rawReason : decodeGitCQuotedPath(rawReason)
-      } else if (line === 'prunable' || line.startsWith('prunable ')) {
-        // Why: Git ≥2.36 flags registrations whose directory is gone; ignoring it shows the stale worktree as live (#8389).
-        prunable = true
-        const rawReason = line.slice('prunable'.length).trim()
-        prunableReason = options.nulDelimited ? rawReason : decodeGitCQuotedPath(rawReason)
-      }
-    }
-
-    if (path) {
-      // `git worktree list` always emits the main working tree first.
-      worktrees.push({
-        path,
-        head,
-        branch,
-        isBare,
-        ...(isSparse ? { isSparse } : {}),
-        ...(locked ? { locked: true } : {}),
-        ...(lockReason ? { lockReason } : {}),
-        ...(prunable ? { prunable: true } : {}),
-        ...(prunableReason ? { prunableReason } : {}),
-        isMainWorktree: worktrees.length === 0
-      })
-    }
-  }
-
-  return worktrees
-}
-
-function splitLineWorktreeList(output: string): string[][] {
-  return output
-    .trim()
-    .split(/\r?\n\r?\n/)
-    .map((block) => block.trim().split(/\r?\n/))
-}
-
-function splitNulWorktreeList(output: string): string[][] {
-  if (!output.includes('\0')) {
-    return splitLineWorktreeList(output)
-  }
-
-  const blocks: string[][] = []
-  let currentBlock: string[] = []
-
-  for (const field of output.split('\0')) {
-    if (field) {
-      currentBlock.push(field)
-      continue
-    }
-    if (currentBlock.length > 0) {
-      blocks.push(currentBlock)
-      currentBlock = []
-    }
-  }
-
-  if (currentBlock.length > 0) {
-    blocks.push(currentBlock)
-  }
-
-  return blocks
-}
-
-async function readWorktreeList(
-  repoPath: string,
-  options: GitWorktreeExecOptions = {}
-): Promise<GitWorktreeInfo[]> {
-  const execOptions = {
-    cwd: repoPath,
-    ...options,
-    timeout: options.timeout ?? WORKTREE_LIST_TIMEOUT_MS
-  }
-  return withLocalGitCapabilityCacheForExecution(
-    { cwd: repoPath, wslDistro: options.wslDistro, signal: options.signal },
-    (capabilities) =>
-      capabilities.runWithFallback(
-        'worktree-list-z',
-        async () => {
-          const { stdout } = await gitExecFileAsync(
-            ['worktree', 'list', '--porcelain', '-z'],
-            execOptions
-          )
-          return normalizeMainWorktreePath(
-            repoPath,
-            parseWorktreeList(stdout, { nulDelimited: true }),
-            options
-          )
-        },
-        async () => {
-          // Why: `-z` preserves worktree paths with newlines but Git <2.36 rejects it; fall back to the line parser.
-          const { stdout } = await gitExecFileAsync(
-            ['worktree', 'list', '--porcelain'],
-            execOptions
-          )
-          const normalized = await normalizeMainWorktreePath(
-            repoPath,
-            parseWorktreeList(stdout),
-            options
-          )
-          // Why: Git <2.31 emits no `prunable`, so probe each linked path for existence instead of trusting
-          // stale registrations; a harmless backstop on 2.31–2.35 where parseWorktreeList already set it (#8389).
-          return annotatePrunableByExistence(normalized, repoPath, options)
-        },
-        isUnsupportedWorktreeListZError
-      )
-  )
-}
-
-async function annotatePrunableByExistence(
-  worktrees: GitWorktreeInfo[],
-  repoPath: string,
-  options: GitWorktreeExecOptions = {}
-): Promise<GitWorktreeInfo[]> {
-  const annotated = [...worktrees]
-  let nextIndex = 0
-
-  async function probeNext(): Promise<void> {
-    while (nextIndex < worktrees.length) {
-      const index = nextIndex
-      nextIndex += 1
-      const worktree = worktrees[index]
-      // Git only prunes linked worktrees, never locked ones (a lock shields a missing dir; `locked`
-      // parses only on Git >=2.31). A missing main worktree is handled by the repo-level ENOENT paths.
-      if (
-        !worktree ||
-        worktree.isMainWorktree ||
-        worktree.isBare ||
-        worktree.locked ||
-        worktree.prunable
-      ) {
-        continue
-      }
-      try {
-        await stat(translateWorktreePath(worktree.path, repoPath, options))
-      } catch (err) {
-        if (getErrorCode(err) === 'ENOENT') {
-          annotated[index] = { ...worktree, prunable: true }
-        }
-      }
-    }
-  }
-
-  const workerCount = Math.min(PRUNABLE_EXISTENCE_PROBE_CONCURRENCY, worktrees.length)
-  await Promise.all(Array.from({ length: workerCount }, () => probeNext()))
-  return annotated
-}
-
-async function readTranslatedWorktreeGraph(
-  repoPath: string,
-  options: GitWorktreeExecOptions = {}
-): Promise<GitWorktreeInfo[]> {
-  return (await readWorktreeList(repoPath, options)).map((worktree) => {
-    const translatedPath = translateWorktreePath(worktree.path, repoPath, options)
-    return translatedPath === worktree.path ? worktree : { ...worktree, path: translatedPath }
-  })
-}
-
-export async function listWorktreeGraph(
-  repoPath: string,
-  options: GitWorktreeExecOptions = {}
-): Promise<GitWorktreeInfo[]> {
-  try {
-    return await readTranslatedWorktreeGraph(repoPath, options)
-  } catch (err) {
-    if (getErrorCode(err) === 'ENOENT') {
-      try {
-        await stat(repoPath)
-      } catch (statErr) {
-        if (getErrorCode(statErr) === 'ENOENT') {
-          console.warn(`[git/worktree] repo path missing; skipping worktree list: ${repoPath}`)
-          return []
-        }
-      }
-    }
-    if (isNotGitRepositoryError(err)) {
-      return []
-    }
-    console.warn(`[git/worktree] listWorktreeGraph failed for ${repoPath}:`, err)
-    return []
-  }
-}
-
-// Why: share concurrent `git worktree list` scans, which are expensive on Windows.
-const inFlightWorktreeScans = new Map<string, Promise<GitWorktreeInfo[]>>()
-
-// Why: mutation generations prevent listings from joining stale scans.
-const worktreeScanGenerations = new Map<string, number>()
-
-function hasInFlightWorktreeScanForRepo(repoPath: string): boolean {
-  const keyPrefix = `${repoPath}\0`
-  for (const key of inFlightWorktreeScans.keys()) {
-    if (key.startsWith(keyPrefix)) {
-      return true
-    }
-  }
-  return false
-}
-
-function bumpWorktreeScanGeneration(repoPath: string): void {
-  // Why: generations only prevent joining a pre-mutation scan; with no active scan, keeping the repo path just leaks completed mutation keys.
-  if (!hasInFlightWorktreeScanForRepo(repoPath)) {
-    return
-  }
-  worktreeScanGenerations.set(repoPath, (worktreeScanGenerations.get(repoPath) ?? 0) + 1)
-}
-
-function pruneWorktreeScanGeneration(repoPath: string): void {
-  // Why: keep ordinary scan settlement O(1); only repos invalidated during an active scan need the cross-generation check.
-  if (!worktreeScanGenerations.has(repoPath)) {
-    return
-  }
-  if (!hasInFlightWorktreeScanForRepo(repoPath)) {
-    worktreeScanGenerations.delete(repoPath)
-  }
-}
-
-export function _getWorktreeScanCacheSizesForTests(): { inFlight: number; generations: number } {
-  return {
-    inFlight: inFlightWorktreeScans.size,
-    generations: worktreeScanGenerations.size
-  }
-}
-
-export function _resetWorktreeScanCacheForTests(): void {
-  inFlightWorktreeScans.clear()
-  worktreeScanGenerations.clear()
-}
-
-/**
- * List all worktrees for a git repo at the given path. Concurrent calls for
- * the same repo share one scan (unless the caller passes an AbortSignal,
- * which must only cancel its own scan).
- */
-export function listWorktrees(
-  repoPath: string,
-  options: GitWorktreeExecOptions = {}
-): Promise<GitWorktreeInfo[]> {
-  if (options.signal) {
-    return listWorktreesUnshared(repoPath, options)
-  }
-  const generation = worktreeScanGenerations.get(repoPath) ?? 0
-  const timeout = options.timeout ?? WORKTREE_LIST_TIMEOUT_MS
-  // Why: callers with different deadlines cannot safely share which timeout wins the scan.
-  const key = `${repoPath}\0${options.wslDistro ?? ''}\0${timeout}\0${generation}`
-  const inFlight = inFlightWorktreeScans.get(key)
-  if (inFlight) {
-    return inFlight
-  }
-  const scan = listWorktreesUnshared(repoPath, options).finally(() => {
-    if (inFlightWorktreeScans.get(key) === scan) {
-      inFlightWorktreeScans.delete(key)
-    }
-    pruneWorktreeScanGeneration(repoPath)
-  })
-  inFlightWorktreeScans.set(key, scan)
-  return scan
-}
-
-async function listWorktreesUnshared(
-  repoPath: string,
-  options: GitWorktreeExecOptions = {}
-): Promise<GitWorktreeInfo[]> {
-  try {
-    const worktrees = await readTranslatedWorktreeGraph(repoPath, options)
-    return annotateSparseCheckoutStatus(worktrees)
-  } catch (err) {
-    if (getErrorCode(err) === 'ENOENT') {
-      try {
-        await stat(repoPath)
-      } catch (statErr) {
-        if (getErrorCode(statErr) === 'ENOENT') {
-          console.warn(`[git/worktree] repo path missing; skipping worktree list: ${repoPath}`)
-          return []
-        }
-      }
-    }
-    if (isNotGitRepositoryError(err)) {
-      return []
-    }
-    // Why: don't swallow git-compat/repo-state failures — else they resurface as opaque "created but not found in listing" errors.
-    console.warn(`[git/worktree] listWorktrees failed for ${repoPath}:`, err)
-    return []
-  }
-}
-
-export async function listWorktreesStrict(
-  repoPath: string,
-  options: GitWorktreeExecOptions = {}
-): Promise<GitWorktreeInfo[]> {
-  const worktrees = (await readWorktreeList(repoPath, options)).map((worktree) => {
-    const translatedPath = translateWorktreePath(worktree.path, repoPath, options)
-    return translatedPath === worktree.path ? worktree : { ...worktree, path: translatedPath }
-  })
-  return annotateSparseCheckoutStatus(worktrees)
-}
-
-async function annotateSparseCheckoutStatus(
-  worktrees: GitWorktreeInfo[]
-): Promise<GitWorktreeInfo[]> {
-  const annotated = [...worktrees]
-  let nextIndex = 0
-
-  async function detectNext(): Promise<void> {
-    while (nextIndex < worktrees.length) {
-      const index = nextIndex
-      nextIndex += 1
-      const worktree = worktrees[index]
-      if (!worktree || worktree.isBare || worktree.isSparse) {
-        continue
-      }
-      const isSparse = await detectSparseCheckout(worktree.path)
-      if (isSparse) {
-        annotated[index] = { ...worktree, isSparse }
-      }
-    }
-  }
-
-  // Why: cap concurrency so status-poll refreshes don't fan out many sparse-checkout filesystem probes at once.
-  const workerCount = Math.min(SPARSE_CHECKOUT_DETECTION_CONCURRENCY, worktrees.length)
-  await Promise.all(Array.from({ length: workerCount }, () => detectNext()))
-  return annotated
-}
-
-async function refreshLocalBaseRefForWorktreeCreate(
-  repoPath: string,
-  baseBranch: string,
-  remoteTrackingRef: string,
-  remoteTrackingBase?: AddWorktreeOptions['remoteTrackingBase'],
-  options: GitWorktreeExecOptions = {}
-): Promise<LocalBaseRefRefreshResult | undefined> {
-  const evaluation = await evaluateLocalBaseRefRefreshability(
-    repoPath,
-    baseBranch,
-    remoteTrackingRef,
-    remoteTrackingBase,
-    options
-  )
-  if (!evaluation) {
-    return undefined
-  }
-  if (!evaluation.refreshable) {
-    return evaluation.result
-  }
-
-  const resultBase = { baseRef: evaluation.baseRef, localBranch: evaluation.localBranch }
-  try {
-    if (evaluation.ownerWorktreePath) {
-      const { stdout: worktreeListOutput } = await gitExecFileAsync(
-        ['worktree', 'list', '--porcelain'],
-        gitExecOptions(repoPath, options)
-      )
-      const worktrees = parseWorktreeList(
-        translateWslOutputPaths(worktreeListOutput, repoPath, options)
-      )
-      const currentOwner = worktrees.find((wt) => wt.branch === evaluation.fullRef)
-      if (!currentOwner || currentOwner.path !== evaluation.ownerWorktreePath) {
-        return { ...resultBase, status: 'skipped_error' }
-      }
-      const { stdout: status } = await gitExecFileAsync(
-        ['status', '--porcelain', '--untracked-files=no'],
-        gitExecOptions(currentOwner.path, options)
-      )
-      if (status.trim()) {
-        return {
-          ...resultBase,
-          status: 'skipped_dirty_worktree',
-          ownerWorktreePath: currentOwner.path
-        }
-      }
-      await gitExecFileAsync(
-        ['reset', '--hard', evaluation.remoteOid],
-        gitExecOptions(currentOwner.path, options)
-      )
-      return { ...resultBase, status: 'updated', ownerWorktreePath: currentOwner.path }
-    }
-
-    // Why: no owner worktree — fast-forward the bare ref; the expected-old-OID form is a no-op-safe CAS if the ref moved since evaluation.
-    await gitExecFileAsync(
-      ['update-ref', evaluation.fullRef, evaluation.remoteOid, evaluation.localOid],
-      gitExecOptions(repoPath, options)
-    )
-    return { ...resultBase, status: 'updated' }
-  } catch {
-    // update-ref/reset can fail on locked refs or odd worktree states; worktree creation should still proceed.
-    return { ...resultBase, status: 'skipped_error' }
-  }
-}
-
-/**
- * Create a new worktree.
- * @param repoPath - Path to the main repo (or bare repo)
- * @param worktreePath - Absolute path where the worktree will be created
- * @param branch - Branch name for the new worktree
- * @param baseBranch - Optional base branch to create from (defaults to HEAD)
- * @remarks Side effects (best-effort, warn-only): passes `--no-track`, writes
- * `branch.<branch>.base` for new-branch worktrees with a base ref, and may
- * write `push.autoSetupRemote=true` to the repo's shared config.
- */
-export async function addWorktree(
-  repoPath: string,
-  worktreePath: string,
-  branch: string,
-  baseBranch?: string,
-  refreshLocalBaseRef = false,
-  noCheckout = false,
-  options: AddWorktreeOptions = {}
-): Promise<AddWorktreeResult> {
-  try {
-    return await runWithGitReadCacheInvalidation(() =>
-      performAddWorktree(
-        repoPath,
-        worktreePath,
-        branch,
-        baseBranch,
-        refreshLocalBaseRef,
-        noCheckout,
-        options
-      )
-    )
-  } finally {
-    bumpWorktreeScanGeneration(repoPath)
-  }
-}
-
-async function performAddWorktree(
-  repoPath: string,
-  worktreePath: string,
-  branch: string,
-  baseBranch?: string,
-  refreshLocalBaseRef = false,
-  noCheckout = false,
-  options: AddWorktreeOptions = {}
-): Promise<AddWorktreeResult> {
-  let localBaseRefRefresh: LocalBaseRefRefreshResult | undefined
-  let localBaseRefUpdateSuggestion: LocalBaseRefUpdateSuggestion | undefined
-  // Why: enable long paths for this Windows checkout without changing user Git config.
-  const args = [...windowsLongPathGitArgs(repoPath), 'worktree', 'add']
-  let effectiveBase: string | undefined
-  if (noCheckout) {
-    args.push('--no-checkout')
-  }
-  if (options.checkoutExistingBranch) {
-    // Why: -b would create a new branch instead of checking out the selected one.
-    args.push(worktreePath, branch)
-  } else {
-    // Why: --no-track avoids inheriting the base's upstream so `git status` won't misreport "behind by N" pre-publish; first push sets it (see push.autoSetupRemote below).
-    args.push('--no-track', '-b', branch, worktreePath)
-    if (baseBranch) {
-      effectiveBase = await resolveWorktreeAddBaseRef(baseBranch, (qualifiedRef) =>
-        hasWorktreeBaseCommitRef(repoPath, qualifiedRef, options)
-      )
-      // Why: resolve the creation base first to distinguish remote-tracking refs from slash-containing local branches (mutation gated behind the explicit setting).
-      if (refreshLocalBaseRef) {
-        localBaseRefRefresh = await refreshLocalBaseRefForWorktreeCreate(
-          repoPath,
-          baseBranch,
-          effectiveBase,
-          options.remoteTrackingBase,
-          options
-        )
-      } else if (options.suggestLocalBaseRefUpdate) {
-        localBaseRefUpdateSuggestion = await getLocalBaseRefUpdateSuggestionForWorktreeCreate(
-          repoPath,
-          baseBranch,
-          effectiveBase,
-          options.remoteTrackingBase,
-          options
-        )
-      }
-      args.push(effectiveBase)
-    }
-  }
-  await gitExecFileAsync(args, {
-    ...gitExecOptions(repoPath, options),
-    // Why: resolve per call — hoisting this to a module const would freeze the override at import.
-    timeout: resolveWorktreeAddTimeoutMs()
-  })
-
-  if (options.checkoutExistingBranch) {
-    return localBaseRefRefresh ? { localBaseRefRefresh } : {}
-  }
-
-  if (effectiveBase) {
-    await persistWorktreeCreationBase(worktreePath, branch, effectiveBase, options)
-  }
-
-  // SSH parity: relay's addWorktreeOp (src/relay/git-handler-worktree-ops.ts) mirrors this — change both in lockstep.
-  // Why: --no-track leaves no upstream until first push; push.autoSetupRemote=true lets a plain
-  // `git push` create+set origin/<branch> (git >=2.37; older clients ignore it). `--local` on a
-  // linked worktree writes the shared common-dir config (whole repo) — intentional and idempotent,
-  // so it's warn-only and not rolled back on failure.
-  try {
-    // Why: `--get` (not `--local --get`) so a value at any scope counts as "user already chose" and isn't overwritten.
-    let alreadySet = false
-    try {
-      await gitExecFileAsync(['config', '--get', 'push.autoSetupRemote'], {
-        ...gitExecOptions(worktreePath, options)
-      })
-      alreadySet = true
-    } catch (readError) {
-      // Why: `git config --get` exits 1 only when unset at every scope; any other code is a real read failure — rethrow rather than overwrite the user's value.
-      const code = (readError as { code?: unknown })?.code
-      if (code !== 1) {
-        throw readError
-      }
-    }
-    if (!alreadySet) {
-      await gitExecFileAsync(['config', '--local', 'push.autoSetupRemote', 'true'], {
-        ...gitExecOptions(worktreePath, options)
-      })
-    }
-  } catch (error) {
-    console.warn(`addWorktree: failed to set push.autoSetupRemote for ${worktreePath}`, error)
-  }
-  return {
-    ...(localBaseRefRefresh ? { localBaseRefRefresh } : {}),
-    ...(localBaseRefUpdateSuggestion ? { localBaseRefUpdateSuggestion } : {})
-  }
-}
-
-export async function addSparseWorktree(
-  repoPath: string,
-  worktreePath: string,
-  branch: string,
-  directories: string[],
-  baseBranch?: string,
-  refreshLocalBaseRef = false,
-  options: AddWorktreeOptions = {}
-): Promise<AddWorktreeResult> {
-  let created = false
-  let addResult: AddWorktreeResult = {}
-  try {
-    addResult = await addWorktree(
-      repoPath,
-      worktreePath,
-      branch,
-      baseBranch,
-      refreshLocalBaseRef,
-      true,
-      options
-    )
-    created = true
-    // Why: `worktree add --no-checkout` writes no files, so these are the calls that
-    // actually materialize the deep path and need the long-path escape hatch.
-    const longPathArgs = windowsLongPathGitArgs(worktreePath)
-    await gitExecFileAsync(
-      ['sparse-checkout', 'init', '--cone'],
-      gitExecOptions(worktreePath, options)
-    )
-    await gitExecFileAsync(
-      [...longPathArgs, 'sparse-checkout', 'set', '--', ...directories],
-      gitExecOptions(worktreePath, options)
-    )
-    await gitExecFileAsync(
-      [...longPathArgs, 'checkout', branch],
-      gitExecOptions(worktreePath, options)
-    )
-    return addResult
-  } catch (error) {
-    const wrapped: SparseWorktreeCreateError =
-      error instanceof Error ? (error as SparseWorktreeCreateError) : new Error(String(error))
-    if (created) {
-      if (!options.checkoutExistingBranch) {
-        try {
-          await unsetWorktreeCreationBase(worktreePath, branch, options)
-        } catch (cleanupError) {
-          console.warn(
-            `addSparseWorktree: failed to clear creation base for ${worktreePath}`,
-            cleanupError
-          )
-        }
-      }
-      try {
-        await removeWorktree(repoPath, worktreePath, true, {
-          deleteBranch: !options.checkoutExistingBranch,
-          // Why: failed-creation rollback — the fresh branch has no user commits, so force-delete rather than orphan it.
-          forceBranchDelete: !options.checkoutExistingBranch,
-          ...(options.wslDistro ? { wslDistro: options.wslDistro } : {})
-        })
-      } catch {
-        wrapped.cleanupFailed = true
-        // Why: surface that manual cleanup may be needed, else a half-created worktree lingers silently on disk.
-        wrapped.message = `${wrapped.message} (cleanup also failed — the partially created worktree at "${worktreePath}" may need manual removal)`
-      }
-    }
-    throw wrapped
-  }
-}
-
-/**
- * Move a worktree with `git worktree move` (not `fs.rename`, which corrupts the
- * `.git` file and the `.git/worktrees/<name>/gitdir` back-pointer). Local-only,
- * so there is no relay parity handler. Caller owns migrating Orca's
- * path-derived worktree identity and pre-checks that the destination is free.
- */
-export async function moveWorktree(
-  repoPath: string,
-  oldPath: string,
-  newPath: string
-): Promise<void> {
-  try {
-    await runWithGitReadCacheInvalidation(() =>
-      gitExecFileAsync(['worktree', 'move', oldPath, newPath], { cwd: repoPath })
-    )
-  } finally {
-    bumpWorktreeScanGeneration(repoPath)
-  }
-}
-
-/**
- * Remove a worktree.
- */
-export async function removeWorktree(
-  repoPath: string,
-  worktreePath: string,
-  force = false,
-  // forceBranchDelete: for failed-creation rollback (fresh branch, no user work); user deletes leave it false so unmerged commits survive.
-  options: RemoveWorktreeOptions = {}
-): Promise<RemoveWorktreeResult> {
-  try {
-    return await runWithGitReadCacheInvalidation(() =>
-      performRemoveWorktree(repoPath, worktreePath, force, options)
-    )
-  } finally {
-    bumpWorktreeScanGeneration(repoPath)
-  }
-}
-
-async function performRemoveWorktree(
-  repoPath: string,
-  worktreePath: string,
-  force = false,
-  options: RemoveWorktreeOptions = {}
-): Promise<RemoveWorktreeResult> {
-  const removedWorktree =
-    options.knownRemovedWorktree ??
-    (await listWorktrees(repoPath, options)).find((worktree) =>
-      areWorktreePathsEqual(worktree.path, worktreePath)
-    )
-  const branchName = normalizeLocalBranchRef(removedWorktree?.branch ?? '')
-  const branchHead = removedWorktree?.head ?? ''
-
-  // Why: callers outside the IPC/runtime preflight must not bypass Git's lock contract or rely on localized stderr after side effects.
-  assertWorktreeUnlockedForRemoval(removedWorktree)
-
-  if (
-    !(await tryRemoveWorktreeWithDeferredDirectoryDeletion(repoPath, worktreePath, force, options))
-  ) {
-    const args = ['worktree', 'remove']
-    if (force) {
-      args.push('--force')
-    }
-    args.push(worktreePath)
-    try {
-      await gitExecFileAsync(args, gitExecOptions(repoPath, options))
-    } catch (error) {
-      if (force || !isSubmoduleWorktreeRemovalRefusal(error)) {
-        throw error
-      }
-      // Why: Git refuses non-force removal of a worktree with an initialised submodule even when clean; re-prove cleanliness, then --force.
-      await assertWorktreeCleanForRemoval(worktreePath, false, options)
-      await gitExecFileAsync(
-        ['worktree', 'remove', '--force', worktreePath],
-        gitExecOptions(repoPath, options)
-      )
-    }
-  }
-
-  if (!branchName) {
-    return {}
-  }
-  if (options.deleteBranch === false) {
-    return {}
-  }
-
-  // Why its own span: branch cleanup can reach the network (`fetch --prune`), so a stall here reads as
-  // `git worktree remove` being slow unless it is timed separately.
-  return withSpan('worktree.remove.branch_delete', () =>
-    deleteBranchAfterWorktreeRemoval(repoPath, branchName, branchHead, options)
-  )
-}
-
-/**
- * Rename the checkout into a sibling trash directory and clear Git's registration for the
- * now-missing path, so the multi-GB recursive delete runs after this removal has returned.
- * Returns false when the caller must let `git worktree remove` delete the directory inline.
- */
-async function tryRemoveWorktreeWithDeferredDirectoryDeletion(
-  repoPath: string,
-  worktreePath: string,
-  force: boolean,
-  options: RemoveWorktreeOptions
-): Promise<boolean> {
-  // Why: WSL-owned checkouts are deleted inside the distro, so Node on Windows must not rename them.
-  if (options.wslDistro || parseWslPath(worktreePath)) {
-    return false
-  }
-  if (!force) {
-    try {
-      // Why: `git worktree remove` re-checks cleanliness as it removes; prove the same thing here or leave removal to Git.
-      await assertWorktreeCleanForRemoval(worktreePath, false, options)
-    } catch {
-      return false
-    }
-  }
-
-  const trashPath = await withWorktreeRemoveStageSpan('trash_rename', 'local', () =>
-    moveWorktreeDirectoryToTrash(worktreePath)
-  )
-  if (!trashPath) {
-    return false
-  }
-  try {
-    await clearGitRegistrationForMissingWorktree(repoPath, worktreePath, options)
-  } catch (error) {
-    // Why: put the checkout back so the in-place removal below still sees the worktree Git registered.
-    if (await restoreWorktreeDirectoryFromTrash(trashPath, worktreePath)) {
-      return false
-    }
-    throw error
-  }
-  scheduleWorktreeTrashDeletion(trashPath)
-  return true
-}
-
-async function clearGitRegistrationForMissingWorktree(
-  repoPath: string,
-  worktreePath: string,
-  options: RemoveWorktreeOptions
-): Promise<void> {
-  const registrationOptions = {
-    ...options,
-    timeout: options.timeout ?? WORKTREE_REMOVAL_REGISTRATION_TIMEOUT_MS
-  }
-  try {
-    // Removing an already-missing directory is accepted back to the Git 2.25 baseline and touches only this entry.
-    await gitExecFileAsync(
-      ['worktree', 'remove', '--force', worktreePath],
-      gitExecOptions(repoPath, registrationOptions)
-    )
-    return
-  } catch (error) {
-    console.warn(
-      `[git] Failed to deregister the moved worktree "${worktreePath}"; pruning instead`,
-      error
-    )
-  }
-
-  await gitExecFileAsync(['worktree', 'prune'], gitExecOptions(repoPath, registrationOptions))
-  // Strict (not the shared scan): an unreadable repo must not read as proof that the row is gone.
-  const stillRegistered = (await listWorktreesStrict(repoPath, registrationOptions)).some(
-    (worktree) => areWorktreePathsEqual(worktree.path, worktreePath)
-  )
-  if (stillRegistered) {
-    throw new Error(`Git still reports a registration for "${worktreePath}" after pruning it.`)
-  }
-}
-
-async function deleteBranchAfterWorktreeRemoval(
-  repoPath: string,
-  branchName: string,
-  branchHead: string,
-  options: RemoveWorktreeOptions
-): Promise<RemoveWorktreeResult> {
-  try {
-    // Why: also drop the now-orphaned branch so delete-worktree leaves none; `-d` (not `-D`) preserves
-    // unmerged work, and forceBranchDelete opts into `-D` for failed-creation rollback.
-    const branchDeleteResult = await deleteLocalBranchAfterWorktreeRemoval(
-      repoPath,
-      branchName,
-      options.forceBranchDelete === true,
-      options
-    )
-    if (branchDeleteResult === 'checked-out') {
-      return {}
-    }
-    return {}
-  } catch (error) {
-    if (!options.forceBranchDelete && branchHead) {
-      try {
-        if (
-          await deleteAlreadyMergedBranchAfterSafeDeleteFailure(
-            repoPath,
-            branchName,
-            branchHead,
-            options
-          )
-        ) {
-          return {}
-        }
-      } catch (alreadyMergedDeleteError) {
-        // Why: worktree is already gone; a raced branch cleanup should degrade to preserved-branch recovery, not fail delete.
-        console.warn(
-          `[git] Failed to delete already-merged local branch "${branchName}" after removing worktree`,
-          alreadyMergedDeleteError
-        )
-      }
-    }
-    // Keep an unmerged/unpublished branch: deleting a worktree must never silently discard commits.
-    console.warn(
-      `[git] Preserved local branch "${branchName}" after removing worktree (not fully merged)`,
-      error
-    )
-    return { preservedBranch: { branchName, ...(branchHead ? { head: branchHead } : {}) } }
-  }
-}
-
-async function deleteLocalBranchAfterWorktreeRemoval(
-  repoPath: string,
-  branchName: string,
-  forceBranchDelete: boolean,
-  options: GitWorktreeExecOptions = {}
-): Promise<'deleted' | 'checked-out'> {
-  const deleteFlag = forceBranchDelete ? '-D' : '-d'
-  try {
-    await gitExecFileAsync(
-      ['branch', deleteFlag, '--', branchName],
-      gitExecOptions(repoPath, options)
-    )
-    return 'deleted'
-  } catch (error) {
-    if (!isBranchCheckedOutInWorktreeError(error)) {
-      throw error
-    }
-  }
-
-  try {
-    // Why: only pay for `worktree prune` when a stale admin record may be blocking `branch -d`.
-    await gitExecFileAsync(['worktree', 'prune'], gitExecOptions(repoPath, options))
-  } catch (error) {
-    console.warn(`[git] Failed to prune worktrees before deleting branch "${branchName}"`, error)
-    return 'checked-out'
-  }
-
-  try {
-    await gitExecFileAsync(
-      ['branch', deleteFlag, '--', branchName],
-      gitExecOptions(repoPath, options)
-    )
-    return 'deleted'
-  } catch (error) {
-    if (isBranchCheckedOutInWorktreeError(error)) {
-      return 'checked-out'
-    }
-    throw error
-  }
-}
-
-async function deleteAlreadyMergedBranchAfterSafeDeleteFailure(
-  repoPath: string,
-  branchName: string,
-  branchHead: string,
-  options: GitWorktreeExecOptions = {}
-): Promise<boolean> {
-  const runGit = (args: string[], execOptions?: { stdin?: string }) =>
-    gitExecFileAsync(args, {
-      ...gitExecOptions(repoPath, options),
-      ...(execOptions?.stdin !== undefined ? { stdin: execOptions.stdin } : {})
-    })
-  const targetRefs = await getBranchCleanupTargetRefs(runGit, branchName)
-  // Why: squash merges rewrite commit IDs, so `branch -d` rejects already-merged branches; delete only when Git proves no unmerged tree changes.
-  const hasNoUnmergedChanges = await withLocalGitCapabilityCacheForExecution(
-    { cwd: repoPath, wslDistro: options.wslDistro, signal: options.signal },
-    (capabilities) =>
-      branchHasNoUnmergedChangesWithLazyTargetRefresh(runGit, branchName, targetRefs, capabilities)
-  )
-  if (!hasNoUnmergedChanges) {
-    return false
-  }
-  await forceDeleteLocalBranch(repoPath, branchName, branchHead, (args, cwd) =>
-    gitExecFileAsync(args, gitExecOptions(cwd, options))
-  )
-  return true
-}
-
-export async function forceDeleteLocalBranch(
-  repoPath: string,
-  branchName: string,
-  expectedHead: string,
-  runGit: (args: string[], cwd: string) => Promise<{ stdout: string; stderr: string }> = (
-    args,
-    cwd
-  ) => gitExecFileAsync(args, { cwd })
-): Promise<void> {
-  if (!branchName || branchName.includes('\0')) {
-    throw new Error('Invalid branch name')
-  }
-  if (!expectedHead) {
-    throw new Error(
-      `Cannot force-delete local branch "${branchName}" without the commit Git preserved.`
-    )
-  }
-  if (await isLocalBranchCheckedOut(repoPath, branchName, runGit)) {
-    throw new Error(`Local branch "${branchName}" is checked out in another worktree.`)
-  }
-  // Why: stale toast actions must not delete a branch that moved; `update-ref -d` deletes only if the ref still == expectedHead.
-  try {
-    await runGit(['update-ref', '-d', `refs/heads/${branchName}`, expectedHead], repoPath)
-  } catch {
-    throw new Error(
-      `Local branch "${branchName}" changed after the workspace was deleted. Review it before deleting it.`
-    )
-  }
-  if (await isLocalBranchCheckedOut(repoPath, branchName, runGit)) {
-    try {
-      await runGit(['update-ref', `refs/heads/${branchName}`, expectedHead, ''], repoPath)
-    } catch (restoreError) {
-      console.warn(
-        `[git] Failed to restore local branch "${branchName}" after concurrent checkout`,
-        restoreError
-      )
-    }
-    throw new Error(`Local branch "${branchName}" is checked out in another worktree.`)
-  }
-  try {
-    await runGit(['config', '--remove-section', `branch.${branchName}`], repoPath)
-  } catch {
-    // Best-effort parity with `git branch -D`; stale config is harmless.
-  }
-}
-
-async function isLocalBranchCheckedOut(
-  repoPath: string,
-  branchName: string,
-  runGit: (args: string[], cwd: string) => Promise<{ stdout: string; stderr: string }>
-): Promise<boolean> {
-  const { stdout } = await runGit(['worktree', 'list', '--porcelain'], repoPath)
-  return parseWorktreeList(stdout).some(
-    (worktree) => normalizeLocalBranchRef(worktree.branch) === branchName
-  )
-}
-
-/**
- * Assert a worktree is clean enough for non-force removal.
- */
-export async function assertWorktreeCleanForRemoval(
-  worktreePath: string,
-  force = false,
-  options: WorktreeRemovalPreflightOptions = {}
-): Promise<void> {
-  if (force) {
-    return
-  }
-
-  const { ignoredUntrackedPaths = [], ...gitOptions } = options
-  const useNullTerminatedStatus = ignoredUntrackedPaths.length > 0
-  const { stdout } = await gitExecFileAsync(
-    ['status', '--porcelain', ...(useNullTerminatedStatus ? ['-z'] : []), '--untracked-files=all'],
-    {
-      ...gitExecOptions(worktreePath, gitOptions),
-      timeout: gitOptions.timeout ?? WORKTREE_REMOVAL_PREFLIGHT_TIMEOUT_MS
-    }
-  )
-  // Why one parse feeds both: the clean verdict and the error text must never
-  // disagree about which entries block removal.
-  const blockingEntries = useNullTerminatedStatus
-    ? getBlockingUntrackedStatusEntries(stdout, ignoredUntrackedPaths)
-    : null
-  if (blockingEntries ? blockingEntries.length === 0 : !stdout.trim()) {
-    return
-  }
-
-  const error = new Error('Worktree has uncommitted or untracked changes.')
-  // Why not the raw stdout: `-z` output is NUL-delimited and `.trim()` leaves
-  // interior NULs, so attaching it verbatim put raw control bytes into the
-  // user-facing removal error — and listed the tolerated shared link, the one
-  // entry that is not the user's work and cannot be committed away.
-  ;(error as Error & { stdout?: string }).stdout = blockingEntries
-    ? blockingEntries.join('\n')
-    : stdout
-  throw error
-}
-
-/** The `git status --porcelain -z` entries that genuinely block removal:
- *  everything except the untracked shared links the caller tolerates. */
-function getBlockingUntrackedStatusEntries(
-  status: string,
-  ignoredUntrackedPaths: readonly string[]
-): string[] {
-  const ignored = new Set(
-    ignoredUntrackedPaths
-      .map((entry) =>
-        entry
-          .trim()
-          .replace(/^[\\/]+/, '')
-          .replace(/\\/g, '/')
-      )
-      .filter((entry) => entry && !entry.split('/').includes('..'))
-  )
-  return status
-    .split('\0')
-    .filter(Boolean)
-    .filter(
-      (entry) => !(entry.startsWith('?? ') && ignored.has(entry.slice(3).replace(/\\/g, '/')))
-    )
-}
-
-function translateWorktreePath(
-  worktreePath: string,
-  repoPath: string,
-  options: GitWorktreeExecOptions = {}
-): string {
-  const prefix = 'worktree '
-  const translated = translateWslOutputPaths(`${prefix}${worktreePath}`, repoPath, options)
-  return translated.startsWith(prefix) ? translated.slice(prefix.length) : worktreePath
-}
-
-async function detectSparseCheckout(worktreePath: string): Promise<boolean> {
-  // Why: fs.stat the per-worktree gitdir's sparse-checkout pattern file instead of a per-poll `git sparse-checkout list` subprocess that regressed responsiveness (PR #1290);
-  // this is the cheap fast-path gate before the enabled check below.
-  try {
-    const gitDir = await resolveGitDir(worktreePath)
-    const stats = await stat(join(gitDir, 'info', 'sparse-checkout'))
-    if (!stats.isFile() || stats.size === 0) {
-      return false
-    }
-    // Why the extra config read: `git sparse-checkout disable` restores every file to the
-    // working tree and sets core.sparseCheckout=false, but it deliberately LEAVES
-    // <gitdir>/info/sparse-checkout in place so the checkout can be re-enabled with the same
-    // patterns. A non-empty pattern file is therefore necessary but not sufficient — without
-    // confirming core.sparseCheckout is actually on we would flag a fully-populated worktree as
-    // sparse and show a misleading "files are not on disk" badge. This runs only for the rare
-    // worktree that still has a non-empty pattern file, so it does not reintroduce the per-poll
-    // subprocess fan-out PR #1290 removed, and it reads git's config files directly (no
-    // subprocess) so it stays cheap and needs no exec options.
-    return await isSparseCheckoutEnabled(gitDir)
-  } catch {
-    return false
-  }
-}
-
-// Resolve the shared common gitdir for a (possibly linked) worktree gitdir. A linked worktree's
-// gitdir holds a `commondir` file pointing at the repo's main `.git`; the main worktree's gitdir
-// is itself the common dir.
-async function resolveGitCommonDir(gitDir: string): Promise<string> {
-  try {
-    const raw = (await readFile(join(gitDir, 'commondir'), 'utf-8')).trim()
-    if (raw.length > 0) {
-      return isAbsolute(raw) ? raw : resolve(gitDir, raw)
-    }
-  } catch {
-    // No `commondir` file: this gitdir is already the common dir.
-  }
-  return gitDir
-}
-
-// Whether core.sparseCheckout is actually enabled for this worktree. The value can live in the
-// shared repo config or, when extensions.worktreeConfig is on, in the worktree-local
-// `config.worktree`; later files override earlier ones, matching git's config precedence.
-async function isSparseCheckoutEnabled(gitDir: string): Promise<boolean> {
-  const commonDir = await resolveGitCommonDir(gitDir)
-  const sharedConfig = await readGitConfigText(join(commonDir, 'config'))
-  const sharedFlag = parseCoreSparseCheckoutFlag(sharedConfig)
-  // Git reads `config.worktree` only while extensions.worktreeConfig is on; without that gate a
-  // stale worktree config left behind by an earlier sparse checkout overrides the real repo value.
-  if (parseGitConfigFlag(sharedConfig, 'extensions', 'worktreeconfig') !== true) {
-    return sharedFlag ?? false
-  }
-  const worktreeConfig = await readGitConfigText(join(gitDir, 'config.worktree'))
-  return parseCoreSparseCheckoutFlag(worktreeConfig) ?? sharedFlag ?? false
-}
-
-async function readGitConfigText(configPath: string): Promise<string> {
-  try {
-    return await readFile(configPath, 'utf-8')
-  } catch {
-    return ''
-  }
-}
-
-// Read the effective `core.sparseCheckout` boolean from one git config file's text, or `undefined`
-// when the plain `[core]` section does not set it. Kept as a pure, exported function so the
-// git-config parsing edge cases can be unit tested without touching the filesystem. Only the last
-// assignment wins, and a `[core "subsection"]` header is intentionally not treated as `[core]`.
-export function parseCoreSparseCheckoutFlag(configContent: string): boolean | undefined {
-  return parseGitConfigFlag(configContent, 'core', 'sparsecheckout')
-}
-
-// A section header may be followed on the same line by further headers and then one assignment
-// (`[core] sparseCheckout = true` is legal git config); the value runs to end of line, so at most
-// one assignment can share a line and the last header before it decides the section.
-const GIT_CONFIG_SECTION_HEADER = /^\[\s*([A-Za-z0-9.-]+)(\s+"(?:[^"\\]|\\.)*")?\s*\]/
-const GIT_CONFIG_ASSIGNMENT = /^([A-Za-z][A-Za-z0-9-]*)\s*(?:=\s*(.*))?$/
-
-// `section` and `key` must be lowercase: git config names are case-insensitive.
-function parseGitConfigFlag(
-  configContent: string,
-  section: string,
-  key: string
-): boolean | undefined {
-  let inSection = false
-  let value: boolean | undefined
-  for (const rawLine of configContent.split(/\r?\n/)) {
-    let rest = stripGitConfigComment(rawLine).trim()
-    for (
-      let header = rest.match(GIT_CONFIG_SECTION_HEADER);
-      header;
-      header = rest.match(GIT_CONFIG_SECTION_HEADER)
-    ) {
-      inSection = header[1].toLowerCase() === section && header[2] === undefined
-      rest = rest.slice(header[0].length).trim()
-    }
-    if (!inSection || rest.length === 0) {
-      continue
-    }
-    const assignment = rest.match(GIT_CONFIG_ASSIGNMENT)
-    if (!assignment || assignment[1].toLowerCase() !== key) {
-      continue
-    }
-    value = parseGitConfigBoolean(assignment[2])
-  }
-  return value
-}
-
-// Drop a trailing `#`/`;` comment that is not inside a double-quoted value.
-function stripGitConfigComment(line: string): string {
-  let inQuotes = false
-  for (let index = 0; index < line.length; index += 1) {
-    const char = line[index]
-    if (char === '"' && line[index - 1] !== '\\') {
-      inQuotes = !inQuotes
-    } else if ((char === '#' || char === ';') && !inQuotes) {
-      return line.slice(0, index)
-    }
-  }
-  return line
-}
-
-// Git treats a valueless boolean (`sparseCheckout` with no `=`) as true and only true/yes/on/1 as
-// true otherwise; everything else (including the disable-written `false`) is false.
-function parseGitConfigBoolean(raw: string | undefined): boolean {
-  if (raw === undefined) {
-    return true
-  }
-  const value = raw
-    .trim()
-    .replace(/^"(.*)"$/, '$1')
-    .toLowerCase()
-  return value === 'true' || value === 'yes' || value === 'on' || value === '1'
-}
+export { addWorktree } from './worktree-add'
+export { forceDeleteLocalBranch } from './worktree-branch-removal'
+export { parseWorktreeList } from './worktree-list-parser'
+export { listWorktreeGraph, listWorktreesStrict } from './worktree-listing'
+export { moveWorktree } from './worktree-move'
+export {
+  WORKTREE_ADD_TIMEOUT_MAX_MS,
+  WORKTREE_ADD_TIMEOUT_MS,
+  WORKTREE_LIST_TIMEOUT_MS,
+  WORKTREE_REMOVAL_PREFLIGHT_TIMEOUT_MS,
+  WORKTREE_REMOVAL_REGISTRATION_TIMEOUT_MS,
+  resolveWorktreeAddTimeoutMs
+} from './worktree-operation-options'
+export type {
+  AddWorktreeOptions,
+  AddWorktreeResult,
+  GitWorktreeExecOptions,
+  RemoveWorktreeOptions
+} from './worktree-operation-options'
+export { assertWorktreeCleanForRemoval } from './worktree-removal-preflight'
+export { removeWorktree } from './worktree-removal'
+export {
+  _getWorktreeScanCacheSizesForTests,
+  _resetWorktreeScanCacheForTests,
+  listWorktrees
+} from './worktree-scan-cache'
+export { addSparseWorktree } from './worktree-sparse-add'
+export { parseCoreSparseCheckoutFlag } from './worktree-sparse-state'
diff --git a/src/main/github/client/fetch/get-pr-comments.ts b/src/main/github/client/fetch/get-pr-comments.ts
index 17ba9175a00..06df95e29fb 100644
--- a/src/main/github/client/fetch/get-pr-comments.ts
+++ b/src/main/github/client/fetch/get-pr-comments.ts
@@ -149,19 +149,17 @@ export async function getPRComments(
         if (!pullRequest) {
           console.warn('Review threads response missing pullRequest; keeping REST results')
         }
-        const graphQLIssueComments = (pullRequest?.comments?.nodes ?? []).map(
-          (c): PRComment => ({
-            id: c.databaseId,
-            author: c.author?.login ?? 'ghost',
-            authorAvatarUrl: c.author?.avatarUrl ?? '',
-            body: c.body ?? '',
-            createdAt: c.createdAt,
-            url: c.url,
-            isBot: c.author?.__typename === 'Bot',
-            reactionSubjectId: c.id,
-            reactions: mapGraphQLReactionGroups(c.reactionGroups)
-          })
-        )
+        const graphQLIssueComments = (pullRequest?.comments?.nodes ?? []).map((c): PRComment => ({
+          id: c.databaseId,
+          author: c.author?.login ?? 'ghost',
+          authorAvatarUrl: c.author?.avatarUrl ?? '',
+          body: c.body ?? '',
+          createdAt: c.createdAt,
+          url: c.url,
+          isBot: c.author?.__typename === 'Bot',
+          reactionSubjectId: c.id,
+          reactions: mapGraphQLReactionGroups(c.reactionGroups)
+        }))
         if (graphQLIssueComments.length > 0) {
           issueComments = graphQLIssueComments
         }
@@ -169,19 +167,17 @@ export async function getPRComments(
         graphQLReviewSummaries = pullRequest
           ? (pullRequest.reviews?.nodes ?? [])
               .filter((review) => review.body?.trim())
-              .map(
-                (review): PRComment => ({
-                  id: review.databaseId,
-                  author: review.author?.login ?? 'ghost',
-                  authorAvatarUrl: review.author?.avatarUrl ?? '',
-                  body: review.body,
-                  createdAt: review.createdAt,
-                  url: review.url,
-                  isBot: review.author?.__typename === 'Bot',
-                  reactionSubjectId: review.id,
-                  reactions: mapGraphQLReactionGroups(review.reactionGroups)
-                })
-              )
+              .map((review): PRComment => ({
+                id: review.databaseId,
+                author: review.author?.login ?? 'ghost',
+                authorAvatarUrl: review.author?.avatarUrl ?? '',
+                body: review.body,
+                createdAt: review.createdAt,
+                url: review.url,
+                isBot: review.author?.__typename === 'Bot',
+                reactionSubjectId: review.id,
+                reactions: mapGraphQLReactionGroups(review.reactionGroups)
+              }))
           : undefined
 
         const threads = pullRequest?.reviewThreads?.nodes ?? []
@@ -228,17 +224,15 @@ export async function getPRComments(
       } else if (reviewsResult.status === 'fulfilled') {
         reviewSummaries = (JSON.parse(reviewsResult.value.stdout) as RESTReview[])
           .filter((r) => r.body?.trim())
-          .map(
-            (r): PRComment => ({
-              id: r.id,
-              author: r.user?.login ?? 'ghost',
-              authorAvatarUrl: r.user?.avatar_url ?? '',
-              body: r.body,
-              createdAt: r.submitted_at,
-              url: r.html_url,
-              isBot: r.user?.type === 'Bot'
-            })
-          )
+          .map((r): PRComment => ({
+            id: r.id,
+            author: r.user?.login ?? 'ghost',
+            authorAvatarUrl: r.user?.avatar_url ?? '',
+            body: r.body,
+            createdAt: r.submitted_at,
+            url: r.html_url,
+            isBot: r.user?.type === 'Bot'
+          }))
       } else {
         console.warn('Failed to fetch review summaries:', reviewsResult.reason)
       }
diff --git a/src/main/github/issue-work-item-details.ts b/src/main/github/issue-work-item-details.ts
index d58491abd87..5cb95f50d48 100644
--- a/src/main/github/issue-work-item-details.ts
+++ b/src/main/github/issue-work-item-details.ts
@@ -238,16 +238,14 @@ export async function getIssueBodyAndComments(
       }[]
       assignees?: { login: string }[]
     }
-    const comments = (data.comments ?? []).map(
-      (comment, index): PRComment => ({
-        id: index,
-        author: comment.author?.login ?? 'ghost',
-        authorAvatarUrl: '',
-        body: comment.body ?? '',
-        createdAt: comment.createdAt,
-        url: comment.url ?? ''
-      })
-    )
+    const comments = (data.comments ?? []).map((comment, index): PRComment => ({
+      id: index,
+      author: comment.author?.login ?? 'ghost',
+      authorAvatarUrl: '',
+      body: comment.body ?? '',
+      createdAt: comment.createdAt,
+      url: comment.url ?? ''
+    }))
     return {
       body: data.body ?? '',
       comments,
diff --git a/src/main/github/project-view.ts b/src/main/github/project-view.ts
index 9a0d9e97f78..71566110b36 100644
--- a/src/main/github/project-view.ts
+++ b/src/main/github/project-view.ts
@@ -1,62 +1,3 @@
-/* eslint-disable max-lines -- Why: co-locate the ProjectV2 read path (normalize/retry/paste-parser/discovery) as one reviewable surface; plumbing lives in ./project-view/internals and mutations. */
-import {
-  acquire,
-  release,
-  extractExecError,
-  ghExecFileAsync,
-  repositoryRateLimitGuard,
-  noteRepositoryRateLimitSpend,
-  runGraphql,
-  isValidOwnerSlug,
-  assertSlug,
-  assertPositiveInt,
-  projectHostAuthenticationError,
-  projectGhExecOptions,
-  type GraphqlVars
-} from './project-view/internals'
-import {
-  classifyProjectError,
-  driftError,
-  errorsIndicateParentField,
-  rateLimitedError,
-  type GhGraphqlErrorShape
-} from './project-view/project-error-classification'
-import type {
-  GitHubProjectField,
-  GitHubProjectFieldValue,
-  GitHubProjectIteration,
-  GitHubProjectLabel,
-  GitHubProjectOwnerType,
-  GitHubProjectRow,
-  GitHubProjectRowItemType,
-  GitHubProjectSingleSelectOption,
-  GitHubProjectSort,
-  GitHubProjectSummary,
-  GitHubProjectTable,
-  GitHubProjectUser,
-  GitHubProjectView,
-  GitHubProjectViewLayout,
-  GitHubProjectViewSummary
-} from '../../shared/github/project-types'
-import type {
-  GetProjectViewTableResult,
-  GitHubProjectViewError,
-  ListAccessibleProjectsResult,
-  ListProjectViewsResult,
-  ResolveProjectRefResult
-} from '../../shared/github/project-result-types'
-import type {
-  GetProjectViewTableArgs,
-  ListAccessibleProjectsArgs,
-  ListProjectViewsArgs,
-  ResolveProjectRefArgs
-} from '../../shared/github/project-request-types'
-import {
-  GITHUB_PROJECT_REF_INPUT_TOO_LARGE_ERROR,
-  isGitHubProjectRefInputTooLarge
-} from '../../shared/github/project-ref-input'
-import { githubProjectHost } from '../../shared/github/project-identity'
-
 // Re-export the public API so existing `./project-view` call sites keep working; the split is internal-only.
 export { isValidOwnerSlug, isValidRepoSlug } from './project-view/internals'
 export { classifyProjectError } from './project-view/project-error-classification'
@@ -78,1724 +19,23 @@ export {
 } from './project-view/repository-field-options'
 export { updateIssueTypeBySlug } from './project-view/issue-type-mutation'
 export { getWorkItemDetailsBySlug } from './project-view/work-item-details'
-
-// ─── Constants ─────────────────────────────────────────────────────────
-
-// Why: defaults deliberately shrunk to cut quota spend in discovery — the org loop dominates and produced the HTTP 504; overflow owners can paste a URL.
-const ITEM_PAGE_SIZE = 100
-const MAX_ITEMS = 500
-const VIEWS_PAGE_SIZE = 20
-const FIELDS_PAGE_SIZE = 50
-const DISCOVERY_PROJECTS_PER_OWNER = 40
-const DISCOVERY_MAX_ORGS = 20
-const DISCOVERY_ORG_PAGE_SIZE = 20
-const DISCOVERY_PROJECTS_PER_ORG = 20
-const FIELD_VALUES_PAGE_SIZE = 100
-export const PROJECT_VIEW_OWNER_CACHE_MAX_ENTRIES = 512
-
-// ─── Module-scope caches (reset on HMR — intentional) ──────────────────
-
-// Why: owners are user-controlled over a long session; bound cache entries to avoid unbounded retention while keeping the hot-owner fast path.
-function rememberProjectViewCacheEntry<K, V>(
-  cache: Map<K, V>,
-  key: K,
-  value: V,
-  maxEntries = PROJECT_VIEW_OWNER_CACHE_MAX_ENTRIES
-): void {
-  if (cache.has(key)) {
-    cache.delete(key)
-  }
-  cache.set(key, value)
-  while (cache.size > maxEntries) {
-    const oldest = cache.keys().next()
-    if (oldest.done) {
-      break
-    }
-    cache.delete(oldest.value)
-  }
-}
-
-function getProjectViewCacheEntry<K, V>(cache: Map<K, V>, key: K): V | undefined {
-  if (!cache.has(key)) {
-    return undefined
-  }
-  const value = cache.get(key) as V
-  rememberProjectViewCacheEntry(cache, key, value)
-  return value
-}
-
-// Why: plain module locals so HMR code swaps re-run capability probes instead of carrying a stale "unsupported" flag.
-const ownerTypeCache = new Map<string, GitHubProjectOwnerType | null>()
-// Why: keyed per owner (not a process-global flag) so one owner's capability gap doesn't poison others that DO support Issue.parent (bug-scan finding 2).
-const parentFieldRetriedByOwner = new Map<string, true>()
-const parentFieldWarningLoggedByOwner = new Map<string, true>()
-// Why: in-flight promise per owner so concurrent fetchAllItems callers share one probe instead of each racing a duplicate first-page probe.
-const parentFieldProbeInFlight = new Map<string, Promise<void>>()
-
-// Why: GHES owners are a separate namespace and capability surface from
-// github.com owners with the same login — scope cache keys by host so one
-// host's probe result can't leak into another. Normalize github.com so
-// host-less callers share the same probe state as explicitly pinned calls.
-function ownerScopeKey(owner: string, ownerType: GitHubProjectOwnerType, host?: string): string {
-  const base = `${owner}\u0000${ownerType}`
-  return `${base}\u0000${githubProjectHost(host)}`
-}
-
-function ownerTypeCacheKey(owner: string, host?: string): string {
-  return `${owner}\u0000${githubProjectHost(host)}`
-}
-
-function rememberOwnerType(
-  owner: string,
-  ownerType: GitHubProjectOwnerType | null,
-  host?: string
-): void {
-  rememberProjectViewCacheEntry(ownerTypeCache, ownerTypeCacheKey(owner, host), ownerType)
-}
-
-function getCachedOwnerType(
-  owner: string,
-  host?: string
-): GitHubProjectOwnerType | null | undefined {
-  return getProjectViewCacheEntry(ownerTypeCache, ownerTypeCacheKey(owner, host))
-}
-
-function markParentFieldRetried(scopeKey: string): void {
-  rememberProjectViewCacheEntry(parentFieldRetriedByOwner, scopeKey, true)
-}
-
-function hasParentFieldRetried(scopeKey: string): boolean {
-  return getProjectViewCacheEntry(parentFieldRetriedByOwner, scopeKey) === true
-}
-
-function markParentFieldWarningLogged(scopeKey: string): void {
-  rememberProjectViewCacheEntry(parentFieldWarningLoggedByOwner, scopeKey, true)
-}
-
-function hasParentFieldWarningLogged(scopeKey: string): boolean {
-  return getProjectViewCacheEntry(parentFieldWarningLoggedByOwner, scopeKey) === true
-}
-
-export function _resetProjectViewCachesForTests(): void {
-  ownerTypeCache.clear()
-  parentFieldRetriedByOwner.clear()
-  parentFieldWarningLoggedByOwner.clear()
-  parentFieldProbeInFlight.clear()
-}
-
-export function _getProjectViewCacheSizesForTests(): {
-  ownerTypes: number
-  parentFieldRetries: number
-  parentFieldWarnings: number
-  parentFieldProbes: number
-} {
-  return {
-    ownerTypes: ownerTypeCache.size,
-    parentFieldRetries: parentFieldRetriedByOwner.size,
-    parentFieldWarnings: parentFieldWarningLoggedByOwner.size,
-    parentFieldProbes: parentFieldProbeInFlight.size
-  }
-}
-
-/** @internal - exposed for cache-bound tests only. */
-export function _rememberProjectViewOwnerTypeForTests(
-  owner: string,
-  ownerType: GitHubProjectOwnerType | null,
-  host?: string
-): void {
-  rememberOwnerType(owner, ownerType, host)
-}
-
-/** @internal - exposed for cache-bound tests only. */
-export function _getProjectViewOwnerTypeForTests(
-  owner: string,
-  host?: string
-): GitHubProjectOwnerType | null | undefined {
-  return getCachedOwnerType(owner, host)
-}
-
-/** @internal - exposed for cache-bound tests only. */
-export function _markProjectViewParentFieldRetriedForTests(scopeKey: string): void {
-  markParentFieldRetried(scopeKey)
-}
-
-/** @internal - exposed for cache-bound tests only. */
-export function _hasProjectViewParentFieldRetriedForTests(scopeKey: string): boolean {
-  return hasParentFieldRetried(scopeKey)
-}
-
-/** @internal - exposed for cache-bound tests only. */
-export function _markProjectViewParentFieldWarningLoggedForTests(scopeKey: string): void {
-  markParentFieldWarningLogged(scopeKey)
-}
-
-/** @internal - exposed for cache-bound tests only. */
-export function _hasProjectViewParentFieldWarningLoggedForTests(scopeKey: string): boolean {
-  return hasParentFieldWarningLogged(scopeKey)
-}
-
-// ─── Normalizers ───────────────────────────────────────────────────────
-
-type RawProjectV2Field = {
-  __typename?: string
-  id?: string
-  name?: string
-  dataType?: string
-  options?: { id?: string; name?: string; color?: string }[]
-  configuration?: {
-    iterations?: { id?: string; title?: string; startDate?: string; duration?: number }[]
-    completedIterations?: {
-      id?: string
-      title?: string
-      startDate?: string
-      duration?: number
-    }[]
-  }
-}
-
-export function normalizeField(
-  raw: RawProjectV2Field | null | undefined
-): GitHubProjectField | null {
-  if (!raw || typeof raw.id !== 'string' || typeof raw.name !== 'string') {
-    return null
-  }
-  const dataType = raw.dataType ?? raw.__typename ?? ''
-  if (raw.__typename === 'ProjectV2SingleSelectField' || dataType === 'SINGLE_SELECT') {
-    const options: GitHubProjectSingleSelectOption[] = (raw.options ?? [])
-      .map((o) =>
-        typeof o.id === 'string' && typeof o.name === 'string'
-          ? { id: o.id, name: o.name, color: o.color ?? '' }
-          : null
-      )
-      .filter((o): o is GitHubProjectSingleSelectOption => o !== null)
-    return { kind: 'single-select', id: raw.id, name: raw.name, dataType: 'SINGLE_SELECT', options }
-  }
-  if (raw.__typename === 'ProjectV2IterationField' || dataType === 'ITERATION') {
-    const cfg = raw.configuration ?? {}
-    const iterations: GitHubProjectIteration[] = []
-    for (const it of cfg.completedIterations ?? []) {
-      if (typeof it.id === 'string' && typeof it.title === 'string') {
-        iterations.push({
-          id: it.id,
-          title: it.title,
-          startDate: it.startDate ?? '',
-          duration: typeof it.duration === 'number' ? it.duration : 0,
-          completed: true
-        })
-      }
-    }
-    for (const it of cfg.iterations ?? []) {
-      if (typeof it.id === 'string' && typeof it.title === 'string') {
-        iterations.push({
-          id: it.id,
-          title: it.title,
-          startDate: it.startDate ?? '',
-          duration: typeof it.duration === 'number' ? it.duration : 0,
-          completed: false
-        })
-      }
-    }
-    return { kind: 'iteration', id: raw.id, name: raw.name, dataType: 'ITERATION', iterations }
-  }
-  return { kind: 'field', id: raw.id, name: raw.name, dataType }
-}
-
-type RawUser = {
-  login?: string
-  name?: string | null
-  avatarUrl?: string | null
-}
-
-function normalizeUser(raw: RawUser | null | undefined): GitHubProjectUser | null {
-  if (!raw || typeof raw.login !== 'string') {
-    return null
-  }
-  return {
-    login: raw.login,
-    name: raw.name ?? null,
-    avatarUrl: raw.avatarUrl ?? null
-  }
-}
-
-type RawLabel = { name?: string; color?: string }
-
-function normalizeLabel(raw: RawLabel | null | undefined): GitHubProjectLabel | null {
-  if (!raw || typeof raw.name !== 'string') {
-    return null
-  }
-  return { name: raw.name, color: raw.color ?? '' }
-}
-
-type RawFieldValue = {
-  __typename?: string
-  field?: RawProjectV2Field
-  name?: string
-  color?: string
-  optionId?: string
-  title?: string
-  startDate?: string
-  duration?: number
-  iterationId?: string
-  text?: string
-  number?: number
-  date?: string
-  labels?: { nodes?: RawLabel[] }
-  users?: { nodes?: RawUser[] }
-}
-
-export function normalizeFieldValue(
-  raw: RawFieldValue | null | undefined
-): GitHubProjectFieldValue | null {
-  if (!raw || !raw.field || typeof raw.field.id !== 'string') {
-    return null
-  }
-  const fieldId = raw.field.id
-  switch (raw.__typename) {
-    case 'ProjectV2ItemFieldSingleSelectValue':
-      if (typeof raw.optionId !== 'string') {
-        return null
-      }
-      return {
-        kind: 'single-select',
-        fieldId,
-        optionId: raw.optionId,
-        name: raw.name ?? '',
-        color: raw.color ?? ''
-      }
-    case 'ProjectV2ItemFieldIterationValue':
-      if (typeof raw.iterationId !== 'string') {
-        return null
-      }
-      return {
-        kind: 'iteration',
-        fieldId,
-        iterationId: raw.iterationId,
-        title: raw.title ?? '',
-        startDate: raw.startDate ?? '',
-        duration: typeof raw.duration === 'number' ? raw.duration : 0
-      }
-    case 'ProjectV2ItemFieldTextValue':
-      return { kind: 'text', fieldId, text: raw.text ?? '' }
-    case 'ProjectV2ItemFieldNumberValue':
-      if (typeof raw.number !== 'number') {
-        return null
-      }
-      return { kind: 'number', fieldId, number: raw.number }
-    case 'ProjectV2ItemFieldDateValue':
-      return { kind: 'date', fieldId, date: raw.date ?? '' }
-    case 'ProjectV2ItemFieldLabelValue': {
-      const labels = (raw.labels?.nodes ?? [])
-        .map(normalizeLabel)
-        .filter((l): l is GitHubProjectLabel => l !== null)
-      return { kind: 'labels', fieldId, labels }
-    }
-    case 'ProjectV2ItemFieldUserValue': {
-      const users = (raw.users?.nodes ?? [])
-        .map(normalizeUser)
-        .filter((u): u is GitHubProjectUser => u !== null)
-      return { kind: 'users', fieldId, users }
-    }
-    case undefined:
-    default:
-      // Unknown __typename → forward-compat: drop silently, don't classify as drift (see design §Error Handling).
-      return null
-  }
-}
-
-type RawContent = {
-  __typename?: string
-  id?: string
-  number?: number
-  title?: string
-  body?: string
-  url?: string
-  state?: string
-  stateReason?: string | null
-  isDraft?: boolean
-  repository?: { nameWithOwner?: string }
-  assignees?: { nodes?: RawUser[] }
-  labels?: { nodes?: RawLabel[] }
-  parent?: { number?: number; title?: string; url?: string } | null
-  issueType?: {
-    id?: string
-    name?: string
-    color?: string | null
-    description?: string | null
-  } | null
-}
-
-type RawItem = {
-  id?: string
-  type?: string
-  updatedAt?: string
-  content?: RawContent | null
-  fieldValues?: {
-    nodes?: RawFieldValue[]
-    pageInfo?: { hasNextPage?: boolean }
-  }
-}
-
-type NormalizedItemOutcome =
-  | { ok: true; row: GitHubProjectRow }
-  | { ok: false; drift: GitHubProjectViewError }
-
-function mapItemType(raw: string | undefined, hasContent: boolean): GitHubProjectRowItemType {
-  if (raw === 'ISSUE') {
-    return 'ISSUE'
-  }
-  if (raw === 'PULL_REQUEST') {
-    return 'PULL_REQUEST'
-  }
-  if (raw === 'DRAFT_ISSUE') {
-    return 'DRAFT_ISSUE'
-  }
-  if (raw === 'REDACTED' || !hasContent) {
-    return 'REDACTED'
-  }
-  // Unknown item type with content — treat as redacted rather than dropping.
-  return 'REDACTED'
-}
-
-export function normalizeItem(raw: RawItem, position: number): NormalizedItemOutcome {
-  if (!raw || typeof raw.id !== 'string') {
-    return {
-      ok: false,
-      drift: driftError('item missing id', { path: ['items', 'nodes', position, 'id'] })
-    }
-  }
-  if (raw.fieldValues?.pageInfo?.hasNextPage === true) {
-    return {
-      ok: false,
-      drift: driftError('item field values exceeded single page', {
-        path: ['items', 'nodes', position, 'fieldValues', 'pageInfo', 'hasNextPage']
-      })
-    }
-  }
-  const itemType = mapItemType(raw.type, raw.content !== null && raw.content !== undefined)
-  const content = raw.content ?? null
-  const assignees = (content?.assignees?.nodes ?? [])
-    .map(normalizeUser)
-    .filter((u): u is GitHubProjectUser => u !== null)
-  const labels = (content?.labels?.nodes ?? [])
-    .map(normalizeLabel)
-    .filter((l): l is GitHubProjectLabel => l !== null)
-  const parentIssue =
-    content?.parent &&
-    typeof content.parent.number === 'number' &&
-    typeof content.parent.title === 'string' &&
-    typeof content.parent.url === 'string'
-      ? { number: content.parent.number, title: content.parent.title, url: content.parent.url }
-      : null
-  const issueType =
-    content?.issueType &&
-    typeof content.issueType.id === 'string' &&
-    typeof content.issueType.name === 'string'
-      ? {
-          id: content.issueType.id,
-          name: content.issueType.name,
-          color: typeof content.issueType.color === 'string' ? content.issueType.color : null,
-          description:
-            typeof content.issueType.description === 'string' ? content.issueType.description : null
-        }
-      : null
-  const fieldValuesByFieldId: Record<string, GitHubProjectFieldValue> = {}
-  for (const fv of raw.fieldValues?.nodes ?? []) {
-    const normalized = normalizeFieldValue(fv)
-    if (normalized) {
-      fieldValuesByFieldId[normalized.fieldId] = normalized
-    }
-  }
-  const title =
-    itemType === 'REDACTED'
-      ? 'Restricted item'
-      : typeof content?.title === 'string'
-        ? content.title
-        : ''
-  const row: GitHubProjectRow = {
-    id: raw.id,
-    itemType,
-    content: {
-      number: typeof content?.number === 'number' ? content.number : null,
-      title,
-      body: typeof content?.body === 'string' ? content.body : null,
-      url: typeof content?.url === 'string' ? content.url : null,
-      state: typeof content?.state === 'string' ? content.state : null,
-      stateReason: typeof content?.stateReason === 'string' ? content.stateReason : null,
-      isDraft: typeof content?.isDraft === 'boolean' ? content.isDraft : null,
-      repository:
-        typeof content?.repository?.nameWithOwner === 'string'
-          ? content.repository.nameWithOwner
-          : null,
-      assignees,
-      labels,
-      parentIssue,
-      issueType
-    },
-    fieldValuesByFieldId,
-    updatedAt: typeof raw.updatedAt === 'string' ? raw.updatedAt : '',
-    position
-  }
-  return { ok: true, row }
-}
-
-// ─── GraphQL query fragments ───────────────────────────────────────────
-
-const FIELD_CONFIG_FRAGMENT = `
-fragment FieldConfig on ProjectV2FieldConfiguration {
-  __typename
-  ... on ProjectV2Field { id name dataType }
-  ... on ProjectV2SingleSelectField {
-    id
-    name
-    dataType
-    options { id name color }
-  }
-  ... on ProjectV2IterationField {
-    id
-    name
-    dataType
-    configuration {
-      iterations { id title startDate duration }
-      completedIterations { id title startDate duration }
-    }
-  }
-}
-`
-
-function itemContentSelection(includeParent: boolean): string {
-  const parentFrag = includeParent ? 'parent { number title url }' : ''
-  return `
-    __typename
-    ... on Issue {
-      id
-      number
-      title
-      url
-      state
-      stateReason
-      repository { nameWithOwner }
-      assignees(first:5) { nodes { login name avatarUrl } }
-      labels(first:10) { nodes { name color } }
-      issueType { id name color description }
-      ${parentFrag}
-    }
-    ... on PullRequest {
-      id
-      number
-      title
-      url
-      state
-      isDraft
-      repository { nameWithOwner }
-      assignees(first:5) { nodes { login name avatarUrl } }
-      labels(first:10) { nodes { name color } }
-    }
-    ... on DraftIssue { id title body }
-  `
-}
-
-const FIELD_VALUES_SELECTION = `
-  fieldValues(first:${FIELD_VALUES_PAGE_SIZE}) {
-    pageInfo { hasNextPage }
-    nodes {
-      __typename
-      ... on ProjectV2ItemFieldSingleSelectValue { field { ...FieldConfig } name color optionId }
-      ... on ProjectV2ItemFieldIterationValue    { field { ...FieldConfig } title startDate duration iterationId }
-      ... on ProjectV2ItemFieldTextValue         { field { ...FieldConfig } text }
-      ... on ProjectV2ItemFieldNumberValue       { field { ...FieldConfig } number }
-      ... on ProjectV2ItemFieldDateValue         { field { ...FieldConfig } date }
-      ... on ProjectV2ItemFieldLabelValue        { field { ...FieldConfig } labels(first:10) { nodes { name color } } }
-      ... on ProjectV2ItemFieldUserValue         { field { ...FieldConfig } users(first:5) { nodes { login name avatarUrl } } }
-    }
-  }
-`
-
-// ─── Project config fetch (views + fields, paginated) ──────────────────
-
-type RawProjectConfig = {
-  id?: string
-  title?: string
-  url?: string
-  views?: {
-    pageInfo?: { hasNextPage?: boolean; endCursor?: string | null }
-    nodes?: (RawProjectView | null)[]
-  }
-}
-
-type RawProjectView = {
-  id?: string
-  number?: number
-  name?: string
-  layout?: string
-  filter?: string | null
-  fields?: {
-    pageInfo?: { hasNextPage?: boolean; endCursor?: string | null }
-    nodes?: (RawProjectV2Field | null)[]
-  }
-  groupByFields?: { nodes?: (RawProjectV2Field | null)[] }
-  sortByFields?: {
-    nodes?: ({ direction?: string; field?: RawProjectV2Field | null } | null)[]
-  }
-}
-
-function ownerQueryRoot(ownerType: GitHubProjectOwnerType): string {
-  return ownerType === 'organization' ? 'organization' : 'user'
-}
-
-async function fetchProjectViewsPage(args: {
-  owner: string
-  ownerType: GitHubProjectOwnerType
-  projectNumber: number
-  host?: string
-  after: string | null
-}): Promise<
-  | {
-      ok: true
-      project: { id: string; title: string; url: string }
-      views: RawProjectView[]
-      hasNextPage: boolean
-      endCursor: string | null
-    }
-  | { ok: false; error: GitHubProjectViewError }
-> {
-  const root = ownerQueryRoot(args.ownerType)
-  const afterArg = args.after ? `, after: $after` : ''
-  const afterVar = args.after ? `$after:String!, ` : ''
-  const query = `
-    query(${afterVar}$owner:String!, $num:Int!) {
-      ${root}(login:$owner) {
-        projectV2(number:$num) {
-          id title url
-          views(first:${VIEWS_PAGE_SIZE}${afterArg}) {
-            pageInfo { hasNextPage endCursor }
-            nodes {
-              id number name layout filter
-              fields(first:${FIELDS_PAGE_SIZE}) {
-                pageInfo { hasNextPage endCursor }
-                nodes { ...FieldConfig }
-              }
-              groupByFields(first:10) { nodes { ...FieldConfig } }
-              sortByFields(first:10) {
-                nodes { direction field { ...FieldConfig } }
-              }
-            }
-          }
-        }
-      }
-    }
-    ${FIELD_CONFIG_FRAGMENT}
-  `
-  const vars: GraphqlVars = { owner: args.owner, num: args.projectNumber }
-  if (args.after) {
-    vars.after = args.after
-  }
-  const res = await runGraphql<Record<string, { projectV2?: RawProjectConfig | null } | null>>(
-    query,
-    vars,
-    projectGhExecOptions(args.host)
-  )
-  if (!res.ok) {
-    return res
-  }
-  const top = res.data[root]
-  const project = top?.projectV2 ?? null
-  if (!project || typeof project.id !== 'string') {
-    return { ok: false, error: { type: 'not_found', message: 'Project not found.' } }
-  }
-  const pageInfo = project.views?.pageInfo
-  const views = (project.views?.nodes ?? []).filter((v): v is RawProjectView => v !== null)
-  return {
-    ok: true,
-    project: { id: project.id, title: project.title ?? '', url: project.url ?? '' },
-    views,
-    hasNextPage: pageInfo?.hasNextPage === true,
-    endCursor: pageInfo?.endCursor ?? null
-  }
-}
-
-async function fetchViewFieldsContinuation(
-  viewId: string,
-  after: string,
-  host?: string
-): Promise<
-  { ok: true; fields: RawProjectV2Field[] } | { ok: false; error: GitHubProjectViewError }
-> {
-  // Why: address the view directly via node(id:) instead of re-walking all views each page — one round-trip per field page.
-  const query = `
-    query($after:String!, $viewId:ID!) {
-      node(id:$viewId) {
-        ... on ProjectV2View {
-          id
-          fields(first:${FIELDS_PAGE_SIZE}, after:$after) {
-            pageInfo { hasNextPage endCursor }
-            nodes { ...FieldConfig }
-          }
-        }
-      }
-    }
-    ${FIELD_CONFIG_FRAGMENT}
-  `
-  const collected: RawProjectV2Field[] = []
-  let cursor: string | null = after
-  while (cursor !== null) {
-    const res = await runGraphql<{
-      node?: {
-        id?: string
-        fields?: {
-          pageInfo?: { hasNextPage?: boolean; endCursor?: string | null }
-          nodes?: (RawProjectV2Field | null)[]
-        }
-      } | null
-    }>(query, { viewId, after: cursor }, projectGhExecOptions(host))
-    if (!res.ok) {
-      return res
-    }
-    const view = res.data.node ?? null
-    if (!view) {
-      return { ok: false, error: driftError('view disappeared during field pagination') }
-    }
-    const nodes = (view.fields?.nodes ?? []).filter((f): f is RawProjectV2Field => f !== null)
-    collected.push(...nodes)
-    const pi = view.fields?.pageInfo
-    cursor = pi?.hasNextPage === true && typeof pi.endCursor === 'string' ? pi.endCursor : null
-  }
-  return { ok: true, fields: collected }
-}
-
-function finalizeView(
-  raw: RawProjectView,
-  extraFields: RawProjectV2Field[]
-): { ok: true; view: GitHubProjectView } | { ok: false; drift: GitHubProjectViewError } {
-  if (typeof raw.id !== 'string' || typeof raw.layout !== 'string') {
-    return { ok: false, drift: driftError('view missing id or layout') }
-  }
-  const layout = raw.layout as GitHubProjectViewLayout
-  const fields: GitHubProjectField[] = []
-  const all = [...(raw.fields?.nodes ?? []), ...extraFields.map((f) => f as RawProjectV2Field)]
-  for (const f of all) {
-    const n = normalizeField(f)
-    if (n) {
-      fields.push(n)
-    }
-  }
-  const groupByFields: GitHubProjectField[] = []
-  for (const f of raw.groupByFields?.nodes ?? []) {
-    const n = normalizeField(f)
-    if (n) {
-      groupByFields.push(n)
-    }
-  }
-  const sortByFields: GitHubProjectSort[] = []
-  for (const s of raw.sortByFields?.nodes ?? []) {
-    if (!s || (s.direction !== 'ASC' && s.direction !== 'DESC')) {
-      continue
-    }
-    const n = normalizeField(s.field)
-    if (n) {
-      sortByFields.push({ direction: s.direction, field: n })
-    }
-  }
-  return {
-    ok: true,
-    view: {
-      id: raw.id,
-      number: typeof raw.number === 'number' ? raw.number : 0,
-      name: typeof raw.name === 'string' ? raw.name : '',
-      layout,
-      // Why: `ProjectV2View.filter` is nullable — normalize to ''.
-      filter: typeof raw.filter === 'string' ? raw.filter : '',
-      fields,
-      groupByFields,
-      sortByFields
-    }
-  }
-}
-
-// ─── View selection ───────────────────────────────────────────────────
-
-function matchesSelector(
-  raw: RawProjectView,
-  sel: { viewId?: string; viewNumber?: number; viewName?: string }
-): 'none' | 'id' | 'number' | 'name' | 'default' {
-  if (sel.viewId && raw.id === sel.viewId) {
-    return 'id'
-  }
-  if (sel.viewNumber !== undefined && raw.number === sel.viewNumber) {
-    return 'number'
-  }
-  if (sel.viewName && raw.name === sel.viewName) {
-    return 'name'
-  }
-  if (
-    sel.viewId === undefined &&
-    sel.viewNumber === undefined &&
-    sel.viewName === undefined &&
-    raw.layout === 'TABLE_LAYOUT'
-  ) {
-    return 'default'
-  }
-  return 'none'
-}
-
-// ─── Items fetch (paginated) ──────────────────────────────────────────
-
-type RawItemsPage = {
-  totalCount?: number
-  pageInfo?: { hasNextPage?: boolean; endCursor?: string | null }
-  nodes?: (RawItem | null)[]
-}
-
-// Why: unlike runGraphql, return the raw GraphQL error envelope so the parent-field retry decision can re-inspect it.
-async function fetchItemsPageWithRaw(args: {
-  owner: string
-  ownerType: GitHubProjectOwnerType
-  projectNumber: number
-  query: string
-  first: number
-  after: string | null
-  includeParent: boolean
-  host?: string
-}): Promise<
-  | { ok: true; page: RawItemsPage }
-  | {
-      ok: false
-      error: GitHubProjectViewError
-      rawErrors: GhGraphqlErrorShape[]
-      stderr: string
-    }
-> {
-  const authError = await projectHostAuthenticationError(args.host)
-  if (authError) {
-    return { ok: false, error: authError, rawErrors: [], stderr: '' }
-  }
-  const root = ownerQueryRoot(args.ownerType)
-  const afterArg = args.after ? `, after: $after` : ''
-  const afterVar = args.after ? `$after:String!, ` : ''
-  const query = `
-    query(${afterVar}$owner:String!, $num:Int!, $q:String!, $first:Int!) {
-      ${root}(login:$owner) {
-        projectV2(number:$num) {
-          items(first:$first${afterArg}, query:$q, orderBy:{ field: POSITION, direction: ASC }) {
-            totalCount
-            pageInfo { hasNextPage endCursor }
-            nodes {
-              id
-              type
-              updatedAt
-              content { ${itemContentSelection(args.includeParent)} }
-              ${FIELD_VALUES_SELECTION}
-            }
-          }
-        }
-      }
-    }
-    ${FIELD_CONFIG_FRAGMENT}
-  `
-  const argsArr: string[] = ['api', 'graphql', '-f', `query=${query}`]
-  argsArr.push('-f', `owner=${args.owner}`)
-  argsArr.push('-F', `num=${args.projectNumber}`)
-  argsArr.push('-f', `q=${args.query}`)
-  argsArr.push('-F', `first=${args.first}`)
-  if (args.after) {
-    argsArr.push('-f', `after=${args.after}`)
-  }
-
-  // Why: GHES traffic runs against its own quota — only github.com requests
-  // consult/debit the shared snapshot.
-  const guard = repositoryRateLimitGuard(args, 'graphql')
-  if (guard.blocked) {
-    return {
-      ok: false,
-      error: rateLimitedError(guard),
-      rawErrors: [],
-      stderr: ''
-    }
-  }
-  await acquire()
-  noteRepositoryRateLimitSpend(args, 'graphql')
-  try {
-    let stdout = ''
-    let stderr = ''
-    let execFailed = false
-    try {
-      const r = await ghExecFileAsync(argsArr, {
-        encoding: 'utf-8',
-        ...projectGhExecOptions(args.host)
-      })
-      stdout = r.stdout
-      stderr = r.stderr
-    } catch (err) {
-      const extracted = extractExecError(err)
-      stderr = extracted.stderr
-      stdout = extracted.stdout
-      execFailed = true
-    }
-    let parsed: { data?: Record<string, unknown>; errors?: GhGraphqlErrorShape[] } = {}
-    try {
-      parsed = JSON.parse(stdout)
-    } catch {
-      // Why: gh exited non-zero with unparseable stdout; classify against stderr so callers see the real cause, not a synthesized drift/not-found.
-      if (execFailed) {
-        return {
-          ok: false,
-          error: classifyProjectError(stderr, stdout, args.host),
-          rawErrors: [],
-          stderr
-        }
-      }
-      return {
-        ok: false,
-        error: driftError('failed to parse items response'),
-        rawErrors: [],
-        stderr
-      }
-    }
-    // Why: gh rejected but stdout parsed; fall through to parsed.errors below, else surface the stderr classification rather than not_found.
-    if (execFailed && (!parsed.errors || parsed.errors.length === 0) && !parsed.data) {
-      return {
-        ok: false,
-        error: classifyProjectError(stderr, stdout, args.host),
-        rawErrors: [],
-        stderr
-      }
-    }
-    if (parsed.errors && parsed.errors.length > 0) {
-      return {
-        ok: false,
-        error: classifyProjectError(stderr, stdout, args.host),
-        rawErrors: parsed.errors,
-        stderr
-      }
-    }
-    const top = parsed.data?.[root] as { projectV2?: { items?: RawItemsPage } | null } | undefined
-    const page = top?.projectV2?.items
-    if (!page) {
-      return {
-        ok: false,
-        error: { type: 'not_found', message: 'Project or view not found.' },
-        rawErrors: [],
-        stderr
-      }
-    }
-    return { ok: true, page }
-  } finally {
-    release()
-  }
-}
-
-async function fetchAllItems(args: {
-  owner: string
-  ownerType: GitHubProjectOwnerType
-  projectNumber: number
-  query: string
-  host?: string
-}): Promise<
-  | { ok: true; rows: GitHubProjectRow[]; totalCount: number; parentFieldDropped: boolean }
-  | { ok: false; error: GitHubProjectViewError; totalCount?: number }
-> {
-  // Why: isolate missing Issue.parent capability by owner, type, and host.
-  const scopeKey = ownerScopeKey(args.owner, args.ownerType, args.host)
-  // Why: await the same-scope probe, then re-read state because it may have changed.
-  const inFlight = parentFieldProbeInFlight.get(scopeKey)
-  if (inFlight) {
-    await inFlight.catch(() => {})
-  }
-  let includeParent = !hasParentFieldRetried(scopeKey)
-  let parentFieldDropped = !includeParent
-  // Single-flight the with-parent probe per owner; assign the in-flight promise synchronously (no await between get() and set()) so callers share one probe.
-  let first: Awaited<ReturnType<typeof fetchItemsPageWithRaw>>
-  let probePromise: Promise<Awaited<ReturnType<typeof fetchItemsPageWithRaw>>> | null = null
-  if (includeParent && !parentFieldProbeInFlight.has(scopeKey)) {
-    let resolveProbe: () => void = () => {}
-    const probe = new Promise<void>((resolve) => {
-      resolveProbe = resolve
-    })
-    parentFieldProbeInFlight.set(scopeKey, probe)
-    probePromise = (async () => {
-      try {
-        const result = await fetchItemsPageWithRaw({
-          owner: args.owner,
-          ownerType: args.ownerType,
-          projectNumber: args.projectNumber,
-          query: args.query,
-          first: ITEM_PAGE_SIZE,
-          after: null,
-          includeParent: true,
-          host: args.host
-        })
-        // Why: set the retried flag BEFORE resolving/clearing the probe so siblings awoken on inFlight.catch() see it and don't fire duplicate with-parent probes.
-        if (!result.ok && errorsIndicateParentField(result.rawErrors, result.stderr)) {
-          markParentFieldRetried(scopeKey)
-        }
-        return result
-      } finally {
-        resolveProbe()
-        parentFieldProbeInFlight.delete(scopeKey)
-      }
-    })()
-    first = await probePromise
-  } else {
-    first = await fetchItemsPageWithRaw({
-      owner: args.owner,
-      ownerType: args.ownerType,
-      projectNumber: args.projectNumber,
-      query: args.query,
-      first: ITEM_PAGE_SIZE,
-      after: null,
-      includeParent,
-      host: args.host
-    })
-  }
-  if (!first.ok && includeParent && errorsIndicateParentField(first.rawErrors, first.stderr)) {
-    // Retry the whole table without parent; mark this owner retried so later fetches skip the probe (other owners unaffected).
-    markParentFieldRetried(scopeKey)
-    includeParent = false
-    parentFieldDropped = true
-    if (!hasParentFieldWarningLogged(scopeKey)) {
-      console.warn(
-        `[project-view] Issue.parent is not available for ${args.owner} on this token — retrying without the parent selection.`
-      )
-      markParentFieldWarningLogged(scopeKey)
-    }
-    first = await fetchItemsPageWithRaw({
-      owner: args.owner,
-      ownerType: args.ownerType,
-      projectNumber: args.projectNumber,
-      query: args.query,
-      first: ITEM_PAGE_SIZE,
-      after: null,
-      includeParent: false,
-      host: args.host
-    })
-  }
-  if (!first.ok) {
-    return { ok: false, error: first.error }
-  }
-
-  // Drift guards
-  if (first.page.totalCount === undefined || first.page.totalCount === null) {
-    return { ok: false, error: driftError('items.totalCount missing') }
-  }
-  const totalCount = first.page.totalCount
-  if (first.page.pageInfo?.hasNextPage === undefined) {
-    return { ok: false, error: driftError('items.pageInfo.hasNextPage missing'), totalCount }
-  }
-  if (!Array.isArray(first.page.nodes)) {
-    return { ok: false, error: driftError('items.nodes missing'), totalCount }
-  }
-
-  // Size cap
-  if (totalCount > MAX_ITEMS) {
-    return {
-      ok: false,
-      error: { type: 'too_large', message: `View has ${totalCount} items.` },
-      totalCount
-    }
-  }
-
-  const rows: GitHubProjectRow[] = []
-  let position = 0
-  const appendNodes = (nodes: (RawItem | null)[]): GitHubProjectViewError | null => {
-    for (const n of nodes) {
-      if (!n) {
-        continue
-      }
-      const norm = normalizeItem(n, position)
-      if (!norm.ok) {
-        return norm.drift
-      }
-      rows.push(norm.row)
-      position++
-    }
-    return null
-  }
-  const e1 = appendNodes(first.page.nodes)
-  if (e1) {
-    return { ok: false, error: e1, totalCount }
-  }
-
-  // Paginate
-  let hasNext = first.page.pageInfo.hasNextPage === true
-  let cursor: string | null | undefined = first.page.pageInfo.endCursor
-  if (hasNext && typeof cursor !== 'string') {
-    return {
-      ok: false,
-      error: driftError('items.pageInfo.endCursor missing with hasNextPage=true'),
-      totalCount
-    }
-  }
-  while (hasNext) {
-    const next = await fetchItemsPageWithRaw({
-      owner: args.owner,
-      ownerType: args.ownerType,
-      projectNumber: args.projectNumber,
-      query: args.query,
-      first: ITEM_PAGE_SIZE,
-      after: cursor as string,
-      includeParent,
-      host: args.host
-    })
-    if (!next.ok) {
-      return { ok: false, error: next.error, totalCount }
-    }
-    if (!Array.isArray(next.page.nodes)) {
-      return { ok: false, error: driftError('items.nodes missing on follow page'), totalCount }
-    }
-    if (next.page.pageInfo?.hasNextPage === undefined) {
-      return {
-        ok: false,
-        error: driftError('items.pageInfo.hasNextPage missing on follow page'),
-        totalCount
-      }
-    }
-    const e2 = appendNodes(next.page.nodes)
-    if (e2) {
-      return { ok: false, error: e2, totalCount }
-    }
-    hasNext = next.page.pageInfo.hasNextPage === true
-    cursor = next.page.pageInfo.endCursor
-    if (hasNext && typeof cursor !== 'string') {
-      return {
-        ok: false,
-        error: driftError('items.pageInfo.endCursor missing with hasNextPage=true'),
-        totalCount
-      }
-    }
-  }
-  return { ok: true, rows, totalCount, parentFieldDropped }
-}
-
-// ─── Cheap count-only query (for unsupported_layout) ──────────────────
-
-async function fetchItemsCountOnly(args: {
-  owner: string
-  ownerType: GitHubProjectOwnerType
-  projectNumber: number
-  query: string
-  host?: string
-}): Promise<number | null> {
-  const root = ownerQueryRoot(args.ownerType)
-  const query = `
-    query($owner:String!, $num:Int!, $q:String!) {
-      ${root}(login:$owner) {
-        projectV2(number:$num) {
-          items(first:1, query:$q) { totalCount }
-        }
-      }
-    }
-  `
-  const res = await runGraphql<
-    Record<string, { projectV2?: { items?: { totalCount?: number } | null } | null } | null>
-  >(
-    query,
-    { owner: args.owner, num: args.projectNumber, q: args.query },
-    projectGhExecOptions(args.host)
-  )
-  if (!res.ok) {
-    return null
-  }
-  const count = res.data[root]?.projectV2?.items?.totalCount
-  return typeof count === 'number' ? count : null
-}
-
-// ─── Public: getProjectViewTable ──────────────────────────────────────
-
-export async function getProjectViewTable(
-  args: GetProjectViewTableArgs
-): Promise<GetProjectViewTableResult> {
-  const ownerCheck = assertSlug(args.owner, 'owner')
-  if (!ownerCheck.ok) {
-    return { ok: false, error: ownerCheck.error }
-  }
-  const numCheck = assertPositiveInt(args.projectNumber, 'projectNumber')
-  if (!numCheck.ok) {
-    return { ok: false, error: numCheck.error }
-  }
-  if (args.ownerType !== 'organization' && args.ownerType !== 'user') {
-    return {
-      ok: false,
-      error: { type: 'validation_error', message: 'Invalid ownerType.' }
-    }
-  }
-
-  // Paginate views until a match is found.
-  let cursor: string | null = null
-  let project: { id: string; title: string; url: string } | null = null
-  let selectedRaw: RawProjectView | null = null
-  let matchStrength: 'id' | 'number' | 'name' | 'default' | null = null
-  const viewsSeen: RawProjectView[] = []
-  while (true) {
-    const page = await fetchProjectViewsPage({
-      owner: args.owner,
-      ownerType: args.ownerType,
-      projectNumber: args.projectNumber,
-      host: args.host,
-      after: cursor
-    })
-    if (!page.ok) {
-      return { ok: false, error: page.error }
-    }
-    project = page.project
-    for (const v of page.views) {
-      viewsSeen.push(v)
-      const m = matchesSelector(v, {
-        viewId: args.viewId,
-        viewNumber: args.viewNumber,
-        viewName: args.viewName
-      })
-      if (m === 'none') {
-        continue
-      }
-      // Precedence: id > number > name > default.
-      const rank: Record<typeof m, number> = { id: 4, number: 3, name: 2, default: 1 }
-      const currentRank = matchStrength ? rank[matchStrength] : 0
-      if (!selectedRaw || rank[m] > currentRank) {
-        selectedRaw = v
-        matchStrength = m
-      }
-    }
-    // Why: stop on ANY match (incl. 'default' = first table view); walking further pages costs a GraphQL call per page with no re-ranking upside.
-    if (selectedRaw) {
-      break
-    }
-    if (!page.hasNextPage) {
-      break
-    }
-    cursor = page.endCursor
-    if (typeof cursor !== 'string') {
-      break
-    }
-  }
-  if (!project) {
-    return { ok: false, error: { type: 'not_found', message: 'Project not found.' } }
-  }
-  if (!selectedRaw) {
-    return { ok: false, error: { type: 'not_found', message: 'Could not find the selected view.' } }
-  }
-
-  // Paginate view fields if necessary.
-  let extraFields: RawProjectV2Field[] = []
-  const fieldsPi = selectedRaw.fields?.pageInfo
-  if (fieldsPi?.hasNextPage === true && typeof fieldsPi.endCursor === 'string' && selectedRaw.id) {
-    const cont = await fetchViewFieldsContinuation(selectedRaw.id, fieldsPi.endCursor, args.host)
-    if (!cont.ok) {
-      return { ok: false, error: cont.error }
-    }
-    extraFields = cont.fields
-  }
-
-  const finalized = finalizeView(selectedRaw, extraFields)
-  if (!finalized.ok) {
-    return { ok: false, error: finalized.drift }
-  }
-  const selectedView = finalized.view
-
-  // Why: empty-string override means "no filter"; undefined means "use the view's stored filter". The override is ephemeral, never persisted.
-  const effectiveQuery =
-    typeof args.queryOverride === 'string' ? args.queryOverride : selectedView.filter
-
-  // Unsupported layout: skip item pagination; best-effort count-only query.
-  if (selectedView.layout !== 'TABLE_LAYOUT') {
-    const count = await fetchItemsCountOnly({
-      owner: args.owner,
-      ownerType: args.ownerType,
-      projectNumber: args.projectNumber,
-      query: effectiveQuery,
-      host: args.host
-    })
-    return {
-      ok: false,
-      error: {
-        type: 'unsupported_layout',
-        message: `Orca only renders table views. This is a ${selectedView.layout.replace('_LAYOUT', '').toLowerCase()} view.`
-      },
-      ...(typeof count === 'number' ? { totalCount: count } : {})
-    }
-  }
-
-  // Fetch items.
-  const items = await fetchAllItems({
-    owner: args.owner,
-    ownerType: args.ownerType,
-    projectNumber: args.projectNumber,
-    query: effectiveQuery,
-    host: args.host
-  })
-  if (!items.ok) {
-    return {
-      ok: false,
-      error: items.error,
-      ...(typeof items.totalCount === 'number' ? { totalCount: items.totalCount } : {})
-    }
-  }
-
-  const table: GitHubProjectTable = {
-    project: {
-      id: project.id,
-      host: githubProjectHost(args.host),
-      owner: args.owner,
-      ownerType: args.ownerType,
-      number: args.projectNumber,
-      title: project.title,
-      url: project.url
-    },
-    selectedView,
-    rows: items.rows,
-    totalCount: items.totalCount,
-    parentFieldDropped: items.parentFieldDropped
-  }
-  return { ok: true, data: table }
-}
-
-// ─── listAccessibleProjects ────────────────────────────────────────────
-
-type RawViewerDiscovery = {
-  viewer?: {
-    login?: string
-    projectsV2?: {
-      pageInfo?: { hasNextPage?: boolean; endCursor?: string | null }
-      nodes?: ({
-        id?: string
-        number?: number
-        title?: string
-        url?: string
-        owner?: { __typename?: string; login?: string }
-      } | null)[]
-    }
-    organizations?: {
-      pageInfo?: { hasNextPage?: boolean; endCursor?: string | null }
-      nodes?: ({
-        login?: string
-        projectsV2?: {
-          pageInfo?: { hasNextPage?: boolean; endCursor?: string | null }
-          nodes?: ({ id?: string; number?: number; title?: string; url?: string } | null)[]
-        }
-      } | null)[]
-    }
-  }
-}
-
-export async function listAccessibleProjects(
-  args?: ListAccessibleProjectsArgs
-): Promise<ListAccessibleProjectsResult> {
-  const host = githubProjectHost(args?.host)
-  const viewerProjects: GitHubProjectSummary[] = []
-  const orgProjects: GitHubProjectSummary[] = []
-  // Why: collect per-org failures so the picker shows a "some orgs didn't load" banner instead of aborting discovery on the first 504.
-  const partialFailures: { owner: string; message: string }[] = []
-  let viewerLogin: string | null = null
-
-  // 1) Viewer projects (paginated, single owner so cap at DISCOVERY_PROJECTS_PER_OWNER total).
-  let viewerCursor: string | null = null
-  let viewerMore = true
-  let viewerFetched = 0
-  while (viewerMore && viewerFetched < DISCOVERY_PROJECTS_PER_OWNER) {
-    const afterArg = viewerCursor ? ', after: $after' : ''
-    const afterVar = viewerCursor ? '$after:String!' : ''
-    const query = `
-      query${afterVar ? `(${afterVar})` : ''} {
-        viewer {
-          login
-          projectsV2(first:${DISCOVERY_PROJECTS_PER_ORG}${afterArg}) {
-            pageInfo { hasNextPage endCursor }
-            nodes {
-              id number title url
-              owner { __typename ... on Organization { login } ... on User { login } }
-            }
-          }
-        }
-      }
-    `
-    const vars: GraphqlVars = {}
-    if (viewerCursor) {
-      vars.after = viewerCursor
-    }
-    const res = await runGraphql<RawViewerDiscovery>(query, vars, projectGhExecOptions(host))
-    if (!res.ok) {
-      // Why: viewer-level failure is structural (no projects to build on), so propagate hard; org-level errors below are non-fatal.
-      return { ok: false, error: res.error }
-    }
-    if (!res.data.viewer) {
-      return { ok: false, error: driftError('viewer missing') }
-    }
-    if (viewerLogin === null) {
-      viewerLogin = res.data.viewer.login ?? null
-    }
-    const nodes = res.data.viewer.projectsV2?.nodes ?? []
-    for (const n of nodes) {
-      if (!n || typeof n.id !== 'string' || typeof n.number !== 'number') {
-        continue
-      }
-      const ownerLogin = n.owner?.login ?? viewerLogin ?? ''
-      const ownerType: GitHubProjectOwnerType =
-        n.owner?.__typename === 'Organization' ? 'organization' : 'user'
-      viewerProjects.push({
-        id: n.id,
-        host,
-        owner: ownerLogin,
-        ownerType,
-        number: n.number,
-        title: n.title ?? '',
-        url: n.url ?? '',
-        source: 'viewer'
-      })
-      viewerFetched++
-      if (viewerFetched >= DISCOVERY_PROJECTS_PER_OWNER) {
-        break
-      }
-    }
-    const pi = res.data.viewer.projectsV2?.pageInfo
-    viewerMore = pi?.hasNextPage === true && typeof pi.endCursor === 'string'
-    viewerCursor = viewerMore ? (pi?.endCursor ?? null) : null
-  }
-
-  // 2) Organizations the viewer belongs to, each with its projectsV2.
-  // Why: no per-org projectsV2 continuation loop — it was the dominant 504 cost; users past the cap can paste a URL instead.
-  let orgCursor: string | null = null
-  let orgMore = true
-  let orgsSeen = 0
-  while (orgMore && orgsSeen < DISCOVERY_MAX_ORGS) {
-    const afterArg = orgCursor ? ', after: $orgAfter' : ''
-    const afterVar = orgCursor ? '$orgAfter:String!' : ''
-    const query = `
-      query${afterVar ? `(${afterVar})` : ''} {
-        viewer {
-          organizations(first:${DISCOVERY_ORG_PAGE_SIZE}${afterArg}) {
-            pageInfo { hasNextPage endCursor }
-            nodes {
-              login
-              projectsV2(first:${DISCOVERY_PROJECTS_PER_ORG}) {
-                pageInfo { hasNextPage endCursor }
-                nodes { id number title url }
-              }
-            }
-          }
-        }
-      }
-    `
-    const vars: GraphqlVars = {}
-    if (orgCursor) {
-      vars.orgAfter = orgCursor
-    }
-    const res = await runGraphql<RawViewerDiscovery>(query, vars, projectGhExecOptions(host))
-    if (!res.ok) {
-      // Why: org-listing failed; record a synthetic '*' partial failure so the banner explains it, but keep collected viewer projects (the reported 504 path).
-      partialFailures.push({ owner: '*', message: res.error.message })
-      break
-    }
-    const orgs = res.data.viewer?.organizations?.nodes ?? []
-    for (const org of orgs) {
-      if (!org || typeof org.login !== 'string') {
-        continue
-      }
-      if (orgsSeen >= DISCOVERY_MAX_ORGS) {
-        break
-      }
-      orgsSeen++
-      const login = org.login
-      // Cache for paste/resolve even when the nested projects query was empty or partially failed.
-      rememberOwnerType(login, 'organization', host)
-      const nodes = org.projectsV2?.nodes ?? []
-      let ownerCount = 0
-      for (const n of nodes) {
-        if (!n || typeof n.id !== 'string' || typeof n.number !== 'number') {
-          continue
-        }
-        if (ownerCount >= DISCOVERY_PROJECTS_PER_OWNER) {
-          break
-        }
-        orgProjects.push({
-          id: n.id,
-          host,
-          owner: login,
-          ownerType: 'organization',
-          number: n.number,
-          title: n.title ?? '',
-          url: n.url ?? '',
-          source: `org:${login}`
-        })
-        ownerCount++
-      }
-    }
-    const pi = res.data.viewer?.organizations?.pageInfo
-    orgMore = pi?.hasNextPage === true && typeof pi.endCursor === 'string'
-    orgCursor = orgMore ? (pi?.endCursor ?? null) : null
-  }
-
-  if (viewerLogin) {
-    rememberOwnerType(viewerLogin, 'user', host)
-  }
-
-  return {
-    ok: true,
-    projects: [...viewerProjects, ...orgProjects],
-    ...(partialFailures.length > 0 ? { partialFailures } : {})
-  }
-}
-
-// ─── resolveProjectRef ─────────────────────────────────────────────────
-
-type ParsedPaste =
-  | { kind: 'org'; owner: string; number: number; host: string; viewNumber?: number }
-  | { kind: 'user'; owner: string; number: number; host: string; viewNumber?: number }
-  | { kind: 'bare'; owner: string; number: number }
-
-export function parseProjectPaste(input: string, host?: string): ParsedPaste | null {
-  const trimmed = input.trim()
-  if (!trimmed) {
-    return null
-  }
-  if (isGitHubProjectRefInputTooLarge(trimmed)) {
-    return null
-  }
-  // Why: URL parsing enforces an exact Project path and rejects credentials;
-  // a prefix regex could silently turn `/projects/1evil` into Project 1.
-  try {
-    const url = new URL(trimmed)
-    const allowedHosts = new Set(['github.com', ...(host ? [host.trim().toLowerCase()] : [])])
-    const parts = url.pathname.split('/').filter(Boolean)
-    const hasView = parts.length === 6 && parts[4] === 'views'
-    if (
-      (url.protocol !== 'https:' && url.protocol !== 'http:') ||
-      url.username ||
-      url.password ||
-      !allowedHosts.has(url.host.toLowerCase()) ||
-      (parts[0] !== 'orgs' && parts[0] !== 'users') ||
-      !isValidOwnerSlug(parts[1]) ||
-      parts[2] !== 'projects' ||
-      (parts.length !== 4 && !hasView)
-    ) {
-      return null
-    }
-    const number = Number(parts[3])
-    const viewNumber = hasView ? Number(parts[5]) : undefined
-    if (
-      !Number.isSafeInteger(number) ||
-      number < 1 ||
-      (hasView && (!Number.isSafeInteger(viewNumber) || (viewNumber ?? 0) < 1))
-    ) {
-      return null
-    }
-    return {
-      kind: parts[0] === 'orgs' ? 'org' : 'user',
-      owner: parts[1],
-      number,
-      host: url.host.toLowerCase(),
-      ...(viewNumber !== undefined ? { viewNumber } : {})
-    }
-  } catch {
-    // Shorthand parsing below remains available for non-URL input.
-  }
-  // owner/number shorthand — owner alphabet matches OWNER_SLUG_RE.
-  const shortRe = /^([A-Za-z0-9][A-Za-z0-9-]*)\/(\d+)$/
-  const sm = trimmed.match(shortRe)
-  if (sm) {
-    const number = Number.parseInt(sm[2], 10)
-    if (!Number.isInteger(number) || number < 1) {
-      return null
-    }
-    return { kind: 'bare', owner: sm[1], number }
-  }
-  return null
-}
-
-async function resolveOwnerType(
-  owner: string,
-  preferred: GitHubProjectOwnerType | null,
-  host?: string
-): Promise<
-  | { ok: true; ownerType: GitHubProjectOwnerType; title: string }
-  | { ok: false; error: GitHubProjectViewError }
-> {
-  const tryOne = async (
-    ot: GitHubProjectOwnerType,
-    num: number | null
-  ): Promise<{ ok: true; title: string } | { ok: false; error: GitHubProjectViewError }> => {
-    const root = ownerQueryRoot(ot)
-    // If number is provided, fetch the project title; else just confirm owner exists.
-    const query = num
-      ? `
-        query($owner:String!, $num:Int!) {
-          ${root}(login:$owner) { projectV2(number:$num) { id title } }
-        }
-      `
-      : `
-        query($owner:String!) {
-          ${root}(login:$owner) { login }
-        }
-      `
-    const vars: GraphqlVars = { owner }
-    if (num) {
-      vars.num = num
-    }
-    const res = await runGraphql<
-      Record<string, { projectV2?: { id?: string; title?: string } | null; login?: string } | null>
-    >(query, vars, projectGhExecOptions(host))
-    if (!res.ok) {
-      return { ok: false, error: res.error }
-    }
-    const top = res.data[root]
-    if (!top) {
-      return { ok: false, error: { type: 'not_found', message: 'Owner not found.' } }
-    }
-    if (num) {
-      const p = top.projectV2
-      if (!p || typeof p.id !== 'string') {
-        return { ok: false, error: { type: 'not_found', message: 'Project not found.' } }
-      }
-      return { ok: true, title: p.title ?? '' }
-    }
-    return { ok: true, title: '' }
-  }
-
-  const cached = getCachedOwnerType(owner, host)
-  const candidates: GitHubProjectOwnerType[] = preferred
-    ? [preferred]
-    : cached
-      ? [cached]
-      : ['organization', 'user']
-  const fallback: GitHubProjectOwnerType[] = preferred
-    ? []
-    : cached
-      ? cached === 'organization'
-        ? ['user']
-        : ['organization']
-      : []
-  const ordered = [...candidates, ...fallback]
-  let lastError: GitHubProjectViewError | null = null
-  for (const ot of ordered) {
-    const r = await tryOne(ot, null)
-    if (r.ok) {
-      rememberOwnerType(owner, ot, host)
-      return { ok: true, ownerType: ot, title: r.title }
-    }
-    lastError = r.error
-    if (r.error.type !== 'not_found') {
-      // Non-NOT_FOUND errors (auth, network, rate) should not trigger fallback.
-      return { ok: false, error: r.error }
-    }
-  }
-  rememberOwnerType(owner, null, host)
-  return {
-    ok: false,
-    error: lastError ?? { type: 'not_found', message: 'Owner not found.' }
-  }
-}
-
-export async function resolveProjectRef(
-  args: ResolveProjectRefArgs
-): Promise<ResolveProjectRefResult> {
-  const input = typeof args.input === 'string' ? args.input.trim() : ''
-  if (!input) {
-    return {
-      ok: false,
-      error: { type: 'validation_error', message: 'Input required.' }
-    }
-  }
-  if (isGitHubProjectRefInputTooLarge(input)) {
-    return {
-      ok: false,
-      error: { type: 'validation_error', message: GITHUB_PROJECT_REF_INPUT_TOO_LARGE_ERROR }
-    }
-  }
-  const parsed = parseProjectPaste(input, args.host)
-  if (!parsed) {
-    return {
-      ok: false,
-      error: {
-        type: 'validation_error',
-        message: 'Could not parse input. Expected a GitHub project URL or `owner/number`.'
-      }
-    }
-  }
-  const preferred: GitHubProjectOwnerType | null =
-    parsed.kind === 'org' ? 'organization' : parsed.kind === 'user' ? 'user' : null
-  // Why: a pasted URL is authoritative. The ambient host only applies to
-  // owner/number shorthand; otherwise same-number Projects can cross hosts.
-  const executionHost = parsed.kind === 'bare' ? githubProjectHost(args.host) : parsed.host
-  // Verify by fetching project title.
-  const ownerRes = await resolveOwnerType(parsed.owner, preferred, executionHost)
-  if (!ownerRes.ok) {
-    return { ok: false, error: ownerRes.error }
-  }
-  const ownerType = ownerRes.ownerType
-  const root = ownerQueryRoot(ownerType)
-  const query = `
-    query($owner:String!, $num:Int!) {
-      ${root}(login:$owner) { projectV2(number:$num) { id title } }
-    }
-  `
-  const res = await runGraphql<
-    Record<string, { projectV2?: { id?: string; title?: string } | null } | null>
-  >(query, { owner: parsed.owner, num: parsed.number }, projectGhExecOptions(executionHost))
-  if (!res.ok) {
-    return { ok: false, error: res.error }
-  }
-  const p = res.data[root]?.projectV2
-  if (!p || typeof p.id !== 'string') {
-    return { ok: false, error: { type: 'not_found', message: 'Project not found.' } }
-  }
-  return {
-    ok: true,
-    owner: parsed.owner,
-    ownerType,
-    number: parsed.number,
-    title: p.title ?? '',
-    host: executionHost,
-    // Why: forward URL view numbers so the renderer can skip view selection; bare shorthand has none.
-    ...(parsed.kind !== 'bare' && parsed.viewNumber !== undefined
-      ? { viewNumber: parsed.viewNumber }
-      : {})
-  }
-}
-
-// ─── listProjectViews ──────────────────────────────────────────────────
-
-export async function listProjectViews(
-  args: ListProjectViewsArgs
-): Promise<ListProjectViewsResult> {
-  const ownerCheck = assertSlug(args.owner, 'owner')
-  if (!ownerCheck.ok) {
-    return { ok: false, error: ownerCheck.error }
-  }
-  const numCheck = assertPositiveInt(args.projectNumber, 'projectNumber')
-  if (!numCheck.ok) {
-    return { ok: false, error: numCheck.error }
-  }
-  if (args.ownerType !== 'organization' && args.ownerType !== 'user') {
-    return { ok: false, error: { type: 'validation_error', message: 'Invalid ownerType.' } }
-  }
-  const summaries: GitHubProjectViewSummary[] = []
-  let cursor: string | null = null
-  while (true) {
-    const page = await fetchProjectViewsPage({
-      owner: args.owner,
-      ownerType: args.ownerType,
-      projectNumber: args.projectNumber,
-      host: args.host,
-      after: cursor
-    })
-    if (!page.ok) {
-      return { ok: false, error: page.error }
-    }
-    for (const v of page.views) {
-      if (typeof v.id !== 'string' || typeof v.layout !== 'string') {
-        continue
-      }
-      summaries.push({
-        id: v.id,
-        number: typeof v.number === 'number' ? v.number : 0,
-        name: typeof v.name === 'string' ? v.name : '',
-        layout: v.layout as GitHubProjectViewLayout
-      })
-    }
-    if (!page.hasNextPage) {
-      break
-    }
-    cursor = page.endCursor
-    if (typeof cursor !== 'string') {
-      break
-    }
-  }
-  return { ok: true, views: summaries }
-}
+export {
+  PROJECT_VIEW_OWNER_CACHE_MAX_ENTRIES,
+  _resetProjectViewCachesForTests,
+  _getProjectViewCacheSizesForTests,
+  _rememberProjectViewOwnerTypeForTests,
+  _getProjectViewOwnerTypeForTests,
+  _markProjectViewParentFieldRetriedForTests,
+  _hasProjectViewParentFieldRetriedForTests,
+  _markProjectViewParentFieldWarningLoggedForTests,
+  _hasProjectViewParentFieldWarningLoggedForTests
+} from './project-view/project-view-cache'
+export {
+  normalizeField,
+  normalizeFieldValue
+} from './project-view/project-view-field-normalization'
+export { normalizeItem } from './project-view/project-view-item-normalization'
+export { getProjectViewTable } from './project-view/project-view-table'
+export { listAccessibleProjects } from './project-view/project-view-discovery'
+export { parseProjectPaste, resolveProjectRef } from './project-view/project-view-reference'
+export { listProjectViews } from './project-view/project-view-listing'
diff --git a/src/main/github/project-view/project-view-cache.ts b/src/main/github/project-view/project-view-cache.ts
new file mode 100644
index 00000000000..571e5318dc8
--- /dev/null
+++ b/src/main/github/project-view/project-view-cache.ts
@@ -0,0 +1,149 @@
+import type { GitHubProjectOwnerType } from '../../../shared/github/project-types'
+import { githubProjectHost } from '../../../shared/github/project-identity'
+
+export const PROJECT_VIEW_OWNER_CACHE_MAX_ENTRIES = 512
+
+// ─── Module-scope caches (reset on HMR — intentional) ──────────────────
+
+// Why: owners are user-controlled over a long session; bound cache entries to avoid unbounded retention while keeping the hot-owner fast path.
+function rememberProjectViewCacheEntry<K, V>(
+  cache: Map<K, V>,
+  key: K,
+  value: V,
+  maxEntries = PROJECT_VIEW_OWNER_CACHE_MAX_ENTRIES
+): void {
+  if (cache.has(key)) {
+    cache.delete(key)
+  }
+  cache.set(key, value)
+  while (cache.size > maxEntries) {
+    const oldest = cache.keys().next()
+    if (oldest.done) {
+      break
+    }
+    cache.delete(oldest.value)
+  }
+}
+
+function getProjectViewCacheEntry<K, V>(cache: Map<K, V>, key: K): V | undefined {
+  if (!cache.has(key)) {
+    return undefined
+  }
+  const value = cache.get(key) as V
+  rememberProjectViewCacheEntry(cache, key, value)
+  return value
+}
+
+// Why: plain module locals so HMR code swaps re-run capability probes instead of carrying a stale "unsupported" flag.
+const ownerTypeCache = new Map<string, GitHubProjectOwnerType | null>()
+// Why: keyed per owner (not a process-global flag) so one owner's capability gap doesn't poison others that DO support Issue.parent (bug-scan finding 2).
+const parentFieldRetriedByOwner = new Map<string, true>()
+const parentFieldWarningLoggedByOwner = new Map<string, true>()
+// Why: in-flight promise per owner so concurrent fetchAllItems callers share one probe instead of each racing a duplicate first-page probe.
+export const parentFieldProbeInFlight = new Map<string, Promise<void>>()
+
+// Why: GHES owners are a separate namespace and capability surface from
+// github.com owners with the same login — scope cache keys by host so one
+// host's probe result can't leak into another. Normalize github.com so
+// host-less callers share the same probe state as explicitly pinned calls.
+export function ownerScopeKey(
+  owner: string,
+  ownerType: GitHubProjectOwnerType,
+  host?: string
+): string {
+  const base = `${owner}\u0000${ownerType}`
+  return `${base}\u0000${githubProjectHost(host)}`
+}
+
+function ownerTypeCacheKey(owner: string, host?: string): string {
+  return `${owner}\u0000${githubProjectHost(host)}`
+}
+
+export function rememberOwnerType(
+  owner: string,
+  ownerType: GitHubProjectOwnerType | null,
+  host?: string
+): void {
+  rememberProjectViewCacheEntry(ownerTypeCache, ownerTypeCacheKey(owner, host), ownerType)
+}
+
+export function getCachedOwnerType(
+  owner: string,
+  host?: string
+): GitHubProjectOwnerType | null | undefined {
+  return getProjectViewCacheEntry(ownerTypeCache, ownerTypeCacheKey(owner, host))
+}
+
+export function markParentFieldRetried(scopeKey: string): void {
+  rememberProjectViewCacheEntry(parentFieldRetriedByOwner, scopeKey, true)
+}
+
+export function hasParentFieldRetried(scopeKey: string): boolean {
+  return getProjectViewCacheEntry(parentFieldRetriedByOwner, scopeKey) === true
+}
+
+export function markParentFieldWarningLogged(scopeKey: string): void {
+  rememberProjectViewCacheEntry(parentFieldWarningLoggedByOwner, scopeKey, true)
+}
+
+export function hasParentFieldWarningLogged(scopeKey: string): boolean {
+  return getProjectViewCacheEntry(parentFieldWarningLoggedByOwner, scopeKey) === true
+}
+
+export function _resetProjectViewCachesForTests(): void {
+  ownerTypeCache.clear()
+  parentFieldRetriedByOwner.clear()
+  parentFieldWarningLoggedByOwner.clear()
+  parentFieldProbeInFlight.clear()
+}
+
+export function _getProjectViewCacheSizesForTests(): {
+  ownerTypes: number
+  parentFieldRetries: number
+  parentFieldWarnings: number
+  parentFieldProbes: number
+} {
+  return {
+    ownerTypes: ownerTypeCache.size,
+    parentFieldRetries: parentFieldRetriedByOwner.size,
+    parentFieldWarnings: parentFieldWarningLoggedByOwner.size,
+    parentFieldProbes: parentFieldProbeInFlight.size
+  }
+}
+
+/** @internal - exposed for cache-bound tests only. */
+export function _rememberProjectViewOwnerTypeForTests(
+  owner: string,
+  ownerType: GitHubProjectOwnerType | null,
+  host?: string
+): void {
+  rememberOwnerType(owner, ownerType, host)
+}
+
+/** @internal - exposed for cache-bound tests only. */
+export function _getProjectViewOwnerTypeForTests(
+  owner: string,
+  host?: string
+): GitHubProjectOwnerType | null | undefined {
+  return getCachedOwnerType(owner, host)
+}
+
+/** @internal - exposed for cache-bound tests only. */
+export function _markProjectViewParentFieldRetriedForTests(scopeKey: string): void {
+  markParentFieldRetried(scopeKey)
+}
+
+/** @internal - exposed for cache-bound tests only. */
+export function _hasProjectViewParentFieldRetriedForTests(scopeKey: string): boolean {
+  return hasParentFieldRetried(scopeKey)
+}
+
+/** @internal - exposed for cache-bound tests only. */
+export function _markProjectViewParentFieldWarningLoggedForTests(scopeKey: string): void {
+  markParentFieldWarningLogged(scopeKey)
+}
+
+/** @internal - exposed for cache-bound tests only. */
+export function _hasProjectViewParentFieldWarningLoggedForTests(scopeKey: string): boolean {
+  return hasParentFieldWarningLogged(scopeKey)
+}
diff --git a/src/main/github/project-view/project-view-config.ts b/src/main/github/project-view/project-view-config.ts
new file mode 100644
index 00000000000..794e7861bf9
--- /dev/null
+++ b/src/main/github/project-view/project-view-config.ts
@@ -0,0 +1,242 @@
+import type {
+  GitHubProjectField,
+  GitHubProjectOwnerType,
+  GitHubProjectSort,
+  GitHubProjectView,
+  GitHubProjectViewLayout
+} from '../../../shared/github/project-types'
+import type { GitHubProjectViewError } from '../../../shared/github/project-result-types'
+import { driftError } from './project-error-classification'
+import { projectGhExecOptions, runGraphql, type GraphqlVars } from './internals'
+import { normalizeField, type RawProjectV2Field } from './project-view-field-normalization'
+import { FIELD_CONFIG_FRAGMENT } from './project-view-query-fragments'
+
+const VIEWS_PAGE_SIZE = 20
+const FIELDS_PAGE_SIZE = 50
+
+// ─── Project config fetch (views + fields, paginated) ──────────────────
+
+type RawProjectConfig = {
+  id?: string
+  title?: string
+  url?: string
+  views?: {
+    pageInfo?: { hasNextPage?: boolean; endCursor?: string | null }
+    nodes?: (RawProjectView | null)[]
+  }
+}
+
+export type RawProjectView = {
+  id?: string
+  number?: number
+  name?: string
+  layout?: string
+  filter?: string | null
+  fields?: {
+    pageInfo?: { hasNextPage?: boolean; endCursor?: string | null }
+    nodes?: (RawProjectV2Field | null)[]
+  }
+  groupByFields?: { nodes?: (RawProjectV2Field | null)[] }
+  sortByFields?: {
+    nodes?: ({ direction?: string; field?: RawProjectV2Field | null } | null)[]
+  }
+}
+
+export function ownerQueryRoot(ownerType: GitHubProjectOwnerType): string {
+  return ownerType === 'organization' ? 'organization' : 'user'
+}
+
+export async function fetchProjectViewsPage(args: {
+  owner: string
+  ownerType: GitHubProjectOwnerType
+  projectNumber: number
+  host?: string
+  after: string | null
+}): Promise<
+  | {
+      ok: true
+      project: { id: string; title: string; url: string }
+      views: RawProjectView[]
+      hasNextPage: boolean
+      endCursor: string | null
+    }
+  | { ok: false; error: GitHubProjectViewError }
+> {
+  const root = ownerQueryRoot(args.ownerType)
+  const afterArg = args.after ? `, after: $after` : ''
+  const afterVar = args.after ? `$after:String!, ` : ''
+  const query = `
+    query(${afterVar}$owner:String!, $num:Int!) {
+      ${root}(login:$owner) {
+        projectV2(number:$num) {
+          id title url
+          views(first:${VIEWS_PAGE_SIZE}${afterArg}) {
+            pageInfo { hasNextPage endCursor }
+            nodes {
+              id number name layout filter
+              fields(first:${FIELDS_PAGE_SIZE}) {
+                pageInfo { hasNextPage endCursor }
+                nodes { ...FieldConfig }
+              }
+              groupByFields(first:10) { nodes { ...FieldConfig } }
+              sortByFields(first:10) {
+                nodes { direction field { ...FieldConfig } }
+              }
+            }
+          }
+        }
+      }
+    }
+    ${FIELD_CONFIG_FRAGMENT}
+  `
+  const vars: GraphqlVars = { owner: args.owner, num: args.projectNumber }
+  if (args.after) {
+    vars.after = args.after
+  }
+  const res = await runGraphql<Record<string, { projectV2?: RawProjectConfig | null } | null>>(
+    query,
+    vars,
+    projectGhExecOptions(args.host)
+  )
+  if (!res.ok) {
+    return res
+  }
+  const top = res.data[root]
+  const project = top?.projectV2 ?? null
+  if (!project || typeof project.id !== 'string') {
+    return { ok: false, error: { type: 'not_found', message: 'Project not found.' } }
+  }
+  const pageInfo = project.views?.pageInfo
+  const views = (project.views?.nodes ?? []).filter((v): v is RawProjectView => v !== null)
+  return {
+    ok: true,
+    project: { id: project.id, title: project.title ?? '', url: project.url ?? '' },
+    views,
+    hasNextPage: pageInfo?.hasNextPage === true,
+    endCursor: pageInfo?.endCursor ?? null
+  }
+}
+
+export async function fetchViewFieldsContinuation(
+  viewId: string,
+  after: string,
+  host?: string
+): Promise<
+  { ok: true; fields: RawProjectV2Field[] } | { ok: false; error: GitHubProjectViewError }
+> {
+  // Why: address the view directly via node(id:) instead of re-walking all views each page — one round-trip per field page.
+  const query = `
+    query($after:String!, $viewId:ID!) {
+      node(id:$viewId) {
+        ... on ProjectV2View {
+          id
+          fields(first:${FIELDS_PAGE_SIZE}, after:$after) {
+            pageInfo { hasNextPage endCursor }
+            nodes { ...FieldConfig }
+          }
+        }
+      }
+    }
+    ${FIELD_CONFIG_FRAGMENT}
+  `
+  const collected: RawProjectV2Field[] = []
+  let cursor: string | null = after
+  while (cursor !== null) {
+    const res = await runGraphql<{
+      node?: {
+        id?: string
+        fields?: {
+          pageInfo?: { hasNextPage?: boolean; endCursor?: string | null }
+          nodes?: (RawProjectV2Field | null)[]
+        }
+      } | null
+    }>(query, { viewId, after: cursor }, projectGhExecOptions(host))
+    if (!res.ok) {
+      return res
+    }
+    const view = res.data.node ?? null
+    if (!view) {
+      return { ok: false, error: driftError('view disappeared during field pagination') }
+    }
+    const nodes = (view.fields?.nodes ?? []).filter((f): f is RawProjectV2Field => f !== null)
+    collected.push(...nodes)
+    const pi = view.fields?.pageInfo
+    cursor = pi?.hasNextPage === true && typeof pi.endCursor === 'string' ? pi.endCursor : null
+  }
+  return { ok: true, fields: collected }
+}
+
+export function finalizeView(
+  raw: RawProjectView,
+  extraFields: RawProjectV2Field[]
+): { ok: true; view: GitHubProjectView } | { ok: false; drift: GitHubProjectViewError } {
+  if (typeof raw.id !== 'string' || typeof raw.layout !== 'string') {
+    return { ok: false, drift: driftError('view missing id or layout') }
+  }
+  const layout = raw.layout as GitHubProjectViewLayout
+  const fields: GitHubProjectField[] = []
+  const all = [...(raw.fields?.nodes ?? []), ...extraFields.map((f) => f as RawProjectV2Field)]
+  for (const f of all) {
+    const n = normalizeField(f)
+    if (n) {
+      fields.push(n)
+    }
+  }
+  const groupByFields: GitHubProjectField[] = []
+  for (const f of raw.groupByFields?.nodes ?? []) {
+    const n = normalizeField(f)
+    if (n) {
+      groupByFields.push(n)
+    }
+  }
+  const sortByFields: GitHubProjectSort[] = []
+  for (const s of raw.sortByFields?.nodes ?? []) {
+    if (!s || (s.direction !== 'ASC' && s.direction !== 'DESC')) {
+      continue
+    }
+    const n = normalizeField(s.field)
+    if (n) {
+      sortByFields.push({ direction: s.direction, field: n })
+    }
+  }
+  return {
+    ok: true,
+    view: {
+      id: raw.id,
+      number: typeof raw.number === 'number' ? raw.number : 0,
+      name: typeof raw.name === 'string' ? raw.name : '',
+      layout,
+      // Why: `ProjectV2View.filter` is nullable — normalize to ''.
+      filter: typeof raw.filter === 'string' ? raw.filter : '',
+      fields,
+      groupByFields,
+      sortByFields
+    }
+  }
+}
+
+// ─── View selection ───────────────────────────────────────────────────
+
+export function matchesSelector(
+  raw: RawProjectView,
+  sel: { viewId?: string; viewNumber?: number; viewName?: string }
+): 'none' | 'id' | 'number' | 'name' | 'default' {
+  if (sel.viewId && raw.id === sel.viewId) {
+    return 'id'
+  }
+  if (sel.viewNumber !== undefined && raw.number === sel.viewNumber) {
+    return 'number'
+  }
+  if (sel.viewName && raw.name === sel.viewName) {
+    return 'name'
+  }
+  if (
+    sel.viewId === undefined &&
+    sel.viewNumber === undefined &&
+    sel.viewName === undefined &&
+    raw.layout === 'TABLE_LAYOUT'
+  ) {
+    return 'default'
+  }
+  return 'none'
+}
diff --git a/src/main/github/project-view/project-view-discovery.ts b/src/main/github/project-view/project-view-discovery.ts
new file mode 100644
index 00000000000..8fdd47c97ac
--- /dev/null
+++ b/src/main/github/project-view/project-view-discovery.ts
@@ -0,0 +1,204 @@
+import type { ListAccessibleProjectsArgs } from '../../../shared/github/project-request-types'
+import type { ListAccessibleProjectsResult } from '../../../shared/github/project-result-types'
+import type {
+  GitHubProjectOwnerType,
+  GitHubProjectSummary
+} from '../../../shared/github/project-types'
+import { githubProjectHost } from '../../../shared/github/project-identity'
+import { projectGhExecOptions, runGraphql, type GraphqlVars } from './internals'
+import { driftError } from './project-error-classification'
+import { rememberOwnerType } from './project-view-cache'
+
+// ─── Constants ─────────────────────────────────────────────────────────
+
+// Why: defaults deliberately shrunk to cut quota spend in discovery — the org loop dominates and produced the HTTP 504; overflow owners can paste a URL.
+const DISCOVERY_PROJECTS_PER_OWNER = 40
+const DISCOVERY_MAX_ORGS = 20
+const DISCOVERY_ORG_PAGE_SIZE = 20
+const DISCOVERY_PROJECTS_PER_ORG = 20
+
+type RawViewerDiscovery = {
+  viewer?: {
+    login?: string
+    projectsV2?: {
+      pageInfo?: { hasNextPage?: boolean; endCursor?: string | null }
+      nodes?: ({
+        id?: string
+        number?: number
+        title?: string
+        url?: string
+        owner?: { __typename?: string; login?: string }
+      } | null)[]
+    }
+    organizations?: {
+      pageInfo?: { hasNextPage?: boolean; endCursor?: string | null }
+      nodes?: ({
+        login?: string
+        projectsV2?: {
+          pageInfo?: { hasNextPage?: boolean; endCursor?: string | null }
+          nodes?: ({ id?: string; number?: number; title?: string; url?: string } | null)[]
+        }
+      } | null)[]
+    }
+  }
+}
+
+// ─── listAccessibleProjects ────────────────────────────────────────────
+
+export async function listAccessibleProjects(
+  args?: ListAccessibleProjectsArgs
+): Promise<ListAccessibleProjectsResult> {
+  const host = githubProjectHost(args?.host)
+  const viewerProjects: GitHubProjectSummary[] = []
+  const orgProjects: GitHubProjectSummary[] = []
+  // Why: collect per-org failures so the picker shows a "some orgs didn't load" banner instead of aborting discovery on the first 504.
+  const partialFailures: { owner: string; message: string }[] = []
+  let viewerLogin: string | null = null
+
+  // 1) Viewer projects (paginated, single owner so cap at DISCOVERY_PROJECTS_PER_OWNER total).
+  let viewerCursor: string | null = null
+  let viewerMore = true
+  let viewerFetched = 0
+  while (viewerMore && viewerFetched < DISCOVERY_PROJECTS_PER_OWNER) {
+    const afterArg = viewerCursor ? ', after: $after' : ''
+    const afterVar = viewerCursor ? '$after:String!' : ''
+    const query = `
+      query${afterVar ? `(${afterVar})` : ''} {
+        viewer {
+          login
+          projectsV2(first:${DISCOVERY_PROJECTS_PER_ORG}${afterArg}) {
+            pageInfo { hasNextPage endCursor }
+            nodes {
+              id number title url
+              owner { __typename ... on Organization { login } ... on User { login } }
+            }
+          }
+        }
+      }
+    `
+    const vars: GraphqlVars = {}
+    if (viewerCursor) {
+      vars.after = viewerCursor
+    }
+    const res = await runGraphql<RawViewerDiscovery>(query, vars, projectGhExecOptions(host))
+    if (!res.ok) {
+      // Why: viewer-level failure is structural (no projects to build on), so propagate hard; org-level errors below are non-fatal.
+      return { ok: false, error: res.error }
+    }
+    if (!res.data.viewer) {
+      return { ok: false, error: driftError('viewer missing') }
+    }
+    if (viewerLogin === null) {
+      viewerLogin = res.data.viewer.login ?? null
+    }
+    const nodes = res.data.viewer.projectsV2?.nodes ?? []
+    for (const n of nodes) {
+      if (!n || typeof n.id !== 'string' || typeof n.number !== 'number') {
+        continue
+      }
+      const ownerLogin = n.owner?.login ?? viewerLogin ?? ''
+      const ownerType: GitHubProjectOwnerType =
+        n.owner?.__typename === 'Organization' ? 'organization' : 'user'
+      viewerProjects.push({
+        id: n.id,
+        host,
+        owner: ownerLogin,
+        ownerType,
+        number: n.number,
+        title: n.title ?? '',
+        url: n.url ?? '',
+        source: 'viewer'
+      })
+      viewerFetched++
+      if (viewerFetched >= DISCOVERY_PROJECTS_PER_OWNER) {
+        break
+      }
+    }
+    const pi = res.data.viewer.projectsV2?.pageInfo
+    viewerMore = pi?.hasNextPage === true && typeof pi.endCursor === 'string'
+    viewerCursor = viewerMore ? (pi?.endCursor ?? null) : null
+  }
+
+  // 2) Organizations the viewer belongs to, each with its projectsV2.
+  // Why: no per-org projectsV2 continuation loop — it was the dominant 504 cost; users past the cap can paste a URL instead.
+  let orgCursor: string | null = null
+  let orgMore = true
+  let orgsSeen = 0
+  while (orgMore && orgsSeen < DISCOVERY_MAX_ORGS) {
+    const afterArg = orgCursor ? ', after: $orgAfter' : ''
+    const afterVar = orgCursor ? '$orgAfter:String!' : ''
+    const query = `
+      query${afterVar ? `(${afterVar})` : ''} {
+        viewer {
+          organizations(first:${DISCOVERY_ORG_PAGE_SIZE}${afterArg}) {
+            pageInfo { hasNextPage endCursor }
+            nodes {
+              login
+              projectsV2(first:${DISCOVERY_PROJECTS_PER_ORG}) {
+                pageInfo { hasNextPage endCursor }
+                nodes { id number title url }
+              }
+            }
+          }
+        }
+      }
+    `
+    const vars: GraphqlVars = {}
+    if (orgCursor) {
+      vars.orgAfter = orgCursor
+    }
+    const res = await runGraphql<RawViewerDiscovery>(query, vars, projectGhExecOptions(host))
+    if (!res.ok) {
+      // Why: org-listing failed; record a synthetic '*' partial failure so the banner explains it, but keep collected viewer projects (the reported 504 path).
+      partialFailures.push({ owner: '*', message: res.error.message })
+      break
+    }
+    const orgs = res.data.viewer?.organizations?.nodes ?? []
+    for (const org of orgs) {
+      if (!org || typeof org.login !== 'string') {
+        continue
+      }
+      if (orgsSeen >= DISCOVERY_MAX_ORGS) {
+        break
+      }
+      orgsSeen++
+      const login = org.login
+      // Cache for paste/resolve even when the nested projects query was empty or partially failed.
+      rememberOwnerType(login, 'organization', host)
+      const nodes = org.projectsV2?.nodes ?? []
+      let ownerCount = 0
+      for (const n of nodes) {
+        if (!n || typeof n.id !== 'string' || typeof n.number !== 'number') {
+          continue
+        }
+        if (ownerCount >= DISCOVERY_PROJECTS_PER_OWNER) {
+          break
+        }
+        orgProjects.push({
+          id: n.id,
+          host,
+          owner: login,
+          ownerType: 'organization',
+          number: n.number,
+          title: n.title ?? '',
+          url: n.url ?? '',
+          source: `org:${login}`
+        })
+        ownerCount++
+      }
+    }
+    const pi = res.data.viewer?.organizations?.pageInfo
+    orgMore = pi?.hasNextPage === true && typeof pi.endCursor === 'string'
+    orgCursor = orgMore ? (pi?.endCursor ?? null) : null
+  }
+
+  if (viewerLogin) {
+    rememberOwnerType(viewerLogin, 'user', host)
+  }
+
+  return {
+    ok: true,
+    projects: [...viewerProjects, ...orgProjects],
+    ...(partialFailures.length > 0 ? { partialFailures } : {})
+  }
+}
diff --git a/src/main/github/project-view/project-view-field-normalization.ts b/src/main/github/project-view/project-view-field-normalization.ts
new file mode 100644
index 00000000000..1441a999809
--- /dev/null
+++ b/src/main/github/project-view/project-view-field-normalization.ts
@@ -0,0 +1,176 @@
+import type {
+  GitHubProjectField,
+  GitHubProjectFieldValue,
+  GitHubProjectIteration,
+  GitHubProjectLabel,
+  GitHubProjectSingleSelectOption,
+  GitHubProjectUser
+} from '../../../shared/github/project-types'
+
+// ─── Normalizers ───────────────────────────────────────────────────────
+
+export type RawProjectV2Field = {
+  __typename?: string
+  id?: string
+  name?: string
+  dataType?: string
+  options?: { id?: string; name?: string; color?: string }[]
+  configuration?: {
+    iterations?: { id?: string; title?: string; startDate?: string; duration?: number }[]
+    completedIterations?: {
+      id?: string
+      title?: string
+      startDate?: string
+      duration?: number
+    }[]
+  }
+}
+
+export function normalizeField(
+  raw: RawProjectV2Field | null | undefined
+): GitHubProjectField | null {
+  if (!raw || typeof raw.id !== 'string' || typeof raw.name !== 'string') {
+    return null
+  }
+  const dataType = raw.dataType ?? raw.__typename ?? ''
+  if (raw.__typename === 'ProjectV2SingleSelectField' || dataType === 'SINGLE_SELECT') {
+    const options: GitHubProjectSingleSelectOption[] = (raw.options ?? [])
+      .map((o) =>
+        typeof o.id === 'string' && typeof o.name === 'string'
+          ? { id: o.id, name: o.name, color: o.color ?? '' }
+          : null
+      )
+      .filter((o): o is GitHubProjectSingleSelectOption => o !== null)
+    return { kind: 'single-select', id: raw.id, name: raw.name, dataType: 'SINGLE_SELECT', options }
+  }
+  if (raw.__typename === 'ProjectV2IterationField' || dataType === 'ITERATION') {
+    const cfg = raw.configuration ?? {}
+    const iterations: GitHubProjectIteration[] = []
+    for (const it of cfg.completedIterations ?? []) {
+      if (typeof it.id === 'string' && typeof it.title === 'string') {
+        iterations.push({
+          id: it.id,
+          title: it.title,
+          startDate: it.startDate ?? '',
+          duration: typeof it.duration === 'number' ? it.duration : 0,
+          completed: true
+        })
+      }
+    }
+    for (const it of cfg.iterations ?? []) {
+      if (typeof it.id === 'string' && typeof it.title === 'string') {
+        iterations.push({
+          id: it.id,
+          title: it.title,
+          startDate: it.startDate ?? '',
+          duration: typeof it.duration === 'number' ? it.duration : 0,
+          completed: false
+        })
+      }
+    }
+    return { kind: 'iteration', id: raw.id, name: raw.name, dataType: 'ITERATION', iterations }
+  }
+  return { kind: 'field', id: raw.id, name: raw.name, dataType }
+}
+
+export type RawUser = {
+  login?: string
+  name?: string | null
+  avatarUrl?: string | null
+}
+
+export function normalizeUser(raw: RawUser | null | undefined): GitHubProjectUser | null {
+  if (!raw || typeof raw.login !== 'string') {
+    return null
+  }
+  return {
+    login: raw.login,
+    name: raw.name ?? null,
+    avatarUrl: raw.avatarUrl ?? null
+  }
+}
+
+export type RawLabel = { name?: string; color?: string }
+
+export function normalizeLabel(raw: RawLabel | null | undefined): GitHubProjectLabel | null {
+  if (!raw || typeof raw.name !== 'string') {
+    return null
+  }
+  return { name: raw.name, color: raw.color ?? '' }
+}
+
+export type RawFieldValue = {
+  __typename?: string
+  field?: RawProjectV2Field
+  name?: string
+  color?: string
+  optionId?: string
+  title?: string
+  startDate?: string
+  duration?: number
+  iterationId?: string
+  text?: string
+  number?: number
+  date?: string
+  labels?: { nodes?: RawLabel[] }
+  users?: { nodes?: RawUser[] }
+}
+
+export function normalizeFieldValue(
+  raw: RawFieldValue | null | undefined
+): GitHubProjectFieldValue | null {
+  if (!raw || !raw.field || typeof raw.field.id !== 'string') {
+    return null
+  }
+  const fieldId = raw.field.id
+  switch (raw.__typename) {
+    case 'ProjectV2ItemFieldSingleSelectValue':
+      if (typeof raw.optionId !== 'string') {
+        return null
+      }
+      return {
+        kind: 'single-select',
+        fieldId,
+        optionId: raw.optionId,
+        name: raw.name ?? '',
+        color: raw.color ?? ''
+      }
+    case 'ProjectV2ItemFieldIterationValue':
+      if (typeof raw.iterationId !== 'string') {
+        return null
+      }
+      return {
+        kind: 'iteration',
+        fieldId,
+        iterationId: raw.iterationId,
+        title: raw.title ?? '',
+        startDate: raw.startDate ?? '',
+        duration: typeof raw.duration === 'number' ? raw.duration : 0
+      }
+    case 'ProjectV2ItemFieldTextValue':
+      return { kind: 'text', fieldId, text: raw.text ?? '' }
+    case 'ProjectV2ItemFieldNumberValue':
+      if (typeof raw.number !== 'number') {
+        return null
+      }
+      return { kind: 'number', fieldId, number: raw.number }
+    case 'ProjectV2ItemFieldDateValue':
+      return { kind: 'date', fieldId, date: raw.date ?? '' }
+    case 'ProjectV2ItemFieldLabelValue': {
+      const labels = (raw.labels?.nodes ?? [])
+        .map(normalizeLabel)
+        .filter((l): l is GitHubProjectLabel => l !== null)
+      return { kind: 'labels', fieldId, labels }
+    }
+    case 'ProjectV2ItemFieldUserValue': {
+      const users = (raw.users?.nodes ?? [])
+        .map(normalizeUser)
+        .filter((u): u is GitHubProjectUser => u !== null)
+      return { kind: 'users', fieldId, users }
+    }
+    case undefined:
+    default:
+      // Unknown __typename → forward-compat: drop silently, don't classify as drift (see design §Error Handling).
+      return null
+  }
+}
diff --git a/src/main/github/project-view/project-view-item-normalization.ts b/src/main/github/project-view/project-view-item-normalization.ts
new file mode 100644
index 00000000000..3bcfda9d6ba
--- /dev/null
+++ b/src/main/github/project-view/project-view-item-normalization.ts
@@ -0,0 +1,153 @@
+import type {
+  GitHubProjectFieldValue,
+  GitHubProjectLabel,
+  GitHubProjectRow,
+  GitHubProjectRowItemType,
+  GitHubProjectUser
+} from '../../../shared/github/project-types'
+import type { GitHubProjectViewError } from '../../../shared/github/project-result-types'
+import { driftError } from './project-error-classification'
+import {
+  normalizeFieldValue,
+  normalizeLabel,
+  normalizeUser,
+  type RawFieldValue,
+  type RawLabel,
+  type RawUser
+} from './project-view-field-normalization'
+
+type RawContent = {
+  __typename?: string
+  id?: string
+  number?: number
+  title?: string
+  body?: string
+  url?: string
+  state?: string
+  stateReason?: string | null
+  isDraft?: boolean
+  repository?: { nameWithOwner?: string }
+  assignees?: { nodes?: RawUser[] }
+  labels?: { nodes?: RawLabel[] }
+  parent?: { number?: number; title?: string; url?: string } | null
+  issueType?: {
+    id?: string
+    name?: string
+    color?: string | null
+    description?: string | null
+  } | null
+}
+
+export type RawItem = {
+  id?: string
+  type?: string
+  updatedAt?: string
+  content?: RawContent | null
+  fieldValues?: {
+    nodes?: RawFieldValue[]
+    pageInfo?: { hasNextPage?: boolean }
+  }
+}
+
+type NormalizedItemOutcome =
+  | { ok: true; row: GitHubProjectRow }
+  | { ok: false; drift: GitHubProjectViewError }
+
+function mapItemType(raw: string | undefined, hasContent: boolean): GitHubProjectRowItemType {
+  if (raw === 'ISSUE') {
+    return 'ISSUE'
+  }
+  if (raw === 'PULL_REQUEST') {
+    return 'PULL_REQUEST'
+  }
+  if (raw === 'DRAFT_ISSUE') {
+    return 'DRAFT_ISSUE'
+  }
+  if (raw === 'REDACTED' || !hasContent) {
+    return 'REDACTED'
+  }
+  // Unknown item type with content — treat as redacted rather than dropping.
+  return 'REDACTED'
+}
+
+export function normalizeItem(raw: RawItem, position: number): NormalizedItemOutcome {
+  if (!raw || typeof raw.id !== 'string') {
+    return {
+      ok: false,
+      drift: driftError('item missing id', { path: ['items', 'nodes', position, 'id'] })
+    }
+  }
+  if (raw.fieldValues?.pageInfo?.hasNextPage === true) {
+    return {
+      ok: false,
+      drift: driftError('item field values exceeded single page', {
+        path: ['items', 'nodes', position, 'fieldValues', 'pageInfo', 'hasNextPage']
+      })
+    }
+  }
+  const itemType = mapItemType(raw.type, raw.content !== null && raw.content !== undefined)
+  const content = raw.content ?? null
+  const assignees = (content?.assignees?.nodes ?? [])
+    .map(normalizeUser)
+    .filter((u): u is GitHubProjectUser => u !== null)
+  const labels = (content?.labels?.nodes ?? [])
+    .map(normalizeLabel)
+    .filter((l): l is GitHubProjectLabel => l !== null)
+  const parentIssue =
+    content?.parent &&
+    typeof content.parent.number === 'number' &&
+    typeof content.parent.title === 'string' &&
+    typeof content.parent.url === 'string'
+      ? { number: content.parent.number, title: content.parent.title, url: content.parent.url }
+      : null
+  const issueType =
+    content?.issueType &&
+    typeof content.issueType.id === 'string' &&
+    typeof content.issueType.name === 'string'
+      ? {
+          id: content.issueType.id,
+          name: content.issueType.name,
+          color: typeof content.issueType.color === 'string' ? content.issueType.color : null,
+          description:
+            typeof content.issueType.description === 'string' ? content.issueType.description : null
+        }
+      : null
+  const fieldValuesByFieldId: Record<string, GitHubProjectFieldValue> = {}
+  for (const fv of raw.fieldValues?.nodes ?? []) {
+    const normalized = normalizeFieldValue(fv)
+    if (normalized) {
+      fieldValuesByFieldId[normalized.fieldId] = normalized
+    }
+  }
+  const title =
+    itemType === 'REDACTED'
+      ? 'Restricted item'
+      : typeof content?.title === 'string'
+        ? content.title
+        : ''
+  const row: GitHubProjectRow = {
+    id: raw.id,
+    itemType,
+    content: {
+      number: typeof content?.number === 'number' ? content.number : null,
+      title,
+      body: typeof content?.body === 'string' ? content.body : null,
+      url: typeof content?.url === 'string' ? content.url : null,
+      state: typeof content?.state === 'string' ? content.state : null,
+      stateReason: typeof content?.stateReason === 'string' ? content.stateReason : null,
+      isDraft: typeof content?.isDraft === 'boolean' ? content.isDraft : null,
+      repository:
+        typeof content?.repository?.nameWithOwner === 'string'
+          ? content.repository.nameWithOwner
+          : null,
+      assignees,
+      labels,
+      parentIssue,
+      issueType
+    },
+    fieldValuesByFieldId,
+    updatedAt: typeof raw.updatedAt === 'string' ? raw.updatedAt : '',
+    position
+  }
+  return { ok: true, row }
+}
diff --git a/src/main/github/project-view/project-view-item-page.ts b/src/main/github/project-view/project-view-item-page.ts
new file mode 100644
index 00000000000..ca135fded51
--- /dev/null
+++ b/src/main/github/project-view/project-view-item-page.ts
@@ -0,0 +1,171 @@
+import type { GitHubProjectOwnerType } from '../../../shared/github/project-types'
+import type { GitHubProjectViewError } from '../../../shared/github/project-result-types'
+import {
+  acquire,
+  extractExecError,
+  ghExecFileAsync,
+  noteRepositoryRateLimitSpend,
+  projectGhExecOptions,
+  projectHostAuthenticationError,
+  release,
+  repositoryRateLimitGuard
+} from './internals'
+import {
+  classifyProjectError,
+  driftError,
+  rateLimitedError,
+  type GhGraphqlErrorShape
+} from './project-error-classification'
+import { ownerQueryRoot } from './project-view-config'
+import type { RawItem } from './project-view-item-normalization'
+import {
+  FIELD_CONFIG_FRAGMENT,
+  FIELD_VALUES_SELECTION,
+  itemContentSelection
+} from './project-view-query-fragments'
+
+// ─── Items fetch (paginated) ──────────────────────────────────────────
+
+export type RawItemsPage = {
+  totalCount?: number
+  pageInfo?: { hasNextPage?: boolean; endCursor?: string | null }
+  nodes?: (RawItem | null)[]
+}
+
+// Why: unlike runGraphql, return the raw GraphQL error envelope so the parent-field retry decision can re-inspect it.
+export async function fetchItemsPageWithRaw(args: {
+  owner: string
+  ownerType: GitHubProjectOwnerType
+  projectNumber: number
+  query: string
+  first: number
+  after: string | null
+  includeParent: boolean
+  host?: string
+}): Promise<
+  | { ok: true; page: RawItemsPage }
+  | {
+      ok: false
+      error: GitHubProjectViewError
+      rawErrors: GhGraphqlErrorShape[]
+      stderr: string
+    }
+> {
+  const authError = await projectHostAuthenticationError(args.host)
+  if (authError) {
+    return { ok: false, error: authError, rawErrors: [], stderr: '' }
+  }
+  const root = ownerQueryRoot(args.ownerType)
+  const afterArg = args.after ? `, after: $after` : ''
+  const afterVar = args.after ? `$after:String!, ` : ''
+  const query = `
+    query(${afterVar}$owner:String!, $num:Int!, $q:String!, $first:Int!) {
+      ${root}(login:$owner) {
+        projectV2(number:$num) {
+          items(first:$first${afterArg}, query:$q, orderBy:{ field: POSITION, direction: ASC }) {
+            totalCount
+            pageInfo { hasNextPage endCursor }
+            nodes {
+              id
+              type
+              updatedAt
+              content { ${itemContentSelection(args.includeParent)} }
+              ${FIELD_VALUES_SELECTION}
+            }
+          }
+        }
+      }
+    }
+    ${FIELD_CONFIG_FRAGMENT}
+  `
+  const argsArr: string[] = ['api', 'graphql', '-f', `query=${query}`]
+  argsArr.push('-f', `owner=${args.owner}`)
+  argsArr.push('-F', `num=${args.projectNumber}`)
+  argsArr.push('-f', `q=${args.query}`)
+  argsArr.push('-F', `first=${args.first}`)
+  if (args.after) {
+    argsArr.push('-f', `after=${args.after}`)
+  }
+
+  // Why: GHES traffic runs against its own quota — only github.com requests
+  // consult/debit the shared snapshot.
+  const guard = repositoryRateLimitGuard(args, 'graphql')
+  if (guard.blocked) {
+    return {
+      ok: false,
+      error: rateLimitedError(guard),
+      rawErrors: [],
+      stderr: ''
+    }
+  }
+  await acquire()
+  noteRepositoryRateLimitSpend(args, 'graphql')
+  try {
+    let stdout = ''
+    let stderr = ''
+    let execFailed = false
+    try {
+      const r = await ghExecFileAsync(argsArr, {
+        encoding: 'utf-8',
+        ...projectGhExecOptions(args.host)
+      })
+      stdout = r.stdout
+      stderr = r.stderr
+    } catch (err) {
+      const extracted = extractExecError(err)
+      stderr = extracted.stderr
+      stdout = extracted.stdout
+      execFailed = true
+    }
+    let parsed: { data?: Record<string, unknown>; errors?: GhGraphqlErrorShape[] } = {}
+    try {
+      parsed = JSON.parse(stdout)
+    } catch {
+      // Why: gh exited non-zero with unparseable stdout; classify against stderr so callers see the real cause, not a synthesized drift/not-found.
+      if (execFailed) {
+        return {
+          ok: false,
+          error: classifyProjectError(stderr, stdout, args.host),
+          rawErrors: [],
+          stderr
+        }
+      }
+      return {
+        ok: false,
+        error: driftError('failed to parse items response'),
+        rawErrors: [],
+        stderr
+      }
+    }
+    // Why: gh rejected but stdout parsed; fall through to parsed.errors below, else surface the stderr classification rather than not_found.
+    if (execFailed && (!parsed.errors || parsed.errors.length === 0) && !parsed.data) {
+      return {
+        ok: false,
+        error: classifyProjectError(stderr, stdout, args.host),
+        rawErrors: [],
+        stderr
+      }
+    }
+    if (parsed.errors && parsed.errors.length > 0) {
+      return {
+        ok: false,
+        error: classifyProjectError(stderr, stdout, args.host),
+        rawErrors: parsed.errors,
+        stderr
+      }
+    }
+    const top = parsed.data?.[root] as { projectV2?: { items?: RawItemsPage } | null } | undefined
+    const page = top?.projectV2?.items
+    if (!page) {
+      return {
+        ok: false,
+        error: { type: 'not_found', message: 'Project or view not found.' },
+        rawErrors: [],
+        stderr
+      }
+    }
+    return { ok: true, page }
+  } finally {
+    release()
+  }
+}
diff --git a/src/main/github/project-view/project-view-items.ts b/src/main/github/project-view/project-view-items.ts
new file mode 100644
index 00000000000..3ecdb55bd9a
--- /dev/null
+++ b/src/main/github/project-view/project-view-items.ts
@@ -0,0 +1,233 @@
+import type { GitHubProjectOwnerType, GitHubProjectRow } from '../../../shared/github/project-types'
+import type { GitHubProjectViewError } from '../../../shared/github/project-result-types'
+import { projectGhExecOptions, runGraphql } from './internals'
+import { driftError, errorsIndicateParentField } from './project-error-classification'
+import {
+  hasParentFieldRetried,
+  hasParentFieldWarningLogged,
+  markParentFieldRetried,
+  markParentFieldWarningLogged,
+  ownerScopeKey,
+  parentFieldProbeInFlight
+} from './project-view-cache'
+import { ownerQueryRoot } from './project-view-config'
+import { fetchItemsPageWithRaw } from './project-view-item-page'
+import { normalizeItem, type RawItem } from './project-view-item-normalization'
+
+const ITEM_PAGE_SIZE = 100
+const MAX_ITEMS = 500
+
+export async function fetchAllItems(args: {
+  owner: string
+  ownerType: GitHubProjectOwnerType
+  projectNumber: number
+  query: string
+  host?: string
+}): Promise<
+  | { ok: true; rows: GitHubProjectRow[]; totalCount: number; parentFieldDropped: boolean }
+  | { ok: false; error: GitHubProjectViewError; totalCount?: number }
+> {
+  // Why: isolate missing Issue.parent capability by owner, type, and host.
+  const scopeKey = ownerScopeKey(args.owner, args.ownerType, args.host)
+  // Why: await the same-scope probe, then re-read state because it may have changed.
+  const inFlight = parentFieldProbeInFlight.get(scopeKey)
+  if (inFlight) {
+    await inFlight.catch(() => {})
+  }
+  let includeParent = !hasParentFieldRetried(scopeKey)
+  let parentFieldDropped = !includeParent
+  // Single-flight the with-parent probe per owner; assign the in-flight promise synchronously (no await between get() and set()) so callers share one probe.
+  let first: Awaited<ReturnType<typeof fetchItemsPageWithRaw>>
+  let probePromise: Promise<Awaited<ReturnType<typeof fetchItemsPageWithRaw>>> | null = null
+  if (includeParent && !parentFieldProbeInFlight.has(scopeKey)) {
+    let resolveProbe: () => void = () => {}
+    const probe = new Promise<void>((resolve) => {
+      resolveProbe = resolve
+    })
+    parentFieldProbeInFlight.set(scopeKey, probe)
+    probePromise = (async () => {
+      try {
+        const result = await fetchItemsPageWithRaw({
+          owner: args.owner,
+          ownerType: args.ownerType,
+          projectNumber: args.projectNumber,
+          query: args.query,
+          first: ITEM_PAGE_SIZE,
+          after: null,
+          includeParent: true,
+          host: args.host
+        })
+        // Why: set the retried flag BEFORE resolving/clearing the probe so siblings awoken on inFlight.catch() see it and don't fire duplicate with-parent probes.
+        if (!result.ok && errorsIndicateParentField(result.rawErrors, result.stderr)) {
+          markParentFieldRetried(scopeKey)
+        }
+        return result
+      } finally {
+        resolveProbe()
+        parentFieldProbeInFlight.delete(scopeKey)
+      }
+    })()
+    first = await probePromise
+  } else {
+    first = await fetchItemsPageWithRaw({
+      owner: args.owner,
+      ownerType: args.ownerType,
+      projectNumber: args.projectNumber,
+      query: args.query,
+      first: ITEM_PAGE_SIZE,
+      after: null,
+      includeParent,
+      host: args.host
+    })
+  }
+  if (!first.ok && includeParent && errorsIndicateParentField(first.rawErrors, first.stderr)) {
+    // Retry the whole table without parent; mark this owner retried so later fetches skip the probe (other owners unaffected).
+    markParentFieldRetried(scopeKey)
+    includeParent = false
+    parentFieldDropped = true
+    if (!hasParentFieldWarningLogged(scopeKey)) {
+      console.warn(
+        `[project-view] Issue.parent is not available for ${args.owner} on this token — retrying without the parent selection.`
+      )
+      markParentFieldWarningLogged(scopeKey)
+    }
+    first = await fetchItemsPageWithRaw({
+      owner: args.owner,
+      ownerType: args.ownerType,
+      projectNumber: args.projectNumber,
+      query: args.query,
+      first: ITEM_PAGE_SIZE,
+      after: null,
+      includeParent: false,
+      host: args.host
+    })
+  }
+  if (!first.ok) {
+    return { ok: false, error: first.error }
+  }
+
+  // Drift guards
+  if (first.page.totalCount === undefined || first.page.totalCount === null) {
+    return { ok: false, error: driftError('items.totalCount missing') }
+  }
+  const totalCount = first.page.totalCount
+  if (first.page.pageInfo?.hasNextPage === undefined) {
+    return { ok: false, error: driftError('items.pageInfo.hasNextPage missing'), totalCount }
+  }
+  if (!Array.isArray(first.page.nodes)) {
+    return { ok: false, error: driftError('items.nodes missing'), totalCount }
+  }
+
+  // Size cap
+  if (totalCount > MAX_ITEMS) {
+    return {
+      ok: false,
+      error: { type: 'too_large', message: `View has ${totalCount} items.` },
+      totalCount
+    }
+  }
+
+  const rows: GitHubProjectRow[] = []
+  let position = 0
+  const appendNodes = (nodes: (RawItem | null)[]): GitHubProjectViewError | null => {
+    for (const n of nodes) {
+      if (!n) {
+        continue
+      }
+      const norm = normalizeItem(n, position)
+      if (!norm.ok) {
+        return norm.drift
+      }
+      rows.push(norm.row)
+      position++
+    }
+    return null
+  }
+  const e1 = appendNodes(first.page.nodes)
+  if (e1) {
+    return { ok: false, error: e1, totalCount }
+  }
+
+  // Paginate
+  let hasNext = first.page.pageInfo.hasNextPage === true
+  let cursor: string | null | undefined = first.page.pageInfo.endCursor
+  if (hasNext && typeof cursor !== 'string') {
+    return {
+      ok: false,
+      error: driftError('items.pageInfo.endCursor missing with hasNextPage=true'),
+      totalCount
+    }
+  }
+  while (hasNext) {
+    const next = await fetchItemsPageWithRaw({
+      owner: args.owner,
+      ownerType: args.ownerType,
+      projectNumber: args.projectNumber,
+      query: args.query,
+      first: ITEM_PAGE_SIZE,
+      after: cursor as string,
+      includeParent,
+      host: args.host
+    })
+    if (!next.ok) {
+      return { ok: false, error: next.error, totalCount }
+    }
+    if (!Array.isArray(next.page.nodes)) {
+      return { ok: false, error: driftError('items.nodes missing on follow page'), totalCount }
+    }
+    if (next.page.pageInfo?.hasNextPage === undefined) {
+      return {
+        ok: false,
+        error: driftError('items.pageInfo.hasNextPage missing on follow page'),
+        totalCount
+      }
+    }
+    const e2 = appendNodes(next.page.nodes)
+    if (e2) {
+      return { ok: false, error: e2, totalCount }
+    }
+    hasNext = next.page.pageInfo.hasNextPage === true
+    cursor = next.page.pageInfo.endCursor
+    if (hasNext && typeof cursor !== 'string') {
+      return {
+        ok: false,
+        error: driftError('items.pageInfo.endCursor missing with hasNextPage=true'),
+        totalCount
+      }
+    }
+  }
+  return { ok: true, rows, totalCount, parentFieldDropped }
+}
+
+// ─── Cheap count-only query (for unsupported_layout) ──────────────────
+
+export async function fetchItemsCountOnly(args: {
+  owner: string
+  ownerType: GitHubProjectOwnerType
+  projectNumber: number
+  query: string
+  host?: string
+}): Promise<number | null> {
+  const root = ownerQueryRoot(args.ownerType)
+  const query = `
+    query($owner:String!, $num:Int!, $q:String!) {
+      ${root}(login:$owner) {
+        projectV2(number:$num) {
+          items(first:1, query:$q) { totalCount }
+        }
+      }
+    }
+  `
+  const res = await runGraphql<
+    Record<string, { projectV2?: { items?: { totalCount?: number } | null } | null } | null>
+  >(
+    query,
+    { owner: args.owner, num: args.projectNumber, q: args.query },
+    projectGhExecOptions(args.host)
+  )
+  if (!res.ok) {
+    return null
+  }
+  const count = res.data[root]?.projectV2?.items?.totalCount
+  return typeof count === 'number' ? count : null
+}
diff --git a/src/main/github/project-view/project-view-listing.ts b/src/main/github/project-view/project-view-listing.ts
new file mode 100644
index 00000000000..f6784110428
--- /dev/null
+++ b/src/main/github/project-view/project-view-listing.ts
@@ -0,0 +1,59 @@
+import type { ListProjectViewsArgs } from '../../../shared/github/project-request-types'
+import type { ListProjectViewsResult } from '../../../shared/github/project-result-types'
+import type {
+  GitHubProjectViewLayout,
+  GitHubProjectViewSummary
+} from '../../../shared/github/project-types'
+import { assertPositiveInt, assertSlug } from './internals'
+import { fetchProjectViewsPage } from './project-view-config'
+
+// ─── listProjectViews ──────────────────────────────────────────────────
+
+export async function listProjectViews(
+  args: ListProjectViewsArgs
+): Promise<ListProjectViewsResult> {
+  const ownerCheck = assertSlug(args.owner, 'owner')
+  if (!ownerCheck.ok) {
+    return { ok: false, error: ownerCheck.error }
+  }
+  const numCheck = assertPositiveInt(args.projectNumber, 'projectNumber')
+  if (!numCheck.ok) {
+    return { ok: false, error: numCheck.error }
+  }
+  if (args.ownerType !== 'organization' && args.ownerType !== 'user') {
+    return { ok: false, error: { type: 'validation_error', message: 'Invalid ownerType.' } }
+  }
+  const summaries: GitHubProjectViewSummary[] = []
+  let cursor: string | null = null
+  while (true) {
+    const page = await fetchProjectViewsPage({
+      owner: args.owner,
+      ownerType: args.ownerType,
+      projectNumber: args.projectNumber,
+      host: args.host,
+      after: cursor
+    })
+    if (!page.ok) {
+      return { ok: false, error: page.error }
+    }
+    for (const v of page.views) {
+      if (typeof v.id !== 'string' || typeof v.layout !== 'string') {
+        continue
+      }
+      summaries.push({
+        id: v.id,
+        number: typeof v.number === 'number' ? v.number : 0,
+        name: typeof v.name === 'string' ? v.name : '',
+        layout: v.layout as GitHubProjectViewLayout
+      })
+    }
+    if (!page.hasNextPage) {
+      break
+    }
+    cursor = page.endCursor
+    if (typeof cursor !== 'string') {
+      break
+    }
+  }
+  return { ok: true, views: summaries }
+}
diff --git a/src/main/github/project-view/project-view-query-fragments.ts b/src/main/github/project-view/project-view-query-fragments.ts
new file mode 100644
index 00000000000..aca32a0b2ae
--- /dev/null
+++ b/src/main/github/project-view/project-view-query-fragments.ts
@@ -0,0 +1,73 @@
+const FIELD_VALUES_PAGE_SIZE = 100
+
+// ─── GraphQL query fragments ───────────────────────────────────────────
+
+export const FIELD_CONFIG_FRAGMENT = `
+fragment FieldConfig on ProjectV2FieldConfiguration {
+  __typename
+  ... on ProjectV2Field { id name dataType }
+  ... on ProjectV2SingleSelectField {
+    id
+    name
+    dataType
+    options { id name color }
+  }
+  ... on ProjectV2IterationField {
+    id
+    name
+    dataType
+    configuration {
+      iterations { id title startDate duration }
+      completedIterations { id title startDate duration }
+    }
+  }
+}
+`
+
+export function itemContentSelection(includeParent: boolean): string {
+  const parentFrag = includeParent ? 'parent { number title url }' : ''
+  return `
+    __typename
+    ... on Issue {
+      id
+      number
+      title
+      url
+      state
+      stateReason
+      repository { nameWithOwner }
+      assignees(first:5) { nodes { login name avatarUrl } }
+      labels(first:10) { nodes { name color } }
+      issueType { id name color description }
+      ${parentFrag}
+    }
+    ... on PullRequest {
+      id
+      number
+      title
+      url
+      state
+      isDraft
+      repository { nameWithOwner }
+      assignees(first:5) { nodes { login name avatarUrl } }
+      labels(first:10) { nodes { name color } }
+    }
+    ... on DraftIssue { id title body }
+  `
+}
+
+export const FIELD_VALUES_SELECTION = `
+  fieldValues(first:${FIELD_VALUES_PAGE_SIZE}) {
+    pageInfo { hasNextPage }
+    nodes {
+      __typename
+      ... on ProjectV2ItemFieldSingleSelectValue { field { ...FieldConfig } name color optionId }
+      ... on ProjectV2ItemFieldIterationValue    { field { ...FieldConfig } title startDate duration iterationId }
+      ... on ProjectV2ItemFieldTextValue         { field { ...FieldConfig } text }
+      ... on ProjectV2ItemFieldNumberValue       { field { ...FieldConfig } number }
+      ... on ProjectV2ItemFieldDateValue         { field { ...FieldConfig } date }
+      ... on ProjectV2ItemFieldLabelValue        { field { ...FieldConfig } labels(first:10) { nodes { name color } } }
+      ... on ProjectV2ItemFieldUserValue         { field { ...FieldConfig } users(first:5) { nodes { login name avatarUrl } } }
+    }
+  }
+`
diff --git a/src/main/github/project-view/project-view-reference.ts b/src/main/github/project-view/project-view-reference.ts
new file mode 100644
index 00000000000..54542a3e720
--- /dev/null
+++ b/src/main/github/project-view/project-view-reference.ts
@@ -0,0 +1,230 @@
+import type { ResolveProjectRefArgs } from '../../../shared/github/project-request-types'
+import type {
+  GitHubProjectViewError,
+  ResolveProjectRefResult
+} from '../../../shared/github/project-result-types'
+import type { GitHubProjectOwnerType } from '../../../shared/github/project-types'
+import {
+  GITHUB_PROJECT_REF_INPUT_TOO_LARGE_ERROR,
+  isGitHubProjectRefInputTooLarge
+} from '../../../shared/github/project-ref-input'
+import { githubProjectHost } from '../../../shared/github/project-identity'
+import { isValidOwnerSlug, projectGhExecOptions, runGraphql, type GraphqlVars } from './internals'
+import { getCachedOwnerType, rememberOwnerType } from './project-view-cache'
+import { ownerQueryRoot } from './project-view-config'
+
+// ─── resolveProjectRef ─────────────────────────────────────────────────
+
+type ParsedPaste =
+  | { kind: 'org'; owner: string; number: number; host: string; viewNumber?: number }
+  | { kind: 'user'; owner: string; number: number; host: string; viewNumber?: number }
+  | { kind: 'bare'; owner: string; number: number }
+
+export function parseProjectPaste(input: string, host?: string): ParsedPaste | null {
+  const trimmed = input.trim()
+  if (!trimmed) {
+    return null
+  }
+  if (isGitHubProjectRefInputTooLarge(trimmed)) {
+    return null
+  }
+  // Why: URL parsing enforces an exact Project path and rejects credentials;
+  // a prefix regex could silently turn `/projects/1evil` into Project 1.
+  try {
+    const url = new URL(trimmed)
+    const allowedHosts = new Set(['github.com', ...(host ? [host.trim().toLowerCase()] : [])])
+    const parts = url.pathname.split('/').filter(Boolean)
+    const hasView = parts.length === 6 && parts[4] === 'views'
+    if (
+      (url.protocol !== 'https:' && url.protocol !== 'http:') ||
+      url.username ||
+      url.password ||
+      !allowedHosts.has(url.host.toLowerCase()) ||
+      (parts[0] !== 'orgs' && parts[0] !== 'users') ||
+      !isValidOwnerSlug(parts[1]) ||
+      parts[2] !== 'projects' ||
+      (parts.length !== 4 && !hasView)
+    ) {
+      return null
+    }
+    const number = Number(parts[3])
+    const viewNumber = hasView ? Number(parts[5]) : undefined
+    if (
+      !Number.isSafeInteger(number) ||
+      number < 1 ||
+      (hasView && (!Number.isSafeInteger(viewNumber) || (viewNumber ?? 0) < 1))
+    ) {
+      return null
+    }
+    return {
+      kind: parts[0] === 'orgs' ? 'org' : 'user',
+      owner: parts[1],
+      number,
+      host: url.host.toLowerCase(),
+      ...(viewNumber !== undefined ? { viewNumber } : {})
+    }
+  } catch {
+    // Shorthand parsing below remains available for non-URL input.
+  }
+  // owner/number shorthand — owner alphabet matches OWNER_SLUG_RE.
+  const shortRe = /^([A-Za-z0-9][A-Za-z0-9-]*)\/(\d+)$/
+  const sm = trimmed.match(shortRe)
+  if (sm) {
+    const number = Number.parseInt(sm[2], 10)
+    if (!Number.isInteger(number) || number < 1) {
+      return null
+    }
+    return { kind: 'bare', owner: sm[1], number }
+  }
+  return null
+}
+
+async function resolveOwnerType(
+  owner: string,
+  preferred: GitHubProjectOwnerType | null,
+  host?: string
+): Promise<
+  | { ok: true; ownerType: GitHubProjectOwnerType; title: string }
+  | { ok: false; error: GitHubProjectViewError }
+> {
+  const tryOne = async (
+    ot: GitHubProjectOwnerType,
+    num: number | null
+  ): Promise<{ ok: true; title: string } | { ok: false; error: GitHubProjectViewError }> => {
+    const root = ownerQueryRoot(ot)
+    // If number is provided, fetch the project title; else just confirm owner exists.
+    const query = num
+      ? `
+        query($owner:String!, $num:Int!) {
+          ${root}(login:$owner) { projectV2(number:$num) { id title } }
+        }
+      `
+      : `
+        query($owner:String!) {
+          ${root}(login:$owner) { login }
+        }
+      `
+    const vars: GraphqlVars = { owner }
+    if (num) {
+      vars.num = num
+    }
+    const res = await runGraphql<
+      Record<string, { projectV2?: { id?: string; title?: string } | null; login?: string } | null>
+    >(query, vars, projectGhExecOptions(host))
+    if (!res.ok) {
+      return { ok: false, error: res.error }
+    }
+    const top = res.data[root]
+    if (!top) {
+      return { ok: false, error: { type: 'not_found', message: 'Owner not found.' } }
+    }
+    if (num) {
+      const p = top.projectV2
+      if (!p || typeof p.id !== 'string') {
+        return { ok: false, error: { type: 'not_found', message: 'Project not found.' } }
+      }
+      return { ok: true, title: p.title ?? '' }
+    }
+    return { ok: true, title: '' }
+  }
+
+  const cached = getCachedOwnerType(owner, host)
+  const candidates: GitHubProjectOwnerType[] = preferred
+    ? [preferred]
+    : cached
+      ? [cached]
+      : ['organization', 'user']
+  const fallback: GitHubProjectOwnerType[] = preferred
+    ? []
+    : cached
+      ? cached === 'organization'
+        ? ['user']
+        : ['organization']
+      : []
+  const ordered = [...candidates, ...fallback]
+  let lastError: GitHubProjectViewError | null = null
+  for (const ot of ordered) {
+    const r = await tryOne(ot, null)
+    if (r.ok) {
+      rememberOwnerType(owner, ot, host)
+      return { ok: true, ownerType: ot, title: r.title }
+    }
+    lastError = r.error
+    if (r.error.type !== 'not_found') {
+      // Non-NOT_FOUND errors (auth, network, rate) should not trigger fallback.
+      return { ok: false, error: r.error }
+    }
+  }
+  rememberOwnerType(owner, null, host)
+  return {
+    ok: false,
+    error: lastError ?? { type: 'not_found', message: 'Owner not found.' }
+  }
+}
+
+export async function resolveProjectRef(
+  args: ResolveProjectRefArgs
+): Promise<ResolveProjectRefResult> {
+  const input = typeof args.input === 'string' ? args.input.trim() : ''
+  if (!input) {
+    return {
+      ok: false,
+      error: { type: 'validation_error', message: 'Input required.' }
+    }
+  }
+  if (isGitHubProjectRefInputTooLarge(input)) {
+    return {
+      ok: false,
+      error: { type: 'validation_error', message: GITHUB_PROJECT_REF_INPUT_TOO_LARGE_ERROR }
+    }
+  }
+  const parsed = parseProjectPaste(input, args.host)
+  if (!parsed) {
+    return {
+      ok: false,
+      error: {
+        type: 'validation_error',
+        message: 'Could not parse input. Expected a GitHub project URL or `owner/number`.'
+      }
+    }
+  }
+  const preferred: GitHubProjectOwnerType | null =
+    parsed.kind === 'org' ? 'organization' : parsed.kind === 'user' ? 'user' : null
+  // Why: a pasted URL is authoritative. The ambient host only applies to
+  // owner/number shorthand; otherwise same-number Projects can cross hosts.
+  const executionHost = parsed.kind === 'bare' ? githubProjectHost(args.host) : parsed.host
+  // Verify by fetching project title.
+  const ownerRes = await resolveOwnerType(parsed.owner, preferred, executionHost)
+  if (!ownerRes.ok) {
+    return { ok: false, error: ownerRes.error }
+  }
+  const ownerType = ownerRes.ownerType
+  const root = ownerQueryRoot(ownerType)
+  const query = `
+    query($owner:String!, $num:Int!) {
+      ${root}(login:$owner) { projectV2(number:$num) { id title } }
+    }
+  `
+  const res = await runGraphql<
+    Record<string, { projectV2?: { id?: string; title?: string } | null } | null>
+  >(query, { owner: parsed.owner, num: parsed.number }, projectGhExecOptions(executionHost))
+  if (!res.ok) {
+    return { ok: false, error: res.error }
+  }
+  const p = res.data[root]?.projectV2
+  if (!p || typeof p.id !== 'string') {
+    return { ok: false, error: { type: 'not_found', message: 'Project not found.' } }
+  }
+  return {
+    ok: true,
+    owner: parsed.owner,
+    ownerType,
+    number: parsed.number,
+    title: p.title ?? '',
+    host: executionHost,
+    // Why: forward URL view numbers so the renderer can skip view selection; bare shorthand has none.
+    ...(parsed.kind !== 'bare' && parsed.viewNumber !== undefined
+      ? { viewNumber: parsed.viewNumber }
+      : {})
+  }
+}
diff --git a/src/main/github/project-view/project-view-table.ts b/src/main/github/project-view/project-view-table.ts
new file mode 100644
index 00000000000..042aeb333cf
--- /dev/null
+++ b/src/main/github/project-view/project-view-table.ts
@@ -0,0 +1,163 @@
+import type { GetProjectViewTableArgs } from '../../../shared/github/project-request-types'
+import type { GetProjectViewTableResult } from '../../../shared/github/project-result-types'
+import type { GitHubProjectTable } from '../../../shared/github/project-types'
+import { githubProjectHost } from '../../../shared/github/project-identity'
+import { assertPositiveInt, assertSlug } from './internals'
+import {
+  fetchProjectViewsPage,
+  fetchViewFieldsContinuation,
+  finalizeView,
+  matchesSelector,
+  type RawProjectView
+} from './project-view-config'
+import type { RawProjectV2Field } from './project-view-field-normalization'
+import { fetchAllItems, fetchItemsCountOnly } from './project-view-items'
+
+// ─── Public: getProjectViewTable ──────────────────────────────────────
+
+export async function getProjectViewTable(
+  args: GetProjectViewTableArgs
+): Promise<GetProjectViewTableResult> {
+  const ownerCheck = assertSlug(args.owner, 'owner')
+  if (!ownerCheck.ok) {
+    return { ok: false, error: ownerCheck.error }
+  }
+  const numCheck = assertPositiveInt(args.projectNumber, 'projectNumber')
+  if (!numCheck.ok) {
+    return { ok: false, error: numCheck.error }
+  }
+  if (args.ownerType !== 'organization' && args.ownerType !== 'user') {
+    return {
+      ok: false,
+      error: { type: 'validation_error', message: 'Invalid ownerType.' }
+    }
+  }
+
+  // Paginate views until a match is found.
+  let cursor: string | null = null
+  let project: { id: string; title: string; url: string } | null = null
+  let selectedRaw: RawProjectView | null = null
+  let matchStrength: 'id' | 'number' | 'name' | 'default' | null = null
+  const viewsSeen: RawProjectView[] = []
+  while (true) {
+    const page = await fetchProjectViewsPage({
+      owner: args.owner,
+      ownerType: args.ownerType,
+      projectNumber: args.projectNumber,
+      host: args.host,
+      after: cursor
+    })
+    if (!page.ok) {
+      return { ok: false, error: page.error }
+    }
+    project = page.project
+    for (const v of page.views) {
+      viewsSeen.push(v)
+      const m = matchesSelector(v, {
+        viewId: args.viewId,
+        viewNumber: args.viewNumber,
+        viewName: args.viewName
+      })
+      if (m === 'none') {
+        continue
+      }
+      // Precedence: id > number > name > default.
+      const rank: Record<typeof m, number> = { id: 4, number: 3, name: 2, default: 1 }
+      const currentRank = matchStrength ? rank[matchStrength] : 0
+      if (!selectedRaw || rank[m] > currentRank) {
+        selectedRaw = v
+        matchStrength = m
+      }
+    }
+    // Why: stop on ANY match (incl. 'default' = first table view); walking further pages costs a GraphQL call per page with no re-ranking upside.
+    if (selectedRaw) {
+      break
+    }
+    if (!page.hasNextPage) {
+      break
+    }
+    cursor = page.endCursor
+    if (typeof cursor !== 'string') {
+      break
+    }
+  }
+  if (!project) {
+    return { ok: false, error: { type: 'not_found', message: 'Project not found.' } }
+  }
+  if (!selectedRaw) {
+    return { ok: false, error: { type: 'not_found', message: 'Could not find the selected view.' } }
+  }
+
+  // Paginate view fields if necessary.
+  let extraFields: RawProjectV2Field[] = []
+  const fieldsPi = selectedRaw.fields?.pageInfo
+  if (fieldsPi?.hasNextPage === true && typeof fieldsPi.endCursor === 'string' && selectedRaw.id) {
+    const cont = await fetchViewFieldsContinuation(selectedRaw.id, fieldsPi.endCursor, args.host)
+    if (!cont.ok) {
+      return { ok: false, error: cont.error }
+    }
+    extraFields = cont.fields
+  }
+
+  const finalized = finalizeView(selectedRaw, extraFields)
+  if (!finalized.ok) {
+    return { ok: false, error: finalized.drift }
+  }
+  const selectedView = finalized.view
+
+  // Why: empty-string override means "no filter"; undefined means "use the view's stored filter". The override is ephemeral, never persisted.
+  const effectiveQuery =
+    typeof args.queryOverride === 'string' ? args.queryOverride : selectedView.filter
+
+  // Unsupported layout: skip item pagination; best-effort count-only query.
+  if (selectedView.layout !== 'TABLE_LAYOUT') {
+    const count = await fetchItemsCountOnly({
+      owner: args.owner,
+      ownerType: args.ownerType,
+      projectNumber: args.projectNumber,
+      query: effectiveQuery,
+      host: args.host
+    })
+    return {
+      ok: false,
+      error: {
+        type: 'unsupported_layout',
+        message: `Orca only renders table views. This is a ${selectedView.layout.replace('_LAYOUT', '').toLowerCase()} view.`
+      },
+      ...(typeof count === 'number' ? { totalCount: count } : {})
+    }
+  }
+
+  // Fetch items.
+  const items = await fetchAllItems({
+    owner: args.owner,
+    ownerType: args.ownerType,
+    projectNumber: args.projectNumber,
+    query: effectiveQuery,
+    host: args.host
+  })
+  if (!items.ok) {
+    return {
+      ok: false,
+      error: items.error,
+      ...(typeof items.totalCount === 'number' ? { totalCount: items.totalCount } : {})
+    }
+  }
+
+  const table: GitHubProjectTable = {
+    project: {
+      id: project.id,
+      host: githubProjectHost(args.host),
+      owner: args.owner,
+      ownerType: args.ownerType,
+      number: args.projectNumber,
+      title: project.title,
+      url: project.url
+    },
+    selectedView,
+    rows: items.rows,
+    totalCount: items.totalCount,
+    parentFieldDropped: items.parentFieldDropped
+  }
+  return { ok: true, data: table }
+}
diff --git a/src/main/global-fetch-call-site-audit.test.ts b/src/main/global-fetch-call-site-audit.test.ts
index 8902b867554..e4c0539fbfb 100644
--- a/src/main/global-fetch-call-site-audit.test.ts
+++ b/src/main/global-fetch-call-site-audit.test.ts
@@ -42,7 +42,7 @@ const AUDITED_GLOBAL_FETCH_LINES = new Map<string, number>([
   ['main/pi/agent-status-extension-source.ts', 1],
   // local identifiers named `fetch` (git fetch), not HTTP
   ['main/ipc/worktree-remote.ts', 2],
-  ['relay/git-handler.ts', 1],
+  ['relay/git-handler-fetch-operations.ts', 1],
   // fetch mentioned only in a comment
   ['main/ipc/feedback.ts', 1]
 ])
diff --git a/src/main/index.ts b/src/main/index.ts
index 7df14b894a1..00b059885ad 100644
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -3389,12 +3389,12 @@ void app.whenReady().then(async () => {
   let desktopWindow: BrowserWindow | null = null
   if (process.platform === 'win32' && app.isPackaged && !serveOptions) {
     const desktopStartup = startWindowsDesktopBeforeShellPathReady({
+      bindServices: bindTerminalRuntimeStartupServices,
       openWindow: () => openMainWindow({ revealOnDidFinishLoad: true }),
       shellPathReady,
       startServices: startTerminalRuntimeStartupServices
     })
     desktopWindow = desktopStartup.window
-    bindTerminalRuntimeStartupServices(desktopStartup.services)
   } else {
     await shellPathReady
     bindTerminalRuntimeStartupServices(Promise.resolve(startTerminalRuntimeStartupServices()))
@@ -3410,7 +3410,8 @@ void app.whenReady().then(async () => {
     })
     // Why: headless PTYs must not start on the fallback provider, then get swept when an activated renderer registers desktop lifecycle handlers.
     await localPtyStartupReady
-    registerHeadlessPtyRuntime(
+    await localPtyProviderStartupReady
+    await registerHeadlessPtyRuntime(
       runtime,
       prepareCodexRuntimeHomeForLaunch,
       () => store!.getSettings(),
diff --git a/src/main/ipc/filesystem-watcher-event-batch.test.ts b/src/main/ipc/filesystem-watcher-event-batch.test.ts
index ff166b7b880..31f983b96ce 100644
--- a/src/main/ipc/filesystem-watcher-event-batch.test.ts
+++ b/src/main/ipc/filesystem-watcher-event-batch.test.ts
@@ -8,10 +8,10 @@ import {
 
 describe('queueWatcherEvents', () => {
   function events(count: number): WatcherEvent[] {
-    return Array.from(
-      { length: count },
-      (_, index): WatcherEvent => ({ type: 'update', path: `/repo/file-${index}.ts` })
-    )
+    return Array.from({ length: count }, (_, index): WatcherEvent => ({
+      type: 'update',
+      path: `/repo/file-${index}.ts`
+    }))
   }
 
   it('keeps precise events while the batch remains under the overflow limit', () => {
diff --git a/src/main/ipc/filesystem-watcher-handlers.ts b/src/main/ipc/filesystem-watcher-handlers.ts
new file mode 100644
index 00000000000..7a2b6230abd
--- /dev/null
+++ b/src/main/ipc/filesystem-watcher-handlers.ts
@@ -0,0 +1,97 @@
+import { ipcMain } from 'electron'
+import { onSshFilesystemProviderRegistered } from '../providers/ssh-filesystem-dispatch'
+import { watcherLifecycleState } from './filesystem-watcher-lifecycle-state'
+import { getRemoteWatcherKey } from './filesystem-watcher-paths'
+import {
+  cancelInFlightRemoteInstallIfUnowned,
+  forgetDesiredRemoteWatcher,
+  releaseRemoteWatchListener
+} from './filesystem-watcher-listener-lifecycle'
+import {
+  installRemoteWatcher,
+  reinstallRemoteWatchersForConnection,
+  scheduleRemoteWatcherRetry
+} from './filesystem-watcher-remote-controller'
+import { rememberDesiredRemoteWatcher } from './filesystem-watcher-remote-desired'
+import {
+  subscribeLocalWatcher,
+  unsubscribeLocalWatcher
+} from './filesystem-watcher-local-subscription'
+
+export function registerFilesystemWatcherHandlers(): void {
+  // Why: re-registration replaces the handler set, so drop the previous subscription instead of
+  // stacking a second re-arm on every provider registration.
+  watcherLifecycleState.unsubscribeFromProviderRegistrations?.()
+  watcherLifecycleState.unsubscribeFromProviderRegistrations = onSshFilesystemProviderRegistered(
+    reinstallRemoteWatchersForConnection
+  )
+
+  ipcMain.handle(
+    'fs:watchWorktree',
+    async (event, args: { worktreePath: string; connectionId?: string }): Promise<void> => {
+      if (args.connectionId) {
+        // Why: a real new watch reopens the subsystem after closeAllWatchers latched it shut (also resets tests between cases).
+        watcherLifecycleState.remoteWatchersClosed = false
+        const key = getRemoteWatcherKey(args.connectionId, args.worktreePath)
+        // Why: record intent before the install so a provider registering mid-flight (or long after
+        // this attempt gives up) can still re-arm this listener.
+        rememberDesiredRemoteWatcher(args.connectionId, args.worktreePath, event.sender)
+        const result = await installRemoteWatcher(
+          event.sender,
+          args.connectionId,
+          args.worktreePath
+        )
+        if (result === 'unavailable') {
+          if (!watcherLifecycleState.loggedUnavailableRemoteWatchers.has(key)) {
+            watcherLifecycleState.loggedUnavailableRemoteWatchers.add(key)
+            console.warn(
+              `[filesystem-watcher] SSH filesystem provider unavailable; retrying watch for ${args.worktreePath} on connection ${args.connectionId}`
+            )
+          }
+          scheduleRemoteWatcherRetry(event.sender, args.connectionId, args.worktreePath)
+          return
+        }
+        return
+      }
+      // Why: reopen the local subsystem for tests and post-shutdown reattachment; stale callers keep the prior generation.
+      watcherLifecycleState.localWatchersClosed = false
+      await subscribeLocalWatcher(args.worktreePath, event.sender)
+    }
+  )
+
+  ipcMain.handle(
+    'fs:unwatchWorktree',
+    (_event, args: { worktreePath: string; connectionId?: string }): void => {
+      if (args.connectionId) {
+        const key = getRemoteWatcherKey(args.connectionId, args.worktreePath)
+        // Why: the caller stopped watching on purpose — drop the intent or a later provider
+        // registration would resurrect a watch nobody asked for.
+        forgetDesiredRemoteWatcher(key, _event.sender.id)
+        const suspended = watcherLifecycleState.suspendedRemoteWatcherListeners.get(key)
+        suspended?.listeners.delete(_event.sender.id)
+        if (suspended?.listeners.size === 0) {
+          watcherLifecycleState.suspendedRemoteWatcherListeners.delete(key)
+        }
+        const retry = watcherLifecycleState.pendingRemoteWatcherRetryListeners.get(key)
+        retry?.listeners.delete(_event.sender.id)
+        const retryTimer = watcherLifecycleState.pendingRemoteWatcherRetries.get(key)
+        if (retryTimer && retry?.listeners.size === 0) {
+          clearTimeout(retryTimer)
+          watcherLifecycleState.pendingRemoteWatcherRetries.delete(key)
+          watcherLifecycleState.pendingRemoteWatcherRetryListeners.delete(key)
+        }
+        // Why: a retry-tick provider.watch() may still be in flight; mark cancelled so its resolved unwatch handle is discarded.
+        const inFlight = watcherLifecycleState.inFlightRemoteInstalls.get(key)
+        if (inFlight) {
+          inFlight.listeners.delete(_event.sender.id)
+          cancelInFlightRemoteInstallIfUnowned(inFlight)
+        }
+        watcherLifecycleState.loggedUnavailableRemoteWatchers.delete(key)
+        releaseRemoteWatchListener(key, _event?.sender?.id ?? 0)
+        return
+      }
+      const senderId = _event.sender.id
+      unsubscribeLocalWatcher(args.worktreePath, senderId)
+    }
+  )
+}
diff --git a/src/main/ipc/filesystem-watcher-large-batch.test.ts b/src/main/ipc/filesystem-watcher-large-batch.test.ts
index cfb99c217c1..3d71581595e 100644
--- a/src/main/ipc/filesystem-watcher-large-batch.test.ts
+++ b/src/main/ipc/filesystem-watcher-large-batch.test.ts
@@ -73,10 +73,10 @@ describe('local filesystem watcher large batches', () => {
       { worktreePath }
     )
 
-    const events = Array.from(
-      { length: 200_000 },
-      (_, index): WatcherEvent => ({ type: 'delete', path: join(worktreePath, `file-${index}`) })
-    )
+    const events = Array.from({ length: 200_000 }, (_, index): WatcherEvent => ({
+      type: 'delete',
+      path: join(worktreePath, `file-${index}`)
+    }))
 
     expect(() => watcherCallback?.(null, events)).not.toThrow()
     await closeAllWatchers()
@@ -97,13 +97,10 @@ describe('local filesystem watcher large batches', () => {
     await handlers['fs:watchWorktree']({ sender }, { worktreePath })
     watcherCallback?.(
       null,
-      Array.from(
-        { length: 5_001 },
-        (_, index): WatcherEvent => ({
-          type: 'update',
-          path: join(worktreePath, `file-${index}.txt`)
-        })
-      )
+      Array.from({ length: 5_001 }, (_, index): WatcherEvent => ({
+        type: 'update',
+        path: join(worktreePath, `file-${index}.txt`)
+      }))
     )
 
     await vi.advanceTimersByTimeAsync(150)
diff --git a/src/main/ipc/filesystem-watcher-lifecycle-state.ts b/src/main/ipc/filesystem-watcher-lifecycle-state.ts
new file mode 100644
index 00000000000..548d958f90c
--- /dev/null
+++ b/src/main/ipc/filesystem-watcher-lifecycle-state.ts
@@ -0,0 +1,124 @@
+import type { WebContents } from 'electron'
+import type { WatchedRoot } from './filesystem-watcher-wsl'
+import type { RemoteWatcherEventBatch } from './remote-watcher-event-batch'
+
+// ── Per-root watcher state ───────────────────────────────────────────
+// WatchedRoot/WatcherSubscription live in filesystem-watcher-wsl.ts so native and WSL watchers share one shape.
+
+// ── Module state ─────────────────────────────────────────────────────
+
+export type LocalWatcherInstallToken = {
+  cancelled: boolean
+  listeners: Map<number, WebContents>
+  abortController: AbortController
+}
+
+export type LocalWatcherInstallResult = 'installed' | 'unavailable' | 'capacity' | 'cancelled'
+
+export type LocalWatcherCapacityRetry = {
+  listeners: Map<number, WebContents>
+  cancelWait: () => void
+}
+
+export type RemoteWatcherInstallToken = {
+  cancelled: boolean
+  listeners: Map<number, WebContents>
+  abortController: AbortController
+  abortScheduled: boolean
+  terminalError?: Error
+}
+
+export type RemoteWatcherState = {
+  unwatch: () => void
+  listeners: Map<number, WebContents>
+  installToken: RemoteWatcherInstallToken
+  /** Held so every teardown can drop the trailing flush timer instead of letting it fire into a dead watch. */
+  batch: RemoteWatcherEventBatch
+}
+
+export type RemoteWatcherInstallResult = 'installed' | 'unavailable' | 'cancelled'
+
+export type RemoteWatcherResyncState = {
+  lastSentAt: number
+  listeners: Map<number, WebContents>
+  timer?: ReturnType<typeof setTimeout>
+  worktreePath: string
+}
+
+// Why: cache roots that failed watcher creation (e.g. WSL UNC paths) so we don't retry every worktree switch and spam the console with errors.
+export const UNWATCHABLE_ROOT_CACHE_MAX = 256
+// Why: recreating @parcel/watcher on Windows is expensive (ReadDirectoryChangesW + AV, 500ms+); a 30s grace lets rapid switches reuse the watcher.
+export const WATCHER_TEARDOWN_GRACE_MS = 30_000
+export const REMOTE_WATCH_RETRY_MS = 1_000
+export const REMOTE_WATCH_RETRY_TIMEOUT_MS = 60_000
+// Why: preserve the first and latest resync while bounding full-tree SSH refreshes during flaps.
+export const REMOTE_WATCH_RESYNC_COALESCE_MS = 5_000
+// Why: doubling from a minute to a half-hour ceiling costs a permanently broken remote ~7 fs.watch
+// calls in the first hour and 2/hour after, which a flapping link can absorb.
+export const REMOTE_WATCH_DORMANT_RETRY_MS = 60_000
+export const REMOTE_WATCH_DORMANT_RETRY_MAX_MS = 30 * 60_000
+
+export const watcherLifecycleState = {
+  watchedRoots: new Map<string, WatchedRoot>(),
+  unwatchableRoots: new Set<string>(),
+  // Why: key cleanup by sender WebContents (not per root) to avoid MaxListeners warnings when a workspace has many worktrees open.
+  senderCleanupRegistered: new Set<number>(),
+  pendingTeardowns: new Map<string, ReturnType<typeof setTimeout>>(),
+  // Why: @parcel/watcher unsubscribe does native async work that sender-destroy can start before shutdown, so will-quit must still await it.
+  pendingLocalUnsubscribes: new Set<Promise<void>>(),
+  pendingLocalUnsubscribesByRoot: new Map<string, Set<Promise<void>>>(),
+  suspendedLocalWatcherListeners: new Map<
+    string,
+    { worktreePath: string; listeners: Map<number, WebContents> }
+  >(),
+  // Why: an install cancelled by shutdown can't be revived by a waiter that resumes after a later call reopens the subsystem.
+  localWatchersClosed: false,
+  localWatcherLifecycleGeneration: 0,
+  failedLocalUnsubscribes: new Map<string, unknown>(),
+  // Why: a drain that timed out no longer gates the delete — Git removal already proceeded past it. Its
+  // late failure must not fail-close a *later* close of the same root, which would leave that path
+  // undeletable until the watcher process physically exits.
+  abandonedLocalUnsubscribes: new WeakSet<Promise<void>>(),
+  // Why: watcher creation is async; concurrent watch requests for the same root must share one install or later resolves orphan listeners.
+  inFlightLocalInstalls: new Map<string, LocalWatcherInstallToken>(),
+  pendingLocalInstallPromises: new Map<string, Promise<LocalWatcherInstallResult>>(),
+  pendingLocalCapacityRetries: new Map<string, LocalWatcherCapacityRetry>(),
+  // Remote watcher state
+  // Key: `${connectionId}:${worktreePath}`, Value: shared remote watch state.
+  remoteWatchers: new Map<string, RemoteWatcherState>(),
+  suspendedRemoteWatcherListeners: new Map<
+    string,
+    { connectionId: string; worktreePath: string; listeners: Map<number, WebContents> }
+  >(),
+  // Why: the renderer subscribes once per target and never re-issues, so the intent to watch has to
+  // outlive any single connection — an install that failed or died with a dropped transport is
+  // re-armed from here when a provider appears. Without it a reconnect (or a connect slower than the
+  // retry window) leaves the watch dead until the app restarts.
+  desiredRemoteWatchers: new Map<
+    string,
+    { connectionId: string; worktreePath: string; listeners: Map<number, WebContents> }
+  >(),
+  // Why: provider registration only fires on reconnect, so a watch that dies while the SSH link stays
+  // healthy (remote OOM, inotify/fd exhaustion, relay watcher killed) has no re-arm trigger at all
+  // once the fast window gives up. Backoff keeps the recovery attempt without the 1s storm.
+  dormantRemoteWatchers: new Map<
+    string,
+    { delayMs: number; timer: ReturnType<typeof setTimeout> }
+  >(),
+  loggedUnavailableRemoteWatchers: new Set<string>(),
+  pendingRemoteWatcherRetries: new Map<string, ReturnType<typeof setTimeout>>(),
+  pendingRemoteWatcherRetryListeners: new Map<
+    string,
+    { listeners: Map<number, WebContents>; startedAt: number; resyncOnInstall: boolean }
+  >(),
+  remoteWatcherResyncStates: new Map<string, RemoteWatcherResyncState>(),
+  // Why: last-listener cleanup aborts relay setup; late success is unwatched rather than installed after the renderer stopped watching.
+  inFlightRemoteInstalls: new Map<string, RemoteWatcherInstallToken>(),
+  // Why: dedupe concurrent installRemoteWatcher calls per key so overlapping watches share one watcher instead of clobbering per-key state.
+  pendingRemoteInstallPromises: new Map<string, Promise<RemoteWatcherInstallResult>>(),
+  // Why: block installs beginning after closeAllWatchers (joiner recursion / retry tick bypass the abort loop); a new fs:watchWorktree clears it.
+  remoteWatchersClosed: false,
+  // Why: closeAllWatchers bumps this so a joiner that awaited across shutdown+reopen is refused (the latch alone can't tell it from a fresh call).
+  remoteWatcherLifecycleGeneration: 0,
+  unsubscribeFromProviderRegistrations: null as (() => void) | null
+}
diff --git a/src/main/ipc/filesystem-watcher-listener-lifecycle.ts b/src/main/ipc/filesystem-watcher-listener-lifecycle.ts
new file mode 100644
index 00000000000..ce0cfaa80fc
--- /dev/null
+++ b/src/main/ipc/filesystem-watcher-listener-lifecycle.ts
@@ -0,0 +1,272 @@
+import type { WebContents } from 'electron'
+import { isWatcherProcessFailure } from './parcel-watcher-process-failure'
+import type { WatchedRoot } from './filesystem-watcher-wsl'
+import {
+  type LocalWatcherInstallToken,
+  type RemoteWatcherInstallToken,
+  UNWATCHABLE_ROOT_CACHE_MAX,
+  watcherLifecycleState
+} from './filesystem-watcher-lifecycle-state'
+
+export function rememberUnwatchableRoot(rootKey: string): void {
+  const { unwatchableRoots } = watcherLifecycleState
+  // Why: deleted worktrees churn through unique paths; cap the set so retry suppression stays useful without retaining every failed path.
+  unwatchableRoots.delete(rootKey)
+  unwatchableRoots.add(rootKey)
+  while (unwatchableRoots.size > UNWATCHABLE_ROOT_CACHE_MAX) {
+    const oldest = unwatchableRoots.keys().next().value
+    if (oldest === undefined) {
+      break
+    }
+    unwatchableRoots.delete(oldest)
+  }
+}
+
+export function retainLocalWatcherPhysicalFailure(rootKey: string, error: unknown): void {
+  if (!isWatcherProcessFailure(error) || !error.physicalExit) {
+    return
+  }
+  watcherLifecycleState.failedLocalUnsubscribes.set(rootKey, error)
+  void error.physicalExit.then(() => {
+    if (watcherLifecycleState.failedLocalUnsubscribes.get(rootKey) === error) {
+      watcherLifecycleState.failedLocalUnsubscribes.delete(rootKey)
+    }
+  })
+}
+
+export function trackDetachedLocalUnsubscribe(rootKey: string, root: WatchedRoot): Promise<void> {
+  const rootUnsubscribes =
+    watcherLifecycleState.pendingLocalUnsubscribesByRoot.get(rootKey) ?? new Set<Promise<void>>()
+  watcherLifecycleState.pendingLocalUnsubscribesByRoot.set(rootKey, rootUnsubscribes)
+  const unsubscribePromise = Promise.resolve()
+    .then(() => root.subscription.unsubscribe())
+    .finally(() => {
+      watcherLifecycleState.pendingLocalUnsubscribes.delete(unsubscribePromise)
+      rootUnsubscribes.delete(unsubscribePromise)
+      if (rootUnsubscribes.size === 0) {
+        watcherLifecycleState.pendingLocalUnsubscribesByRoot.delete(rootKey)
+      }
+    })
+  watcherLifecycleState.pendingLocalUnsubscribes.add(unsubscribePromise)
+  rootUnsubscribes.add(unsubscribePromise)
+  // Why: swallow here to avoid unhandled rejections, but keep the original promise rejected so later destructive cleanup can fail closed.
+  void unsubscribePromise.catch((error: unknown) => {
+    if (!watcherLifecycleState.abandonedLocalUnsubscribes.has(unsubscribePromise)) {
+      retainLocalWatcherPhysicalFailure(rootKey, error)
+    }
+    console.error(`[filesystem-watcher] unsubscribe error for ${rootKey}:`, error)
+  })
+  return unsubscribePromise
+}
+
+/** Mark unsubscribes whose drain timed out so their late failures stay out of failedLocalUnsubscribes. */
+export function abandonLocalUnsubscribes(promises: Iterable<Promise<void>>): void {
+  for (const promise of promises) {
+    watcherLifecycleState.abandonedLocalUnsubscribes.add(promise)
+  }
+}
+
+export function addInFlightLocalInstallListener(
+  token: LocalWatcherInstallToken,
+  sender: WebContents
+): void {
+  if (sender.isDestroyed() || token.abortController.signal.aborted) {
+    return
+  }
+  token.listeners.set(sender.id, sender)
+  token.cancelled = false
+  registerWatcherSenderCleanup(sender)
+}
+
+function cleanupInFlightLocalInstallsForSender(senderId: number): void {
+  for (const token of watcherLifecycleState.inFlightLocalInstalls.values()) {
+    token.listeners.delete(senderId)
+    if (token.listeners.size === 0) {
+      token.cancelled = true
+      // Why: abort so a pending native/forked subscription stops early (matches closeLocalWatcherForWorktreePath / closeAllWatchers).
+      token.abortController.abort()
+    }
+  }
+  for (const [rootKey, retry] of watcherLifecycleState.pendingLocalCapacityRetries) {
+    retry.listeners.delete(senderId)
+    if (retry.listeners.size === 0) {
+      retry.cancelWait()
+      watcherLifecycleState.pendingLocalCapacityRetries.delete(rootKey)
+    }
+  }
+}
+
+export function takeLocalCapacityRetryListeners(rootKey: string): WebContents[] {
+  const retry = watcherLifecycleState.pendingLocalCapacityRetries.get(rootKey)
+  if (!retry) {
+    return []
+  }
+  retry.cancelWait()
+  watcherLifecycleState.pendingLocalCapacityRetries.delete(rootKey)
+  return [...retry.listeners.values()].filter((listener) => !listener.isDestroyed())
+}
+
+export function clearLocalCapacityRetry(rootKey: string): void {
+  const retry = watcherLifecycleState.pendingLocalCapacityRetries.get(rootKey)
+  retry?.cancelWait()
+  watcherLifecycleState.pendingLocalCapacityRetries.delete(rootKey)
+}
+
+export function addLocalWatchListener(rootKey: string, sender: WebContents): void {
+  const root = watcherLifecycleState.watchedRoots.get(rootKey)
+  if (!root || sender.isDestroyed()) {
+    return
+  }
+  root.listeners.set(sender.id, sender)
+  registerWatcherSenderCleanup(sender)
+}
+
+export function cancelInFlightRemoteInstallIfUnowned(token: RemoteWatcherInstallToken): void {
+  token.cancelled = token.listeners.size === 0
+  if (!token.cancelled || token.abortScheduled || token.abortController.signal.aborted) {
+    return
+  }
+  token.abortScheduled = true
+  // Why: a replacement sender can synchronously revive the shared install during a renderer handoff; otherwise stop the relay crawl next microtask.
+  queueMicrotask(() => {
+    token.abortScheduled = false
+    if (token.cancelled && token.listeners.size === 0) {
+      token.abortController.abort()
+    }
+  })
+}
+
+export function addInFlightRemoteInstallListener(
+  token: RemoteWatcherInstallToken,
+  sender: WebContents
+): void {
+  if (sender.isDestroyed() || token.abortController.signal.aborted) {
+    return
+  }
+  token.listeners.set(sender.id, sender)
+  token.cancelled = false
+  registerWatcherSenderCleanup(sender)
+}
+
+export function addRemoteWatchListener(key: string, sender: WebContents): void {
+  const state = watcherLifecycleState.remoteWatchers.get(key)
+  if (!state) {
+    return
+  }
+  state.listeners.set(sender.id, sender)
+  registerWatcherSenderCleanup(sender)
+}
+
+export function releaseRemoteWatchListener(key: string, senderId: number): void {
+  const state = watcherLifecycleState.remoteWatchers.get(key)
+  if (!state) {
+    return
+  }
+  state.listeners.delete(senderId)
+  if (state.listeners.size > 0) {
+    return
+  }
+  state.unwatch()
+  state.batch.close()
+  watcherLifecycleState.remoteWatchers.delete(key)
+}
+
+export function registerWatcherSenderCleanup(sender: WebContents): void {
+  if (watcherLifecycleState.senderCleanupRegistered.has(sender.id)) {
+    return
+  }
+  watcherLifecycleState.senderCleanupRegistered.add(sender.id)
+  sender.once('destroyed', () => {
+    watcherLifecycleState.senderCleanupRegistered.delete(sender.id)
+    cleanupLocalWatchersForSender(sender.id)
+    cleanupRemoteWatchersForSender(sender.id)
+  })
+}
+
+function cleanupLocalWatchersForSender(senderId: number): void {
+  for (const [rootKey, suspended] of watcherLifecycleState.suspendedLocalWatcherListeners) {
+    suspended.listeners.delete(senderId)
+    if (suspended.listeners.size === 0) {
+      watcherLifecycleState.suspendedLocalWatcherListeners.delete(rootKey)
+    }
+  }
+  cleanupInFlightLocalInstallsForSender(senderId)
+  for (const [key, watchedRoot] of watcherLifecycleState.watchedRoots) {
+    if (!watchedRoot.listeners.has(senderId)) {
+      continue
+    }
+    watchedRoot.listeners.delete(senderId)
+    if (watchedRoot.listeners.size === 0) {
+      // Cancel any pending grace-period teardown for this root.
+      const pending = watcherLifecycleState.pendingTeardowns.get(key)
+      if (pending) {
+        clearTimeout(pending)
+        watcherLifecycleState.pendingTeardowns.delete(key)
+      }
+      if (watchedRoot.batch.timer) {
+        clearTimeout(watchedRoot.batch.timer)
+      }
+      trackDetachedLocalUnsubscribe(key, watchedRoot)
+      watcherLifecycleState.watchedRoots.delete(key)
+    }
+  }
+}
+
+function cleanupRemoteWatchersForSender(senderId: number): void {
+  for (const key of Array.from(watcherLifecycleState.desiredRemoteWatchers.keys())) {
+    forgetDesiredRemoteWatcher(key, senderId)
+  }
+  for (const [key, suspended] of watcherLifecycleState.suspendedRemoteWatcherListeners) {
+    suspended.listeners.delete(senderId)
+    if (suspended.listeners.size === 0) {
+      watcherLifecycleState.suspendedRemoteWatcherListeners.delete(key)
+    }
+  }
+  for (const token of watcherLifecycleState.inFlightRemoteInstalls.values()) {
+    token.listeners.delete(senderId)
+    cancelInFlightRemoteInstallIfUnowned(token)
+  }
+  for (const [key, retry] of watcherLifecycleState.pendingRemoteWatcherRetryListeners) {
+    retry.listeners.delete(senderId)
+    if (retry.listeners.size === 0) {
+      const timer = watcherLifecycleState.pendingRemoteWatcherRetries.get(key)
+      if (timer) {
+        clearTimeout(timer)
+        watcherLifecycleState.pendingRemoteWatcherRetries.delete(key)
+      }
+      watcherLifecycleState.pendingRemoteWatcherRetryListeners.delete(key)
+    }
+  }
+  for (const key of Array.from(watcherLifecycleState.remoteWatchers.keys())) {
+    releaseRemoteWatchListener(key, senderId)
+  }
+}
+
+export function clearRemoteWatcherResync(key: string): void {
+  const resync = watcherLifecycleState.remoteWatcherResyncStates.get(key)
+  if (resync?.timer) {
+    clearTimeout(resync.timer)
+  }
+  watcherLifecycleState.remoteWatcherResyncStates.delete(key)
+}
+
+export function clearDormantRemoteWatcher(key: string): void {
+  const dormant = watcherLifecycleState.dormantRemoteWatchers.get(key)
+  if (dormant) {
+    clearTimeout(dormant.timer)
+    watcherLifecycleState.dormantRemoteWatchers.delete(key)
+  }
+}
+
+export function forgetDesiredRemoteWatcher(key: string, senderId: number): void {
+  const desired = watcherLifecycleState.desiredRemoteWatchers.get(key)
+  if (!desired) {
+    return
+  }
+  desired.listeners.delete(senderId)
+  if (desired.listeners.size === 0) {
+    watcherLifecycleState.desiredRemoteWatchers.delete(key)
+    clearRemoteWatcherResync(key)
+    clearDormantRemoteWatcher(key)
+  }
+}
diff --git a/src/main/ipc/filesystem-watcher-local-capacity.ts b/src/main/ipc/filesystem-watcher-local-capacity.ts
new file mode 100644
index 00000000000..a66f7822b14
--- /dev/null
+++ b/src/main/ipc/filesystem-watcher-local-capacity.ts
@@ -0,0 +1,59 @@
+import type { WebContents } from 'electron'
+import { onWatcherChildCapacityAvailable } from './parcel-watcher-child-registry'
+import type { LocalWatcherCapacityRetry } from './filesystem-watcher-lifecycle-state'
+import { watcherLifecycleState } from './filesystem-watcher-lifecycle-state'
+import {
+  clearLocalCapacityRetry,
+  registerWatcherSenderCleanup
+} from './filesystem-watcher-listener-lifecycle'
+import { isWatcherRemovalInProgressError } from './watcher-removal-gate'
+
+export type SubscribeLocalWatcher = (worktreePath: string, sender: WebContents) => Promise<void>
+
+export function scheduleLocalCapacityRetry(
+  rootKey: string,
+  worktreePath: string,
+  listeners: Map<number, WebContents>,
+  subscribe: SubscribeLocalWatcher
+): void {
+  const existing = watcherLifecycleState.pendingLocalCapacityRetries.get(rootKey)
+  if (existing) {
+    for (const listener of listeners.values()) {
+      if (!listener.isDestroyed()) {
+        existing.listeners.set(listener.id, listener)
+      }
+    }
+    return
+  }
+
+  let retry!: LocalWatcherCapacityRetry
+  const cancelWait = onWatcherChildCapacityAvailable(async () => {
+    if (watcherLifecycleState.pendingLocalCapacityRetries.get(rootKey) !== retry) {
+      return
+    }
+    watcherLifecycleState.pendingLocalCapacityRetries.delete(rootKey)
+    await Promise.all(
+      [...retry.listeners.values()].map(async (listener) => {
+        if (listener.isDestroyed()) {
+          return
+        }
+        await subscribe(worktreePath, listener).catch((error: unknown) => {
+          if (!isWatcherRemovalInProgressError(error)) {
+            console.error(`[filesystem-watcher] capacity retry failed for ${rootKey}:`, error)
+          }
+        })
+      })
+    )
+  })
+  retry = { listeners: new Map(), cancelWait }
+  watcherLifecycleState.pendingLocalCapacityRetries.set(rootKey, retry)
+  for (const listener of listeners.values()) {
+    if (!listener.isDestroyed()) {
+      retry.listeners.set(listener.id, listener)
+      registerWatcherSenderCleanup(listener)
+    }
+  }
+  if (retry.listeners.size === 0) {
+    clearLocalCapacityRetry(rootKey)
+  }
+}
diff --git a/src/main/ipc/filesystem-watcher-local-events.ts b/src/main/ipc/filesystem-watcher-local-events.ts
new file mode 100644
index 00000000000..9618c6e74a7
--- /dev/null
+++ b/src/main/ipc/filesystem-watcher-local-events.ts
@@ -0,0 +1,239 @@
+import { stat } from 'node:fs/promises'
+import type { Event as WatcherEvent } from '@parcel/watcher'
+import type { FsChangeEvent, FsChangedPayload } from '../../shared/filesystem-entry-types'
+import {
+  WATCH_BATCH_MAX_WAIT_MS,
+  WATCH_BATCH_TRAILING_MS
+} from '../../shared/filesystem-watch-batch-window'
+import { MAX_BATCHED_WATCHER_EVENTS, queueWatcherEvents } from './filesystem-watcher-event-batch'
+// Why: suppress high-churn dirs at the watcher level (separate from the File Explorer display filter, which only hides rows).
+import { WATCHER_IGNORE_DIRS, buildParcelWatcherIgnoreOptions } from './filesystem-watcher-ignore'
+import type { WatchedRoot } from './filesystem-watcher-wsl'
+import { subscribeViaWatcherProcess } from './parcel-watcher-process'
+import { normalizeWatcherEventPath } from './filesystem-watcher-paths'
+import { watcherLifecycleState } from './filesystem-watcher-lifecycle-state'
+import {
+  retainLocalWatcherPhysicalFailure,
+  trackDetachedLocalUnsubscribe
+} from './filesystem-watcher-listener-lifecycle'
+
+// ── Event coalescing ─────────────────────────────────────────────────
+// Why: keep the last event per path in a flush window; delete→create emits both (delete cleans the subtree, create refreshes the parent), create→delete is dropped (§4.4).
+function coalesceEvents(
+  raw: WatcherEvent[]
+): { type: 'create' | 'update' | 'delete'; path: string }[] {
+  const lastByPath = new Map<string, { type: 'create' | 'update' | 'delete'; index: number }>()
+  const deleteBeforeCreate = new Set<string>()
+
+  for (let i = 0; i < raw.length; i++) {
+    const evt = raw[i]
+    const p = normalizeWatcherEventPath(evt.path)
+    const prev = lastByPath.get(p)
+
+    if (prev) {
+      // delete followed by create → emit both
+      if (prev.type === 'delete' && evt.type === 'create') {
+        deleteBeforeCreate.add(p)
+      }
+      // create followed by delete → net no-op, remove both
+      if (prev.type === 'create' && evt.type === 'delete') {
+        lastByPath.delete(p)
+        deleteBeforeCreate.delete(p)
+        continue
+      }
+    }
+
+    lastByPath.set(p, { type: evt.type, index: i })
+
+    // Why: drop the stale delete when a later event supersedes delete→create, else output has a spurious delete for a file that still exists (§4.4).
+    if (evt.type !== 'create' && deleteBeforeCreate.has(p)) {
+      deleteBeforeCreate.delete(p)
+    }
+  }
+
+  const result: { type: 'create' | 'update' | 'delete'; path: string }[] = []
+
+  // Emit delete events first for paths that have delete→create
+  for (const p of deleteBeforeCreate) {
+    result.push({ type: 'delete', path: p })
+  }
+
+  // Emit the last event for each path
+  for (const [p, entry] of lastByPath) {
+    result.push({ type: entry.type, path: p })
+  }
+
+  return result
+}
+
+// ── Stat helper for isDirectory ──────────────────────────────────────
+
+async function tryStatIsDirectory(filePath: string): Promise<boolean | undefined> {
+  try {
+    const s = await stat(filePath)
+    return s.isDirectory()
+  } catch {
+    // Why: stat failure (EPERM, vanished file) → undefined; renderer treats it as a file event, the safe default (§4.4).
+    return undefined
+  }
+}
+
+// ── Flush and emit ───────────────────────────────────────────────────
+
+function emitOverflowPayload(root: WatchedRoot): void {
+  const { rootPath } = root
+  const payload: FsChangedPayload = {
+    worktreePath: rootPath,
+    events: [{ kind: 'overflow', absolutePath: rootPath }]
+  }
+  for (const [, wc] of root.listeners) {
+    if (!wc.isDestroyed()) {
+      wc.send('fs:changed', payload)
+    }
+  }
+}
+
+async function flushBatch(root: WatchedRoot): Promise<void> {
+  const overflowed = root.batch.overflowed
+  const rawEvents = root.batch.events.splice(0)
+  root.batch.overflowed = false
+  root.batch.timer = null
+  root.batch.firstEventAt = 0
+
+  if ((rawEvents.length === 0 && !overflowed) || root.listeners.size === 0) {
+    return
+  }
+
+  if (overflowed || rawEvents.length > MAX_BATCHED_WATCHER_EVENTS) {
+    // Why: deletion storms can be too large to coalesce/stat per path; one overflow asks the renderer for the same conservative refresh.
+    emitOverflowPayload(root)
+    return
+  }
+
+  const coalesced = coalesceEvents(rawEvents)
+
+  const events: FsChangeEvent[] = await Promise.all(
+    coalesced.map(async (evt) => {
+      // Why: a deleted path can't be stat'd; leave isDirectory undefined and let the renderer infer from dirCache.
+      const isDirectory = evt.type === 'delete' ? undefined : await tryStatIsDirectory(evt.path)
+
+      return {
+        kind: evt.type,
+        absolutePath: evt.path,
+        isDirectory
+      }
+    })
+  )
+
+  const payload: FsChangedPayload = {
+    worktreePath: root.rootPath,
+    events
+  }
+
+  for (const [, wc] of root.listeners) {
+    if (!wc.isDestroyed()) {
+      wc.send('fs:changed', payload)
+    }
+  }
+}
+
+export function scheduleLocalBatchFlush(root: WatchedRoot): void {
+  const now = Date.now()
+
+  if (root.batch.firstEventAt === 0) {
+    root.batch.firstEventAt = now
+  }
+
+  // If we've exceeded the max wait, flush immediately
+  if (now - root.batch.firstEventAt >= WATCH_BATCH_MAX_WAIT_MS) {
+    if (root.batch.timer) {
+      clearTimeout(root.batch.timer)
+    }
+    void flushBatch(root)
+    return
+  }
+
+  // Trailing-edge debounce: reset timer on each new event
+  if (root.batch.timer) {
+    clearTimeout(root.batch.timer)
+  }
+  root.batch.timer = setTimeout(() => void flushBatch(root), WATCH_BATCH_TRAILING_MS)
+}
+
+// ── Watcher creation ─────────────────────────────────────────────────
+
+export async function createLocalWatcher(
+  rootKey: string,
+  rootPath: string,
+  signal?: AbortSignal
+): Promise<WatchedRoot> {
+  const root: WatchedRoot = {
+    subscription: null!,
+    listeners: new Map(),
+    batch: { events: [], overflowed: false, timer: null, firstEventAt: 0 },
+    rootPath
+  }
+
+  try {
+    // Why: if the error callback cleaned up before subscribe() resolved, its returned subscription is orphaned and leaks a native handle.
+    let errorCleanedUp = false
+
+    const watcherOptions = {
+      ...buildParcelWatcherIgnoreOptions(WATCHER_IGNORE_DIRS),
+      // Why: Parcel probes Watchman first, which prints a shell-level "watchman not recognized" error on Windows; pin the backend to suppress it.
+      ...(process.platform === 'win32' ? { backend: 'windows' as const } : {})
+    }
+
+    const markWatcherInterrupted = (): void => {
+      root.batch.overflowed = true
+      scheduleLocalBatchFlush(root)
+    }
+
+    // Why: fork the watcher process (issue #7547 — watcher.node teardown races crash the host); onInterruption marks overflow to refresh past the gap.
+    root.subscription = await subscribeViaWatcherProcess(
+      rootPath,
+      (err, events) => {
+        if (err) {
+          // Why: treat watcher errors as overflow so the renderer conservatively refreshes rather than trusting possibly-invalid caches (§7.2, §7.3).
+          console.error(`[filesystem-watcher] error for ${rootKey}:`, err)
+          emitOverflowPayload(root)
+          // Why: after an error the native subscription may be invalid (deleted root); tear down the dead watcher so it doesn't dangle (§7.3).
+          if (root.batch.timer) {
+            clearTimeout(root.batch.timer)
+          }
+          // Why: error callback can fire before subscribe() assigns root.subscription; guard against null so cleanup doesn't crash.
+          if (root.subscription) {
+            retainLocalWatcherPhysicalFailure(rootKey, err)
+            void trackDetachedLocalUnsubscribe(rootKey, root)
+          }
+          errorCleanedUp = true
+          watcherLifecycleState.watchedRoots.delete(rootKey)
+          return
+        }
+
+        queueWatcherEvents(root.batch, events)
+        scheduleLocalBatchFlush(root)
+      },
+      watcherOptions,
+      {
+        delivery: { maxEventsPerBatch: MAX_BATCHED_WATCHER_EVENTS },
+        // A child restart or bounded-queue overflow loses path precision; both need the same conservative renderer refresh.
+        onInterruption: markWatcherInterrupted,
+        onOverflow: markWatcherInterrupted,
+        signal
+      }
+    )
+
+    // Why: error callback already cleaned up watchedRoots before subscribe() resolved; unsubscribe this orphaned subscription so it doesn't leak.
+    if (errorCleanedUp) {
+      void trackDetachedLocalUnsubscribe(rootKey, root)
+      throw new Error(`Watcher for ${rootKey} errored during subscribe`)
+    }
+  } catch (err) {
+    // Why: watcher backend can throw synchronously on a deleted root/permission error; log rather than crash the main process (§7.3).
+    console.error(`[filesystem-watcher] failed to subscribe ${rootKey}:`, err)
+    throw err
+  }
+
+  return root
+}
diff --git a/src/main/ipc/filesystem-watcher-local-install.ts b/src/main/ipc/filesystem-watcher-local-install.ts
new file mode 100644
index 00000000000..089c553297b
--- /dev/null
+++ b/src/main/ipc/filesystem-watcher-local-install.ts
@@ -0,0 +1,94 @@
+import { stat } from 'node:fs/promises'
+import { isWslPath } from '../wsl'
+import { WATCHER_IGNORE_DIRS } from './filesystem-watcher-ignore'
+import { createWslWatcher, type WatchedRoot } from './filesystem-watcher-wsl'
+import { WatcherChildCapacityError } from './parcel-watcher-child-registry'
+import { isWatcherProcessFailure } from './parcel-watcher-process-failure'
+import type {
+  LocalWatcherInstallResult,
+  LocalWatcherInstallToken
+} from './filesystem-watcher-lifecycle-state'
+import { watcherLifecycleState } from './filesystem-watcher-lifecycle-state'
+import { createLocalWatcher, scheduleLocalBatchFlush } from './filesystem-watcher-local-events'
+import {
+  registerWatcherSenderCleanup,
+  rememberUnwatchableRoot,
+  retainLocalWatcherPhysicalFailure,
+  trackDetachedLocalUnsubscribe
+} from './filesystem-watcher-listener-lifecycle'
+
+export async function installLocalWatcher(
+  rootKey: string,
+  rootPath: string,
+  worktreePath: string,
+  cancelToken: LocalWatcherInstallToken,
+  scheduleCapacityRetry: (listeners: Map<number, Electron.WebContents>) => void
+): Promise<LocalWatcherInstallResult> {
+  let root: WatchedRoot
+  try {
+    const s = await stat(rootPath)
+    if (!s.isDirectory()) {
+      console.warn(`[filesystem-watcher] not a directory: ${rootKey}`)
+      rememberUnwatchableRoot(rootKey)
+      return 'unavailable'
+    }
+  } catch {
+    console.warn(`[filesystem-watcher] cannot stat root: ${rootKey}`)
+    rememberUnwatchableRoot(rootKey)
+    return 'unavailable'
+  }
+
+  try {
+    // Why: WSL paths use one snapshot subprocess inside the distro so `wsl --shutdown` can kill it; native Windows uses @parcel/watcher.
+    root = isWslPath(worktreePath)
+      ? await createWslWatcher(
+          rootKey,
+          worktreePath,
+          {
+            ignoreDirs: WATCHER_IGNORE_DIRS,
+            scheduleBatchFlush: scheduleLocalBatchFlush,
+            watchedRoots: watcherLifecycleState.watchedRoots
+          },
+          cancelToken.abortController.signal
+        )
+      : await createLocalWatcher(rootKey, rootPath, cancelToken.abortController.signal)
+  } catch (error) {
+    // Why: setup can fail after its child misses the exit deadline; retain that owner even when the renderer-facing error is swallowed.
+    retainLocalWatcherPhysicalFailure(rootKey, error)
+    if (cancelToken.cancelled) {
+      if (isWatcherProcessFailure(error) && error.code === 'process_unavailable') {
+        throw error
+      }
+      return 'cancelled'
+    }
+    // Why: capacity is transient — allow retry once another child exits instead of caching this root as permanently failed.
+    if (error instanceof WatcherChildCapacityError) {
+      scheduleCapacityRetry(cancelToken.listeners)
+      return 'capacity'
+    }
+    rememberUnwatchableRoot(rootKey)
+    return 'unavailable'
+  } finally {
+    if (watcherLifecycleState.inFlightLocalInstalls.get(rootKey) === cancelToken) {
+      watcherLifecycleState.inFlightLocalInstalls.delete(rootKey)
+    }
+  }
+
+  const liveListeners = new Map(
+    Array.from(cancelToken.listeners.entries()).filter(([, listener]) => !listener.isDestroyed())
+  )
+  if (cancelToken.cancelled || liveListeners.size === 0) {
+    if (root.batch.timer) {
+      clearTimeout(root.batch.timer)
+    }
+    void trackDetachedLocalUnsubscribe(rootKey, root)
+    return 'cancelled'
+  }
+
+  root.listeners = liveListeners
+  watcherLifecycleState.watchedRoots.set(rootKey, root)
+  for (const listener of liveListeners.values()) {
+    registerWatcherSenderCleanup(listener)
+  }
+  return 'installed'
+}
diff --git a/src/main/ipc/filesystem-watcher-local-removal.ts b/src/main/ipc/filesystem-watcher-local-removal.ts
new file mode 100644
index 00000000000..b0b92a9c118
--- /dev/null
+++ b/src/main/ipc/filesystem-watcher-local-removal.ts
@@ -0,0 +1,156 @@
+import type { WebContents } from 'electron'
+import type { FsChangedPayload } from '../../shared/filesystem-entry-types'
+import {
+  createWatcherRemovalDeadline,
+  drainBeforeWatcherRemoval,
+  WATCHER_REMOVAL_FINAL_DRAIN_RESERVE_MS,
+  type WatcherRemovalDeadline
+} from './watcher-removal-drain'
+import { getLocalWatcherRoot } from './filesystem-watcher-paths'
+import { watcherLifecycleState } from './filesystem-watcher-lifecycle-state'
+import {
+  abandonLocalUnsubscribes,
+  clearLocalCapacityRetry,
+  trackDetachedLocalUnsubscribe
+} from './filesystem-watcher-listener-lifecycle'
+import { subscribeLocalWatcher } from './filesystem-watcher-local-subscription'
+
+export async function closeLocalWatcherForWorktreePath(
+  worktreePath: string,
+  deadline: WatcherRemovalDeadline = createWatcherRemovalDeadline()
+): Promise<void> {
+  const { key: rootKey } = getLocalWatcherRoot(worktreePath)
+  const suspended = watcherLifecycleState.suspendedLocalWatcherListeners.get(rootKey) ?? {
+    worktreePath,
+    listeners: new Map<number, WebContents>()
+  }
+  for (const source of [
+    watcherLifecycleState.pendingLocalCapacityRetries.get(rootKey)?.listeners,
+    watcherLifecycleState.inFlightLocalInstalls.get(rootKey)?.listeners,
+    watcherLifecycleState.watchedRoots.get(rootKey)?.listeners
+  ]) {
+    for (const [senderId, sender] of source ?? []) {
+      if (!sender.isDestroyed()) {
+        suspended.listeners.set(senderId, sender)
+      }
+    }
+  }
+  if (suspended.listeners.size > 0) {
+    watcherLifecycleState.suspendedLocalWatcherListeners.set(rootKey, suspended)
+  }
+  clearLocalCapacityRetry(rootKey)
+  const pendingTeardown = watcherLifecycleState.pendingTeardowns.get(rootKey)
+  if (pendingTeardown) {
+    clearTimeout(pendingTeardown)
+    watcherLifecycleState.pendingTeardowns.delete(rootKey)
+  }
+
+  const inFlight = watcherLifecycleState.inFlightLocalInstalls.get(rootKey)
+  if (inFlight) {
+    // Why: Windows locks watched directories; deletion must cancel an in-flight subscription before Git removes the tree.
+    inFlight.listeners.clear()
+    inFlight.cancelled = true
+    inFlight.abortController.abort()
+  }
+  // Why: abort alone is not enough if the native subscribe never settles; bound so delete cannot hang the app.
+  const pendingInstall = watcherLifecycleState.pendingLocalInstallPromises.get(rootKey)
+  const installDrain = await drainBeforeWatcherRemoval(
+    pendingInstall,
+    deadline,
+    `local watcher install for ${rootKey}`,
+    { reserveMs: WATCHER_REMOVAL_FINAL_DRAIN_RESERVE_MS }
+  )
+  if (installDrain === 'timeout') {
+    // Why: an abandoned install never runs its own cleanup, so leaving these entries would make every
+    // later watch of this root queue behind the same wedged promise. Identity-checked so a late settle
+    // can't evict a newer install.
+    if (watcherLifecycleState.pendingLocalInstallPromises.get(rootKey) === pendingInstall) {
+      watcherLifecycleState.pendingLocalInstallPromises.delete(rootKey)
+    }
+    if (inFlight && watcherLifecycleState.inFlightLocalInstalls.get(rootKey) === inFlight) {
+      watcherLifecycleState.inFlightLocalInstalls.delete(rootKey)
+    }
+  }
+  const pendingUnsubscribes = watcherLifecycleState.pendingLocalUnsubscribesByRoot.get(rootKey)
+  if (pendingUnsubscribes) {
+    const draining = Array.from(pendingUnsubscribes)
+    const unsubscribeDrain = await drainBeforeWatcherRemoval(
+      // Why the per-promise catch: an already-abandoned unsubscribe belongs to a delete that finished
+      // without it; re-raising its rejection here would fail a later close on stale news.
+      Promise.all(
+        draining.map((unsubscribe) =>
+          watcherLifecycleState.abandonedLocalUnsubscribes.has(unsubscribe)
+            ? unsubscribe.catch(() => undefined)
+            : unsubscribe
+        )
+      ),
+      deadline,
+      `local watcher unsubscribe for ${rootKey}`,
+      { reserveMs: WATCHER_REMOVAL_FINAL_DRAIN_RESERVE_MS }
+    )
+    if (unsubscribeDrain === 'timeout') {
+      abandonLocalUnsubscribes(draining)
+    }
+  }
+  if (watcherLifecycleState.failedLocalUnsubscribes.has(rootKey)) {
+    throw watcherLifecycleState.failedLocalUnsubscribes.get(rootKey)
+  }
+
+  const root = watcherLifecycleState.watchedRoots.get(rootKey)
+  if (!root) {
+    return
+  }
+  if (root.batch.timer) {
+    clearTimeout(root.batch.timer)
+  }
+  watcherLifecycleState.watchedRoots.delete(rootKey)
+  // Why: the in-process Parcel fallback has no unsubscribe timeout of its own, so an unbounded await
+  // here would hang delete forever and hold the removal gate. The promise stays tracked in
+  // pendingLocalUnsubscribesByRoot, so a later close still observes its failure.
+  const finalUnsubscribe = trackDetachedLocalUnsubscribe(rootKey, root)
+  const finalDrain = await drainBeforeWatcherRemoval(
+    finalUnsubscribe,
+    deadline,
+    `local watcher unsubscribe for ${rootKey}`
+  )
+  if (finalDrain === 'timeout') {
+    abandonLocalUnsubscribes([finalUnsubscribe])
+  }
+}
+
+export async function restoreLocalWatcherAfterFailedRemoval(worktreePath: string): Promise<void> {
+  const { key: rootKey } = getLocalWatcherRoot(worktreePath)
+  const suspended = watcherLifecycleState.suspendedLocalWatcherListeners.get(rootKey)
+  if (!suspended) {
+    return
+  }
+  watcherLifecycleState.suspendedLocalWatcherListeners.delete(rootKey)
+  const failures: unknown[] = []
+  const failedListeners = new Map<number, WebContents>()
+  for (const sender of suspended.listeners.values()) {
+    if (sender.isDestroyed()) {
+      continue
+    }
+    try {
+      await subscribeLocalWatcher(suspended.worktreePath, sender)
+      sender.send('fs:changed', {
+        worktreePath: suspended.worktreePath,
+        events: [{ kind: 'overflow', absolutePath: suspended.worktreePath }]
+      } satisfies FsChangedPayload)
+    } catch (error) {
+      failures.push(error)
+      failedListeners.set(sender.id, sender)
+    }
+  }
+  if (failures.length > 0) {
+    watcherLifecycleState.suspendedLocalWatcherListeners.set(rootKey, {
+      worktreePath: suspended.worktreePath,
+      listeners: failedListeners
+    })
+    throw failures[0]
+  }
+}
+
+export function forgetLocalWatcherRemovalSnapshot(worktreePath: string): void {
+  watcherLifecycleState.suspendedLocalWatcherListeners.delete(getLocalWatcherRoot(worktreePath).key)
+}
diff --git a/src/main/ipc/filesystem-watcher-local-subscription.ts b/src/main/ipc/filesystem-watcher-local-subscription.ts
new file mode 100644
index 00000000000..6d27f58f233
--- /dev/null
+++ b/src/main/ipc/filesystem-watcher-local-subscription.ts
@@ -0,0 +1,221 @@
+import type { WebContents } from 'electron'
+import { beginWatcherInstall } from './watcher-removal-gate'
+import type { LocalWatcherInstallToken } from './filesystem-watcher-lifecycle-state'
+import {
+  WATCHER_TEARDOWN_GRACE_MS,
+  watcherLifecycleState
+} from './filesystem-watcher-lifecycle-state'
+import { getLocalWatcherRoot } from './filesystem-watcher-paths'
+import {
+  addInFlightLocalInstallListener,
+  addLocalWatchListener,
+  clearLocalCapacityRetry,
+  rememberUnwatchableRoot,
+  takeLocalCapacityRetryListeners,
+  trackDetachedLocalUnsubscribe
+} from './filesystem-watcher-listener-lifecycle'
+import { scheduleLocalCapacityRetry } from './filesystem-watcher-local-capacity'
+import { installLocalWatcher } from './filesystem-watcher-local-install'
+
+// ── Subscribe / Unsubscribe ──────────────────────────────────────────
+
+export async function subscribeLocalWatcher(
+  worktreePath: string,
+  sender: WebContents,
+  generation = watcherLifecycleState.localWatcherLifecycleGeneration
+): Promise<void> {
+  if (
+    watcherLifecycleState.localWatchersClosed ||
+    generation !== watcherLifecycleState.localWatcherLifecycleGeneration
+  ) {
+    return
+  }
+  const finishInstall = beginWatcherInstall(worktreePath)
+  try {
+    await subscribeWhileRemovalAllowed(worktreePath, sender, generation)
+  } finally {
+    finishInstall()
+  }
+}
+
+async function subscribeWhileRemovalAllowed(
+  worktreePath: string,
+  sender: WebContents,
+  generation: number
+): Promise<void> {
+  if (
+    watcherLifecycleState.localWatchersClosed ||
+    generation !== watcherLifecycleState.localWatcherLifecycleGeneration
+  ) {
+    return
+  }
+  const { key: rootKey, path: rootPath } = getLocalWatcherRoot(worktreePath)
+  if (sender.isDestroyed()) {
+    return
+  }
+
+  // Don't retry roots that already failed — avoids repeated error spam.
+  if (watcherLifecycleState.unwatchableRoots.has(rootKey)) {
+    rememberUnwatchableRoot(rootKey)
+    return
+  }
+
+  const root = watcherLifecycleState.watchedRoots.get(rootKey)
+
+  // Cancel any pending grace-period teardown — a new listener arrived.
+  const pendingTeardown = watcherLifecycleState.pendingTeardowns.get(rootKey)
+  if (pendingTeardown) {
+    clearTimeout(pendingTeardown)
+    watcherLifecycleState.pendingTeardowns.delete(rootKey)
+  }
+  const capacityRetryListeners = takeLocalCapacityRetryListeners(rootKey)
+
+  if (root) {
+    for (const listener of capacityRetryListeners) {
+      addLocalWatchListener(rootKey, listener)
+    }
+    addLocalWatchListener(rootKey, sender)
+    return
+  }
+
+  const pendingInstall = watcherLifecycleState.pendingLocalInstallPromises.get(rootKey)
+  if (pendingInstall) {
+    const inFlight = watcherLifecycleState.inFlightLocalInstalls.get(rootKey)
+    const canJoinInstall = inFlight && !inFlight.abortController.signal.aborted
+    if (canJoinInstall) {
+      // Why: an unwatch may cancel an install while another renderer awaits the same root; a new live listener keeps it alive.
+      addInFlightLocalInstallListener(inFlight, sender)
+      for (const listener of capacityRetryListeners) {
+        addInFlightLocalInstallListener(inFlight, listener)
+      }
+    }
+    const result = await pendingInstall
+    if (
+      result === 'cancelled' &&
+      !canJoinInstall &&
+      !watcherLifecycleState.localWatchersClosed &&
+      generation === watcherLifecycleState.localWatcherLifecycleGeneration
+    ) {
+      // Why: AbortSignal can't be revived; listeners arriving after cancellation wait out that generation, then own a fresh install.
+      if (watcherLifecycleState.pendingLocalInstallPromises.get(rootKey) === pendingInstall) {
+        watcherLifecycleState.pendingLocalInstallPromises.delete(rootKey)
+      }
+      const retryListeners = new Map(
+        capacityRetryListeners.map((listener) => [listener.id, listener])
+      )
+      retryListeners.set(sender.id, sender)
+      for (const listener of retryListeners.values()) {
+        if (!listener.isDestroyed()) {
+          await subscribeWhileRemovalAllowed(worktreePath, listener, generation)
+        }
+      }
+      return
+    }
+    if (!inFlight) {
+      if (result === 'installed') {
+        for (const listener of capacityRetryListeners) {
+          addLocalWatchListener(rootKey, listener)
+        }
+      } else if (result === 'capacity') {
+        const retryListeners = new Map(
+          capacityRetryListeners.map((listener) => [listener.id, listener])
+        )
+        retryListeners.set(sender.id, sender)
+        scheduleLocalCapacityRetry(rootKey, worktreePath, retryListeners, subscribeLocalWatcher)
+      }
+    }
+    if (
+      result === 'installed' &&
+      watcherLifecycleState.watchedRoots.has(rootKey) &&
+      !sender.isDestroyed() &&
+      (!inFlight || inFlight.listeners.has(sender.id))
+    ) {
+      addLocalWatchListener(rootKey, sender)
+    }
+    return
+  }
+
+  const cancelToken: LocalWatcherInstallToken = {
+    cancelled: false,
+    listeners: new Map(),
+    abortController: new AbortController()
+  }
+  watcherLifecycleState.inFlightLocalInstalls.set(rootKey, cancelToken)
+  for (const listener of capacityRetryListeners) {
+    addInFlightLocalInstallListener(cancelToken, listener)
+  }
+  addInFlightLocalInstallListener(cancelToken, sender)
+  const installPromise = installLocalWatcher(
+    rootKey,
+    rootPath,
+    worktreePath,
+    cancelToken,
+    (listeners) =>
+      scheduleLocalCapacityRetry(rootKey, worktreePath, listeners, subscribeLocalWatcher)
+  )
+  watcherLifecycleState.pendingLocalInstallPromises.set(rootKey, installPromise)
+  try {
+    await installPromise
+  } finally {
+    if (watcherLifecycleState.pendingLocalInstallPromises.get(rootKey) === installPromise) {
+      watcherLifecycleState.pendingLocalInstallPromises.delete(rootKey)
+    }
+  }
+}
+
+export function unsubscribeLocalWatcher(worktreePath: string, senderId: number): void {
+  const { key: rootKey } = getLocalWatcherRoot(worktreePath)
+  const suspended = watcherLifecycleState.suspendedLocalWatcherListeners.get(rootKey)
+  suspended?.listeners.delete(senderId)
+  if (suspended?.listeners.size === 0) {
+    watcherLifecycleState.suspendedLocalWatcherListeners.delete(rootKey)
+  }
+  const capacityRetry = watcherLifecycleState.pendingLocalCapacityRetries.get(rootKey)
+  if (capacityRetry) {
+    capacityRetry.listeners.delete(senderId)
+    if (capacityRetry.listeners.size === 0) {
+      clearLocalCapacityRetry(rootKey)
+    }
+  }
+  const inFlight = watcherLifecycleState.inFlightLocalInstalls.get(rootKey)
+  if (inFlight) {
+    inFlight.listeners.delete(senderId)
+    inFlight.cancelled = inFlight.listeners.size === 0
+    // Why: last normal disconnect must abort the pending native/forked install (same early-cancel as closeLocalWatcherForWorktreePath).
+    if (inFlight.cancelled) {
+      inFlight.abortController.abort()
+    }
+  }
+
+  const root = watcherLifecycleState.watchedRoots.get(rootKey)
+  if (!root) {
+    return
+  }
+
+  root.listeners.delete(senderId)
+
+  // Defer teardown when the last subscriber leaves so rapid worktree switches reuse the native watcher.
+  if (root.listeners.size === 0) {
+    if (root.batch.timer) {
+      clearTimeout(root.batch.timer)
+    }
+
+    // Why: duplicate unwatch calls for a root would leak overwritten grace timers; keep just one.
+    if (watcherLifecycleState.pendingTeardowns.has(rootKey)) {
+      return
+    }
+
+    const teardownTimer = setTimeout(() => {
+      watcherLifecycleState.pendingTeardowns.delete(rootKey)
+      // Re-check: a new listener may have arrived during the grace period.
+      const currentRoot = watcherLifecycleState.watchedRoots.get(rootKey)
+      if (!currentRoot || currentRoot.listeners.size > 0) {
+        return
+      }
+      void trackDetachedLocalUnsubscribe(rootKey, currentRoot)
+      watcherLifecycleState.watchedRoots.delete(rootKey)
+    }, WATCHER_TEARDOWN_GRACE_MS)
+
+    watcherLifecycleState.pendingTeardowns.set(rootKey, teardownTimer)
+  }
+}
diff --git a/src/main/ipc/filesystem-watcher-paths.ts b/src/main/ipc/filesystem-watcher-paths.ts
new file mode 100644
index 00000000000..44cb2cc00e6
--- /dev/null
+++ b/src/main/ipc/filesystem-watcher-paths.ts
@@ -0,0 +1,39 @@
+import * as path from 'node:path'
+import {
+  isWindowsAbsolutePathLike,
+  normalizeRuntimePathForComparison
+} from '../../shared/cross-platform-path'
+
+// ── Path normalization ───────────────────────────────────────────────
+
+function normalizeWatcherRootPath(rootPath: string): string {
+  let resolved = isWindowsAbsolutePathLike(rootPath)
+    ? path.win32.resolve(rootPath)
+    : path.resolve(rootPath)
+  // Why: Windows watcher events may use lowercase drive letters vs stored uppercase; normalize so renderer casing stays consistent (§4.4).
+  if (/^[a-zA-Z]:/.test(resolved)) {
+    resolved = resolved.charAt(0).toUpperCase() + resolved.slice(1)
+  }
+  return resolved
+}
+
+export function getLocalWatcherRoot(rootPath: string): { key: string; path: string } {
+  const normalizedPath = normalizeWatcherRootPath(rootPath)
+  return {
+    // Why: Windows drive/UNC paths are case-insensitive; cleanup must match the owner even when Git returns a different spelling.
+    key: normalizeRuntimePathForComparison(normalizedPath),
+    path: normalizedPath
+  }
+}
+
+export function normalizeWatcherEventPath(eventPath: string): string {
+  let resolved = path.resolve(eventPath)
+  if (/^[a-zA-Z]:/.test(resolved)) {
+    resolved = resolved.charAt(0).toUpperCase() + resolved.slice(1)
+  }
+  return resolved
+}
+
+export function getRemoteWatcherKey(connectionId: string, worktreePath: string): string {
+  return JSON.stringify([connectionId, normalizeRuntimePathForComparison(worktreePath)])
+}
diff --git a/src/main/ipc/filesystem-watcher-remote-batch.test.ts b/src/main/ipc/filesystem-watcher-remote-batch.test.ts
index befc9a194e2..de1f4fb3d37 100644
--- a/src/main/ipc/filesystem-watcher-remote-batch.test.ts
+++ b/src/main/ipc/filesystem-watcher-remote-batch.test.ts
@@ -107,13 +107,10 @@ describe('remote filesystem watcher batching', () => {
     await handlers['fs:watchWorktree']({ sender }, WATCH_ARGS)
 
     watchCallbacks[0](
-      Array.from(
-        { length: 6_000 },
-        (_unused, index): FsChangeEvent => ({
-          kind: 'update',
-          absolutePath: `${WORKTREE_PATH}/file-${index}.ts`
-        })
-      )
+      Array.from({ length: 6_000 }, (_unused, index): FsChangeEvent => ({
+        kind: 'update',
+        absolutePath: `${WORKTREE_PATH}/file-${index}.ts`
+      }))
     )
     await vi.advanceTimersByTimeAsync(150)
 
diff --git a/src/main/ipc/filesystem-watcher-remote-controller.ts b/src/main/ipc/filesystem-watcher-remote-controller.ts
new file mode 100644
index 00000000000..75bc4aa75d5
--- /dev/null
+++ b/src/main/ipc/filesystem-watcher-remote-controller.ts
@@ -0,0 +1,95 @@
+import type { WebContents } from 'electron'
+import type { RemoteWatcherInstallToken } from './filesystem-watcher-lifecycle-state'
+import { watcherLifecycleState } from './filesystem-watcher-lifecycle-state'
+import {
+  installRemoteWatcherCore,
+  type RemoteWatcherTerminalErrorHandler
+} from './filesystem-watcher-remote-install'
+import { requestRemoteWatcherResync } from './filesystem-watcher-remote-resync'
+import { scheduleRemoteWatcherRetryCore } from './filesystem-watcher-remote-retry'
+import { scheduleDormantRemoteWatcherRearmCore } from './filesystem-watcher-remote-dormant'
+import { reinstallRemoteWatchersForConnectionCore } from './filesystem-watcher-remote-provider-rearm'
+
+export function installRemoteWatcher(
+  sender: WebContents,
+  connectionId: string,
+  worktreePath: string,
+  generation = watcherLifecycleState.remoteWatcherLifecycleGeneration
+) {
+  return installRemoteWatcherCore(
+    sender,
+    connectionId,
+    worktreePath,
+    handleRemoteWatcherTerminalError,
+    generation
+  )
+}
+
+export function scheduleRemoteWatcherRetry(
+  sender: WebContents,
+  connectionId: string,
+  worktreePath: string,
+  startedAt = Date.now(),
+  resyncOnInstall = false
+): void {
+  scheduleRemoteWatcherRetryCore(
+    sender,
+    connectionId,
+    worktreePath,
+    {
+      install: installRemoteWatcher,
+      requestResync: requestRemoteWatcherResync,
+      scheduleDormant: scheduleDormantRemoteWatcherRearm
+    },
+    startedAt,
+    resyncOnInstall
+  )
+}
+
+export function scheduleDormantRemoteWatcherRearm(
+  connectionId: string,
+  worktreePath: string,
+  delayMs?: number
+): void {
+  scheduleDormantRemoteWatcherRearmCore(
+    connectionId,
+    worktreePath,
+    { install: installRemoteWatcher, requestResync: requestRemoteWatcherResync },
+    delayMs
+  )
+}
+
+export function reinstallRemoteWatchersForConnection(connectionId: string): void {
+  reinstallRemoteWatchersForConnectionCore(connectionId, {
+    install: installRemoteWatcher,
+    requestResync: requestRemoteWatcherResync,
+    scheduleRetry: scheduleRemoteWatcherRetry
+  })
+}
+
+const handleRemoteWatcherTerminalError: RemoteWatcherTerminalErrorHandler = (
+  key: string,
+  connectionId: string,
+  worktreePath: string,
+  installToken: RemoteWatcherInstallToken,
+  error: Error
+): void => {
+  installToken.terminalError = error
+  const state = watcherLifecycleState.remoteWatchers.get(key)
+  if (!state || state.installToken !== installToken) {
+    return
+  }
+  watcherLifecycleState.remoteWatchers.delete(key)
+  state.batch.close()
+  if (
+    watcherLifecycleState.remoteWatchersClosed ||
+    watcherLifecycleState.suspendedRemoteWatcherListeners.has(key)
+  ) {
+    return
+  }
+  console.warn(`[filesystem-watcher] SSH watcher terminated for ${key}:`, error)
+  const startedAt = Date.now()
+  for (const listener of state.listeners.values()) {
+    scheduleRemoteWatcherRetry(listener, connectionId, worktreePath, startedAt, true)
+  }
+}
diff --git a/src/main/ipc/filesystem-watcher-remote-desired.ts b/src/main/ipc/filesystem-watcher-remote-desired.ts
new file mode 100644
index 00000000000..858e8e22027
--- /dev/null
+++ b/src/main/ipc/filesystem-watcher-remote-desired.ts
@@ -0,0 +1,29 @@
+import type { WebContents } from 'electron'
+import { watcherLifecycleState } from './filesystem-watcher-lifecycle-state'
+import { getRemoteWatcherKey } from './filesystem-watcher-paths'
+import { registerWatcherSenderCleanup } from './filesystem-watcher-listener-lifecycle'
+
+export function rememberDesiredRemoteWatcher(
+  connectionId: string,
+  worktreePath: string,
+  sender: WebContents
+): void {
+  if (sender.isDestroyed()) {
+    return
+  }
+  const key = getRemoteWatcherKey(connectionId, worktreePath)
+  const desired = watcherLifecycleState.desiredRemoteWatchers.get(key) ?? {
+    connectionId,
+    worktreePath,
+    listeners: new Map<number, WebContents>()
+  }
+  desired.listeners.set(sender.id, sender)
+  watcherLifecycleState.desiredRemoteWatchers.set(key, desired)
+  registerWatcherSenderCleanup(sender)
+}
+
+export function isCurrentDesiredRemoteWatcher(key: string, listener: WebContents): boolean {
+  return (
+    watcherLifecycleState.desiredRemoteWatchers.get(key)?.listeners.get(listener.id) === listener
+  )
+}
diff --git a/src/main/ipc/filesystem-watcher-remote-dormant.ts b/src/main/ipc/filesystem-watcher-remote-dormant.ts
new file mode 100644
index 00000000000..741753b42e5
--- /dev/null
+++ b/src/main/ipc/filesystem-watcher-remote-dormant.ts
@@ -0,0 +1,113 @@
+import { getSshFilesystemProvider } from '../providers/ssh-filesystem-dispatch'
+import { isWatcherRemovalInProgressError } from './watcher-removal-gate'
+import type {
+  InstallRemoteWatcher,
+  RequestRemoteWatcherResync
+} from './filesystem-watcher-remote-retry'
+import {
+  REMOTE_WATCH_DORMANT_RETRY_MAX_MS,
+  REMOTE_WATCH_DORMANT_RETRY_MS,
+  watcherLifecycleState
+} from './filesystem-watcher-lifecycle-state'
+import { getRemoteWatcherKey } from './filesystem-watcher-paths'
+
+type ScheduleDormantDependencies = {
+  install: InstallRemoteWatcher
+  requestResync: RequestRemoteWatcherResync
+}
+
+export function scheduleDormantRemoteWatcherRearmCore(
+  connectionId: string,
+  worktreePath: string,
+  dependencies: ScheduleDormantDependencies,
+  delayMs = REMOTE_WATCH_DORMANT_RETRY_MS
+): void {
+  const key = getRemoteWatcherKey(connectionId, worktreePath)
+  if (
+    watcherLifecycleState.remoteWatchersClosed ||
+    !watcherLifecycleState.desiredRemoteWatchers.has(key) ||
+    watcherLifecycleState.dormantRemoteWatchers.has(key)
+  ) {
+    return
+  }
+  const timer = setTimeout(() => {
+    watcherLifecycleState.dormantRemoteWatchers.delete(key)
+    void rearmDormantRemoteWatcher(key, connectionId, worktreePath, delayMs, dependencies)
+  }, delayMs)
+  // Why: a half-hour timer shouldn't be what keeps the process alive at quit.
+  timer.unref?.()
+  watcherLifecycleState.dormantRemoteWatchers.set(key, { delayMs, timer })
+}
+
+async function rearmDormantRemoteWatcher(
+  key: string,
+  connectionId: string,
+  worktreePath: string,
+  delayMs: number,
+  dependencies: ScheduleDormantDependencies
+): Promise<void> {
+  const desired = watcherLifecycleState.desiredRemoteWatchers.get(key)
+  if (watcherLifecycleState.remoteWatchersClosed || !desired) {
+    return
+  }
+  for (const [senderId, sender] of Array.from(desired.listeners)) {
+    if (sender.isDestroyed()) {
+      desired.listeners.delete(senderId)
+    }
+  }
+  if (desired.listeners.size === 0) {
+    watcherLifecycleState.desiredRemoteWatchers.delete(key)
+    return
+  }
+  // Why: a live watch or an in-flight fast retry already owns this key; installing again would
+  // clobber the entry the running watch reads its listeners from.
+  if (
+    watcherLifecycleState.remoteWatchers.has(key) ||
+    watcherLifecycleState.pendingRemoteWatcherRetries.has(key)
+  ) {
+    return
+  }
+  // Why: no provider means the connection itself is down, and its registration re-arms for free —
+  // polling would only add wire traffic to a link that is already being rebuilt.
+  if (!getSshFilesystemProvider(connectionId)) {
+    return
+  }
+
+  const listeners = Array.from(desired.listeners.values())
+  let results: Awaited<ReturnType<InstallRemoteWatcher>>[]
+  try {
+    results = await Promise.all(
+      listeners.map((listener) => dependencies.install(listener, connectionId, worktreePath))
+    )
+  } catch (error) {
+    if (isWatcherRemovalInProgressError(error)) {
+      // Why: removal owns the key now and either forgets the intent or restores the watch itself.
+      return
+    }
+    scheduleDormantRemoteWatcherRearmCore(
+      connectionId,
+      worktreePath,
+      dependencies,
+      nextDormantDelayMs(delayMs)
+    )
+    return
+  }
+  dependencies.requestResync(
+    key,
+    worktreePath,
+    listeners.filter((_, index) => results[index] === 'installed')
+  )
+  // Why: 'cancelled' means shutdown or the last listener left, so only 'unavailable' stays dormant.
+  if (results.some((result) => result === 'unavailable')) {
+    scheduleDormantRemoteWatcherRearmCore(
+      connectionId,
+      worktreePath,
+      dependencies,
+      nextDormantDelayMs(delayMs)
+    )
+  }
+}
+
+function nextDormantDelayMs(delayMs: number): number {
+  return Math.min(delayMs * 2, REMOTE_WATCH_DORMANT_RETRY_MAX_MS)
+}
diff --git a/src/main/ipc/filesystem-watcher-remote-install.ts b/src/main/ipc/filesystem-watcher-remote-install.ts
new file mode 100644
index 00000000000..c069c8dc16b
--- /dev/null
+++ b/src/main/ipc/filesystem-watcher-remote-install.ts
@@ -0,0 +1,239 @@
+import type { WebContents } from 'electron'
+import type { FsChangedPayload } from '../../shared/filesystem-entry-types'
+import {
+  WATCH_BATCH_MAX_WAIT_MS,
+  WATCH_BATCH_TRAILING_MS
+} from '../../shared/filesystem-watch-batch-window'
+import { getSshFilesystemProvider } from '../providers/ssh-filesystem-dispatch'
+import { MAX_BATCHED_WATCHER_EVENTS } from './filesystem-watcher-event-batch'
+import { createRemoteWatcherEventBatch } from './remote-watcher-event-batch'
+import { beginWatcherInstall } from './watcher-removal-gate'
+import type {
+  RemoteWatcherInstallResult,
+  RemoteWatcherInstallToken
+} from './filesystem-watcher-lifecycle-state'
+import { watcherLifecycleState } from './filesystem-watcher-lifecycle-state'
+import { getRemoteWatcherKey } from './filesystem-watcher-paths'
+import {
+  addInFlightRemoteInstallListener,
+  addRemoteWatchListener,
+  registerWatcherSenderCleanup
+} from './filesystem-watcher-listener-lifecycle'
+
+export type RemoteWatcherTerminalErrorHandler = (
+  key: string,
+  connectionId: string,
+  worktreePath: string,
+  installToken: RemoteWatcherInstallToken,
+  error: Error
+) => void
+
+export async function installRemoteWatcherCore(
+  sender: WebContents,
+  connectionId: string,
+  worktreePath: string,
+  onTerminalError: RemoteWatcherTerminalErrorHandler,
+  generation = watcherLifecycleState.remoteWatcherLifecycleGeneration
+): Promise<RemoteWatcherInstallResult> {
+  // Why: refuse installs racing in after teardown (or a waiter from an earlier lifecycle) so provider.watch() isn't called post-shutdown.
+  if (
+    watcherLifecycleState.remoteWatchersClosed ||
+    generation !== watcherLifecycleState.remoteWatcherLifecycleGeneration
+  ) {
+    return 'cancelled'
+  }
+  const finishInstall = beginWatcherInstall(worktreePath, connectionId)
+  try {
+    return await installRemoteWatcherWhileRemovalAllowed(
+      sender,
+      connectionId,
+      worktreePath,
+      onTerminalError,
+      generation
+    )
+  } finally {
+    finishInstall()
+  }
+}
+
+async function installRemoteWatcherWhileRemovalAllowed(
+  sender: WebContents,
+  connectionId: string,
+  worktreePath: string,
+  onTerminalError: RemoteWatcherTerminalErrorHandler,
+  generation: number
+): Promise<RemoteWatcherInstallResult> {
+  const provider = getSshFilesystemProvider(connectionId)
+  if (!provider || sender.isDestroyed()) {
+    return 'unavailable'
+  }
+
+  const key = getRemoteWatcherKey(connectionId, worktreePath)
+  const existing = watcherLifecycleState.remoteWatchers.get(key)
+  if (existing) {
+    addRemoteWatchListener(key, sender)
+    return 'installed'
+  }
+  // Why: concurrent same-key watches must share the first provider.watch(); separate watchers would clobber per-key state and drop the unwatch handle.
+  const pendingInstall = watcherLifecycleState.pendingRemoteInstallPromises.get(key)
+  if (pendingInstall) {
+    const inFlight = watcherLifecycleState.inFlightRemoteInstalls.get(key)
+    const canJoinInstall = inFlight && !inFlight.abortController.signal.aborted
+    if (canJoinInstall) {
+      // Why: a new watcher joining before provider.watch() resolves should revive the install instead of inheriting the stale cancellation.
+      addInFlightRemoteInstallListener(inFlight, sender)
+    }
+    const result = await pendingInstall
+    if (
+      result === 'installed' &&
+      watcherLifecycleState.remoteWatchers.has(key) &&
+      !sender.isDestroyed() &&
+      (!inFlight || inFlight.listeners.has(sender.id))
+    ) {
+      addRemoteWatchListener(key, sender)
+    }
+    if (
+      result === 'cancelled' &&
+      !canJoinInstall &&
+      !sender.isDestroyed() &&
+      generation === watcherLifecycleState.remoteWatcherLifecycleGeneration
+    ) {
+      // Why: AbortSignal can't be revived; a listener arriving after cancellation waits out that generation, then owns a fresh install.
+      if (watcherLifecycleState.pendingRemoteInstallPromises.get(key) === pendingInstall) {
+        watcherLifecycleState.pendingRemoteInstallPromises.delete(key)
+      }
+      return installRemoteWatcherCore(
+        sender,
+        connectionId,
+        worktreePath,
+        onTerminalError,
+        generation
+      )
+    }
+    return result
+  }
+  const cancelToken: RemoteWatcherInstallToken = {
+    cancelled: false,
+    listeners: new Map(),
+    abortController: new AbortController(),
+    abortScheduled: false
+  }
+  watcherLifecycleState.inFlightRemoteInstalls.set(key, cancelToken)
+  addInFlightRemoteInstallListener(cancelToken, sender)
+  const installPromise = doInstallRemoteWatcher(
+    provider,
+    key,
+    connectionId,
+    worktreePath,
+    cancelToken,
+    onTerminalError
+  )
+  watcherLifecycleState.pendingRemoteInstallPromises.set(key, installPromise)
+  try {
+    return await installPromise
+  } finally {
+    if (watcherLifecycleState.pendingRemoteInstallPromises.get(key) === installPromise) {
+      watcherLifecycleState.pendingRemoteInstallPromises.delete(key)
+    }
+  }
+}
+
+async function doInstallRemoteWatcher(
+  provider: NonNullable<ReturnType<typeof getSshFilesystemProvider>>,
+  key: string,
+  connectionId: string,
+  worktreePath: string,
+  cancelToken: RemoteWatcherInstallToken,
+  onTerminalError: RemoteWatcherTerminalErrorHandler
+): Promise<RemoteWatcherInstallResult> {
+  let unwatch: () => void
+  // Why: the abandon paths below close the batch directly; once it is stored on the remoteWatchers
+  // entry, every later teardown closes it through that handle. deliver's state/installToken guard
+  // still covers a flush that races a close.
+  const batch = createRemoteWatcherEventBatch({
+    rootPath: worktreePath,
+    trailingMs: WATCH_BATCH_TRAILING_MS,
+    maxWaitMs: WATCH_BATCH_MAX_WAIT_MS,
+    maxEvents: MAX_BATCHED_WATCHER_EVENTS,
+    deliver: (events) => {
+      const state = watcherLifecycleState.remoteWatchers.get(key)
+      // Why: buffering defers delivery past install, so a bare non-null check would let a stale flush
+      // land on a different install generation.
+      if (!state || state.installToken !== cancelToken) {
+        return
+      }
+      for (const listener of state.listeners.values()) {
+        if (listener.isDestroyed()) {
+          continue
+        }
+        try {
+          listener.send('fs:changed', {
+            worktreePath,
+            events
+          } satisfies FsChangedPayload)
+        } catch (err) {
+          // Why: batching moved this send out of the SSH mux's notification try/catch into a bare
+          // timer, so a frame disposed mid-window would escape as a fatal main-process exception.
+          console.warn(
+            `[filesystem-watch] failed to deliver remote fs:changed for ${worktreePath}: ${
+              err instanceof Error ? err.message : String(err)
+            }`
+          )
+        }
+      }
+    }
+  })
+  try {
+    unwatch = await provider.watch(
+      worktreePath,
+      (events) => {
+        batch.push(events)
+      },
+      {
+        signal: cancelToken.abortController.signal,
+        onTerminalError: (error) =>
+          onTerminalError(key, connectionId, worktreePath, cancelToken, error)
+      }
+    )
+  } catch (err) {
+    // Why: the provider can fire its callback before rejecting (an aborted reinstall), so this
+    // abandon path owes the same close as the two below — nothing else holds the batch.
+    batch.close()
+    if (cancelToken.cancelled || cancelToken.abortController.signal.aborted) {
+      return 'cancelled'
+    }
+    console.warn(`[filesystem-watcher] SSH watcher unavailable for ${key}:`, err)
+    return 'unavailable'
+  } finally {
+    if (watcherLifecycleState.inFlightRemoteInstalls.get(key) === cancelToken) {
+      watcherLifecycleState.inFlightRemoteInstalls.delete(key)
+    }
+  }
+  const liveListeners = new Map(
+    Array.from(cancelToken.listeners.entries()).filter(([, listener]) => !listener.isDestroyed())
+  )
+  if (cancelToken.cancelled || liveListeners.size === 0) {
+    batch.close()
+    try {
+      unwatch()
+    } catch (err) {
+      console.error(`[filesystem-watcher] remote unwatch (post-cancel) error for ${key}:`, err)
+    }
+    return 'cancelled'
+  }
+  if (cancelToken.terminalError) {
+    batch.close()
+    return 'unavailable'
+  }
+  watcherLifecycleState.remoteWatchers.set(key, {
+    unwatch,
+    listeners: liveListeners,
+    installToken: cancelToken,
+    batch
+  })
+  for (const listener of liveListeners.values()) {
+    registerWatcherSenderCleanup(listener)
+  }
+  watcherLifecycleState.loggedUnavailableRemoteWatchers.delete(key)
+  return 'installed'
+}
diff --git a/src/main/ipc/filesystem-watcher-remote-provider-rearm.ts b/src/main/ipc/filesystem-watcher-remote-provider-rearm.ts
new file mode 100644
index 00000000000..6b0ea28ef9b
--- /dev/null
+++ b/src/main/ipc/filesystem-watcher-remote-provider-rearm.ts
@@ -0,0 +1,120 @@
+import type { WebContents } from 'electron'
+import { isWatcherRemovalInProgressError } from './watcher-removal-gate'
+import type {
+  InstallRemoteWatcher,
+  RequestRemoteWatcherResync
+} from './filesystem-watcher-remote-retry'
+import { watcherLifecycleState } from './filesystem-watcher-lifecycle-state'
+import { clearDormantRemoteWatcher } from './filesystem-watcher-listener-lifecycle'
+
+type ScheduleRemoteWatcherRetry = (
+  sender: WebContents,
+  connectionId: string,
+  worktreePath: string,
+  startedAt?: number,
+  resyncOnInstall?: boolean
+) => void
+
+/**
+ * Rebuild remote watches for a connection whose filesystem provider was just (re)registered.
+ *
+ * Why: the relay's watch registrations die with the transport they were made on, and the previous
+ * provider's unwatch handle is scoped to that dead transport. Reinstalling is the only way the
+ * subscription comes back, and consumers get an overflow so they resync whatever changed while the
+ * watch was down.
+ */
+export function reinstallRemoteWatchersForConnectionCore(
+  connectionId: string,
+  dependencies: {
+    install: InstallRemoteWatcher
+    requestResync: RequestRemoteWatcherResync
+    scheduleRetry: ScheduleRemoteWatcherRetry
+  }
+): void {
+  if (watcherLifecycleState.remoteWatchersClosed) {
+    return
+  }
+  for (const [key, desired] of Array.from(watcherLifecycleState.desiredRemoteWatchers)) {
+    if (desired.connectionId !== connectionId) {
+      continue
+    }
+    for (const [senderId, sender] of Array.from(desired.listeners)) {
+      if (sender.isDestroyed()) {
+        desired.listeners.delete(senderId)
+      }
+    }
+    if (desired.listeners.size === 0) {
+      watcherLifecycleState.desiredRemoteWatchers.delete(key)
+      continue
+    }
+
+    // Why: drop the entry the dead transport left behind first — installRemoteWatcher treats an
+    // existing entry as already-installed and would hand back a watcher that can never fire again.
+    const stale = watcherLifecycleState.remoteWatchers.get(key)
+    if (stale) {
+      watcherLifecycleState.remoteWatchers.delete(key)
+      stale.batch.close()
+      try {
+        stale.unwatch()
+      } catch {
+        // Why: the handle belongs to the replaced transport; failing to close it is expected.
+      }
+    }
+    const retryTimer = watcherLifecycleState.pendingRemoteWatcherRetries.get(key)
+    if (retryTimer) {
+      clearTimeout(retryTimer)
+      watcherLifecycleState.pendingRemoteWatcherRetries.delete(key)
+      watcherLifecycleState.pendingRemoteWatcherRetryListeners.delete(key)
+    }
+    // Why: a pending watch belongs to the replaced transport; joiners must retry on the new provider.
+    const inFlight = watcherLifecycleState.inFlightRemoteInstalls.get(key)
+    if (inFlight) {
+      inFlight.listeners.clear()
+      inFlight.cancelled = true
+      inFlight.abortController.abort()
+    }
+    // Why: this reinstall supersedes the pending backoff; leaving it armed double-installs the key.
+    clearDormantRemoteWatcher(key)
+    watcherLifecycleState.loggedUnavailableRemoteWatchers.delete(key)
+
+    const listeners = Array.from(desired.listeners.values())
+    void Promise.all(
+      listeners.map((listener) =>
+        dependencies.install(listener, desired.connectionId, desired.worktreePath)
+      )
+    )
+      .then((results) => {
+        // Why: events between the transport dropping and this reinstall are gone for good.
+        dependencies.requestResync(
+          key,
+          desired.worktreePath,
+          listeners.filter((_, index) => results[index] === 'installed')
+        )
+        if (results.some((result) => result === 'unavailable')) {
+          for (const listener of listeners) {
+            dependencies.scheduleRetry(
+              listener,
+              desired.connectionId,
+              desired.worktreePath,
+              Date.now(),
+              true
+            )
+          }
+        }
+      })
+      .catch((error: unknown) => {
+        if (isWatcherRemovalInProgressError(error)) {
+          return
+        }
+        for (const listener of listeners) {
+          dependencies.scheduleRetry(
+            listener,
+            desired.connectionId,
+            desired.worktreePath,
+            Date.now(),
+            true
+          )
+        }
+      })
+  }
+}
diff --git a/src/main/ipc/filesystem-watcher-remote-removal.ts b/src/main/ipc/filesystem-watcher-remote-removal.ts
new file mode 100644
index 00000000000..61424dc1db9
--- /dev/null
+++ b/src/main/ipc/filesystem-watcher-remote-removal.ts
@@ -0,0 +1,105 @@
+import type { WebContents } from 'electron'
+import type { FsChangedPayload } from '../../shared/filesystem-entry-types'
+import { getSshFilesystemProvider } from '../providers/ssh-filesystem-dispatch'
+import { watcherLifecycleState } from './filesystem-watcher-lifecycle-state'
+import { getRemoteWatcherKey } from './filesystem-watcher-paths'
+import {
+  clearDormantRemoteWatcher,
+  clearRemoteWatcherResync
+} from './filesystem-watcher-listener-lifecycle'
+import {
+  installRemoteWatcher,
+  scheduleRemoteWatcherRetry
+} from './filesystem-watcher-remote-controller'
+
+export async function closeRemoteWatcherForWorktreePath(
+  connectionId: string,
+  worktreePath: string
+): Promise<void> {
+  const key = getRemoteWatcherKey(connectionId, worktreePath)
+  const suspended = watcherLifecycleState.suspendedRemoteWatcherListeners.get(key) ?? {
+    connectionId,
+    worktreePath,
+    listeners: new Map<number, WebContents>()
+  }
+  for (const source of [
+    watcherLifecycleState.pendingRemoteWatcherRetryListeners.get(key)?.listeners,
+    watcherLifecycleState.inFlightRemoteInstalls.get(key)?.listeners,
+    watcherLifecycleState.remoteWatchers.get(key)?.listeners
+  ]) {
+    for (const [senderId, sender] of source ?? []) {
+      if (!sender.isDestroyed()) {
+        suspended.listeners.set(senderId, sender)
+      }
+    }
+  }
+  if (suspended.listeners.size > 0) {
+    watcherLifecycleState.suspendedRemoteWatcherListeners.set(key, suspended)
+  }
+  clearRemoteWatcherResync(key)
+  const retryTimer = watcherLifecycleState.pendingRemoteWatcherRetries.get(key)
+  if (retryTimer) {
+    clearTimeout(retryTimer)
+    watcherLifecycleState.pendingRemoteWatcherRetries.delete(key)
+    watcherLifecycleState.pendingRemoteWatcherRetryListeners.delete(key)
+  }
+  // Why: removal is deliberate — a backoff firing mid-removal would re-watch the path being deleted.
+  clearDormantRemoteWatcher(key)
+  const inFlight = watcherLifecycleState.inFlightRemoteInstalls.get(key)
+  if (inFlight) {
+    inFlight.listeners.clear()
+    inFlight.cancelled = true
+  }
+  const state = watcherLifecycleState.remoteWatchers.get(key)
+  const provider = getSshFilesystemProvider(connectionId)
+  await (provider?.closeWatch
+    ? provider.closeWatch(worktreePath)
+    : Promise.resolve(state?.unwatch()))
+  state?.batch.close()
+  watcherLifecycleState.remoteWatchers.delete(key)
+  watcherLifecycleState.loggedUnavailableRemoteWatchers.delete(key)
+}
+
+export async function restoreRemoteWatcherAfterFailedRemoval(
+  connectionId: string,
+  worktreePath: string
+): Promise<void> {
+  const key = getRemoteWatcherKey(connectionId, worktreePath)
+  const suspended = watcherLifecycleState.suspendedRemoteWatcherListeners.get(key)
+  if (!suspended) {
+    return
+  }
+  watcherLifecycleState.suspendedRemoteWatcherListeners.delete(key)
+  for (const sender of suspended.listeners.values()) {
+    if (sender.isDestroyed()) {
+      continue
+    }
+    const result = await installRemoteWatcher(sender, connectionId, worktreePath)
+    if (result === 'unavailable') {
+      scheduleRemoteWatcherRetry(sender, connectionId, worktreePath)
+    }
+    sender.send('fs:changed', {
+      worktreePath,
+      events: [{ kind: 'overflow', absolutePath: worktreePath }]
+    } satisfies FsChangedPayload)
+  }
+}
+
+export function forgetRemoteWatcherRemovalSnapshot(
+  connectionId: string,
+  worktreePath: string
+): void {
+  const key = getRemoteWatcherKey(connectionId, worktreePath)
+  watcherLifecycleState.suspendedRemoteWatcherListeners.delete(key)
+  clearRemoteWatcherResync(key)
+  const retryTimer = watcherLifecycleState.pendingRemoteWatcherRetries.get(key)
+  if (retryTimer) {
+    clearTimeout(retryTimer)
+    watcherLifecycleState.pendingRemoteWatcherRetries.delete(key)
+  }
+  watcherLifecycleState.pendingRemoteWatcherRetryListeners.delete(key)
+  // Why: the worktree is gone — keeping the intent lets a reconnect landing before the renderer's
+  // unwatch re-watch a deleted path (60s of retries against the host, then a bogus overflow).
+  watcherLifecycleState.desiredRemoteWatchers.delete(key)
+  clearDormantRemoteWatcher(key)
+}
diff --git a/src/main/ipc/filesystem-watcher-remote-resync.ts b/src/main/ipc/filesystem-watcher-remote-resync.ts
new file mode 100644
index 00000000000..918b16e6795
--- /dev/null
+++ b/src/main/ipc/filesystem-watcher-remote-resync.ts
@@ -0,0 +1,77 @@
+import type { WebContents } from 'electron'
+import type { FsChangedPayload } from '../../shared/filesystem-entry-types'
+import {
+  REMOTE_WATCH_RESYNC_COALESCE_MS,
+  watcherLifecycleState
+} from './filesystem-watcher-lifecycle-state'
+import { isCurrentDesiredRemoteWatcher } from './filesystem-watcher-remote-desired'
+
+function flushRemoteWatcherResync(key: string): void {
+  const state = watcherLifecycleState.remoteWatcherResyncStates.get(key)
+  if (!state) {
+    return
+  }
+  state.timer = undefined
+  if (
+    watcherLifecycleState.remoteWatchersClosed ||
+    watcherLifecycleState.suspendedRemoteWatcherListeners.has(key) ||
+    !watcherLifecycleState.remoteWatchers.has(key)
+  ) {
+    if (!watcherLifecycleState.desiredRemoteWatchers.has(key)) {
+      watcherLifecycleState.remoteWatcherResyncStates.delete(key)
+    }
+    return
+  }
+  let sent = false
+  for (const listener of state.listeners.values()) {
+    if (listener.isDestroyed() || !isCurrentDesiredRemoteWatcher(key, listener)) {
+      continue
+    }
+    try {
+      listener.send('fs:changed', {
+        worktreePath: state.worktreePath,
+        events: [{ kind: 'overflow', absolutePath: state.worktreePath }]
+      } satisfies FsChangedPayload)
+      sent = true
+    } catch (error) {
+      console.warn(`[filesystem-watcher] failed to send SSH watcher resync for ${key}:`, error)
+    }
+  }
+  state.listeners.clear()
+  if (sent) {
+    state.lastSentAt = Date.now()
+  } else {
+    watcherLifecycleState.remoteWatcherResyncStates.delete(key)
+  }
+}
+
+export function requestRemoteWatcherResync(
+  key: string,
+  worktreePath: string,
+  listeners: Iterable<WebContents>
+): void {
+  const state = watcherLifecycleState.remoteWatcherResyncStates.get(key) ?? {
+    lastSentAt: Number.NEGATIVE_INFINITY,
+    listeners: new Map<number, WebContents>(),
+    worktreePath
+  }
+  state.worktreePath = worktreePath
+  for (const listener of listeners) {
+    if (!listener.isDestroyed() && isCurrentDesiredRemoteWatcher(key, listener)) {
+      state.listeners.set(listener.id, listener)
+    }
+  }
+  if (state.listeners.size === 0) {
+    return
+  }
+  watcherLifecycleState.remoteWatcherResyncStates.set(key, state)
+  const delayMs = Math.max(0, state.lastSentAt + REMOTE_WATCH_RESYNC_COALESCE_MS - Date.now())
+  if (delayMs === 0) {
+    flushRemoteWatcherResync(key)
+    return
+  }
+  if (!state.timer) {
+    state.timer = setTimeout(() => flushRemoteWatcherResync(key), delayMs)
+    state.timer.unref?.()
+  }
+}
diff --git a/src/main/ipc/filesystem-watcher-remote-retry.ts b/src/main/ipc/filesystem-watcher-remote-retry.ts
new file mode 100644
index 00000000000..0151ecf4419
--- /dev/null
+++ b/src/main/ipc/filesystem-watcher-remote-retry.ts
@@ -0,0 +1,134 @@
+import type { WebContents } from 'electron'
+import type { FsChangedPayload } from '../../shared/filesystem-entry-types'
+import { isWatcherRemovalInProgressError } from './watcher-removal-gate'
+import type { RemoteWatcherInstallResult } from './filesystem-watcher-lifecycle-state'
+import {
+  REMOTE_WATCH_RETRY_MS,
+  REMOTE_WATCH_RETRY_TIMEOUT_MS,
+  watcherLifecycleState
+} from './filesystem-watcher-lifecycle-state'
+import { getRemoteWatcherKey } from './filesystem-watcher-paths'
+import { clearRemoteWatcherResync } from './filesystem-watcher-listener-lifecycle'
+import { isCurrentDesiredRemoteWatcher } from './filesystem-watcher-remote-desired'
+
+export type InstallRemoteWatcher = (
+  sender: WebContents,
+  connectionId: string,
+  worktreePath: string
+) => Promise<RemoteWatcherInstallResult>
+
+export type RequestRemoteWatcherResync = (
+  key: string,
+  worktreePath: string,
+  listeners: Iterable<WebContents>
+) => void
+
+type ScheduleDormantRemoteWatcher = (
+  connectionId: string,
+  worktreePath: string,
+  delayMs?: number
+) => void
+
+export function scheduleRemoteWatcherRetryCore(
+  sender: WebContents,
+  connectionId: string,
+  worktreePath: string,
+  dependencies: {
+    install: InstallRemoteWatcher
+    requestResync: RequestRemoteWatcherResync
+    scheduleDormant: ScheduleDormantRemoteWatcher
+  },
+  startedAt = Date.now(),
+  // Why: a retry that replaces a watch which was already live owes the renderer an overflow once it
+  // lands — the events lost while it was down are otherwise never signalled.
+  resyncOnInstall = false
+): void {
+  const key = getRemoteWatcherKey(connectionId, worktreePath)
+  const existingRetry = watcherLifecycleState.pendingRemoteWatcherRetryListeners.get(key)
+  if (existingRetry) {
+    if (!sender.isDestroyed()) {
+      existingRetry.listeners.set(sender.id, sender)
+    }
+    existingRetry.resyncOnInstall ||= resyncOnInstall
+    return
+  }
+
+  const retry = {
+    listeners: new Map(sender.isDestroyed() ? [] : [[sender.id, sender]]),
+    startedAt,
+    resyncOnInstall
+  }
+  watcherLifecycleState.pendingRemoteWatcherRetryListeners.set(key, retry)
+
+  if (Date.now() - startedAt >= REMOTE_WATCH_RETRY_TIMEOUT_MS || sender.isDestroyed()) {
+    watcherLifecycleState.pendingRemoteWatcherRetries.delete(key)
+    watcherLifecycleState.pendingRemoteWatcherRetryListeners.delete(key)
+    watcherLifecycleState.loggedUnavailableRemoteWatchers.delete(key)
+    clearRemoteWatcherResync(key)
+    // Why: handler already resolved so the renderer thinks the watch is live; emit overflow to force a manual refresh instead of waiting forever.
+    for (const listener of retry.listeners.values()) {
+      if (listener.isDestroyed() || !isCurrentDesiredRemoteWatcher(key, listener)) {
+        continue
+      }
+      console.warn(
+        `[filesystem-watcher] giving up SSH watch retry for ${worktreePath} on connection ${connectionId} after ${REMOTE_WATCH_RETRY_TIMEOUT_MS}ms`
+      )
+      listener.send('fs:changed', {
+        worktreePath,
+        events: [{ kind: 'overflow', absolutePath: worktreePath }]
+      } satisfies FsChangedPayload)
+    }
+    // Why: overflow only refreshes once — without this the watch stays dead until the app restarts.
+    dependencies.scheduleDormant(connectionId, worktreePath)
+    return
+  }
+
+  const retryTimer = setTimeout(() => {
+    watcherLifecycleState.pendingRemoteWatcherRetries.delete(key)
+    watcherLifecycleState.pendingRemoteWatcherRetryListeners.delete(key)
+    const listeners = Array.from(retry.listeners.values()).filter(
+      (listener) => !listener.isDestroyed() && isCurrentDesiredRemoteWatcher(key, listener)
+    )
+    void Promise.all(
+      listeners.map((listener) => dependencies.install(listener, connectionId, worktreePath))
+    )
+      .then((results) => {
+        if (retry.resyncOnInstall) {
+          dependencies.requestResync(
+            key,
+            worktreePath,
+            listeners.filter((_, index) => results[index] === 'installed')
+          )
+        }
+        // Why: don't re-arm on 'cancelled' (renderer stopped watching) — it would fire a stale overflow when the 60s window expires.
+        if (results.some((result) => result === 'unavailable')) {
+          for (const listener of listeners) {
+            scheduleRemoteWatcherRetryCore(
+              listener,
+              connectionId,
+              worktreePath,
+              dependencies,
+              retry.startedAt,
+              retry.resyncOnInstall
+            )
+          }
+        }
+      })
+      .catch((error: unknown) => {
+        if (isWatcherRemovalInProgressError(error)) {
+          return
+        }
+        for (const listener of listeners) {
+          scheduleRemoteWatcherRetryCore(
+            listener,
+            connectionId,
+            worktreePath,
+            dependencies,
+            retry.startedAt,
+            retry.resyncOnInstall
+          )
+        }
+      })
+  }, REMOTE_WATCH_RETRY_MS)
+  watcherLifecycleState.pendingRemoteWatcherRetries.set(key, retryTimer)
+}
diff --git a/src/main/ipc/filesystem-watcher-shutdown.ts b/src/main/ipc/filesystem-watcher-shutdown.ts
new file mode 100644
index 00000000000..96018b57512
--- /dev/null
+++ b/src/main/ipc/filesystem-watcher-shutdown.ts
@@ -0,0 +1,81 @@
+import { disposeWatcherProcess } from './parcel-watcher-process'
+import { watcherLifecycleState } from './filesystem-watcher-lifecycle-state'
+import { trackDetachedLocalUnsubscribe } from './filesystem-watcher-listener-lifecycle'
+
+/** Tear down all watchers on app shutdown. */
+export async function closeAllWatchers(): Promise<void> {
+  // Why: drop the intent with the rest of the state, but keep the provider-registration
+  // subscription — a new fs:watchWorktree reopens the subsystem and still needs the re-arm hook.
+  watcherLifecycleState.desiredRemoteWatchers.clear()
+  watcherLifecycleState.senderCleanupRegistered.clear()
+  watcherLifecycleState.unwatchableRoots.clear()
+  watcherLifecycleState.suspendedLocalWatcherListeners.clear()
+  watcherLifecycleState.suspendedRemoteWatcherListeners.clear()
+  for (const retry of watcherLifecycleState.pendingLocalCapacityRetries.values()) {
+    retry.cancelWait()
+  }
+  watcherLifecycleState.pendingLocalCapacityRetries.clear()
+
+  // Cancel any pending grace-period teardowns — we're tearing down everything.
+  for (const timer of watcherLifecycleState.pendingTeardowns.values()) {
+    clearTimeout(timer)
+  }
+  watcherLifecycleState.pendingTeardowns.clear()
+
+  for (const timer of watcherLifecycleState.pendingRemoteWatcherRetries.values()) {
+    clearTimeout(timer)
+  }
+  watcherLifecycleState.pendingRemoteWatcherRetries.clear()
+  watcherLifecycleState.pendingRemoteWatcherRetryListeners.clear()
+  for (const state of watcherLifecycleState.remoteWatcherResyncStates.values()) {
+    if (state.timer) {
+      clearTimeout(state.timer)
+    }
+  }
+  watcherLifecycleState.remoteWatcherResyncStates.clear()
+  for (const dormant of watcherLifecycleState.dormantRemoteWatchers.values()) {
+    clearTimeout(dormant.timer)
+  }
+  watcherLifecycleState.dormantRemoteWatchers.clear()
+  watcherLifecycleState.loggedUnavailableRemoteWatchers.clear()
+  // Why: latch both subsystems shut so late installs can't register; generation bumps reject older-lifecycle waiters.
+  watcherLifecycleState.remoteWatchersClosed = true
+  watcherLifecycleState.remoteWatcherLifecycleGeneration += 1
+  watcherLifecycleState.localWatchersClosed = true
+  watcherLifecycleState.localWatcherLifecycleGeneration += 1
+  watcherLifecycleState.pendingRemoteInstallPromises.clear()
+  // Why: cancel in-flight provider.watch() calls so their resolved unwatch handles aren't installed post-shutdown.
+  for (const token of watcherLifecycleState.inFlightRemoteInstalls.values()) {
+    token.listeners.clear()
+    token.cancelled = true
+    token.abortController.abort()
+  }
+  for (const token of watcherLifecycleState.inFlightLocalInstalls.values()) {
+    token.listeners.clear()
+    token.cancelled = true
+    token.abortController.abort()
+  }
+
+  for (const [rootKey, root] of watcherLifecycleState.watchedRoots) {
+    if (root.batch.timer) {
+      clearTimeout(root.batch.timer)
+    }
+    await trackDetachedLocalUnsubscribe(rootKey, root).catch(() => undefined)
+  }
+  watcherLifecycleState.watchedRoots.clear()
+  await Promise.allSettled(Array.from(watcherLifecycleState.pendingLocalUnsubscribes))
+  watcherLifecycleState.failedLocalUnsubscribes.clear()
+  // Why: kill the forked watcher process instead of watcher.node's crash-prone async teardown; process death frees native handles.
+  disposeWatcherProcess()
+
+  // Why: remote watchers are separate from local @parcel/watcher subs; unwatch here or the relay keeps polling FS after shutdown.
+  for (const [key, state] of watcherLifecycleState.remoteWatchers) {
+    state.batch.close()
+    try {
+      state.unwatch()
+    } catch (err) {
+      console.error(`[filesystem-watcher] remote unwatch error for ${key}:`, err)
+    }
+  }
+  watcherLifecycleState.remoteWatchers.clear()
+}
diff --git a/src/main/ipc/filesystem-watcher.ts b/src/main/ipc/filesystem-watcher.ts
index 71830efc7c2..9680227cbc1 100644
--- a/src/main/ipc/filesystem-watcher.ts
+++ b/src/main/ipc/filesystem-watcher.ts
@@ -1,1966 +1,26 @@
-/* eslint-disable max-lines -- Why: one module keeps native (@parcel/watcher), WSL-snapshot, and SSH watcher lifecycle invariants and shared debounce/coalesce helpers auditable in one file. */
-import { ipcMain, type WebContents } from 'electron'
-import * as path from 'node:path'
-import { stat } from 'node:fs/promises'
-import type { Event as WatcherEvent } from '@parcel/watcher'
-import type { FsChangeEvent, FsChangedPayload } from '../../shared/filesystem-entry-types'
-import {
-  isWindowsAbsolutePathLike,
-  normalizeRuntimePathForComparison
-} from '../../shared/cross-platform-path'
-import { isWslPath } from '../wsl'
-import { createWslWatcher } from './filesystem-watcher-wsl'
-import type { WatchedRoot } from './filesystem-watcher-wsl'
-import {
-  getSshFilesystemProvider,
-  onSshFilesystemProviderRegistered
-} from '../providers/ssh-filesystem-dispatch'
-import { MAX_BATCHED_WATCHER_EVENTS, queueWatcherEvents } from './filesystem-watcher-event-batch'
-import {
-  createRemoteWatcherEventBatch,
-  type RemoteWatcherEventBatch
-} from './remote-watcher-event-batch'
-import {
-  WATCH_BATCH_MAX_WAIT_MS,
-  WATCH_BATCH_TRAILING_MS
-} from '../../shared/filesystem-watch-batch-window'
-import { disposeWatcherProcess, subscribeViaWatcherProcess } from './parcel-watcher-process'
-import { isWatcherProcessFailure } from './parcel-watcher-process-failure'
-import {
-  onWatcherChildCapacityAvailable,
-  WatcherChildCapacityError
-} from './parcel-watcher-child-registry'
-import { beginWatcherInstall, isWatcherRemovalInProgressError } from './watcher-removal-gate'
-import {
-  createWatcherRemovalDeadline,
-  drainBeforeWatcherRemoval,
-  WATCHER_REMOVAL_FINAL_DRAIN_RESERVE_MS,
-  type WatcherRemovalDeadline
-} from './watcher-removal-drain'
-// Why: suppress high-churn dirs at the watcher level (separate from the File Explorer display filter, which only hides rows).
-import { WATCHER_IGNORE_DIRS, buildParcelWatcherIgnoreOptions } from './filesystem-watcher-ignore'
 import type { WorktreeWatcherRemoval } from './worktree-watcher-removal'
-
-// ── Per-root watcher state ───────────────────────────────────────────
-// WatchedRoot/WatcherSubscription live in filesystem-watcher-wsl.ts so native and WSL watchers share one shape.
-
-// ── Module state ─────────────────────────────────────────────────────
-
-const watchedRoots = new Map<string, WatchedRoot>()
-
-// Why: cache roots that failed watcher creation (e.g. WSL UNC paths) so we don't retry every worktree switch and spam the console with errors.
-const UNWATCHABLE_ROOT_CACHE_MAX = 256
-const unwatchableRoots = new Set<string>()
-
-function rememberUnwatchableRoot(rootKey: string): void {
-  // Why: deleted worktrees churn through unique paths; cap the set so retry suppression stays useful without retaining every failed path.
-  unwatchableRoots.delete(rootKey)
-  unwatchableRoots.add(rootKey)
-  while (unwatchableRoots.size > UNWATCHABLE_ROOT_CACHE_MAX) {
-    const oldest = unwatchableRoots.keys().next().value
-    if (oldest === undefined) {
-      break
-    }
-    unwatchableRoots.delete(oldest)
-  }
-}
-
-// Why: key cleanup by sender WebContents (not per root) to avoid MaxListeners warnings when a workspace has many worktrees open.
-const senderCleanupRegistered = new Set<number>()
-
-// Why: recreating @parcel/watcher on Windows is expensive (ReadDirectoryChangesW + AV, 500ms+); a 30s grace lets rapid switches reuse the watcher.
-const WATCHER_TEARDOWN_GRACE_MS = 30_000
-const pendingTeardowns = new Map<string, ReturnType<typeof setTimeout>>()
-// Why: @parcel/watcher unsubscribe does native async work that sender-destroy can start before shutdown, so will-quit must still await it.
-const pendingLocalUnsubscribes = new Set<Promise<void>>()
-const pendingLocalUnsubscribesByRoot = new Map<string, Set<Promise<void>>>()
-const suspendedLocalWatcherListeners = new Map<
-  string,
-  { worktreePath: string; listeners: Map<number, WebContents> }
->()
-// Why: an install cancelled by shutdown can't be revived by a waiter that resumes after a later call reopens the subsystem.
-let localWatchersClosed = false
-let localWatcherLifecycleGeneration = 0
-const failedLocalUnsubscribes = new Map<string, unknown>()
-// Why: a drain that timed out no longer gates the delete — Git removal already proceeded past it. Its
-// late failure must not fail-close a *later* close of the same root, which would leave that path
-// undeletable until the watcher process physically exits.
-const abandonedLocalUnsubscribes = new WeakSet<Promise<void>>()
-type LocalWatcherInstallToken = {
-  cancelled: boolean
-  listeners: Map<number, WebContents>
-  abortController: AbortController
-}
-type LocalWatcherInstallResult = 'installed' | 'unavailable' | 'capacity' | 'cancelled'
-type LocalWatcherCapacityRetry = {
-  listeners: Map<number, WebContents>
-  cancelWait: () => void
-}
-// Why: watcher creation is async; concurrent watch requests for the same root must share one install or later resolves orphan listeners.
-const inFlightLocalInstalls = new Map<string, LocalWatcherInstallToken>()
-const pendingLocalInstallPromises = new Map<string, Promise<LocalWatcherInstallResult>>()
-const pendingLocalCapacityRetries = new Map<string, LocalWatcherCapacityRetry>()
-
-function addInFlightLocalInstallListener(
-  token: LocalWatcherInstallToken,
-  sender: WebContents
-): void {
-  if (sender.isDestroyed() || token.abortController.signal.aborted) {
-    return
-  }
-  token.listeners.set(sender.id, sender)
-  token.cancelled = false
-  registerSenderCleanup(sender)
-}
-
-function cleanupInFlightLocalInstallsForSender(senderId: number): void {
-  for (const token of inFlightLocalInstalls.values()) {
-    token.listeners.delete(senderId)
-    if (token.listeners.size === 0) {
-      token.cancelled = true
-      // Why: abort so a pending native/forked subscription stops early (matches closeLocalWatcherForWorktreePath / closeAllWatchers).
-      token.abortController.abort()
-    }
-  }
-  for (const [rootKey, retry] of pendingLocalCapacityRetries) {
-    retry.listeners.delete(senderId)
-    if (retry.listeners.size === 0) {
-      retry.cancelWait()
-      pendingLocalCapacityRetries.delete(rootKey)
-    }
-  }
-}
-
-function takeLocalCapacityRetryListeners(rootKey: string): WebContents[] {
-  const retry = pendingLocalCapacityRetries.get(rootKey)
-  if (!retry) {
-    return []
-  }
-  retry.cancelWait()
-  pendingLocalCapacityRetries.delete(rootKey)
-  return [...retry.listeners.values()].filter((listener) => !listener.isDestroyed())
-}
-
-function clearLocalCapacityRetry(rootKey: string): void {
-  const retry = pendingLocalCapacityRetries.get(rootKey)
-  retry?.cancelWait()
-  pendingLocalCapacityRetries.delete(rootKey)
-}
-
-function scheduleLocalCapacityRetry(
-  rootKey: string,
-  worktreePath: string,
-  listeners: Map<number, WebContents>
-): void {
-  const existing = pendingLocalCapacityRetries.get(rootKey)
-  if (existing) {
-    for (const listener of listeners.values()) {
-      if (!listener.isDestroyed()) {
-        existing.listeners.set(listener.id, listener)
-      }
-    }
-    return
-  }
-
-  let retry!: LocalWatcherCapacityRetry
-  const cancelWait = onWatcherChildCapacityAvailable(async () => {
-    if (pendingLocalCapacityRetries.get(rootKey) !== retry) {
-      return
-    }
-    pendingLocalCapacityRetries.delete(rootKey)
-    await Promise.all(
-      [...retry.listeners.values()].map(async (listener) => {
-        if (listener.isDestroyed()) {
-          return
-        }
-        await subscribe(worktreePath, listener).catch((error: unknown) => {
-          if (!isWatcherRemovalInProgressError(error)) {
-            console.error(`[filesystem-watcher] capacity retry failed for ${rootKey}:`, error)
-          }
-        })
-      })
-    )
-  })
-  retry = { listeners: new Map(), cancelWait }
-  pendingLocalCapacityRetries.set(rootKey, retry)
-  for (const listener of listeners.values()) {
-    if (!listener.isDestroyed()) {
-      retry.listeners.set(listener.id, listener)
-      registerSenderCleanup(listener)
-    }
-  }
-  if (retry.listeners.size === 0) {
-    clearLocalCapacityRetry(rootKey)
-  }
-}
-
-// ── Path normalization ───────────────────────────────────────────────
-
-function normalizeRootPath(rootPath: string): string {
-  let resolved = isWindowsAbsolutePathLike(rootPath)
-    ? path.win32.resolve(rootPath)
-    : path.resolve(rootPath)
-  // Why: Windows watcher events may use lowercase drive letters vs stored uppercase; normalize so renderer casing stays consistent (§4.4).
-  if (/^[a-zA-Z]:/.test(resolved)) {
-    resolved = resolved.charAt(0).toUpperCase() + resolved.slice(1)
-  }
-  return resolved
-}
-
-function localWatcherRoot(rootPath: string): { key: string; path: string } {
-  const normalizedPath = normalizeRootPath(rootPath)
-  return {
-    // Why: Windows drive/UNC paths are case-insensitive; cleanup must match the owner even when Git returns a different spelling.
-    key: normalizeRuntimePathForComparison(normalizedPath),
-    path: normalizedPath
-  }
-}
-
-function normalizeEventPath(eventPath: string): string {
-  let resolved = path.resolve(eventPath)
-  if (/^[a-zA-Z]:/.test(resolved)) {
-    resolved = resolved.charAt(0).toUpperCase() + resolved.slice(1)
-  }
-  return resolved
-}
-
-// ── Event coalescing ─────────────────────────────────────────────────
-// Why: keep the last event per path in a flush window; delete→create emits both (delete cleans the subtree, create refreshes the parent), create→delete is dropped (§4.4).
-
-function coalesceEvents(
-  raw: WatcherEvent[]
-): { type: 'create' | 'update' | 'delete'; path: string }[] {
-  const lastByPath = new Map<string, { type: 'create' | 'update' | 'delete'; index: number }>()
-  const deleteBeforeCreate = new Set<string>()
-
-  for (let i = 0; i < raw.length; i++) {
-    const evt = raw[i]
-    const p = normalizeEventPath(evt.path)
-    const prev = lastByPath.get(p)
-
-    if (prev) {
-      // delete followed by create → emit both
-      if (prev.type === 'delete' && evt.type === 'create') {
-        deleteBeforeCreate.add(p)
-      }
-      // create followed by delete → net no-op, remove both
-      if (prev.type === 'create' && evt.type === 'delete') {
-        lastByPath.delete(p)
-        deleteBeforeCreate.delete(p)
-        continue
-      }
-    }
-
-    lastByPath.set(p, { type: evt.type, index: i })
-
-    // Why: drop the stale delete when a later event supersedes delete→create, else output has a spurious delete for a file that still exists (§4.4).
-    if (evt.type !== 'create' && deleteBeforeCreate.has(p)) {
-      deleteBeforeCreate.delete(p)
-    }
-  }
-
-  const result: { type: 'create' | 'update' | 'delete'; path: string }[] = []
-
-  // Emit delete events first for paths that have delete→create
-  for (const p of deleteBeforeCreate) {
-    result.push({ type: 'delete', path: p })
-  }
-
-  // Emit the last event for each path
-  for (const [p, entry] of lastByPath) {
-    result.push({ type: entry.type, path: p })
-  }
-
-  return result
-}
-
-// ── Stat helper for isDirectory ──────────────────────────────────────
-
-async function tryStatIsDirectory(filePath: string): Promise<boolean | undefined> {
-  try {
-    const s = await stat(filePath)
-    return s.isDirectory()
-  } catch {
-    // Why: stat failure (EPERM, vanished file) → undefined; renderer treats it as a file event, the safe default (§4.4).
-    return undefined
-  }
-}
-
-// ── Flush and emit ───────────────────────────────────────────────────
-
-function emitOverflowPayload(root: WatchedRoot): void {
-  const { rootPath } = root
-  const payload: FsChangedPayload = {
-    worktreePath: rootPath,
-    events: [{ kind: 'overflow', absolutePath: rootPath }]
-  }
-  for (const [, wc] of root.listeners) {
-    if (!wc.isDestroyed()) {
-      wc.send('fs:changed', payload)
-    }
-  }
-}
-
-async function flushBatch(root: WatchedRoot): Promise<void> {
-  const overflowed = root.batch.overflowed
-  const rawEvents = root.batch.events.splice(0)
-  root.batch.overflowed = false
-  root.batch.timer = null
-  root.batch.firstEventAt = 0
-
-  if ((rawEvents.length === 0 && !overflowed) || root.listeners.size === 0) {
-    return
-  }
-
-  if (overflowed || rawEvents.length > MAX_BATCHED_WATCHER_EVENTS) {
-    // Why: deletion storms can be too large to coalesce/stat per path; one overflow asks the renderer for the same conservative refresh.
-    emitOverflowPayload(root)
-    return
-  }
-
-  const coalesced = coalesceEvents(rawEvents)
-
-  const events: FsChangeEvent[] = await Promise.all(
-    coalesced.map(async (evt) => {
-      // Why: a deleted path can't be stat'd; leave isDirectory undefined and let the renderer infer from dirCache.
-      const isDirectory = evt.type === 'delete' ? undefined : await tryStatIsDirectory(evt.path)
-
-      return {
-        kind: evt.type,
-        absolutePath: evt.path,
-        isDirectory
-      }
-    })
-  )
-
-  const payload: FsChangedPayload = {
-    worktreePath: root.rootPath,
-    events
-  }
-
-  for (const [, wc] of root.listeners) {
-    if (!wc.isDestroyed()) {
-      wc.send('fs:changed', payload)
-    }
-  }
-}
-
-function scheduleBatchFlush(root: WatchedRoot): void {
-  const now = Date.now()
-
-  if (root.batch.firstEventAt === 0) {
-    root.batch.firstEventAt = now
-  }
-
-  // If we've exceeded the max wait, flush immediately
-  if (now - root.batch.firstEventAt >= WATCH_BATCH_MAX_WAIT_MS) {
-    if (root.batch.timer) {
-      clearTimeout(root.batch.timer)
-    }
-    void flushBatch(root)
-    return
-  }
-
-  // Trailing-edge debounce: reset timer on each new event
-  if (root.batch.timer) {
-    clearTimeout(root.batch.timer)
-  }
-  root.batch.timer = setTimeout(() => void flushBatch(root), WATCH_BATCH_TRAILING_MS)
-}
-
-// ── Watcher creation ─────────────────────────────────────────────────
-
-async function createWatcher(
-  rootKey: string,
-  rootPath: string,
-  signal?: AbortSignal
-): Promise<WatchedRoot> {
-  const root: WatchedRoot = {
-    subscription: null!,
-    listeners: new Map(),
-    batch: { events: [], overflowed: false, timer: null, firstEventAt: 0 },
-    rootPath
-  }
-
-  try {
-    // Why: if the error callback cleaned up before subscribe() resolved, its returned subscription is orphaned and leaks a native handle.
-    let errorCleanedUp = false
-
-    const watcherOptions = {
-      ...buildParcelWatcherIgnoreOptions(WATCHER_IGNORE_DIRS),
-      // Why: Parcel probes Watchman first, which prints a shell-level "watchman not recognized" error on Windows; pin the backend to suppress it.
-      ...(process.platform === 'win32' ? { backend: 'windows' as const } : {})
-    }
-
-    const markWatcherInterrupted = (): void => {
-      root.batch.overflowed = true
-      scheduleBatchFlush(root)
-    }
-
-    // Why: fork the watcher process (issue #7547 — watcher.node teardown races crash the host); onInterruption marks overflow to refresh past the gap.
-    root.subscription = await subscribeViaWatcherProcess(
-      rootPath,
-      (err, events) => {
-        if (err) {
-          // Why: treat watcher errors as overflow so the renderer conservatively refreshes rather than trusting possibly-invalid caches (§7.2, §7.3).
-          console.error(`[filesystem-watcher] error for ${rootKey}:`, err)
-          emitOverflowPayload(root)
-          // Why: after an error the native subscription may be invalid (deleted root); tear down the dead watcher so it doesn't dangle (§7.3).
-          if (root.batch.timer) {
-            clearTimeout(root.batch.timer)
-          }
-          // Why: error callback can fire before subscribe() assigns root.subscription; guard against null so cleanup doesn't crash.
-          if (root.subscription) {
-            retainLocalWatcherPhysicalFailure(rootKey, err)
-            void trackLocalUnsubscribe(rootKey, root)
-          }
-          errorCleanedUp = true
-          watchedRoots.delete(rootKey)
-          return
-        }
-
-        queueWatcherEvents(root.batch, events)
-        scheduleBatchFlush(root)
-      },
-      watcherOptions,
-      {
-        delivery: { maxEventsPerBatch: MAX_BATCHED_WATCHER_EVENTS },
-        // A child restart or bounded-queue overflow loses path precision; both need the same conservative renderer refresh.
-        onInterruption: markWatcherInterrupted,
-        onOverflow: markWatcherInterrupted,
-        signal
-      }
-    )
-
-    // Why: error callback already cleaned up watchedRoots before subscribe() resolved; unsubscribe this orphaned subscription so it doesn't leak.
-    if (errorCleanedUp) {
-      void trackLocalUnsubscribe(rootKey, root)
-      throw new Error(`Watcher for ${rootKey} errored during subscribe`)
-    }
-  } catch (err) {
-    // Why: watcher backend can throw synchronously on a deleted root/permission error; log rather than crash the main process (§7.3).
-    console.error(`[filesystem-watcher] failed to subscribe ${rootKey}:`, err)
-    throw err
-  }
-
-  return root
-}
-
-// ── Subscribe / Unsubscribe ──────────────────────────────────────────
-
-function cleanupLocalWatchersForSender(senderId: number): void {
-  for (const [rootKey, suspended] of suspendedLocalWatcherListeners) {
-    suspended.listeners.delete(senderId)
-    if (suspended.listeners.size === 0) {
-      suspendedLocalWatcherListeners.delete(rootKey)
-    }
-  }
-  cleanupInFlightLocalInstallsForSender(senderId)
-  for (const [key, watchedRoot] of watchedRoots) {
-    if (watchedRoot.listeners.has(senderId)) {
-      watchedRoot.listeners.delete(senderId)
-      if (watchedRoot.listeners.size === 0) {
-        // Cancel any pending grace-period teardown for this root.
-        const pending = pendingTeardowns.get(key)
-        if (pending) {
-          clearTimeout(pending)
-          pendingTeardowns.delete(key)
-        }
-        if (watchedRoot.batch.timer) {
-          clearTimeout(watchedRoot.batch.timer)
-        }
-        trackLocalUnsubscribe(key, watchedRoot)
-        watchedRoots.delete(key)
-      }
-    }
-  }
-}
-
-function trackLocalUnsubscribe(rootKey: string, root: WatchedRoot): Promise<void> {
-  const rootUnsubscribes = pendingLocalUnsubscribesByRoot.get(rootKey) ?? new Set<Promise<void>>()
-  pendingLocalUnsubscribesByRoot.set(rootKey, rootUnsubscribes)
-  const unsubscribePromise = Promise.resolve()
-    .then(() => root.subscription.unsubscribe())
-    .finally(() => {
-      pendingLocalUnsubscribes.delete(unsubscribePromise)
-      rootUnsubscribes.delete(unsubscribePromise)
-      if (rootUnsubscribes.size === 0) {
-        pendingLocalUnsubscribesByRoot.delete(rootKey)
-      }
-    })
-  pendingLocalUnsubscribes.add(unsubscribePromise)
-  rootUnsubscribes.add(unsubscribePromise)
-  // Why: swallow here to avoid unhandled rejections, but keep the original promise rejected so later destructive cleanup can fail closed.
-  void unsubscribePromise.catch((error: unknown) => {
-    if (!abandonedLocalUnsubscribes.has(unsubscribePromise)) {
-      retainLocalWatcherPhysicalFailure(rootKey, error)
-    }
-    console.error(`[filesystem-watcher] unsubscribe error for ${rootKey}:`, error)
-  })
-  return unsubscribePromise
-}
-
-/** Mark unsubscribes whose drain timed out so their late failures stay out of failedLocalUnsubscribes. */
-function abandonLocalUnsubscribes(promises: Iterable<Promise<void>>): void {
-  for (const promise of promises) {
-    abandonedLocalUnsubscribes.add(promise)
-  }
-}
-
-function retainLocalWatcherPhysicalFailure(rootKey: string, error: unknown): void {
-  if (!isWatcherProcessFailure(error) || !error.physicalExit) {
-    return
-  }
-  failedLocalUnsubscribes.set(rootKey, error)
-  void error.physicalExit.then(() => {
-    if (failedLocalUnsubscribes.get(rootKey) === error) {
-      failedLocalUnsubscribes.delete(rootKey)
-    }
-  })
-}
-
-function registerSenderCleanup(sender: WebContents): void {
-  if (senderCleanupRegistered.has(sender.id)) {
-    return
-  }
-  senderCleanupRegistered.add(sender.id)
-  sender.once('destroyed', () => {
-    senderCleanupRegistered.delete(sender.id)
-    cleanupLocalWatchersForSender(sender.id)
-    cleanupRemoteWatchersForSender(sender.id)
-  })
-}
-
-function addLocalWatchListener(rootKey: string, sender: WebContents): void {
-  const root = watchedRoots.get(rootKey)
-  if (!root || sender.isDestroyed()) {
-    return
-  }
-  root.listeners.set(sender.id, sender)
-  registerSenderCleanup(sender)
-}
-
-async function subscribe(
-  worktreePath: string,
-  sender: WebContents,
-  generation = localWatcherLifecycleGeneration
-): Promise<void> {
-  if (localWatchersClosed || generation !== localWatcherLifecycleGeneration) {
-    return
-  }
-  const finishInstall = beginWatcherInstall(worktreePath)
-  try {
-    await subscribeWhileRemovalAllowed(worktreePath, sender, generation)
-  } finally {
-    finishInstall()
-  }
-}
-
-async function subscribeWhileRemovalAllowed(
-  worktreePath: string,
-  sender: WebContents,
-  generation: number
-): Promise<void> {
-  if (localWatchersClosed || generation !== localWatcherLifecycleGeneration) {
-    return
-  }
-  const { key: rootKey, path: rootPath } = localWatcherRoot(worktreePath)
-  if (sender.isDestroyed()) {
-    return
-  }
-
-  // Don't retry roots that already failed — avoids repeated error spam.
-  if (unwatchableRoots.has(rootKey)) {
-    rememberUnwatchableRoot(rootKey)
-    return
-  }
-
-  let root = watchedRoots.get(rootKey)
-
-  // Cancel any pending grace-period teardown — a new listener arrived.
-  const pendingTeardown = pendingTeardowns.get(rootKey)
-  if (pendingTeardown) {
-    clearTimeout(pendingTeardown)
-    pendingTeardowns.delete(rootKey)
-  }
-  const capacityRetryListeners = takeLocalCapacityRetryListeners(rootKey)
-
-  if (root) {
-    for (const listener of capacityRetryListeners) {
-      addLocalWatchListener(rootKey, listener)
-    }
-    addLocalWatchListener(rootKey, sender)
-    return
-  }
-
-  const pendingInstall = pendingLocalInstallPromises.get(rootKey)
-  if (pendingInstall) {
-    const inFlight = inFlightLocalInstalls.get(rootKey)
-    const canJoinInstall = inFlight && !inFlight.abortController.signal.aborted
-    if (canJoinInstall) {
-      // Why: an unwatch may cancel an install while another renderer awaits the same root; a new live listener keeps it alive.
-      addInFlightLocalInstallListener(inFlight, sender)
-      for (const listener of capacityRetryListeners) {
-        addInFlightLocalInstallListener(inFlight, listener)
-      }
-    }
-    const result = await pendingInstall
-    if (
-      result === 'cancelled' &&
-      !canJoinInstall &&
-      !localWatchersClosed &&
-      generation === localWatcherLifecycleGeneration
-    ) {
-      // Why: AbortSignal can't be revived; listeners arriving after cancellation wait out that generation, then own a fresh install.
-      if (pendingLocalInstallPromises.get(rootKey) === pendingInstall) {
-        pendingLocalInstallPromises.delete(rootKey)
-      }
-      const retryListeners = new Map(
-        capacityRetryListeners.map((listener) => [listener.id, listener])
-      )
-      retryListeners.set(sender.id, sender)
-      for (const listener of retryListeners.values()) {
-        if (!listener.isDestroyed()) {
-          await subscribeWhileRemovalAllowed(worktreePath, listener, generation)
-        }
-      }
-      return
-    }
-    if (!inFlight) {
-      if (result === 'installed') {
-        for (const listener of capacityRetryListeners) {
-          addLocalWatchListener(rootKey, listener)
-        }
-      } else if (result === 'capacity') {
-        const retryListeners = new Map(
-          capacityRetryListeners.map((listener) => [listener.id, listener])
-        )
-        retryListeners.set(sender.id, sender)
-        scheduleLocalCapacityRetry(rootKey, worktreePath, retryListeners)
-      }
-    }
-    if (
-      result === 'installed' &&
-      watchedRoots.has(rootKey) &&
-      !sender.isDestroyed() &&
-      (!inFlight || inFlight.listeners.has(sender.id))
-    ) {
-      addLocalWatchListener(rootKey, sender)
-    }
-    return
-  }
-
-  const cancelToken: LocalWatcherInstallToken = {
-    cancelled: false,
-    listeners: new Map(),
-    abortController: new AbortController()
-  }
-  inFlightLocalInstalls.set(rootKey, cancelToken)
-  for (const listener of capacityRetryListeners) {
-    addInFlightLocalInstallListener(cancelToken, listener)
-  }
-  addInFlightLocalInstallListener(cancelToken, sender)
-  const installPromise = doInstallLocalWatcher(rootKey, rootPath, worktreePath, cancelToken)
-  pendingLocalInstallPromises.set(rootKey, installPromise)
-  try {
-    await installPromise
-  } finally {
-    if (pendingLocalInstallPromises.get(rootKey) === installPromise) {
-      pendingLocalInstallPromises.delete(rootKey)
-    }
-  }
-}
-
-async function doInstallLocalWatcher(
-  rootKey: string,
-  rootPath: string,
-  worktreePath: string,
-  cancelToken: LocalWatcherInstallToken
-): Promise<LocalWatcherInstallResult> {
-  let root: WatchedRoot
-  try {
-    const s = await stat(rootPath)
-    if (!s.isDirectory()) {
-      console.warn(`[filesystem-watcher] not a directory: ${rootKey}`)
-      rememberUnwatchableRoot(rootKey)
-      return 'unavailable'
-    }
-  } catch {
-    console.warn(`[filesystem-watcher] cannot stat root: ${rootKey}`)
-    rememberUnwatchableRoot(rootKey)
-    return 'unavailable'
-  }
-
-  try {
-    // Why: WSL paths use one snapshot subprocess inside the distro so `wsl --shutdown` can kill it; native Windows uses @parcel/watcher.
-    root = isWslPath(worktreePath)
-      ? await createWslWatcher(
-          rootKey,
-          worktreePath,
-          {
-            ignoreDirs: WATCHER_IGNORE_DIRS,
-            scheduleBatchFlush,
-            watchedRoots
-          },
-          cancelToken.abortController.signal
-        )
-      : await createWatcher(rootKey, rootPath, cancelToken.abortController.signal)
-  } catch (error) {
-    // Why: setup can fail after its child misses the exit deadline; retain that owner even when the renderer-facing error is swallowed.
-    retainLocalWatcherPhysicalFailure(rootKey, error)
-    if (cancelToken.cancelled) {
-      if (isWatcherProcessFailure(error) && error.code === 'process_unavailable') {
-        throw error
-      }
-      return 'cancelled'
-    }
-    // Why: capacity is transient — allow retry once another child exits instead of caching this root as permanently failed.
-    if (error instanceof WatcherChildCapacityError) {
-      scheduleLocalCapacityRetry(rootKey, worktreePath, cancelToken.listeners)
-      return 'capacity'
-    }
-    rememberUnwatchableRoot(rootKey)
-    return 'unavailable'
-  } finally {
-    if (inFlightLocalInstalls.get(rootKey) === cancelToken) {
-      inFlightLocalInstalls.delete(rootKey)
-    }
-  }
-
-  const liveListeners = new Map(
-    Array.from(cancelToken.listeners.entries()).filter(([, listener]) => !listener.isDestroyed())
-  )
-  if (cancelToken.cancelled || liveListeners.size === 0) {
-    if (root.batch.timer) {
-      clearTimeout(root.batch.timer)
-    }
-    void trackLocalUnsubscribe(rootKey, root)
-    return 'cancelled'
-  }
-
-  root.listeners = liveListeners
-  watchedRoots.set(rootKey, root)
-  for (const listener of liveListeners.values()) {
-    registerSenderCleanup(listener)
-  }
-  return 'installed'
-}
-
-function unsubscribe(worktreePath: string, senderId: number): void {
-  const { key: rootKey } = localWatcherRoot(worktreePath)
-  const suspended = suspendedLocalWatcherListeners.get(rootKey)
-  suspended?.listeners.delete(senderId)
-  if (suspended?.listeners.size === 0) {
-    suspendedLocalWatcherListeners.delete(rootKey)
-  }
-  const capacityRetry = pendingLocalCapacityRetries.get(rootKey)
-  if (capacityRetry) {
-    capacityRetry.listeners.delete(senderId)
-    if (capacityRetry.listeners.size === 0) {
-      clearLocalCapacityRetry(rootKey)
-    }
-  }
-  const inFlight = inFlightLocalInstalls.get(rootKey)
-  if (inFlight) {
-    inFlight.listeners.delete(senderId)
-    inFlight.cancelled = inFlight.listeners.size === 0
-    // Why: last normal disconnect must abort the pending native/forked install (same early-cancel as closeLocalWatcherForWorktreePath).
-    if (inFlight.cancelled) {
-      inFlight.abortController.abort()
-    }
-  }
-
-  const root = watchedRoots.get(rootKey)
-  if (!root) {
-    return
-  }
-
-  root.listeners.delete(senderId)
-
-  // Defer teardown when the last subscriber leaves so rapid worktree switches reuse the native watcher.
-  if (root.listeners.size === 0) {
-    if (root.batch.timer) {
-      clearTimeout(root.batch.timer)
-    }
-
-    // Why: duplicate unwatch calls for a root would leak overwritten grace timers; keep just one.
-    if (pendingTeardowns.has(rootKey)) {
-      return
-    }
-
-    const teardownTimer = setTimeout(() => {
-      pendingTeardowns.delete(rootKey)
-      // Re-check: a new listener may have arrived during the grace period.
-      const currentRoot = watchedRoots.get(rootKey)
-      if (!currentRoot || currentRoot.listeners.size > 0) {
-        return
-      }
-      void trackLocalUnsubscribe(rootKey, currentRoot)
-      watchedRoots.delete(rootKey)
-    }, WATCHER_TEARDOWN_GRACE_MS)
-
-    pendingTeardowns.set(rootKey, teardownTimer)
-  }
-}
-
-export async function closeLocalWatcherForWorktreePath(
-  worktreePath: string,
-  deadline: WatcherRemovalDeadline = createWatcherRemovalDeadline()
-): Promise<void> {
-  const { key: rootKey } = localWatcherRoot(worktreePath)
-  const suspended = suspendedLocalWatcherListeners.get(rootKey) ?? {
-    worktreePath,
-    listeners: new Map<number, WebContents>()
-  }
-  for (const source of [
-    pendingLocalCapacityRetries.get(rootKey)?.listeners,
-    inFlightLocalInstalls.get(rootKey)?.listeners,
-    watchedRoots.get(rootKey)?.listeners
-  ]) {
-    for (const [senderId, sender] of source ?? []) {
-      if (!sender.isDestroyed()) {
-        suspended.listeners.set(senderId, sender)
-      }
-    }
-  }
-  if (suspended.listeners.size > 0) {
-    suspendedLocalWatcherListeners.set(rootKey, suspended)
-  }
-  clearLocalCapacityRetry(rootKey)
-  const pendingTeardown = pendingTeardowns.get(rootKey)
-  if (pendingTeardown) {
-    clearTimeout(pendingTeardown)
-    pendingTeardowns.delete(rootKey)
-  }
-
-  const inFlight = inFlightLocalInstalls.get(rootKey)
-  if (inFlight) {
-    // Why: Windows locks watched directories; deletion must cancel an in-flight subscription before Git removes the tree.
-    inFlight.listeners.clear()
-    inFlight.cancelled = true
-    inFlight.abortController.abort()
-  }
-  // Why: abort alone is not enough if the native subscribe never settles; bound so delete cannot hang the app.
-  const pendingInstall = pendingLocalInstallPromises.get(rootKey)
-  const installDrain = await drainBeforeWatcherRemoval(
-    pendingInstall,
-    deadline,
-    `local watcher install for ${rootKey}`,
-    { reserveMs: WATCHER_REMOVAL_FINAL_DRAIN_RESERVE_MS }
-  )
-  if (installDrain === 'timeout') {
-    // Why: an abandoned install never runs its own cleanup, so leaving these entries would make every
-    // later watch of this root queue behind the same wedged promise. Identity-checked so a late settle
-    // can't evict a newer install.
-    if (pendingLocalInstallPromises.get(rootKey) === pendingInstall) {
-      pendingLocalInstallPromises.delete(rootKey)
-    }
-    if (inFlight && inFlightLocalInstalls.get(rootKey) === inFlight) {
-      inFlightLocalInstalls.delete(rootKey)
-    }
-  }
-  const pendingUnsubscribes = pendingLocalUnsubscribesByRoot.get(rootKey)
-  if (pendingUnsubscribes) {
-    const draining = Array.from(pendingUnsubscribes)
-    const unsubscribeDrain = await drainBeforeWatcherRemoval(
-      // Why the per-promise catch: an already-abandoned unsubscribe belongs to a delete that finished
-      // without it; re-raising its rejection here would fail a later close on stale news.
-      Promise.all(
-        draining.map((unsubscribe) =>
-          abandonedLocalUnsubscribes.has(unsubscribe)
-            ? unsubscribe.catch(() => undefined)
-            : unsubscribe
-        )
-      ),
-      deadline,
-      `local watcher unsubscribe for ${rootKey}`,
-      { reserveMs: WATCHER_REMOVAL_FINAL_DRAIN_RESERVE_MS }
-    )
-    if (unsubscribeDrain === 'timeout') {
-      abandonLocalUnsubscribes(draining)
-    }
-  }
-  if (failedLocalUnsubscribes.has(rootKey)) {
-    throw failedLocalUnsubscribes.get(rootKey)
-  }
-
-  const root = watchedRoots.get(rootKey)
-  if (!root) {
-    return
-  }
-  if (root.batch.timer) {
-    clearTimeout(root.batch.timer)
-  }
-  watchedRoots.delete(rootKey)
-  // Why: the in-process Parcel fallback has no unsubscribe timeout of its own, so an unbounded await
-  // here would hang delete forever and hold the removal gate. The promise stays tracked in
-  // pendingLocalUnsubscribesByRoot, so a later close still observes its failure.
-  const finalUnsubscribe = trackLocalUnsubscribe(rootKey, root)
-  const finalDrain = await drainBeforeWatcherRemoval(
-    finalUnsubscribe,
-    deadline,
-    `local watcher unsubscribe for ${rootKey}`
-  )
-  if (finalDrain === 'timeout') {
-    abandonLocalUnsubscribes([finalUnsubscribe])
-  }
-}
-
-export async function restoreLocalWatcherAfterFailedRemoval(worktreePath: string): Promise<void> {
-  const { key: rootKey } = localWatcherRoot(worktreePath)
-  const suspended = suspendedLocalWatcherListeners.get(rootKey)
-  if (!suspended) {
-    return
-  }
-  suspendedLocalWatcherListeners.delete(rootKey)
-  const failures: unknown[] = []
-  const failedListeners = new Map<number, WebContents>()
-  for (const sender of suspended.listeners.values()) {
-    if (sender.isDestroyed()) {
-      continue
-    }
-    try {
-      await subscribe(suspended.worktreePath, sender)
-      sender.send('fs:changed', {
-        worktreePath: suspended.worktreePath,
-        events: [{ kind: 'overflow', absolutePath: suspended.worktreePath }]
-      } satisfies FsChangedPayload)
-    } catch (error) {
-      failures.push(error)
-      failedListeners.set(sender.id, sender)
-    }
-  }
-  if (failures.length > 0) {
-    suspendedLocalWatcherListeners.set(rootKey, {
-      worktreePath: suspended.worktreePath,
-      listeners: failedListeners
-    })
-    throw failures[0]
-  }
-}
-
-export function forgetLocalWatcherRemovalSnapshot(worktreePath: string): void {
-  suspendedLocalWatcherListeners.delete(localWatcherRoot(worktreePath).key)
-}
-
-// Remote watcher state
-type RemoteWatcherState = {
-  unwatch: () => void
-  listeners: Map<number, WebContents>
-  installToken: RemoteWatcherInstallToken
-  /** Held so every teardown can drop the trailing flush timer instead of letting it fire into a dead watch. */
-  batch: RemoteWatcherEventBatch
-}
-
-type RemoteWatcherInstallToken = {
-  cancelled: boolean
-  listeners: Map<number, WebContents>
-  abortController: AbortController
-  abortScheduled: boolean
-  terminalError?: Error
-}
-
-// Key: `${connectionId}:${worktreePath}`, Value: shared remote watch state.
-const remoteWatchers = new Map<string, RemoteWatcherState>()
-const suspendedRemoteWatcherListeners = new Map<
-  string,
-  { connectionId: string; worktreePath: string; listeners: Map<number, WebContents> }
->()
-// Why: the renderer subscribes once per target and never re-issues, so the intent to watch has to
-// outlive any single connection — an install that failed or died with a dropped transport is
-// re-armed from here when a provider appears. Without it a reconnect (or a connect slower than the
-// retry window) leaves the watch dead until the app restarts.
-const desiredRemoteWatchers = new Map<
-  string,
-  { connectionId: string; worktreePath: string; listeners: Map<number, WebContents> }
->()
-// Why: provider registration only fires on reconnect, so a watch that dies while the SSH link stays
-// healthy (remote OOM, inotify/fd exhaustion, relay watcher killed) has no re-arm trigger at all
-// once the fast window gives up. Backoff keeps the recovery attempt without the 1s storm.
-const dormantRemoteWatchers = new Map<
-  string,
-  { delayMs: number; timer: ReturnType<typeof setTimeout> }
->()
-const loggedUnavailableRemoteWatchers = new Set<string>()
-const pendingRemoteWatcherRetries = new Map<string, ReturnType<typeof setTimeout>>()
-const pendingRemoteWatcherRetryListeners = new Map<
-  string,
-  { listeners: Map<number, WebContents>; startedAt: number; resyncOnInstall: boolean }
->()
-type RemoteWatcherResyncState = {
-  lastSentAt: number
-  listeners: Map<number, WebContents>
-  timer?: ReturnType<typeof setTimeout>
-  worktreePath: string
-}
-const remoteWatcherResyncStates = new Map<string, RemoteWatcherResyncState>()
-// Why: last-listener cleanup aborts relay setup; late success is unwatched rather than installed after the renderer stopped watching.
-const inFlightRemoteInstalls = new Map<string, RemoteWatcherInstallToken>()
-// Why: dedupe concurrent installRemoteWatcher calls per key so overlapping watches share one watcher instead of clobbering per-key state.
-const pendingRemoteInstallPromises = new Map<string, Promise<RemoteWatcherInstallResult>>()
-// Why: block installs beginning after closeAllWatchers (joiner recursion / retry tick bypass the abort loop); a new fs:watchWorktree clears it.
-let remoteWatchersClosed = false
-// Why: closeAllWatchers bumps this so a joiner that awaited across shutdown+reopen is refused (the latch alone can't tell it from a fresh call).
-let remoteWatcherLifecycleGeneration = 0
-let unsubscribeFromProviderRegistrations: (() => void) | null = null
-const REMOTE_WATCH_RETRY_MS = 1_000
-const REMOTE_WATCH_RETRY_TIMEOUT_MS = 60_000
-// Why: preserve the first and latest resync while bounding full-tree SSH refreshes during flaps.
-const REMOTE_WATCH_RESYNC_COALESCE_MS = 5_000
-// Why: doubling from a minute to a half-hour ceiling costs a permanently broken remote ~7 fs.watch
-// calls in the first hour and 2/hour after, which a flapping link can absorb.
-const REMOTE_WATCH_DORMANT_RETRY_MS = 60_000
-const REMOTE_WATCH_DORMANT_RETRY_MAX_MS = 30 * 60_000
-
-export async function closeRemoteWatcherForWorktreePath(
-  connectionId: string,
-  worktreePath: string
-): Promise<void> {
-  const key = remoteWatcherKey(connectionId, worktreePath)
-  const suspended = suspendedRemoteWatcherListeners.get(key) ?? {
-    connectionId,
-    worktreePath,
-    listeners: new Map<number, WebContents>()
-  }
-  for (const source of [
-    pendingRemoteWatcherRetryListeners.get(key)?.listeners,
-    inFlightRemoteInstalls.get(key)?.listeners,
-    remoteWatchers.get(key)?.listeners
-  ]) {
-    for (const [senderId, sender] of source ?? []) {
-      if (!sender.isDestroyed()) {
-        suspended.listeners.set(senderId, sender)
-      }
-    }
-  }
-  if (suspended.listeners.size > 0) {
-    suspendedRemoteWatcherListeners.set(key, suspended)
-  }
-  clearRemoteWatcherResync(key)
-  const retryTimer = pendingRemoteWatcherRetries.get(key)
-  if (retryTimer) {
-    clearTimeout(retryTimer)
-    pendingRemoteWatcherRetries.delete(key)
-    pendingRemoteWatcherRetryListeners.delete(key)
-  }
-  // Why: removal is deliberate — a backoff firing mid-removal would re-watch the path being deleted.
-  clearDormantRemoteWatcher(key)
-  const inFlight = inFlightRemoteInstalls.get(key)
-  if (inFlight) {
-    inFlight.listeners.clear()
-    inFlight.cancelled = true
-  }
-  const state = remoteWatchers.get(key)
-  const provider = getSshFilesystemProvider(connectionId)
-  await (provider?.closeWatch
-    ? provider.closeWatch(worktreePath)
-    : Promise.resolve(state?.unwatch()))
-  state?.batch.close()
-  remoteWatchers.delete(key)
-  loggedUnavailableRemoteWatchers.delete(key)
-}
-
-export async function restoreRemoteWatcherAfterFailedRemoval(
-  connectionId: string,
-  worktreePath: string
-): Promise<void> {
-  const key = remoteWatcherKey(connectionId, worktreePath)
-  const suspended = suspendedRemoteWatcherListeners.get(key)
-  if (!suspended) {
-    return
-  }
-  suspendedRemoteWatcherListeners.delete(key)
-  for (const sender of suspended.listeners.values()) {
-    if (sender.isDestroyed()) {
-      continue
-    }
-    const result = await installRemoteWatcher(sender, connectionId, worktreePath)
-    if (result === 'unavailable') {
-      scheduleRemoteWatcherRetry(sender, connectionId, worktreePath)
-    }
-    sender.send('fs:changed', {
-      worktreePath,
-      events: [{ kind: 'overflow', absolutePath: worktreePath }]
-    } satisfies FsChangedPayload)
-  }
-}
-
-export function forgetRemoteWatcherRemovalSnapshot(
-  connectionId: string,
-  worktreePath: string
-): void {
-  const key = remoteWatcherKey(connectionId, worktreePath)
-  suspendedRemoteWatcherListeners.delete(key)
-  clearRemoteWatcherResync(key)
-  const retryTimer = pendingRemoteWatcherRetries.get(key)
-  if (retryTimer) {
-    clearTimeout(retryTimer)
-    pendingRemoteWatcherRetries.delete(key)
-  }
-  pendingRemoteWatcherRetryListeners.delete(key)
-  // Why: the worktree is gone — keeping the intent lets a reconnect landing before the renderer's
-  // unwatch re-watch a deleted path (60s of retries against the host, then a bogus overflow).
-  desiredRemoteWatchers.delete(key)
-  clearDormantRemoteWatcher(key)
-}
-
-function addInFlightRemoteInstallListener(
-  token: RemoteWatcherInstallToken,
-  sender: WebContents
-): void {
-  if (sender.isDestroyed() || token.abortController.signal.aborted) {
-    return
-  }
-  token.listeners.set(sender.id, sender)
-  token.cancelled = false
-  registerSenderCleanup(sender)
-}
-
-function cancelInFlightRemoteInstallIfUnowned(token: RemoteWatcherInstallToken): void {
-  token.cancelled = token.listeners.size === 0
-  if (!token.cancelled || token.abortScheduled || token.abortController.signal.aborted) {
-    return
-  }
-  token.abortScheduled = true
-  // Why: a replacement sender can synchronously revive the shared install during a renderer handoff; otherwise stop the relay crawl next microtask.
-  queueMicrotask(() => {
-    token.abortScheduled = false
-    if (token.cancelled && token.listeners.size === 0) {
-      token.abortController.abort()
-    }
-  })
-}
-
-function cleanupInFlightRemoteInstallsForSender(senderId: number): void {
-  for (const token of inFlightRemoteInstalls.values()) {
-    token.listeners.delete(senderId)
-    cancelInFlightRemoteInstallIfUnowned(token)
-  }
-  for (const [key, retry] of pendingRemoteWatcherRetryListeners) {
-    retry.listeners.delete(senderId)
-    if (retry.listeners.size === 0) {
-      const timer = pendingRemoteWatcherRetries.get(key)
-      if (timer) {
-        clearTimeout(timer)
-        pendingRemoteWatcherRetries.delete(key)
-      }
-      pendingRemoteWatcherRetryListeners.delete(key)
-    }
-  }
-}
-
-function addRemoteWatchListener(key: string, sender: WebContents): void {
-  const state = remoteWatchers.get(key)
-  if (!state) {
-    return
-  }
-  state.listeners.set(sender.id, sender)
-  registerSenderCleanup(sender)
-}
-
-function releaseRemoteWatchListener(key: string, senderId: number): void {
-  const state = remoteWatchers.get(key)
-  if (!state) {
-    return
-  }
-  state.listeners.delete(senderId)
-  if (state.listeners.size > 0) {
-    return
-  }
-  state.unwatch()
-  state.batch.close()
-  remoteWatchers.delete(key)
-}
-
-function cleanupRemoteWatchersForSender(senderId: number): void {
-  for (const key of Array.from(desiredRemoteWatchers.keys())) {
-    forgetDesiredRemoteWatcher(key, senderId)
-  }
-  for (const [key, suspended] of suspendedRemoteWatcherListeners) {
-    suspended.listeners.delete(senderId)
-    if (suspended.listeners.size === 0) {
-      suspendedRemoteWatcherListeners.delete(key)
-    }
-  }
-  cleanupInFlightRemoteInstallsForSender(senderId)
-  for (const key of Array.from(remoteWatchers.keys())) {
-    releaseRemoteWatchListener(key, senderId)
-  }
-}
-
-type RemoteWatcherInstallResult = 'installed' | 'unavailable' | 'cancelled'
-
-async function installRemoteWatcher(
-  sender: WebContents,
-  connectionId: string,
-  worktreePath: string,
-  generation = remoteWatcherLifecycleGeneration
-): Promise<RemoteWatcherInstallResult> {
-  // Why: refuse installs racing in after teardown (or a waiter from an earlier lifecycle) so provider.watch() isn't called post-shutdown.
-  if (remoteWatchersClosed || generation !== remoteWatcherLifecycleGeneration) {
-    return 'cancelled'
-  }
-  const finishInstall = beginWatcherInstall(worktreePath, connectionId)
-  try {
-    return await installRemoteWatcherWhileRemovalAllowed(
-      sender,
-      connectionId,
-      worktreePath,
-      generation
-    )
-  } finally {
-    finishInstall()
-  }
-}
-
-async function installRemoteWatcherWhileRemovalAllowed(
-  sender: WebContents,
-  connectionId: string,
-  worktreePath: string,
-  generation: number
-): Promise<RemoteWatcherInstallResult> {
-  const provider = getSshFilesystemProvider(connectionId)
-  if (!provider || sender.isDestroyed()) {
-    return 'unavailable'
-  }
-
-  const key = remoteWatcherKey(connectionId, worktreePath)
-  const existing = remoteWatchers.get(key)
-  if (existing) {
-    addRemoteWatchListener(key, sender)
-    return 'installed'
-  }
-  // Why: concurrent same-key watches must share the first provider.watch(); separate watchers would clobber per-key state and drop the unwatch handle.
-  const pendingInstall = pendingRemoteInstallPromises.get(key)
-  if (pendingInstall) {
-    const inFlight = inFlightRemoteInstalls.get(key)
-    const canJoinInstall = inFlight && !inFlight.abortController.signal.aborted
-    if (canJoinInstall) {
-      // Why: a new watcher joining before provider.watch() resolves should revive the install instead of inheriting the stale cancellation.
-      addInFlightRemoteInstallListener(inFlight, sender)
-    }
-    const result = await pendingInstall
-    if (
-      result === 'installed' &&
-      remoteWatchers.has(key) &&
-      !sender.isDestroyed() &&
-      (!inFlight || inFlight.listeners.has(sender.id))
-    ) {
-      addRemoteWatchListener(key, sender)
-    }
-    if (
-      result === 'cancelled' &&
-      !canJoinInstall &&
-      !sender.isDestroyed() &&
-      generation === remoteWatcherLifecycleGeneration
-    ) {
-      // Why: AbortSignal can't be revived; a listener arriving after cancellation waits out that generation, then owns a fresh install.
-      if (pendingRemoteInstallPromises.get(key) === pendingInstall) {
-        pendingRemoteInstallPromises.delete(key)
-      }
-      return installRemoteWatcher(sender, connectionId, worktreePath, generation)
-    }
-    return result
-  }
-  const cancelToken: RemoteWatcherInstallToken = {
-    cancelled: false,
-    listeners: new Map(),
-    abortController: new AbortController(),
-    abortScheduled: false
-  }
-  inFlightRemoteInstalls.set(key, cancelToken)
-  addInFlightRemoteInstallListener(cancelToken, sender)
-  const installPromise = doInstallRemoteWatcher(
-    provider,
-    key,
-    connectionId,
-    worktreePath,
-    cancelToken
-  )
-  pendingRemoteInstallPromises.set(key, installPromise)
-  try {
-    return await installPromise
-  } finally {
-    if (pendingRemoteInstallPromises.get(key) === installPromise) {
-      pendingRemoteInstallPromises.delete(key)
-    }
-  }
-}
-
-async function doInstallRemoteWatcher(
-  provider: NonNullable<ReturnType<typeof getSshFilesystemProvider>>,
-  key: string,
-  connectionId: string,
-  worktreePath: string,
-  cancelToken: RemoteWatcherInstallToken
-): Promise<RemoteWatcherInstallResult> {
-  let unwatch: () => void
-  // Why: the abandon paths below close the batch directly; once it is stored on the remoteWatchers
-  // entry, every later teardown closes it through that handle. deliver's state/installToken guard
-  // still covers a flush that races a close.
-  const batch = createRemoteWatcherEventBatch({
-    rootPath: worktreePath,
-    trailingMs: WATCH_BATCH_TRAILING_MS,
-    maxWaitMs: WATCH_BATCH_MAX_WAIT_MS,
-    maxEvents: MAX_BATCHED_WATCHER_EVENTS,
-    deliver: (events) => {
-      const state = remoteWatchers.get(key)
-      // Why: buffering defers delivery past install, so a bare non-null check would let a stale flush
-      // land on a different install generation.
-      if (!state || state.installToken !== cancelToken) {
-        return
-      }
-      for (const listener of state.listeners.values()) {
-        if (listener.isDestroyed()) {
-          continue
-        }
-        try {
-          listener.send('fs:changed', {
-            worktreePath,
-            events
-          } satisfies FsChangedPayload)
-        } catch (err) {
-          // Why: batching moved this send out of the SSH mux's notification try/catch into a bare
-          // timer, so a frame disposed mid-window would escape as a fatal main-process exception.
-          console.warn(
-            `[filesystem-watch] failed to deliver remote fs:changed for ${worktreePath}: ${
-              err instanceof Error ? err.message : String(err)
-            }`
-          )
-        }
-      }
-    }
-  })
-  try {
-    unwatch = await provider.watch(
-      worktreePath,
-      (events) => {
-        batch.push(events)
-      },
-      {
-        signal: cancelToken.abortController.signal,
-        onTerminalError: (error) =>
-          handleRemoteWatcherTerminalError(key, connectionId, worktreePath, cancelToken, error)
-      }
-    )
-  } catch (err) {
-    // Why: the provider can fire its callback before rejecting (an aborted reinstall), so this
-    // abandon path owes the same close as the two below — nothing else holds the batch.
-    batch.close()
-    if (cancelToken.cancelled || cancelToken.abortController.signal.aborted) {
-      return 'cancelled'
-    }
-    console.warn(`[filesystem-watcher] SSH watcher unavailable for ${key}:`, err)
-    return 'unavailable'
-  } finally {
-    if (inFlightRemoteInstalls.get(key) === cancelToken) {
-      inFlightRemoteInstalls.delete(key)
-    }
-  }
-  const liveListeners = new Map(
-    Array.from(cancelToken.listeners.entries()).filter(([, listener]) => !listener.isDestroyed())
-  )
-  if (cancelToken.cancelled || liveListeners.size === 0) {
-    batch.close()
-    try {
-      unwatch()
-    } catch (err) {
-      console.error(`[filesystem-watcher] remote unwatch (post-cancel) error for ${key}:`, err)
-    }
-    return 'cancelled'
-  }
-  if (cancelToken.terminalError) {
-    batch.close()
-    return 'unavailable'
-  }
-  remoteWatchers.set(key, { unwatch, listeners: liveListeners, installToken: cancelToken, batch })
-  for (const listener of liveListeners.values()) {
-    registerSenderCleanup(listener)
-  }
-  loggedUnavailableRemoteWatchers.delete(key)
-  return 'installed'
-}
-
-function handleRemoteWatcherTerminalError(
-  key: string,
-  connectionId: string,
-  worktreePath: string,
-  installToken: RemoteWatcherInstallToken,
-  error: Error
-): void {
-  installToken.terminalError = error
-  const state = remoteWatchers.get(key)
-  if (!state || state.installToken !== installToken) {
-    return
-  }
-  remoteWatchers.delete(key)
-  state.batch.close()
-  if (remoteWatchersClosed || suspendedRemoteWatcherListeners.has(key)) {
-    return
-  }
-  console.warn(`[filesystem-watcher] SSH watcher terminated for ${key}:`, error)
-  const startedAt = Date.now()
-  for (const listener of state.listeners.values()) {
-    scheduleRemoteWatcherRetry(listener, connectionId, worktreePath, startedAt, true)
-  }
-}
-
-function isCurrentDesiredRemoteWatcher(key: string, listener: WebContents): boolean {
-  return desiredRemoteWatchers.get(key)?.listeners.get(listener.id) === listener
-}
-
-function clearRemoteWatcherResync(key: string): void {
-  const state = remoteWatcherResyncStates.get(key)
-  if (state?.timer) {
-    clearTimeout(state.timer)
-  }
-  remoteWatcherResyncStates.delete(key)
-}
-
-function flushRemoteWatcherResync(key: string): void {
-  const state = remoteWatcherResyncStates.get(key)
-  if (!state) {
-    return
-  }
-  state.timer = undefined
-  if (
-    remoteWatchersClosed ||
-    suspendedRemoteWatcherListeners.has(key) ||
-    !remoteWatchers.has(key)
-  ) {
-    if (!desiredRemoteWatchers.has(key)) {
-      remoteWatcherResyncStates.delete(key)
-    }
-    return
-  }
-  let sent = false
-  for (const listener of state.listeners.values()) {
-    if (listener.isDestroyed() || !isCurrentDesiredRemoteWatcher(key, listener)) {
-      continue
-    }
-    try {
-      listener.send('fs:changed', {
-        worktreePath: state.worktreePath,
-        events: [{ kind: 'overflow', absolutePath: state.worktreePath }]
-      } satisfies FsChangedPayload)
-      sent = true
-    } catch (error) {
-      console.warn(`[filesystem-watcher] failed to send SSH watcher resync for ${key}:`, error)
-    }
-  }
-  state.listeners.clear()
-  if (sent) {
-    state.lastSentAt = Date.now()
-  } else {
-    remoteWatcherResyncStates.delete(key)
-  }
-}
-
-function requestRemoteWatcherResync(
-  key: string,
-  worktreePath: string,
-  listeners: Iterable<WebContents>
-): void {
-  const state = remoteWatcherResyncStates.get(key) ?? {
-    lastSentAt: Number.NEGATIVE_INFINITY,
-    listeners: new Map<number, WebContents>(),
-    worktreePath
-  }
-  state.worktreePath = worktreePath
-  for (const listener of listeners) {
-    if (!listener.isDestroyed() && isCurrentDesiredRemoteWatcher(key, listener)) {
-      state.listeners.set(listener.id, listener)
-    }
-  }
-  if (state.listeners.size === 0) {
-    return
-  }
-  remoteWatcherResyncStates.set(key, state)
-  const delayMs = Math.max(0, state.lastSentAt + REMOTE_WATCH_RESYNC_COALESCE_MS - Date.now())
-  if (delayMs === 0) {
-    flushRemoteWatcherResync(key)
-    return
-  }
-  if (!state.timer) {
-    state.timer = setTimeout(() => flushRemoteWatcherResync(key), delayMs)
-    state.timer.unref?.()
-  }
-}
-
-function scheduleRemoteWatcherRetry(
-  sender: WebContents,
-  connectionId: string,
-  worktreePath: string,
-  startedAt = Date.now(),
-  // Why: a retry that replaces a watch which was already live owes the renderer an overflow once it
-  // lands — the events lost while it was down are otherwise never signalled.
-  resyncOnInstall = false
-): void {
-  const key = remoteWatcherKey(connectionId, worktreePath)
-  const existingRetry = pendingRemoteWatcherRetryListeners.get(key)
-  if (existingRetry) {
-    if (!sender.isDestroyed()) {
-      existingRetry.listeners.set(sender.id, sender)
-    }
-    existingRetry.resyncOnInstall ||= resyncOnInstall
-    return
-  }
-
-  const retry = {
-    listeners: new Map(sender.isDestroyed() ? [] : [[sender.id, sender]]),
-    startedAt,
-    resyncOnInstall
-  }
-  pendingRemoteWatcherRetryListeners.set(key, retry)
-
-  if (Date.now() - startedAt >= REMOTE_WATCH_RETRY_TIMEOUT_MS || sender.isDestroyed()) {
-    pendingRemoteWatcherRetries.delete(key)
-    pendingRemoteWatcherRetryListeners.delete(key)
-    loggedUnavailableRemoteWatchers.delete(key)
-    clearRemoteWatcherResync(key)
-    // Why: handler already resolved so the renderer thinks the watch is live; emit overflow to force a manual refresh instead of waiting forever.
-    for (const listener of retry.listeners.values()) {
-      if (listener.isDestroyed() || !isCurrentDesiredRemoteWatcher(key, listener)) {
-        continue
-      }
-      console.warn(
-        `[filesystem-watcher] giving up SSH watch retry for ${worktreePath} on connection ${connectionId} after ${REMOTE_WATCH_RETRY_TIMEOUT_MS}ms`
-      )
-      listener.send('fs:changed', {
-        worktreePath,
-        events: [{ kind: 'overflow', absolutePath: worktreePath }]
-      } satisfies FsChangedPayload)
-    }
-    // Why: overflow only refreshes once — without this the watch stays dead until the app restarts.
-    scheduleDormantRemoteWatcherRearm(connectionId, worktreePath)
-    return
-  }
-
-  const retryTimer = setTimeout(() => {
-    pendingRemoteWatcherRetries.delete(key)
-    pendingRemoteWatcherRetryListeners.delete(key)
-    const listeners = Array.from(retry.listeners.values()).filter(
-      (listener) => !listener.isDestroyed() && isCurrentDesiredRemoteWatcher(key, listener)
-    )
-    void Promise.all(
-      listeners.map((listener) => installRemoteWatcher(listener, connectionId, worktreePath))
-    )
-      .then((results) => {
-        if (retry.resyncOnInstall) {
-          requestRemoteWatcherResync(
-            key,
-            worktreePath,
-            listeners.filter((_, index) => results[index] === 'installed')
-          )
-        }
-        // Why: don't re-arm on 'cancelled' (renderer stopped watching) — it would fire a stale overflow when the 60s window expires.
-        if (results.some((result) => result === 'unavailable')) {
-          for (const listener of listeners) {
-            scheduleRemoteWatcherRetry(
-              listener,
-              connectionId,
-              worktreePath,
-              retry.startedAt,
-              retry.resyncOnInstall
-            )
-          }
-        }
-      })
-      .catch((error: unknown) => {
-        if (isWatcherRemovalInProgressError(error)) {
-          return
-        }
-        for (const listener of listeners) {
-          scheduleRemoteWatcherRetry(
-            listener,
-            connectionId,
-            worktreePath,
-            retry.startedAt,
-            retry.resyncOnInstall
-          )
-        }
-      })
-  }, REMOTE_WATCH_RETRY_MS)
-  pendingRemoteWatcherRetries.set(key, retryTimer)
-}
+import {
+  closeLocalWatcherForWorktreePath,
+  forgetLocalWatcherRemovalSnapshot,
+  restoreLocalWatcherAfterFailedRemoval
+} from './filesystem-watcher-local-removal'
+import {
+  closeRemoteWatcherForWorktreePath,
+  forgetRemoteWatcherRemovalSnapshot,
+  restoreRemoteWatcherAfterFailedRemoval
+} from './filesystem-watcher-remote-removal'
+
+export { closeLocalWatcherForWorktreePath } from './filesystem-watcher-local-removal'
+export { restoreLocalWatcherAfterFailedRemoval } from './filesystem-watcher-local-removal'
+export { forgetLocalWatcherRemovalSnapshot } from './filesystem-watcher-local-removal'
+export { closeRemoteWatcherForWorktreePath } from './filesystem-watcher-remote-removal'
+export { restoreRemoteWatcherAfterFailedRemoval } from './filesystem-watcher-remote-removal'
+export { forgetRemoteWatcherRemovalSnapshot } from './filesystem-watcher-remote-removal'
+export { registerFilesystemWatcherHandlers } from './filesystem-watcher-handlers'
+export { closeAllWatchers } from './filesystem-watcher-shutdown'
 
 // ── Public API ───────────────────────────────────────────────────────
 
-export function registerFilesystemWatcherHandlers(): void {
-  // Why: re-registration replaces the handler set, so drop the previous subscription instead of
-  // stacking a second re-arm on every provider registration.
-  unsubscribeFromProviderRegistrations?.()
-  unsubscribeFromProviderRegistrations = onSshFilesystemProviderRegistered(
-    reinstallRemoteWatchersForConnection
-  )
-
-  ipcMain.handle(
-    'fs:watchWorktree',
-    async (event, args: { worktreePath: string; connectionId?: string }): Promise<void> => {
-      if (args.connectionId) {
-        // Why: a real new watch reopens the subsystem after closeAllWatchers latched it shut (also resets tests between cases).
-        remoteWatchersClosed = false
-        const key = remoteWatcherKey(args.connectionId, args.worktreePath)
-        // Why: record intent before the install so a provider registering mid-flight (or long after
-        // this attempt gives up) can still re-arm this listener.
-        rememberDesiredRemoteWatcher(args.connectionId, args.worktreePath, event.sender)
-        const result = await installRemoteWatcher(
-          event.sender,
-          args.connectionId,
-          args.worktreePath
-        )
-        if (result === 'unavailable') {
-          if (!loggedUnavailableRemoteWatchers.has(key)) {
-            loggedUnavailableRemoteWatchers.add(key)
-            console.warn(
-              `[filesystem-watcher] SSH filesystem provider unavailable; retrying watch for ${args.worktreePath} on connection ${args.connectionId}`
-            )
-          }
-          scheduleRemoteWatcherRetry(event.sender, args.connectionId, args.worktreePath)
-          return
-        }
-        return
-      }
-      // Why: reopen the local subsystem for tests and post-shutdown reattachment; stale callers keep the prior generation.
-      localWatchersClosed = false
-      await subscribe(args.worktreePath, event.sender)
-    }
-  )
-
-  ipcMain.handle(
-    'fs:unwatchWorktree',
-    (_event, args: { worktreePath: string; connectionId?: string }): void => {
-      if (args.connectionId) {
-        const key = remoteWatcherKey(args.connectionId, args.worktreePath)
-        // Why: the caller stopped watching on purpose — drop the intent or a later provider
-        // registration would resurrect a watch nobody asked for.
-        forgetDesiredRemoteWatcher(key, _event.sender.id)
-        const suspended = suspendedRemoteWatcherListeners.get(key)
-        suspended?.listeners.delete(_event.sender.id)
-        if (suspended?.listeners.size === 0) {
-          suspendedRemoteWatcherListeners.delete(key)
-        }
-        const retry = pendingRemoteWatcherRetryListeners.get(key)
-        retry?.listeners.delete(_event.sender.id)
-        const retryTimer = pendingRemoteWatcherRetries.get(key)
-        if (retryTimer && retry?.listeners.size === 0) {
-          clearTimeout(retryTimer)
-          pendingRemoteWatcherRetries.delete(key)
-          pendingRemoteWatcherRetryListeners.delete(key)
-        }
-        // Why: a retry-tick provider.watch() may still be in flight; mark cancelled so its resolved unwatch handle is discarded.
-        const inFlight = inFlightRemoteInstalls.get(key)
-        if (inFlight) {
-          inFlight.listeners.delete(_event.sender.id)
-          cancelInFlightRemoteInstallIfUnowned(inFlight)
-        }
-        loggedUnavailableRemoteWatchers.delete(key)
-        releaseRemoteWatchListener(key, _event?.sender?.id ?? 0)
-        return
-      }
-      const senderId = _event.sender.id
-      unsubscribe(args.worktreePath, senderId)
-    }
-  )
-}
-
-function remoteWatcherKey(connectionId: string, worktreePath: string): string {
-  return JSON.stringify([connectionId, normalizeRuntimePathForComparison(worktreePath)])
-}
-
-function rememberDesiredRemoteWatcher(
-  connectionId: string,
-  worktreePath: string,
-  sender: WebContents
-): void {
-  if (sender.isDestroyed()) {
-    return
-  }
-  const key = remoteWatcherKey(connectionId, worktreePath)
-  const desired = desiredRemoteWatchers.get(key) ?? {
-    connectionId,
-    worktreePath,
-    listeners: new Map<number, WebContents>()
-  }
-  desired.listeners.set(sender.id, sender)
-  desiredRemoteWatchers.set(key, desired)
-  registerSenderCleanup(sender)
-}
-
-function forgetDesiredRemoteWatcher(key: string, senderId: number): void {
-  const desired = desiredRemoteWatchers.get(key)
-  if (!desired) {
-    return
-  }
-  desired.listeners.delete(senderId)
-  if (desired.listeners.size === 0) {
-    desiredRemoteWatchers.delete(key)
-    clearRemoteWatcherResync(key)
-    clearDormantRemoteWatcher(key)
-  }
-}
-
-function clearDormantRemoteWatcher(key: string): void {
-  const dormant = dormantRemoteWatchers.get(key)
-  if (!dormant) {
-    return
-  }
-  clearTimeout(dormant.timer)
-  dormantRemoteWatchers.delete(key)
-}
-
-function scheduleDormantRemoteWatcherRearm(
-  connectionId: string,
-  worktreePath: string,
-  delayMs = REMOTE_WATCH_DORMANT_RETRY_MS
-): void {
-  const key = remoteWatcherKey(connectionId, worktreePath)
-  if (remoteWatchersClosed || !desiredRemoteWatchers.has(key) || dormantRemoteWatchers.has(key)) {
-    return
-  }
-  const timer = setTimeout(() => {
-    dormantRemoteWatchers.delete(key)
-    void rearmDormantRemoteWatcher(key, connectionId, worktreePath, delayMs)
-  }, delayMs)
-  // Why: a half-hour timer shouldn't be what keeps the process alive at quit.
-  timer.unref?.()
-  dormantRemoteWatchers.set(key, { delayMs, timer })
-}
-
-async function rearmDormantRemoteWatcher(
-  key: string,
-  connectionId: string,
-  worktreePath: string,
-  delayMs: number
-): Promise<void> {
-  const desired = desiredRemoteWatchers.get(key)
-  if (remoteWatchersClosed || !desired) {
-    return
-  }
-  for (const [senderId, sender] of Array.from(desired.listeners)) {
-    if (sender.isDestroyed()) {
-      desired.listeners.delete(senderId)
-    }
-  }
-  if (desired.listeners.size === 0) {
-    desiredRemoteWatchers.delete(key)
-    return
-  }
-  // Why: a live watch or an in-flight fast retry already owns this key; installing again would
-  // clobber the entry the running watch reads its listeners from.
-  if (remoteWatchers.has(key) || pendingRemoteWatcherRetries.has(key)) {
-    return
-  }
-  // Why: no provider means the connection itself is down, and its registration re-arms for free —
-  // polling would only add wire traffic to a link that is already being rebuilt.
-  if (!getSshFilesystemProvider(connectionId)) {
-    return
-  }
-
-  const listeners = Array.from(desired.listeners.values())
-  let results: RemoteWatcherInstallResult[]
-  try {
-    results = await Promise.all(
-      listeners.map((listener) => installRemoteWatcher(listener, connectionId, worktreePath))
-    )
-  } catch (error) {
-    if (isWatcherRemovalInProgressError(error)) {
-      // Why: removal owns the key now and either forgets the intent or restores the watch itself.
-      return
-    }
-    scheduleDormantRemoteWatcherRearm(connectionId, worktreePath, nextDormantDelayMs(delayMs))
-    return
-  }
-  requestRemoteWatcherResync(
-    key,
-    worktreePath,
-    listeners.filter((_, index) => results[index] === 'installed')
-  )
-  // Why: 'cancelled' means shutdown or the last listener left, so only 'unavailable' stays dormant.
-  if (results.some((result) => result === 'unavailable')) {
-    scheduleDormantRemoteWatcherRearm(connectionId, worktreePath, nextDormantDelayMs(delayMs))
-  }
-}
-
-function nextDormantDelayMs(delayMs: number): number {
-  return Math.min(delayMs * 2, REMOTE_WATCH_DORMANT_RETRY_MAX_MS)
-}
-
-/**
- * Rebuild remote watches for a connection whose filesystem provider was just (re)registered.
- *
- * Why: the relay's watch registrations die with the transport they were made on, and the previous
- * provider's unwatch handle is scoped to that dead transport. Reinstalling is the only way the
- * subscription comes back, and consumers get an overflow so they resync whatever changed while the
- * watch was down.
- */
-function reinstallRemoteWatchersForConnection(connectionId: string): void {
-  if (remoteWatchersClosed) {
-    return
-  }
-  for (const [key, desired] of Array.from(desiredRemoteWatchers)) {
-    if (desired.connectionId !== connectionId) {
-      continue
-    }
-    for (const [senderId, sender] of Array.from(desired.listeners)) {
-      if (sender.isDestroyed()) {
-        desired.listeners.delete(senderId)
-      }
-    }
-    if (desired.listeners.size === 0) {
-      desiredRemoteWatchers.delete(key)
-      continue
-    }
-
-    // Why: drop the entry the dead transport left behind first — installRemoteWatcher treats an
-    // existing entry as already-installed and would hand back a watcher that can never fire again.
-    const stale = remoteWatchers.get(key)
-    if (stale) {
-      remoteWatchers.delete(key)
-      stale.batch.close()
-      try {
-        stale.unwatch()
-      } catch {
-        // Why: the handle belongs to the replaced transport; failing to close it is expected.
-      }
-    }
-    const retryTimer = pendingRemoteWatcherRetries.get(key)
-    if (retryTimer) {
-      clearTimeout(retryTimer)
-      pendingRemoteWatcherRetries.delete(key)
-      pendingRemoteWatcherRetryListeners.delete(key)
-    }
-    // Why: a pending watch belongs to the replaced transport; joiners must retry on the new provider.
-    const inFlight = inFlightRemoteInstalls.get(key)
-    if (inFlight) {
-      inFlight.listeners.clear()
-      inFlight.cancelled = true
-      inFlight.abortController.abort()
-    }
-    // Why: this reinstall supersedes the pending backoff; leaving it armed double-installs the key.
-    clearDormantRemoteWatcher(key)
-    loggedUnavailableRemoteWatchers.delete(key)
-
-    const listeners = Array.from(desired.listeners.values())
-    void Promise.all(
-      listeners.map((listener) =>
-        installRemoteWatcher(listener, desired.connectionId, desired.worktreePath)
-      )
-    )
-      .then((results) => {
-        // Why: events between the transport dropping and this reinstall are gone for good.
-        requestRemoteWatcherResync(
-          key,
-          desired.worktreePath,
-          listeners.filter((_, index) => results[index] === 'installed')
-        )
-        if (results.some((result) => result === 'unavailable')) {
-          for (const listener of listeners) {
-            scheduleRemoteWatcherRetry(
-              listener,
-              desired.connectionId,
-              desired.worktreePath,
-              Date.now(),
-              true
-            )
-          }
-        }
-      })
-      .catch((error: unknown) => {
-        if (isWatcherRemovalInProgressError(error)) {
-          return
-        }
-        for (const listener of listeners) {
-          scheduleRemoteWatcherRetry(
-            listener,
-            desired.connectionId,
-            desired.worktreePath,
-            Date.now(),
-            true
-          )
-        }
-      })
-  }
-}
-
-/** Tear down all watchers on app shutdown. */
-export async function closeAllWatchers(): Promise<void> {
-  // Why: drop the intent with the rest of the state, but keep the provider-registration
-  // subscription — a new fs:watchWorktree reopens the subsystem and still needs the re-arm hook.
-  desiredRemoteWatchers.clear()
-  senderCleanupRegistered.clear()
-  unwatchableRoots.clear()
-  suspendedLocalWatcherListeners.clear()
-  suspendedRemoteWatcherListeners.clear()
-  for (const retry of pendingLocalCapacityRetries.values()) {
-    retry.cancelWait()
-  }
-  pendingLocalCapacityRetries.clear()
-
-  // Cancel any pending grace-period teardowns — we're tearing down everything.
-  for (const timer of pendingTeardowns.values()) {
-    clearTimeout(timer)
-  }
-  pendingTeardowns.clear()
-
-  for (const timer of pendingRemoteWatcherRetries.values()) {
-    clearTimeout(timer)
-  }
-  pendingRemoteWatcherRetries.clear()
-  pendingRemoteWatcherRetryListeners.clear()
-  for (const state of remoteWatcherResyncStates.values()) {
-    if (state.timer) {
-      clearTimeout(state.timer)
-    }
-  }
-  remoteWatcherResyncStates.clear()
-  for (const dormant of dormantRemoteWatchers.values()) {
-    clearTimeout(dormant.timer)
-  }
-  dormantRemoteWatchers.clear()
-  loggedUnavailableRemoteWatchers.clear()
-  // Why: latch both subsystems shut so late installs can't register; generation bumps reject older-lifecycle waiters.
-  remoteWatchersClosed = true
-  remoteWatcherLifecycleGeneration += 1
-  localWatchersClosed = true
-  localWatcherLifecycleGeneration += 1
-  pendingRemoteInstallPromises.clear()
-  // Why: cancel in-flight provider.watch() calls so their resolved unwatch handles aren't installed post-shutdown.
-  for (const token of inFlightRemoteInstalls.values()) {
-    token.listeners.clear()
-    token.cancelled = true
-    token.abortController.abort()
-  }
-  for (const token of inFlightLocalInstalls.values()) {
-    token.listeners.clear()
-    token.cancelled = true
-    token.abortController.abort()
-  }
-
-  for (const [rootKey, root] of watchedRoots) {
-    if (root.batch.timer) {
-      clearTimeout(root.batch.timer)
-    }
-    await trackLocalUnsubscribe(rootKey, root).catch(() => undefined)
-  }
-  watchedRoots.clear()
-  await Promise.allSettled(Array.from(pendingLocalUnsubscribes))
-  failedLocalUnsubscribes.clear()
-  // Why: kill the forked watcher process instead of watcher.node's crash-prone async teardown; process death frees native handles.
-  disposeWatcherProcess()
-
-  // Why: remote watchers are separate from local @parcel/watcher subs; unwatch here or the relay keeps polling FS after shutdown.
-  for (const [key, state] of remoteWatchers) {
-    state.batch.close()
-    try {
-      state.unwatch()
-    } catch (err) {
-      console.error(`[filesystem-watcher] remote unwatch error for ${key}:`, err)
-    }
-  }
-  remoteWatchers.clear()
-}
-
 /** The desktop binding for {@link WorktreeWatcherRemoval}. Installed during startup. */
 export const desktopWorktreeWatcherRemoval: WorktreeWatcherRemoval = {
   closeLocal: (worktreePath, deadline) =>
diff --git a/src/main/ipc/orca-profiles.ts b/src/main/ipc/orca-profiles.ts
index 497da481ae0..bf1bf666270 100644
--- a/src/main/ipc/orca-profiles.ts
+++ b/src/main/ipc/orca-profiles.ts
@@ -169,17 +169,13 @@ export function registerOrcaProfileHandlers(
   store: Store,
   options: RegisterOrcaProfileHandlersOptions = {}
 ): void {
-  ipcMain.handle(
-    'orcaProfiles:list',
-    (): OrcaProfileListResult => ({
-      ...getOrcaProfileListState(),
-      multiProfileUi: isMultiProfileUiEnabled()
-    })
-  )
+  ipcMain.handle('orcaProfiles:list', (): OrcaProfileListResult => ({
+    ...getOrcaProfileListState(),
+    multiProfileUi: isMultiProfileUiEnabled()
+  }))
 
-  ipcMain.handle(
-    'orcaProfiles:authStatus',
-    (): OrcaProfileAuthStatus => getCurrentOrcaProfileAuthStatus(getProfileUserDataPath())
+  ipcMain.handle('orcaProfiles:authStatus', (): OrcaProfileAuthStatus =>
+    getCurrentOrcaProfileAuthStatus(getProfileUserDataPath())
   )
 
   ipcMain.handle(
diff --git a/src/main/ipc/pet.ts b/src/main/ipc/pet.ts
index 88cacffc6fa..3521482ef41 100644
--- a/src/main/ipc/pet.ts
+++ b/src/main/ipc/pet.ts
@@ -81,9 +81,8 @@ export function registerPetHandlers(): void {
     }
   })
 
-  ipcMain.handle(
-    'pet:importPetBundle',
-    async (event): Promise<CustomPet | null> => importPetBundle(event)
+  ipcMain.handle('pet:importPetBundle', async (event): Promise<CustomPet | null> =>
+    importPetBundle(event)
   )
 
   ipcMain.handle(
diff --git a/src/main/ipc/pty/register-headless-runtime.test.ts b/src/main/ipc/pty/register-headless-runtime.test.ts
new file mode 100644
index 00000000000..7063ec2454d
--- /dev/null
+++ b/src/main/ipc/pty/register-headless-runtime.test.ts
@@ -0,0 +1,41 @@
+import { describe, expect, it, vi } from 'vitest'
+
+const { hydrateMock, registerHandlersMock } = vi.hoisted(() => ({
+  hydrateMock: vi.fn(),
+  registerHandlersMock: vi.fn()
+}))
+
+vi.mock('./register-handlers', () => ({
+  registerPtyHandlers: registerHandlersMock
+}))
+
+vi.mock('../../memory/hydrate-local-pty-registry', () => ({
+  hydrateLocalPtyRegistryAtBoot: hydrateMock
+}))
+
+import { registerHeadlessPtyRuntime } from './register-headless-runtime'
+
+describe('registerHeadlessPtyRuntime', () => {
+  it('registers handlers before awaiting registry hydration', async () => {
+    let resolveHydration!: () => void
+    const hydration = new Promise<void>((resolve) => {
+      resolveHydration = resolve
+    })
+    const events: string[] = []
+    registerHandlersMock.mockImplementation(() => events.push('handlers'))
+    hydrateMock.mockImplementation(() => {
+      events.push('hydrate')
+      return hydration
+    })
+    const store = {} as never
+
+    const ready = registerHeadlessPtyRuntime({} as never, undefined, undefined, undefined, store)
+
+    expect(events).toEqual(['handlers', 'hydrate'])
+    expect(registerHandlersMock).toHaveBeenCalledOnce()
+    expect(hydrateMock).toHaveBeenCalledWith(store)
+
+    resolveHydration()
+    await ready
+  })
+})
diff --git a/src/main/ipc/pty/register-headless-runtime.ts b/src/main/ipc/pty/register-headless-runtime.ts
index f380482a079..2212fbfac3a 100644
--- a/src/main/ipc/pty/register-headless-runtime.ts
+++ b/src/main/ipc/pty/register-headless-runtime.ts
@@ -9,6 +9,7 @@ import type {
   PrepareCodexSessionResume
 } from './host-env/types'
 import { registerPtyHandlers } from './register-handlers'
+import { hydrateLocalPtyRegistryAtBoot } from '../../memory/hydrate-local-pty-registry'
 
 export function registerHeadlessPtyRuntime(
   runtime: OrcaRuntimeService,
@@ -21,7 +22,7 @@ export function registerHeadlessPtyRuntime(
     onCodexHomePtySpawned?: (args: CodexHomePtySpawnedLifecycleArgs) => void
     onPtyExit?: (id: string, exitSequence: number) => void
   }
-): void {
+): Promise<void> {
   // Why: headless `orca serve` has no renderer window but still needs the same PTY handlers so remote clients can drive terminals.
   // Why a fake rather than null: `registerPtyHandlers` takes a non-null BrowserWindow. `isDestroyed: () => true`
   // is what makes that safe — every renderer-liveness guard reads it and skips, so no send is ever attempted.
@@ -44,4 +45,5 @@ export function registerHeadlessPtyRuntime(
     store,
     { prepareCodexSessionResume, ...lifecycle }
   )
+  return store ? hydrateLocalPtyRegistryAtBoot(store) : Promise.resolve()
 }
diff --git a/src/main/ipc/registered-worktree-roots-cache.ts b/src/main/ipc/registered-worktree-roots-cache.ts
index 8ca19984298..92ae4fc334f 100644
--- a/src/main/ipc/registered-worktree-roots-cache.ts
+++ b/src/main/ipc/registered-worktree-roots-cache.ts
@@ -7,6 +7,9 @@ import { isDescendantOrEqual, normalizeExistingPath } from './filesystem-path-co
 const registeredWorktreeRoots = new Set<string>()
 const registeredWorktreeRootsByRepo = new Map<string, Set<string>>()
 const registeredWorktreeRootRepoIds = new Set<string>()
+const registeredWorktreeRootsRevisionByRepo = new Map<string, number>()
+let registeredWorktreeRootsRevisionSequence = 0
+let registeredWorktreeRootsBaseRevision = 0
 let registeredWorktreeRootsDirty = true
 let registeredWorktreeRootsRefresh: Promise<void> | null = null
 const AUTHORIZED_ROOTS_REBUILD_CONCURRENCY = 8
@@ -17,6 +20,8 @@ export function invalidateAuthorizedRootsCache(): void {
   registeredWorktreeRoots.clear()
   registeredWorktreeRootsByRepo.clear()
   registeredWorktreeRootRepoIds.clear()
+  registeredWorktreeRootsBaseRevision = ++registeredWorktreeRootsRevisionSequence
+  registeredWorktreeRootsRevisionByRepo.clear()
 }
 
 export async function rebuildAuthorizedRootsCache(store: Store): Promise<void> {
@@ -55,6 +60,8 @@ export async function rebuildAuthorizedRootsCache(store: Store): Promise<void> {
     registeredWorktreeRootRepoIds.add(repoId)
   }
   registeredWorktreeRootsDirty = false
+  registeredWorktreeRootsBaseRevision = ++registeredWorktreeRootsRevisionSequence
+  registeredWorktreeRootsRevisionByRepo.clear()
 }
 
 async function mapWithConcurrency<T, R>(
@@ -87,6 +94,10 @@ export function registerWorktreeRootsForRepo(
     if (!localRepoIds.has(registeredRepoId)) {
       registeredWorktreeRootsByRepo.delete(registeredRepoId)
       registeredWorktreeRootRepoIds.delete(registeredRepoId)
+      registeredWorktreeRootsRevisionByRepo.set(
+        registeredRepoId,
+        ++registeredWorktreeRootsRevisionSequence
+      )
     }
   }
 
@@ -98,10 +109,15 @@ export function registerWorktreeRootsForRepo(
 
   registeredWorktreeRootsByRepo.set(repoId, new Set(worktreeRoots.map((root) => resolve(root))))
   registeredWorktreeRootRepoIds.add(repoId)
+  registeredWorktreeRootsRevisionByRepo.set(repoId, ++registeredWorktreeRootsRevisionSequence)
   refreshRegisteredWorktreeRoots()
   registeredWorktreeRootsDirty = !allLocalRepoRootsRegistered(localRepoIds)
 }
 
+export function getRegisteredWorktreeRootsRevision(repoId: string): number {
+  return registeredWorktreeRootsRevisionByRepo.get(repoId) ?? registeredWorktreeRootsBaseRevision
+}
+
 export async function ensureAuthorizedRootsCache(store: Store): Promise<void> {
   if (!registeredWorktreeRootsDirty) {
     return
diff --git a/src/main/ipc/remote-watcher-event-batch.test.ts b/src/main/ipc/remote-watcher-event-batch.test.ts
index 99f7afee014..96dfe564724 100644
--- a/src/main/ipc/remote-watcher-event-batch.test.ts
+++ b/src/main/ipc/remote-watcher-event-batch.test.ts
@@ -182,13 +182,10 @@ describe('createRemoteWatcherEventBatch', () => {
 
     for (let i = 0; i < 3; i++) {
       batch.push(
-        Array.from(
-          { length: 50 },
-          (_unused, index): FsChangeEvent => ({
-            kind: 'update',
-            absolutePath: `${ROOT}/wave-${i}-${index}.ts`
-          })
-        )
+        Array.from({ length: 50 }, (_unused, index): FsChangeEvent => ({
+          kind: 'update',
+          absolutePath: `${ROOT}/wave-${i}-${index}.ts`
+        }))
       )
     }
     vi.advanceTimersByTime(150)
diff --git a/src/main/ipc/ssh-pty-model-admission-pressure.ts b/src/main/ipc/ssh-pty-model-admission-pressure.ts
index 256c37bb8dd..e5ce722f941 100644
--- a/src/main/ipc/ssh-pty-model-admission-pressure.ts
+++ b/src/main/ipc/ssh-pty-model-admission-pressure.ts
@@ -107,7 +107,7 @@ export class SshPtyModelAdmissionPressure {
     if (options.disposed) {
       return
     }
-    for (let index = 0; index < this.entries.length; ) {
+    for (let index = 0; index < this.entries.length;) {
       const entry = this.entries[index]!
       const hasEarlierEntryForPty = this.entries
         .slice(0, index)
diff --git a/src/main/ipc/workspace-cleanup-broad-scan.test.ts b/src/main/ipc/workspace-cleanup-broad-scan.test.ts
index 0bfa3e3ccc9..66555d216ac 100644
--- a/src/main/ipc/workspace-cleanup-broad-scan.test.ts
+++ b/src/main/ipc/workspace-cleanup-broad-scan.test.ts
@@ -447,16 +447,13 @@ describe('workspace cleanup broad scan opt-in', () => {
   it('batches fleet progress instead of emitting one IPC payload per row', async () => {
     const worktrees = [
       GIT_WORKTREES[0],
-      ...Array.from(
-        { length: 200 },
-        (_, index): GitWorktreeInfo => ({
-          path: `/repo-batch-${index}`,
-          head: `head-${index}`,
-          branch: `refs/heads/batch-${index}`,
-          isBare: false,
-          isMainWorktree: false
-        })
-      )
+      ...Array.from({ length: 200 }, (_, index): GitWorktreeInfo => ({
+        path: `/repo-batch-${index}`,
+        head: `head-${index}`,
+        branch: `refs/heads/batch-${index}`,
+        isBare: false,
+        isMainWorktree: false
+      }))
     ]
     listRepoWorktreesMock.mockResolvedValue(worktrees)
     const onProgress = vi.fn()
diff --git a/src/main/ipc/workspace-cleanup.test.ts b/src/main/ipc/workspace-cleanup.test.ts
index 6f5d3d74a9b..1bc9d8740b3 100644
--- a/src/main/ipc/workspace-cleanup.test.ts
+++ b/src/main/ipc/workspace-cleanup.test.ts
@@ -767,18 +767,15 @@ describe('workspace cleanup scan', () => {
   })
 
   it('summarizes large diff-note lists without hitting argument limits', async () => {
-    const diffComments = Array.from(
-      { length: 150_000 },
-      (_, index): DiffComment => ({
-        id: `comment-${index}`,
-        worktreeId: 'repo-1::/repo-feature',
-        filePath: 'src/file.ts',
-        lineNumber: 12,
-        body: 'Follow up before deleting',
-        createdAt: NOW - index,
-        side: 'modified'
-      })
-    )
+    const diffComments = Array.from({ length: 150_000 }, (_, index): DiffComment => ({
+      id: `comment-${index}`,
+      worktreeId: 'repo-1::/repo-feature',
+      filePath: 'src/file.ts',
+      lineNumber: 12,
+      body: 'Follow up before deleting',
+      createdAt: NOW - index,
+      side: 'modified'
+    }))
 
     const result = await scanWorkspaceCleanup(
       makeStore({
diff --git a/src/main/ipc/workspace-cleanup.ts b/src/main/ipc/workspace-cleanup.ts
index ef120a837ad..23bbf55602f 100644
--- a/src/main/ipc/workspace-cleanup.ts
+++ b/src/main/ipc/workspace-cleanup.ts
@@ -127,10 +127,8 @@ export function registerWorkspaceCleanupHandlers(
     return true
   })
 
-  ipcMain.handle(
-    'workspaceCleanup:getCachedScan',
-    (): Promise<WorkspaceCleanupScanResult | null> =>
-      readWorkspaceCleanupScanSnapshot(snapshotDirectory)
+  ipcMain.handle('workspaceCleanup:getCachedScan', (): Promise<WorkspaceCleanupScanResult | null> =>
+    readWorkspaceCleanupScanSnapshot(snapshotDirectory)
   )
 
   ipcMain.handle('workspaceCleanup:dismiss', (_event, args: WorkspaceCleanupDismissArgs) => {
diff --git a/src/main/ipc/workspace-space.ts b/src/main/ipc/workspace-space.ts
index 5b10b039b31..e6165dd1059 100644
--- a/src/main/ipc/workspace-space.ts
+++ b/src/main/ipc/workspace-space.ts
@@ -114,10 +114,8 @@ export function registerWorkspaceSpaceHandlers(store: Store): void {
     return inFlightScan.promise
   })
 
-  ipcMain.handle(
-    'workspaceSpace:getCachedAnalysis',
-    (): Promise<WorkspaceSpaceAnalysis | null> =>
-      readWorkspaceSpaceAnalysisSnapshot(snapshotDirectory)
+  ipcMain.handle('workspaceSpace:getCachedAnalysis', (): Promise<WorkspaceSpaceAnalysis | null> =>
+    readWorkspaceSpaceAnalysisSnapshot(snapshotDirectory)
   )
 
   ipcMain.handle('workspaceSpace:cancel', async (): Promise<boolean> => {
diff --git a/src/main/ipc/worktree-base-directory-watch-targets.test.ts b/src/main/ipc/worktree-base-directory-watch-targets.test.ts
new file mode 100644
index 00000000000..250b3d7625d
--- /dev/null
+++ b/src/main/ipc/worktree-base-directory-watch-targets.test.ts
@@ -0,0 +1,232 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { join, sep } from 'node:path'
+import type { GlobalSettings } from '../../shared/global-settings-types'
+import type { Repo } from '../../shared/repo-types'
+
+const { getSshFilesystemProviderMock, readFileMock, realpathMock, statMock } = vi.hoisted(() => ({
+  getSshFilesystemProviderMock: vi.fn(),
+  readFileMock: vi.fn(),
+  realpathMock: vi.fn(),
+  statMock: vi.fn()
+}))
+
+vi.mock('node:fs/promises', () => ({
+  readFile: readFileMock,
+  realpath: realpathMock,
+  stat: statMock
+}))
+
+vi.mock('../providers/ssh-filesystem-dispatch', () => ({
+  getSshFilesystemProvider: getSshFilesystemProviderMock
+}))
+
+import {
+  buildWorktreeBaseDirectoryWatchTargets,
+  clearWorktreeBaseDirectoryWatchTargetWarnings,
+  WORKTREE_BASE_TARGET_RESOLUTION_CONCURRENCY
+} from './worktree-base-directory-watch-targets'
+
+const absolutePath = (...parts: string[]): string => join(sep, ...parts)
+const WORKTREE_ROOT = absolutePath('workspace', 'worktrees')
+const PROJECT_ROOT = absolutePath('workspace', 'projects')
+const localDirectoryStat = { isDirectory: () => true }
+const remoteDirectoryStat = { type: 'directory', size: 0, mtime: 0 }
+const settings = {
+  workspaceDir: WORKTREE_ROOT,
+  nestWorkspaces: true
+} as GlobalSettings
+
+function makeRepo(index: number, overrides: Partial<Repo> = {}): Repo {
+  return {
+    id: `repo-${index}`,
+    path: join(PROJECT_ROOT, `project-${index}`),
+    displayName: `Project ${index}`,
+    badgeColor: '#000000',
+    addedAt: index,
+    ...overrides
+  } as Repo
+}
+
+function makeStore(repos: Repo[]) {
+  return {
+    getSettings: () => settings,
+    getRepos: () => repos
+  }
+}
+
+function makeRemoteProvider() {
+  return {
+    stat: vi.fn(async () => remoteDirectoryStat),
+    realpath: vi.fn(async (path: string) => path),
+    readFile: vi.fn(async () => ({ content: '', isBinary: false }))
+  }
+}
+
+describe('worktree base directory watch target resolution', () => {
+  let warnSpy: ReturnType<typeof vi.spyOn>
+
+  beforeEach(() => {
+    statMock.mockReset().mockResolvedValue(localDirectoryStat)
+    realpathMock.mockReset().mockImplementation(async (path: string) => path)
+    readFileMock.mockReset().mockResolvedValue('')
+    getSshFilesystemProviderMock.mockReset().mockReturnValue(undefined)
+    warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {})
+  })
+
+  afterEach(() => {
+    clearWorktreeBaseDirectoryWatchTargetWarnings()
+    warnSpy.mockRestore()
+  })
+
+  it('bounds resolution concurrency and starts one successor per released slot', async () => {
+    const repos = Array.from(
+      { length: WORKTREE_BASE_TARGET_RESOLUTION_CONCURRENCY + 4 },
+      (_, index) => makeRepo(index)
+    )
+    const gates = repos.map(() => Promise.withResolvers<void>())
+    let startedRootStats = 0
+    let activeRootStats = 0
+    let peakRootStats = 0
+    statMock.mockImplementation(async (path: string) => {
+      if (path === WORKTREE_ROOT) {
+        const gate = gates[startedRootStats++]
+        activeRootStats++
+        peakRootStats = Math.max(peakRootStats, activeRootStats)
+        await gate.promise
+        activeRootStats--
+      }
+      return localDirectoryStat
+    })
+
+    const resultPromise = buildWorktreeBaseDirectoryWatchTargets(makeStore(repos) as never)
+    await vi.waitFor(() => {
+      expect(startedRootStats).toBe(WORKTREE_BASE_TARGET_RESOLUTION_CONCURRENCY)
+    })
+    expect(peakRootStats).toBe(WORKTREE_BASE_TARGET_RESOLUTION_CONCURRENCY)
+
+    gates[0].resolve()
+    await vi.waitFor(() => {
+      expect(startedRootStats).toBe(WORKTREE_BASE_TARGET_RESOLUTION_CONCURRENCY + 1)
+    })
+    expect(peakRootStats).toBe(WORKTREE_BASE_TARGET_RESOLUTION_CONCURRENCY)
+
+    for (const gate of gates) {
+      gate.resolve()
+    }
+    await resultPromise
+    expect(startedRootStats).toBe(repos.length)
+    expect(peakRootStats).toBe(WORKTREE_BASE_TARGET_RESOLUTION_CONCURRENCY)
+  })
+
+  it('merges targets and shared repo membership in store order after reverse completion', async () => {
+    const repos = Array.from({ length: 4 }, (_, index) => makeRepo(index))
+    const gates = repos.map(() => Promise.withResolvers<void>())
+    const gitStatStarted = new Set<number>()
+    const completionOrder: number[] = []
+    statMock.mockImplementation(async (path: string) => {
+      const index = repos.findIndex((repo) => path === join(repo.path, '.git'))
+      if (index !== -1) {
+        gitStatStarted.add(index)
+        await gates[index].promise
+        completionOrder.push(index)
+      }
+      return localDirectoryStat
+    })
+
+    const resultPromise = buildWorktreeBaseDirectoryWatchTargets(makeStore(repos) as never)
+    await vi.waitFor(() => expect(gitStatStarted.size).toBe(repos.length))
+    for (let index = repos.length - 1; index >= 0; index--) {
+      gates[index].resolve()
+      await vi.waitFor(() => expect(completionOrder).toContain(index))
+    }
+    const targets = await resultPromise
+
+    expect(completionOrder).toEqual([3, 2, 1, 0])
+    expect([...targets.values()].map((target) => [target.kind, target.path])).toEqual([
+      ['base', WORKTREE_ROOT],
+      ...repos.map((repo) => ['git-common', join(repo.path, '.git')])
+    ])
+    expect([...([...targets.values()][0]?.repos.keys() ?? [])]).toEqual(
+      repos.map((repo) => repo.id)
+    )
+  })
+
+  it('isolates missing paths to the affected repo', async () => {
+    const missing = Object.assign(new Error('missing'), { code: 'ENOENT' })
+    const goodBefore = makeRepo(0, { worktreeBasePath: absolutePath('worktrees', 'before') })
+    const unavailable = makeRepo(1, { worktreeBasePath: absolutePath('worktrees', 'missing') })
+    const goodAfter = makeRepo(2, { worktreeBasePath: absolutePath('worktrees', 'after') })
+    statMock.mockImplementation(async (path: string) => {
+      if (path === unavailable.worktreeBasePath || path === join(unavailable.path, '.git')) {
+        throw missing
+      }
+      return localDirectoryStat
+    })
+
+    const targets = await buildWorktreeBaseDirectoryWatchTargets(
+      makeStore([goodBefore, unavailable, goodAfter]) as never
+    )
+    const repoIds = [...targets.values()].flatMap((target) => [...target.repos.keys()])
+
+    expect(repoIds).toContain(goodBefore.id)
+    expect(repoIds).not.toContain(unavailable.id)
+    expect(repoIds).toContain(goodAfter.id)
+  })
+
+  it('keeps identical SSH paths isolated by connection and provider', async () => {
+    const providerA = makeRemoteProvider()
+    const providerB = makeRemoteProvider()
+    getSshFilesystemProviderMock.mockImplementation((connectionId: string) =>
+      connectionId === 'ssh-a' ? providerA : connectionId === 'ssh-b' ? providerB : undefined
+    )
+    const sharedPath = '/srv/project'
+    const repos = [
+      makeRepo(0, { path: sharedPath, connectionId: 'ssh-a' }),
+      makeRepo(1, { path: sharedPath, connectionId: 'ssh-b' })
+    ]
+
+    const targets = await buildWorktreeBaseDirectoryWatchTargets(makeStore(repos) as never)
+
+    expect(providerA.stat).toHaveBeenCalledTimes(2)
+    expect(providerA.realpath).toHaveBeenCalledTimes(2)
+    expect(providerB.stat).toHaveBeenCalledTimes(2)
+    expect(providerB.realpath).toHaveBeenCalledTimes(2)
+    expect([...targets.values()].map((target) => target.connectionId)).toEqual([
+      'ssh-a',
+      'ssh-a',
+      'ssh-b',
+      'ssh-b'
+    ])
+    expect(new Set(targets.keys()).size).toBe(4)
+  })
+
+  it('skips folder workspaces, unavailable SSH providers, and WSL UNC roots', async () => {
+    const folder = makeRepo(0, { kind: 'folder' })
+    const unavailableSsh = makeRepo(1, { connectionId: 'missing', path: '/srv/missing' })
+    const wslPath = '\\\\wsl.localhost\\Ubuntu\\home\\alice\\project'
+    const wsl = makeRepo(2, { path: wslPath, worktreeBasePath: wslPath })
+
+    const targets = await buildWorktreeBaseDirectoryWatchTargets(
+      makeStore([folder, unavailableSsh, wsl]) as never
+    )
+
+    expect(targets.size).toBe(0)
+    expect(statMock).not.toHaveBeenCalled()
+    expect(getSshFilesystemProviderMock).toHaveBeenCalledWith('missing')
+  })
+
+  it('does not publish ordered partial targets when a repo resolver rejects unexpectedly', async () => {
+    const completed = makeRepo(0)
+    const broken = makeRepo(1)
+    Object.defineProperty(broken, 'path', {
+      get: () => {
+        throw new Error('unexpected resolver failure')
+      }
+    })
+
+    await expect(
+      buildWorktreeBaseDirectoryWatchTargets(makeStore([completed, broken]) as never)
+    ).rejects.toThrow('unexpected resolver failure')
+    expect(statMock).toHaveBeenCalled()
+  })
+})
diff --git a/src/main/ipc/worktree-base-directory-watch-targets.ts b/src/main/ipc/worktree-base-directory-watch-targets.ts
index cfa825e09ab..5300475593d 100644
--- a/src/main/ipc/worktree-base-directory-watch-targets.ts
+++ b/src/main/ipc/worktree-base-directory-watch-targets.ts
@@ -15,6 +15,7 @@ import {
   resolveRuntimePath
 } from '../../shared/cross-platform-path'
 import { isWslUncPath } from '../../shared/wsl-paths'
+import { mapWithConcurrency } from '../../shared/map-with-concurrency'
 import { getSshFilesystemProvider } from '../providers/ssh-filesystem-dispatch'
 import {
   computeWorkspaceRoot,
@@ -32,6 +33,9 @@ import type {
 const missingRootWarnings = new Set<string>()
 const skippedWslWarnings = new Set<string>()
 
+// Why: match existing worktree probe caps while bounding aggregate SSH filesystem RPC pressure.
+export const WORKTREE_BASE_TARGET_RESOLUTION_CONCURRENCY = 8
+
 function normalizeWatchKey(pathValue: string): string {
   return normalizeRuntimePathForComparison(normalize(pathValue))
 }
@@ -177,21 +181,51 @@ async function maybeAddBaseTarget(
   }
 }
 
+async function resolveRepoTargets(
+  repo: Repo,
+  settings: GlobalSettings
+): Promise<Map<string, WorktreeBaseWatchTarget>> {
+  const targets = new Map<string, WorktreeBaseWatchTarget>()
+  if (isFolderRepo(repo)) {
+    return targets
+  }
+  const executionHostId = getRepoExecutionHostId(repo)
+  if (executionHostId === LOCAL_EXECUTION_HOST_ID) {
+    await maybeAddBaseTarget(targets, repo, settings)
+  } else if (repo.connectionId) {
+    await maybeAddBaseTarget(targets, repo, settings, repo.connectionId)
+  }
+  return targets
+}
+
+function mergeRepoTargets(
+  targets: Map<string, WorktreeBaseWatchTarget>,
+  repoTargets: Map<string, WorktreeBaseWatchTarget>
+): void {
+  for (const [key, target] of repoTargets) {
+    const existing = targets.get(key)
+    if (!existing) {
+      targets.set(key, target)
+      continue
+    }
+    for (const [repoId, config] of target.repos) {
+      existing.repos.set(repoId, config)
+    }
+  }
+}
+
 export async function buildWorktreeBaseDirectoryWatchTargets(
   store: Store
 ): Promise<Map<string, WorktreeBaseWatchTarget>> {
   const settings = store.getSettings()
+  const resolvedRepoTargets = await mapWithConcurrency(
+    store.getRepos(),
+    WORKTREE_BASE_TARGET_RESOLUTION_CONCURRENCY,
+    (repo) => resolveRepoTargets(repo, settings)
+  )
   const targets = new Map<string, WorktreeBaseWatchTarget>()
-  for (const repo of store.getRepos()) {
-    if (isFolderRepo(repo)) {
-      continue
-    }
-    const executionHostId = getRepoExecutionHostId(repo)
-    if (executionHostId === LOCAL_EXECUTION_HOST_ID) {
-      await maybeAddBaseTarget(targets, repo, settings)
-    } else if (repo.connectionId) {
-      await maybeAddBaseTarget(targets, repo, settings, repo.connectionId)
-    }
+  for (const repoTargets of resolvedRepoTargets) {
+    mergeRepoTargets(targets, repoTargets)
   }
   return targets
 }
diff --git a/src/main/ipc/worktree-remote-ssh-branch-conflict.test.ts b/src/main/ipc/worktree-remote-ssh-branch-conflict.test.ts
new file mode 100644
index 00000000000..7ced18eb173
--- /dev/null
+++ b/src/main/ipc/worktree-remote-ssh-branch-conflict.test.ts
@@ -0,0 +1,75 @@
+import { describe, expect, it, vi } from 'vitest'
+
+import { getSshBranchConflictKind } from './worktree-remote'
+
+type ConflictProvider = Parameters<typeof getSshBranchConflictKind>[0]
+
+function providerAnswering(answers: {
+  remotes: string[]
+  localBranchHead?: string
+  remoteRefs: string[]
+}): ConflictProvider {
+  const exec: ConflictProvider['exec'] = vi.fn(async (args: string[]) => {
+    if (args[0] === 'remote') {
+      return { stdout: `${answers.remotes.join('\n')}\n`, stderr: '' }
+    }
+    if (args[0] === 'rev-parse') {
+      if (!answers.localBranchHead) {
+        throw new Error('missing ref')
+      }
+      return { stdout: `${answers.localBranchHead}\n`, stderr: '' }
+    }
+    if (args[0] === 'for-each-ref') {
+      return { stdout: `${answers.remoteRefs.join('\n')}\n`, stderr: '' }
+    }
+    throw new Error(`unexpected git ${args.join(' ')}`)
+  })
+  return { exec }
+}
+
+describe('getSshBranchConflictKind remote ownership', () => {
+  it('reports a local branch before scanning remote refs', async () => {
+    const provider = providerAnswering({
+      localBranchHead: 'abc123',
+      remotes: ['origin'],
+      remoteRefs: []
+    })
+
+    await expect(
+      getSshBranchConflictKind(provider, '/srv/repo', 'my-task', 'origin/main')
+    ).resolves.toBe('local')
+  })
+
+  it('ignores a ref whose prefix matches no configured remote', async () => {
+    const provider = providerAnswering({
+      remotes: ['origin'],
+      remoteRefs: ['refs/remotes/origin/main', 'refs/remotes/deleted-fork/my-task']
+    })
+
+    await expect(
+      getSshBranchConflictKind(provider, '/srv/repo', 'my-task', 'origin/main')
+    ).resolves.toBeNull()
+  })
+
+  it('still reports a ref owned by a configured remote', async () => {
+    const provider = providerAnswering({
+      remotes: ['origin'],
+      remoteRefs: ['refs/remotes/origin/main', 'refs/remotes/origin/my-task']
+    })
+
+    await expect(
+      getSshBranchConflictKind(provider, '/srv/repo', 'my-task', 'origin/main')
+    ).resolves.toBe('remote')
+  })
+
+  it('prefers the longest configured remote name', async () => {
+    const provider = providerAnswering({
+      remotes: ['foo', 'foo/bar'],
+      remoteRefs: ['refs/remotes/foo/bar/my-task']
+    })
+
+    await expect(
+      getSshBranchConflictKind(provider, '/srv/repo', 'my-task', 'origin/main')
+    ).resolves.toBe('remote')
+  })
+})
diff --git a/src/main/ipc/worktree-remote.ts b/src/main/ipc/worktree-remote.ts
index 581872540df..d9908b7c05c 100644
--- a/src/main/ipc/worktree-remote.ts
+++ b/src/main/ipc/worktree-remote.ts
@@ -34,6 +34,7 @@ import {
   resolveDefaultBaseRefViaExec,
   resolveDefaultBaseRefWithLocalGit
 } from '../git/repo'
+import { getBranchConflictKindViaExec } from '../git/repo-branch-conflict'
 import { resolveLocalGitUsername, getSshGitUsername } from '../git/git-username'
 import { hasCommitObjectViaGitExec } from '../git/commit-object-ref'
 import { probeWorktreeBaseRefPresence } from '../git/worktree-base-ref-probe'
@@ -839,98 +840,19 @@ async function canCheckoutExistingLocalBranchSsh(
   return !worktrees.some((worktree) => normalizeLocalBranchName(worktree.branch) === branchName)
 }
 
-async function listSshRemoteNames(provider: SshGitProvider, repoPath: string): Promise<string[]> {
-  try {
-    const { stdout } = await provider.exec(['remote'], repoPath)
-    return stdout
-      .split(/\r?\n/)
-      .map((line) => line.trim())
-      .filter(Boolean)
-      .sort((a, b) => b.length - a.length)
-  } catch {
-    return []
-  }
-}
+type SshGitExecutor = Pick<SshGitProvider, 'exec'>
 
-function isAllowedSshRemoteBaseRef(refName: string, allowedBaseRef: string): boolean {
-  if (!allowedBaseRef) {
-    return false
-  }
-  const normalizedAllowedRef = allowedBaseRef.startsWith('refs/remotes/')
-    ? allowedBaseRef
-    : `refs/remotes/${allowedBaseRef}`
-  return refName === normalizedAllowedRef
-}
-
-function resolveSshRemoteBranchName(refName: string, remoteNames: string[]): string {
-  const remotePrefix = 'refs/remotes/'
-  if (!refName.startsWith(remotePrefix)) {
-    return refName
-  }
-  const remoteAndBranch = refName.slice(remotePrefix.length)
-  const remote = remoteNames.find((candidate) => remoteAndBranch.startsWith(`${candidate}/`))
-  if (remote) {
-    return remoteAndBranch.slice(remote.length + 1)
-  }
-  return remoteAndBranch.split('/').slice(1).join('/') || remoteAndBranch
-}
-
-async function hasSshRemoteBranchConflict(
-  provider: SshGitProvider,
-  repoPath: string,
-  branchName: string,
-  allowedBaseRef: string
-): Promise<boolean> {
-  const remoteNames = await listSshRemoteNames(provider, repoPath)
-  try {
-    const { stdout } = await provider.exec(
-      ['for-each-ref', '--format=%(refname)', 'refs/remotes'],
-      repoPath
-    )
-    return stdout.split(/\r?\n/).some((line) => {
-      const refName = line.trim()
-      if (!refName || /^refs\/remotes\/.+\/HEAD$/.test(refName)) {
-        return false
-      }
-      if (isAllowedSshRemoteBaseRef(refName, allowedBaseRef)) {
-        return false
-      }
-      // Why: `git branch --all --list feature/x` doesn't match `remotes/origin/feature/x`; parse remote refs directly.
-      return resolveSshRemoteBranchName(refName, remoteNames) === branchName
-    })
-  } catch {
-    return false
-  }
-}
-
-async function hasSshLocalBranchConflict(
-  provider: SshGitProvider,
-  repoPath: string,
-  branchName: string
-): Promise<boolean> {
-  try {
-    const { stdout } = await provider.exec(
-      ['rev-parse', '--verify', '--quiet', `refs/heads/${branchName}^{commit}`],
-      repoPath
-    )
-    return stdout.trim().length > 0
-  } catch {
-    return false
-  }
-}
-
-async function getSshBranchConflictKind(
-  provider: SshGitProvider,
+export function getSshBranchConflictKind(
+  provider: SshGitExecutor,
   repoPath: string,
   branchName: string,
   allowedBaseRef: string
 ): Promise<'local' | 'remote' | null> {
-  if (await hasSshLocalBranchConflict(provider, repoPath, branchName)) {
-    return 'local'
-  }
-  return (await hasSshRemoteBranchConflict(provider, repoPath, branchName, allowedBaseRef))
-    ? 'remote'
-    : null
+  return getBranchConflictKindViaExec(
+    (argv) => provider.exec(argv, repoPath),
+    branchName,
+    allowedBaseRef
+  )
 }
 
 type SelectedReviewBranchInput = Pick<
diff --git a/src/main/ipc/worktrees-authoritative-local-metadata-pruning.test.ts b/src/main/ipc/worktrees-authoritative-local-metadata-pruning.test.ts
new file mode 100644
index 00000000000..aa3fff56f77
--- /dev/null
+++ b/src/main/ipc/worktrees-authoritative-local-metadata-pruning.test.ts
@@ -0,0 +1,611 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import type { GitWorktreeInfo } from '../../shared/worktree/types'
+import type { NativeLocalWorktreeMetadataScanExpectation } from '../persistence/tracking-repos/missing-local-worktree-metadata-pruning'
+import { notifyWorktreesChanged } from './worktree-remote'
+import {
+  listWorktreesMock,
+  pruneCleanupScanSnapshotsMock,
+  pruneSpaceAnalysisSnapshotsMock
+} from './worktrees-test-module-mocks'
+import { handlers, mainWindow, setupWorktreeHandlers, store } from './worktrees-test-harness'
+import { mockSelectedWslProjectRuntime } from './worktrees-test-fixtures'
+import { pruneMetadataMissingFromAuthoritativeLocalScan } from './worktrees/listing/authoritative-local-worktree-metadata-pruning'
+import { listDetectedWorktreesForCapturedRepo } from './worktrees/listing/detected-provider-listing'
+import { getLocalWorktreeScanGeneration } from '../local-worktree-scan-generation'
+import {
+  isRegisteredWorktreePath,
+  registerWorktreeRootsForRepo
+} from './registered-worktree-roots-cache'
+
+const localWorktreePathPresenceMock = vi.hoisted(() => vi.fn())
+
+vi.mock('electron', async () =>
+  (await import('./worktrees-test-module-mocks')).electronModuleMock()
+)
+vi.mock('../git/worktree', async () =>
+  (await import('./worktrees-test-module-mocks')).gitWorktreeModuleMock()
+)
+vi.mock('../git/runner', async () =>
+  (await import('./worktrees-test-module-mocks')).gitRunnerModuleMock()
+)
+vi.mock('../git/repo', async () =>
+  (await import('./worktrees-test-module-mocks')).gitRepoModuleMock()
+)
+vi.mock('../git/git-username', async (importOriginal) => ({
+  ...(await importOriginal<Record<string, unknown>>()),
+  resolveLocalGitUsername: (await import('./worktrees-test-module-mocks'))
+    .resolveLocalGitUsernameMock
+}))
+vi.mock('../github/client', async () =>
+  (await import('./worktrees-test-module-mocks')).githubClientModuleMock()
+)
+vi.mock('../source-control/hosted-review', async () =>
+  (await import('./worktrees-test-module-mocks')).hostedReviewModuleMock()
+)
+vi.mock('../providers/ssh-git-dispatch', async () =>
+  (await import('./worktrees-test-module-mocks')).sshGitDispatchModuleMock()
+)
+vi.mock('../providers/ssh-filesystem-dispatch', async () =>
+  (await import('./worktrees-test-module-mocks')).sshFilesystemDispatchModuleMock()
+)
+vi.mock('./worktree-symlinks', async () =>
+  (await import('./worktrees-test-module-mocks')).worktreeSymlinksModuleMock()
+)
+vi.mock('./ssh', async () => (await import('./worktrees-test-module-mocks')).sshModuleMock())
+vi.mock('../ssh/ssh-target-registry', async () =>
+  (await import('./worktrees-test-module-mocks')).sshTargetRegistryModuleMock()
+)
+vi.mock('../hooks', async () => (await import('./worktrees-test-module-mocks')).hooksModuleMock())
+vi.mock('../setup-runner-script-text', async (importOriginal) =>
+  (await import('./worktrees-test-module-mocks')).setupRunnerScriptTextModuleMock(
+    (await importOriginal()) as Record<string, unknown>
+  )
+)
+vi.mock('../worktree-runner-script', async (importOriginal) =>
+  (await import('./worktrees-test-module-mocks')).worktreeRunnerScriptModuleMock(
+    (await importOriginal()) as Record<string, unknown>
+  )
+)
+vi.mock('../effective-hook-config', async (importOriginal) =>
+  (await import('./worktrees-test-module-mocks')).effectiveHookConfigModuleMock(
+    (await importOriginal()) as Record<string, unknown>
+  )
+)
+vi.mock('../setup-hook-env-vars', async (importOriginal) =>
+  (await import('./worktrees-test-module-mocks')).setupHookEnvVarsModuleMock(
+    (await importOriginal()) as Record<string, unknown>
+  )
+)
+vi.mock('./worktree-logic', async (importOriginal) =>
+  (await import('./worktrees-test-module-mocks')).worktreeLogicModuleMock(
+    (await importOriginal()) as Record<string, unknown>
+  )
+)
+vi.mock('../terminal-history-deletion', async () =>
+  (await import('./worktrees-test-module-mocks')).terminalHistoryDeletionModuleMock()
+)
+vi.mock('../ports/advertised-url-watcher', async () =>
+  (await import('./worktrees-test-module-mocks')).advertisedUrlWatcherModuleMock()
+)
+vi.mock('../workspace-cleanup-scan-snapshot', async () =>
+  (await import('./worktrees-test-module-mocks')).workspaceCleanupScanSnapshotModuleMock()
+)
+vi.mock('../workspace-space-analysis-snapshot', async () =>
+  (await import('./worktrees-test-module-mocks')).workspaceSpaceAnalysisSnapshotModuleMock()
+)
+vi.mock('../workspace-cleanup-removal-snapshot-prune', async () =>
+  (await import('./worktrees-test-module-mocks')).workspaceCleanupRemovalSnapshotPruneModuleMock()
+)
+vi.mock('../local-worktree-path-presence', async (importOriginal) => ({
+  ...(await importOriginal<Record<string, unknown>>()),
+  localWorktreePathsExistOrAreUnverifiable: localWorktreePathPresenceMock
+}))
+vi.mock('../runtime/worktree-teardown', async () =>
+  (await import('./worktrees-test-module-mocks')).worktreeTeardownModuleMock()
+)
+vi.mock('./pty', async () => (await import('./worktrees-test-module-mocks')).ptyModuleMock())
+
+const REPO_ID = 'repo-1'
+const REPO_PATH = '/workspace/repo'
+const LOCAL_HOST_ID = 'local'
+
+function worktree(path: string, overrides: Partial<GitWorktreeInfo> = {}): GitWorktreeInfo {
+  return {
+    path,
+    head: path,
+    branch: `refs/heads/${path.split('/').at(-1) ?? 'main'}`,
+    isBare: false,
+    isMainWorktree: path === REPO_PATH,
+    ...overrides
+  }
+}
+
+function scanExpectation(
+  worktreeIds: readonly string[]
+): NativeLocalWorktreeMetadataScanExpectation {
+  const expectedRepo = {
+    id: REPO_ID,
+    path: REPO_PATH,
+    displayName: 'repo',
+    badgeColor: '#000',
+    addedAt: 0
+  }
+  return {
+    repo: {
+      id: REPO_ID,
+      path: REPO_PATH,
+      kind: 'git',
+      expectedRepo
+    },
+    routing: {
+      expectedProject: undefined,
+      expectedProjectUpdatedAt: undefined,
+      expectedSettings:
+        {} as NativeLocalWorktreeMetadataScanExpectation['routing']['expectedSettings']
+    },
+    metadata: worktreeIds.map((worktreeId) => ({
+      worktreeId,
+      expectedLegacy: {
+        expectedPresent: true,
+        expectedMeta: undefined,
+        expectedSerialized: undefined,
+        expectedInstanceId: undefined,
+        expectedHostId: LOCAL_HOST_ID
+      },
+      expectedAliases: []
+    }))
+  }
+}
+
+function listDetected(): Promise<unknown> {
+  return handlers['worktrees:listDetected'](null, { repoId: REPO_ID }) as Promise<unknown>
+}
+
+const localListingCalls = [
+  ['worktrees:listDetected', listDetected],
+  [
+    'worktrees:list',
+    () => handlers['worktrees:list'](null, { repoId: REPO_ID }) as Promise<unknown>
+  ],
+  ['worktrees:listAll', () => handlers['worktrees:listAll'](null, undefined) as Promise<unknown>]
+] as const
+
+describe('authoritative local worktree metadata pruning integration', () => {
+  beforeEach(() => {
+    setupWorktreeHandlers()
+    localWorktreePathPresenceMock.mockReset()
+    localWorktreePathPresenceMock.mockImplementation(
+      async (pathValues: readonly string[]) =>
+        new Map(pathValues.map((pathValue) => [pathValue, false]))
+    )
+  })
+
+  it('captures metadata expectations before starting the Git scan', async () => {
+    const order: string[] = []
+    store.captureNativeLocalWorktreeMetadataScanExpectation.mockImplementation(() => {
+      order.push('capture')
+      return scanExpectation([])
+    })
+    listWorktreesMock.mockImplementation(() => {
+      order.push('scan')
+      return Promise.resolve([worktree(REPO_PATH)])
+    })
+
+    await listDetected()
+
+    expect(order).toEqual(['capture', 'scan'])
+  })
+
+  it('prunes once for the fresh producer, while coalesced and cached callers do nothing', async () => {
+    const staleId = `${REPO_ID}::/workspace/stale`
+    const rows = [worktree(REPO_PATH), worktree('/workspace/live')]
+    store.captureNativeLocalWorktreeMetadataScanExpectation.mockReturnValue(
+      scanExpectation([staleId])
+    )
+    store.pruneSessionlessMissingLocalWorktreeMetadataForRepo.mockReturnValue([staleId])
+    listWorktreesMock.mockImplementation(async () => {
+      await Promise.resolve()
+      return rows
+    })
+
+    await Promise.all([listDetected(), listDetected(), listDetected()])
+    await listDetected()
+
+    expect(store.captureNativeLocalWorktreeMetadataScanExpectation).toHaveBeenCalledTimes(1)
+    expect(store.pruneSessionlessMissingLocalWorktreeMetadataForRepo).toHaveBeenCalledTimes(1)
+    const firstPruneCall = store.pruneSessionlessMissingLocalWorktreeMetadataForRepo.mock
+      .calls[0] as [unknown, readonly { worktreeId: string }[]] | undefined
+    expect(firstPruneCall?.[1].map(({ worktreeId }) => worktreeId)).toEqual([staleId])
+    expect(pruneCleanupScanSnapshotsMock).toHaveBeenCalledTimes(1)
+    expect(pruneCleanupScanSnapshotsMock).toHaveBeenCalledWith('/profile-a', [
+      { worktreeId: staleId, executionHostId: LOCAL_HOST_ID }
+    ])
+    expect(pruneSpaceAnalysisSnapshotsMock).toHaveBeenCalledTimes(1)
+    expect(pruneSpaceAnalysisSnapshotsMock).toHaveBeenCalledWith('/profile-a', [
+      { worktreeId: staleId, executionHostId: LOCAL_HOST_ID }
+    ])
+  })
+
+  it('does not prune when the authoritative scan is invalidated while in flight', async () => {
+    const staleId = `${REPO_ID}::/workspace/stale`
+    let resolveScan: (rows: GitWorktreeInfo[]) => void = () => {}
+    store.captureNativeLocalWorktreeMetadataScanExpectation.mockReturnValue(
+      scanExpectation([staleId])
+    )
+    store.pruneSessionlessMissingLocalWorktreeMetadataForRepo.mockReturnValue([staleId])
+    listWorktreesMock.mockImplementation(
+      () =>
+        new Promise((resolve) => {
+          resolveScan = resolve as (rows: GitWorktreeInfo[]) => void
+        })
+    )
+
+    const pending = listDetected()
+    await Promise.resolve()
+    notifyWorktreesChanged(mainWindow as never, REPO_ID)
+    resolveScan([worktree(REPO_PATH), worktree('/workspace/live')])
+    await pending
+
+    expect(store.captureNativeLocalWorktreeMetadataScanExpectation).toHaveBeenCalledTimes(1)
+    expect(store.pruneSessionlessMissingLocalWorktreeMetadataForRepo).not.toHaveBeenCalled()
+    expect(pruneCleanupScanSnapshotsMock).not.toHaveBeenCalled()
+    expect(pruneSpaceAnalysisSnapshotsMock).not.toHaveBeenCalled()
+  })
+
+  it('does not prune when the completed scan is invalidated before its caller resumes', async () => {
+    const staleId = `${REPO_ID}::/workspace/stale`
+    let resolveScan: (rows: GitWorktreeInfo[]) => void = () => {}
+    store.captureNativeLocalWorktreeMetadataScanExpectation.mockReturnValue(
+      scanExpectation([staleId])
+    )
+    store.pruneSessionlessMissingLocalWorktreeMetadataForRepo.mockReturnValue([staleId])
+    listWorktreesMock.mockImplementation(
+      () =>
+        new Promise((resolve) => {
+          resolveScan = resolve as (rows: GitWorktreeInfo[]) => void
+        })
+    )
+
+    const pending = listDetected()
+    await Promise.resolve()
+    resolveScan([worktree(REPO_PATH)])
+    queueMicrotask(() => notifyWorktreesChanged(mainWindow as never, REPO_ID))
+    await pending
+
+    expect(store.pruneSessionlessMissingLocalWorktreeMetadataForRepo).not.toHaveBeenCalled()
+  })
+
+  it.each(localListingCalls)(
+    'skips stale WSL root and lineage side effects after %s caller resumption',
+    async (_channel, listWorktrees) => {
+      const orphanId = `${REPO_ID}::/workspace/orphan`
+      let resolveScan: (rows: GitWorktreeInfo[]) => void = () => {}
+      mockSelectedWslProjectRuntime()
+      store.getAllWorktreeLineage.mockReturnValue({
+        [orphanId]: {
+          worktreeId: orphanId,
+          worktreeInstanceId: 'orphan-instance',
+          parentWorktreeId: `${REPO_ID}::${REPO_PATH}`,
+          parentWorktreeInstanceId: 'main-instance',
+          origin: 'manual',
+          capture: { source: 'manual-action', confidence: 'explicit' },
+          createdAt: 0
+        }
+      })
+      listWorktreesMock.mockImplementation(
+        () =>
+          new Promise((resolve) => {
+            resolveScan = resolve as (rows: GitWorktreeInfo[]) => void
+          })
+      )
+
+      const pending = listWorktrees()
+      await Promise.resolve()
+      resolveScan([worktree(REPO_PATH)])
+      queueMicrotask(() => notifyWorktreesChanged(mainWindow as never, REPO_ID))
+      await pending
+
+      expect(store.removeWorktreeLineage).not.toHaveBeenCalled()
+      expect(isRegisteredWorktreePath(REPO_PATH)).toBe(false)
+    }
+  )
+
+  it('preserves WSL roots and lineage created while an older Git scan is pending', async () => {
+    const newPath = '/workspace/new-wsl-worktree'
+    const newId = `${REPO_ID}::${newPath}`
+    let resolveScan: (rows: GitWorktreeInfo[]) => void = () => {}
+    mockSelectedWslProjectRuntime()
+    listWorktreesMock.mockImplementation(
+      () =>
+        new Promise((resolve) => {
+          resolveScan = resolve as (rows: GitWorktreeInfo[]) => void
+        })
+    )
+
+    const pending = listDetected()
+    await Promise.resolve()
+
+    resolveScan([worktree(REPO_PATH)])
+    queueMicrotask(() => {
+      registerWorktreeRootsForRepo(store as never, REPO_ID, [REPO_PATH, newPath])
+      store.setWorktreeMeta(newId, { hostId: LOCAL_HOST_ID, instanceId: 'new-instance' })
+      store.getAllWorktreeLineage.mockReturnValue({
+        [newId]: {
+          worktreeId: newId,
+          worktreeInstanceId: 'new-instance',
+          parentWorktreeId: `${REPO_ID}::${REPO_PATH}`,
+          parentWorktreeInstanceId: 'main-instance',
+          origin: 'manual',
+          capture: { source: 'manual-action', confidence: 'explicit' },
+          createdAt: 0
+        }
+      })
+    })
+    await pending
+
+    expect(store.removeWorktreeLineage).not.toHaveBeenCalled()
+    expect(isRegisteredWorktreePath(newPath)).toBe(true)
+  })
+
+  it.each(['scan generation', 'caller request'] as const)(
+    'skips metadata, root, and lineage mutations when the %s is invalidated during path probes',
+    async (invalidation) => {
+      const staleId = `${REPO_ID}::/workspace/stale`
+      const orphanId = `${REPO_ID}::/workspace/orphan`
+      let callerCurrent = true
+      let resolvePresence: (presence: ReadonlyMap<string, boolean>) => void = () => {}
+      store.captureNativeLocalWorktreeMetadataScanExpectation.mockReturnValue(
+        scanExpectation([staleId])
+      )
+      store.pruneSessionlessMissingLocalWorktreeMetadataForRepo.mockReturnValue([staleId])
+      store.getAllWorktreeLineage.mockReturnValue({
+        [orphanId]: {
+          worktreeId: orphanId,
+          worktreeInstanceId: 'orphan-instance',
+          parentWorktreeId: `${REPO_ID}::${REPO_PATH}`,
+          parentWorktreeInstanceId: 'main-instance',
+          origin: 'manual',
+          capture: { source: 'manual-action', confidence: 'explicit' },
+          createdAt: 0
+        }
+      })
+      localWorktreePathPresenceMock.mockImplementationOnce(
+        () =>
+          new Promise((resolve) => {
+            resolvePresence = resolve
+          })
+      )
+      listWorktreesMock.mockResolvedValue([worktree(REPO_PATH)])
+
+      const pending = listDetectedWorktreesForCapturedRepo(
+        store as never,
+        store.getRepo(REPO_ID) as never,
+        () => callerCurrent
+      )
+      await vi.waitFor(() => expect(localWorktreePathPresenceMock).toHaveBeenCalledTimes(1))
+      if (invalidation === 'scan generation') {
+        notifyWorktreesChanged(mainWindow as never, REPO_ID)
+      } else {
+        callerCurrent = false
+      }
+      resolvePresence(new Map([['/workspace/stale', false]]))
+      await pending
+
+      expect(store.pruneSessionlessMissingLocalWorktreeMetadataForRepo).not.toHaveBeenCalled()
+      expect(store.removeWorktreeLineage).not.toHaveBeenCalled()
+      expect(isRegisteredWorktreePath(REPO_PATH)).toBe(false)
+      expect(pruneCleanupScanSnapshotsMock).not.toHaveBeenCalled()
+      expect(pruneSpaceAnalysisSnapshotsMock).not.toHaveBeenCalled()
+    }
+  )
+
+  it('preserves roots and lineage created while an older path probe is pending', async () => {
+    const staleId = `${REPO_ID}::/workspace/stale`
+    const newPath = '/workspace/new-worktree'
+    const newId = `${REPO_ID}::${newPath}`
+    let resolvePresence: (presence: ReadonlyMap<string, boolean>) => void = () => {}
+    const metadata = new Map<string, { hostId: string; instanceId: string }>()
+    store.getWorktreeMeta.mockImplementation((worktreeId) => metadata.get(worktreeId))
+    store.captureNativeLocalWorktreeMetadataScanExpectation.mockReturnValue(
+      scanExpectation([staleId])
+    )
+    store.pruneSessionlessMissingLocalWorktreeMetadataForRepo.mockReturnValue([staleId])
+    localWorktreePathPresenceMock.mockImplementationOnce(
+      () =>
+        new Promise((resolve) => {
+          resolvePresence = resolve
+        })
+    )
+    listWorktreesMock.mockResolvedValue([worktree(REPO_PATH)])
+
+    const pending = listDetected()
+    await vi.waitFor(() => expect(localWorktreePathPresenceMock).toHaveBeenCalledTimes(1))
+
+    registerWorktreeRootsForRepo(store as never, REPO_ID, [REPO_PATH, newPath])
+    const newMetadata = { hostId: LOCAL_HOST_ID, instanceId: 'new-instance' }
+    metadata.set(newId, newMetadata)
+    store.setWorktreeMeta(newId, newMetadata)
+    store.getAllWorktreeLineage.mockReturnValue({
+      [newId]: {
+        worktreeId: newId,
+        worktreeInstanceId: newMetadata.instanceId,
+        parentWorktreeId: `${REPO_ID}::${REPO_PATH}`,
+        parentWorktreeInstanceId: 'main-instance',
+        origin: 'manual',
+        capture: { source: 'manual-action', confidence: 'explicit' },
+        createdAt: 0
+      }
+    })
+    resolvePresence(new Map([['/workspace/stale', false]]))
+    await pending
+
+    expect(store.pruneSessionlessMissingLocalWorktreeMetadataForRepo).toHaveBeenCalledTimes(1)
+    expect(store.removeWorktreeLineage).not.toHaveBeenCalled()
+    expect(isRegisteredWorktreePath(newPath)).toBe(true)
+  })
+
+  it('does not capture or prune on an initial WSL scan', async () => {
+    mockSelectedWslProjectRuntime()
+    listWorktreesMock.mockResolvedValue([worktree(REPO_PATH)])
+
+    await listDetected()
+
+    expect(listWorktreesMock).toHaveBeenCalledWith(REPO_PATH, { wslDistro: 'Ubuntu' })
+    expect(store.captureNativeLocalWorktreeMetadataScanExpectation).not.toHaveBeenCalled()
+    expect(store.pruneSessionlessMissingLocalWorktreeMetadataForRepo).not.toHaveBeenCalled()
+  })
+
+  it('does not let a native scan that changes to WSL routing become destructive', async () => {
+    const staleId = `${REPO_ID}::/workspace/stale`
+    const resolvers: ((rows: GitWorktreeInfo[]) => void)[] = []
+    store.captureNativeLocalWorktreeMetadataScanExpectation.mockReturnValue(
+      scanExpectation([staleId])
+    )
+    store.pruneSessionlessMissingLocalWorktreeMetadataForRepo.mockReturnValue([staleId])
+    listWorktreesMock.mockImplementation(
+      () =>
+        new Promise((resolve) => {
+          resolvers.push(resolve as (rows: GitWorktreeInfo[]) => void)
+        })
+    )
+
+    const nativePending = listDetected()
+    await Promise.resolve()
+    mockSelectedWslProjectRuntime()
+    const wslPending = listDetected()
+    await Promise.resolve()
+
+    resolvers[1]?.([worktree(REPO_PATH)])
+    await wslPending
+    resolvers[0]?.([worktree(REPO_PATH), worktree('/workspace/live')])
+    await nativePending
+
+    expect(store.captureNativeLocalWorktreeMetadataScanExpectation).toHaveBeenCalledTimes(1)
+    expect(store.pruneSessionlessMissingLocalWorktreeMetadataForRepo).not.toHaveBeenCalled()
+    expect(pruneCleanupScanSnapshotsMock).not.toHaveBeenCalled()
+    expect(pruneSpaceAnalysisSnapshotsMock).not.toHaveBeenCalled()
+  })
+
+  it.each([
+    ['empty', [] as GitWorktreeInfo[]],
+    ['failed', new Error('git worktree list failed')]
+  ] as const)('does nothing for an %s authoritative scan', async (_label, result) => {
+    const staleId = `${REPO_ID}::/workspace/stale`
+    store.captureNativeLocalWorktreeMetadataScanExpectation.mockReturnValue(
+      scanExpectation([staleId])
+    )
+    store.pruneSessionlessMissingLocalWorktreeMetadataForRepo.mockReturnValue([staleId])
+    if (result instanceof Error) {
+      listWorktreesMock.mockRejectedValue(result)
+    } else {
+      listWorktreesMock.mockResolvedValue(result)
+    }
+
+    await listDetected()
+
+    expect(store.pruneSessionlessMissingLocalWorktreeMetadataForRepo).not.toHaveBeenCalled()
+    expect(pruneCleanupScanSnapshotsMock).not.toHaveBeenCalled()
+    expect(pruneSpaceAnalysisSnapshotsMock).not.toHaveBeenCalled()
+  })
+
+  it('keeps prunable Git registrations live and does not probe their paths', async () => {
+    const staleId = `${REPO_ID}::/workspace/stale`
+    const liveId = `${REPO_ID}::/workspace/live`
+    const prunableId = `${REPO_ID}::/workspace/prunable`
+    store.captureNativeLocalWorktreeMetadataScanExpectation.mockReturnValue(
+      scanExpectation([staleId, liveId, prunableId])
+    )
+    store.pruneSessionlessMissingLocalWorktreeMetadataForRepo.mockReturnValue([staleId])
+    listWorktreesMock.mockResolvedValue([
+      worktree(REPO_PATH),
+      worktree('/workspace/live'),
+      worktree('/workspace/prunable', { prunable: true })
+    ])
+
+    await listDetected()
+
+    expect(store.pruneSessionlessMissingLocalWorktreeMetadataForRepo).toHaveBeenCalledTimes(1)
+    const missing = store.pruneSessionlessMissingLocalWorktreeMetadataForRepo.mock.calls[0]?.[1] as
+      | readonly { worktreeId: string }[]
+      | undefined
+    expect(missing?.map(({ worktreeId }) => worktreeId)).toEqual([staleId])
+    expect(missing?.map(({ worktreeId }) => worktreeId)).not.toContain(liveId)
+    expect(missing?.map(({ worktreeId }) => worktreeId)).not.toContain(prunableId)
+    expect(localWorktreePathPresenceMock).toHaveBeenCalledWith(['/workspace/stale'], {
+      signal: undefined
+    })
+  })
+
+  it('keeps the configured repo path live when Git reports a canonical spelling', async () => {
+    const configuredMainId = `${REPO_ID}::${REPO_PATH}`
+    const staleId = `${REPO_ID}::/workspace/stale`
+    store.captureNativeLocalWorktreeMetadataScanExpectation.mockReturnValue(
+      scanExpectation([configuredMainId, staleId])
+    )
+    store.pruneSessionlessMissingLocalWorktreeMetadataForRepo.mockReturnValue([staleId])
+    listWorktreesMock.mockResolvedValue([worktree('/canonical/workspace/repo')])
+
+    await listDetected()
+
+    const missing = store.pruneSessionlessMissingLocalWorktreeMetadataForRepo.mock.calls[0]?.[1] as
+      | readonly { worktreeId: string }[]
+      | undefined
+    expect(missing?.map(({ worktreeId }) => worktreeId)).toEqual([staleId])
+    expect(missing?.map(({ worktreeId }) => worktreeId)).not.toContain(configuredMainId)
+  })
+
+  it('keeps a linked worktree whose persisted symlink spelling still exists', async () => {
+    const aliasId = `${REPO_ID}::/workspace/alias/linked`
+    const staleId = `${REPO_ID}::/workspace/stale`
+    const scan = scanExpectation([aliasId, staleId])
+    const repo = scan.repo.expectedRepo!
+    const prune = vi.fn(
+      (
+        _scan: NativeLocalWorktreeMetadataScanExpectation,
+        _missing: readonly { worktreeId: string }[]
+      ) => [] as string[]
+    )
+
+    await pruneMetadataMissingFromAuthoritativeLocalScan({
+      store: {
+        getRepos: () => [repo],
+        pruneSessionlessMissingLocalWorktreeMetadataForRepo: prune
+      } as never,
+      repo,
+      gitWorktrees: [worktree('/workspace/real/linked')],
+      scan,
+      scanGeneration: getLocalWorktreeScanGeneration(REPO_ID),
+      pathsExistOrAreUnverifiable: async (pathValues) =>
+        new Map(pathValues.map((pathValue) => [pathValue, pathValue === '/workspace/alias/linked']))
+    })
+
+    expect(prune.mock.calls[0]?.[1].map(({ worktreeId }) => worktreeId)).toEqual([staleId])
+  })
+
+  it('does not rematerialize a removed lineage parent metadata row', async () => {
+    const staleId = `${REPO_ID}::/workspace/stale`
+    store.captureNativeLocalWorktreeMetadataScanExpectation.mockReturnValue(
+      scanExpectation([staleId])
+    )
+    store.pruneSessionlessMissingLocalWorktreeMetadataForRepo.mockReturnValue([staleId])
+    store.getAllWorktreeLineage.mockReturnValue({
+      [`${REPO_ID}::/workspace/live-child`]: {
+        worktreeId: `${REPO_ID}::/workspace/live-child`,
+        worktreeInstanceId: 'child-instance',
+        parentWorktreeId: staleId,
+        parentWorktreeInstanceId: 'stale-instance',
+        origin: 'manual',
+        capture: { source: 'manual-action', confidence: 'explicit' },
+        createdAt: 0
+      }
+    })
+    listWorktreesMock.mockResolvedValue([worktree(REPO_PATH), worktree('/workspace/live')])
+
+    await listDetected()
+
+    expect(store.pruneSessionlessMissingLocalWorktreeMetadataForRepo).toHaveBeenCalledTimes(1)
+    expect(store.setWorktreeMeta.mock.calls.some(([worktreeId]) => worktreeId === staleId)).toBe(
+      false
+    )
+  })
+})
diff --git a/src/main/ipc/worktrees-test-harness.ts b/src/main/ipc/worktrees-test-harness.ts
index 0eacf52e472..1888156a692 100644
--- a/src/main/ipc/worktrees-test-harness.ts
+++ b/src/main/ipc/worktrees-test-harness.ts
@@ -7,6 +7,7 @@ import { resetRetirementCollisionKeyCacheForTests } from '../worktree-name-retir
 import { resetSshProviderAuthorities } from '../ssh/ssh-provider-authority'
 import { createWorktreeRuntimeStub, type WorktreeRuntimeStub } from './worktrees-test-runtime-stub'
 import { handlers, mainWindow, store } from './worktrees-test-ipc-surface'
+import { configureMetadataPruningStoreMocks } from './worktrees-test-metadata-pruning-store'
 import {
   ORIGINAL_PLATFORM,
   setPlatform,
@@ -129,10 +130,12 @@ export function setupWorktreeHandlers(): WorktreeRuntimeStub {
     store.getWorktreeMeta,
     store.getWorktreeMetaForHost,
     store.getAllWorktreeMeta,
+    store.captureNativeLocalWorktreeMetadataScanExpectation,
     store.setWorktreeMeta,
     store.setWorktreeMetaForHost,
     store.getProjectHostSetups,
     store.removeWorktreeMeta,
+    store.pruneSessionlessMissingLocalWorktreeMetadataForRepo,
     store.removeWorkspaceSessionStateForWorktree,
     store.getAllWorktreeLineage,
     store.removeWorktreeLineage,
@@ -187,12 +190,13 @@ export function setupWorktreeHandlers(): WorktreeRuntimeStub {
   store.getRepo.mockReturnValue({ ...repo, worktreeBaseRef: null })
   store.getProjects.mockReturnValue([])
   store.getSparsePresets.mockReturnValue([])
-  store.getSettings.mockReturnValue({
+  const settings = {
     branchPrefix: 'none',
     nestWorkspaces: false,
     refreshLocalBaseRefOnWorktreeCreate: false,
     workspaceDir: '/workspace'
-  })
+  }
+  store.getSettings.mockReturnValue(settings)
   store.getWorktreeMeta.mockReturnValue(undefined)
   // Host-qualified accessors delegate by default so payload assertions stay on one spy;
   // host routing itself is covered by worktree-identity-persistence.test.ts.
@@ -200,6 +204,7 @@ export function setupWorktreeHandlers(): WorktreeRuntimeStub {
     store.getWorktreeMeta(args[0] as string)
   )
   store.getAllWorktreeMeta.mockReturnValue({})
+  configureMetadataPruningStoreMocks(store, settings)
   store.getRetiredWorktreeNameRegistry.mockReturnValue({ exhaustedTiers: 0, names: [] })
   resetRetirementCollisionKeyCacheForTests()
   store.setWorktreeMeta.mockReturnValue({})
diff --git a/src/main/ipc/worktrees-test-ipc-surface.ts b/src/main/ipc/worktrees-test-ipc-surface.ts
index cc4b497b1bc..a858aacf6b8 100644
--- a/src/main/ipc/worktrees-test-ipc-surface.ts
+++ b/src/main/ipc/worktrees-test-ipc-surface.ts
@@ -24,10 +24,12 @@ export type TestStore = {
   getWorktreeMeta: KeyedStoreMock
   getWorktreeMetaForHost: StoreMock
   getAllWorktreeMeta: StoreMock
+  captureNativeLocalWorktreeMetadataScanExpectation: StoreMock
   setWorktreeMeta: KeyedStoreWriteMock
   setWorktreeMetaForHost: StoreMock
   getProjectHostSetups: StoreMock
   removeWorktreeMeta: KeyedStoreMock
+  pruneSessionlessMissingLocalWorktreeMetadataForRepo: StoreMock
   removeWorkspaceSessionStateForWorktree: KeyedStoreMock
   getAllWorktreeLineage: StoreMock
   removeWorktreeLineage: KeyedStoreMock
@@ -58,10 +60,12 @@ export const store: TestStore = {
   getWorktreeMeta: vi.fn(),
   getWorktreeMetaForHost: vi.fn(),
   getAllWorktreeMeta: vi.fn(),
+  captureNativeLocalWorktreeMetadataScanExpectation: vi.fn(),
   setWorktreeMeta: vi.fn(),
   setWorktreeMetaForHost: vi.fn(),
   getProjectHostSetups: vi.fn(),
   removeWorktreeMeta: vi.fn(),
+  pruneSessionlessMissingLocalWorktreeMetadataForRepo: vi.fn(),
   removeWorkspaceSessionStateForWorktree: vi.fn(),
   getAllWorktreeLineage: vi.fn(),
   removeWorktreeLineage: vi.fn(),
diff --git a/src/main/ipc/worktrees-test-metadata-pruning-store.ts b/src/main/ipc/worktrees-test-metadata-pruning-store.ts
new file mode 100644
index 00000000000..dd60acaa027
--- /dev/null
+++ b/src/main/ipc/worktrees-test-metadata-pruning-store.ts
@@ -0,0 +1,35 @@
+import type { TestStore } from './worktrees-test-ipc-surface'
+
+export function configureMetadataPruningStoreMocks(
+  store: TestStore,
+  expectedSettings: unknown
+): void {
+  store.captureNativeLocalWorktreeMetadataScanExpectation.mockImplementation(
+    (...args: unknown[]) => {
+      const repo = args[0] as {
+        id: string
+        path: string
+        connectionId?: string | null
+        executionHostId?: string | null
+        kind?: string
+      }
+      return {
+        repo: {
+          id: repo.id,
+          path: repo.path,
+          connectionId: repo.connectionId,
+          executionHostId: repo.executionHostId,
+          kind: repo.kind === 'folder' ? 'folder' : 'git',
+          expectedRepo: repo
+        },
+        routing: {
+          expectedProject: undefined,
+          expectedProjectUpdatedAt: undefined,
+          expectedSettings
+        },
+        metadata: []
+      }
+    }
+  )
+  store.pruneSessionlessMissingLocalWorktreeMetadataForRepo.mockReturnValue([])
+}
diff --git a/src/main/ipc/worktrees-windows.test.ts b/src/main/ipc/worktrees-windows.test.ts
index b22d7decd84..3826f5493a8 100644
--- a/src/main/ipc/worktrees-windows.test.ts
+++ b/src/main/ipc/worktrees-windows.test.ts
@@ -166,6 +166,7 @@ describe('registerWorktreeHandlers – Windows path handling', () => {
     getSettings: vi.fn(),
     getWorktreeMeta: vi.fn(),
     getAllWorktreeMeta: vi.fn(),
+    captureNativeLocalWorktreeMetadataScanExpectation: vi.fn(),
     setWorktreeMeta: vi.fn(),
     removeWorktreeMeta: vi.fn(),
     addRetiredWorktreeName: vi.fn(),
@@ -211,6 +212,7 @@ describe('registerWorktreeHandlers – Windows path handling', () => {
     store.getSettings.mockReset()
     store.getWorktreeMeta.mockReset()
     store.getAllWorktreeMeta.mockReset()
+    store.captureNativeLocalWorktreeMetadataScanExpectation.mockReset()
     store.setWorktreeMeta.mockReset()
     store.removeWorktreeMeta.mockReset()
     store.addRetiredWorktreeName.mockReset()
@@ -254,6 +256,20 @@ describe('registerWorktreeHandlers – Windows path handling', () => {
     resolveSetupRunnerShellMock.mockReturnValue(undefined)
     store.getWorktreeMeta.mockReturnValue(undefined)
     store.getAllWorktreeMeta.mockReturnValue({})
+    store.captureNativeLocalWorktreeMetadataScanExpectation.mockImplementation((repo) => ({
+      repo: {
+        id: repo.id,
+        path: repo.path,
+        kind: 'git',
+        expectedRepo: repo
+      },
+      routing: {
+        expectedProject: undefined,
+        expectedProjectUpdatedAt: undefined,
+        expectedSettings: store.getSettings()
+      },
+      metadata: []
+    }))
     store.getRetiredWorktreeNameRegistry.mockReturnValue({ exhaustedTiers: 0, names: [] })
     store.setWorktreeMeta.mockReturnValue({})
     resolveLocalGitUsernameMock.mockResolvedValue('')
diff --git a/src/main/ipc/worktrees/listing/authoritative-local-worktree-metadata-pruning.ts b/src/main/ipc/worktrees/listing/authoritative-local-worktree-metadata-pruning.ts
new file mode 100644
index 00000000000..c5ceb1acafb
--- /dev/null
+++ b/src/main/ipc/worktrees/listing/authoritative-local-worktree-metadata-pruning.ts
@@ -0,0 +1,141 @@
+import { getRepoExecutionHostId, LOCAL_EXECUTION_HOST_ID } from '../../../../shared/execution-host'
+import { isWindowsAbsolutePathLike } from '../../../../shared/cross-platform-path'
+import { isFolderRepo } from '../../../../shared/repo-kind'
+import type { Repo } from '../../../../shared/repo-types'
+import {
+  FOLDER_WORKSPACE_INSTANCE_SEPARATOR,
+  splitWorktreeId
+} from '../../../../shared/worktree/id'
+import type { GitWorktreeInfo } from '../../../../shared/worktree/types'
+import { isWslUncPath } from '../../../../shared/wsl-paths'
+import type { Store } from '../../../persistence/loading-store/store'
+import type { NativeLocalWorktreeMetadataScanExpectation } from '../../../persistence/tracking-repos/missing-local-worktree-metadata-pruning'
+import { pruneWorkspaceCleanupScanSnapshots } from '../../../workspace-cleanup-scan-snapshot'
+import { pruneWorkspaceSpaceAnalysisSnapshots } from '../../../workspace-space-analysis-snapshot'
+import { isLocalWorktreeScanGenerationCurrent } from '../../../local-worktree-scan-generation'
+import { localWorktreePathsExistOrAreUnverifiable } from '../../../local-worktree-path-presence'
+import { worktreeRetentionPathComparisonKey } from '../../../worktree-retention-path-comparison'
+
+type AuthoritativeLocalMetadataPruneArgs = {
+  store: Store
+  repo: Repo
+  gitWorktrees: readonly GitWorktreeInfo[]
+  scan: NativeLocalWorktreeMetadataScanExpectation
+  scanGeneration: number
+  platform?: NodeJS.Platform
+  pathsExistOrAreUnverifiable?: (
+    pathValues: readonly string[],
+    options?: { signal?: AbortSignal }
+  ) => Promise<ReadonlyMap<string, boolean>>
+  isCallerCurrent?: () => boolean
+  signal?: AbortSignal
+}
+
+export type AuthoritativeLocalMetadataPruneResult = Readonly<{
+  removedWorktreeIds: readonly string[]
+  preservedMetadataCandidateIds: ReadonlySet<string>
+  scanGenerationCurrent: boolean
+}>
+
+export async function pruneMetadataMissingFromAuthoritativeLocalScan({
+  store,
+  repo,
+  gitWorktrees,
+  scan,
+  scanGeneration,
+  platform = process.platform,
+  pathsExistOrAreUnverifiable = localWorktreePathsExistOrAreUnverifiable,
+  isCallerCurrent = () => true,
+  signal
+}: AuthoritativeLocalMetadataPruneArgs): Promise<AuthoritativeLocalMetadataPruneResult> {
+  const capturedCandidateIds = scan.metadata.map(({ worktreeId }) => worktreeId)
+  const result = (
+    removedWorktreeIds: readonly string[],
+    scanGenerationCurrent: boolean
+  ): AuthoritativeLocalMetadataPruneResult => {
+    const removedIds = new Set(removedWorktreeIds)
+    return {
+      removedWorktreeIds,
+      preservedMetadataCandidateIds: new Set(
+        capturedCandidateIds.filter((worktreeId) => !removedIds.has(worktreeId))
+      ),
+      scanGenerationCurrent
+    }
+  }
+  const generationCurrent = () => isLocalWorktreeScanGenerationCurrent(repo.id, scanGeneration)
+  const repoOwners = store.getRepos().filter((candidate) => candidate.id === repo.id)
+  if (
+    !generationCurrent() ||
+    !isCallerCurrent() ||
+    gitWorktrees.length === 0 ||
+    repoOwners.length !== 1 ||
+    repo.id !== scan.repo.id ||
+    repo.path !== scan.repo.path ||
+    repo.connectionId ||
+    isFolderRepo(repo) ||
+    getRepoExecutionHostId(repo) !== LOCAL_EXECUTION_HOST_ID ||
+    (platform === 'win32' &&
+      (isWslUncPath(repo.path) || gitWorktrees.some(({ path }) => isWslUncPath(path))))
+  ) {
+    return result([], generationCurrent())
+  }
+
+  const livePathKeys = new Set([
+    // Why: Git can canonicalize a symlinked main checkout differently from the configured path.
+    worktreeRetentionPathComparisonKey(repo.path, platform),
+    ...gitWorktrees.map((worktree) => worktreeRetentionPathComparisonKey(worktree.path, platform))
+  ])
+  const probeCandidates = scan.metadata.flatMap((metadata) => {
+    const { worktreeId } = metadata
+    const parsed = splitWorktreeId(worktreeId)
+    const nativeAbsolute = parsed
+      ? platform === 'win32'
+        ? isWindowsAbsolutePathLike(parsed.worktreePath)
+        : parsed.worktreePath.startsWith('/')
+      : false
+    if (
+      parsed?.repoId !== repo.id ||
+      !nativeAbsolute ||
+      isWslUncPath(parsed.worktreePath) ||
+      worktreeId.includes(FOLDER_WORKSPACE_INSTANCE_SEPARATOR) ||
+      livePathKeys.has(worktreeRetentionPathComparisonKey(parsed.worktreePath, platform))
+    ) {
+      return []
+    }
+    return [{ metadata, pathValue: parsed.worktreePath }]
+  })
+  const presenceByPath = await pathsExistOrAreUnverifiable(
+    probeCandidates.map(({ pathValue }) => pathValue),
+    { signal }
+  )
+  if (!generationCurrent() || !isCallerCurrent()) {
+    return result([], generationCurrent())
+  }
+  const missingMetadata = probeCandidates.flatMap(({ metadata, pathValue }) =>
+    presenceByPath.get(pathValue) === false ? [metadata] : []
+  )
+  if (missingMetadata.length === 0) {
+    return result([], generationCurrent())
+  }
+
+  if (!generationCurrent() || !isCallerCurrent()) {
+    return result([], generationCurrent())
+  }
+  const removedIds = store.pruneSessionlessMissingLocalWorktreeMetadataForRepo(
+    scan,
+    missingMetadata
+  )
+  if (removedIds.length > 0) {
+    const snapshotDirectory = store.getProfileStorageDirectory()
+    const targets: {
+      worktreeId: string
+      executionHostId: typeof LOCAL_EXECUTION_HOST_ID
+    }[] = removedIds.map((worktreeId) => ({
+      worktreeId,
+      executionHostId: LOCAL_EXECUTION_HOST_ID
+    }))
+    void pruneWorkspaceCleanupScanSnapshots(snapshotDirectory, targets)
+    void pruneWorkspaceSpaceAnalysisSnapshots(snapshotDirectory, targets)
+  }
+  return result(removedIds, generationCurrent())
+}
diff --git a/src/main/ipc/worktrees/listing/detected-provider-listing.ts b/src/main/ipc/worktrees/listing/detected-provider-listing.ts
index d855e582161..45ccd4183bb 100644
--- a/src/main/ipc/worktrees/listing/detected-provider-listing.ts
+++ b/src/main/ipc/worktrees/listing/detected-provider-listing.ts
@@ -4,7 +4,6 @@ import { getSshGitProvider } from '../../../providers/ssh-git-dispatch'
 import type { DetectedWorktreeListResult, GitWorktreeInfo } from '../../../../shared/worktree/types'
 import { isFolderRepo } from '../../../../shared/repo-kind'
 import { projectResolvedWorktreeLineage } from '../../../../shared/resolved-worktree-lineage'
-import { pruneLineageForMissingRepoWorktrees } from '../../../worktree-lineage-pruning'
 import type { DirectSshDetectedWorktreeRequest } from '../../../../shared/detected-worktree-provider-contract'
 import { isAdmissibleDirectSshAuthority } from '../../../../shared/ssh-retained-payload-admission'
 import type { ListDesktopLineageForHostArgs } from '../../../../shared/host-lineage-contract'
@@ -20,8 +19,10 @@ import {
 import { isFolderWorkspaceIdForRepo } from '../folder-workspace-model'
 import { hasConflictingStoredWorktreeOwner } from './worktree-host-ownership'
 import {
+  applyFreshDetectedWorktreeScanSideEffects,
   listDetectedGitWorktrees,
-  rememberLocalWorktreeRoots
+  type DetectedWorktreeMetadataPrune,
+  type DetectedWorktreeSideEffectToken
 } from './detected-worktree-scan-cache'
 import { loggedWorktreeListFailures, warnOnce } from './worktree-listing-diagnostics'
 import { readAllWorktreeMetaForHost } from '../../../persistence/host-qualified-worktree-meta'
@@ -48,6 +49,8 @@ export async function listDetectedWorktreesForCapturedRepo(
   try {
     let gitWorktrees: GitWorktreeInfo[]
     let freshScan = true
+    let sideEffectToken: DetectedWorktreeSideEffectToken | undefined
+    let metadataPrune: DetectedWorktreeMetadataPrune | undefined
     if (isFolderRepo(repo)) {
       if (!isCurrent()) {
         return null
@@ -97,6 +100,8 @@ export async function listDetectedWorktreesForCapturedRepo(
       const scan = await listDetectedGitWorktrees(store, repo)
       gitWorktrees = scan.gitWorktrees
       freshScan = scan.fresh
+      sideEffectToken = scan.sideEffectToken
+      metadataPrune = scan.metadataPrune
     }
     const aborted = abortedResult()
     if (aborted) {
@@ -115,8 +120,18 @@ export async function listDetectedWorktreesForCapturedRepo(
       }
     }
     if (freshScan) {
-      rememberLocalWorktreeRoots(store, repo, gitWorktrees)
-      pruneLineageForMissingRepoWorktrees(store, repo, gitWorktrees)
+      await applyFreshDetectedWorktreeScanSideEffects(store, repo, gitWorktrees, metadataPrune, {
+        isCurrent: () => isCurrent() && !providerAbort?.signal.aborted,
+        sideEffectToken,
+        signal: providerAbort?.signal
+      })
+      const aborted = abortedResult()
+      if (aborted) {
+        return aborted
+      }
+      if (!isCurrent()) {
+        return null
+      }
     }
     loggedWorktreeListFailures.delete(`${repo.id}:${repo.path}`)
     return {
diff --git a/src/main/ipc/worktrees/listing/detected-worktree-scan-cache.ts b/src/main/ipc/worktrees/listing/detected-worktree-scan-cache.ts
index 55b3d75e3ed..fea200f1a8b 100644
--- a/src/main/ipc/worktrees/listing/detected-worktree-scan-cache.ts
+++ b/src/main/ipc/worktrees/listing/detected-worktree-scan-cache.ts
@@ -4,7 +4,19 @@ import type { Repo } from '../../../../shared/repo-types'
 import { getLocalProjectWorktreeGitOptions } from '../../../project-runtime-git-options'
 import { isFolderRepo } from '../../../../shared/repo-kind'
 import { listRepoWorktrees } from '../../../repo-worktrees'
-import { registerWorktreeRootsForRepo } from '../../registered-worktree-roots-cache'
+import {
+  getRegisteredWorktreeRootsRevision,
+  registerWorktreeRootsForRepo
+} from '../../registered-worktree-roots-cache'
+import type { NativeLocalWorktreeMetadataScanExpectation } from '../../../persistence/tracking-repos/missing-local-worktree-metadata-pruning'
+import {
+  bumpLocalWorktreeScanGeneration,
+  getLocalWorktreeScanGeneration,
+  isLocalWorktreeScanGenerationCurrent,
+  resetLocalWorktreeScanGenerationsForTests
+} from '../../../local-worktree-scan-generation'
+import { pruneLineageForMissingRepoWorktrees } from '../../../worktree-lineage-pruning'
+import { pruneMetadataMissingFromAuthoritativeLocalScan } from './authoritative-local-worktree-metadata-pruning'
 
 // Why: absorb renderer polling bursts while bounding external worktree-change lag to one short refresh window.
 export const DETECTED_WORKTREE_SCAN_CACHE_TTL_MS = 5_000
@@ -17,17 +29,31 @@ export type DetectedWorktreeScanCacheEntry = {
 export type DetectedWorktreeScan = {
   invalidated: boolean
   promise: Promise<GitWorktreeInfo[]>
+  sideEffectToken: DetectedWorktreeSideEffectToken
+  metadataPrune?: DetectedWorktreeMetadataPrune
 }
 
+export type DetectedWorktreeSideEffectToken = Readonly<{
+  generation: number
+  authorizedRootsRevision: number
+}>
+
+export type DetectedWorktreeMetadataPrune = Readonly<{
+  expectation: NativeLocalWorktreeMetadataScanExpectation
+}>
+
 export type DetectedWorktreeScanResult = {
   gitWorktrees: GitWorktreeInfo[]
   fresh: boolean
+  sideEffectToken?: DetectedWorktreeSideEffectToken
+  metadataPrune?: DetectedWorktreeMetadataPrune
 }
 
 export const detectedWorktreeScanCache = new Map<string, DetectedWorktreeScanCacheEntry>()
 export const detectedWorktreeScanInFlight = new Map<string, DetectedWorktreeScan>()
 
 export function invalidateDetectedWorktreeScanCache(repoId: string): void {
+  bumpLocalWorktreeScanGeneration(repoId)
   const keyPrefix = `${repoId}\0`
   for (const key of new Set([
     ...detectedWorktreeScanCache.keys(),
@@ -53,6 +79,7 @@ export function __resetDetectedWorktreeScanCacheForTests(): void {
   }
   detectedWorktreeScanCache.clear()
   detectedWorktreeScanInFlight.clear()
+  resetLocalWorktreeScanGenerationsForTests()
 }
 
 export function __getDetectedWorktreeScanCacheStatsForTests(): {
@@ -88,21 +115,47 @@ export async function listDetectedGitWorktrees(
     return { gitWorktrees: await inFlight.promise, fresh: false }
   }
 
+  // Why: capture before invoking Git because listing can mutate synchronously before its first await.
+  // WSL listings can use UNC paths while legacy metadata keeps Linux paths; v1 cannot prove
+  // those aliases equivalent, so only native-host scans carry destructive expectations.
+  const generation = getLocalWorktreeScanGeneration(repo.id)
+  const authorizedRootsRevision = getRegisteredWorktreeRootsRevision(repo.id)
+  const metadataPruneExpectation = localWorktreeGitOptions.wslDistro
+    ? undefined
+    : store.captureNativeLocalWorktreeMetadataScanExpectation(repo)
   const scan: DetectedWorktreeScan = {
     invalidated: false,
-    promise: listRepoWorktrees(repo, localWorktreeGitOptions)
+    promise: listRepoWorktrees(repo, localWorktreeGitOptions),
+    sideEffectToken: { generation, authorizedRootsRevision },
+    ...(metadataPruneExpectation
+      ? {
+          metadataPrune: {
+            expectation: metadataPruneExpectation
+          }
+        }
+      : {})
   }
   detectedWorktreeScanInFlight.set(cacheKey, scan)
   try {
     const gitWorktrees = await scan.promise
+    const routingUnchanged =
+      getDetectedWorktreeScanCacheKey(repo.id, getLocalProjectWorktreeGitOptions(store, repo)) ===
+      cacheKey
     // Why: a create/remove notification can invalidate mid-scan; don't let that stale scan repopulate the cache afterward.
-    if (!scan.invalidated) {
+    const generationCurrent = isLocalWorktreeScanGenerationCurrent(repo.id, generation)
+    if (!scan.invalidated && routingUnchanged && generationCurrent) {
       detectedWorktreeScanCache.set(cacheKey, {
         worktrees: gitWorktrees,
         expiresAt: Date.now() + DETECTED_WORKTREE_SCAN_CACHE_TTL_MS
       })
     }
-    return { gitWorktrees, fresh: !scan.invalidated }
+    const fresh = !scan.invalidated && routingUnchanged && generationCurrent
+    return {
+      gitWorktrees,
+      fresh,
+      ...(fresh ? { sideEffectToken: scan.sideEffectToken } : {}),
+      ...(fresh && scan.metadataPrune ? { metadataPrune: scan.metadataPrune } : {})
+    }
   } finally {
     if (detectedWorktreeScanInFlight.get(cacheKey) === scan) {
       detectedWorktreeScanInFlight.delete(cacheKey)
@@ -110,6 +163,63 @@ export async function listDetectedGitWorktrees(
   }
 }
 
+export async function applyFreshDetectedWorktreeScanSideEffects(
+  store: Store,
+  repo: Repo,
+  gitWorktrees: GitWorktreeInfo[],
+  metadataPrune?: DetectedWorktreeMetadataPrune,
+  options: {
+    isCurrent?: () => boolean
+    sideEffectToken?: DetectedWorktreeSideEffectToken
+    signal?: AbortSignal
+  } = {}
+): Promise<boolean> {
+  const { isCurrent = () => true, sideEffectToken, signal } = options
+  const generationCurrent = () =>
+    sideEffectToken === undefined ||
+    isLocalWorktreeScanGenerationCurrent(repo.id, sideEffectToken.generation)
+  if (!generationCurrent() || !isCurrent()) {
+    return false
+  }
+  let preservedMetadataCandidateIds: ReadonlySet<string> | undefined
+  if (metadataPrune) {
+    if (!sideEffectToken) {
+      return false
+    }
+    const pruneResult = await pruneMetadataMissingFromAuthoritativeLocalScan({
+      store,
+      repo,
+      gitWorktrees,
+      scan: metadataPrune.expectation,
+      scanGeneration: sideEffectToken.generation,
+      isCallerCurrent: isCurrent,
+      signal
+    })
+    if (!pruneResult.scanGenerationCurrent || !generationCurrent() || !isCurrent()) {
+      return false
+    }
+    preservedMetadataCandidateIds = pruneResult.preservedMetadataCandidateIds
+  }
+  if (!generationCurrent() || !isCurrent()) {
+    return false
+  }
+
+  if (
+    sideEffectToken &&
+    getRegisteredWorktreeRootsRevision(repo.id) !== sideEffectToken.authorizedRootsRevision
+  ) {
+    return false
+  }
+  rememberLocalWorktreeRoots(store, repo, gitWorktrees)
+  pruneLineageForMissingRepoWorktrees(
+    store,
+    repo,
+    gitWorktrees,
+    preservedMetadataCandidateIds ? { preservedMetadataCandidateIds } : undefined
+  )
+  return true
+}
+
 export function getDetectedWorktreeScanCacheKey(
   repoId: string,
   localWorktreeGitOptions: { wslDistro?: string } = {}
diff --git a/src/main/ipc/worktrees/listing/register-worktree-catalog-handlers.ts b/src/main/ipc/worktrees/listing/register-worktree-catalog-handlers.ts
index ac98130b5eb..4a882ff24b7 100644
--- a/src/main/ipc/worktrees/listing/register-worktree-catalog-handlers.ts
+++ b/src/main/ipc/worktrees/listing/register-worktree-catalog-handlers.ts
@@ -2,7 +2,6 @@ import { ipcMain } from 'electron'
 import { isFolderRepo } from '../../../../shared/repo-kind'
 import { getRepoExecutionHostId, type ExecutionHostId } from '../../../../shared/execution-host'
 import { getSshGitProvider } from '../../../providers/ssh-git-dispatch'
-import { pruneLineageForMissingRepoWorktrees } from '../../../worktree-lineage-pruning'
 import { EMPTY_RETIRED_NAME_REGISTRY } from '../../../../shared/worktree/retired-name-registry'
 import { getRetiredNameRegistryForRepo } from '../../../worktree-name-retirement'
 import {
@@ -13,8 +12,10 @@ import {
 } from './ssh-worktree-fallback'
 import { listVisibleFolderWorkspaces } from './folder-workspace-catalog'
 import {
+  applyFreshDetectedWorktreeScanSideEffects,
   listDetectedGitWorktrees,
-  rememberLocalWorktreeRoots
+  type DetectedWorktreeMetadataPrune,
+  type DetectedWorktreeSideEffectToken
 } from './detected-worktree-scan-cache'
 import {
   loggedUnavailableSshGitProviders,
@@ -88,6 +89,8 @@ export function registerWorktreeCatalogHandlers(context: WorktreeIpcContext): vo
       try {
         let gitWorktrees
         let freshScan = true
+        let sideEffectToken: DetectedWorktreeSideEffectToken | undefined
+        let metadataPrune: DetectedWorktreeMetadataPrune | undefined
         if (isFolderRepo(repo)) {
           return listVisibleFolderWorkspaces(store, repo)
         } else if (repo.connectionId) {
@@ -116,10 +119,19 @@ export function registerWorktreeCatalogHandlers(context: WorktreeIpcContext): vo
           const scan = await listDetectedGitWorktrees(store, repo)
           gitWorktrees = scan.gitWorktrees
           freshScan = scan.fresh
+          sideEffectToken = scan.sideEffectToken
+          metadataPrune = scan.metadataPrune
         }
         if (freshScan) {
-          rememberLocalWorktreeRoots(store, repo, gitWorktrees)
-          pruneLineageForMissingRepoWorktrees(store, repo, gitWorktrees)
+          await applyFreshDetectedWorktreeScanSideEffects(
+            store,
+            repo,
+            gitWorktrees,
+            metadataPrune,
+            {
+              sideEffectToken
+            }
+          )
         }
         loggedWorktreeListFailures.delete(`${repo.id}:${repo.path}`)
         const metadata = metadataForRepo(repo)
@@ -169,6 +181,8 @@ export function registerWorktreeCatalogHandlers(context: WorktreeIpcContext): vo
     try {
       let gitWorktrees
       let freshScan = true
+      let sideEffectToken: DetectedWorktreeSideEffectToken | undefined
+      let metadataPrune: DetectedWorktreeMetadataPrune | undefined
       if (isFolderRepo(repo)) {
         return listVisibleFolderWorkspaces(store, repo)
       } else if (repo.connectionId) {
@@ -197,10 +211,13 @@ export function registerWorktreeCatalogHandlers(context: WorktreeIpcContext): vo
         const scan = await listDetectedGitWorktrees(store, repo)
         gitWorktrees = scan.gitWorktrees
         freshScan = scan.fresh
+        sideEffectToken = scan.sideEffectToken
+        metadataPrune = scan.metadataPrune
       }
       if (freshScan) {
-        rememberLocalWorktreeRoots(store, repo, gitWorktrees)
-        pruneLineageForMissingRepoWorktrees(store, repo, gitWorktrees)
+        await applyFreshDetectedWorktreeScanSideEffects(store, repo, gitWorktrees, metadataPrune, {
+          sideEffectToken
+        })
       }
       loggedWorktreeListFailures.delete(`${repo.id}:${repo.path}`)
       const metadata = allMeta ?? readAllWorktreeMetaForHost(store, getRepoExecutionHostId(repo))
diff --git a/src/main/jira/adf-media-destination.ts b/src/main/jira/adf-media-destination.ts
index e92cce03083..67deb7a685d 100644
--- a/src/main/jira/adf-media-destination.ts
+++ b/src/main/jira/adf-media-destination.ts
@@ -25,7 +25,7 @@ export function escapeMarkdownLinkDestination(url: string): string | null {
   }
 
   let encoded = ''
-  for (let i = 0; i < url.length; ) {
+  for (let i = 0; i < url.length;) {
     const char = url[i] ?? ''
     if (char === '%') {
       const hex = url.slice(i + 1, i + 3)
diff --git a/src/main/local-worktree-path-presence.test.ts b/src/main/local-worktree-path-presence.test.ts
new file mode 100644
index 00000000000..d54284f7c6b
--- /dev/null
+++ b/src/main/local-worktree-path-presence.test.ts
@@ -0,0 +1,219 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+const { statMock } = vi.hoisted(() => ({
+  statMock: vi.fn()
+}))
+
+vi.mock('node:fs/promises', () => ({ stat: statMock }))
+
+import {
+  LOCAL_WORKTREE_PATH_PROBE_TIMEOUT_MS,
+  localWorktreePathExistsOrIsUnverifiable,
+  localWorktreePathsExistOrAreUnverifiable
+} from './local-worktree-path-presence'
+
+function fsError(code: string): NodeJS.ErrnoException {
+  return Object.assign(new Error(code), { code })
+}
+
+function installFakeAbortSignalTimeout(): AbortController[] {
+  const controllers: AbortController[] = []
+  vi.spyOn(AbortSignal, 'timeout').mockImplementation((timeoutMs) => {
+    const controller = new AbortController()
+    controllers.push(controller)
+    setTimeout(
+      () => controller.abort(new DOMException('The operation timed out.', 'TimeoutError')),
+      timeoutMs
+    )
+    return controller.signal
+  })
+  return controllers
+}
+
+describe('local worktree path presence', () => {
+  beforeEach(() => {
+    statMock.mockReset()
+  })
+
+  afterEach(() => {
+    vi.useRealTimers()
+    vi.restoreAllMocks()
+  })
+
+  it('returns one result per distinct path and only treats ENOENT/ENOTDIR as missing', async () => {
+    statMock.mockImplementation(async (pathValue: string) => {
+      if (pathValue === '/missing') {
+        throw fsError('ENOENT')
+      }
+      if (pathValue === '/not-a-directory') {
+        throw fsError('ENOTDIR')
+      }
+      if (pathValue === '/permission-denied') {
+        throw fsError('EACCES')
+      }
+      return {}
+    })
+
+    const result = await localWorktreePathsExistOrAreUnverifiable([
+      '/present',
+      '/missing',
+      '/not-a-directory',
+      '/permission-denied',
+      '/present'
+    ])
+
+    expect([...result.entries()]).toEqual([
+      ['/present', true],
+      ['/missing', false],
+      ['/not-a-directory', false],
+      ['/permission-denied', true]
+    ])
+    expect(statMock).toHaveBeenCalledTimes(4)
+  })
+
+  it('does not allocate a deadline when there are no paths to probe', async () => {
+    const timeout = vi.spyOn(AbortSignal, 'timeout')
+
+    await expect(localWorktreePathsExistOrAreUnverifiable([])).resolves.toEqual(new Map())
+
+    expect(timeout).not.toHaveBeenCalled()
+    expect(statMock).not.toHaveBeenCalled()
+  })
+
+  it('globally bounds stat calls across simultaneous bulk probes', async () => {
+    let active = 0
+    let maximumActive = 0
+    const pending: (() => void)[] = []
+    statMock.mockImplementation(
+      () =>
+        new Promise((resolve) => {
+          active += 1
+          maximumActive = Math.max(maximumActive, active)
+          pending.push(() => {
+            active -= 1
+            resolve({})
+          })
+        })
+    )
+
+    const first = localWorktreePathsExistOrAreUnverifiable([
+      '/first-1',
+      '/first-2',
+      '/first-3',
+      '/first-4'
+    ])
+    const second = localWorktreePathsExistOrAreUnverifiable([
+      '/second-1',
+      '/second-2',
+      '/second-3',
+      '/second-4'
+    ])
+
+    let resolved = 0
+    while (resolved < 8) {
+      while (pending.length === 0) {
+        await Promise.resolve()
+      }
+      pending.shift()?.()
+      resolved += 1
+      await Promise.resolve()
+    }
+
+    await Promise.all([first, second])
+
+    expect(maximumActive).toBe(2)
+    expect(statMock).toHaveBeenCalledTimes(8)
+  })
+
+  it('uses the same fail-closed classification for a single probe', async () => {
+    statMock.mockRejectedValueOnce(fsError('ENOENT'))
+    statMock.mockRejectedValueOnce(fsError('ENOTDIR'))
+    statMock.mockRejectedValueOnce(fsError('EIO'))
+
+    await expect(localWorktreePathExistsOrIsUnverifiable('/missing')).resolves.toBe(false)
+    await expect(localWorktreePathExistsOrIsUnverifiable('/parent-missing')).resolves.toBe(false)
+    await expect(localWorktreePathExistsOrIsUnverifiable('/unverifiable')).resolves.toBe(true)
+  })
+
+  it('settles timed-out batches without exceeding or leaking the global stat bound', async () => {
+    vi.useFakeTimers()
+    const timeoutControllers = installFakeAbortSignalTimeout()
+    const releaseStats: (() => void)[] = []
+    let returnMissing = false
+    statMock.mockImplementation(() =>
+      returnMissing
+        ? Promise.reject(fsError('ENOENT'))
+        : new Promise((resolve) => releaseStats.push(() => resolve({})))
+    )
+
+    try {
+      const firstPaths = ['/first-1', '/first-2', '/first-3', '/first-4']
+      const first = localWorktreePathsExistOrAreUnverifiable(firstPaths)
+      let firstSettled = false
+      void first.then(() => {
+        firstSettled = true
+      })
+      await vi.advanceTimersByTimeAsync(0)
+
+      expect(statMock).toHaveBeenCalledTimes(2)
+      await vi.advanceTimersByTimeAsync(LOCAL_WORKTREE_PATH_PROBE_TIMEOUT_MS - 1)
+      expect(firstSettled).toBe(false)
+      await vi.advanceTimersByTimeAsync(1)
+      await expect(first).resolves.toEqual(
+        new Map(firstPaths.map((pathValue) => [pathValue, true]))
+      )
+      expect(statMock).toHaveBeenCalledTimes(2)
+
+      const secondPaths = ['/second-1', '/second-2', '/second-3']
+      const second = localWorktreePathsExistOrAreUnverifiable(secondPaths)
+      await vi.advanceTimersByTimeAsync(LOCAL_WORKTREE_PATH_PROBE_TIMEOUT_MS)
+      await expect(second).resolves.toEqual(
+        new Map(secondPaths.map((pathValue) => [pathValue, true]))
+      )
+      expect(statMock).toHaveBeenCalledTimes(2)
+
+      returnMissing = true
+      releaseStats.splice(0).forEach((release) => release())
+      await vi.advanceTimersByTimeAsync(0)
+
+      await expect(localWorktreePathsExistOrAreUnverifiable(['/after-release'])).resolves.toEqual(
+        new Map([['/after-release', false]])
+      )
+      expect(statMock).toHaveBeenCalledTimes(3)
+    } finally {
+      timeoutControllers.forEach((controller) => controller.abort())
+      releaseStats.splice(0).forEach((release) => release())
+      await Promise.resolve()
+      await Promise.resolve()
+    }
+  })
+
+  it('settles promptly and fail closed when the caller aborts hung probes', async () => {
+    vi.useFakeTimers()
+    const timeoutControllers = installFakeAbortSignalTimeout()
+    const releaseStats: (() => void)[] = []
+    statMock.mockImplementation(
+      () => new Promise((resolve) => releaseStats.push(() => resolve({})))
+    )
+    const controller = new AbortController()
+    const paths = ['/abort-1', '/abort-2', '/abort-3']
+
+    try {
+      const result = localWorktreePathsExistOrAreUnverifiable(paths, {
+        signal: controller.signal
+      })
+      await vi.advanceTimersByTimeAsync(0)
+      expect(statMock).toHaveBeenCalledTimes(2)
+
+      controller.abort()
+
+      await expect(result).resolves.toEqual(new Map(paths.map((pathValue) => [pathValue, true])))
+      expect(vi.getTimerCount()).toBeGreaterThan(0)
+    } finally {
+      timeoutControllers.forEach((timeoutController) => timeoutController.abort())
+      releaseStats.splice(0).forEach((release) => release())
+      await Promise.resolve()
+      await Promise.resolve()
+    }
+  })
+})
diff --git a/src/main/local-worktree-path-presence.ts b/src/main/local-worktree-path-presence.ts
new file mode 100644
index 00000000000..673305d9513
--- /dev/null
+++ b/src/main/local-worktree-path-presence.ts
@@ -0,0 +1,72 @@
+import { stat } from 'node:fs/promises'
+import { mapWithConcurrency } from '../shared/map-with-concurrency'
+import { PrioritySemaphore } from '../shared/priority-semaphore'
+
+// Why: share one bound across polling callers so slow mounts cannot multiply libuv work.
+const LOCAL_WORKTREE_PATH_PROBE_CONCURRENCY = 2
+export const LOCAL_WORKTREE_PATH_PROBE_TIMEOUT_MS = 2_000
+const localWorktreePathProbeSemaphore = new PrioritySemaphore(LOCAL_WORKTREE_PATH_PROBE_CONCURRENCY)
+
+function probeDeadline(signal?: AbortSignal): AbortSignal {
+  const timeout = AbortSignal.timeout(LOCAL_WORKTREE_PATH_PROBE_TIMEOUT_MS)
+  return signal ? AbortSignal.any([signal, timeout]) : timeout
+}
+
+async function probeLocalWorktreePath(pathValue: string, signal: AbortSignal): Promise<boolean> {
+  let release: () => void
+  try {
+    release = await localWorktreePathProbeSemaphore.acquire(0, signal)
+  } catch {
+    return true
+  }
+  if (signal.aborted) {
+    release()
+    return true
+  }
+  const presence = stat(pathValue)
+    .then(
+      () => true,
+      (error) => {
+        const code = (error as NodeJS.ErrnoException | undefined)?.code
+        return code !== 'ENOENT' && code !== 'ENOTDIR'
+      }
+    )
+    .finally(release)
+  if (signal.aborted) {
+    return true
+  }
+  return new Promise((resolve) => {
+    const finish = (value: boolean): void => {
+      signal.removeEventListener('abort', onAbort)
+      resolve(value)
+    }
+    const onAbort = (): void => finish(true)
+    signal.addEventListener('abort', onAbort, { once: true })
+    void presence.then(finish)
+  })
+}
+
+/** A non-absence filesystem error cannot prove a native-local worktree disappeared. */
+export function localWorktreePathExistsOrIsUnverifiable(
+  pathValue: string,
+  options: { signal?: AbortSignal } = {}
+): Promise<boolean> {
+  return probeLocalWorktreePath(pathValue, probeDeadline(options.signal))
+}
+
+export async function localWorktreePathsExistOrAreUnverifiable(
+  pathValues: readonly string[],
+  options: { signal?: AbortSignal } = {}
+): Promise<ReadonlyMap<string, boolean>> {
+  const uniquePaths = [...new Set(pathValues)]
+  if (uniquePaths.length === 0) {
+    return new Map()
+  }
+  const signal = probeDeadline(options.signal)
+  const results = await mapWithConcurrency(
+    uniquePaths,
+    LOCAL_WORKTREE_PATH_PROBE_CONCURRENCY,
+    async (pathValue) => [pathValue, await probeLocalWorktreePath(pathValue, signal)] as const
+  )
+  return new Map(results)
+}
diff --git a/src/main/local-worktree-scan-generation.ts b/src/main/local-worktree-scan-generation.ts
new file mode 100644
index 00000000000..c8cc3bd0ff9
--- /dev/null
+++ b/src/main/local-worktree-scan-generation.ts
@@ -0,0 +1,25 @@
+const generationByRepoId = new Map<string, number>()
+let generationSequence = 0
+
+export function getLocalWorktreeScanGeneration(repoId: string): number {
+  const existing = generationByRepoId.get(repoId)
+  if (existing !== undefined) {
+    return existing
+  }
+  const generation = ++generationSequence
+  generationByRepoId.set(repoId, generation)
+  return generation
+}
+
+export function bumpLocalWorktreeScanGeneration(repoId: string): void {
+  generationByRepoId.set(repoId, ++generationSequence)
+}
+
+export function isLocalWorktreeScanGenerationCurrent(repoId: string, generation: number): boolean {
+  return getLocalWorktreeScanGeneration(repoId) === generation
+}
+
+export function resetLocalWorktreeScanGenerationsForTests(): void {
+  generationSequence += 1
+  generationByRepoId.clear()
+}
diff --git a/src/main/memory/hydrate-local-pty-registry.test.ts b/src/main/memory/hydrate-local-pty-registry.test.ts
index 7b9a90bfb73..a7a03293832 100644
--- a/src/main/memory/hydrate-local-pty-registry.test.ts
+++ b/src/main/memory/hydrate-local-pty-registry.test.ts
@@ -11,7 +11,10 @@
  */
 
 import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { resolveFolderWorkspaceHost } from '../../shared/folder-workspace-execution-host'
+import type { FolderWorkspace } from '../../shared/folder-workspace-types'
 import type { Repo } from '../../shared/repo-types'
+import type { WorktreeMeta } from '../../shared/worktree/meta-types'
 import type { SessionInfo } from '../daemon/types'
 import type { DaemonPtyAdapter } from '../daemon/daemon-pty-adapter'
 import type { Store } from '../persistence'
@@ -23,7 +26,6 @@ import type {
 } from './pty-registry'
 
 const LARGE_SESSION_COUNT = 150_000
-
 // Why: the hydrator pulls the daemon provider through this module-level
 // getter. Stubbing it lets us drive the offline / throwing / live paths
 // without spinning up real sockets.
@@ -32,32 +34,53 @@ vi.mock('../daemon/daemon-init', () => ({
   getDaemonProvider: () => getDaemonProviderMock()
 }))
 
-// Why: the hydrator builds its worktreeId → connectionId map through
-// listRepoWorktrees(repo). The git I/O is out of scope for this unit; the mock
-// also lets count tests prove repos without live sessions launch no Git work.
-const listRepoWorktreesMock = vi.fn()
-vi.mock('../repo-worktrees', () => ({
-  listRepoWorktrees: (repo: unknown) => listRepoWorktreesMock(repo)
+const getLocalProjectWorktreeGitOptionsMock = vi.fn()
+vi.mock('../project-runtime-git-options', () => ({
+  getLocalProjectWorktreeGitOptions: (store: unknown, repo: unknown) =>
+    getLocalProjectWorktreeGitOptionsMock(store, repo)
 }))
 
-// Why: hydrateLocalPtyRegistryAtBoot accepts `Pick<Store, 'getRepos'>` and
-// the hydrator only reads `id` + `connectionId` off each Repo, but Repo's
-// required fields (path, displayName, badgeColor, addedAt) still have to be
-// present at the type level. Filling them with placeholder values keeps the
-// test schema-compliant without coupling to anything the hydrator doesn't
-// touch.
+// Why: the hydrator builds its worktreeId → connectionId map through
+// listLocalRepoWorktreesStrict(repo). The git I/O is out of scope for this
+// unit; the mock also lets count tests prove repos without live sessions
+// launch no Git work.
+const listLocalRepoWorktreesStrictMock = vi.fn()
+vi.mock('../repo-worktrees', () => ({
+  listLocalRepoWorktreesStrict: (
+    repo: unknown,
+    options?: { signal?: AbortSignal; wslDistro?: string }
+  ) => listLocalRepoWorktreesStrictMock(repo, options)
+}))
+
+// The runtime option helper accepts Store; mocks keep this fixture scoped to hydration reads.
 function makeStore(
-  repos: { id: string; connectionId?: string | null }[] = []
-): Pick<Store, 'getRepos'> {
+  repos: {
+    id: string
+    connectionId?: string | null
+    executionHostId?: Repo['executionHostId']
+    kind?: Repo['kind']
+    path?: string
+  }[] = [],
+  worktreeMeta: Record<string, WorktreeMeta> = {}
+): Store {
   const built: Repo[] = repos.map((r) => ({
     id: r.id,
-    path: `/tmp/${r.id}`,
+    path: r.path ?? `/tmp/${r.id}`,
     displayName: r.id,
     badgeColor: '#000000',
     addedAt: 0,
-    connectionId: r.connectionId ?? null
+    connectionId: r.connectionId ?? null,
+    executionHostId: r.executionHostId ?? null,
+    kind: r.kind
   }))
-  return { getRepos: () => built }
+  return {
+    getRepos: () => built,
+    getAllWorktreeMeta: () => worktreeMeta,
+    getAllWorktreeMetaForHost: (hostId) =>
+      Object.fromEntries(
+        Object.entries(worktreeMeta).filter(([, meta]) => !meta.hostId || meta.hostId === hostId)
+      )
+  } as Store
 }
 
 function makeProvider(sessions: SessionInfo[]): Pick<DaemonPtyAdapter, 'listSessions'> {
@@ -66,6 +89,12 @@ function makeProvider(sessions: SessionInfo[]): Pick<DaemonPtyAdapter, 'listSess
   }
 }
 
+function makeProviderGroup(adapters: Pick<DaemonPtyAdapter, 'listSessions'>[]): {
+  getAllAdapters: () => Pick<DaemonPtyAdapter, 'listSessions'>[]
+} {
+  return { getAllAdapters: () => adapters }
+}
+
 function makeLocalSessions(repoId: string, worktreePath: string, count: number): SessionInfo[] {
   const sessions: SessionInfo[] = []
   for (let index = 0; index < count; index += 1) {
@@ -98,6 +127,8 @@ function createDeferred<T>(): {
 // a coherent pair.
 async function loadFresh(): Promise<{
   hydrate: typeof HydrateFn
+  deadlineMs: number
+  gitEnumerationConcurrency: number
   listRegisteredPtys: typeof ListFn
   registerPty: typeof RegisterFn
   unregisterPty: typeof UnregisterFn
@@ -107,6 +138,8 @@ async function loadFresh(): Promise<{
   const registryMod = await import('./pty-registry')
   return {
     hydrate: hydrateMod.hydrateLocalPtyRegistryAtBoot,
+    deadlineMs: hydrateMod.LOCAL_PTY_REGISTRY_BOOT_HYDRATION_DEADLINE_MS,
+    gitEnumerationConcurrency: hydrateMod.LOCAL_PTY_REGISTRY_GIT_ENUMERATION_CONCURRENCY,
     listRegisteredPtys: registryMod.listRegisteredPtys,
     registerPty: registryMod.registerPty,
     unregisterPty: registryMod.unregisterPty
@@ -116,7 +149,8 @@ async function loadFresh(): Promise<{
 describe('hydrateLocalPtyRegistryAtBoot', () => {
   beforeEach(() => {
     getDaemonProviderMock.mockReset()
-    listRepoWorktreesMock.mockReset()
+    getLocalProjectWorktreeGitOptionsMock.mockReset().mockReturnValue({})
+    listLocalRepoWorktreesStrictMock.mockReset()
   })
 
   it('no-op when daemon provider is null at first call (retries on later activation)', async () => {
@@ -126,19 +160,19 @@ describe('hydrateLocalPtyRegistryAtBoot', () => {
     await hydrate(makeStore([{ id: 'repo-a' }]))
 
     expect(listRegisteredPtys()).toHaveLength(0)
-    expect(listRepoWorktreesMock).not.toHaveBeenCalled()
+    expect(listLocalRepoWorktreesStrictMock).not.toHaveBeenCalled()
 
     // Why: the design says the hasHydrated guard must stay false until a
     // provider is obtained, so a later macOS dock re-activation can retry.
     // Provider becomes available; second call should now perform the pass.
     const provider = makeProvider([])
     getDaemonProviderMock.mockReturnValue(provider)
-    listRepoWorktreesMock.mockResolvedValue([])
+    listLocalRepoWorktreesStrictMock.mockResolvedValue([])
 
     await hydrate(makeStore([{ id: 'repo-a' }]))
 
     expect(provider.listSessions).toHaveBeenCalledTimes(1)
-    expect(listRepoWorktreesMock).not.toHaveBeenCalled()
+    expect(listLocalRepoWorktreesStrictMock).not.toHaveBeenCalled()
   })
 
   it('catches provider.listSessions rejection and does not throw', async () => {
@@ -147,7 +181,9 @@ describe('hydrateLocalPtyRegistryAtBoot', () => {
       listSessions: vi.fn().mockRejectedValue(new Error('socket EPIPE'))
     }
     getDaemonProviderMock.mockReturnValue(provider)
-    listRepoWorktreesMock.mockResolvedValue([{ path: '/local/Triton', isMainWorktree: true }])
+    listLocalRepoWorktreesStrictMock.mockResolvedValue([
+      { path: '/local/Triton', isMainWorktree: true }
+    ])
 
     // Why: the renderer-side step-2 merge fallback covers this case. The
     // hydrator must not surface the failure to the caller — it logs and
@@ -157,7 +193,234 @@ describe('hydrateLocalPtyRegistryAtBoot', () => {
     warnSpy.mockRestore()
 
     expect(listRegisteredPtys()).toHaveLength(0)
-    expect(listRepoWorktreesMock).not.toHaveBeenCalled()
+    expect(listLocalRepoWorktreesStrictMock).not.toHaveBeenCalled()
+  })
+
+  it('coalesces concurrent calls onto one inventory attempt', async () => {
+    const { hydrate } = await loadFresh()
+    const inventory = createDeferred<SessionInfo[]>()
+    const provider = { listSessions: vi.fn(() => inventory.promise) }
+    getDaemonProviderMock.mockReturnValue(provider)
+
+    const first = hydrate(makeStore())
+    const second = hydrate(makeStore())
+
+    expect(first).toBe(second)
+    expect(provider.listSessions).toHaveBeenCalledOnce()
+
+    inventory.resolve([])
+    await first
+  })
+
+  it('retries after worktree enumeration throws', async () => {
+    const { hydrate, listRegisteredPtys } = await loadFresh()
+    const ptyId = 'repo-a::/local/repo-a@@00000001'
+    const provider = makeProvider([
+      { sessionId: ptyId, pid: 4001, cwd: '/local/repo-a' } as unknown as SessionInfo
+    ])
+    getDaemonProviderMock.mockReturnValue(provider)
+    listLocalRepoWorktreesStrictMock
+      .mockRejectedValueOnce(new Error('git unavailable'))
+      .mockResolvedValue([
+        { path: '/local/repo-a', head: '', branch: '', isBare: false, isMainWorktree: true }
+      ])
+    const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {})
+
+    await hydrate(makeStore([{ id: 'repo-a' }]))
+    expect(listRegisteredPtys()).toHaveLength(0)
+    expect(listLocalRepoWorktreesStrictMock).toHaveBeenCalledOnce()
+
+    await hydrate(makeStore([{ id: 'repo-a' }]))
+    warnSpy.mockRestore()
+
+    expect(listRegisteredPtys()).toEqual([expect.objectContaining({ ptyId })])
+    expect(listLocalRepoWorktreesStrictMock).toHaveBeenCalledTimes(2)
+  })
+
+  it('forwards the WSL project runtime and live deadline signal to strict enumeration', async () => {
+    const { hydrate } = await loadFresh()
+    const ptyId = 'repo-a::/mnt/c/repo-a@@00000001'
+    const store = makeStore([{ id: 'repo-a', path: '/mnt/c/repo-a' }])
+    getDaemonProviderMock.mockReturnValue(
+      makeProvider([
+        { sessionId: ptyId, pid: 4001, cwd: '/mnt/c/repo-a' } as unknown as SessionInfo
+      ])
+    )
+    getLocalProjectWorktreeGitOptionsMock.mockReturnValue({ wslDistro: 'Ubuntu' })
+    listLocalRepoWorktreesStrictMock.mockResolvedValue([
+      { path: '/mnt/c/repo-a', head: '', branch: '', isBare: false, isMainWorktree: true }
+    ])
+
+    await hydrate(store)
+
+    const [repo, options] = listLocalRepoWorktreesStrictMock.mock.calls[0] as [
+      Repo,
+      { signal: AbortSignal; wslDistro?: string }
+    ]
+    expect(getLocalProjectWorktreeGitOptionsMock).toHaveBeenCalledWith(store, repo)
+    expect(options.wslDistro).toBe('Ubuntu')
+    expect(options.signal).toBeInstanceOf(AbortSignal)
+    expect(options.signal.aborted).toBe(false)
+  })
+
+  it('resolves by the boot deadline and lets a later call retry stalled enumeration', async () => {
+    vi.useFakeTimers()
+    const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {})
+    try {
+      const { hydrate, deadlineMs, listRegisteredPtys } = await loadFresh()
+      const ptyId = 'repo-a::/local/repo-a@@00000001'
+      const provider = makeProvider([
+        { sessionId: ptyId, pid: 4001, cwd: '/local/repo-a' } as unknown as SessionInfo
+      ])
+      const signals: AbortSignal[] = []
+      getDaemonProviderMock.mockReturnValue(provider)
+      listLocalRepoWorktreesStrictMock
+        .mockImplementationOnce((_repo: Repo, options?: { signal?: AbortSignal }) => {
+          if (options?.signal) {
+            signals.push(options.signal)
+          }
+          return new Promise(() => {})
+        })
+        .mockImplementation(async (_repo: Repo, options?: { signal?: AbortSignal }) => {
+          if (options?.signal) {
+            signals.push(options.signal)
+          }
+          return [
+            {
+              path: '/local/repo-a',
+              head: '',
+              branch: '',
+              isBare: false,
+              isMainWorktree: true
+            }
+          ]
+        })
+
+      let settled = false
+      const first = hydrate(makeStore([{ id: 'repo-a' }])).then(() => {
+        settled = true
+      })
+      await vi.advanceTimersByTimeAsync(deadlineMs - 1)
+      expect(settled).toBe(false)
+
+      await vi.advanceTimersByTimeAsync(1)
+      expect(settled).toBe(true)
+      await first
+      expect(signals[0]?.aborted).toBe(true)
+
+      await hydrate(makeStore([{ id: 'repo-a' }]))
+
+      expect(listLocalRepoWorktreesStrictMock).toHaveBeenCalledTimes(2)
+      expect(listRegisteredPtys()).toEqual([expect.objectContaining({ ptyId })])
+      expect(vi.getTimerCount()).toBe(0)
+    } finally {
+      warnSpy.mockRestore()
+      vi.clearAllTimers()
+      vi.useRealTimers()
+    }
+  })
+
+  it('bounds concurrent Git worktree enumeration', async () => {
+    const { hydrate, gitEnumerationConcurrency } = await loadFresh()
+    const repoCount = 6
+    const gate = createDeferred<void>()
+    let active = 0
+    let maxActive = 0
+    const sessions = Array.from({ length: repoCount }, (_, index) => {
+      const repoId = `repo-${index}`
+      return {
+        sessionId: `${repoId}::/local/${repoId}@@0000000${index}`,
+        pid: 4000 + index,
+        cwd: `/local/${repoId}`
+      } as unknown as SessionInfo
+    })
+    getDaemonProviderMock.mockReturnValue(makeProvider(sessions))
+    listLocalRepoWorktreesStrictMock.mockImplementation(async (repo: Repo) => {
+      active += 1
+      maxActive = Math.max(maxActive, active)
+      await gate.promise
+      active -= 1
+      return [
+        { path: `/local/${repo.id}`, head: '', branch: '', isBare: false, isMainWorktree: true }
+      ]
+    })
+
+    const hydration = hydrate(
+      makeStore(Array.from({ length: repoCount }, (_, index) => ({ id: `repo-${index}` })))
+    )
+    let startedBeforeRelease = 0
+    try {
+      await vi.waitFor(() =>
+        expect(listLocalRepoWorktreesStrictMock).toHaveBeenCalledTimes(gitEnumerationConcurrency)
+      )
+      startedBeforeRelease = listLocalRepoWorktreesStrictMock.mock.calls.length
+    } finally {
+      gate.resolve(undefined)
+      await hydration
+    }
+
+    expect(startedBeforeRelease).toBe(gitEnumerationConcurrency)
+    expect(maxActive).toBe(gitEnumerationConcurrency)
+  })
+
+  it('registers successful adapter rows but retries a failed adapter', async () => {
+    const { hydrate, listRegisteredPtys } = await loadFresh()
+    const sessionA = {
+      sessionId: 'repo-a::/local/repo-a@@00000001',
+      pid: 4001,
+      cwd: '/local/repo-a'
+    } as unknown as SessionInfo
+    const sessionB = {
+      sessionId: 'repo-b::/local/repo-b@@00000002',
+      pid: 4002,
+      cwd: '/local/repo-b'
+    } as unknown as SessionInfo
+    const adapterA = makeProvider([sessionA])
+    const adapterB = {
+      listSessions: vi
+        .fn()
+        .mockRejectedValueOnce(new Error('legacy unavailable'))
+        .mockRejectedValueOnce(new Error('legacy unavailable'))
+        .mockResolvedValue([sessionB])
+    }
+    getDaemonProviderMock.mockReturnValue(makeProviderGroup([adapterA, adapterB]))
+    listLocalRepoWorktreesStrictMock.mockImplementation(async (repo: Repo) => [
+      { path: `/local/${repo.id}`, head: '', branch: '', isBare: false, isMainWorktree: true }
+    ])
+    const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {})
+    const store = makeStore([{ id: 'repo-a' }, { id: 'repo-b' }])
+
+    await hydrate(store)
+    expect(listRegisteredPtys().map((pty) => pty.ptyId)).toEqual([sessionA.sessionId])
+
+    await hydrate(store)
+    warnSpy.mockRestore()
+
+    expect(
+      listRegisteredPtys()
+        .map((pty) => pty.ptyId)
+        .sort()
+    ).toEqual([sessionA.sessionId, sessionB.sessionId].sort())
+  })
+
+  it('retries an all-adapter inventory failure and latches only the complete retry', async () => {
+    const { hydrate } = await loadFresh()
+    const firstAdapter = {
+      listSessions: vi.fn().mockRejectedValueOnce(new Error('current down')).mockResolvedValue([])
+    }
+    const secondAdapter = {
+      listSessions: vi.fn().mockRejectedValueOnce(new Error('legacy down')).mockResolvedValue([])
+    }
+    getDaemonProviderMock.mockReturnValue(makeProviderGroup([firstAdapter, secondAdapter]))
+    const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {})
+
+    await hydrate(makeStore())
+    await hydrate(makeStore())
+    await hydrate(makeStore())
+    warnSpy.mockRestore()
+
+    expect(firstAdapter.listSessions).toHaveBeenCalledTimes(2)
+    expect(secondAdapter.listSessions).toHaveBeenCalledTimes(2)
   })
 
   it('does not clobber a pre-existing registry pid with a null pid from listSessions', async () => {
@@ -183,7 +446,7 @@ describe('hydrateLocalPtyRegistryAtBoot', () => {
       { sessionId: ptyId, pid: null, cwd: '/local/Triton' } as unknown as SessionInfo
     ])
     getDaemonProviderMock.mockReturnValue(provider)
-    listRepoWorktreesMock.mockResolvedValue([
+    listLocalRepoWorktreesStrictMock.mockResolvedValue([
       { path: '/local/Triton', head: '', branch: '', isBare: false, isMainWorktree: true }
     ])
 
@@ -193,7 +456,7 @@ describe('hydrateLocalPtyRegistryAtBoot', () => {
     expect(entry).toBeDefined()
     expect(entry!.pid).toBe(12345)
     expect(entry!.paneKey).toBe('tab-1:1')
-    expect(listRepoWorktreesMock).not.toHaveBeenCalled()
+    expect(listLocalRepoWorktreesStrictMock).not.toHaveBeenCalled()
   })
 
   it('does not clobber a pty:spawn registration that arrives during worktree enumeration', async () => {
@@ -207,10 +470,10 @@ describe('hydrateLocalPtyRegistryAtBoot', () => {
       createDeferred<
         { path: string; head: string; branch: string; isBare: boolean; isMainWorktree: boolean }[]
       >()
-    listRepoWorktreesMock.mockReturnValue(worktrees.promise)
+    listLocalRepoWorktreesStrictMock.mockReturnValue(worktrees.promise)
 
     const hydration = hydrate(makeStore([{ id: 'repo-a', connectionId: null }]))
-    await vi.waitFor(() => expect(listRepoWorktreesMock).toHaveBeenCalledTimes(1))
+    await vi.waitFor(() => expect(listLocalRepoWorktreesStrictMock).toHaveBeenCalledTimes(1))
     registerPty({
       ptyId,
       worktreeId: 'repo-a::/local/Triton',
@@ -244,10 +507,10 @@ describe('hydrateLocalPtyRegistryAtBoot', () => {
       createDeferred<
         { path: string; head: string; branch: string; isBare: boolean; isMainWorktree: boolean }[]
       >()
-    listRepoWorktreesMock.mockReturnValue(worktrees.promise)
+    listLocalRepoWorktreesStrictMock.mockReturnValue(worktrees.promise)
 
     const hydration = hydrate(makeStore([{ id: 'repo-a', connectionId: null }]))
-    await vi.waitFor(() => expect(listRepoWorktreesMock).toHaveBeenCalledTimes(1))
+    await vi.waitFor(() => expect(listLocalRepoWorktreesStrictMock).toHaveBeenCalledTimes(1))
     unregisterPty(ptyId)
     worktrees.resolve([
       { path: '/local/Triton', head: '', branch: '', isBare: false, isMainWorktree: true }
@@ -266,7 +529,7 @@ describe('hydrateLocalPtyRegistryAtBoot', () => {
       { sessionId: ptyId, pid: 999, cwd: '/remote/Stingray' } as unknown as SessionInfo
     ])
     getDaemonProviderMock.mockReturnValue(provider)
-    listRepoWorktreesMock.mockResolvedValue([
+    listLocalRepoWorktreesStrictMock.mockResolvedValue([
       { path: '/remote/Stingray', head: '', branch: '', isBare: false, isMainWorktree: true }
     ])
 
@@ -276,7 +539,24 @@ describe('hydrateLocalPtyRegistryAtBoot', () => {
     // visible to the local process sampler. Mirrors the spawn-time gate
     // around `registerPty` in `pty.ts`'s `pty:spawn` handler.
     expect(listRegisteredPtys()).toHaveLength(0)
-    expect(listRepoWorktreesMock).not.toHaveBeenCalled()
+    expect(listLocalRepoWorktreesStrictMock).not.toHaveBeenCalled()
+  })
+
+  it('skips paired-runtime repos even when connectionId is absent', async () => {
+    const { hydrate, listRegisteredPtys } = await loadFresh()
+    const provider = makeProvider([
+      {
+        sessionId: 'repo-runtime::/runtime/Stingray@@feedface',
+        pid: 999,
+        cwd: '/runtime/Stingray'
+      } as unknown as SessionInfo
+    ])
+    getDaemonProviderMock.mockReturnValue(provider)
+
+    await hydrate(makeStore([{ id: 'repo-runtime', executionHostId: 'runtime:environment-1' }]))
+
+    expect(listRegisteredPtys()).toHaveLength(0)
+    expect(listLocalRepoWorktreesStrictMock).not.toHaveBeenCalled()
   })
 
   it('registers a local session whose worktree is in the store with the daemon-published pid', async () => {
@@ -287,7 +567,7 @@ describe('hydrateLocalPtyRegistryAtBoot', () => {
       { sessionId: ptyId, pid: 4242, cwd: '/local/Triton' } as unknown as SessionInfo
     ])
     getDaemonProviderMock.mockReturnValue(provider)
-    listRepoWorktreesMock.mockResolvedValue([
+    listLocalRepoWorktreesStrictMock.mockResolvedValue([
       { path: '/local/Triton', head: '', branch: '', isBare: false, isMainWorktree: true }
     ])
 
@@ -299,6 +579,221 @@ describe('hydrateLocalPtyRegistryAtBoot', () => {
     expect(entry!.worktreeId).toBe('repo-a::/local/Triton')
   })
 
+  it('matches Windows worktree path spelling while preserving the daemon worktree id', async () => {
+    const { hydrate, listRegisteredPtys } = await loadFresh()
+    const worktreeId = 'repo-a::C:/Users/Neil/Orca'
+    const ptyId = `${worktreeId}@@cafebabe`
+    getDaemonProviderMock.mockReturnValue(
+      makeProvider([
+        { sessionId: ptyId, pid: 4242, cwd: 'C:/Users/Neil/Orca' } as unknown as SessionInfo
+      ])
+    )
+    listLocalRepoWorktreesStrictMock.mockResolvedValue([
+      {
+        path: 'c:\\users\\neil\\orca',
+        head: '',
+        branch: '',
+        isBare: false,
+        isMainWorktree: true
+      }
+    ])
+
+    await hydrate(makeStore([{ id: 'repo-a', path: 'C:\\Users\\Neil\\Orca' }]))
+
+    expect(listRegisteredPtys()).toEqual([expect.objectContaining({ ptyId, worktreeId })])
+  })
+
+  it('fails closed when live worktrees collide on one normalized key', async () => {
+    const { hydrate, listRegisteredPtys } = await loadFresh()
+    const ptyId = 'repo-a::C:/Users/Neil/Orca@@cafebabe'
+    getDaemonProviderMock.mockReturnValue(
+      makeProvider([
+        { sessionId: ptyId, pid: 4242, cwd: 'C:/Users/Neil/Orca' } as unknown as SessionInfo
+      ])
+    )
+    listLocalRepoWorktreesStrictMock.mockResolvedValue([
+      {
+        path: 'C:/Users/Neil/Orca',
+        head: '',
+        branch: '',
+        isBare: false,
+        isMainWorktree: true
+      },
+      {
+        path: 'c:\\users\\neil\\orca',
+        head: '',
+        branch: '',
+        isBare: false,
+        isMainWorktree: false
+      }
+    ])
+
+    await hydrate(makeStore([{ id: 'repo-a', path: 'C:/Users/Neil/Orca' }]))
+
+    expect(listRegisteredPtys()).toHaveLength(0)
+  })
+
+  it('matches local WSL UNC aliases without treating WSL as a remote host', async () => {
+    const { hydrate, listRegisteredPtys } = await loadFresh()
+    const worktreeId = 'repo-a::\\\\wsl$\\Ubuntu\\home\\neil\\orca'
+    const ptyId = `${worktreeId}@@cafebabe`
+    getDaemonProviderMock.mockReturnValue(
+      makeProvider([
+        {
+          sessionId: ptyId,
+          pid: 4242,
+          cwd: '\\\\wsl$\\Ubuntu\\home\\neil\\orca'
+        } as unknown as SessionInfo
+      ])
+    )
+    listLocalRepoWorktreesStrictMock.mockResolvedValue([
+      {
+        path: '\\\\wsl.localhost\\ubuntu\\home\\neil\\orca',
+        head: '',
+        branch: '',
+        isBare: false,
+        isMainWorktree: true
+      }
+    ])
+
+    await hydrate(makeStore([{ id: 'repo-a', path: '\\\\wsl$\\Ubuntu\\home\\neil\\orca' }]))
+
+    expect(listRegisteredPtys()).toEqual([expect.objectContaining({ ptyId, worktreeId })])
+  })
+
+  it('preserves an exact repo-backed folder instance id from local-host metadata', async () => {
+    const { hydrate, listRegisteredPtys } = await loadFresh()
+    const instanceId =
+      'folder-repo::/workspace/folder::workspace:aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa'
+    const ptyId = `${instanceId}@@cafebabe`
+    getDaemonProviderMock.mockReturnValue(
+      makeProvider([
+        { sessionId: ptyId, pid: 4242, cwd: '/workspace/folder' } as unknown as SessionInfo
+      ])
+    )
+
+    await hydrate(
+      makeStore([{ id: 'folder-repo', kind: 'folder', path: '/workspace/folder' }], {
+        [instanceId]: { hostId: 'local' } as WorktreeMeta
+      })
+    )
+
+    expect(listRegisteredPtys()).toEqual([
+      expect.objectContaining({ ptyId, worktreeId: instanceId })
+    ])
+    expect(listLocalRepoWorktreesStrictMock).not.toHaveBeenCalled()
+  })
+
+  it('accepts legacy unhosted folder-instance metadata for a uniquely local repo', async () => {
+    const { hydrate, listRegisteredPtys } = await loadFresh()
+    const instanceId =
+      'folder-repo::/workspace/folder::workspace:aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa'
+    const ptyId = `${instanceId}@@cafebabe`
+    getDaemonProviderMock.mockReturnValue(
+      makeProvider([
+        { sessionId: ptyId, pid: 4242, cwd: '/workspace/folder' } as unknown as SessionInfo
+      ])
+    )
+
+    await hydrate(
+      makeStore([{ id: 'folder-repo', kind: 'folder', path: '/workspace/folder' }], {
+        [instanceId]: {} as WorktreeMeta
+      })
+    )
+
+    expect(listRegisteredPtys()).toEqual([expect.objectContaining({ ptyId })])
+  })
+
+  it('rejects legacy folder-instance metadata when the repo id also has a remote owner', async () => {
+    const { hydrate, listRegisteredPtys } = await loadFresh()
+    const instanceId =
+      'folder-repo::/workspace/folder::workspace:aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa'
+    getDaemonProviderMock.mockReturnValue(
+      makeProvider([
+        {
+          sessionId: `${instanceId}@@cafebabe`,
+          pid: 4242,
+          cwd: '/workspace/folder'
+        } as unknown as SessionInfo
+      ])
+    )
+
+    await hydrate(
+      makeStore(
+        [
+          { id: 'folder-repo', kind: 'folder', path: '/workspace/folder' },
+          {
+            id: 'folder-repo',
+            kind: 'folder',
+            path: '/workspace/folder',
+            executionHostId: 'runtime:environment-1'
+          }
+        ],
+        { [instanceId]: {} as WorktreeMeta }
+      )
+    )
+
+    expect(listRegisteredPtys()).toHaveLength(0)
+  })
+
+  it('accepts explicit local folder-instance metadata beside a same-id runtime owner', async () => {
+    const { hydrate, listRegisteredPtys } = await loadFresh()
+    const instanceId =
+      'folder-repo::/workspace/folder::workspace:aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa'
+    const ptyId = `${instanceId}@@cafebabe`
+    getDaemonProviderMock.mockReturnValue(
+      makeProvider([
+        { sessionId: ptyId, pid: 4242, cwd: '/workspace/folder' } as unknown as SessionInfo
+      ])
+    )
+
+    await hydrate(
+      makeStore(
+        [
+          { id: 'folder-repo', kind: 'folder', path: '/workspace/folder' },
+          {
+            id: 'folder-repo',
+            kind: 'folder',
+            path: '/workspace/folder',
+            executionHostId: 'runtime:environment-1'
+          }
+        ],
+        { [instanceId]: { hostId: 'local' } as WorktreeMeta }
+      )
+    )
+
+    expect(listRegisteredPtys()).toEqual([expect.objectContaining({ ptyId })])
+  })
+
+  it('keeps true folder workspace PTY ids as an accepted hydration gap', async () => {
+    const { hydrate, listRegisteredPtys } = await loadFresh()
+    const workspace = {
+      id: 'folder-workspace-1',
+      executionHostId: 'local'
+    } as FolderWorkspace
+    getDaemonProviderMock.mockReturnValue(
+      makeProvider([
+        {
+          sessionId: 'folder:folder-workspace-1@@cafebabe',
+          pid: 4242,
+          cwd: '/workspace/folder'
+        } as unknown as SessionInfo
+      ])
+    )
+
+    expect(
+      resolveFolderWorkspaceHost(
+        { folderWorkspaces: [workspace], projectGroups: [], repos: [] },
+        workspace.id
+      )
+    ).toEqual({ kind: 'local' })
+
+    await hydrate(makeStore())
+
+    expect(listRegisteredPtys()).toHaveLength(0)
+    expect(listLocalRepoWorktreesStrictMock).not.toHaveBeenCalled()
+  })
+
   it('does not register a daemon session whose worktree was removed', async () => {
     const { hydrate, listRegisteredPtys } = await loadFresh()
     const provider = makeProvider([
@@ -309,13 +804,13 @@ describe('hydrateLocalPtyRegistryAtBoot', () => {
       } as unknown as SessionInfo
     ])
     getDaemonProviderMock.mockReturnValue(provider)
-    listRepoWorktreesMock.mockResolvedValue([
+    listLocalRepoWorktreesStrictMock.mockResolvedValue([
       { path: '/local/current', head: '', branch: '', isBare: false, isMainWorktree: true }
     ])
 
     await hydrate(makeStore([{ id: 'repo-a', connectionId: null }]))
 
-    expect(listRepoWorktreesMock).toHaveBeenCalledTimes(1)
+    expect(listLocalRepoWorktreesStrictMock).toHaveBeenCalledTimes(1)
     expect(listRegisteredPtys()).toHaveLength(0)
   })
 
@@ -334,7 +829,7 @@ describe('hydrateLocalPtyRegistryAtBoot', () => {
       )
     )
     getDaemonProviderMock.mockReturnValue(provider)
-    listRepoWorktreesMock.mockImplementation(async (repo: Repo) => [
+    listLocalRepoWorktreesStrictMock.mockImplementation(async (repo: Repo) => [
       {
         path: `/local/${repo.id}`,
         head: '',
@@ -346,8 +841,8 @@ describe('hydrateLocalPtyRegistryAtBoot', () => {
 
     await hydrate(makeStore(repos))
 
-    expect(listRepoWorktreesMock).toHaveBeenCalledTimes(activeRepoIds.length)
-    expect(listRepoWorktreesMock.mock.calls.map(([repo]) => (repo as Repo).id)).toEqual(
+    expect(listLocalRepoWorktreesStrictMock).toHaveBeenCalledTimes(activeRepoIds.length)
+    expect(listLocalRepoWorktreesStrictMock.mock.calls.map(([repo]) => (repo as Repo).id)).toEqual(
       activeRepoIds
     )
     expect(listRegisteredPtys()).toHaveLength(activeRepoIds.length)
@@ -374,13 +869,13 @@ describe('hydrateLocalPtyRegistryAtBoot', () => {
       .mockResolvedValueOnce([sessionA])
       .mockResolvedValue([sessionA, sessionB])
     getDaemonProviderMock.mockReturnValue({ listSessions })
-    listRepoWorktreesMock.mockImplementation(async (repo: Repo) => [
+    listLocalRepoWorktreesStrictMock.mockImplementation(async (repo: Repo) => [
       { path: `/local/${repo.id}`, head: '', branch: '', isBare: false, isMainWorktree: true }
     ])
 
     await hydrate(makeStore([{ id: 'repo-a' }, { id: 'repo-b' }]))
 
-    expect(listRepoWorktreesMock.mock.calls.map(([repo]) => (repo as Repo).id)).toEqual([
+    expect(listLocalRepoWorktreesStrictMock.mock.calls.map(([repo]) => (repo as Repo).id)).toEqual([
       'repo-a',
       'repo-b'
     ])
@@ -398,7 +893,7 @@ describe('hydrateLocalPtyRegistryAtBoot', () => {
     const sessions = makeLocalSessions('repo-a', '/local/Triton', LARGE_SESSION_COUNT)
     const provider = makeProvider(sessions)
     getDaemonProviderMock.mockReturnValue(provider)
-    listRepoWorktreesMock.mockResolvedValue([
+    listLocalRepoWorktreesStrictMock.mockResolvedValue([
       { path: '/local/Triton', head: '', branch: '', isBare: false, isMainWorktree: true }
     ])
 
diff --git a/src/main/memory/hydrate-local-pty-registry.ts b/src/main/memory/hydrate-local-pty-registry.ts
index 3388eeebed9..b384439f0f2 100644
--- a/src/main/memory/hydrate-local-pty-registry.ts
+++ b/src/main/memory/hydrate-local-pty-registry.ts
@@ -1,146 +1,279 @@
-/**
- * Boot-time hydration of `pty-registry` from the live daemon.
- *
- * Why: on warm reattach (fresh Orca process, still-running daemon) the renderer
- * hasn't re-mounted every pane, so `pty:spawn` never fired for those sessions
- * and they surfaced as "REMOTE" despite being local. Fill the gap once at boot,
- * registering only sessions whose repo has no `connectionId` — mirroring the
- * spawn-time gate in `src/main/ipc/pty.ts`.
- */
-
-import { getDaemonProvider } from '../daemon/daemon-init'
-import { DaemonPtyRouter } from '../daemon/daemon-pty-router'
-import { DegradedDaemonPtyProvider } from '../daemon/degraded-daemon-pty-provider'
-import type { DaemonPtyAdapter } from '../daemon/daemon-pty-adapter'
-import type { SessionInfo } from '../daemon/types'
-import { listRegisteredPtys, registerPty } from './pty-registry'
-import { listRepoWorktrees } from '../repo-worktrees'
+import { getRepoExecutionHostId, LOCAL_EXECUTION_HOST_ID } from '../../shared/execution-host'
+import { throwIfSignalAborted, waitForPromiseWithSignal } from '../../shared/abort-signal-reason'
+import { mapSettledWithConcurrency } from '../../shared/map-with-concurrency'
 import { parsePtySessionId } from '../../shared/pty-session-id-format'
-import { splitWorktreeId } from '../../shared/worktree/id'
+import { isFolderRepo } from '../../shared/repo-kind'
+import type { Repo } from '../../shared/repo-types'
+import { splitWorktreeId, worktreeIdComparisonKey } from '../../shared/worktree/id'
+import { getDaemonProvider } from '../daemon/daemon-init'
+import type { DaemonPtyAdapter } from '../daemon/daemon-pty-adapter'
+import type { DaemonPtyRouter } from '../daemon/daemon-pty-router'
+import type { DegradedDaemonPtyProvider } from '../daemon/degraded-daemon-pty-provider'
+import type { SessionInfo } from '../daemon/types'
+import { isFolderWorkspaceIdForRepo } from '../ipc/worktrees/folder-workspace-model'
 import type { Store } from '../persistence'
+import { readAllWorktreeMetaForHost } from '../persistence/host-qualified-worktree-meta'
+import { getLocalProjectWorktreeGitOptions } from '../project-runtime-git-options'
+import { listLocalRepoWorktreesStrict } from '../repo-worktrees'
+import { listRegisteredPtys, registerPty } from './pty-registry'
+
+type HydrationStore = Store
+
+type DaemonInventory = {
+  complete: boolean
+  sessions: SessionInfo[]
+}
+
+type LocalRepoCatalog = {
+  byId: Map<string, Repo>
+  ownerCountById: Map<string, number>
+}
+
+// Why: matches existing local Git/read startup budgets while allowing for Defender-heavy repos.
+export const LOCAL_PTY_REGISTRY_BOOT_HYDRATION_DEADLINE_MS = 5_000
+export const LOCAL_PTY_REGISTRY_GIT_ENUMERATION_CONCURRENCY = 4
 
-// Why: macOS dock reactivation reruns setup; avoid repeating Git I/O and daemon RPC.
 let hasHydrated = false
+let hydrationInFlight: Promise<void> | null = null
 
-/**
- * Read the live daemon session list and register every local session the
- * registry doesn't already know about.
- *
- * Why: failures here are a coverage degradation (the renderer-side union still
- * covers the gap), not a correctness regression, so they're swallowed.
- */
-export async function hydrateLocalPtyRegistryAtBoot(store: Pick<Store, 'getRepos'>): Promise<void> {
-  try {
-    if (hasHydrated) {
-      return
-    }
-    const provider = getDaemonProvider()
-    if (!provider) {
-      // Why: leave hasHydrated false so a later activation can retry once the daemon is up.
-      return
-    }
-    // Why: flip only after a provider exists; retrying a failed RPC on the same socket won't help.
-    hasHydrated = true
+export function hydrateLocalPtyRegistryAtBoot(store: HydrationStore): Promise<void> {
+  if (hasHydrated) {
+    return Promise.resolve()
+  }
+  if (hydrationInFlight) {
+    return hydrationInFlight
+  }
 
-    // Why: enumerate Git worktrees only for live-session repos.
-    const reposById = new Map(store.getRepos().map((repo) => [repo.id, repo]))
-    // Why: verify via live git that a referenced worktree still exists, to avoid resurrecting removed ones.
-    const liveLocalWorktreeIds = new Set<string>()
-    const resolvedRepoIds = new Set<string>()
-
-    let sessionInfos = await collectSessionInfos(provider)
-    let alreadyRegistered = new Set(listRegisteredPtys().map((p) => p.ptyId))
-
-    // Why: re-read live sessions each pass to avoid resurrecting exited sessions.
-    for (;;) {
-      const newlyReferencedRepos = new Map<string, ReturnType<(typeof store)['getRepos']>[number]>()
-      for (const info of sessionInfos) {
-        if (alreadyRegistered.has(info.sessionId)) {
-          continue
-        }
-        const { worktreeId } = parsePtySessionId(info.sessionId)
-        const parsedWorktreeId = worktreeId ? splitWorktreeId(worktreeId) : null
-        if (!parsedWorktreeId || resolvedRepoIds.has(parsedWorktreeId.repoId)) {
-          continue
-        }
-        const repo = reposById.get(parsedWorktreeId.repoId)
-        if (!repo || (repo.connectionId ?? null)) {
-          // Why: unknown and SSH repos cannot be proven local, so do not enumerate them.
-          resolvedRepoIds.add(parsedWorktreeId.repoId)
-          continue
-        }
-        newlyReferencedRepos.set(repo.id, repo)
+  const controller = new AbortController()
+  const deadline = setTimeout(() => {
+    controller.abort(new Error('Boot-time pty-registry hydration deadline expired'))
+  }, LOCAL_PTY_REGISTRY_BOOT_HYDRATION_DEADLINE_MS)
+  let attempt!: Promise<void>
+  attempt = waitForPromiseWithSignal(
+    hydrateLocalPtyRegistry(store, controller.signal),
+    controller.signal
+  )
+    .then((complete) => {
+      if (complete) {
+        hasHydrated = true
       }
-      if (newlyReferencedRepos.size === 0) {
-        break
+    })
+    .catch((error) => {
+      console.warn(
+        '[memory] Boot-time pty-registry hydration failed:',
+        error instanceof Error ? error.message : String(error)
+      )
+    })
+    .finally(() => {
+      clearTimeout(deadline)
+      if (hydrationInFlight === attempt) {
+        hydrationInFlight = null
       }
+    })
+  hydrationInFlight = attempt
+  return attempt
+}
 
-      for (const repo of newlyReferencedRepos.values()) {
-        resolvedRepoIds.add(repo.id)
-        const worktrees = await listRepoWorktrees(repo)
-        for (const wt of worktrees) {
-          liveLocalWorktreeIds.add(`${repo.id}::${wt.path}`)
-        }
-      }
+async function hydrateLocalPtyRegistry(
+  store: HydrationStore,
+  signal: AbortSignal
+): Promise<boolean> {
+  throwIfSignalAborted(signal)
+  const provider = getDaemonProvider()
+  if (!provider) {
+    return false
+  }
 
-      sessionInfos = await collectSessionInfos(provider)
-      alreadyRegistered = new Set(listRegisteredPtys().map((p) => p.ptyId))
-    }
-    for (const info of sessionInfos) {
-      // Why: pty:spawn is the authoritative pid writer; don't overwrite its entry with a stale listSessions() pid.
+  const repoCatalog = getLocalRepoCatalog(store.getRepos())
+  const reposById = repoCatalog.byId
+  const verifiedFolderWorktreeIds = getVerifiedFolderWorktreeIds(store, repoCatalog)
+  const liveGitWorktreeIdsByKey = new Map<string, string | null>()
+  const resolvedRepoIds = new Set<string>()
+  let inventory = await collectSessionInfos(provider, signal)
+  let complete = inventory.complete
+  let alreadyRegistered = new Set(listRegisteredPtys().map((pty) => pty.ptyId))
+
+  for (;;) {
+    const referencedRepos = new Map<string, Repo>()
+    for (const info of inventory.sessions) {
       if (alreadyRegistered.has(info.sessionId)) {
         continue
       }
-      const { worktreeId } = parsePtySessionId(info.sessionId)
-      if (!worktreeId) {
+      const parsed = splitWorktreeId(parsePtySessionId(info.sessionId).worktreeId ?? '')
+      if (!parsed || resolvedRepoIds.has(parsed.repoId)) {
         continue
       }
-      // Why: register only proven-local worktrees, matching the spawn-time gate.
-      if (!liveLocalWorktreeIds.has(worktreeId)) {
+      const repo = reposById.get(parsed.repoId)
+      if (!repo || isFolderRepo(repo)) {
+        resolvedRepoIds.add(parsed.repoId)
         continue
       }
-      registerPty({
-        ptyId: info.sessionId,
-        worktreeId,
-        sessionId: info.sessionId,
-        paneKey: null,
-        pid:
-          typeof info.pid === 'number' && Number.isFinite(info.pid) && info.pid > 0
-            ? info.pid
-            : null
-      })
+      referencedRepos.set(repo.id, repo)
     }
-  } catch (err) {
-    console.warn(
-      '[memory] Boot-time pty-registry hydration failed:',
-      err instanceof Error ? err.message : String(err)
+    if (referencedRepos.size === 0) {
+      break
+    }
+    for (const repo of referencedRepos.values()) {
+      resolvedRepoIds.add(repo.id)
+    }
+
+    const worktreeResults = await mapSettledWithConcurrency(
+      [...referencedRepos.values()],
+      LOCAL_PTY_REGISTRY_GIT_ENUMERATION_CONCURRENCY,
+      async (repo) => {
+        throwIfSignalAborted(signal)
+        const worktrees = await waitForPromiseWithSignal(
+          listLocalRepoWorktreesStrict(repo, {
+            ...getLocalProjectWorktreeGitOptions(store, repo),
+            signal
+          }),
+          signal
+        )
+        throwIfSignalAborted(signal)
+        return { repo, worktrees }
+      }
     )
+    throwIfSignalAborted(signal)
+
+    for (const result of worktreeResults) {
+      if (result.status === 'rejected') {
+        complete = false
+        console.warn(
+          '[memory] Worktree enumeration failed during pty-registry hydration:',
+          result.reason instanceof Error ? result.reason.message : String(result.reason)
+        )
+        continue
+      }
+      const { repo, worktrees } = result.value
+      for (const worktree of worktrees) {
+        const worktreeId = `${repo.id}::${worktree.path}`
+        const key = worktreeIdComparisonKey(worktreeId)
+        if (key) {
+          const existing = liveGitWorktreeIdsByKey.get(key)
+          liveGitWorktreeIdsByKey.set(
+            key,
+            existing === undefined || existing === worktreeId ? worktreeId : null
+          )
+        }
+      }
+    }
+
+    inventory = await collectSessionInfos(provider, signal)
+    complete = complete && inventory.complete
+    alreadyRegistered = new Set(listRegisteredPtys().map((pty) => pty.ptyId))
+  }
+
+  throwIfSignalAborted(signal)
+  for (const info of inventory.sessions) {
+    throwIfSignalAborted(signal)
+    if (alreadyRegistered.has(info.sessionId)) {
+      continue
+    }
+    const { worktreeId } = parsePtySessionId(info.sessionId)
+    if (!worktreeId || !isVerifiedLocalWorktree(worktreeId)) {
+      continue
+    }
+    registerPty({
+      ptyId: info.sessionId,
+      worktreeId,
+      sessionId: info.sessionId,
+      paneKey: null,
+      pid:
+        typeof info.pid === 'number' && Number.isFinite(info.pid) && info.pid > 0 ? info.pid : null
+    })
+  }
+  return complete
+
+  function isVerifiedLocalWorktree(worktreeId: string): boolean {
+    if (verifiedFolderWorktreeIds.has(worktreeId)) {
+      return true
+    }
+    const key = worktreeIdComparisonKey(worktreeId)
+    return key !== null && typeof liveGitWorktreeIdsByKey.get(key) === 'string'
   }
 }
 
-async function collectSessionInfos(
-  provider: DaemonPtyRouter | DaemonPtyAdapter | DegradedDaemonPtyProvider
-): Promise<SessionInfo[]> {
-  // Why: fan listSessions across current + legacy adapters so no daemon protocol version is missed.
-  const adapters: readonly DaemonPtyAdapter[] =
-    provider instanceof DaemonPtyRouter || provider instanceof DegradedDaemonPtyProvider
-      ? provider.getAllAdapters()
-      : [provider]
-  const out: SessionInfo[] = []
-  for (const adapter of adapters) {
-    try {
-      const sessions = await adapter.listSessions()
-      // Why: session count can exceed the JS argument limit, so avoid push(...sessions).
-      for (const session of sessions) {
-        out.push(session)
-      }
-    } catch (err) {
-      // Why: one adapter's socket being unreachable is normal; don't abort the others.
-      console.warn(
-        '[memory] listSessions failed for one adapter during hydration:',
-        err instanceof Error ? err.message : String(err)
-      )
+function getLocalRepoCatalog(repos: Repo[]): LocalRepoCatalog {
+  const byId = new Map<string, Repo>()
+  const ownerCountById = new Map<string, number>()
+  const ambiguousIds = new Set<string>()
+  for (const repo of repos) {
+    ownerCountById.set(repo.id, (ownerCountById.get(repo.id) ?? 0) + 1)
+    if (getRepoExecutionHostId(repo) !== LOCAL_EXECUTION_HOST_ID) {
+      continue
+    }
+    if (byId.has(repo.id)) {
+      ambiguousIds.add(repo.id)
+    } else {
+      byId.set(repo.id, repo)
     }
   }
-  return out
+  for (const repoId of ambiguousIds) {
+    byId.delete(repoId)
+  }
+  return { byId, ownerCountById }
+}
+
+function getVerifiedFolderWorktreeIds(
+  store: HydrationStore,
+  repoCatalog: LocalRepoCatalog
+): Set<string> {
+  const verified = new Set<string>()
+  const metadata = readAllWorktreeMetaForHost(store, LOCAL_EXECUTION_HOST_ID)
+  for (const [worktreeId, meta] of Object.entries(metadata)) {
+    const parsed = splitWorktreeId(worktreeId)
+    const repo = parsed ? repoCatalog.byId.get(parsed.repoId) : undefined
+    const hasLocalAuthority =
+      meta.hostId === LOCAL_EXECUTION_HOST_ID ||
+      (meta.hostId === undefined && repoCatalog.ownerCountById.get(parsed?.repoId ?? '') === 1)
+    if (
+      repo &&
+      isFolderRepo(repo) &&
+      hasLocalAuthority &&
+      isFolderWorkspaceIdForRepo(repo, worktreeId)
+    ) {
+      verified.add(worktreeId)
+    }
+  }
+  return verified
+}
+
+async function collectSessionInfos(
+  provider: DaemonPtyRouter | DaemonPtyAdapter | DegradedDaemonPtyProvider,
+  signal: AbortSignal
+): Promise<DaemonInventory> {
+  const adapters =
+    'getAllAdapters' in provider && typeof provider.getAllAdapters === 'function'
+      ? provider.getAllAdapters()
+      : [provider]
+  const results = await Promise.all(
+    adapters.map(async (adapter) => {
+      try {
+        throwIfSignalAborted(signal)
+        const sessions = await waitForPromiseWithSignal<SessionInfo[]>(
+          adapter.listSessions(),
+          signal
+        )
+        throwIfSignalAborted(signal)
+        return { complete: true, sessions }
+      } catch (error) {
+        throwIfSignalAborted(signal)
+        console.warn(
+          '[memory] listSessions failed for one adapter during hydration:',
+          error instanceof Error ? error.message : String(error)
+        )
+        return { complete: false, sessions: [] }
+      }
+    })
+  )
+  const sessions: SessionInfo[] = []
+  for (const result of results) {
+    for (const session of result.sessions) {
+      sessions.push(session)
+    }
+  }
+  return {
+    complete: results.length > 0 && results.every((result) => result.complete),
+    sessions
+  }
 }
diff --git a/src/main/native-chat/transcript-read-cache.test.ts b/src/main/native-chat/transcript-read-cache.test.ts
index 0d61f25f48e..de6bf34ffed 100644
--- a/src/main/native-chat/transcript-read-cache.test.ts
+++ b/src/main/native-chat/transcript-read-cache.test.ts
@@ -161,7 +161,9 @@ describe('readNativeChatTranscriptCached', () => {
     await utimes(fileA, when, when)
     await utimes(fileC, when, when)
 
-    const readText = (result: Awaited<ReturnType<typeof readNativeChatTranscriptCached>>): string =>
+    const readText = (
+      result: Awaited<ReturnType<typeof readNativeChatTranscriptCached>>
+    ): string =>
       'messages' in result
         ? result.messages
             .flatMap((message) => message.blocks)
diff --git a/src/main/opencode-usage/snapshot-rollups.ts b/src/main/opencode-usage/snapshot-rollups.ts
index a98ddbdca14..c60f251914d 100644
--- a/src/main/opencode-usage/snapshot-rollups.ts
+++ b/src/main/opencode-usage/snapshot-rollups.ts
@@ -150,25 +150,23 @@ export function buildOpenCodeUsageRecentSessions(
   filteredSessions: OpenCodeUsageSession[],
   limit = 10
 ): OpenCodeUsageSessionRow[] {
-  return filteredSessions.slice(0, limit).map(
-    (session): OpenCodeUsageSessionRow => ({
-      sessionId: session.sessionId,
-      lastActiveAt: session.lastTimestamp,
-      durationMinutes: Math.max(
-        0,
-        Math.round(
-          (new Date(session.lastTimestamp).getTime() - new Date(session.firstTimestamp).getTime()) /
-            60_000
-        )
-      ),
-      projectLabel: session.primaryProjectLabel,
-      model: session.primaryModel,
-      events: session.eventCount,
-      inputTokens: session.totalInputTokens,
-      cachedInputTokens: session.totalCachedInputTokens,
-      outputTokens: session.totalOutputTokens,
-      reasoningOutputTokens: session.totalReasoningOutputTokens,
-      totalTokens: session.totalTokens
-    })
-  )
+  return filteredSessions.slice(0, limit).map((session): OpenCodeUsageSessionRow => ({
+    sessionId: session.sessionId,
+    lastActiveAt: session.lastTimestamp,
+    durationMinutes: Math.max(
+      0,
+      Math.round(
+        (new Date(session.lastTimestamp).getTime() - new Date(session.firstTimestamp).getTime()) /
+          60_000
+      )
+    ),
+    projectLabel: session.primaryProjectLabel,
+    model: session.primaryModel,
+    events: session.eventCount,
+    inputTokens: session.totalInputTokens,
+    cachedInputTokens: session.totalCachedInputTokens,
+    outputTokens: session.totalOutputTokens,
+    reasoningOutputTokens: session.totalReasoningOutputTokens,
+    totalTokens: session.totalTokens
+  }))
 }
diff --git a/src/main/orcad/orcad-entry.ts b/src/main/orcad/orcad-entry.ts
index 4af2a87c45d..3b10ca985e9 100644
--- a/src/main/orcad/orcad-entry.ts
+++ b/src/main/orcad/orcad-entry.ts
@@ -190,7 +190,7 @@ async function startOrcadRuntime(
   // Codex-home and Claude-auth preparation are left unset: both are desktop account
   // flows. A launch that needs one fails with its own message rather than silently
   // spawning an unauthenticated agent.
-  registerHeadlessPtyRuntime(runtime, undefined, () => store.getSettings(), undefined, store)
+  await registerHeadlessPtyRuntime(runtime, undefined, () => store.getSettings(), undefined, store)
 
   // Why: same post-registration reconciliation `--serve` performs. Skipping it leaves
   // restored orchestration rows claiming an authority this host never took over.
diff --git a/src/main/persistence-initial-load.test.ts b/src/main/persistence-initial-load.test.ts
index e1926a67877..6d0c0f11d5e 100644
--- a/src/main/persistence-initial-load.test.ts
+++ b/src/main/persistence-initial-load.test.ts
@@ -16,6 +16,10 @@ import {
   makeProjectHostSetup
 } from './persistence-test-harness'
 import { TEST_LEAF_1 } from './persistence-session-fixtures'
+import {
+  getLocalWorktreeScanGeneration,
+  isLocalWorktreeScanGenerationCurrent
+} from './local-worktree-scan-generation'
 
 // Stub the ~/.ssh/config parser so the SSH-import test drives the real Store with deterministic hosts, not the operator's actual ~/.ssh/config.
 const { loadUserSshConfigMock, sshConfigHostsToTargetsMock } = vi.hoisted(() => ({
@@ -304,12 +308,13 @@ describe('Store', () => {
 
   it('updates and persists a project Windows runtime preference', async () => {
     const project = makeProject({
-      id: 'project-1',
+      id: 'repo:r1',
       sourceRepoIds: ['r1'],
       localWindowsRuntimePreference: { kind: 'inherit-global' }
     })
     writeDataFile({
       ...getDefaultPersistedState(testState.dir),
+      repos: [makeRepo({ id: 'r1' })],
       projects: [project],
       projectHostSetups: [
         makeProjectHostSetup({
@@ -320,12 +325,14 @@ describe('Store', () => {
       ]
     })
     const store = await createStore()
+    const scanGeneration = getLocalWorktreeScanGeneration('r1')
 
-    const updated = store.updateProject('project-1', {
+    const updated = store.updateProject(project.id, {
       localWindowsRuntimePreference: { kind: 'wsl', distro: 'Ubuntu' }
     })
 
     expect(updated?.localWindowsRuntimePreference).toEqual({ kind: 'wsl', distro: 'Ubuntu' })
+    expect(isLocalWorktreeScanGenerationCurrent('r1', scanGeneration)).toBe(false)
     store.flush()
     const reloaded = await createStore()
     expect(reloaded.getProjects()[0]?.localWindowsRuntimePreference).toEqual({
diff --git a/src/main/persistence-loading-store-extraction.test.ts b/src/main/persistence-loading-store-extraction.test.ts
index dafb6deadee..e48971d6c5c 100644
--- a/src/main/persistence-loading-store-extraction.test.ts
+++ b/src/main/persistence-loading-store-extraction.test.ts
@@ -2,14 +2,22 @@ import { afterEach, beforeEach, describe, expect, expectTypeOf, it, vi } from 'v
 import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
-import { getDefaultWorkspaceSession } from '../shared/constants'
+import { getDefaultPersistedState, getDefaultWorkspaceSession } from '../shared/constants'
 import type { PersistedState } from '../shared/persisted-state-types'
+import type * as StartupDiagnosticsModule from './startup/startup-diagnostics'
 import type { Store as PersistenceStore } from './persistence/loading-store/store'
-import { createStore, dataFile, makeRepo, testState } from './persistence-test-harness'
+import {
+  createStore,
+  dataFile,
+  makeRepo,
+  testState,
+  writeDataFile
+} from './persistence-test-harness'
 
-const { trackMock, getCohortAtEmitMock } = vi.hoisted(() => ({
+const { trackMock, getCohortAtEmitMock, logStartupDiagnosticMock } = vi.hoisted(() => ({
   trackMock: vi.fn(),
-  getCohortAtEmitMock: vi.fn(() => ({ nth_repo_added: 2 }))
+  getCohortAtEmitMock: vi.fn(() => ({ nth_repo_added: 2 })),
+  logStartupDiagnosticMock: vi.fn()
 }))
 
 vi.mock('electron', () => ({
@@ -33,6 +41,10 @@ vi.mock('./ssh/ssh-config-parser', () => ({
   loadUserSshConfig: vi.fn(() => ({ hosts: [] })),
   sshConfigHostsToTargets: vi.fn(() => [])
 }))
+vi.mock('./startup/startup-diagnostics', async (importOriginal) => {
+  const actual = await importOriginal<typeof StartupDiagnosticsModule>()
+  return { ...actual, logStartupDiagnostic: logStartupDiagnosticMock }
+})
 
 describe('loading Store extraction seams', () => {
   beforeEach(() => {
@@ -40,9 +52,70 @@ describe('loading Store extraction seams', () => {
   })
 
   afterEach(() => {
+    vi.unstubAllEnvs()
+    logStartupDiagnosticMock.mockReset()
     rmSync(testState.dir, { recursive: true, force: true })
   })
 
+  it('does not serialize the workspace session when startup diagnostics are disabled', () => {
+    const sentinel = 'startup-diagnostics-workspace-session-sentinel-disabled'
+    vi.stubEnv('ORCA_STARTUP_DIAGNOSTICS', '')
+    const state = getDefaultPersistedState(testState.dir)
+    state.workspaceSession = { ...state.workspaceSession, activeTabId: sentinel }
+    writeDataFile(state)
+
+    const stringifySpy = vi.spyOn(JSON, 'stringify')
+    const store = createStore()
+    store.freezeWrites()
+
+    const workspaceSessionStringifyCalls = stringifySpy.mock.calls.filter(
+      ([value]) =>
+        value &&
+        typeof value === 'object' &&
+        (value as { activeTabId?: unknown }).activeTabId === sentinel
+    )
+    stringifySpy.mockRestore()
+
+    expect(store.getWorkspaceSession().activeTabId).toBe(sentinel)
+    expect(workspaceSessionStringifyCalls).toHaveLength(0)
+    expect(
+      logStartupDiagnosticMock.mock.calls.some(([event]) => event === 'persistence-load-done')
+    ).toBe(false)
+  })
+
+  it('reports the unchanged workspace-session byte count when startup diagnostics are enabled', () => {
+    const sentinel = 'startup-diagnostics-workspace-session-sentinel-enabled'
+    vi.stubEnv('ORCA_STARTUP_DIAGNOSTICS', '1')
+    const state = getDefaultPersistedState(testState.dir)
+    state.workspaceSession = { ...state.workspaceSession, activeTabId: sentinel }
+    writeDataFile(state)
+
+    const stringifySpy = vi.spyOn(JSON, 'stringify')
+    const store = createStore()
+    store.freezeWrites()
+
+    const workspaceSessionStringifyCalls = stringifySpy.mock.calls.filter(
+      ([value]) =>
+        value &&
+        typeof value === 'object' &&
+        (value as { activeTabId?: unknown }).activeTabId === sentinel
+    )
+    stringifySpy.mockRestore()
+
+    expect(store.getWorkspaceSession().activeTabId).toBe(sentinel)
+    expect(workspaceSessionStringifyCalls).toHaveLength(1)
+    const loadDoneCall = logStartupDiagnosticMock.mock.calls.find(
+      ([event]) => event === 'persistence-load-done'
+    )
+    expect(loadDoneCall).toBeDefined()
+    const details = loadDoneCall?.[1] as Record<string, unknown> | undefined
+    expect(details).toEqual({
+      t: expect.any(Number),
+      repos: state.repos.length,
+      workspaceSessionBytes: Buffer.byteLength(JSON.stringify(store.getWorkspaceSession()))
+    })
+  })
+
   it('accepts the first JSON-parseable backup even when an older backup has richer state', async () => {
     mkdirSync(testState.dir, { recursive: true })
     writeFileSync(dataFile(), '{{corrupt-primary', 'utf-8')
diff --git a/src/main/persistence-pane-identity-migration.test.ts b/src/main/persistence-pane-identity-migration.test.ts
index 606e1599fdf..c9a6fc4e592 100644
--- a/src/main/persistence-pane-identity-migration.test.ts
+++ b/src/main/persistence-pane-identity-migration.test.ts
@@ -507,6 +507,7 @@ describe('Store', () => {
     )
   })
 
+  // ~9s locally; the 30s default timeout leaves too little headroom on a loaded CI shard.
   it('loads legacy pane aliases from very large persisted split layouts', async () => {
     const leafCount = 130_000
     writeDataFile({
@@ -561,7 +562,7 @@ describe('Store', () => {
         (entry) => entry.ptyId === 'large-pty' && entry.legacyPaneKey === `tab1:${leafCount}`
       )
     ).toBe(true)
-  })
+  }, 120_000)
 
   it('converts unambiguous dev migration rows into persisted aliases', async () => {
     const stablePaneKey = makePaneKey('tab1', TEST_LEAF_1)
diff --git a/src/main/persistence-repo-lifecycle.test.ts b/src/main/persistence-repo-lifecycle.test.ts
index 53b759a7d01..1653f78297e 100644
--- a/src/main/persistence-repo-lifecycle.test.ts
+++ b/src/main/persistence-repo-lifecycle.test.ts
@@ -14,6 +14,10 @@ import {
   makeTerminalTab,
   makeWorktreeLineage
 } from './persistence-test-harness'
+import {
+  getLocalWorktreeScanGeneration,
+  isLocalWorktreeScanGenerationCurrent
+} from './local-worktree-scan-generation'
 
 // Stub the ~/.ssh/config parser so the SSH-import test drives the real Store with deterministic hosts, not the operator's actual ~/.ssh/config.
 const { loadUserSshConfigMock, sshConfigHostsToTargetsMock } = vi.hoisted(() => ({
@@ -79,6 +83,23 @@ describe('Store', () => {
     expect(fetched!.gitUsername).toBe('')
   })
 
+  it('invalidates local scans across add, remove, and same-id re-add', async () => {
+    const store = await createStore()
+    const repoId = 'scan-lifecycle'
+    const beforeAdd = getLocalWorktreeScanGeneration(repoId)
+
+    store.addRepo(makeRepo({ id: repoId }))
+    expect(isLocalWorktreeScanGenerationCurrent(repoId, beforeAdd)).toBe(false)
+
+    const beforeRemove = getLocalWorktreeScanGeneration(repoId)
+    store.removeProject(repoId)
+    expect(isLocalWorktreeScanGenerationCurrent(repoId, beforeRemove)).toBe(false)
+
+    const beforeReAdd = getLocalWorktreeScanGeneration(repoId)
+    store.addRepo(makeRepo({ id: repoId, path: '/replacement' }))
+    expect(isLocalWorktreeScanGenerationCurrent(repoId, beforeReAdd)).toBe(false)
+  })
+
   it('setResolvedRepoGitUsername persists the enriched username for hydration', async () => {
     const store = await createStore()
     store.addRepo(makeRepo())
@@ -369,6 +390,24 @@ describe('Store', () => {
 
   // ── 6b. removeProjectForHost is host-scoped ───────────────────────────
 
+  it('invalidates local scans when one host registration is removed', async () => {
+    const store = await createStore()
+    store.addRepo(makeRepo({ id: 'shared', path: '/local/repo' }))
+    store.addRepo(
+      makeRepo({
+        id: 'shared',
+        path: '/remote/repo',
+        connectionId: 'ssh-old',
+        executionHostId: 'ssh:ssh-old'
+      })
+    )
+    const beforeRemove = getLocalWorktreeScanGeneration('shared')
+
+    store.removeProjectForHost('shared', 'ssh:ssh-old')
+
+    expect(isLocalWorktreeScanGenerationCurrent('shared', beforeRemove)).toBe(false)
+  })
+
   it('removeProjectForHost removes only the target host row for a shared repo id', async () => {
     const store = await createStore()
     // Same repo id on both local and an SSH host.
diff --git a/src/main/persistence-settings-update.test.ts b/src/main/persistence-settings-update.test.ts
index 330386a48a2..dc3a3c7ebb5 100644
--- a/src/main/persistence-settings-update.test.ts
+++ b/src/main/persistence-settings-update.test.ts
@@ -14,6 +14,10 @@ import {
   makeRepo,
   makeTerminalTab
 } from './persistence-test-harness'
+import {
+  getLocalWorktreeScanGeneration,
+  isLocalWorktreeScanGenerationCurrent
+} from './local-worktree-scan-generation'
 
 // Stub the ~/.ssh/config parser so the SSH-import test drives the real Store with deterministic hosts, not the operator's actual ~/.ssh/config.
 const { loadUserSshConfigMock, sshConfigHostsToTargetsMock } = vi.hoisted(() => ({
@@ -227,6 +231,21 @@ describe('Store', () => {
     expect(listener).not.toHaveBeenCalled()
   })
 
+  it('invalidates local worktree scans when the global Windows runtime changes', async () => {
+    writeDataFile({ repos: [makeRepo()] })
+    const store = await createStore()
+    const generation = getLocalWorktreeScanGeneration('r1')
+
+    store.updateSettings({ theme: 'dark' })
+    expect(isLocalWorktreeScanGenerationCurrent('r1', generation)).toBe(true)
+
+    store.updateSettings({
+      localWindowsRuntimeDefault: { kind: 'wsl', distro: 'Ubuntu' }
+    })
+
+    expect(isLocalWorktreeScanGenerationCurrent('r1', generation)).toBe(false)
+  })
+
   it('migrates missing terminal scrollback rows to the row default and writes back rows only', async () => {
     writeDataFile({ settings: {} })
 
diff --git a/src/main/persistence-update-repo.test.ts b/src/main/persistence-update-repo.test.ts
index d2266103615..a89378d6c71 100644
--- a/src/main/persistence-update-repo.test.ts
+++ b/src/main/persistence-update-repo.test.ts
@@ -11,6 +11,10 @@ import {
   makeProject,
   makeProjectHostSetup
 } from './persistence-test-harness'
+import {
+  getLocalWorktreeScanGeneration,
+  isLocalWorktreeScanGenerationCurrent
+} from './local-worktree-scan-generation'
 
 // Stub the ~/.ssh/config parser so the SSH-import test drives the real Store with deterministic hosts, not the operator's actual ~/.ssh/config.
 const { loadUserSshConfigMock, sshConfigHostsToTargetsMock } = vi.hoisted(() => ({
@@ -75,6 +79,25 @@ describe('Store', () => {
     expect(store.getRepo('r1')!.displayName).toBe('renamed')
   })
 
+  it('invalidates local worktree scans across a git-folder-git update round trip', async () => {
+    const store = await createStore()
+    store.addRepo(makeRepo({ id: 'scan-round-trip', kind: 'git' }))
+
+    const initialGeneration = getLocalWorktreeScanGeneration('scan-round-trip')
+    expect(isLocalWorktreeScanGenerationCurrent('scan-round-trip', initialGeneration)).toBe(true)
+
+    const folder = store.updateRepo('scan-round-trip', { kind: 'folder' })
+    expect(folder?.kind).toBe('folder')
+    expect(isLocalWorktreeScanGenerationCurrent('scan-round-trip', initialGeneration)).toBe(false)
+
+    const folderGeneration = getLocalWorktreeScanGeneration('scan-round-trip')
+    expect(isLocalWorktreeScanGenerationCurrent('scan-round-trip', folderGeneration)).toBe(true)
+
+    const git = store.updateRepo('scan-round-trip', { kind: 'git' })
+    expect(git?.kind).toBe('git')
+    expect(isLocalWorktreeScanGenerationCurrent('scan-round-trip', folderGeneration)).toBe(false)
+  })
+
   it('updateRepo targets one host when repo ids collide', async () => {
     const store = await createStore()
     store.addRepo(makeRepo({ id: 'shared', path: '/local/repo' }))
diff --git a/src/main/persistence/applying-settings/settings-update.ts b/src/main/persistence/applying-settings/settings-update.ts
index c4ded8da753..20614061bdd 100644
--- a/src/main/persistence/applying-settings/settings-update.ts
+++ b/src/main/persistence/applying-settings/settings-update.ts
@@ -41,6 +41,7 @@ import {
 
 export type SettingsMutationOperations = {
   state: PersistedState
+  bumpLocalWorktreeScanGeneration: (repoId: string) => void
   removeRetainedBlob: (
     slot: Parameters<ProtectedSecretPersistence['removeRetainedBlob']>[0]
   ) => void
@@ -242,6 +243,16 @@ export function updateSettings(
     }),
     ...(mergedTelemetry !== undefined ? { telemetry: mergedTelemetry } : {})
   }
+  if (
+    !Object.is(
+      previousSettings.localWindowsRuntimeDefault,
+      operations.state.settings.localWindowsRuntimeDefault
+    )
+  ) {
+    for (const repoId of new Set(operations.state.repos.map(({ id }) => id))) {
+      operations.bumpLocalWorktreeScanGeneration(repoId)
+    }
+  }
   operations.scheduleSave()
   const changedUpdates = {} as Partial<GlobalSettings> & Record<string, unknown>
   for (const key of Object.keys(sanitizedUpdates) as (keyof GlobalSettings)[]) {
diff --git a/src/main/persistence/loading-store/loaded-state-parsing.ts b/src/main/persistence/loading-store/loaded-state-parsing.ts
index 2f28c771508..5bd6e572ab1 100644
--- a/src/main/persistence/loading-store/loaded-state-parsing.ts
+++ b/src/main/persistence/loading-store/loaded-state-parsing.ts
@@ -42,13 +42,17 @@ import { prepareLoadedTerminalSettings } from './prepare-loaded-terminal-setting
 import { prepareLoadedProfileSettings } from './prepare-loaded-profile-settings'
 import { normalizeLoadedProfileState } from './normalize-loaded-profile-state'
 
+type PersistenceStartupDetails = Record<string, unknown> | (() => Record<string, unknown>)
+
 function logPersistenceStartupMilestone(
   event: string,
-  details: Record<string, unknown> = {}
+  details: PersistenceStartupDetails = {}
 ): void {
-  if (isStartupDiagnosticsEnabled()) {
-    logStartupDiagnostic(event, { t: Math.round(performance.now()), ...details })
+  if (!isStartupDiagnosticsEnabled()) {
+    return
   }
+  const resolvedDetails = typeof details === 'function' ? details() : details
+  logStartupDiagnostic(event, { t: Math.round(performance.now()), ...resolvedDetails })
 }
 
 import type { StoreRuntimeState } from './store-runtime-state'
@@ -279,10 +283,10 @@ export class LoadedStateParsingOperations {
       migrated.githubCache = readGithubCacheSnapshot(this.runtime.dataFile) ?? migrated.githubCache
     }
 
-    logPersistenceStartupMilestone('persistence-load-done', {
+    logPersistenceStartupMilestone('persistence-load-done', () => ({
       repos: migrated.repos.length,
       workspaceSessionBytes: Buffer.byteLength(JSON.stringify(migrated.workspaceSession))
-    })
+    }))
     return migrated
   }
 }
diff --git a/src/main/persistence/loading-store/metadata-lineage-batch-pruning.test.ts b/src/main/persistence/loading-store/metadata-lineage-batch-pruning.test.ts
new file mode 100644
index 00000000000..9e7b71734b6
--- /dev/null
+++ b/src/main/persistence/loading-store/metadata-lineage-batch-pruning.test.ts
@@ -0,0 +1,64 @@
+import { describe, expect, it, vi } from 'vitest'
+import { getDefaultPersistedState } from '../../../shared/constants'
+import type { Repo } from '../../../shared/repo-types'
+import type { WorktreeMeta } from '../../../shared/worktree/meta-types'
+import type * as WriteSchedulingModule from './write-scheduling'
+import { MetadataLineageOperations } from './metadata-lineage-operations'
+
+const { scheduleSaveMock } = vi.hoisted(() => ({ scheduleSaveMock: vi.fn() }))
+
+vi.mock('./write-scheduling', async (importOriginal) => ({
+  ...(await importOriginal<typeof WriteSchedulingModule>()),
+  scheduleSave: scheduleSaveMock
+}))
+
+const REPO: Repo = {
+  id: 'repo-1',
+  path: '/workspace/repo',
+  displayName: 'repo',
+  badgeColor: '#000',
+  addedAt: 0
+}
+
+function makeMeta(worktreeId: string): WorktreeMeta {
+  return {
+    instanceId: `instance-${worktreeId}`,
+    hostId: 'local',
+    displayName: worktreeId,
+    comment: '',
+    linkedIssue: null,
+    linkedPR: null,
+    linkedLinearIssue: null,
+    isArchived: false,
+    isUnread: false,
+    isPinned: false,
+    sortOrder: 0,
+    lastActivityAt: 0
+  }
+}
+
+describe('MetadataLineageOperations batch metadata pruning', () => {
+  it('schedules one save for thousands of removals and none for a no-op retry', () => {
+    const state = getDefaultPersistedState('/home/test')
+    state.repos = [REPO]
+    const staleIds = Array.from(
+      { length: 2_709 },
+      (_, index) => `${REPO.id}::/workspace/stale-${index}`
+    )
+    for (const worktreeId of staleIds) {
+      state.worktreeMeta[worktreeId] = makeMeta(worktreeId)
+    }
+    const operations = new MetadataLineageOperations({ state } as never, {} as never, {} as never)
+    const scan = operations.captureNativeLocalWorktreeMetadataScanExpectation(REPO)
+
+    expect(
+      operations.pruneSessionlessMissingLocalWorktreeMetadataForRepo(scan, scan.metadata)
+    ).toHaveLength(staleIds.length)
+    expect(scheduleSaveMock).toHaveBeenCalledTimes(1)
+
+    expect(
+      operations.pruneSessionlessMissingLocalWorktreeMetadataForRepo(scan, scan.metadata)
+    ).toEqual([])
+    expect(scheduleSaveMock).toHaveBeenCalledTimes(1)
+  })
+})
diff --git a/src/main/persistence/loading-store/metadata-lineage-operations.ts b/src/main/persistence/loading-store/metadata-lineage-operations.ts
index f12af5d1583..7d4867ce476 100644
--- a/src/main/persistence/loading-store/metadata-lineage-operations.ts
+++ b/src/main/persistence/loading-store/metadata-lineage-operations.ts
@@ -1,6 +1,7 @@
 import type { WorkspaceKey } from '../../../shared/folder-workspace-types'
 import type { WorkspaceLineage, WorktreeLineage } from '../../../shared/worktree/lineage-types'
 import type { WorktreeMeta } from '../../../shared/worktree/meta-types'
+import type { Repo } from '../../../shared/repo-types'
 import { LOCAL_EXECUTION_HOST_ID, type ExecutionHostId } from '../../../shared/execution-host'
 import { getRepoIdFromWorktreeId } from '../../../shared/worktree/id'
 import { hasWorktreeRemovalRepoOwnerOnOtherHost } from '../../worktree-removal-repo-owner'
@@ -28,6 +29,12 @@ import {
   setWorktreeMetaForHost as setWorktreeMetaForHostOperation
 } from './worktree-identity-metadata'
 import { mergeWorktreeMetaForWrite } from './worktree-meta-write-normalization'
+import {
+  captureNativeLocalWorktreeMetadataScanExpectation as captureNativeLocalWorktreeMetadataScanExpectationOperation,
+  pruneSessionlessMissingLocalWorktreeMetadataForRepo as pruneSessionlessMissingLocalWorktreeMetadataForRepoOperation,
+  type LocalWorktreeMetadataPruneExpectation,
+  type NativeLocalWorktreeMetadataScanExpectation
+} from '../tracking-repos/missing-local-worktree-metadata-pruning'
 
 type MetadataLineageOperationsRuntime = Pick<StoreRuntimeState, 'state'>
 
@@ -89,6 +96,15 @@ export class MetadataLineageOperations {
     )
   }
 
+  captureNativeLocalWorktreeMetadataScanExpectation(
+    repo: Repo
+  ): NativeLocalWorktreeMetadataScanExpectation {
+    return captureNativeLocalWorktreeMetadataScanExpectationOperation(
+      this[metadataLineageOperationsContext].runtime.state,
+      repo
+    )
+  }
+
   setWorktreeMeta(worktreeId: string, meta: Partial<WorktreeMeta>): WorktreeMeta {
     const state = this[metadataLineageOperationsContext].runtime.state
     const stored = state.worktreeMeta[worktreeId]
@@ -184,6 +200,21 @@ export class MetadataLineageOperations {
     scheduleSave(this[metadataLineageOperationsContext].scheduling)
   }
 
+  pruneSessionlessMissingLocalWorktreeMetadataForRepo(
+    scan: NativeLocalWorktreeMetadataScanExpectation,
+    missingMetadata: readonly LocalWorktreeMetadataPruneExpectation[]
+  ): string[] {
+    const removed = pruneSessionlessMissingLocalWorktreeMetadataForRepoOperation(
+      this[metadataLineageOperationsContext].runtime.state,
+      scan,
+      missingMetadata
+    )
+    if (removed.length > 0) {
+      scheduleSave(this[metadataLineageOperationsContext].scheduling)
+    }
+    return removed
+  }
+
   getWorktreeLineage(worktreeId: string): WorktreeLineage | undefined {
     return this[metadataLineageOperationsContext].runtime.state.worktreeLineageById[worktreeId]
   }
diff --git a/src/main/persistence/loading-store/profile-preferences.ts b/src/main/persistence/loading-store/profile-preferences.ts
index 228229d2584..0ec4e383c34 100644
--- a/src/main/persistence/loading-store/profile-preferences.ts
+++ b/src/main/persistence/loading-store/profile-preferences.ts
@@ -17,6 +17,7 @@ import {
 import type { StoreRuntimeState } from './store-runtime-state'
 import type { WriteSchedulingOperations } from './write-scheduling'
 import { scheduleSave } from './write-scheduling'
+import { bumpLocalWorktreeScanGeneration } from '../../local-worktree-scan-generation'
 
 type ProfilePreferencesRuntime = Pick<
   StoreRuntimeState,
@@ -155,6 +156,7 @@ export function getSettingsMutationOperations(
 ): SettingsMutationOperations {
   return {
     state: owner[profilePreferencesContext].runtime.state,
+    bumpLocalWorktreeScanGeneration,
     removeRetainedBlob: (slot) =>
       owner[profilePreferencesContext].runtime.protectedSecrets.removeRetainedBlob(slot),
     scheduleSave: () => scheduleSave(owner[profilePreferencesContext].scheduling),
diff --git a/src/main/persistence/loading-store/project-collection-operations.ts b/src/main/persistence/loading-store/project-collection-operations.ts
index e7100478037..ecb1130072f 100644
--- a/src/main/persistence/loading-store/project-collection-operations.ts
+++ b/src/main/persistence/loading-store/project-collection-operations.ts
@@ -28,6 +28,7 @@ import {
 } from './repo-lifecycle-operations'
 import { scheduleSave } from './write-scheduling'
 import { removeWorkspaceLineageForFolderParent } from './metadata-lineage-operations'
+import { bumpLocalWorktreeScanGeneration } from '../../local-worktree-scan-generation'
 
 type ProjectCollectionOperationsRuntime = Pick<
   StoreRuntimeState,
@@ -159,6 +160,7 @@ export function getProjectHostOperations(
     new ProjectHostPersistenceOperations({
       state: owner[projectCollectionOperationsContext].runtime.state,
       gitUsernameCache: owner[projectCollectionOperationsContext].runtime.gitUsernameCache,
+      bumpLocalWorktreeScanGeneration,
       hydrateRepo: (repo) => hydrateRepo(owner[projectCollectionOperationsContext].repos, repo),
       updateRepoBackedProjectHostSetup: (setup, repo, updates) =>
         updateRepoBackedProjectHostSetup(
diff --git a/src/main/persistence/loading-store/repo-lifecycle-operations.ts b/src/main/persistence/loading-store/repo-lifecycle-operations.ts
index bdd3718d9a6..095090ee1ca 100644
--- a/src/main/persistence/loading-store/repo-lifecycle-operations.ts
+++ b/src/main/persistence/loading-store/repo-lifecycle-operations.ts
@@ -15,6 +15,7 @@ import { pruneWorktreeStateForRepo as pruneWorktreeStateForRepoOperation } from
 import { hydrateRepo as hydrateRepoOperation } from '../tracking-repos/repo-hydration'
 import { RepoUpdatePersistenceOperations } from '../tracking-repos/repo-update-operations'
 import { ProjectHostSetupPersistenceOperations } from '../tracking-repos/project-host-setup-update'
+import { bumpLocalWorktreeScanGeneration } from '../../local-worktree-scan-generation'
 
 import type { StoreRuntimeState } from './store-runtime-state'
 import type { WriteSchedulingOperations } from './write-scheduling'
@@ -43,6 +44,7 @@ export class RepoLifecycleOperations {
   }
 
   addRepo(repo: Repo): void {
+    bumpLocalWorktreeScanGeneration(repo.id)
     getRepoOrderOperations(this).addRepo(repo)
   }
 
@@ -55,9 +57,15 @@ export class RepoLifecycleOperations {
   }
 
   removeProject(id: string): void {
+    const repoRemoved = this[repoLifecycleOperationsContext].runtime.state.repos.some(
+      (repo) => repo.id === id
+    )
     this[repoLifecycleOperationsContext].runtime.state.repos = this[
       repoLifecycleOperationsContext
     ].runtime.state.repos.filter((r) => r.id !== id)
+    if (repoRemoved) {
+      bumpLocalWorktreeScanGeneration(id)
+    }
     syncProjectHostSetupCompatibilityState(this)
     // Why: presets are repo-scoped and unreachable once the repo is gone, so drop them with it.
     delete this[repoLifecycleOperationsContext].runtime.state.sparsePresetsByRepo[id]
@@ -77,9 +85,15 @@ export class RepoLifecycleOperations {
   }
 
   removeProjectForHost(id: string, hostId: ExecutionHostId): void {
+    const repoRemoved = this[repoLifecycleOperationsContext].runtime.state.repos.some(
+      (repo) => repo.id === id && getRepoExecutionHostId(repo) === hostId
+    )
     this[repoLifecycleOperationsContext].runtime.state.repos = this[
       repoLifecycleOperationsContext
     ].runtime.state.repos.filter((r) => !(r.id === id && getRepoExecutionHostId(r) === hostId))
+    if (repoRemoved) {
+      bumpLocalWorktreeScanGeneration(id)
+    }
     const idStillPresent = this[repoLifecycleOperationsContext].runtime.state.repos.some(
       (r) => r.id === id
     )
@@ -204,6 +218,7 @@ export function getRepoUpdateOperations(
   owner[repoLifecycleOperationsContext].runtime.repoUpdateOperations ??=
     new RepoUpdatePersistenceOperations({
       state: owner[repoLifecycleOperationsContext].runtime.state,
+      bumpLocalWorktreeScanGeneration,
       syncProjectHostSetupCompatibilityState: () => syncProjectHostSetupCompatibilityState(owner),
       scheduleSave: () => scheduleSave(owner[repoLifecycleOperationsContext].scheduling),
       hydrateRepo: (repo) => hydrateRepo(owner, repo)
diff --git a/src/main/persistence/loading-store/worktree-identity-metadata.ts b/src/main/persistence/loading-store/worktree-identity-metadata.ts
index 396c2ffae85..21fea4ac15c 100644
--- a/src/main/persistence/loading-store/worktree-identity-metadata.ts
+++ b/src/main/persistence/loading-store/worktree-identity-metadata.ts
@@ -36,11 +36,18 @@ function resolveAliasIdentityKey(state: PersistedState, alias: string): string |
 }
 
 /** Drop identity metadata no alias points at any more. */
-export function pruneUnreferencedWorktreeIdentityMeta(state: PersistedState): boolean {
+export function pruneUnreferencedWorktreeIdentityMeta(
+  state: PersistedState,
+  candidates?: ReadonlySet<string>
+): boolean {
   const referenced = new Set(Object.values(state.worktreeIdentityAliases ?? {}).flat())
   let changed = false
-  for (const identityKey of Object.keys(state.worktreeMetaByIdentity ?? {})) {
-    if (!referenced.has(identityKey)) {
+  const identityKeys = candidates ?? Object.keys(state.worktreeMetaByIdentity ?? {})
+  for (const identityKey of identityKeys) {
+    if (
+      Object.hasOwn(state.worktreeMetaByIdentity ?? {}, identityKey) &&
+      !referenced.has(identityKey)
+    ) {
       delete state.worktreeMetaByIdentity?.[identityKey]
       changed = true
     }
diff --git a/src/main/persistence/restoring-sessions/pane-identity-migration.ts b/src/main/persistence/restoring-sessions/pane-identity-migration.ts
index e07e9995286..98d97a649a3 100644
--- a/src/main/persistence/restoring-sessions/pane-identity-migration.ts
+++ b/src/main/persistence/restoring-sessions/pane-identity-migration.ts
@@ -1,5 +1,5 @@
 import type { LegacyPaneKeyAliasEntry } from '../../../shared/persisted-state-types'
-import type { TerminalLayoutSnapshot } from '../../../shared/terminal-tab-types'
+import type { TerminalLayoutSnapshot, TerminalTab } from '../../../shared/terminal-tab-types'
 import type { WorkspaceSessionState } from '../../../shared/workspace-session-state-types'
 import { isTerminalLeafId, makePaneKey } from '../../../shared/stable-pane-id'
 import { agentHookServer } from '../../agent-hooks/server'
@@ -17,23 +17,69 @@ export function findWorktreeIdForTab(
   return undefined
 }
 
+export type TerminalTabLookup = {
+  get(tabId: string): TerminalTab | undefined
+}
+
+/** Resolves tabs on demand while retaining first-match ordering and scan progress. */
+export function createLazyTerminalTabLookup(session: WorkspaceSessionState): TerminalTabLookup {
+  const tabsByWorktree = Object.entries(session.tabsByWorktree ?? {})
+  const tabsById = new Map<string, TerminalTab>()
+  let worktreeIndex = 0
+  let tabIndex = 0
+  let exhausted = false
+
+  return {
+    get(requestedTabId: string): TerminalTab | undefined {
+      if (tabsById.has(requestedTabId)) {
+        return tabsById.get(requestedTabId)
+      }
+      if (exhausted) {
+        return undefined
+      }
+
+      while (worktreeIndex < tabsByWorktree.length) {
+        const tabs = tabsByWorktree[worktreeIndex][1]
+        while (tabIndex < tabs.length) {
+          const currentIndex = tabIndex
+          tabIndex += 1
+          // Array#some, used by the prior lookup, skips sparse holes.
+          if (!(currentIndex in tabs)) {
+            continue
+          }
+          const tab = tabs[currentIndex]
+          const tabId = tab.id
+          // Preserve first-match behavior when persisted IDs collide.
+          if (!tabsById.has(tabId)) {
+            tabsById.set(tabId, tab)
+          }
+          if (tabId === requestedTabId) {
+            return tabsById.get(requestedTabId)
+          }
+        }
+        worktreeIndex += 1
+        tabIndex = 0
+      }
+
+      exhausted = true
+      return undefined
+    }
+  }
+}
+
 /** Bridges a tab's legacy numeric pane keys to stable ones; returns the alias rows worth persisting. */
 export function registerLegacyPaneKeyAliasesForTab(args: {
-  session: WorkspaceSessionState
   tabId: string
+  tab: TerminalTab | undefined
   inputLayout: TerminalLayoutSnapshot
   normalizedLayout: TerminalLayoutSnapshot
   leafIdByInputLeafId: Map<string, string>
 }): LegacyPaneKeyAliasEntry[] {
-  const worktreeId = findWorktreeIdForTab(args.session, args.tabId)
-  const tab = worktreeId
-    ? args.session.tabsByWorktree?.[worktreeId]?.find((entry) => entry.id === args.tabId)
-    : undefined
   const legacyPaneKeyAliasEntries: LegacyPaneKeyAliasEntry[] = []
   const registeredLegacyPaneKeys = new Set<string>()
   const hasLeafPtyBindings = Object.keys(args.inputLayout.ptyIdsByLeafId ?? {}).length > 0
   const fallbackPtyId =
-    !hasLeafPtyBindings && typeof tab?.ptyId === 'string' ? tab.ptyId : undefined
+    !hasLeafPtyBindings && typeof args.tab?.ptyId === 'string' ? args.tab.ptyId : undefined
   const registerLegacyAlias = (inputLeafId: string, leafId: string, ptyId?: string): boolean => {
     if (!isTerminalLeafId(leafId)) {
       return false
@@ -80,7 +126,7 @@ export function registerLegacyPaneKeyAliasesForTab(args: {
       )
     }
   }
-  if (tab?.ptyId && !hasLeafPtyBindings) {
+  if (args.tab?.ptyId && !hasLeafPtyBindings) {
     const fallbackLeafId =
       args.normalizedLayout.activeLeafId ?? firstLayoutLeafId(args.normalizedLayout.root)
     let paneKey: string | undefined
@@ -96,9 +142,9 @@ export function registerLegacyPaneKeyAliasesForTab(args: {
         if (registeredLegacyPaneKeys.has(legacyPaneKey)) {
           continue
         }
-        agentHookServer.registerPaneKeyAlias(legacyPaneKey, paneKey, tab.ptyId)
+        agentHookServer.registerPaneKeyAlias(legacyPaneKey, paneKey, args.tab.ptyId)
         legacyPaneKeyAliasEntries.push({
-          ptyId: tab.ptyId,
+          ptyId: args.tab.ptyId,
           legacyPaneKey,
           stablePaneKey: paneKey,
           updatedAt: Date.now()
diff --git a/src/main/persistence/restoring-sessions/session-worktree-ownership.test.ts b/src/main/persistence/restoring-sessions/session-worktree-ownership.test.ts
new file mode 100644
index 00000000000..1e84cf4c506
--- /dev/null
+++ b/src/main/persistence/restoring-sessions/session-worktree-ownership.test.ts
@@ -0,0 +1,166 @@
+import { describe, expect, it } from 'vitest'
+import { getDefaultPersistedState, getDefaultWorkspaceSession } from '../../../shared/constants'
+import type { WorkspaceSessionState } from '../../../shared/workspace-session-state-types'
+import { worktreeWorkspaceKey } from '../../../shared/workspace-scope'
+import {
+  collectPersistedSessionWorktreeOwners,
+  collectWorkspaceSessionWorktreeOwners
+} from './session-worktree-ownership'
+
+const TARGET = 'repo-1::/workspace/target'
+const OTHER = 'repo-1::/workspace/other'
+
+function sessionWith(field: keyof WorkspaceSessionState, value: unknown): WorkspaceSessionState {
+  return { ...getDefaultWorkspaceSession(), [field]: value } as WorkspaceSessionState
+}
+
+function collected(session: WorkspaceSessionState): string[] {
+  return [...collectWorkspaceSessionWorktreeOwners(session, new Set([TARGET]))]
+}
+
+const OWNER_KEYED_FIELD_VALUES = [
+  ['tabsByWorktree', []],
+  ['openFilesByWorktree', []],
+  ['activeFileIdByWorktree', null],
+  ['browserTabsByWorktree', []],
+  ['activeBrowserTabIdByWorktree', null],
+  ['clientHostedBrowserPagesByWorktree', []],
+  ['activeTabTypeByWorktree', 'terminal'],
+  ['activeTabIdByWorktree', null],
+  ['unifiedTabs', []],
+  ['tabGroups', []],
+  ['tabGroupLayouts', { type: 'leaf', groupId: 'group-1' }],
+  ['activeGroupIdByWorktree', 'group-1'],
+  ['lastVisitedAtByWorktreeId', 0],
+  ['defaultTerminalTabsAppliedByWorktreeId', true]
+] as const satisfies readonly [keyof WorkspaceSessionState, unknown][]
+
+describe('workspace session worktree ownership', () => {
+  it.each(OWNER_KEYED_FIELD_VALUES)(
+    'treats a key in %s as ownership even when its bucket is empty or null',
+    (field, value) => {
+      expect(collected(sessionWith(field, { [TARGET]: value }))).toEqual([TARGET])
+    }
+  )
+
+  it.each([
+    ['active worktree', sessionWith('activeWorktreeId', TARGET)],
+    ['active workspace', sessionWith('activeWorkspaceKey', worktreeWorkspaceKey(TARGET))],
+    ['shutdown owner', sessionWith('activeWorktreeIdsOnShutdown', [TARGET])],
+    [
+      'host-qualified recency owner',
+      sessionWith('lastVisitedAtByWorktreeId', { [`ssh:builder|${TARGET}`]: 1 })
+    ]
+  ])('collects the %s', (_label, session) => {
+    expect(collected(session)).toEqual([TARGET])
+  })
+
+  it.each([
+    ['terminal tab', 'tabsByWorktree', { [OTHER]: [{ worktreeId: TARGET }] }],
+    ['open file', 'openFilesByWorktree', { [OTHER]: [{ worktreeId: TARGET }] }],
+    ['unified tab', 'unifiedTabs', { [OTHER]: [{ worktreeId: TARGET }] }],
+    ['tab group', 'tabGroups', { [OTHER]: [{ worktreeId: TARGET }] }],
+    ['browser workspace', 'browserTabsByWorktree', { [OTHER]: [{ worktreeId: TARGET }] }],
+    [
+      'browser workspace document',
+      'browserTabsByWorktree',
+      { [OTHER]: [{ worktreeId: OTHER, docLocation: { worktreeId: TARGET } }] }
+    ],
+    ['browser page', 'browserPagesByWorkspace', { page: [{ worktreeId: TARGET }] }],
+    [
+      'browser page document',
+      'browserPagesByWorkspace',
+      { page: [{ worktreeId: OTHER, docLocation: { worktreeId: TARGET } }] }
+    ],
+    [
+      'browser close intent',
+      'clientHostedBrowserCloseIntentsByEnvironment',
+      { environment: [{ worktreeId: TARGET }] }
+    ],
+    ['sleeping agent', 'sleepingAgentSessionsByPaneKey', { pane: { worktreeId: TARGET } }],
+    ['terminal tombstone', 'terminalSurfaceTombstonesByPaneKey', { pane: { worktreeId: TARGET } }],
+    [
+      'closed-terminal tombstone',
+      'closedTerminalTabTombstonesByTabId',
+      { tab: { worktreeId: TARGET } }
+    ]
+  ] as const)(
+    'collects a %s value even when its enclosing key names something else',
+    (_label, field, value) => {
+      expect(collected(sessionWith(field, value))).toEqual([TARGET])
+    }
+  )
+
+  it('collects ownership from every persisted host partition', () => {
+    const state = getDefaultPersistedState('/home/test')
+    state.workspaceSessionsByHostId = {
+      'ssh:builder': sessionWith('tabsByWorktree', { [TARGET]: [] }),
+      'runtime:environment': sessionWith('activeWorktreeIdsOnShutdown', [OTHER])
+    }
+
+    expect(
+      [...collectPersistedSessionWorktreeOwners(state, new Set([TARGET, OTHER]))].sort()
+    ).toEqual([OTHER, TARGET])
+  })
+
+  it('prefers an exact candidate id over workspace-key prefix parsing', () => {
+    const prefixedId = 'folder::/workspace/target'
+    const session = sessionWith('tabsByWorktree', { [prefixedId]: [] })
+
+    expect([...collectWorkspaceSessionWorktreeOwners(session, new Set([prefixedId]))]).toEqual([
+      prefixedId
+    ])
+  })
+
+  it('matches canonically equivalent Unicode worktree owners', () => {
+    const candidateId = 'repo-1::/workspace/Café'.normalize('NFC')
+    const ownerId = candidateId.normalize('NFD')
+    const session = sessionWith('activeWorktreeId', ownerId)
+
+    expect([...collectWorkspaceSessionWorktreeOwners(session, new Set([candidateId]))]).toEqual([
+      candidateId
+    ])
+  })
+
+  it('matches Windows worktree owners across drive case and slash spelling', () => {
+    const candidateId = 'repo-1::D:/Agentic/game2'
+    const session = sessionWith('activeWorktreeId', 'repo-1::d:\\agentic\\game2')
+
+    expect([...collectWorkspaceSessionWorktreeOwners(session, new Set([candidateId]))]).toEqual([
+      candidateId
+    ])
+  })
+
+  it('matches macOS /private/tmp session owners to /tmp metadata', () => {
+    const candidateId = 'repo-1::/private/tmp/orca/target'
+    const session = sessionWith('activeWorktreeId', 'repo-1::/tmp/orca/target')
+
+    expect([
+      ...collectWorkspaceSessionWorktreeOwners(session, new Set([candidateId]), 'darwin')
+    ]).toEqual([candidateId])
+  })
+
+  it('preserves every candidate that shares an owner comparison key', () => {
+    const nfcId = 'repo-1::/workspace/Café'.normalize('NFC')
+    const nfdId = nfcId.normalize('NFD')
+    const session = sessionWith('activeWorktreeId', nfcId)
+
+    expect(
+      [...collectWorkspaceSessionWorktreeOwners(session, new Set([nfcId, nfdId]))].sort()
+    ).toEqual([nfcId, nfdId].sort())
+  })
+
+  it('ignores fields whose keys cannot identify a worktree owner', () => {
+    const session = {
+      ...getDefaultWorkspaceSession(),
+      activeRepoId: TARGET,
+      activeTabId: TARGET,
+      terminalLayoutsByTabId: { [TARGET]: { root: null } },
+      remoteSessionIdsByTabId: { [TARGET]: TARGET },
+      terminalPtyIncarnationsByPaneKey: { [TARGET]: TARGET },
+      terminalTopologyRevisionByRepoId: { [TARGET]: 1 }
+    } as unknown as WorkspaceSessionState
+
+    expect(collected(session)).toEqual([])
+  })
+})
diff --git a/src/main/persistence/restoring-sessions/session-worktree-ownership.ts b/src/main/persistence/restoring-sessions/session-worktree-ownership.ts
new file mode 100644
index 00000000000..dc572e79278
--- /dev/null
+++ b/src/main/persistence/restoring-sessions/session-worktree-ownership.ts
@@ -0,0 +1,246 @@
+import type { PersistedState } from '../../../shared/persisted-state-types'
+import type { WorkspaceSessionState } from '../../../shared/workspace-session-state-types'
+import { parseWorkspaceKey } from '../../../shared/workspace-scope'
+import {
+  getWorktreeIdFromHostIdentity,
+  isWorktreeHostIdentity
+} from '../../../shared/worktree/host-qualified-identity'
+import { worktreeRetentionIdComparisonKey } from '../../worktree-retention-path-comparison'
+
+type WorkspaceSessionWorktreeReferenceKind =
+  | 'none'
+  | 'direct'
+  | 'owner-keyed'
+  | 'owner-keyed-row-arrays'
+  | 'owner-keyed-browser-row-arrays'
+  | 'worktree-id-array'
+  | 'row-record'
+  | 'row-arrays'
+  | 'browser-row-arrays'
+
+/** Every persisted session field must state how, if at all, it can name a worktree owner. */
+export const WORKSPACE_SESSION_WORKTREE_REFERENCE_KIND = {
+  activeRepoId: 'none',
+  activeWorkspaceKey: 'direct',
+  activeWorkspaceExecutionHostId: 'none',
+  activeWorktreeId: 'direct',
+  activeTabId: 'none',
+  tabsByWorktree: 'owner-keyed-row-arrays',
+  terminalLayoutsByTabId: 'none',
+  activeWorktreeIdsOnShutdown: 'worktree-id-array',
+  openFilesByWorktree: 'owner-keyed-row-arrays',
+  activeFileIdByWorktree: 'owner-keyed',
+  markdownFrontmatterVisible: 'none',
+  browserTabsByWorktree: 'owner-keyed-browser-row-arrays',
+  browserPagesByWorkspace: 'browser-row-arrays',
+  activeBrowserTabIdByWorktree: 'owner-keyed',
+  clientHostedBrowserPagesByWorktree: 'owner-keyed',
+  clientHostedBrowserCloseIntentsByEnvironment: 'row-arrays',
+  activeTabTypeByWorktree: 'owner-keyed',
+  browserUrlHistory: 'none',
+  activeTabIdByWorktree: 'owner-keyed',
+  unifiedTabs: 'owner-keyed-row-arrays',
+  tabGroups: 'owner-keyed-row-arrays',
+  tabGroupLayouts: 'owner-keyed',
+  activeGroupIdByWorktree: 'owner-keyed',
+  activeConnectionIdsAtShutdown: 'none',
+  remoteSessionIdsByTabId: 'none',
+  lastVisitedAtByWorktreeId: 'owner-keyed',
+  defaultTerminalTabsAppliedByWorktreeId: 'owner-keyed',
+  sleepingAgentSessionsByPaneKey: 'row-record',
+  terminalPtyIncarnationsByPaneKey: 'none',
+  terminalTopologyRevisionByRepoId: 'none',
+  terminalSurfaceTombstonesByPaneKey: 'row-record',
+  closedTerminalTabTombstonesByTabId: 'row-record'
+} as const satisfies Record<keyof WorkspaceSessionState, WorkspaceSessionWorktreeReferenceKind>
+
+type WorktreeRow = { worktreeId?: string | null }
+type BrowserWorktreeRow = WorktreeRow & {
+  docLocation?: { worktreeId?: string | null } | null
+}
+
+export type WorktreeOwnerCandidateCollector = Readonly<{
+  owners: Set<string>
+  addOwner: (ownerKey: string | null | undefined) => void
+}>
+
+export function getPersistedWorktreeOwnerId(ownerKey: string | null | undefined): string | null {
+  if (!ownerKey) {
+    return null
+  }
+  if (isWorktreeHostIdentity(ownerKey)) {
+    return getWorktreeIdFromHostIdentity(ownerKey) || null
+  }
+  const scope = parseWorkspaceKey(ownerKey)
+  if (scope?.type === 'folder') {
+    return null
+  }
+  return scope?.type === 'worktree' ? scope.worktreeId : ownerKey
+}
+
+export function createWorktreeOwnerCandidateCollector(
+  candidateIds: ReadonlySet<string>,
+  platform: NodeJS.Platform = process.platform,
+  owners: Set<string> = new Set<string>()
+): WorktreeOwnerCandidateCollector {
+  const candidateIdsByComparisonKey = new Map<string, string[]>()
+  for (const candidateId of candidateIds) {
+    const comparisonKey = worktreeRetentionIdComparisonKey(candidateId, platform)
+    if (!comparisonKey) {
+      continue
+    }
+    const matches = candidateIdsByComparisonKey.get(comparisonKey) ?? []
+    matches.push(candidateId)
+    candidateIdsByComparisonKey.set(comparisonKey, matches)
+  }
+  return {
+    owners,
+    addOwner: (ownerKey) => {
+      const worktreeId =
+        ownerKey && candidateIds.has(ownerKey) ? ownerKey : getPersistedWorktreeOwnerId(ownerKey)
+      if (!worktreeId) {
+        return
+      }
+      const comparisonKey = worktreeRetentionIdComparisonKey(worktreeId, platform)
+      const equivalentCandidates = comparisonKey
+        ? candidateIdsByComparisonKey.get(comparisonKey)
+        : undefined
+      if (equivalentCandidates) {
+        for (const candidateId of equivalentCandidates) {
+          owners.add(candidateId)
+        }
+      } else if (candidateIds.has(worktreeId)) {
+        owners.add(worktreeId)
+      }
+    }
+  }
+}
+
+function collectRecordKeys(
+  value: unknown,
+  add: (ownerKey: string | null | undefined) => void
+): void {
+  for (const ownerKey of Object.keys((value ?? {}) as Record<string, unknown>)) {
+    add(ownerKey)
+  }
+}
+
+function collectWorktreeRows(
+  rows: unknown,
+  add: (ownerKey: string | null | undefined) => void
+): void {
+  if (!Array.isArray(rows)) {
+    return
+  }
+  for (const row of rows as WorktreeRow[]) {
+    add(row?.worktreeId)
+  }
+}
+
+function collectBrowserRows(
+  rows: unknown,
+  add: (ownerKey: string | null | undefined) => void
+): void {
+  if (!Array.isArray(rows)) {
+    return
+  }
+  for (const row of rows as BrowserWorktreeRow[]) {
+    add(row?.worktreeId)
+    add(row?.docLocation?.worktreeId)
+  }
+}
+
+function collectSessionFieldOwners(
+  value: unknown,
+  kind: WorkspaceSessionWorktreeReferenceKind,
+  add: (ownerKey: string | null | undefined) => void
+): void {
+  switch (kind) {
+    case 'none':
+      return
+    case 'direct':
+      add(typeof value === 'string' ? value : null)
+      return
+    case 'owner-keyed':
+      collectRecordKeys(value, add)
+      return
+    case 'owner-keyed-row-arrays':
+    case 'owner-keyed-browser-row-arrays':
+      for (const [ownerKey, rows] of Object.entries((value ?? {}) as Record<string, unknown>)) {
+        add(ownerKey)
+        if (kind === 'owner-keyed-browser-row-arrays') {
+          collectBrowserRows(rows, add)
+        } else {
+          collectWorktreeRows(rows, add)
+        }
+      }
+      return
+    case 'worktree-id-array':
+      for (const ownerKey of (value ?? []) as string[]) {
+        add(ownerKey)
+      }
+      return
+    case 'row-record':
+      for (const row of Object.values((value ?? {}) as Record<string, WorktreeRow>)) {
+        add(row?.worktreeId)
+      }
+      return
+    case 'row-arrays':
+    case 'browser-row-arrays':
+      for (const rows of Object.values((value ?? {}) as Record<string, unknown>)) {
+        if (kind === 'browser-row-arrays') {
+          collectBrowserRows(rows, add)
+        } else {
+          collectWorktreeRows(rows, add)
+        }
+      }
+  }
+}
+
+export function collectWorkspaceSessionWorktreeOwners(
+  session: WorkspaceSessionState,
+  candidateIds: ReadonlySet<string>,
+  platform: NodeJS.Platform = process.platform,
+  owners: Set<string> = new Set<string>()
+): Set<string> {
+  const collector = createWorktreeOwnerCandidateCollector(candidateIds, platform, owners)
+  addWorkspaceSessionWorktreeOwners(session, collector)
+  return owners
+}
+
+function addWorkspaceSessionWorktreeOwners(
+  session: WorkspaceSessionState,
+  collector: WorktreeOwnerCandidateCollector
+): void {
+  for (const field of Object.keys(
+    WORKSPACE_SESSION_WORKTREE_REFERENCE_KIND
+  ) as (keyof WorkspaceSessionState)[]) {
+    collectSessionFieldOwners(
+      session[field],
+      WORKSPACE_SESSION_WORKTREE_REFERENCE_KIND[field],
+      collector.addOwner
+    )
+  }
+}
+
+export function addPersistedSessionWorktreeOwners(
+  state: Pick<PersistedState, 'workspaceSession' | 'workspaceSessionsByHostId'>,
+  collector: WorktreeOwnerCandidateCollector
+): void {
+  addWorkspaceSessionWorktreeOwners(state.workspaceSession, collector)
+  for (const session of Object.values(state.workspaceSessionsByHostId ?? {})) {
+    if (session) {
+      addWorkspaceSessionWorktreeOwners(session, collector)
+    }
+  }
+}
+
+export function collectPersistedSessionWorktreeOwners(
+  state: Pick<PersistedState, 'workspaceSession' | 'workspaceSessionsByHostId'>,
+  candidateIds: ReadonlySet<string>,
+  platform: NodeJS.Platform = process.platform
+): Set<string> {
+  const collector = createWorktreeOwnerCandidateCollector(candidateIds, platform)
+  addPersistedSessionWorktreeOwners(state, collector)
+  return collector.owners
+}
diff --git a/src/main/persistence/restoring-sessions/workspace-pane-normalization-index.test.ts b/src/main/persistence/restoring-sessions/workspace-pane-normalization-index.test.ts
new file mode 100644
index 00000000000..9cebe041544
--- /dev/null
+++ b/src/main/persistence/restoring-sessions/workspace-pane-normalization-index.test.ts
@@ -0,0 +1,184 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import type { TerminalLayoutSnapshot, TerminalTab } from '../../../shared/terminal-tab-types'
+import type { WorkspaceSessionState } from '../../../shared/workspace-session-state-types'
+import { createLazyTerminalTabLookup } from './pane-identity-migration'
+import { normalizeWorkspaceSessionPaneIdentities } from './workspace-pane-normalization'
+
+const { registerPaneKeyAliasMock } = vi.hoisted(() => ({
+  registerPaneKeyAliasMock: vi.fn()
+}))
+
+vi.mock('../../agent-hooks/server', () => ({
+  agentHookServer: {
+    registerPaneKeyAlias: registerPaneKeyAliasMock
+  }
+}))
+
+const STABLE_LEAF_ID = '00000000-0000-4000-8000-000000000001'
+
+function terminalTab(id: string, worktreeId: string, ptyId: string | null): TerminalTab {
+  return {
+    id,
+    worktreeId,
+    ptyId,
+    title: 'Terminal',
+    customTitle: null,
+    color: null,
+    sortOrder: 0,
+    createdAt: 1
+  }
+}
+
+function workspaceSession(
+  tabsByWorktree: Record<string, TerminalTab[]>,
+  terminalLayoutsByTabId: Record<string, TerminalLayoutSnapshot>
+): WorkspaceSessionState {
+  return {
+    activeRepoId: null,
+    activeWorktreeId: null,
+    activeTabId: null,
+    tabsByWorktree,
+    terminalLayoutsByTabId
+  }
+}
+
+function legacyLayout(): TerminalLayoutSnapshot {
+  return {
+    root: { type: 'leaf', leafId: 'pane:1' },
+    activeLeafId: 'pane:1',
+    expandedLeafId: null
+  }
+}
+
+function stableLayout(): TerminalLayoutSnapshot {
+  return {
+    root: { type: 'leaf', leafId: STABLE_LEAF_ID },
+    activeLeafId: STABLE_LEAF_ID,
+    expandedLeafId: null
+  }
+}
+
+describe('workspace pane normalization tab index', () => {
+  beforeEach(() => {
+    registerPaneKeyAliasMock.mockReset()
+  })
+
+  it('keeps the first tab when duplicate ids occur across worktrees', () => {
+    const result = normalizeWorkspaceSessionPaneIdentities(
+      workspaceSession(
+        {
+          first: [terminalTab('duplicate-tab', 'first', 'first-pty')],
+          second: [terminalTab('duplicate-tab', 'second', 'second-pty')]
+        },
+        { 'duplicate-tab': legacyLayout() }
+      )
+    )
+
+    expect(result.legacyPaneKeyAliasEntries).not.toHaveLength(0)
+    expect(result.legacyPaneKeyAliasEntries.every((entry) => entry.ptyId === 'first-pty')).toBe(
+      true
+    )
+  })
+
+  it('keeps missing tab ids without inventing persisted aliases', () => {
+    const result = normalizeWorkspaceSessionPaneIdentities(
+      workspaceSession({}, { 'missing-tab': legacyLayout() })
+    )
+
+    expect(result.legacyPaneKeyAliasEntries).toEqual([])
+  })
+
+  it('reads each tab id once regardless of the number of layouts', () => {
+    const tabCount = 256
+    let idReads = 0
+    const tabs = Array.from({ length: tabCount }, (_, index) => {
+      const id = `tab-${index}`
+      const tab = terminalTab(id, 'worktree', null)
+      Object.defineProperty(tab, 'id', {
+        enumerable: true,
+        get: () => {
+          idReads += 1
+          return id
+        }
+      })
+      return tab
+    })
+    const layouts = Object.fromEntries(
+      Array.from({ length: tabCount }, (_, index) => [`tab-${index}`, stableLayout()])
+    )
+
+    normalizeWorkspaceSessionPaneIdentities(workspaceSession({ worktree: tabs }, layouts))
+
+    expect(idReads).toBe(tabCount)
+  })
+
+  it('does not inspect tabs after an early match', () => {
+    const first = terminalTab('first', 'worktree', 'first-pty')
+    const later = terminalTab('later', 'worktree', 'later-pty')
+    Object.defineProperty(later, 'id', {
+      enumerable: true,
+      get: () => {
+        throw new Error('later tab should not be inspected')
+      }
+    })
+
+    const lookup = createLazyTerminalTabLookup(workspaceSession({ worktree: [first, later] }, {}))
+
+    expect(lookup.get('first')).toBe(first)
+  })
+
+  it('resumes scanning and makes later misses constant-time', () => {
+    const reads: string[] = []
+    const tabs = ['first', 'second', 'third'].map((id) => {
+      const tab = terminalTab(id, 'worktree', null)
+      Object.defineProperty(tab, 'id', {
+        enumerable: true,
+        get: () => {
+          reads.push(id)
+          return id
+        }
+      })
+      return tab
+    })
+    const lookup = createLazyTerminalTabLookup(workspaceSession({ worktree: tabs }, {}))
+
+    expect(lookup.get('first')).toBe(tabs[0])
+    expect(reads).toEqual(['first'])
+    expect(lookup.get('second')).toBe(tabs[1])
+    expect(reads).toEqual(['first', 'second'])
+    expect(lookup.get('missing')).toBeUndefined()
+    expect(reads).toEqual(['first', 'second', 'third'])
+    expect(lookup.get('missing')).toBeUndefined()
+    expect(reads).toEqual(['first', 'second', 'third'])
+  })
+
+  it('skips sparse tab-array holes', () => {
+    const tabs: TerminalTab[] = []
+    tabs.length = 3
+    tabs[1] = terminalTab('target', 'worktree', null)
+    const lookup = createLazyTerminalTabLookup(workspaceSession({ worktree: tabs }, {}))
+
+    expect(lookup.get('target')).toBe(tabs[1])
+    expect(lookup.get('missing')).toBeUndefined()
+  })
+
+  it('does not read tab ids when every layout is skipped', () => {
+    const tab = terminalTab('skipped', 'worktree', null)
+    let idReads = 0
+    Object.defineProperty(tab, 'id', {
+      enumerable: true,
+      get: () => {
+        idReads += 1
+        return 'skipped'
+      }
+    })
+
+    normalizeWorkspaceSessionPaneIdentities(
+      workspaceSession({ worktree: [tab] }, { skipped: legacyLayout() }),
+      {},
+      { skipAliasTabIds: new Set(['skipped']) }
+    )
+
+    expect(idReads).toBe(0)
+  })
+})
diff --git a/src/main/persistence/restoring-sessions/workspace-pane-normalization.ts b/src/main/persistence/restoring-sessions/workspace-pane-normalization.ts
index a977134bd0e..2bfafebae9f 100644
--- a/src/main/persistence/restoring-sessions/workspace-pane-normalization.ts
+++ b/src/main/persistence/restoring-sessions/workspace-pane-normalization.ts
@@ -10,7 +10,10 @@ import {
 import type { SshRemotePtyLease } from '../../../shared/ssh-types'
 import { isTerminalLeafId, makePaneKey, parsePaneKey } from '../../../shared/stable-pane-id'
 import { findCrossHostPaneTabIds, withoutPaneTabIds } from './cross-host-pane-tab-ids'
-import { registerLegacyPaneKeyAliasesForTab } from './pane-identity-migration'
+import {
+  createLazyTerminalTabLookup,
+  registerLegacyPaneKeyAliasesForTab
+} from './pane-identity-migration'
 import { normalizeTerminalLayoutSnapshotForPersistence } from './terminal-layout-normalization'
 import {
   legacyMigrationUnsupportedRowsToAliasEntries,
@@ -40,6 +43,7 @@ export function normalizeWorkspaceSessionPaneIdentities(
   const migrationUnsupportedEntries: MigrationUnsupportedPtyEntry[] = []
   const legacyPaneKeyAliasEntries: LegacyPaneKeyAliasEntry[] = []
   const terminalLayoutsByTabId: Record<string, TerminalLayoutSnapshot> = {}
+  let tabsById: ReturnType<typeof createLazyTerminalTabLookup> | null = null
   for (const [tabId, layout] of Object.entries(session.terminalLayoutsByTabId ?? {})) {
     const normalized = normalizeTerminalLayoutSnapshotForPersistence(
       layout,
@@ -48,9 +52,10 @@ export function normalizeWorkspaceSessionPaneIdentities(
     terminalLayoutsByTabId[tabId] = normalized.snapshot
     leafIdByInputLeafIdByTabId.set(tabId, normalized.leafIdByInputLeafId)
     if (!options.skipAliasTabIds?.has(tabId)) {
+      tabsById ??= createLazyTerminalTabLookup(session)
       const tabAliasEntries = registerLegacyPaneKeyAliasesForTab({
-        session,
         tabId,
+        tab: tabsById.get(tabId),
         inputLayout: layout,
         normalizedLayout: normalized.snapshot,
         leafIdByInputLeafId: normalized.leafIdByInputLeafId
diff --git a/src/main/persistence/tracking-repos/local-worktree-metadata-batch-pruning.bench.test.ts b/src/main/persistence/tracking-repos/local-worktree-metadata-batch-pruning.bench.test.ts
new file mode 100644
index 00000000000..0f5a85a80c6
--- /dev/null
+++ b/src/main/persistence/tracking-repos/local-worktree-metadata-batch-pruning.bench.test.ts
@@ -0,0 +1,106 @@
+// Opt in: ORCA_LOCAL_METADATA_PRUNE_BENCH=1 pnpm test src/main/persistence/tracking-repos/local-worktree-metadata-batch-pruning.bench.test.ts
+import { performance } from 'node:perf_hooks'
+import { describe, expect, it, vi } from 'vitest'
+import { getDefaultPersistedState } from '../../../shared/constants'
+import type { PersistedState } from '../../../shared/persisted-state-types'
+import type { Repo } from '../../../shared/repo-types'
+import type { WorktreeMeta } from '../../../shared/worktree/meta-types'
+import { removeWorkspaceSessionOwner } from '../restoring-sessions/session-owner-removal'
+import {
+  pruneUnreferencedWorktreeIdentityMeta,
+  removeWorktreeMetadataForHost
+} from '../loading-store/worktree-identity-metadata'
+import {
+  captureNativeLocalWorktreeMetadataScanExpectation,
+  pruneSessionlessMissingLocalWorktreeMetadataForRepo
+} from './missing-local-worktree-metadata-pruning'
+
+const describeBench = process.env.ORCA_LOCAL_METADATA_PRUNE_BENCH ? describe : describe.skip
+const ROW_COUNT = 2_709
+const REPO: Repo = {
+  id: 'repo-1',
+  path: '/workspace/repo',
+  displayName: 'repo',
+  badgeColor: '#000',
+  addedAt: 0
+}
+
+function makeMeta(index: number): WorktreeMeta {
+  return {
+    instanceId: `instance-${index}`,
+    hostId: 'local',
+    displayName: `stale-${index}`,
+    comment: '',
+    linkedIssue: null,
+    linkedPR: null,
+    linkedLinearIssue: null,
+    isArchived: false,
+    isUnread: false,
+    isPinned: false,
+    sortOrder: index,
+    lastActivityAt: 0
+  }
+}
+
+function makeState(): { state: PersistedState; staleIds: string[] } {
+  const state = getDefaultPersistedState('/home/test')
+  state.repos = [REPO]
+  state.worktreeMetaByIdentity = {}
+  state.worktreeIdentityAliases = {}
+  const staleIds = Array.from(
+    { length: ROW_COUNT },
+    (_, index) => `${REPO.id}::/workspace/stale-${index}`
+  )
+  for (const [index, worktreeId] of staleIds.entries()) {
+    const meta = makeMeta(index)
+    const identityKey = `identity-${index}`
+    state.worktreeMeta[worktreeId] = meta
+    state.worktreeMetaByIdentity[identityKey] = meta
+    state.worktreeIdentityAliases[`local|${worktreeId}`] = [identityKey]
+  }
+  return { state, staleIds }
+}
+
+describeBench('authoritative local metadata batch pruning', () => {
+  it('measures the reported 2,709-row sequential and batch shapes', () => {
+    const legacy = makeState()
+    const batch = makeState()
+    const cloneSpy = vi.spyOn(globalThis, 'structuredClone')
+    const legacyStartedAt = performance.now()
+    for (const worktreeId of legacy.staleIds) {
+      removeWorktreeMetadataForHost(legacy.state, worktreeId, undefined)
+      delete legacy.state.worktreeMeta[worktreeId]
+      legacy.state.workspaceSession = removeWorkspaceSessionOwner(
+        legacy.state.workspaceSession,
+        worktreeId
+      )!
+    }
+    pruneUnreferencedWorktreeIdentityMeta(legacy.state)
+    const legacyMs = performance.now() - legacyStartedAt
+    const legacySessionClones = cloneSpy.mock.calls.length
+    cloneSpy.mockClear()
+
+    const batchStartedAt = performance.now()
+    const scan = captureNativeLocalWorktreeMetadataScanExpectation(batch.state, REPO)
+    const removed = pruneSessionlessMissingLocalWorktreeMetadataForRepo(
+      batch.state,
+      scan,
+      scan.metadata
+    )
+    const batchMs = performance.now() - batchStartedAt
+    const batchSessionClones = cloneSpy.mock.calls.length
+    cloneSpy.mockRestore()
+
+    expect(removed).toHaveLength(ROW_COUNT)
+    expect(Object.keys(legacy.state.worktreeMeta)).toHaveLength(0)
+    expect(Object.keys(batch.state.worktreeMeta)).toHaveLength(0)
+    expect(legacySessionClones).toBe(ROW_COUNT)
+    expect(batchSessionClones).toBe(0)
+
+    console.log(
+      `[bench] rows=${ROW_COUNT} metadata+session=${legacyMs.toFixed(2)}ms -> ${batchMs.toFixed(2)}ms; ` +
+        `gitScans=${ROW_COUNT} -> 1; sessionClones=${legacySessionClones} -> ${batchSessionClones}; ` +
+        `minimumSaveSchedules=${ROW_COUNT * 2} -> 1`
+    )
+  })
+})
diff --git a/src/main/persistence/tracking-repos/local-worktree-metadata-scan-expectation.test.ts b/src/main/persistence/tracking-repos/local-worktree-metadata-scan-expectation.test.ts
new file mode 100644
index 00000000000..85c883fe666
--- /dev/null
+++ b/src/main/persistence/tracking-repos/local-worktree-metadata-scan-expectation.test.ts
@@ -0,0 +1,242 @@
+import { describe, expect, it } from 'vitest'
+import { getDefaultPersistedState } from '../../../shared/constants'
+import type { PersistedState } from '../../../shared/persisted-state-types'
+import type { Repo } from '../../../shared/repo-types'
+import type { WorktreeMeta } from '../../../shared/worktree/meta-types'
+import {
+  captureNativeLocalWorktreeMetadataScanExpectation,
+  pruneSessionlessMissingLocalWorktreeMetadataForRepo
+} from './missing-local-worktree-metadata-pruning'
+
+const REPO_ID = 'repo-1'
+const WORKTREE_ID = `${REPO_ID}::/workspace/stale`
+const LOCAL_ALIAS = `local|${WORKTREE_ID}`
+const IDENTITY_KEY = 'local-identity'
+
+function makeRepo(id = REPO_ID): Repo {
+  return {
+    id,
+    path: `/workspace/${id}`,
+    displayName: id,
+    badgeColor: '#000',
+    addedAt: 0
+  }
+}
+
+function makeMeta(worktreeId = WORKTREE_ID): WorktreeMeta {
+  return {
+    instanceId: `instance-${worktreeId}`,
+    hostId: 'local',
+    displayName: worktreeId,
+    comment: '',
+    linkedIssue: null,
+    linkedPR: null,
+    linkedLinearIssue: null,
+    isArchived: false,
+    isUnread: false,
+    isPinned: false,
+    sortOrder: 0,
+    lastActivityAt: 0
+  }
+}
+
+function makeState(): PersistedState {
+  const state = getDefaultPersistedState('/home/test')
+  state.repos = [makeRepo()]
+  return state
+}
+
+function makeCanonicalOnlyState(): {
+  state: PersistedState
+  meta: WorktreeMeta
+} {
+  const state = makeState()
+  const meta = makeMeta()
+  state.worktreeMetaByIdentity = { [IDENTITY_KEY]: meta }
+  state.worktreeIdentityAliases = { [LOCAL_ALIAS]: [IDENTITY_KEY] }
+  return { state, meta }
+}
+
+function pruneCaptured(state: PersistedState): string[] {
+  const scan = captureNativeLocalWorktreeMetadataScanExpectation(state, state.repos[0]!)
+  return pruneSessionlessMissingLocalWorktreeMetadataForRepo(state, scan, scan.metadata)
+}
+
+describe('local worktree metadata scan expectations', () => {
+  it('captures canonical-only local metadata and removes its orphaned identity row', () => {
+    const { state } = makeCanonicalOnlyState()
+
+    expect(pruneCaptured(state)).toEqual([WORKTREE_ID])
+    expect(state.worktreeMeta[WORKTREE_ID]).toBeUndefined()
+    expect(state.worktreeIdentityAliases?.[LOCAL_ALIAS]).toBeUndefined()
+    expect(state.worktreeMetaByIdentity?.[IDENTITY_KEY]).toBeUndefined()
+  })
+
+  it('removes equal legacy and canonical projections after a persistence round trip', () => {
+    const state = makeState()
+    const meta = makeMeta()
+    state.worktreeMeta[WORKTREE_ID] = structuredClone(meta)
+    state.worktreeMetaByIdentity = { [IDENTITY_KEY]: structuredClone(meta) }
+    state.worktreeIdentityAliases = { [LOCAL_ALIAS]: [IDENTITY_KEY] }
+
+    expect(pruneCaptured(state)).toEqual([WORKTREE_ID])
+    expect(state.worktreeMeta[WORKTREE_ID]).toBeUndefined()
+    expect(state.worktreeIdentityAliases[LOCAL_ALIAS]).toBeUndefined()
+    expect(state.worktreeMetaByIdentity[IDENTITY_KEY]).toBeUndefined()
+  })
+
+  it('does not sweep an unrelated unaliased canonical row during pruning', () => {
+    const { state, meta } = makeCanonicalOnlyState()
+    const unrelated = makeMeta(`${REPO_ID}::/workspace/unrelated`)
+    state.worktreeMetaByIdentity!.unrelated = unrelated
+
+    expect(pruneCaptured(state)).toEqual([WORKTREE_ID])
+    expect(state.worktreeMetaByIdentity).toEqual({ unrelated })
+    expect(state.worktreeMetaByIdentity?.[IDENTITY_KEY]).not.toBeDefined()
+    expect(meta).not.toBe(unrelated)
+  })
+
+  it('allocates expectations only for the scanned repository', () => {
+    const state = makeState()
+    const otherRepo = makeRepo('repo-2')
+    const otherId = `${otherRepo.id}::/workspace/other`
+    const canonicalId = `${REPO_ID}::/workspace/canonical`
+    const canonicalKey = 'canonical-key'
+    state.repos.push(otherRepo)
+    state.worktreeMeta[WORKTREE_ID] = makeMeta()
+    state.worktreeMeta[otherId] = makeMeta(otherId)
+    state.worktreeMetaByIdentity = {
+      [canonicalKey]: makeMeta(canonicalId),
+      'other-key': makeMeta(otherId)
+    }
+    state.worktreeIdentityAliases = {
+      [`local|${canonicalId}`]: [canonicalKey],
+      [`local|${otherId}`]: ['other-key']
+    }
+
+    const scan = captureNativeLocalWorktreeMetadataScanExpectation(state, state.repos[0]!)
+
+    expect(scan.metadata.map(({ worktreeId }) => worktreeId).sort()).toEqual(
+      [WORKTREE_ID, canonicalId].sort()
+    )
+  })
+
+  it('preserves metadata when an alias array is replaced with identical contents', () => {
+    const { state } = makeCanonicalOnlyState()
+    const scan = captureNativeLocalWorktreeMetadataScanExpectation(state, state.repos[0]!)
+    state.worktreeIdentityAliases![LOCAL_ALIAS] = [IDENTITY_KEY]
+
+    expect(pruneSessionlessMissingLocalWorktreeMetadataForRepo(state, scan, scan.metadata)).toEqual(
+      []
+    )
+    expect(state.worktreeMetaByIdentity?.[IDENTITY_KEY]).toBeDefined()
+  })
+
+  it('preserves metadata when the captured alias array is mutated in place', () => {
+    const { state } = makeCanonicalOnlyState()
+    const scan = captureNativeLocalWorktreeMetadataScanExpectation(state, state.repos[0]!)
+    state.worktreeIdentityAliases![LOCAL_ALIAS]!.push('new-identity')
+    state.worktreeMetaByIdentity!['new-identity'] = makeMeta()
+
+    expect(pruneSessionlessMissingLocalWorktreeMetadataForRepo(state, scan, scan.metadata)).toEqual(
+      []
+    )
+  })
+
+  it.each([
+    [
+      'replaced',
+      (state: PersistedState) => {
+        state.worktreeMetaByIdentity![IDENTITY_KEY] = {
+          ...state.worktreeMetaByIdentity![IDENTITY_KEY]!
+        }
+      }
+    ],
+    [
+      'host-mutated',
+      (state: PersistedState) => {
+        state.worktreeMetaByIdentity![IDENTITY_KEY]!.hostId = 'ssh:builder'
+      }
+    ],
+    [
+      'instance-mutated',
+      (state: PersistedState) => {
+        state.worktreeMetaByIdentity![IDENTITY_KEY]!.instanceId = 'new-instance'
+      }
+    ],
+    [
+      'content-mutated',
+      (state: PersistedState) => {
+        state.worktreeMetaByIdentity![IDENTITY_KEY]!.comment = 'new comment'
+      }
+    ]
+  ] as const)('preserves metadata when a canonical row is %s', (_label, mutate) => {
+    const { state } = makeCanonicalOnlyState()
+    const scan = captureNativeLocalWorktreeMetadataScanExpectation(state, state.repos[0]!)
+    mutate(state)
+
+    expect(pruneSessionlessMissingLocalWorktreeMetadataForRepo(state, scan, scan.metadata)).toEqual(
+      []
+    )
+  })
+
+  it.each([
+    [
+      'added',
+      (state: PersistedState) => {
+        state.worktreeIdentityAliases![`ssh:builder|${WORKTREE_ID}`] = [IDENTITY_KEY]
+      }
+    ],
+    [
+      'removed',
+      (state: PersistedState) => {
+        delete state.worktreeIdentityAliases![LOCAL_ALIAS]
+      }
+    ]
+  ] as const)('preserves metadata when an alias is %s during the scan', (_label, mutate) => {
+    const { state } = makeCanonicalOnlyState()
+    const scan = captureNativeLocalWorktreeMetadataScanExpectation(state, state.repos[0]!)
+    mutate(state)
+
+    expect(pruneSessionlessMissingLocalWorktreeMetadataForRepo(state, scan, scan.metadata)).toEqual(
+      []
+    )
+    expect(state.worktreeMetaByIdentity?.[IDENTITY_KEY]).toBeDefined()
+  })
+
+  it('preserves a legacy row created after a canonical-only scan capture', () => {
+    const { state } = makeCanonicalOnlyState()
+    const scan = captureNativeLocalWorktreeMetadataScanExpectation(state, state.repos[0]!)
+    state.worktreeMeta[WORKTREE_ID] = makeMeta()
+
+    expect(pruneSessionlessMissingLocalWorktreeMetadataForRepo(state, scan, scan.metadata)).toEqual(
+      []
+    )
+    expect(state.worktreeMeta[WORKTREE_ID]).toBeDefined()
+  })
+
+  it.each([WORKTREE_ID, `bogus|${WORKTREE_ID}`, `ssh:builder|${WORKTREE_ID}`])(
+    'preserves metadata with an unqualified or foreign alias: %s',
+    (alias) => {
+      const state = makeState()
+      state.worktreeMeta[WORKTREE_ID] = makeMeta()
+      state.worktreeMetaByIdentity = { [IDENTITY_KEY]: state.worktreeMeta[WORKTREE_ID]! }
+      state.worktreeIdentityAliases = { [alias]: [IDENTITY_KEY] }
+
+      expect(pruneCaptured(state)).toEqual([])
+      expect(state.worktreeMeta[WORKTREE_ID]).toBeDefined()
+    }
+  )
+
+  it('preserves an unqualified alias whose worktree path contains a pipe', () => {
+    const state = makeState()
+    const pipedId = `${REPO_ID}::/workspace/a|b`
+    state.worktreeMeta[pipedId] = makeMeta(pipedId)
+    state.worktreeMetaByIdentity = { [IDENTITY_KEY]: state.worktreeMeta[pipedId]! }
+    state.worktreeIdentityAliases = { [pipedId]: [IDENTITY_KEY] }
+
+    expect(pruneCaptured(state)).toEqual([])
+    expect(state.worktreeMeta[pipedId]).toBeDefined()
+    expect(state.worktreeIdentityAliases[pipedId]).toEqual([IDENTITY_KEY])
+  })
+})
diff --git a/src/main/persistence/tracking-repos/local-worktree-metadata-scan-expectation.ts b/src/main/persistence/tracking-repos/local-worktree-metadata-scan-expectation.ts
new file mode 100644
index 00000000000..fca925d0986
--- /dev/null
+++ b/src/main/persistence/tracking-repos/local-worktree-metadata-scan-expectation.ts
@@ -0,0 +1,243 @@
+import { isDeepStrictEqual } from 'node:util'
+import type { PersistedState } from '../../../shared/persisted-state-types'
+import type { GlobalSettings } from '../../../shared/global-settings-types'
+import type { Project } from '../../../shared/project-types'
+import type { Repo } from '../../../shared/repo-types'
+import { getRepoKind } from '../../../shared/repo-kind'
+import { splitWorktreeId } from '../../../shared/worktree/id'
+import {
+  composeWorktreeHostIdentity,
+  getWorktreeIdFromHostIdentity,
+  isWorktreeHostIdentity
+} from '../../../shared/worktree/host-qualified-identity'
+import type { WorktreeMeta } from '../../../shared/worktree/meta-types'
+import { LOCAL_EXECUTION_HOST_ID } from '../../../shared/execution-host'
+
+type CapturedLocalRepoIdentity = Readonly<
+  Pick<Repo, 'id' | 'path' | 'connectionId' | 'executionHostId'> & {
+    kind: ReturnType<typeof getRepoKind>
+    expectedRepo: Repo | undefined
+  }
+>
+
+type CapturedLocalRoutingIdentity = Readonly<{
+  expectedProject: Project | undefined
+  expectedProjectUpdatedAt: number | undefined
+  expectedSettings: GlobalSettings
+}>
+
+type MetadataRowExpectation = Readonly<{
+  expectedPresent: boolean
+  expectedMeta: WorktreeMeta | undefined
+  expectedSerialized: string | null | undefined
+  expectedInstanceId: string | undefined
+  expectedHostId: WorktreeMeta['hostId']
+}>
+
+type MetadataAliasExpectation = Readonly<{
+  alias: string
+  expectedAlias: string[]
+  expectedIdentityKeys: readonly string[]
+  expectedIdentityRows: readonly (MetadataRowExpectation & { identityKey: string })[]
+}>
+
+export type LocalWorktreeMetadataPruneExpectation = Readonly<{
+  worktreeId: string
+  expectedLegacy: MetadataRowExpectation
+  expectedAliases: readonly MetadataAliasExpectation[]
+}>
+
+export type NativeLocalWorktreeMetadataScanExpectation = Readonly<{
+  repo: CapturedLocalRepoIdentity
+  routing: CapturedLocalRoutingIdentity
+  metadata: readonly LocalWorktreeMetadataPruneExpectation[]
+}>
+
+type MetadataAliasEntry = readonly [alias: string, identityKeys: string[]]
+
+function serializeMetadataRow(meta: WorktreeMeta | undefined): string | null | undefined {
+  if (!meta) {
+    return undefined
+  }
+  try {
+    return JSON.stringify(meta)
+  } catch {
+    return null
+  }
+}
+
+function captureRow(
+  record: Readonly<Record<string, WorktreeMeta>> | undefined,
+  key: string
+): MetadataRowExpectation {
+  const expectedPresent = Object.hasOwn(record ?? {}, key)
+  const expectedMeta = record?.[key]
+  return {
+    expectedPresent,
+    expectedMeta,
+    expectedSerialized: serializeMetadataRow(expectedMeta),
+    expectedInstanceId: expectedMeta?.instanceId,
+    expectedHostId: expectedMeta?.hostId
+  }
+}
+
+export function indexMetadataAliasesForWorktreeIds(
+  state: PersistedState,
+  worktreeIds: ReadonlySet<string>
+): Map<string, MetadataAliasEntry[]> {
+  const indexed = new Map<string, MetadataAliasEntry[]>()
+  for (const [alias, identityKeys] of Object.entries(state.worktreeIdentityAliases ?? {})) {
+    const matches = new Set<string>()
+    if (worktreeIds.has(alias)) {
+      matches.add(alias)
+    }
+    const separator = alias.indexOf('|')
+    const suffix = separator === -1 ? alias : alias.slice(separator + 1)
+    if (worktreeIds.has(suffix)) {
+      matches.add(suffix)
+    }
+    for (const worktreeId of matches) {
+      const entries = indexed.get(worktreeId) ?? []
+      entries.push([alias, identityKeys])
+      indexed.set(worktreeId, entries)
+    }
+  }
+  return indexed
+}
+
+export function captureNativeLocalWorktreeMetadataScanExpectation(
+  state: PersistedState,
+  repo: Repo
+): NativeLocalWorktreeMetadataScanExpectation {
+  const matchingRepos = state.repos.filter((entry) => entry.id === repo.id)
+  const expectedRepo = matchingRepos.length === 1 ? matchingRepos[0] : undefined
+  const expectedProject = state.projects.find((project) => project.sourceRepoIds.includes(repo.id))
+  const candidateIds = new Set<string>()
+  for (const [worktreeId, meta] of Object.entries(state.worktreeMeta)) {
+    if (
+      splitWorktreeId(worktreeId)?.repoId === repo.id &&
+      (!meta.hostId || meta.hostId === LOCAL_EXECUTION_HOST_ID)
+    ) {
+      candidateIds.add(worktreeId)
+    }
+  }
+  for (const alias of Object.keys(state.worktreeIdentityAliases ?? {})) {
+    if (!isWorktreeHostIdentity(alias)) {
+      continue
+    }
+    const worktreeId = getWorktreeIdFromHostIdentity(alias)
+    if (
+      alias === composeWorktreeHostIdentity(LOCAL_EXECUTION_HOST_ID, worktreeId) &&
+      splitWorktreeId(worktreeId)?.repoId === repo.id
+    ) {
+      candidateIds.add(worktreeId)
+    }
+  }
+  const aliasesByWorktreeId = indexMetadataAliasesForWorktreeIds(state, candidateIds)
+  return {
+    repo: {
+      id: repo.id,
+      path: repo.path,
+      connectionId: repo.connectionId,
+      executionHostId: repo.executionHostId,
+      kind: getRepoKind(repo),
+      expectedRepo
+    },
+    routing: {
+      expectedProject,
+      expectedProjectUpdatedAt: expectedProject?.updatedAt,
+      expectedSettings: state.settings
+    },
+    metadata: [...candidateIds].map((worktreeId) => ({
+      worktreeId,
+      expectedLegacy: captureRow(state.worktreeMeta, worktreeId),
+      expectedAliases: (aliasesByWorktreeId.get(worktreeId) ?? []).map(([alias, identityKeys]) => ({
+        alias,
+        expectedAlias: identityKeys,
+        expectedIdentityKeys: [...identityKeys],
+        expectedIdentityRows: identityKeys.map((identityKey) => ({
+          identityKey,
+          ...captureRow(state.worktreeMetaByIdentity, identityKey)
+        }))
+      }))
+    }))
+  }
+}
+
+function rowStillMatches(
+  record: Readonly<Record<string, WorktreeMeta>> | undefined,
+  key: string,
+  expected: MetadataRowExpectation
+): boolean {
+  const current = record?.[key]
+  return (
+    Object.hasOwn(record ?? {}, key) === expected.expectedPresent &&
+    current === expected.expectedMeta &&
+    expected.expectedSerialized !== null &&
+    serializeMetadataRow(current) === expected.expectedSerialized &&
+    current?.instanceId === expected.expectedInstanceId &&
+    current?.hostId === expected.expectedHostId
+  )
+}
+
+function aliasesStillMatch(
+  state: PersistedState,
+  expected: LocalWorktreeMetadataPruneExpectation,
+  currentAliases: readonly MetadataAliasEntry[]
+): boolean {
+  if (currentAliases.length !== expected.expectedAliases.length) {
+    return false
+  }
+  const currentByAlias = new Map(currentAliases)
+  return expected.expectedAliases.every((aliasExpectation) => {
+    const current = currentByAlias.get(aliasExpectation.alias)
+    return Boolean(
+      current &&
+      current === aliasExpectation.expectedAlias &&
+      current.length === aliasExpectation.expectedIdentityKeys.length &&
+      current.every((key, index) => key === aliasExpectation.expectedIdentityKeys[index]) &&
+      aliasExpectation.expectedIdentityRows.every(({ identityKey, ...row }) =>
+        rowStillMatches(state.worktreeMetaByIdentity, identityKey, row)
+      )
+    )
+  })
+}
+
+export function removeRevalidatedLocalWorktreeMetadata(
+  state: PersistedState,
+  expected: LocalWorktreeMetadataPruneExpectation,
+  currentAliases: readonly MetadataAliasEntry[],
+  removedIdentityKeys?: Set<string>
+): boolean {
+  if (
+    !rowStillMatches(state.worktreeMeta, expected.worktreeId, expected.expectedLegacy) ||
+    !aliasesStillMatch(state, expected, currentAliases)
+  ) {
+    return false
+  }
+  const localAlias = composeWorktreeHostIdentity(LOCAL_EXECUTION_HOST_ID, expected.worktreeId)
+  if (currentAliases.some(([alias]) => alias !== localAlias)) {
+    return false
+  }
+  const legacy = state.worktreeMeta[expected.worktreeId]
+  const identityKeys = state.worktreeIdentityAliases?.[localAlias]
+  if (identityKeys && identityKeys.length !== 1) {
+    return false
+  }
+  const canonical = identityKeys?.[0] ? state.worktreeMetaByIdentity?.[identityKeys[0]] : undefined
+  if (
+    (legacy?.hostId && legacy.hostId !== LOCAL_EXECUTION_HOST_ID) ||
+    (canonical?.hostId && canonical.hostId !== LOCAL_EXECUTION_HOST_ID) ||
+    (identityKeys && !canonical) ||
+    (legacy && canonical && !isDeepStrictEqual(legacy, canonical)) ||
+    (!legacy && !canonical)
+  ) {
+    return false
+  }
+  if (identityKeys?.[0]) {
+    removedIdentityKeys?.add(identityKeys[0])
+  }
+  delete state.worktreeMeta[expected.worktreeId]
+  delete state.worktreeIdentityAliases?.[localAlias]
+  return true
+}
diff --git a/src/main/persistence/tracking-repos/missing-local-worktree-metadata-pruning.test.ts b/src/main/persistence/tracking-repos/missing-local-worktree-metadata-pruning.test.ts
new file mode 100644
index 00000000000..cdad14034e2
--- /dev/null
+++ b/src/main/persistence/tracking-repos/missing-local-worktree-metadata-pruning.test.ts
@@ -0,0 +1,477 @@
+import { describe, expect, it, vi } from 'vitest'
+import { getDefaultPersistedState, getDefaultWorkspaceSession } from '../../../shared/constants'
+import type { PersistedState } from '../../../shared/persisted-state-types'
+import type { Project } from '../../../shared/project-types'
+import type { Repo } from '../../../shared/repo-types'
+import { worktreeWorkspaceKey } from '../../../shared/workspace-scope'
+import type { WorktreeMeta } from '../../../shared/worktree/meta-types'
+import {
+  captureNativeLocalWorktreeMetadataScanExpectation,
+  pruneSessionlessMissingLocalWorktreeMetadataForRepo
+} from './missing-local-worktree-metadata-pruning'
+
+const REPO_ID = 'repo-1'
+const LIVE_ID = `${REPO_ID}::/workspace/live`
+
+function makeRepo(overrides: Partial<Repo> = {}): Repo {
+  return {
+    id: REPO_ID,
+    path: '/workspace/repo',
+    displayName: 'repo',
+    badgeColor: '#000',
+    addedAt: 0,
+    ...overrides
+  }
+}
+
+function makeMeta(worktreeId: string): WorktreeMeta {
+  return {
+    instanceId: `instance-${worktreeId}`,
+    hostId: 'local',
+    displayName: worktreeId,
+    comment: '',
+    linkedIssue: null,
+    linkedPR: null,
+    linkedLinearIssue: null,
+    isArchived: false,
+    isUnread: false,
+    isPinned: false,
+    sortOrder: 0,
+    lastActivityAt: 0
+  }
+}
+
+function makeState(repo = makeRepo()): PersistedState {
+  const state = getDefaultPersistedState('/home/test')
+  state.repos = [repo]
+  return state
+}
+
+function capture(state: PersistedState, repo = state.repos[0]!) {
+  return captureNativeLocalWorktreeMetadataScanExpectation(state, repo)
+}
+
+function pruneCaptured(
+  state: PersistedState,
+  scan: ReturnType<typeof capture>,
+  ids: readonly string[],
+  platform?: NodeJS.Platform
+): string[] {
+  const wanted = new Set(ids)
+  return pruneSessionlessMissingLocalWorktreeMetadataForRepo(
+    state,
+    scan,
+    scan.metadata.filter(({ worktreeId }) => wanted.has(worktreeId)),
+    platform
+  )
+}
+
+describe('pruneSessionlessMissingLocalWorktreeMetadataForRepo', () => {
+  it('removes 2,709 sessionless rows in one batch without cloning or changing session state', () => {
+    const state = makeState()
+    const staleIds = Array.from(
+      { length: 2_709 },
+      (_, index) => `${REPO_ID}::/workspace/stale-${index}`
+    )
+    const allIds = [LIVE_ID, ...staleIds]
+    state.worktreeMetaByIdentity = {}
+    state.worktreeIdentityAliases = {}
+    for (const [index, worktreeId] of allIds.entries()) {
+      const meta = makeMeta(worktreeId)
+      const identityKey = `identity-${index}`
+      state.worktreeMeta[worktreeId] = meta
+      state.worktreeMetaByIdentity[identityKey] = meta
+      state.worktreeIdentityAliases[`local|${worktreeId}`] = [identityKey]
+    }
+    state.worktreeLineageById[staleIds[0]!] = { worktreeId: staleIds[0] } as never
+    state.workspaceLineageByChildKey[worktreeWorkspaceKey(staleIds[0]!)] = {
+      childWorkspaceKey: worktreeWorkspaceKey(staleIds[0]!)
+    } as never
+    state.workspaceSession.terminalTopologyRevisionByRepoId = { [REPO_ID]: 7 }
+    const hostSession = {
+      ...getDefaultWorkspaceSession(),
+      terminalTopologyRevisionByRepoId: { [REPO_ID]: 11 }
+    }
+    state.workspaceSessionsByHostId = { 'runtime:mirror': hostSession }
+    const scan = capture(state)
+    const session = state.workspaceSession
+    const sessionSnapshot = structuredClone(session)
+    const hostSessionSnapshot = structuredClone(hostSession)
+    const cloneSpy = vi.spyOn(globalThis, 'structuredClone')
+
+    const removed = pruneCaptured(state, scan, staleIds)
+
+    expect(removed).toHaveLength(staleIds.length)
+    expect(cloneSpy).not.toHaveBeenCalled()
+    cloneSpy.mockRestore()
+    expect(Object.keys(state.worktreeMeta)).toEqual([LIVE_ID])
+    expect(Object.keys(state.worktreeMetaByIdentity ?? {})).toEqual(['identity-0'])
+    expect(Object.keys(state.worktreeIdentityAliases ?? {})).toEqual([`local|${LIVE_ID}`])
+    expect(state.worktreeLineageById[staleIds[0]!]).toBeUndefined()
+    expect(state.workspaceLineageByChildKey[worktreeWorkspaceKey(staleIds[0]!)]).toBeUndefined()
+    expect(state.workspaceSession).toBe(session)
+    expect(state.workspaceSession).toEqual(sessionSnapshot)
+    expect(state.workspaceSessionsByHostId?.['runtime:mirror']).toBe(hostSession)
+    expect(state.workspaceSessionsByHostId?.['runtime:mirror']).toEqual(hostSessionSnapshot)
+  })
+
+  it('fails closed when metadata is mutated or replaced after the scan starts', () => {
+    const inPlaceState = makeState()
+    const inPlaceId = `${REPO_ID}::/workspace/in-place`
+    inPlaceState.worktreeMeta[inPlaceId] = makeMeta(inPlaceId)
+    const inPlaceScan = capture(inPlaceState)
+    inPlaceState.worktreeMeta[inPlaceId]!.instanceId = 'replacement-instance'
+
+    expect(pruneCaptured(inPlaceState, inPlaceScan, [inPlaceId])).toEqual([])
+
+    const replacedState = makeState()
+    const replacedId = `${REPO_ID}::/workspace/replaced`
+    const original = makeMeta(replacedId)
+    replacedState.worktreeMeta[replacedId] = original
+    const replacedScan = capture(replacedState)
+    replacedState.worktreeMeta[replacedId] = { ...original }
+
+    expect(pruneCaptured(replacedState, replacedScan, [replacedId])).toEqual([])
+    expect(replacedState.worktreeMeta[replacedId]).not.toBe(original)
+  })
+
+  it('fails closed when an identical repo row is removed and re-added during the scan', () => {
+    const state = makeState()
+    const worktreeId = `${REPO_ID}::/workspace/re-added-repo`
+    state.worktreeMeta[worktreeId] = makeMeta(worktreeId)
+    const scan = capture(state)
+    const replacement = { ...state.repos[0]! }
+    state.repos.splice(0, 1, replacement)
+
+    expect(pruneCaptured(state, scan, [worktreeId])).toEqual([])
+    expect(state.repos[0]).toBe(replacement)
+    expect(state.worktreeMeta[worktreeId]).toBeDefined()
+  })
+
+  it('uses the effective Git kind when the raw legacy repo omitted kind', () => {
+    const state = makeState()
+    const worktreeId = `${REPO_ID}::/workspace/legacy-git-kind`
+    const rawRepo = state.repos[0]!
+    state.worktreeMeta[worktreeId] = makeMeta(worktreeId)
+    const scan = capture(state, { ...rawRepo, kind: 'git' })
+
+    expect(rawRepo.kind).toBeUndefined()
+    expect(pruneCaptured(state, scan, [worktreeId])).toEqual([worktreeId])
+  })
+
+  it.each([
+    'tabsByWorktree',
+    'browserTabsByWorktree',
+    'openFilesByWorktree',
+    'activeFileIdByWorktree',
+    'activeBrowserTabIdByWorktree',
+    'clientHostedBrowserPagesByWorktree',
+    'activeTabTypeByWorktree',
+    'activeTabIdByWorktree',
+    'unifiedTabs',
+    'tabGroups',
+    'tabGroupLayouts',
+    'activeGroupIdByWorktree',
+    'lastVisitedAtByWorktreeId',
+    'defaultTerminalTabsAppliedByWorktreeId'
+  ] as const)('preserves an owner named by workspaceSession.%s', (field) => {
+    const state = makeState()
+    const worktreeId = `${REPO_ID}::/workspace/${field}`
+    state.worktreeMeta[worktreeId] = makeMeta(worktreeId)
+    const scan = capture(state)
+    const ownerKey = field === 'lastVisitedAtByWorktreeId' ? `local|${worktreeId}` : worktreeId
+    ;(state.workspaceSession as unknown as Record<string, unknown>)[field] = {
+      [ownerKey]: []
+    }
+
+    expect(pruneCaptured(state, scan, [worktreeId])).toEqual([])
+    expect(state.worktreeMeta[worktreeId]).toBeDefined()
+  })
+
+  it('preserves scalar, nested, remote-partition, mobile, and relay recovery owners', () => {
+    const ownerMutations: ((state: PersistedState, worktreeId: string) => void)[] = [
+      (state, worktreeId) => {
+        state.workspaceSession.activeWorktreeId = worktreeId
+      },
+      (state, worktreeId) => {
+        state.workspaceSession.activeWorkspaceKey = worktreeWorkspaceKey(worktreeId)
+      },
+      (state, worktreeId) => {
+        state.workspaceSession.activeWorktreeIdsOnShutdown = [worktreeId]
+      },
+      (state, worktreeId) => {
+        state.ui.lastActiveWorktreeId = worktreeId
+      },
+      (state, worktreeId) => {
+        state.workspaceSession.sleepingAgentSessionsByPaneKey = {
+          pane: { worktreeId } as never
+        }
+      },
+      (state, worktreeId) => {
+        state.workspaceSession.terminalSurfaceTombstonesByPaneKey = {
+          pane: { worktreeId } as never
+        }
+      },
+      (state, worktreeId) => {
+        state.workspaceSession.closedTerminalTabTombstonesByTabId = {
+          tab: { worktreeId, closedAt: 1 }
+        }
+      },
+      (state, worktreeId) => {
+        state.workspaceSession.clientHostedBrowserCloseIntentsByEnvironment = {
+          runtime: [{ worktreeId, browserPageId: 'page', closedAt: 1 }]
+        }
+      },
+      (state, worktreeId) => {
+        state.workspaceSession.browserPagesByWorkspace = {
+          browser: [{ worktreeId } as never]
+        }
+      },
+      (state, worktreeId) => {
+        state.workspaceSessionsByHostId = {
+          'ssh:builder': {
+            ...getDefaultWorkspaceSession(),
+            lastVisitedAtByWorktreeId: { [worktreeId]: 1 }
+          }
+        }
+      },
+      (state, worktreeId) => {
+        state.mobileClientTabSelectionsByDeviceId = {
+          phone: { [worktreeId]: {} as never }
+        }
+      },
+      (state, worktreeId) => {
+        state.sshRemotePtyLeases = [
+          {
+            targetId: 'builder',
+            ptyId: 'pty',
+            worktreeId,
+            state: 'detached',
+            createdAt: 1,
+            updatedAt: 1
+          }
+        ]
+      },
+      (state, worktreeId) => {
+        state.migrationUnsupportedPtyEntries = [
+          {
+            ptyId: 'pty',
+            worktreeId,
+            reason: 'legacy-numeric-pane-key',
+            source: 'local',
+            updatedAt: 1
+          }
+        ]
+      },
+      (state, worktreeId) => {
+        state.automations = [
+          {
+            enabled: true,
+            workspaceMode: 'existing',
+            workspaceId: worktreeId
+          } as never
+        ]
+      },
+      (state, worktreeId) => {
+        state.automationRuns = [{ status: 'dispatching', workspaceId: worktreeId } as never]
+      }
+    ]
+
+    for (const [index, mutate] of ownerMutations.entries()) {
+      const state = makeState()
+      const worktreeId = `${REPO_ID}::/workspace/owner-${index}`
+      state.worktreeMeta[worktreeId] = makeMeta(worktreeId)
+      const scan = capture(state)
+      mutate(state, worktreeId)
+      expect(pruneCaptured(state, scan, [worktreeId])).toEqual([])
+    }
+  })
+
+  it('preserves canonically equivalent session and top-level owners', () => {
+    const candidateId = `${REPO_ID}::/workspace/Café`.normalize('NFC')
+    const ownerId = candidateId.normalize('NFD')
+    const ownerMutations: ((state: PersistedState) => void)[] = [
+      (state) => {
+        state.workspaceSession.activeWorktreeId = ownerId
+      },
+      (state) => {
+        state.ui.lastActiveWorktreeId = ownerId
+      }
+    ]
+
+    for (const mutate of ownerMutations) {
+      const state = makeState()
+      state.worktreeMeta[candidateId] = makeMeta(candidateId)
+      const scan = capture(state)
+      mutate(state)
+
+      expect(pruneCaptured(state, scan, [candidateId])).toEqual([])
+      expect(state.worktreeMeta[candidateId]).toBeDefined()
+    }
+  })
+
+  it('removes a row on a later pass after its persisted owner is cleared', () => {
+    const state = makeState()
+    const worktreeId = `${REPO_ID}::/workspace/two-phase`
+    state.worktreeMeta[worktreeId] = makeMeta(worktreeId)
+    state.workspaceSession.lastVisitedAtByWorktreeId = { [worktreeId]: 1 }
+    const scan = capture(state)
+
+    expect(pruneCaptured(state, scan, [worktreeId])).toEqual([])
+    delete state.workspaceSession.lastVisitedAtByWorktreeId![worktreeId]
+    expect(pruneCaptured(state, scan, [worktreeId])).toEqual([worktreeId])
+  })
+
+  it('treats dotfile visibility and cleanup dismissals as non-owning preferences', () => {
+    const state = makeState()
+    const worktreeId = `${REPO_ID}::/workspace/non-owning-preferences`
+    state.worktreeMeta[worktreeId] = makeMeta(worktreeId)
+    const showDotfilesByWorktree = { [worktreeId]: true }
+    const workspaceCleanup = {
+      dismissals: {
+        [worktreeId]: {
+          worktreeId,
+          dismissedAt: 1,
+          fingerprint: 'fingerprint',
+          classifierVersion: 1
+        }
+      }
+    }
+    state.ui.showDotfilesByWorktree = showDotfilesByWorktree
+    state.ui.workspaceCleanup = workspaceCleanup
+    const scan = capture(state)
+
+    expect(pruneCaptured(state, scan, [worktreeId])).toEqual([worktreeId])
+    expect(state.ui.showDotfilesByWorktree).toBe(showDotfilesByWorktree)
+    expect(state.ui.workspaceCleanup).toBe(workspaceCleanup)
+  })
+
+  it('preserves foreign aliases, ambiguous local aliases, and divergent projections', () => {
+    const foreignState = makeState()
+    const foreignId = `${REPO_ID}::/workspace/foreign-alias`
+    const localMeta = makeMeta(foreignId)
+    const remoteMeta = { ...localMeta, hostId: 'ssh:builder' as const }
+    foreignState.worktreeMeta[foreignId] = localMeta
+    foreignState.worktreeMetaByIdentity = { local: localMeta, remote: remoteMeta }
+    foreignState.worktreeIdentityAliases = {
+      [`local|${foreignId}`]: ['local'],
+      [`ssh:builder|${foreignId}`]: ['remote']
+    }
+    const foreignScan = capture(foreignState)
+
+    expect(pruneCaptured(foreignState, foreignScan, [foreignId])).toEqual([])
+    expect(foreignState.worktreeMetaByIdentity).toEqual({ local: localMeta, remote: remoteMeta })
+
+    const ambiguousState = makeState()
+    const ambiguousId = `${REPO_ID}::/workspace/ambiguous`
+    const first = makeMeta(ambiguousId)
+    ambiguousState.worktreeMeta[ambiguousId] = first
+    ambiguousState.worktreeMetaByIdentity = { first, second: { ...first } }
+    ambiguousState.worktreeIdentityAliases = { [`local|${ambiguousId}`]: ['first', 'second'] }
+    expect(pruneCaptured(ambiguousState, capture(ambiguousState), [ambiguousId])).toEqual([])
+
+    const divergentState = makeState()
+    const divergentId = `${REPO_ID}::/workspace/divergent`
+    const legacy = makeMeta(divergentId)
+    const canonical = { ...legacy, comment: 'newer canonical comment' }
+    divergentState.worktreeMeta[divergentId] = legacy
+    divergentState.worktreeMetaByIdentity = { canonical }
+    divergentState.worktreeIdentityAliases = { [`local|${divergentId}`]: ['canonical'] }
+    const divergentScan = capture(divergentState)
+    expect(pruneCaptured(divergentState, divergentScan, [divergentId])).toEqual([])
+  })
+
+  it('fails closed for repo replacement, host collisions, remote, runtime, and folder repos', () => {
+    const mutations: ((state: PersistedState) => void)[] = [
+      (state) => {
+        state.repos[0] = makeRepo({ path: '/workspace/replacement' })
+      },
+      (state) => {
+        state.repos.push(makeRepo({ connectionId: 'builder', executionHostId: 'ssh:builder' }))
+      },
+      (state) => {
+        state.repos[0] = makeRepo({ connectionId: 'builder', executionHostId: 'ssh:builder' })
+      },
+      (state) => {
+        state.repos[0] = makeRepo({ executionHostId: 'runtime:environment' })
+      },
+      (state) => {
+        state.repos[0] = makeRepo({ kind: 'folder' })
+      }
+    ]
+    for (const mutate of mutations) {
+      const state = makeState()
+      const worktreeId = `${REPO_ID}::/workspace/stale`
+      state.worktreeMeta[worktreeId] = makeMeta(worktreeId)
+      const scan = capture(state)
+      mutate(state)
+      expect(pruneCaptured(state, scan, [worktreeId])).toEqual([])
+    }
+  })
+
+  it('fails closed when project runtime routing changes away and back during the scan', () => {
+    const state = makeState()
+    const worktreeId = `${REPO_ID}::/workspace/project-routing-race`
+    const project: Project = {
+      id: 'project-1',
+      displayName: 'project',
+      badgeColor: '#000',
+      localWindowsRuntimePreference: { kind: 'windows-host' },
+      sourceRepoIds: [REPO_ID],
+      createdAt: 1,
+      updatedAt: 1
+    }
+    state.projects = [project]
+    state.worktreeMeta[worktreeId] = makeMeta(worktreeId)
+    const scan = capture(state)
+    project.localWindowsRuntimePreference = { kind: 'wsl', distro: 'Ubuntu' }
+    project.updatedAt += 1
+    project.localWindowsRuntimePreference = { kind: 'windows-host' }
+    project.updatedAt += 1
+
+    expect(pruneCaptured(state, scan, [worktreeId])).toEqual([])
+    expect(state.worktreeMeta[worktreeId]).toBeDefined()
+  })
+
+  it('fails closed when global runtime routing changes away and back during the scan', () => {
+    const state = makeState()
+    const worktreeId = `${REPO_ID}::/workspace/settings-routing-race`
+    const originalDefault = state.settings.localWindowsRuntimeDefault
+    state.worktreeMeta[worktreeId] = makeMeta(worktreeId)
+    const scan = capture(state)
+    state.settings = {
+      ...state.settings,
+      localWindowsRuntimeDefault: { kind: 'wsl', distro: 'Ubuntu' }
+    }
+    state.settings = {
+      ...state.settings,
+      localWindowsRuntimeDefault: originalDefault
+    }
+
+    expect(state.settings.localWindowsRuntimeDefault).toEqual(originalDefault)
+    expect(pruneCaptured(state, scan, [worktreeId])).toEqual([])
+    expect(state.worktreeMeta[worktreeId]).toBeDefined()
+  })
+
+  it('rejects malformed, folder-instance, WSL, and non-native Windows candidate paths', () => {
+    const state = makeState()
+    const foreignWindowsId = `${REPO_ID}::C:\\workspace\\stale`
+    const ids = [
+      `${REPO_ID}::relative/path`,
+      `${REPO_ID}::`,
+      `wrong::/workspace/stale`,
+      `${REPO_ID}::/workspace/folder::workspace:11111111-1111-4111-8111-111111111111`,
+      `${REPO_ID}::\\\\wsl.localhost\\Ubuntu\\home\\gone`,
+      `${REPO_ID}::/home/user/wsl-legacy`,
+      foreignWindowsId
+    ]
+    for (const worktreeId of ids) {
+      state.worktreeMeta[worktreeId] = makeMeta(worktreeId)
+    }
+    const scan = capture(state)
+
+    expect(pruneCaptured(state, scan, ids.slice(0, -2))).toEqual([])
+    expect(pruneCaptured(state, scan, [ids.at(-2)!], 'win32')).toEqual([])
+    expect(pruneCaptured(state, scan, [foreignWindowsId], 'linux')).toEqual([])
+  })
+})
diff --git a/src/main/persistence/tracking-repos/missing-local-worktree-metadata-pruning.ts b/src/main/persistence/tracking-repos/missing-local-worktree-metadata-pruning.ts
new file mode 100644
index 00000000000..3ab380bdd8e
--- /dev/null
+++ b/src/main/persistence/tracking-repos/missing-local-worktree-metadata-pruning.ts
@@ -0,0 +1,153 @@
+import { isWindowsAbsolutePathLike } from '../../../shared/cross-platform-path'
+import { getRepoExecutionHostId, LOCAL_EXECUTION_HOST_ID } from '../../../shared/execution-host'
+import type { PersistedState } from '../../../shared/persisted-state-types'
+import { getRepoKind } from '../../../shared/repo-kind'
+import { worktreeWorkspaceKey } from '../../../shared/workspace-scope'
+import { FOLDER_WORKSPACE_INSTANCE_SEPARATOR, splitWorktreeId } from '../../../shared/worktree/id'
+import { isWslUncPath } from '../../../shared/wsl-paths'
+import { isFinalAutomationRunStatus } from '../../../shared/automations-types'
+import { pruneUnreferencedWorktreeIdentityMeta } from '../loading-store/worktree-identity-metadata'
+import {
+  addPersistedSessionWorktreeOwners,
+  createWorktreeOwnerCandidateCollector
+} from '../restoring-sessions/session-worktree-ownership'
+import {
+  indexMetadataAliasesForWorktreeIds,
+  removeRevalidatedLocalWorktreeMetadata,
+  type LocalWorktreeMetadataPruneExpectation,
+  type NativeLocalWorktreeMetadataScanExpectation
+} from './local-worktree-metadata-scan-expectation'
+
+export { captureNativeLocalWorktreeMetadataScanExpectation } from './local-worktree-metadata-scan-expectation'
+export type {
+  LocalWorktreeMetadataPruneExpectation,
+  NativeLocalWorktreeMetadataScanExpectation
+} from './local-worktree-metadata-scan-expectation'
+
+function collectPersistedWorkspaceOwners(
+  state: PersistedState,
+  candidateIds: ReadonlySet<string>,
+  platform: NodeJS.Platform
+): Set<string> {
+  const collector = createWorktreeOwnerCandidateCollector(candidateIds, platform)
+  addPersistedSessionWorktreeOwners(state, collector)
+  const add = collector.addOwner
+  add(state.ui.lastActiveWorktreeId)
+  for (const selections of Object.values(state.mobileClientTabSelectionsByDeviceId ?? {})) {
+    for (const worktreeId of Object.keys(selections)) {
+      add(worktreeId)
+    }
+  }
+  for (const lease of state.sshRemotePtyLeases) {
+    add(lease.worktreeId)
+  }
+  for (const entry of state.migrationUnsupportedPtyEntries) {
+    add(entry.worktreeId)
+  }
+  for (const automation of state.automations) {
+    if (automation.enabled && automation.workspaceMode === 'existing') {
+      add(automation.workspaceId)
+    }
+  }
+  for (const run of state.automationRuns) {
+    if (!isFinalAutomationRunStatus(run.status)) {
+      add(run.workspaceId)
+    }
+  }
+  return collector.owners
+}
+
+function repoStillMatches(
+  state: PersistedState,
+  expected: NativeLocalWorktreeMetadataScanExpectation['repo']
+): boolean {
+  const owners = state.repos.filter((repo) => repo.id === expected.id)
+  const current = owners[0]
+  return Boolean(
+    owners.length === 1 &&
+    current &&
+    current === expected.expectedRepo &&
+    current.path === expected.path &&
+    current.connectionId === expected.connectionId &&
+    current.executionHostId === expected.executionHostId &&
+    getRepoKind(current) === expected.kind &&
+    expected.kind === 'git' &&
+    !current.connectionId &&
+    getRepoExecutionHostId(current) === LOCAL_EXECUTION_HOST_ID
+  )
+}
+
+function routingStillMatches(
+  state: PersistedState,
+  expected: NativeLocalWorktreeMetadataScanExpectation
+): boolean {
+  const currentProject = state.projects.find((project) =>
+    project.sourceRepoIds.includes(expected.repo.id)
+  )
+  return (
+    currentProject === expected.routing.expectedProject &&
+    currentProject?.updatedAt === expected.routing.expectedProjectUpdatedAt &&
+    state.settings === expected.routing.expectedSettings
+  )
+}
+
+function isValidCandidateId(
+  repoId: string,
+  worktreeId: string,
+  platform: NodeJS.Platform
+): boolean {
+  const parsed = splitWorktreeId(worktreeId)
+  return Boolean(
+    parsed?.repoId === repoId &&
+    parsed.worktreePath.length > 0 &&
+    !isWslUncPath(parsed.worktreePath) &&
+    (platform === 'win32'
+      ? isWindowsAbsolutePathLike(parsed.worktreePath)
+      : parsed.worktreePath.startsWith('/')) &&
+    !worktreeId.includes(FOLDER_WORKSPACE_INSTANCE_SEPARATOR)
+  )
+}
+
+export function pruneSessionlessMissingLocalWorktreeMetadataForRepo(
+  state: PersistedState,
+  scan: NativeLocalWorktreeMetadataScanExpectation,
+  missingMetadata: readonly LocalWorktreeMetadataPruneExpectation[],
+  platform = process.platform
+): string[] {
+  if (
+    missingMetadata.length === 0 ||
+    !repoStillMatches(state, scan.repo) ||
+    !routingStillMatches(state, scan)
+  ) {
+    return []
+  }
+
+  const candidateIds = new Set(missingMetadata.map(({ worktreeId }) => worktreeId))
+  const sessionOwners = collectPersistedWorkspaceOwners(state, candidateIds, platform)
+  const aliasesByWorktreeId = indexMetadataAliasesForWorktreeIds(state, candidateIds)
+  const removedIdentityKeys = new Set<string>()
+  const removedIds: string[] = []
+  for (const expectation of missingMetadata) {
+    const { worktreeId } = expectation
+    if (
+      !isValidCandidateId(scan.repo.id, worktreeId, platform) ||
+      sessionOwners.has(worktreeId) ||
+      !removeRevalidatedLocalWorktreeMetadata(
+        state,
+        expectation,
+        aliasesByWorktreeId.get(worktreeId) ?? [],
+        removedIdentityKeys
+      )
+    ) {
+      continue
+    }
+    delete state.worktreeLineageById[worktreeId]
+    delete state.workspaceLineageByChildKey[worktreeWorkspaceKey(worktreeId)]
+    removedIds.push(worktreeId)
+  }
+  if (removedIds.length > 0) {
+    // Why: a global sweep could delete unrelated unaliased rows from another repo or host.
+    pruneUnreferencedWorktreeIdentityMeta(state, removedIdentityKeys)
+  }
+  return removedIds
+}
diff --git a/src/main/persistence/tracking-repos/project-host-operations.ts b/src/main/persistence/tracking-repos/project-host-operations.ts
index c6a8441f58a..605c258f4f7 100644
--- a/src/main/persistence/tracking-repos/project-host-operations.ts
+++ b/src/main/persistence/tracking-repos/project-host-operations.ts
@@ -19,6 +19,7 @@ import { repoGitUsernameCacheKey } from './repo-hydration'
 export type ProjectHostMutationOperations = {
   state: PersistedState
   gitUsernameCache: Map<string, string>
+  bumpLocalWorktreeScanGeneration: (repoId: string) => void
   hydrateRepo: (repo: Repo) => Repo
   updateRepoBackedProjectHostSetup: (
     setup: ProjectHostSetup,
@@ -87,6 +88,9 @@ export class ProjectHostPersistenceOperations {
       return null
     }
     if ('localWindowsRuntimePreference' in updates) {
+      for (const repoId of project.sourceRepoIds) {
+        this.operations.bumpLocalWorktreeScanGeneration(repoId)
+      }
       if (updates.localWindowsRuntimePreference === undefined) {
         delete project.localWindowsRuntimePreference
       } else {
diff --git a/src/main/persistence/tracking-repos/repo-update-operations.ts b/src/main/persistence/tracking-repos/repo-update-operations.ts
index f39e0e1e26f..6ad6f23903b 100644
--- a/src/main/persistence/tracking-repos/repo-update-operations.ts
+++ b/src/main/persistence/tracking-repos/repo-update-operations.ts
@@ -9,6 +9,7 @@ import { sanitizeRepoUpdatesForPersistence } from './repo-sanitization'
 
 export type RepoUpdateMutationOperations = {
   state: PersistedState
+  bumpLocalWorktreeScanGeneration: (repoId: string) => void
   syncProjectHostSetupCompatibilityState: () => void
   scheduleSave: () => void
   hydrateRepo: (repo: Repo) => Repo
@@ -21,6 +22,10 @@ export class RepoUpdatePersistenceOperations {
     return this.operations.state
   }
 
+  private bumpLocalWorktreeScanGeneration(repoId: string): void {
+    this.operations.bumpLocalWorktreeScanGeneration(repoId)
+  }
+
   private syncProjectHostSetupCompatibilityState(): void {
     this.operations.syncProjectHostSetupCompatibilityState()
   }
@@ -177,6 +182,7 @@ export class RepoUpdatePersistenceOperations {
       }
     }
     Object.assign(repo, sanitizedUpdates)
+    this.bumpLocalWorktreeScanGeneration(id)
     this.syncProjectHostSetupCompatibilityState()
     this.scheduleSave()
     return this.hydrateRepo(repo)
diff --git a/src/main/pi/agent-status-extension-source.test.ts b/src/main/pi/agent-status-extension-source.test.ts
index b735cd60198..45534662d55 100644
--- a/src/main/pi/agent-status-extension-source.test.ts
+++ b/src/main/pi/agent-status-extension-source.test.ts
@@ -338,7 +338,7 @@ describe('getPiAgentStatusExtensionSource', () => {
 
       await vi.waitFor(() => expect(harness.fetchMock).toHaveBeenCalledTimes(2))
       const payloads = harness.fetchMock.mock.calls.map(
-        ([_, init]) => JSON.parse(String(init?.body)).payload
+        ([_event, init]) => JSON.parse(String(init?.body)).payload
       )
       expect(payloads).toEqual([
         { hook_event_name: 'session_start' },
@@ -391,7 +391,7 @@ describe('getPiAgentStatusExtensionSource', () => {
 
     await vi.waitFor(() => expect(harness.fetchMock).toHaveBeenCalledTimes(3))
     expect(
-      harness.fetchMock.mock.calls.map(([_, init]) => JSON.parse(String(init?.body)).payload)
+      harness.fetchMock.mock.calls.map(([_event, init]) => JSON.parse(String(init?.body)).payload)
     ).toEqual([
       { hook_event_name: 'agent_start', session_id: 'omp-session-8' },
       {
@@ -855,6 +855,16 @@ describe('getPiAgentStatusExtensionSource', () => {
     await vi.waitFor(() => expect(harness.fetchMock).toHaveBeenCalledTimes(1))
   })
 
+  it('does not report a non-terminal OMP agent_end without an idle context', async () => {
+    const harness = createHarness({ kind: 'omp' })
+
+    await harness.callHook('agent_end', { willContinue: true })
+    expect(harness.fetchMock).not.toHaveBeenCalled()
+
+    await harness.callHook('agent_end')
+    await vi.waitFor(() => expect(harness.fetchMock).toHaveBeenCalledTimes(1))
+  })
+
   it('does not treat WSLENV alone as WSL evidence', async () => {
     const harness = createHarness({
       kind: 'omp',
diff --git a/src/main/pi/agent-status-handler-source.ts b/src/main/pi/agent-status-handler-source.ts
index fa9de9d9bd4..20f3f31929a 100644
--- a/src/main/pi/agent-status-handler-source.ts
+++ b/src/main/pi/agent-status-handler-source.ts
@@ -167,8 +167,12 @@ export function getPiAgentStatusHandlerSourceLines(kind: PiAgentKind): string[]
     '    postAgentEndOnce()',
     '  })',
     '',
-    "  pi.on('agent_end', (_event, ctx) => {",
+    "  pi.on('agent_end', (event, ctx) => {",
     ...captureSessionMetadata,
+    '    if (event?.willContinue === true) {',
+    '      clearPendingAgentEndCheck()',
+    '      return',
+    '    }',
     '    if (agentSettledSupported) return',
     "    if (!ctx || typeof ctx.isIdle !== 'function') {",
     '      postAgentEndOnce()',
diff --git a/src/main/pi/titlebar-extension-source.test.ts b/src/main/pi/titlebar-extension-source.test.ts
new file mode 100644
index 00000000000..bee2e007c57
--- /dev/null
+++ b/src/main/pi/titlebar-extension-source.test.ts
@@ -0,0 +1,250 @@
+import { runInNewContext } from 'node:vm'
+// TypeScript 7 is a native CLI; transpile tests still need the legacy JavaScript API.
+import ts from 'typescript-api'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { getPiTitlebarExtensionSource } from './titlebar-extension-source'
+
+const BRAILLE_RE = /[⠀-⣿]/
+
+type TitlebarContext = {
+  ui: { setTitle: (title: string) => void }
+  isIdle?: () => boolean
+}
+type HookHandler = (event?: unknown, context?: TitlebarContext) => Promise<void> | void
+
+type Harness = {
+  handlers: Record<string, HookHandler>
+  titles: string[]
+  lastTitle: () => string | undefined
+  callHook: (name: string, event?: unknown) => Promise<void>
+}
+
+const CWD = '/repo/orca-app'
+const SESSION = 'omp-session'
+const IDLE_TITLE = `π - ${SESSION} - orca-app`
+
+function createHarness(options: { paneKey?: string; isIdle?: () => boolean } = {}): Harness {
+  const titles: string[] = []
+  const ctx: TitlebarContext = {
+    ui: {
+      setTitle: (title: string) => {
+        titles.push(title)
+      }
+    },
+    isIdle: options.isIdle
+  }
+
+  const module = {
+    exports: {} as {
+      default?: (pi: {
+        on: (name: string, handler: HookHandler) => void
+        getSessionName: () => string
+      }) => void
+    }
+  }
+
+  const context = {
+    module,
+    exports: module.exports,
+    process: {
+      env: { ORCA_PANE_KEY: options.paneKey ?? 'pane-1' },
+      cwd: () => CWD
+    },
+    console: { warn: vi.fn(), error: vi.fn(), log: vi.fn() },
+    Promise,
+    // Why: forward to the test realm's timers so vi.useFakeTimers() drives the VM's interval.
+    setInterval: (...args: Parameters<typeof setInterval>) => setInterval(...args),
+    clearInterval: (timer: ReturnType<typeof setInterval>) => clearInterval(timer),
+    setTimeout: (...args: Parameters<typeof setTimeout>) => setTimeout(...args),
+    clearTimeout: (timer: ReturnType<typeof setTimeout>) => clearTimeout(timer)
+  } as Record<string, unknown>
+  context.globalThis = context
+
+  const output = ts.transpileModule(getPiTitlebarExtensionSource(), {
+    compilerOptions: { module: ts.ModuleKind.CommonJS, target: ts.ScriptTarget.ES2020 }
+  }).outputText
+  runInNewContext(output, context)
+
+  const register = module.exports.default
+  if (!register) {
+    throw new Error('expected default export from generated source')
+  }
+
+  const handlers: Record<string, HookHandler> = {}
+  register({
+    on(name: string, handler: HookHandler) {
+      handlers[name] = handler
+    },
+    getSessionName: () => SESSION
+  })
+
+  return {
+    handlers,
+    titles,
+    lastTitle: () => titles.at(-1),
+    callHook: async (name, event) => {
+      const handler = handlers[name]
+      if (!handler) {
+        throw new Error(`no handler registered for ${name}`)
+      }
+      await handler(event, ctx)
+    }
+  }
+}
+
+describe('getPiTitlebarExtensionSource', () => {
+  beforeEach(() => {
+    vi.useFakeTimers()
+  })
+
+  afterEach(() => {
+    vi.useRealTimers()
+  })
+
+  it('registers nothing outside an Orca pane', () => {
+    expect(createHarness({ paneKey: '' }).handlers).toEqual({})
+  })
+
+  it('stops the spinner when the agent settles', async () => {
+    const harness = createHarness()
+
+    await harness.callHook('agent_start')
+    expect(vi.getTimerCount()).toBe(1)
+
+    await harness.callHook('agent_settled')
+
+    expect(vi.getTimerCount()).toBe(0)
+    expect(harness.lastTitle()).toBe(IDLE_TITLE)
+    expect(harness.lastTitle()).not.toMatch(BRAILLE_RE)
+
+    const titleCountAtSettle = harness.titles.length
+    vi.advanceTimersByTime(800)
+    expect(harness.titles.length).toBe(titleCountAtSettle)
+  })
+
+  it('spins for idle auto-compaction and clears it on completion', async () => {
+    const harness = createHarness()
+
+    await harness.callHook('auto_compaction_start', { reason: 'idle' })
+    expect(vi.getTimerCount()).toBe(1)
+    vi.advanceTimersByTime(80)
+    expect(harness.lastTitle()).toMatch(BRAILLE_RE)
+
+    await harness.callHook('auto_compaction_end', { reason: 'idle' })
+
+    expect(vi.getTimerCount()).toBe(0)
+    expect(harness.lastTitle()).toBe(IDLE_TITLE)
+  })
+
+  it('caps the idle-maintenance spinner when no completion event arrives', async () => {
+    const harness = createHarness()
+
+    await harness.callHook('auto_compaction_start', { reason: 'idle' })
+    // Just past the ~5-minute cap; the guard is checked at the top of the next frame.
+    vi.advanceTimersByTime(301_000)
+
+    expect(vi.getTimerCount()).toBe(0)
+    expect(harness.lastTitle()).toBe(IDLE_TITLE)
+  })
+
+  it('does not cap an agent-owned spinner', async () => {
+    const harness = createHarness()
+
+    await harness.callHook('agent_start')
+    vi.advanceTimersByTime(301_000)
+
+    expect(vi.getTimerCount()).toBe(1)
+    expect(harness.lastTitle()).toMatch(BRAILLE_RE)
+  })
+
+  it('keeps spinning through threshold compaction inside an active run', async () => {
+    const harness = createHarness()
+
+    await harness.callHook('agent_start')
+    await harness.callHook('auto_compaction_start', { reason: 'threshold' })
+    await harness.callHook('auto_compaction_end', { reason: 'threshold' })
+
+    expect(vi.getTimerCount()).toBe(1)
+    vi.advanceTimersByTime(80)
+    expect(harness.lastTitle()).toMatch(BRAILLE_RE)
+  })
+
+  it('does not let an idle compaction adopt an already-running agent spinner', async () => {
+    const harness = createHarness()
+
+    await harness.callHook('agent_start')
+    await harness.callHook('auto_compaction_start', { reason: 'idle' })
+    await harness.callHook('auto_compaction_end', { reason: 'idle' })
+
+    expect(vi.getTimerCount()).toBe(1)
+    vi.advanceTimersByTime(80)
+    expect(harness.lastTitle()).toMatch(BRAILLE_RE)
+  })
+
+  it('does not let a stale idle-compaction completion stop a newer run', async () => {
+    const harness = createHarness()
+
+    await harness.callHook('auto_compaction_start', { reason: 'idle' })
+    await harness.callHook('agent_start')
+    await harness.callHook('auto_compaction_end', { reason: 'idle' })
+
+    expect(vi.getTimerCount()).toBe(1)
+    vi.advanceTimersByTime(80)
+    expect(harness.lastTitle()).toMatch(BRAILLE_RE)
+  })
+
+  it('transfers an idle-compaction spinner to a new run without publishing idle', async () => {
+    const harness = createHarness()
+
+    await harness.callHook('auto_compaction_start', { reason: 'idle' })
+    vi.advanceTimersByTime(80)
+    const titleCountBeforeTransfer = harness.titles.length
+
+    await harness.callHook('agent_start')
+
+    const transferTitles = harness.titles.slice(titleCountBeforeTransfer)
+    expect(transferTitles).not.toContain(IDLE_TITLE)
+    expect(transferTitles).toHaveLength(1)
+    expect(transferTitles[0]).toMatch(BRAILLE_RE)
+  })
+
+  it('keeps spinning across a non-terminal OMP agent_end', async () => {
+    const harness = createHarness()
+
+    await harness.callHook('agent_start')
+    await harness.callHook('agent_end', { willContinue: true })
+
+    expect(vi.getTimerCount()).toBe(1)
+    expect(harness.lastTitle()).toMatch(BRAILLE_RE)
+  })
+
+  it('waits for modern runtimes to become idle after agent_end', async () => {
+    let idle = false
+    const harness = createHarness({ isIdle: () => idle })
+
+    await harness.callHook('agent_start')
+    await harness.callHook('agent_end')
+    await vi.advanceTimersByTimeAsync(100)
+    expect(harness.lastTitle()).toMatch(BRAILLE_RE)
+
+    idle = true
+    await vi.advanceTimersByTimeAsync(200)
+    expect(vi.getTimerCount()).toBe(0)
+    expect(harness.lastTitle()).toBe(IDLE_TITLE)
+  })
+
+  it('still stops on legacy agent_end and on session shutdown', async () => {
+    const harness = createHarness()
+
+    await harness.callHook('agent_start')
+    await harness.callHook('agent_end')
+    expect(vi.getTimerCount()).toBe(0)
+    expect(harness.lastTitle()).toBe(IDLE_TITLE)
+
+    await harness.callHook('agent_start')
+    await harness.callHook('session_shutdown')
+    expect(vi.getTimerCount()).toBe(0)
+    expect(harness.lastTitle()).toBe(IDLE_TITLE)
+  })
+})
diff --git a/src/main/pi/titlebar-extension-source.ts b/src/main/pi/titlebar-extension-source.ts
index 6070d35a54a..a41eafb896f 100644
--- a/src/main/pi/titlebar-extension-source.ts
+++ b/src/main/pi/titlebar-extension-source.ts
@@ -15,6 +15,13 @@ export function getPiTitlebarExtensionSource(): string {
     "  '\\u280f'",
     ']',
     '',
+    'const FRAME_INTERVAL_MS = 80',
+    'const AGENT_END_IDLE_RECHECK_MS = 25',
+    'const AGENT_END_IDLE_RECHECK_MAX_MS = 250',
+    '// Why: a failed idle compaction can end without auto_compaction_end, and no agent turn will',
+    '// close a maintenance spinner — cap it so idle maintenance cannot strand a working title.',
+    'const IDLE_COMPACTION_MAX_FRAMES = Math.ceil(300000 / FRAME_INTERVAL_MS)',
+    '',
     'function getBaseTitle(pi) {',
     '  const cwd = process.cwd().split(/[\\\\/]/).filter(Boolean).at(-1) || process.cwd()',
     '  const session = pi.getSessionName()',
@@ -25,33 +32,112 @@ export function getPiTitlebarExtensionSource(): string {
     '  if (!process.env.ORCA_PANE_KEY) return',
     '  let timer = null',
     '  let frameIndex = 0',
+    '  // Why: only idle maintenance owns a spinner of its own. A threshold compaction runs',
+    '  // inside an agent turn, whose spinner must outlive it, and any newer start clears the',
+    '  // marker so a late idle completion cannot stop current work (#16470).',
+    '  let idleCompactionOwnsSpinner = false',
+    '  let pendingAgentEndCheck = null',
+    '  let pendingAgentEndContext = null',
+    '  let agentEndIdleRecheckMs = AGENT_END_IDLE_RECHECK_MS',
     '',
-    '  function stopAnimation(ctx) {',
+    '  function clearPendingAgentEndCheck() {',
+    '    if (pendingAgentEndCheck !== null) clearTimeout(pendingAgentEndCheck)',
+    '    pendingAgentEndCheck = null',
+    '    pendingAgentEndContext = null',
+    '  }',
+    '',
+    '  function clearAnimation() {',
     '    if (timer) {',
     '      clearInterval(timer)',
     '      timer = null',
     '    }',
     '    frameIndex = 0',
+    '    idleCompactionOwnsSpinner = false',
+    '  }',
+    '',
+    '  function stopAnimation(ctx) {',
+    '    clearPendingAgentEndCheck()',
+    '    clearAnimation()',
     '    ctx.ui.setTitle(getBaseTitle(pi))',
     '  }',
     '',
-    '  function startAnimation(ctx) {',
-    '    stopAnimation(ctx)',
-    '    timer = setInterval(() => {',
+    '  function renderFrame(ctx) {',
+    '    if (idleCompactionOwnsSpinner && frameIndex >= IDLE_COMPACTION_MAX_FRAMES) {',
+    '      stopAnimation(ctx)',
+    '      return',
+    '    }',
     '      const frame = BRAILLE_FRAMES[frameIndex % BRAILLE_FRAMES.length]',
     '      const cwd = process.cwd().split(/[\\\\/]/).filter(Boolean).at(-1) || process.cwd()',
     '      const session = pi.getSessionName()',
     '      const title = session ? `${frame} \\u03c0 - ${session} - ${cwd}` : `${frame} \\u03c0 - ${cwd}`',
     '      ctx.ui.setTitle(title)',
     '      frameIndex++',
-    '    }, 80)',
+    '  }',
+    '',
+    '  function startAnimation(ctx) {',
+    '    clearPendingAgentEndCheck()',
+    '    clearAnimation()',
+    '    renderFrame(ctx)',
+    '    timer = setInterval(() => renderFrame(ctx), FRAME_INTERVAL_MS)',
+    '  }',
+    '',
+    '  function checkPendingAgentEnd() {',
+    '    pendingAgentEndCheck = null',
+    '    const ctx = pendingAgentEndContext',
+    '    if (!ctx) return',
+    '    try {',
+    '      if (ctx.isIdle()) {',
+    '        pendingAgentEndContext = null',
+    '        stopAnimation(ctx)',
+    '        return',
+    '      }',
+    '    } catch {',
+    '      pendingAgentEndContext = null',
+    '      return',
+    '    }',
+    '    pendingAgentEndCheck = setTimeout(checkPendingAgentEnd, agentEndIdleRecheckMs)',
+    "    if (typeof pendingAgentEndCheck.unref === 'function') pendingAgentEndCheck.unref()",
+    '    agentEndIdleRecheckMs = Math.min(agentEndIdleRecheckMs * 2, AGENT_END_IDLE_RECHECK_MAX_MS)',
     '  }',
     '',
     "  pi.on('agent_start', async (_event, ctx) => {",
     '    startAnimation(ctx)',
     '  })',
     '',
-    "  pi.on('agent_end', async (_event, ctx) => {",
+    '  // Why: modern Pi/OMP emit agent_end mid-run and only settle later, so settlement is the',
+    '  // authoritative completion boundary. Legacy runtimes never emit it, so agent_end stays.',
+    "  pi.on('agent_settled', async (_event, ctx) => {",
+    '    stopAnimation(ctx)',
+    '  })',
+    '',
+    "  pi.on('agent_end', async (event, ctx) => {",
+    '    if (event?.willContinue === true) {',
+    '      clearPendingAgentEndCheck()',
+    '      return',
+    '    }',
+    "    if (!ctx || typeof ctx.isIdle !== 'function') {",
+    '      stopAnimation(ctx)',
+    '      return',
+    '    }',
+    '    clearPendingAgentEndCheck()',
+    '    agentEndIdleRecheckMs = AGENT_END_IDLE_RECHECK_MS',
+    '    pendingAgentEndContext = ctx',
+    '    pendingAgentEndCheck = setTimeout(checkPendingAgentEnd, 0)',
+    "    if (typeof pendingAgentEndCheck.unref === 'function') pendingAgentEndCheck.unref()",
+    '  })',
+    '',
+    "  pi.on('auto_compaction_start', async (event, ctx) => {",
+    "    if (event?.reason !== 'idle') return",
+    '    // Why: the idle worker can fire against a turn that just started, and reason alone does',
+    '    // not prove the pane is idle. Adopting a live agent spinner would let the matching',
+    '    // auto_compaction_end mark the pane idle mid-run — the inverse of #16470.',
+    '    if (timer && !idleCompactionOwnsSpinner) return',
+    '    startAnimation(ctx)',
+    '    idleCompactionOwnsSpinner = true',
+    '  })',
+    '',
+    "  pi.on('auto_compaction_end', async (_event, ctx) => {",
+    '    if (!idleCompactionOwnsSpinner) return',
     '    stopAnimation(ctx)',
     '  })',
     '',
diff --git a/src/main/providers/local-pty-finalize-environment.ts b/src/main/providers/local-pty-finalize-environment.ts
new file mode 100644
index 00000000000..f77959ce671
--- /dev/null
+++ b/src/main/providers/local-pty-finalize-environment.ts
@@ -0,0 +1,123 @@
+import { win32 as pathWin32 } from 'node:path'
+import { shouldUseShellReadyStartupDelivery } from '../../shared/codex-startup-delivery'
+import { expandWindowsPathEnvironmentVariables } from '../../shared/windows-environment-expansion'
+import { dropInheritedOrcaFishHistory } from '../fish-history-session'
+import { dropIncoherentCondaActivationEnv } from '../pty/conda-activation-env'
+import { stripLegacyTerminalShimEnv } from '../pty/legacy-terminal-shim-dir'
+import {
+  POWERLEVEL10K_WIZARD_DISABLE_ENV,
+  seedPowerlevel10kWizardEnv
+} from '../pty/powerlevel10k-wizard-env'
+import { resolvePathEnvKey } from '../pty/windows-environment-path'
+import { selectShellStartupFeatures } from '../shell-startup-features'
+import {
+  injectHistoryEnv,
+  injectWslFishHistoryEnv,
+  logHistoryInjection,
+  type HistoryInjectionResult
+} from '../terminal-history'
+import { addWslEnvKeys } from '../wsl-env'
+import { dropInheritedOrcaHistFile } from '../worktree-history-file-path'
+import { promoteAgentTeamsShimPath } from './local-pty-launch-helpers'
+import type { LocalPtyLaunchPlan } from './local-pty-launch-plan'
+import type { LocalPtyProviderOptions } from './local-pty-provider-types'
+import { getShellLaunchConfig } from './local-pty-shell-ready'
+import { finalizeWindowsLocalPtySpawnEnvironment } from './local-pty-windows-spawn-environment'
+import type { PtySpawnOptions } from './types'
+
+export function finalizeLocalPtySpawnEnvironment(args: {
+  spawn: PtySpawnOptions
+  getOptions: () => LocalPtyProviderOptions
+  plan: LocalPtyLaunchPlan
+  env: Record<string, string>
+}): HistoryInjectionResult | null {
+  const { spawn, getOptions, plan, env } = args
+  if (process.platform === 'win32') {
+    finalizeWindowsLocalPtySpawnEnvironment({ spawn, plan, env })
+  }
+  seedPowerlevel10kWizardEnv(env, { envToDelete: spawn.envToDelete })
+  if (
+    env[POWERLEVEL10K_WIZARD_DISABLE_ENV] !== undefined &&
+    process.platform === 'win32' &&
+    pathWin32.basename(plan.shellPath).toLowerCase() === 'wsl.exe'
+  ) {
+    addWslEnvKeys(env, [POWERLEVEL10K_WIZARD_DISABLE_ENV])
+  }
+  const requestedEnv = spawn.env
+  expandWindowsPathEnvironmentVariables(env)
+  promoteAgentTeamsShimPath(
+    env,
+    requestedEnv ? requestedEnv[resolvePathEnvKey(requestedEnv, process.platform)] : undefined
+  )
+  // Why: raw requested PATH promotion runs after the host-env scrub.
+  stripLegacyTerminalShimEnv(env, process.platform)
+  // Why after every deletion pass: an envToDelete of CONDA_PREFIX must not leave the sentinel behind.
+  dropIncoherentCondaActivationEnv(env, process.platform)
+
+  // Why: worktree-scoped HISTFILE — without it worktrees share one global history (terminal-history-scope-design §7–§10).
+  const worktreeId = spawn.worktreeId
+  const historyEnabled = worktreeId && (getOptions().isHistoryEnabled?.() ?? true)
+  // Effective shell for history injection: WSL's outer exe is wsl.exe but the inner login shell is bash.
+  const isWslTerminal =
+    Boolean(plan.wslInfo || plan.worktreeWslContext || plan.preferredWslContext) ||
+    pathWin32.basename(plan.shellPath).toLowerCase() === 'wsl.exe'
+  const effectiveShellPath = isWslTerminal ? 'bash' : plan.shellPath
+  let historyResult: ReturnType<typeof injectHistoryEnv> | null = null
+  if (historyEnabled) {
+    historyResult = injectHistoryEnv(env, worktreeId, effectiveShellPath, plan.cwd, {
+      wslDistro: plan.launchWslDistro
+    })
+    if (isWslTerminal && plan.launchWslDistro) {
+      injectWslFishHistoryEnv(env, worktreeId, plan.launchWslDistro)
+      addWslEnvKeys(env, ['HISTFILE', 'fish_history'])
+    }
+    logHistoryInjection(worktreeId, historyResult)
+  } else {
+    // Why: injectHistoryEnv is what normally clears it, so when history is off
+    // an inherited ORCA_HISTFILE would still reach the wrapper. Credit: #11146.
+    delete env.ORCA_HISTFILE
+    // Same for an exported `fish_history` from the fish pane that launched this
+    // Orca: history off means fish's own default, not another worktree's file.
+    dropInheritedOrcaFishHistory(env)
+    // And for an exported HISTFILE: history off means the shell's own default,
+    // not the history file of the worktree this Orca was launched from.
+    dropInheritedOrcaHistFile(env)
+  }
+
+  if (!plan.wslInfo && process.platform !== 'win32') {
+    // Why after history injection: the wrapper is what repairs a worktree
+    // HISTFILE that the system zshrc clobbers, so the decision to wrap has to
+    // see whether this spawn actually injected one.
+    const isCodexStartupCommand = plan.startupAgentRecognition?.agent === 'codex'
+    // Why: payload-bearing Codex startup can be lost to rc-file noise; plain Codex stays markerless for startup speed.
+    const waitsForShellReady =
+      Boolean(spawn.command) &&
+      (!isCodexStartupCommand ||
+        shouldUseShellReadyStartupDelivery({
+          command: spawn.command as string,
+          startupCommandDelivery: spawn.startupCommandDelivery
+        }))
+    // Why delete: ORCA_SHELL_FEATURES is Orca-owned, and only the launch
+    // config below may name features for this shell.
+    delete env.ORCA_SHELL_FEATURES
+    plan.getFallbackShellReadyConfig = (shell) =>
+      getShellLaunchConfig(
+        shell,
+        selectShellStartupFeatures({
+          shellPath: shell,
+          env,
+          hasStartupCommand: Boolean(spawn.command),
+          waitsForShellReady,
+          // Why identical: the identity marker exists so the readiness
+          // handshake can bind output to the right shell PID.
+          emitsStartupIdentity: waitsForShellReady
+        })
+      )
+    const shellLaunch = plan.getFallbackShellReadyConfig(plan.shellPath)
+    Object.assign(env, shellLaunch.env)
+    plan.shellArgs = shellLaunch.args ?? plan.shellArgs
+    plan.shellReadyLaunch = spawn.command ? shellLaunch : null
+    plan.primaryLaunchEnvKeys = Object.keys(shellLaunch.env)
+  }
+  return historyResult
+}
diff --git a/src/main/providers/local-pty-foreground-inspection.ts b/src/main/providers/local-pty-foreground-inspection.ts
new file mode 100644
index 00000000000..643a15f3d47
--- /dev/null
+++ b/src/main/providers/local-pty-foreground-inspection.ts
@@ -0,0 +1,247 @@
+import { recognizeAgentProcessFromCommandLine } from '../../shared/agent-process-recognition'
+import {
+  confirmShellForegroundProcess,
+  resolveAgentForegroundProcessWithAvailability
+} from './agent-foreground-process'
+import { resolveForegroundFallbackProcess } from './local-pty-launch-helpers'
+import {
+  ptyAgentForegroundContextPaths,
+  ptyLastRecognizedForeground,
+  ptyProcesses,
+  ptyShellName
+} from './local-pty-provider-state'
+import type { LocalForegroundObservation } from './local-pty-process-evidence'
+import { resolveStableForegroundProcess } from './stable-foreground-process'
+import {
+  canRevalidateCachedAgentWithoutScan,
+  judgeCachedAgentJobEvidence
+} from './windows-cached-agent-revalidation'
+import { readWindowsConsoleAttachedProcessIds } from './windows-console-attached-processes'
+import { isWindowsPtyJobReadable, readWindowsPtyJobProcessIds } from './windows-pty-job-membership'
+
+export async function hasLocalPtyChildProcesses(id: string): Promise<boolean> {
+  const proc = ptyProcesses.get(id)
+  if (!proc) {
+    return false
+  }
+  try {
+    const foreground = proc.process
+    const shell = ptyShellName.get(id)
+    if (!shell) {
+      return true
+    }
+    return foreground !== shell
+  } catch {
+    return false
+  }
+}
+
+/** The legacy collapse every existing caller sees: the observed name, or the
+ *  stable-cache fallback a degraded read falls back to. Callers that need to
+ *  tell those apart read the evidence via `observeLocalPtyForegroundProcess`. */
+export async function getLocalPtyForegroundProcess(id: string): Promise<string | null> {
+  return (await observeLocalPtyForegroundProcess(id)).processName
+}
+
+/** The foreground read plus the evidence verdict behind it. `processName`
+ *  keeps the exact legacy collapse; only the evidence distinguishes a read
+ *  that observed something from one that could not ask. */
+export async function observeLocalPtyForegroundProcess(
+  id: string
+): Promise<LocalForegroundObservation> {
+  const proc = ptyProcesses.get(id)
+  if (!proc) {
+    ptyLastRecognizedForeground.delete(id)
+    // The provider owns this table; a missing entry is a reaped PTY, not a
+    // failed probe.
+    return { processName: null, evidence: { verdict: 'observed', processName: null } }
+  }
+  const fallbackProcess = resolveForegroundFallbackProcess(
+    proc.process || null,
+    ptyShellName.get(id)
+  )
+  const cachedEntry = ptyLastRecognizedForeground.get(id)
+  const cachedAgent = cachedEntry?.name ?? null
+  let paneMembershipUnavailable = false
+  let cachedAgentAliveInJob = false
+  // Why: job membership preserves a live cached agent without the whole-table
+  // scan (incomplete under Windows load). Job, not console: this asks "is
+  // anything besides the shell alive?", which needs no console attachment and
+  // so needs no forked helper (#10857).
+  if (
+    process.platform === 'win32' &&
+    canRevalidateCachedAgentWithoutScan(cachedAgent, fallbackProcess)
+  ) {
+    try {
+      const paneProcessIds = readWindowsPtyJobProcessIds(proc)
+      if (ptyProcesses.get(id) !== proc) {
+        return {
+          processName: null,
+          evidence: { verdict: 'unverifiable', reason: 'pty replaced during inspection' }
+        }
+      }
+      const verdict = judgeCachedAgentJobEvidence({
+        jobProcessIds: paneProcessIds,
+        jobSupported: isWindowsPtyJobReadable(),
+        shellPid: proc.pid,
+        anchorProcessId: cachedEntry?.pid ?? null,
+        identityAgeMs: Date.now() - (cachedEntry?.at ?? 0)
+      })
+      if (verdict === 'confirmed' || verdict === 'unproven') {
+        // Both rest on a successful, complete job read that saw a live
+        // member: a positive observation, unlike the degraded reads below.
+        return {
+          processName: cachedAgent,
+          evidence: { verdict: 'observed', processName: cachedAgent }
+        }
+      }
+      if (verdict === 'exited') {
+        // The shell stands alone in a complete, inescapable job list: no
+        // successor is possible, so the identity retires before the scan.
+        ptyLastRecognizedForeground.delete(id)
+      } else if (verdict === 'anchor-exited' && cachedEntry) {
+        // The recognized process died but another member remains -- a
+        // leftover, or a restarted successor. Keep the name as unanchored,
+        // age-bounded evidence and let this cycle's scan decide: deleting
+        // here made a degraded scan read a mid-restart agent as an exit.
+        ptyLastRecognizedForeground.set(id, { ...cachedEntry, pid: null })
+      }
+      cachedAgentAliveInJob = verdict === 'recheck'
+      paneMembershipUnavailable = verdict === 'unavailable'
+    } catch {
+      paneMembershipUnavailable = true
+    }
+  }
+  try {
+    const resolution = await resolveAgentForegroundProcessWithAvailability(
+      proc.pid,
+      fallbackProcess,
+      {
+        contextPaths: ptyAgentForegroundContextPaths.get(id),
+        ...(cachedEntry?.pid != null
+          ? { anchorProcessId: cachedEntry.pid, anchorProcessName: cachedEntry.name }
+          : {})
+      }
+    )
+    // Why: the scan can outlive PTY teardown/id reuse; stale results must not resurrect cache for a foreign id.
+    if (ptyProcesses.get(id) !== proc) {
+      return {
+        processName: null,
+        evidence: { verdict: 'unverifiable', reason: 'pty replaced during inspection' }
+      }
+    }
+    // Why: a degraded scan reporting shell-as-foreground fires a false "agent done"; keep last recognized agent instead.
+    const lastRecognizedAgent = ptyLastRecognizedForeground.get(id)?.name ?? null
+    const resolvedAgent = resolution.processName
+      ? recognizeAgentProcessFromCommandLine(resolution.processName)
+      : null
+    // A recycled anchor pid keeps job membership truthful but the identity
+    // dead; the scan proving the pid now runs a non-agent settles it.
+    const anchorContradicted = resolution.anchorPidForeign === true
+    // Why: incomplete snapshot + unavailable job read isn't exit proof; and an
+    // anchor pid still alive in the job outranks a snapshot that lost its row.
+    const stableResolution =
+      (paneMembershipUnavailable || cachedAgentAliveInJob) &&
+      !anchorContradicted &&
+      resolvedAgent === null
+        ? { ...resolution, available: false }
+        : resolution
+    const stable = resolveStableForegroundProcess(stableResolution, lastRecognizedAgent)
+    if (stable.lastRecognizedAgent && stableResolution.available) {
+      // Only a positive recognition restarts the age bound.
+      ptyLastRecognizedForeground.set(id, {
+        name: stable.lastRecognizedAgent,
+        pid:
+          stable.lastRecognizedAgent === resolution.processName
+            ? (resolution.processId ?? null)
+            : null,
+        at: Date.now()
+      })
+    } else if (stable.lastRecognizedAgent && cachedAgentAliveInJob && !anchorContradicted) {
+      // The anchor pid in the job is proof of life; restamp so the
+      // short-circuit resumes instead of scanning on every call.
+      const entry = ptyLastRecognizedForeground.get(id)
+      if (entry) {
+        ptyLastRecognizedForeground.set(id, { ...entry, at: Date.now() })
+      }
+    } else if (!stable.lastRecognizedAgent) {
+      ptyLastRecognizedForeground.delete(id)
+    }
+    if (!stableResolution.available) {
+      // Legacy callers still get the stable-cache fallback; the evidence
+      // says "could not ask" so a degraded read is never exit evidence.
+      return {
+        processName: stable.processName,
+        evidence: {
+          verdict: 'unverifiable',
+          reason: paneMembershipUnavailable
+            ? 'pane membership read unavailable'
+            : 'process table scan degraded'
+        }
+      }
+    }
+    return {
+      processName: stable.processName,
+      evidence: { verdict: 'observed', processName: stable.processName }
+    }
+  } catch {
+    if (ptyProcesses.get(id) !== proc) {
+      return {
+        processName: null,
+        evidence: { verdict: 'unverifiable', reason: 'pty replaced during inspection' }
+      }
+    }
+    // Why: an inspection error is a degraded read; the legacy name keeps the
+    // stable-cache fallback, the evidence keeps it from reading as an exit.
+    return {
+      processName: ptyLastRecognizedForeground.get(id)?.name ?? null,
+      evidence: { verdict: 'unverifiable', reason: 'foreground inspection threw' }
+    }
+  }
+}
+
+export async function confirmLocalPtyForegroundProcess(id: string): Promise<string | null> {
+  const proc = ptyProcesses.get(id)
+  if (!proc) {
+    return null
+  }
+  try {
+    const resolution = await resolveAgentForegroundProcessWithAvailability(
+      proc.pid,
+      resolveForegroundFallbackProcess(proc.process || null, ptyShellName.get(id)),
+      {
+        contextPaths: ptyAgentForegroundContextPaths.get(id),
+        fresh: true,
+        ...(process.platform === 'win32'
+          ? {
+              forceProcessScan: true,
+              readWindowsConsoleAttachedProcessIds: () =>
+                readWindowsConsoleAttachedProcessIds(proc.pid)
+            }
+          : {})
+      }
+    )
+    // Why: a fresh scan can outlive this PTY id; never publish identity from an exited or same-id-reusing session.
+    if (ptyProcesses.get(id) !== proc) {
+      return null
+    }
+    return resolution.available ? resolution.processName : null
+  } catch {
+    return null
+  }
+}
+
+export async function confirmLocalPtyShellForeground(id: string): Promise<boolean> {
+  const proc = ptyProcesses.get(id)
+  if (!proc) {
+    return false
+  }
+  const confirmed = await confirmShellForegroundProcess(
+    proc.pid,
+    ptyShellName.get(id),
+    process.platform === 'win32'
+      ? { readWindowsPtyJobProcessIds: () => readWindowsPtyJobProcessIds(proc) }
+      : {}
+  )
+  return ptyProcesses.get(id) === proc && confirmed
+}
diff --git a/src/main/providers/local-pty-launch-plan.ts b/src/main/providers/local-pty-launch-plan.ts
new file mode 100644
index 00000000000..199459dc0b8
--- /dev/null
+++ b/src/main/providers/local-pty-launch-plan.ts
@@ -0,0 +1,247 @@
+import { win32 as pathWin32 } from 'node:path'
+import { recognizeAgentProcessFromCommandLine } from '../../shared/agent-process-recognition'
+import { WINDOWS_GIT_BASH_SHELL } from '../../shared/windows-terminal-shell'
+import { resolveWindowsGitBashShellPath } from '../git-bash'
+import { getDefaultWslDistro, parseWslPath } from '../wsl'
+import {
+  getDefaultCwd,
+  getWslContextFromPreferredDistro,
+  getWslContextFromWorktreeId
+} from './local-pty-launch-helpers'
+import type { LocalPtyProviderOptions } from './local-pty-provider-types'
+import type { getShellLaunchConfig } from './local-pty-shell-ready'
+import { ensureNodePtySpawnHelperExecutable, validateWorkingDirectory } from './local-pty-utils'
+import {
+  resolveEffectiveWindowsPowerShell,
+  shouldProbeWindowsPowerShellAvailability,
+  type WindowsPowerShellShellFamily
+} from './windows-powershell'
+import { buildWindowsPowerShellSpawnAttempts } from './windows-shell-fallback-chain'
+import { resolveWindowsShellLaunchArgs } from './windows-shell-args'
+import { assertSafeAgentStartupCwd } from './pty-default-cwd'
+import type { PtySpawnOptions } from './types'
+
+type WslLaunchContext = { distro: string; treatPosixCwdAsWsl: true }
+type LocalPtyLaunchSeed = {
+  args: PtySpawnOptions
+  startupAgentRecognition: ReturnType<typeof recognizeAgentProcessFromCommandLine>
+  defaultCwd: string
+  cwd: string
+  wslInfo: ReturnType<typeof parseWslPath>
+  worktreeWslContext: WslLaunchContext | undefined
+  preferredWslContext: WslLaunchContext | undefined
+  launchWslContext: WslLaunchContext | undefined
+}
+
+export type LocalPtyLaunchPlan = {
+  startupAgentRecognition: ReturnType<typeof recognizeAgentProcessFromCommandLine>
+  defaultCwd: string
+  cwd: string
+  wslInfo: ReturnType<typeof parseWslPath>
+  worktreeWslContext: WslLaunchContext | undefined
+  preferredWslContext: WslLaunchContext | undefined
+  launchWslContext: WslLaunchContext | undefined
+  shellPath: string
+  shellArgs: string[]
+  effectiveCwd: string
+  validationCwd: string
+  startupCommandDeliveredInShellArgs: boolean
+  windowsFallbackAttempts: ReturnType<typeof buildWindowsPowerShellSpawnAttempts>
+  shellReadyLaunch: ReturnType<typeof getShellLaunchConfig> | null
+  getFallbackShellReadyConfig:
+    | ((shell: string) => ReturnType<typeof getShellLaunchConfig>)
+    | undefined
+  // Why hoisted: a fallback shell must drop the primary's launch env, and
+  // re-deriving the key names would re-run wrapper generation.
+  primaryLaunchEnvKeys: string[]
+  isWslShell: boolean
+  launchWslDistro: string | null
+}
+
+export class DeferredLocalPtyLaunchPlan {
+  constructor(
+    readonly availability: boolean | Promise<boolean>,
+    readonly finish: (available: boolean) => LocalPtyLaunchPlan
+  ) {}
+}
+
+function finalizeLocalPtyLaunchPlan(
+  seed: LocalPtyLaunchSeed,
+  shell: {
+    shellPath: string
+    shellArgs: string[]
+    effectiveCwd: string
+    validationCwd: string
+    startupCommandDeliveredInShellArgs?: boolean
+    windowsFallbackAttempts?: ReturnType<typeof buildWindowsPowerShellSpawnAttempts>
+  }
+): LocalPtyLaunchPlan {
+  ensureNodePtySpawnHelperExecutable()
+  if (seed.args.prevalidatedCwd !== shell.validationCwd) {
+    validateWorkingDirectory(shell.validationCwd)
+  }
+  const isWslShell =
+    Boolean(seed.wslInfo) || pathWin32.basename(shell.shellPath).toLowerCase() === 'wsl.exe'
+  return {
+    startupAgentRecognition: seed.startupAgentRecognition,
+    defaultCwd: seed.defaultCwd,
+    cwd: seed.cwd,
+    wslInfo: seed.wslInfo,
+    worktreeWslContext: seed.worktreeWslContext,
+    preferredWslContext: seed.preferredWslContext,
+    launchWslContext: seed.launchWslContext,
+    shellPath: shell.shellPath,
+    shellArgs: shell.shellArgs,
+    effectiveCwd: shell.effectiveCwd,
+    validationCwd: shell.validationCwd,
+    startupCommandDeliveredInShellArgs: shell.startupCommandDeliveredInShellArgs ?? false,
+    windowsFallbackAttempts: shell.windowsFallbackAttempts ?? [],
+    shellReadyLaunch: null,
+    getFallbackShellReadyConfig: undefined,
+    primaryLaunchEnvKeys: [],
+    isWslShell,
+    launchWslDistro: isWslShell ? (seed.launchWslContext?.distro ?? null) : null
+  }
+}
+
+function createWindowsLocalPtyLaunchPlan(
+  seed: LocalPtyLaunchSeed,
+  getOptions: () => LocalPtyProviderOptions
+): LocalPtyLaunchPlan | DeferredLocalPtyLaunchPlan {
+  const { args, cwd, defaultCwd, worktreeWslContext } = seed
+  // Why: shellOverride opens one tab in a non-default shell without changing the user's setting; it wins over the setting.
+  const requestedShellFamily =
+    args.shellOverride ||
+    getOptions().getWindowsShell?.() ||
+    process.env.COMSPEC ||
+    'powershell.exe'
+  const shellFamily = worktreeWslContext ? 'wsl.exe' : requestedShellFamily
+  if (!seed.launchWslContext && pathWin32.basename(shellFamily).toLowerCase() === 'wsl.exe') {
+    seed.launchWslContext = getWslContextFromPreferredDistro(getDefaultWslDistro())
+  }
+  const normalizedShellFamily = pathWin32.basename(shellFamily).toLowerCase()
+  const resolvedGitBashPath = resolveWindowsGitBashShellPath(shellFamily)
+  // Why: normalize setting-value and path forms to the PowerShell family so the resolver can fall back to inbox powershell.exe.
+  const powerShellImplementation = getOptions().getWindowsPowerShellImplementation?.()
+  const resolvedShellFamily: WindowsPowerShellShellFamily =
+    normalizedShellFamily === 'powershell.exe' || normalizedShellFamily === 'pwsh.exe'
+      ? normalizedShellFamily
+      : normalizedShellFamily === 'cmd.exe' || normalizedShellFamily === 'wsl.exe'
+        ? normalizedShellFamily
+        : undefined
+  const shouldProbePwsh = shouldProbeWindowsPowerShellAvailability({
+    shellFamily: resolvedShellFamily,
+    implementation: powerShellImplementation
+  })
+  const shouldResolvePowerShellFamily =
+    powerShellImplementation !== undefined || pathWin32.basename(shellFamily) === shellFamily
+  const finish = (pwshAvailable: boolean): LocalPtyLaunchPlan => {
+    let shellPath: string
+    if (resolvedGitBashPath) {
+      shellPath = resolvedGitBashPath
+    } else if (shellFamily === WINDOWS_GIT_BASH_SHELL) {
+      shellPath = 'powershell.exe'
+    } else {
+      shellPath = shouldResolvePowerShellFamily
+        ? (resolveEffectiveWindowsPowerShell({
+            shellFamily: resolvedShellFamily,
+            implementation: powerShellImplementation,
+            pwshAvailable
+          }) ?? shellFamily)
+        : shellFamily
+    }
+    // Why: bare `pwsh.exe` resolves to the Store App Execution Alias stub whose spawn fails (code 5); use an absolute exe + cmd.exe fallback.
+    const windowsFallbackAttempts = buildWindowsPowerShellSpawnAttempts({
+      shellPath,
+      cwd,
+      defaultCwd,
+      wslContext: seed.launchWslContext,
+      startupCommand: args.command
+    })
+    const primaryAttempt = windowsFallbackAttempts[0]
+    if (primaryAttempt) {
+      return finalizeLocalPtyLaunchPlan(seed, {
+        shellPath: primaryAttempt.shellPath,
+        shellArgs: primaryAttempt.shellArgs,
+        effectiveCwd: primaryAttempt.effectiveCwd,
+        validationCwd: primaryAttempt.validationCwd,
+        startupCommandDeliveredInShellArgs: primaryAttempt.startupCommandDeliveredInShellArgs,
+        windowsFallbackAttempts
+      })
+    }
+    const resolved = resolveWindowsShellLaunchArgs(
+      shellPath,
+      cwd,
+      defaultCwd,
+      seed.launchWslContext,
+      args.command
+    )
+    return finalizeLocalPtyLaunchPlan(seed, {
+      shellPath,
+      shellArgs: resolved.shellArgs,
+      effectiveCwd: resolved.effectiveCwd,
+      validationCwd: resolved.validationCwd,
+      startupCommandDeliveredInShellArgs: resolved.startupCommandDeliveredInShellArgs === true,
+      windowsFallbackAttempts
+    })
+  }
+  return shouldProbePwsh
+    ? new DeferredLocalPtyLaunchPlan(getOptions().pwshAvailable?.() ?? false, finish)
+    : finish(false)
+}
+
+export function createLocalPtyLaunchPlan(
+  args: PtySpawnOptions,
+  getOptions: () => LocalPtyProviderOptions
+): LocalPtyLaunchPlan | DeferredLocalPtyLaunchPlan {
+  const startupAgentRecognition = args.command
+    ? recognizeAgentProcessFromCommandLine(args.command)
+    : null
+
+  const defaultCwd = getDefaultCwd()
+  const cwd = args.cwd || defaultCwd
+  // Why: gate on the effective cwd, not raw args.cwd — an omitted cwd becomes a safe default and must not be rejected as root-like.
+  if (args.command && startupAgentRecognition) {
+    assertSafeAgentStartupCwd(cwd, args.command)
+  }
+  const wslInfo = process.platform === 'win32' ? parseWslPath(cwd) : null
+  const worktreeWslContext =
+    process.platform === 'win32' ? getWslContextFromWorktreeId(args.worktreeId) : undefined
+  const preferredWslContext =
+    process.platform === 'win32'
+      ? getWslContextFromPreferredDistro(args.terminalWindowsWslDistro)
+      : undefined
+  const seed: LocalPtyLaunchSeed = {
+    args,
+    startupAgentRecognition,
+    defaultCwd,
+    cwd,
+    wslInfo,
+    worktreeWslContext,
+    preferredWslContext,
+    launchWslContext:
+      wslInfo !== null
+        ? getWslContextFromPreferredDistro(wslInfo.distro)
+        : (worktreeWslContext ?? preferredWslContext)
+  }
+  if (wslInfo) {
+    const shellPath = 'wsl.exe'
+    const resolved = resolveWindowsShellLaunchArgs(shellPath, cwd, defaultCwd)
+    return finalizeLocalPtyLaunchPlan(seed, {
+      shellPath,
+      shellArgs: resolved.shellArgs,
+      effectiveCwd: resolved.effectiveCwd,
+      validationCwd: resolved.validationCwd
+    })
+  }
+  if (process.platform === 'win32') {
+    return createWindowsLocalPtyLaunchPlan(seed, getOptions)
+  }
+  const shellPath = args.env?.SHELL || process.env.SHELL || '/bin/zsh'
+  return finalizeLocalPtyLaunchPlan(seed, {
+    shellPath,
+    shellArgs: ['-l'],
+    effectiveCwd: cwd,
+    validationCwd: cwd
+  })
+}
diff --git a/src/main/providers/local-pty-provider-spawn-env.test.ts b/src/main/providers/local-pty-provider-spawn-env.test.ts
index 97a85fcce10..8dc45d40aa8 100644
--- a/src/main/providers/local-pty-provider-spawn-env.test.ts
+++ b/src/main/providers/local-pty-provider-spawn-env.test.ts
@@ -191,6 +191,22 @@ describe('LocalPtyProvider', () => {
       expect(spawnCall[2].env.CUSTOM_VAR).toBe('custom-value')
     })
 
+    it('re-reads buildSpawnEnv after a reentrant configuration change', async () => {
+      const initialBuildSpawnEnv = vi.fn((_id: string, env: Record<string, string>) => env)
+      const configuredBuildSpawnEnv = vi.fn((_id: string, env: Record<string, string>) => env)
+      provider.configure({
+        get buildSpawnEnv() {
+          provider.configure({ buildSpawnEnv: configuredBuildSpawnEnv })
+          return initialBuildSpawnEnv
+        }
+      })
+
+      await provider.spawn({ cols: 80, rows: 24 })
+
+      expect(initialBuildSpawnEnv).not.toHaveBeenCalled()
+      expect(configuredBuildSpawnEnv).toHaveBeenCalledOnce()
+    })
+
     it.each([
       // fish EXPORTS fish_history, so an Orca launched from a fish pane hands every
       // pane the LAUNCHING worktree's session — even with isolation off (STA-4682).
diff --git a/src/main/providers/local-pty-provider-spawn-session.test.ts b/src/main/providers/local-pty-provider-spawn-session.test.ts
index c4ef90816ed..bb224009117 100644
--- a/src/main/providers/local-pty-provider-spawn-session.test.ts
+++ b/src/main/providers/local-pty-provider-spawn-session.test.ts
@@ -317,6 +317,20 @@ describe('LocalPtyProvider', () => {
       expect(spawnMock).toHaveBeenCalledOnce()
     })
 
+    it('cancels an immediate stable-session shutdown before any PTY is spawned', async () => {
+      spawnMock.mockClear()
+
+      const spawn = provider.spawn({
+        cols: 80,
+        rows: 24,
+        sessionId: 'immediate-shutdown-session'
+      })
+      await provider.shutdown('immediate-shutdown-session', { immediate: true })
+
+      await expect(spawn).rejects.toThrow('PTY spawn canceled: immediate-shutdown-session')
+      expect(spawnMock).not.toHaveBeenCalled()
+    })
+
     // Why (#16441): the Codex hook install and trust grant moved into
     // buildSpawnEnv, so the env build is now the long await before node-pty
     // exists — shutdown must be able to cancel the session id during it.
@@ -341,6 +355,41 @@ describe('LocalPtyProvider', () => {
       expect(spawnMock).not.toHaveBeenCalled()
     })
 
+    it('registers post-build preflight before a nested-microtask shutdown', async () => {
+      spawnMock.mockClear()
+      let finishEnvBuild!: () => void
+      const envProvider = new LocalPtyProvider({
+        buildSpawnEnv: (_id, baseEnv) =>
+          new Promise<Record<string, string>>((resolve) => {
+            finishEnvBuild = () => resolve(baseEnv)
+          })
+      })
+      const spawn = envProvider.spawn({
+        cols: 80,
+        rows: 24,
+        sessionId: 'resolved-env-build-session'
+      })
+      const canceledSpawn = expect(spawn).rejects.toThrow(
+        'PTY spawn canceled: resolved-env-build-session'
+      )
+      await vi.waitFor(() => expect(finishEnvBuild).toBeTypeOf('function'))
+
+      finishEnvBuild()
+      const shutdown = new Promise<void>((resolve, reject) => {
+        queueMicrotask(() => {
+          queueMicrotask(() => {
+            envProvider
+              .shutdown('resolved-env-build-session', { immediate: true })
+              .then(resolve, reject)
+          })
+        })
+      })
+
+      await shutdown
+      await canceledSpawn
+      expect(spawnMock).not.toHaveBeenCalled()
+    })
+
     it('coalesces a concurrent same-session-id spawn before launching a redundant shell (F3)', async () => {
       spawnMock.mockClear()
       const procA = { ...mockProc, pid: 1001 }
diff --git a/src/main/providers/local-pty-provider-state.ts b/src/main/providers/local-pty-provider-state.ts
new file mode 100644
index 00000000000..5e87502b1f6
--- /dev/null
+++ b/src/main/providers/local-pty-provider-state.ts
@@ -0,0 +1,157 @@
+import type * as pty from 'node-pty'
+import type { PhysicalExitTracker } from '../../shared/physical-exit-tracker'
+import type { PtyStartupIngress } from '../../shared/pty-startup-ingress'
+import type { TerminalExitCause } from '../../shared/terminal-exit-cause'
+import { normalizeLocalCallerSessionId } from './local-pty-launch-helpers'
+
+export type PtyShutdownOperation = {
+  promise: Promise<void>
+  immediate: boolean
+  rootSignalled: boolean
+  proc: pty.IPty
+}
+
+export type PendingLocalPtySpawn = {
+  canceled: boolean
+}
+
+export type DataCallback = (payload: {
+  id: string
+  data: string
+  sequenceChars?: number
+  transformed?: boolean
+  seq?: number
+}) => void
+
+export type ExitCallback = (payload: {
+  id: string
+  code: number
+  incarnationId?: string
+  cause?: TerminalExitCause
+}) => void
+
+let ptyCounter = 0
+export const ptyProcesses = new Map<string, pty.IPty>()
+export const ptyIncarnations = new Map<string, string>()
+// Why: agent sessions always sweep descendant trees; plain terminals preserve nohup children except on immediate win32 shutdown.
+export const ptyAgentSessionIds = new Set<string>()
+// Why: descendant capture is async, so reattach/duplicate shutdown must wait for the original owner, not return a dying PTY.
+export const ptyShutdownOperations = new Map<string, PtyShutdownOperation>()
+export const pendingLocalPtySpawns = new Map<string, Set<PendingLocalPtySpawn>>()
+export const ptyShellName = new Map<string, string>()
+export const ptyAgentForegroundContextPaths = new Map<string, string[]>()
+// Why: remember the last recognized agent foreground so a degraded scan doesn't report the shell and look like an exit.
+// `pid` anchors the identity to the row that proved it (null when ambiguous);
+// `at` is the last confirmation, so unanchored job evidence -- only a superset -- cannot hold it forever.
+export const ptyLastRecognizedForeground = new Map<
+  string,
+  { name: string; pid: number | null; at: number }
+>()
+export const ptyTerminalHandle = new Map<string, string>()
+export const ptyWorktreeId = new Map<string, string>()
+export const ptyInitialCwd = new Map<string, string>()
+// Why: reattach carries current settings, not the live process's launch context; keep the first creator's WSL/native identity.
+export const ptyWslDistroById = new Map<string, string | null>()
+// Why: node-pty callbacks dispose before env teardown, but onExit separately owns physical-exit proof during termination.
+export const ptyDisposables = new Map<string, { dispose: () => void }[]>()
+export const ptyExitDisposables = new Map<string, { dispose: () => void }>()
+export const ptyCleanupCallbacks = new Map<string, () => void>()
+export const ptyTerminationMode = new Map<string, 'graceful' | 'force'>()
+export const ptyPhysicalExits = new Map<string, PhysicalExitTracker>()
+// Why: a wrapper spawn (macOS TCC login) reports its own status, never the
+// shell's, so its exit numbers must not be read as the agent's (STA-4536).
+export const ptyReportsChildExitStatus = new Map<string, boolean>()
+export const ptyForceKillTimers = new Map<string, ReturnType<typeof setTimeout>>()
+
+let loadGeneration = 0
+export const ptyLoadGeneration = new Map<string, number>()
+
+export const dataListeners = new Set<DataCallback>()
+export const exitListeners = new Set<ExitCallback>()
+export const startupIngressByPty = new Map<string, PtyStartupIngress>()
+
+/**
+ * Disposes native node-pty listeners registered for a PTY id.
+ */
+export function disposePtyListeners(id: string): void {
+  const disposables = ptyDisposables.get(id)
+  if (disposables) {
+    for (const d of disposables) {
+      d.dispose()
+    }
+    ptyDisposables.delete(id)
+  }
+}
+
+export function disposePtyExitListener(id: string): void {
+  ptyExitDisposables.get(id)?.dispose()
+  ptyExitDisposables.delete(id)
+}
+
+export function clearLocalPtyForceKillTimer(id: string): void {
+  const timer = ptyForceKillTimers.get(id)
+  if (timer) {
+    clearTimeout(timer)
+    ptyForceKillTimers.delete(id)
+  }
+}
+
+export function runPtyCleanup(id: string): void {
+  const cleanup = ptyCleanupCallbacks.get(id)
+  if (!cleanup) {
+    return
+  }
+  ptyCleanupCallbacks.delete(id)
+  cleanup()
+}
+
+/**
+ * Removes all local tracking state for a PTY id after teardown.
+ */
+export function clearPtyState(id: string): void {
+  clearLocalPtyForceKillTimer(id)
+  runPtyCleanup(id)
+  disposePtyListeners(id)
+  disposePtyExitListener(id)
+  ptyProcesses.delete(id)
+  ptyIncarnations.delete(id)
+  ptyAgentSessionIds.delete(id)
+  ptyShellName.delete(id)
+  ptyAgentForegroundContextPaths.delete(id)
+  ptyLastRecognizedForeground.delete(id)
+  ptyTerminalHandle.delete(id)
+  ptyWorktreeId.delete(id)
+  ptyInitialCwd.delete(id)
+  ptyWslDistroById.delete(id)
+  ptyLoadGeneration.delete(id)
+  ptyTerminationMode.delete(id)
+  ptyReportsChildExitStatus.delete(id)
+  ptyPhysicalExits.delete(id)
+}
+
+/**
+ * Allocates either a stable caller-provided PTY id or a new numeric id.
+ */
+export function allocatePtyId(sessionId: string | undefined): string {
+  const requested = normalizeLocalCallerSessionId(sessionId)
+  if (requested) {
+    return requested
+  }
+  let id: string
+  do {
+    id = String(++ptyCounter)
+  } while (ptyProcesses.has(id))
+  return id
+}
+
+export function getLoadGeneration(): number {
+  return loadGeneration
+}
+
+export function advanceLoadGeneration(): number {
+  return ++loadGeneration
+}
+
+export function resetLoadGeneration(): void {
+  loadGeneration = 0
+}
diff --git a/src/main/providers/local-pty-provider-types.ts b/src/main/providers/local-pty-provider-types.ts
new file mode 100644
index 00000000000..c0eaaaa5ed0
--- /dev/null
+++ b/src/main/providers/local-pty-provider-types.ts
@@ -0,0 +1,37 @@
+import type { TerminalExitCause } from '../../shared/terminal-exit-cause'
+import type { PtySpawnOptions } from './types'
+
+export type LocalPtyProviderOptions = {
+  /** Why: `ctx.command` (pi/omp/claude) must drive overlay source-dir selection — a disk-presence fallback shadows the other agent's extensions. */
+  buildSpawnEnv?: (
+    id: string,
+    baseEnv: Record<string, string>,
+    ctx?: {
+      command?: string
+      launchAgent?: PtySpawnOptions['launchAgent']
+      codexHomePathOverride?: PtySpawnOptions['codexHomePathOverride']
+      cwd?: string
+      shellPath?: string
+      isWsl?: boolean
+      wslDistro?: string | null
+    }
+    // Why (#16441): Codex launch prep grants hook trust through a codex
+    // app-server session. `spawn` already awaits, so returning a promise keeps
+    // the Electron main thread responsive instead of blocking on spawnSync.
+  ) => Record<string, string> | Promise<Record<string, string>>
+  /** Whether worktree-scoped shell history is enabled; when true (or absent) with a worktreeId, HISTFILE is scoped per-worktree. */
+  isHistoryEnabled?: () => boolean
+  /** Why: COMSPEC is always cmd.exe, so this callback injects the user's persisted shell preference. Undefined when none set. */
+  getWindowsShell?: () => string | undefined
+  getWindowsPowerShellImplementation?: () => 'auto' | 'powershell.exe' | 'pwsh.exe' | undefined
+  pwshAvailable?: () => boolean | Promise<boolean>
+  onSpawned?: (id: string, incarnationId: string) => void
+  onExit?: (id: string, code: number, incarnationId: string, cause?: TerminalExitCause) => void
+  onData?: (
+    id: string,
+    data: string,
+    timestamp: number,
+    sequenceChars?: number,
+    transformed?: boolean
+  ) => void
+}
diff --git a/src/main/providers/local-pty-provider-windows-shell-launch.test.ts b/src/main/providers/local-pty-provider-windows-shell-launch.test.ts
index 4d8d1b95430..bc96cdb1d6a 100644
--- a/src/main/providers/local-pty-provider-windows-shell-launch.test.ts
+++ b/src/main/providers/local-pty-provider-windows-shell-launch.test.ts
@@ -436,6 +436,56 @@ describe('LocalPtyProvider', () => {
       expect(spawnMock.mock.calls.at(-1)?.[0]).toBe(PWSH7_ABS)
     })
 
+    it('re-reads Windows shell options after a reentrant configuration change', async () => {
+      Object.defineProperty(process, 'platform', { configurable: true, value: 'win32' })
+      const initialPowerShellImplementation = vi.fn(() => 'powershell.exe' as const)
+      const configuredPwshAvailable = vi.fn(() => true)
+      provider.configure({
+        getWindowsShell: () => {
+          provider.configure({
+            getWindowsPowerShellImplementation: () => 'auto',
+            pwshAvailable: configuredPwshAvailable
+          })
+          return 'powershell.exe'
+        },
+        getWindowsPowerShellImplementation: initialPowerShellImplementation
+      })
+
+      await provider.spawn({ cols: 80, rows: 24, cwd: 'C:\\Users\\jin\\repo' })
+
+      expect(initialPowerShellImplementation).not.toHaveBeenCalled()
+      expect(configuredPwshAvailable).toHaveBeenCalledOnce()
+      expect(spawnMock.mock.calls.at(-1)?.[0]).toBe(PWSH7_ABS)
+    })
+
+    it('registers a probe-complete spawn before a later microtask shutdown', async () => {
+      Object.defineProperty(process, 'platform', { configurable: true, value: 'win32' })
+      provider.configure({
+        getWindowsShell: () => 'powershell.exe',
+        getWindowsPowerShellImplementation: () => 'auto',
+        pwshAvailable: () => false
+      })
+      const callsBeforeSpawn = spawnMock.mock.calls.length
+      const spawn = provider.spawn({
+        cols: 80,
+        rows: 24,
+        cwd: 'C:\\Users\\jin\\repo',
+        sessionId: 'probe-shutdown-session'
+      })
+      const canceledSpawn = expect(spawn).rejects.toThrow(
+        'PTY spawn canceled: probe-shutdown-session'
+      )
+      const shutdown = new Promise<void>((resolve, reject) => {
+        queueMicrotask(() => {
+          provider.shutdown('probe-shutdown-session', { immediate: true }).then(resolve, reject)
+        })
+      })
+
+      await shutdown
+      await canceledSpawn
+      expect(spawnMock).toHaveBeenCalledTimes(callsBeforeSpawn)
+    })
+
     it('marks Orca terminal handle for WSL import when buildSpawnEnv opts in', async () => {
       Object.defineProperty(process, 'platform', { configurable: true, value: 'win32' })
       const savedCodexHome = process.env.CODEX_HOME
diff --git a/src/main/providers/local-pty-provider.ts b/src/main/providers/local-pty-provider.ts
index e4c838033ee..621a7a21132 100644
--- a/src/main/providers/local-pty-provider.ts
+++ b/src/main/providers/local-pty-provider.ts
@@ -1,456 +1,52 @@
-/* eslint-disable max-lines -- Why: splitting spawn() would scatter tightly coupled PTY lifecycle logic (scan → ready → write → exit) with no cleaner ownership seam. */
-import { basename, win32 as pathWin32 } from 'node:path'
-import { randomUUID } from 'node:crypto'
-import {
-  ORCA_CODEX_LAUNCH_PREFLIGHT_CMD_QUOTE_ENV,
-  resolveWindowsShellLaunchArgs
-} from './windows-shell-args'
-import {
-  resolveEffectiveWindowsPowerShell,
-  shouldProbeWindowsPowerShellAvailability,
-  type WindowsPowerShellShellFamily
-} from './windows-powershell'
-import { buildWindowsPowerShellSpawnAttempts } from './windows-shell-fallback-chain'
-import { resolveProcessCwd } from './process-cwd'
-import { existsSync } from 'node:fs'
-import * as pty from 'node-pty'
-import { getDefaultWslDistro, parseWslPath, isWslAvailableAsync } from '../wsl'
-import { isBracketedPasteSafeShell } from '../../shared/startup-command-submission'
-import {
-  injectHistoryEnv,
-  injectWslFishHistoryEnv,
-  updateHistoryEnvForFallback,
-  logHistoryInjection,
-  type HistoryInjectionResult
-} from '../terminal-history'
-import { dropInheritedOrcaFishHistory } from '../fish-history-session'
-import { dropInheritedOrcaHistFile } from '../worktree-history-file-path'
+import type * as pty from 'node-pty'
 import type { IPtyProvider, PtyProcessInfo, PtySpawnOptions, PtySpawnResult } from './types'
 import {
-  ensureNodePtySpawnHelperExecutable,
-  validateWorkingDirectory,
-  spawnShellWithFallback
-} from './local-pty-utils'
-import { prepareMacosTccLoginShell } from './macos-tcc-login-shell'
-import { getShellLaunchConfig } from './local-pty-shell-ready'
-import { selectShellStartupFeatures } from '../shell-startup-features'
-import {
-  writeStartupCommandWhenShellReady,
-  STARTUP_COMMAND_READY_MAX_WAIT_MS
-} from './local-pty-shell-ready-startup-command'
-import type { ShellReadySignal } from './local-pty-shell-ready-startup-command'
-import { removeInheritedNoColor } from '../pty/terminal-color-env'
-import { removeAppImageRuntimeEnv } from '../pty/appimage-terminal-env'
-import { stripInheritedBuildModeEnv } from '../pty/build-mode-env'
-import { stripLegacyTerminalShimEnv } from '../pty/legacy-terminal-shim-dir'
-import { dropIncoherentCondaActivationEnv } from '../pty/conda-activation-env'
-import { SessionNotFoundError } from '../daemon/daemon-errors'
-import { resolvePathEnvKey } from '../pty/windows-environment-path'
-import { isHostCodexHomeForWsl, isWslCodexHomeForHost } from '../pty/codex-home-wsl-env'
-import { addWslEnvKeys } from '../wsl-env'
-import {
-  POWERLEVEL10K_WIZARD_DISABLE_ENV,
-  seedPowerlevel10kWizardEnv
-} from '../pty/powerlevel10k-wizard-env'
-import {
-  isWindowsGitBashShellPath,
-  resolveGitBashPath,
-  resolveWindowsGitBashShellPath
-} from '../git-bash'
-import { WINDOWS_GIT_BASH_SHELL } from '../../shared/windows-terminal-shell'
-import {
-  confirmShellForegroundProcess,
-  resolveAgentForegroundProcessWithAvailability
-} from './agent-foreground-process'
-import { resolveStableForegroundProcess } from './stable-foreground-process'
-import {
-  classifyLocalPtyChildProcesses,
-  readLocalPtyTitle,
-  type LocalForegroundObservation
-} from './local-pty-process-evidence'
+  confirmLocalPtyForegroundProcess,
+  confirmLocalPtyShellForeground,
+  getLocalPtyForegroundProcess,
+  hasLocalPtyChildProcesses,
+  observeLocalPtyForegroundProcess
+} from './local-pty-foreground-inspection'
+import { classifyLocalPtyChildProcesses, readLocalPtyTitle } from './local-pty-process-evidence'
 import type { PtyProcessInspection } from './pty-process-inspection'
-import { getAgentForegroundContextPaths } from './agent-foreground-context-paths'
-import { recognizeAgentProcessFromCommandLine } from '../../shared/agent-process-recognition'
-import { killWithDescendantSweep } from '../pty-descendant-termination'
-import { isWindowsPtyJobReadable, readWindowsPtyJobProcessIds } from './windows-pty-job-membership'
-import { readWindowsConsoleAttachedProcessIds } from './windows-console-attached-processes'
-import { terminatePtyJob } from '../windows/windows-pty-job'
+import type { LocalPtyProviderOptions } from './local-pty-provider-types'
 import {
-  canRevalidateCachedAgentWithoutScan,
-  judgeCachedAgentJobEvidence
-} from './windows-cached-agent-revalidation'
-import { forceKillPosixPtyProcessGroups } from '../pty/posix-pty-process-groups'
-import { shouldUseShellReadyStartupDelivery } from '../../shared/codex-startup-delivery'
-import { assertSafeAgentStartupCwd } from './pty-default-cwd'
-import { ORCA_HERMES_STARTUP_QUERY_ENV } from '../../shared/hermes-startup-query'
-import { PhysicalExitTracker } from '../../shared/physical-exit-tracker'
-import { mergeGitConfigEnvProtocol } from '../../shared/git-credential-prompt-env'
-import { PtyStartupIngress, type PtyIngressEmission } from '../../shared/pty-startup-ingress'
-import { resolvePtyOwnerBackend } from '../../shared/pty-owner-backend'
-import { signalPosixPtyForegroundGroup } from '../pty/posix-pty-foreground-group'
-import { readPtsName } from '../pty/node-pty-pts-name'
-import { readPtySlavePath } from '../../shared/pty-slave-line-discipline-echo'
+  advanceLoadGeneration,
+  clearPtyState,
+  pendingLocalPtySpawns,
+  ptyProcesses,
+  ptyShellName,
+  resetLoadGeneration,
+  type DataCallback,
+  type ExitCallback
+} from './local-pty-provider-state'
 import {
-  createShellStartupOutputScanState,
-  drainShellStartupOutputScanState,
-  scanShellStartupOutput
-} from '../shell-startup-output-scanner'
-import {
-  createShellPromptReadinessProbe,
-  type ShellPromptReadinessProbe
-} from '../shell-prompt-readiness-probe'
-import { expandWindowsPathEnvironmentVariables } from '../../shared/windows-environment-expansion'
-import { resolveProcessExitCause, type TerminalExitCause } from '../../shared/terminal-exit-cause'
+  clearLocalPtyBuffer,
+  closeLocalPtyStartupQueryAuthority,
+  getDefaultLocalPtyShell,
+  getLocalPtyAppliedSize,
+  getLocalPtyCwd,
+  getLocalPtyProcess,
+  getLocalPtyProfiles,
+  listLocalPtyProcesses,
+  onLocalPtyData,
+  onLocalPtyExit,
+  pauseLocalPtyProducer,
+  resizeLocalPty,
+  resumeLocalPtyProducer,
+  sendLocalPtySignal,
+  writeLocalPty
+} from './local-pty-session-operations'
+import { spawnLocalPty } from './local-pty-spawn'
+import { cancelAllPendingLocalPtySpawns } from './local-pty-spawn-state'
+import { killAllLocalPtys, killOrphanedLocalPtys, shutdownLocalPty } from './local-pty-termination'
 
-import {
-  getDefaultCwd,
-  getSpawnedShellName,
-  getWslContextFromPreferredDistro,
-  getWslContextFromWorktreeId,
-  normalizeLocalCallerSessionId,
-  promoteAgentTeamsShimPath,
-  removeUnspecifiedPaneIdentityEnv,
-  resolveForegroundFallbackProcess
-} from './local-pty-launch-helpers'
-
-let ptyCounter = 0
-const ptyProcesses = new Map<string, pty.IPty>()
-const ptyIncarnations = new Map<string, string>()
-// Why: agent sessions always sweep descendant trees; plain terminals preserve nohup children except on immediate win32 shutdown.
-const ptyAgentSessionIds = new Set<string>()
-// Why: descendant capture is async, so reattach/duplicate shutdown must wait for the original owner, not return a dying PTY.
-type PtyShutdownOperation = {
-  promise: Promise<void>
-  immediate: boolean
-  rootSignalled: boolean
-  proc: pty.IPty
-}
-const ptyShutdownOperations = new Map<string, PtyShutdownOperation>()
-type PendingLocalPtySpawn = {
-  canceled: boolean
-}
-const pendingLocalPtySpawns = new Map<string, Set<PendingLocalPtySpawn>>()
-const ptyShellName = new Map<string, string>()
-const ptyAgentForegroundContextPaths = new Map<string, string[]>()
-// Why: remember the last recognized agent foreground so a degraded scan doesn't report the shell and look like an exit.
-// `pid` anchors the identity to the row that proved it (null when ambiguous);
-// `at` is the last confirmation, so unanchored job evidence -- only a superset -- cannot hold it forever.
-const ptyLastRecognizedForeground = new Map<
-  string,
-  { name: string; pid: number | null; at: number }
->()
-const ptyTerminalHandle = new Map<string, string>()
-const ptyWorktreeId = new Map<string, string>()
-const ptyInitialCwd = new Map<string, string>()
-// Why: reattach carries current settings, not the live process's launch context; keep the first creator's WSL/native identity.
-const ptyWslDistroById = new Map<string, string | null>()
-// Why: node-pty callbacks dispose before env teardown, but onExit separately owns physical-exit proof during termination.
-const ptyDisposables = new Map<string, { dispose: () => void }[]>()
-const ptyExitDisposables = new Map<string, { dispose: () => void }>()
-const ptyCleanupCallbacks = new Map<string, () => void>()
-const ptyTerminationMode = new Map<string, 'graceful' | 'force'>()
-const ptyPhysicalExits = new Map<string, PhysicalExitTracker>()
-// Why: a wrapper spawn (macOS TCC login) reports its own status, never the
-// shell's, so its exit numbers must not be read as the agent's (STA-4536).
-const ptyReportsChildExitStatus = new Map<string, boolean>()
-const ptyForceKillTimers = new Map<string, ReturnType<typeof setTimeout>>()
-
-export const LOCAL_PTY_PHYSICAL_EXIT_TIMEOUT_MS = 8_000
-export const LOCAL_PTY_GRACEFUL_FORCE_TIMEOUT_MS = 5_000
-export const LOCAL_PTY_FORCE_KILL_RETRY_MS = 250
-
-let loadGeneration = 0
-const ptyLoadGeneration = new Map<string, number>()
-
-type DataCallback = (payload: {
-  id: string
-  data: string
-  sequenceChars?: number
-  transformed?: boolean
-  seq?: number
-}) => void
-type ExitCallback = (payload: {
-  id: string
-  code: number
-  incarnationId?: string
-  cause?: TerminalExitCause
-}) => void
-
-const dataListeners = new Set<DataCallback>()
-const exitListeners = new Set<ExitCallback>()
-const startupIngressByPty = new Map<string, PtyStartupIngress>()
-
-/**
- * Disposes native node-pty listeners registered for a PTY id.
- */
-function disposePtyListeners(id: string): void {
-  const disposables = ptyDisposables.get(id)
-  if (disposables) {
-    for (const d of disposables) {
-      d.dispose()
-    }
-    ptyDisposables.delete(id)
-  }
-}
-
-function disposePtyExitListener(id: string): void {
-  ptyExitDisposables.get(id)?.dispose()
-  ptyExitDisposables.delete(id)
-}
-
-function clearLocalPtyForceKillTimer(id: string): void {
-  const timer = ptyForceKillTimers.get(id)
-  if (timer) {
-    clearTimeout(timer)
-    ptyForceKillTimers.delete(id)
-  }
-}
-
-function runPtyCleanup(id: string): void {
-  const cleanup = ptyCleanupCallbacks.get(id)
-  if (!cleanup) {
-    return
-  }
-  ptyCleanupCallbacks.delete(id)
-  cleanup()
-}
-
-/**
- * Removes all local tracking state for a PTY id after teardown.
- */
-function clearPtyState(id: string): void {
-  clearLocalPtyForceKillTimer(id)
-  runPtyCleanup(id)
-  disposePtyListeners(id)
-  disposePtyExitListener(id)
-  ptyProcesses.delete(id)
-  ptyIncarnations.delete(id)
-  ptyAgentSessionIds.delete(id)
-  ptyShellName.delete(id)
-  ptyAgentForegroundContextPaths.delete(id)
-  ptyLastRecognizedForeground.delete(id)
-  ptyTerminalHandle.delete(id)
-  ptyWorktreeId.delete(id)
-  ptyInitialCwd.delete(id)
-  ptyWslDistroById.delete(id)
-  ptyLoadGeneration.delete(id)
-  ptyTerminationMode.delete(id)
-  ptyReportsChildExitStatus.delete(id)
-  ptyPhysicalExits.delete(id)
-}
-
-function createPtyPhysicalExit(id: string): void {
-  ptyPhysicalExits.set(id, new PhysicalExitTracker())
-}
-
-function waitForPtyPhysicalExit(id: string, physicalExit?: PhysicalExitTracker): Promise<void> {
-  if (!physicalExit) {
-    return Promise.reject(new Error(`PTY "${id}" exit tracking unavailable`))
-  }
-  return physicalExit.waitForExit(
-    LOCAL_PTY_PHYSICAL_EXIT_TIMEOUT_MS,
-    () => new Error(`Timed out waiting for PTY process exit: ${id}`)
-  )
-}
-
-function killLocalPtyProcess(proc: pty.IPty, immediate: boolean): void {
-  if (process.platform === 'win32') {
-    proc.kill()
-    return
-  }
-  if (!immediate) {
-    proc.kill('SIGTERM')
-    return
-  }
-  forceKillPosixPtyProcessGroups(proc.pid, () => proc.kill('SIGKILL'))
-}
-
-function armLocalPtyForceKill(
-  id: string,
-  proc: pty.IPty,
-  options: { delayMs?: number; attemptsRemaining?: number } = {}
-): void {
-  if (ptyProcesses.get(id) !== proc || ptyTerminationMode.get(id) !== 'graceful') {
-    return
-  }
-  const attemptsRemaining = options.attemptsRemaining ?? 2
-  const timer = setTimeout(() => {
-    ptyForceKillTimers.delete(id)
-    if (ptyProcesses.get(id) !== proc || ptyTerminationMode.get(id) !== 'graceful') {
-      return
-    }
-    ptyTerminationMode.set(id, 'force')
-    try {
-      killLocalPtyProcess(proc, true)
-    } catch (error) {
-      ptyTerminationMode.set(id, 'graceful')
-      console.error('[pty] failed to force-kill PTY after graceful deadline', { id, error })
-      // Why: a transient native rejection must not consume the only SIGKILL owner while shutdown still awaits physical exit.
-      if (attemptsRemaining > 1) {
-        armLocalPtyForceKill(id, proc, {
-          delayMs: LOCAL_PTY_FORCE_KILL_RETRY_MS,
-          attemptsRemaining: attemptsRemaining - 1
-        })
-      }
-    }
-  }, options.delayMs ?? LOCAL_PTY_GRACEFUL_FORCE_TIMEOUT_MS)
-  timer.unref?.()
-  ptyForceKillTimers.set(id, timer)
-}
-
-/**
- * Allocates either a stable caller-provided PTY id or a new numeric id.
- */
-function allocatePtyId(sessionId: string | undefined): string {
-  const requested = normalizeLocalCallerSessionId(sessionId)
-  if (requested) {
-    return requested
-  }
-  let id: string
-  do {
-    id = String(++ptyCounter)
-  } while (ptyProcesses.has(id))
-  return id
-}
-
-/** Awaits pre-launch work that shutdown must be able to cancel: no node-pty
- *  process exists yet, so cancellation can only be observed after the await. */
-async function awaitCancelableLocalPtySpawn<T>(id: string, operation: T | Promise<T>): Promise<T> {
-  const pendingSpawn: PendingLocalPtySpawn = { canceled: false }
-  const pending = pendingLocalPtySpawns.get(id) ?? new Set()
-  pending.add(pendingSpawn)
-  pendingLocalPtySpawns.set(id, pending)
-  try {
-    const result = await operation
-    if (pendingSpawn.canceled) {
-      throw new Error(`PTY spawn canceled: ${id}`)
-    }
-    return result
-  } finally {
-    pending.delete(pendingSpawn)
-    if (pending.size === 0) {
-      pendingLocalPtySpawns.delete(id)
-    }
-  }
-}
-
-function cancelPendingLocalPtySpawns(id: string): void {
-  const pending = pendingLocalPtySpawns.get(id)
-  if (!pending) {
-    return
-  }
-  for (const pendingSpawn of pending) {
-    pendingSpawn.canceled = true
-  }
-}
-
-function cancelAllPendingLocalPtySpawns(): void {
-  for (const id of pendingLocalPtySpawns.keys()) {
-    cancelPendingLocalPtySpawns(id)
-  }
-}
-
-function reattachLocalPty(id: string, cols: number, rows: number): PtySpawnResult | null {
-  const existing = ptyProcesses.get(id)
-  if (!existing) {
-    return null
-  }
-  try {
-    existing.resize(cols, rows)
-  } catch {
-    /* Existing PTY may reject resize during teardown; still return the live handle. */
-  }
-  return {
-    id,
-    pid: existing.pid,
-    ...(ptyWslDistroById.has(id) ? { wslDistro: ptyWslDistroById.get(id) ?? null } : {}),
-    isReattach: true
-  }
-}
-
-/**
- * Disposes the native PTY handle while avoiding recycled-pid signals on POSIX.
- */
-function destroyPtyProcess(proc: pty.IPty, options: { alreadyKilled?: boolean } = {}): void {
-  // Why: neutralize proc.kill before destroy(), whose close-listener SIGHUPs a possibly-recycled POSIX pid; destroy() frees the ptmx fd (docs/fix-pty-fd-leak.md); on Windows destroy() is itself kill().
-  if (process.platform === 'win32' && options.alreadyKilled) {
-    return
-  }
-  if (process.platform !== 'win32') {
-    ;(proc as unknown as { kill: (sig?: string) => void }).kill = () => {}
-  }
-  try {
-    ;(proc as unknown as { destroy?: () => void }).destroy?.()
-  } catch {
-    /* swallow — already torn down */
-  }
-}
-
-/**
- * Requests local PTY termination while retaining physical-exit ownership.
- */
-function requestPtyTermination(id: string, proc: pty.IPty): void {
-  runPtyCleanup(id)
-  disposePtyListeners(id)
-  const previousMode = ptyTerminationMode.get(id)
-  // Why: cleanup neutralizes proc.kill below, so escalate an outstanding graceful request before its deadline is disabled.
-  if (previousMode !== 'force') {
-    clearLocalPtyForceKillTimer(id)
-    ptyTerminationMode.set(id, 'force')
-    try {
-      killLocalPtyProcess(proc, true)
-    } catch {
-      if (previousMode === 'graceful') {
-        ptyTerminationMode.set(id, previousMode)
-        armLocalPtyForceKill(id, proc, {
-          delayMs: LOCAL_PTY_FORCE_KILL_RETRY_MS,
-          attemptsRemaining: 1
-        })
-      } else {
-        ptyTerminationMode.delete(id)
-      }
-      /* Process may already be dead. */
-      return
-    }
-  }
-  // Why: shutdown and orphan cleanup can race; keep onExit + tracker installed until the OS proves the child was reaped.
-  destroyPtyProcess(proc, { alreadyKilled: true })
-}
-
-export type LocalPtyProviderOptions = {
-  /** Why: `ctx.command` (pi/omp/claude) must drive overlay source-dir selection — a disk-presence fallback shadows the other agent's extensions. */
-  buildSpawnEnv?: (
-    id: string,
-    baseEnv: Record<string, string>,
-    ctx?: {
-      command?: string
-      launchAgent?: PtySpawnOptions['launchAgent']
-      codexHomePathOverride?: PtySpawnOptions['codexHomePathOverride']
-      cwd?: string
-      shellPath?: string
-      isWsl?: boolean
-      wslDistro?: string | null
-    }
-    // Why (#16441): Codex launch prep grants hook trust through a codex
-    // app-server session. `spawn` already awaits, so returning a promise keeps
-    // the Electron main thread responsive instead of blocking on spawnSync.
-  ) => Record<string, string> | Promise<Record<string, string>>
-  /** Whether worktree-scoped shell history is enabled; when true (or absent) with a worktreeId, HISTFILE is scoped per-worktree. */
-  isHistoryEnabled?: () => boolean
-  /** Why: COMSPEC is always cmd.exe, so this callback injects the user's persisted shell preference. Undefined when none set. */
-  getWindowsShell?: () => string | undefined
-  getWindowsPowerShellImplementation?: () => 'auto' | 'powershell.exe' | 'pwsh.exe' | undefined
-  pwshAvailable?: () => boolean | Promise<boolean>
-  onSpawned?: (id: string, incarnationId: string) => void
-  onExit?: (id: string, code: number, incarnationId: string, cause?: TerminalExitCause) => void
-  onData?: (
-    id: string,
-    data: string,
-    timestamp: number,
-    sequenceChars?: number,
-    transformed?: boolean
-  ) => void
-}
+export type { LocalPtyProviderOptions } from './local-pty-provider-types'
+export {
+  LOCAL_PTY_FORCE_KILL_RETRY_MS,
+  LOCAL_PTY_GRACEFUL_FORCE_TIMEOUT_MS,
+  LOCAL_PTY_PHYSICAL_EXIT_TIMEOUT_MS
+} from './local-pty-termination'
 
 export class LocalPtyProvider implements IPtyProvider {
   private opts: LocalPtyProviderOptions
@@ -469,634 +65,8 @@ export class LocalPtyProvider implements IPtyProvider {
    *
    * Windows launches can pre-deliver startup commands in argv, so the stdin fallback only runs when needed.
    */
-  async spawn(args: PtySpawnOptions): Promise<PtySpawnResult> {
-    const reattachId = normalizeLocalCallerSessionId(args.sessionId, args.attachOnly === true)
-    if (reattachId) {
-      const pendingShutdown = ptyShutdownOperations.get(reattachId)
-      if (pendingShutdown) {
-        await pendingShutdown.promise
-      }
-      const existing = reattachLocalPty(reattachId, args.cols, args.rows)
-      if (existing) {
-        return existing
-      }
-    }
-    if (args.attachOnly) {
-      throw new SessionNotFoundError(args.sessionId ?? '')
-    }
-    const id = allocatePtyId(reattachId ?? undefined)
-    const incarnationId = randomUUID()
-
-    const startupAgentRecognition = args.command
-      ? recognizeAgentProcessFromCommandLine(args.command)
-      : null
-
-    const defaultCwd = getDefaultCwd()
-    const cwd = args.cwd || defaultCwd
-    // Why: gate on the effective cwd, not raw args.cwd — an omitted cwd becomes a safe default and must not be rejected as root-like.
-    if (args.command && startupAgentRecognition) {
-      assertSafeAgentStartupCwd(cwd, args.command)
-    }
-    const wslInfo = process.platform === 'win32' ? parseWslPath(cwd) : null
-    const worktreeWslContext =
-      process.platform === 'win32' ? getWslContextFromWorktreeId(args.worktreeId) : undefined
-    const preferredWslContext =
-      process.platform === 'win32'
-        ? getWslContextFromPreferredDistro(args.terminalWindowsWslDistro)
-        : undefined
-    let launchWslContext =
-      wslInfo !== null
-        ? getWslContextFromPreferredDistro(wslInfo.distro)
-        : (worktreeWslContext ?? preferredWslContext)
-
-    let shellPath: string
-    let shellArgs: string[]
-    let effectiveCwd: string
-    let validationCwd: string
-    let startupCommandDeliveredInShellArgs = false
-    let windowsFallbackAttempts: ReturnType<typeof buildWindowsPowerShellSpawnAttempts> = []
-    let shellReadyLaunch: ReturnType<typeof getShellLaunchConfig> | null = null
-    let getFallbackShellReadyConfig:
-      | ((shell: string) => ReturnType<typeof getShellLaunchConfig>)
-      | undefined
-    // Why hoisted: a fallback shell must drop the primary's launch env, and
-    // re-deriving the key names would re-run wrapper generation.
-    let primaryLaunchEnvKeys: string[] = []
-    if (wslInfo) {
-      shellPath = 'wsl.exe'
-      const resolved = resolveWindowsShellLaunchArgs(shellPath, cwd, defaultCwd)
-      shellArgs = resolved.shellArgs
-      effectiveCwd = resolved.effectiveCwd
-      validationCwd = resolved.validationCwd
-    } else if (process.platform === 'win32') {
-      // Why: shellOverride opens one tab in a non-default shell without changing the user's setting; it wins over the setting.
-      const requestedShellFamily =
-        args.shellOverride ||
-        this.opts.getWindowsShell?.() ||
-        process.env.COMSPEC ||
-        'powershell.exe'
-      const shellFamily = worktreeWslContext ? 'wsl.exe' : requestedShellFamily
-      if (!launchWslContext && pathWin32.basename(shellFamily).toLowerCase() === 'wsl.exe') {
-        launchWslContext = getWslContextFromPreferredDistro(getDefaultWslDistro())
-      }
-      const normalizedShellFamily = pathWin32.basename(shellFamily).toLowerCase()
-      const resolvedGitBashPath = resolveWindowsGitBashShellPath(shellFamily)
-      // Why: normalize setting-value and path forms to the PowerShell family so the resolver can fall back to inbox powershell.exe.
-      const powerShellImplementation = this.opts.getWindowsPowerShellImplementation?.()
-      const resolvedShellFamily: WindowsPowerShellShellFamily =
-        normalizedShellFamily === 'powershell.exe' || normalizedShellFamily === 'pwsh.exe'
-          ? normalizedShellFamily
-          : normalizedShellFamily === 'cmd.exe' || normalizedShellFamily === 'wsl.exe'
-            ? normalizedShellFamily
-            : undefined
-      const shouldProbePwsh = shouldProbeWindowsPowerShellAvailability({
-        shellFamily: resolvedShellFamily,
-        implementation: powerShellImplementation
-      })
-      const shouldResolvePowerShellFamily =
-        powerShellImplementation !== undefined || pathWin32.basename(shellFamily) === shellFamily
-      const pwshAvailable = shouldProbePwsh ? await (this.opts.pwshAvailable?.() ?? false) : false
-      if (resolvedGitBashPath) {
-        shellPath = resolvedGitBashPath
-      } else if (shellFamily === WINDOWS_GIT_BASH_SHELL) {
-        shellPath = 'powershell.exe'
-      } else {
-        shellPath = shouldResolvePowerShellFamily
-          ? (resolveEffectiveWindowsPowerShell({
-              shellFamily: resolvedShellFamily,
-              implementation: powerShellImplementation,
-              pwshAvailable
-            }) ?? shellFamily)
-          : shellFamily
-      }
-      // Why: bare `pwsh.exe` resolves to the Store App Execution Alias stub whose spawn fails (code 5); use an absolute exe + cmd.exe fallback.
-      windowsFallbackAttempts = buildWindowsPowerShellSpawnAttempts({
-        shellPath,
-        cwd,
-        defaultCwd,
-        wslContext: launchWslContext,
-        startupCommand: args.command
-      })
-      const primaryAttempt = windowsFallbackAttempts[0]
-      if (primaryAttempt) {
-        shellPath = primaryAttempt.shellPath
-        shellArgs = primaryAttempt.shellArgs
-        effectiveCwd = primaryAttempt.effectiveCwd
-        validationCwd = primaryAttempt.validationCwd
-        startupCommandDeliveredInShellArgs = primaryAttempt.startupCommandDeliveredInShellArgs
-      } else {
-        const resolved = resolveWindowsShellLaunchArgs(
-          shellPath,
-          cwd,
-          defaultCwd,
-          launchWslContext,
-          args.command
-        )
-        shellArgs = resolved.shellArgs
-        effectiveCwd = resolved.effectiveCwd
-        validationCwd = resolved.validationCwd
-        startupCommandDeliveredInShellArgs = resolved.startupCommandDeliveredInShellArgs === true
-      }
-    } else {
-      shellPath = args.env?.SHELL || process.env.SHELL || '/bin/zsh'
-      shellArgs = ['-l']
-      effectiveCwd = cwd
-      validationCwd = cwd
-    }
-
-    ensureNodePtySpawnHelperExecutable()
-    if (args.prevalidatedCwd !== validationCwd) {
-      validateWorkingDirectory(validationCwd)
-    }
-
-    const spawnEnv: Record<string, string> = {
-      ...mergeGitConfigEnvProtocol(stripInheritedBuildModeEnv(process.env), args.env),
-      TERM: 'xterm-256color',
-      COLORTERM: 'truecolor',
-      TERM_PROGRAM: 'Orca',
-      // Why: TUIs feature-gate on TERM_PROGRAM_VERSION; the fallback keeps tests and non-Electron runs working.
-      TERM_PROGRAM_VERSION: process.env.ORCA_APP_VERSION ?? '0.0.0-dev',
-      // Why: supports-hyperlinks rejects TERM_PROGRAM=Orca, so tools drop OSC 8 links; force it since xterm.js parses them.
-      FORCE_HYPERLINK: '1'
-    } as Record<string, string>
-    // Why: Orca can be launched from an Orca terminal; pane identity belongs to the child PTY, not the parent shell.
-    removeUnspecifiedPaneIdentityEnv(spawnEnv, args.env)
-    removeAppImageRuntimeEnv(spawnEnv)
-    removeInheritedNoColor(spawnEnv)
-    for (const key of args.envToDelete ?? []) {
-      delete spawnEnv[key]
-    }
-    if (args.env?.TERM) {
-      spawnEnv.TERM = args.env.TERM
-    }
-
-    spawnEnv.LANG ??= 'en_US.UTF-8'
-
-    // Why: on Windows LANG doesn't set the console code page; PYTHONUTF8=1 forces Python UTF-8 stdio to avoid garbled CJK.
-    if (process.platform === 'win32') {
-      spawnEnv.PYTHONUTF8 ??= '1'
-      if (isWindowsGitBashShellPath(shellPath)) {
-        // Why: Git for Windows login files otherwise cd to $HOME, ignoring node-pty's cwd for repo-scoped terminals.
-        spawnEnv.CHERE_INVOKING ??= '1'
-      }
-    }
-
-    const isWslShell = Boolean(wslInfo) || pathWin32.basename(shellPath).toLowerCase() === 'wsl.exe'
-    const launchWslDistro = isWslShell ? (launchWslContext?.distro ?? null) : null
-    // Why (#16441): building the env now awaits Codex hook installs and trust
-    // grants, so shutdown must be able to cancel this session id here too.
-    const finalEnv = this.opts.buildSpawnEnv
-      ? await awaitCancelableLocalPtySpawn(
-          id,
-          this.opts.buildSpawnEnv(id, spawnEnv, {
-            command: args.command,
-            launchAgent: args.launchAgent,
-            codexHomePathOverride: args.codexHomePathOverride,
-            cwd,
-            shellPath,
-            isWsl: isWslShell,
-            wslDistro: launchWslDistro
-          })
-        )
-      : spawnEnv
-    // Why: app-level env hooks can re-add scrubbed vars; delete last so shims like Claude Agent Teams keep their PATH.
-    for (const key of args.envToDelete ?? []) {
-      delete finalEnv[key]
-    }
-    if (args.env?.TERM) {
-      finalEnv.TERM = args.env.TERM
-    }
-    if (process.platform === 'win32') {
-      const codexHomeWslInfo = finalEnv.CODEX_HOME ? parseWslPath(finalEnv.CODEX_HOME) : null
-      if (pathWin32.basename(shellPath).toLowerCase() === 'wsl.exe') {
-        if (codexHomeWslInfo) {
-          if (launchWslDistro && launchWslDistro !== codexHomeWslInfo.distro) {
-            delete finalEnv.CODEX_HOME
-            delete finalEnv.ORCA_CODEX_HOME
-          } else {
-            finalEnv.CODEX_HOME = codexHomeWslInfo.linuxPath
-            finalEnv.ORCA_CODEX_HOME = codexHomeWslInfo.linuxPath
-            // Why: wsl.exe only imports non-default env vars named in WSLENV.
-            addWslEnvKeys(finalEnv, ['CODEX_HOME', 'ORCA_CODEX_HOME'])
-            if (!launchWslDistro) {
-              const resolved = resolveWindowsShellLaunchArgs(shellPath, cwd, defaultCwd, {
-                distro: codexHomeWslInfo.distro
-              })
-              shellArgs = resolved.shellArgs
-              effectiveCwd = resolved.effectiveCwd
-              validationCwd = resolved.validationCwd
-              startupCommandDeliveredInShellArgs =
-                resolved.startupCommandDeliveredInShellArgs === true
-            }
-          }
-        } else if (isHostCodexHomeForWsl(finalEnv.CODEX_HOME)) {
-          // Why: Orca's Codex home is host-local; WSL Codex must use its Linux-side ~/.codex, not a Windows path.
-          delete finalEnv.CODEX_HOME
-          delete finalEnv.ORCA_CODEX_HOME
-        } else if (finalEnv.CODEX_HOME) {
-          addWslEnvKeys(finalEnv, ['CODEX_HOME', 'ORCA_CODEX_HOME'])
-        }
-        if (finalEnv.CLAUDE_CONFIG_DIR) {
-          // Why: managed WSL Claude passes a Linux CLAUDE_CONFIG_DIR through wsl.exe; non-default vars need WSLENV import.
-          addWslEnvKeys(finalEnv, ['CLAUDE_CONFIG_DIR'])
-        }
-        if (finalEnv[ORCA_HERMES_STARTUP_QUERY_ENV] !== undefined) {
-          // Why: wsl.exe drops custom Windows env vars; the startup wrapper needs this imported inside WSL.
-          addWslEnvKeys(finalEnv, [ORCA_HERMES_STARTUP_QUERY_ENV])
-        }
-      } else if (codexHomeWslInfo || isWslCodexHomeForHost(finalEnv.CODEX_HOME)) {
-        // Why: WSL Codex homes are Linux paths Windows can't use; also drop ORCA_CODEX_HOME (shell-ready restores CODEX_HOME from it).
-        delete finalEnv.CODEX_HOME
-        delete finalEnv.ORCA_CODEX_HOME
-      }
-
-      const shellBasename = pathWin32.basename(shellPath).toLowerCase()
-      const codexLaunchPreflightCommand = finalEnv.ORCA_CODEX_LAUNCH_PREFLIGHT
-      if (
-        codexLaunchPreflightCommand &&
-        (shellBasename === 'cmd.exe' || isWindowsGitBashShellPath(shellPath))
-      ) {
-        if (shellBasename === 'cmd.exe') {
-          // Why: node-pty backslash-escapes argv quotes; expand the quote inside cmd.exe instead.
-          finalEnv[ORCA_CODEX_LAUNCH_PREFLIGHT_CMD_QUOTE_ENV] = '"'
-        }
-        const resolved = resolveWindowsShellLaunchArgs(
-          shellPath,
-          cwd,
-          defaultCwd,
-          launchWslContext,
-          args.command,
-          codexLaunchPreflightCommand
-        )
-        shellArgs = resolved.shellArgs
-        effectiveCwd = resolved.effectiveCwd
-        validationCwd = resolved.validationCwd
-        startupCommandDeliveredInShellArgs = resolved.startupCommandDeliveredInShellArgs === true
-      }
-    }
-    seedPowerlevel10kWizardEnv(finalEnv, { envToDelete: args.envToDelete })
-    if (
-      finalEnv[POWERLEVEL10K_WIZARD_DISABLE_ENV] !== undefined &&
-      process.platform === 'win32' &&
-      pathWin32.basename(shellPath).toLowerCase() === 'wsl.exe'
-    ) {
-      addWslEnvKeys(finalEnv, [POWERLEVEL10K_WIZARD_DISABLE_ENV])
-    }
-    const requestedEnv = args.env
-    expandWindowsPathEnvironmentVariables(finalEnv)
-    promoteAgentTeamsShimPath(
-      finalEnv,
-      requestedEnv ? requestedEnv[resolvePathEnvKey(requestedEnv, process.platform)] : undefined
-    )
-    // Why: raw requested PATH promotion runs after the host-env scrub.
-    stripLegacyTerminalShimEnv(finalEnv, process.platform)
-    // Why after every deletion pass: an envToDelete of CONDA_PREFIX must not leave the sentinel behind.
-    dropIncoherentCondaActivationEnv(finalEnv, process.platform)
-
-    // Why: worktree-scoped HISTFILE — without it worktrees share one global history (terminal-history-scope-design §7–§10).
-    const worktreeId = args.worktreeId
-    const historyEnabled = worktreeId && (this.opts.isHistoryEnabled?.() ?? true)
-    // Effective shell for history injection: WSL's outer exe is wsl.exe but the inner login shell is bash.
-    const isWslTerminal =
-      Boolean(wslInfo || worktreeWslContext || preferredWslContext) ||
-      pathWin32.basename(shellPath).toLowerCase() === 'wsl.exe'
-    const effectiveShellPath = isWslTerminal ? 'bash' : shellPath
-    let historyResult: ReturnType<typeof injectHistoryEnv> | null = null
-    if (historyEnabled) {
-      historyResult = injectHistoryEnv(finalEnv, worktreeId, effectiveShellPath, cwd, {
-        wslDistro: launchWslDistro
-      })
-      if (isWslTerminal && launchWslDistro) {
-        injectWslFishHistoryEnv(finalEnv, worktreeId, launchWslDistro)
-        addWslEnvKeys(finalEnv, ['HISTFILE', 'fish_history'])
-      }
-      logHistoryInjection(worktreeId, historyResult)
-    } else {
-      // Why: injectHistoryEnv is what normally clears it, so when history is off
-      // an inherited ORCA_HISTFILE would still reach the wrapper. Credit: #11146.
-      delete finalEnv.ORCA_HISTFILE
-      // Same for an exported `fish_history` from the fish pane that launched this
-      // Orca: history off means fish's own default, not another worktree's file.
-      dropInheritedOrcaFishHistory(finalEnv)
-      // And for an exported HISTFILE: history off means the shell's own default,
-      // not the history file of the worktree this Orca was launched from.
-      dropInheritedOrcaHistFile(finalEnv)
-    }
-
-    if (!wslInfo && process.platform !== 'win32') {
-      // Why after history injection: the wrapper is what repairs a worktree
-      // HISTFILE that the system zshrc clobbers, so the decision to wrap has to
-      // see whether this spawn actually injected one.
-      const isCodexStartupCommand = startupAgentRecognition?.agent === 'codex'
-      // Why: payload-bearing Codex startup can be lost to rc-file noise; plain Codex stays markerless for startup speed.
-      const waitsForShellReady =
-        Boolean(args.command) &&
-        (!isCodexStartupCommand ||
-          shouldUseShellReadyStartupDelivery({
-            command: args.command as string,
-            startupCommandDelivery: args.startupCommandDelivery
-          }))
-      // Why delete: ORCA_SHELL_FEATURES is Orca-owned, and only the launch
-      // config below may name features for this shell.
-      delete finalEnv.ORCA_SHELL_FEATURES
-      getFallbackShellReadyConfig = (shell) =>
-        getShellLaunchConfig(
-          shell,
-          selectShellStartupFeatures({
-            shellPath: shell,
-            env: finalEnv,
-            hasStartupCommand: Boolean(args.command),
-            waitsForShellReady,
-            // Why identical: the identity marker exists so the readiness
-            // handshake can bind output to the right shell PID.
-            emitsStartupIdentity: waitsForShellReady
-          })
-        )
-      const shellLaunch = getFallbackShellReadyConfig(shellPath)
-      Object.assign(finalEnv, shellLaunch.env)
-      shellArgs = shellLaunch.args ?? shellArgs
-      shellReadyLaunch = args.command ? shellLaunch : null
-      primaryLaunchEnvKeys = Object.keys(shellLaunch.env)
-    }
-
-    // Why: the async macOS capability probe runs before node-pty exists.
-    await awaitCancelableLocalPtySpawn(id, prepareMacosTccLoginShell())
-    if (args.signal?.aborted) {
-      throw new Error('client_disconnected')
-    }
-    // Why: another same-id request can win while this one awaits preflight; attach before launching a redundant shell.
-    const concurrentWinner = reattachId ? reattachLocalPty(id, args.cols, args.rows) : null
-    if (concurrentWinner) {
-      return concurrentWinner
-    }
-    const spawnResult = spawnShellWithFallback({
-      shellPath,
-      shellArgs,
-      cols: args.cols,
-      rows: args.rows,
-      cwd: effectiveCwd,
-      env: finalEnv,
-      termName: finalEnv.TERM,
-      ptySpawn: pty.spawn,
-      getShellReadyConfig: getFallbackShellReadyConfig,
-      launchEnvKeys: primaryLaunchEnvKeys,
-      // Why: on zsh→bash fallback HISTFILE still points to zsh_history; update before spawn so the child inherits it (design doc §8).
-      onBeforeFallbackSpawn: historyResult?.historyDir
-        ? (env, fallbackShell) =>
-            updateHistoryEnvForFallback(env, fallbackShell, historyResult as HistoryInjectionResult)
-        : undefined,
-      windowsFallbackAttempts
-    })
-    args.onPtySpawnCommitted?.()
-    shellPath = spawnResult.shellPath
-    // Why: a Windows fallback embeds its startup command in argv; honor the winning shell's delivery flag to avoid a double write.
-    if (spawnResult.startupCommandDeliveredInShellArgs !== undefined) {
-      startupCommandDeliveredInShellArgs = spawnResult.startupCommandDeliveredInShellArgs
-    }
-    if (args.command && getFallbackShellReadyConfig) {
-      shellReadyLaunch = getFallbackShellReadyConfig(shellPath)
-    }
-
-    if (process.platform !== 'win32') {
-      finalEnv.SHELL = shellPath
-    }
-
-    const proc = spawnResult.process
-    const spawnedShellIsWsl =
-      process.platform === 'win32' && pathWin32.basename(shellPath).toLowerCase() === 'wsl.exe'
-    const spawnedWslDistro = spawnedShellIsWsl
-      ? (launchWslDistro ?? undefined)
-      : process.platform === 'win32'
-        ? null
-        : undefined
-    createPtyPhysicalExit(id)
-    ptyReportsChildExitStatus.set(id, spawnResult.reportsChildExitStatus !== false)
-    ptyProcesses.set(id, proc)
-    ptyInitialCwd.set(id, cwd)
-    if (spawnedWslDistro !== undefined) {
-      ptyWslDistroById.set(id, spawnedWslDistro)
-    }
-    // Why both: launchAgent is explicit intent that survives command rewrites; recognition catches bare agent command lines.
-    if (args.launchAgent || startupAgentRecognition) {
-      ptyAgentSessionIds.add(id)
-    }
-    ptyShellName.set(id, getSpawnedShellName(shellPath))
-    if (finalEnv.ORCA_TERMINAL_HANDLE) {
-      ptyTerminalHandle.set(id, finalEnv.ORCA_TERMINAL_HANDLE)
-    }
-    if (args.worktreeId) {
-      ptyWorktreeId.set(id, args.worktreeId)
-    }
-    ptyAgentForegroundContextPaths.set(
-      id,
-      getAgentForegroundContextPaths({ cwd: args.cwd, worktreeId: args.worktreeId })
-    )
-    ptyLoadGeneration.set(id, loadGeneration)
-    ptyIncarnations.set(id, incarnationId)
-    this.opts.onSpawned?.(id, incarnationId)
-
-    const emitIngressData = (emission: PtyIngressEmission): void => {
-      const sequenceChars = emission.rawEndSeq - emission.rawStartSeq
-      if (emission.transformed || sequenceChars !== emission.data.length) {
-        this.opts.onData?.(id, emission.data, Date.now(), sequenceChars, true)
-      } else {
-        this.opts.onData?.(id, emission.data, Date.now())
-      }
-      for (const cb of dataListeners) {
-        cb(
-          emission.transformed || sequenceChars !== emission.data.length
-            ? {
-                id,
-                data: emission.data,
-                sequenceChars,
-                seq: emission.rawEndSeq,
-                transformed: true
-              }
-            : { id, data: emission.data }
-        )
-      }
-    }
-    const startupIngress = new PtyStartupIngress({
-      ...(args.startupIngress ? { intent: args.startupIngress } : {}),
-      ownerBackend: resolvePtyOwnerBackend({
-        platform: process.platform,
-        shellPath,
-        wslDistro: spawnedWslDistro
-      }),
-      write: (data) => proc.write(data),
-      onEmission: emitIngressData
-    })
-    startupIngressByPty.set(id, startupIngress)
-
-    // Shell-ready startup command support
-    let resolveShellReady: ((signal: ShellReadySignal) => void) | null = null
-    let shellReadyTimeout: ReturnType<typeof setTimeout> | null = null
-    let shellStartupPid: number | null = null
-    let shellPromptReadinessProbe: ShellPromptReadinessProbe | null = null
-    let shellStartupOutputScanState = shellReadyLaunch?.supportsReadyMarker
-      ? createShellStartupOutputScanState()
-      : null
-    const shellReadyPromise = args.command
-      ? new Promise<ShellReadySignal>((resolve) => {
-          resolveShellReady = resolve
-        })
-      : Promise.resolve({ postMarkerBytesObserved: false })
-    const finishShellReady = (signal: ShellReadySignal): void => {
-      if (!resolveShellReady) {
-        return
-      }
-      if (shellReadyTimeout) {
-        clearTimeout(shellReadyTimeout)
-        shellReadyTimeout = null
-      }
-      shellPromptReadinessProbe?.dispose()
-      shellPromptReadinessProbe = null
-      const resolve = resolveShellReady
-      resolveShellReady = null
-      resolve(signal)
-    }
-    const releaseHeldShellReadyBytes = (): void => {
-      if (!shellStartupOutputScanState) {
-        return
-      }
-      const heldBytes = drainShellStartupOutputScanState(shellStartupOutputScanState)
-      shellStartupOutputScanState = null
-      if (heldBytes.length === 0) {
-        return
-      }
-      startupIngress.accept(heldBytes)
-    }
-    if (shellStartupOutputScanState) {
-      shellPromptReadinessProbe = createShellPromptReadinessProbe({
-        slavePath: readPtySlavePath(proc),
-        shellPath,
-        shellCwd: effectiveCwd,
-        shellPathEnv: finalEnv.PATH,
-        getShellPid: () => shellStartupPid,
-        onPromptReady: () => {
-          console.warn(
-            `[pty] ${id}: shell-ready wrapper was replaced before its marker; releasing at the identified shell prompt. OSC 133 integration may be unavailable.`
-          )
-          releaseHeldShellReadyBytes()
-          finishShellReady({ postMarkerBytesObserved: true })
-        }
-      })
-    }
-    if (args.command) {
-      if (shellReadyLaunch?.supportsReadyMarker) {
-        shellReadyTimeout = setTimeout(() => {
-          releaseHeldShellReadyBytes()
-          finishShellReady({ postMarkerBytesObserved: false })
-        }, STARTUP_COMMAND_READY_MAX_WAIT_MS)
-      } else {
-        finishShellReady({ postMarkerBytesObserved: false })
-      }
-    }
-    let startupCommandCleanup: (() => void) | null = null
-    if (args.command) {
-      ptyCleanupCallbacks.set(id, () => {
-        if (shellReadyTimeout) {
-          clearTimeout(shellReadyTimeout)
-          shellReadyTimeout = null
-        }
-        releaseHeldShellReadyBytes()
-        startupCommandCleanup?.()
-        startupCommandCleanup = null
-        resolveShellReady = null
-        shellPromptReadinessProbe?.dispose()
-        shellPromptReadinessProbe = null
-      })
-    }
-
-    const disposables: { dispose: () => void }[] = []
-    const onDataDisposable = proc.onData((rawData) => {
-      let data = rawData
-      if (shellStartupOutputScanState && resolveShellReady) {
-        const scanned = scanShellStartupOutput(shellStartupOutputScanState, data)
-        data = scanned.output
-        if (scanned.shellPid) {
-          shellStartupPid = scanned.shellPid
-        }
-        if (scanned.ready) {
-          finishShellReady({ postMarkerBytesObserved: scanned.postMarkerBytesObserved })
-        }
-      }
-      startupIngress.accept(data)
-      if (resolveShellReady && data.length > 0) {
-        shellPromptReadinessProbe?.notifyOutput(data)
-      }
-    })
-    if (onDataDisposable) {
-      disposables.push(onDataDisposable)
-    }
-
-    const onExitDisposable = proc.onExit(({ exitCode, signal }) => {
-      // Why: node-pty reports a signalled death as {exitCode: 0, signal: N}; the
-      // cause is built here, where the signal and the spawn's trustworthiness
-      // are both still in hand.
-      const cause = resolveProcessExitCause({
-        exitCode,
-        signal,
-        hostReportsChildExitStatus: ptyReportsChildExitStatus.get(id)
-      })
-      const wasTerminationRequested = ptyTerminationMode.has(id)
-      ptyPhysicalExits.get(id)?.markExited()
-      // Why: neutralize proc.kill before destroy — node-pty SIGHUPs on socket 'close', which can race here and signal a reaped/recycled pid.
-      if (process.platform !== 'win32') {
-        ;(proc as unknown as { kill: (sig?: string) => void }).kill = () => {}
-      }
-      if (shellReadyTimeout) {
-        clearTimeout(shellReadyTimeout)
-        shellReadyTimeout = null
-      }
-      startupCommandCleanup?.()
-      shellPromptReadinessProbe?.dispose()
-      shellPromptReadinessProbe = null
-      clearPtyState(id)
-      startupIngress.drainAndClose()
-      startupIngressByPty.delete(id)
-      // Why: release the master ptmx fd on natural exit, else a clean exit leaks the fd until GC. See docs/fix-pty-fd-leak.md.
-      destroyPtyProcess(proc, { alreadyKilled: wasTerminationRequested })
-      ptyReportsChildExitStatus.delete(id)
-      this.opts.onExit?.(id, exitCode, incarnationId, cause)
-      for (const cb of exitListeners) {
-        cb({ id, code: exitCode, incarnationId, cause })
-      }
-    })
-    if (onExitDisposable) {
-      ptyExitDisposables.set(id, onExitDisposable)
-    }
-    ptyDisposables.set(id, disposables)
-
-    if (args.command && !startupCommandDeliveredInShellArgs) {
-      // Why: shells with bracketed paste armed take a multiline startup prompt literally; others use raw submit.
-      const spawnedShellName = getSpawnedShellName(shellPath).toLowerCase()
-      const bracketedPasteSafe =
-        process.platform !== 'win32' &&
-        isBracketedPasteSafeShell({
-          shellName: spawnedShellName,
-          waitsForShellReady: shellReadyLaunch?.supportsReadyMarker === true
-        })
-      writeStartupCommandWhenShellReady(
-        shellReadyPromise,
-        proc,
-        args.command,
-        (cleanup) => {
-          startupCommandCleanup = cleanup
-        },
-        { bracketedPasteSafe }
-      )
-    }
-
-    // Why: publish the OS pid for the memory collector; proc.pid can be briefly 0/undefined before node-pty sees the child.
-    const rawPid = proc.pid
-    const pid = typeof rawPid === 'number' && Number.isFinite(rawPid) && rawPid > 0 ? rawPid : null
-    return {
-      id,
-      incarnationId,
-      pid,
-      ...(spawnedWslDistro !== undefined ? { wslDistro: spawnedWslDistro } : {})
-    }
+  spawn(args: PtySpawnOptions): Promise<PtySpawnResult> {
+    return spawnLocalPty(args, () => this.opts)
   }
 
   // Local PTYs are always attached -- no-op. Remote providers use this to resubscribe.
@@ -1105,419 +75,66 @@ export class LocalPtyProvider implements IPtyProvider {
     return ptyProcesses.has(id)
   }
   write(id: string, data: string): boolean {
-    // Cooked PTYs echo private DSR/OSC replies; CPR/DA stay immediate unless one of
-    // those is still held, which they must not overtake (#13137, #7329, #15559).
-    if (startupIngressByPty.get(id)?.answerLiveQueryReply(data)) {
-      return true
-    }
-    const proc = ptyProcesses.get(id)
-    if (!proc) {
-      return false
-    }
-    proc.write(data)
-    return true
+    return writeLocalPty(id, data)
   }
   resize(id: string, cols: number, rows: number): void {
-    ptyProcesses.get(id)?.resize(cols, rows)
+    resizeLocalPty(id, cols, rows)
   }
 
-  // Why: node-pty pause() stops reading the master fd, so a flooding child blocks on write — true producer backpressure.
   pauseProducer(id: string): void {
-    try {
-      ptyProcesses.get(id)?.pause()
-    } catch {
-      /* PTY already destroyed */
-    }
+    pauseLocalPtyProducer(id)
   }
 
   resumeProducer(id: string): void {
-    try {
-      ptyProcesses.get(id)?.resume()
-    } catch {
-      /* PTY already destroyed */
-    }
+    resumeLocalPtyProducer(id)
   }
 
-  // Why: proc.cols/rows are node-pty's authoritative applied size (post-clamp/no-op), used by the renderer drift-check.
-  async getAppliedSize(id: string): Promise<{ cols: number; rows: number } | null> {
-    const proc = ptyProcesses.get(id)
-    if (!proc || proc.cols <= 0 || proc.rows <= 0) {
-      return null
-    }
-    return { cols: proc.cols, rows: proc.rows }
+  getAppliedSize(id: string): Promise<{ cols: number; rows: number } | null> {
+    return getLocalPtyAppliedSize(id)
   }
 
-  async shutdown(id: string, opts: { immediate?: boolean; keepHistory?: boolean }): Promise<void> {
-    cancelPendingLocalPtySpawns(id)
-    const pending = ptyShutdownOperations.get(id)
-    if (pending) {
-      if (opts.immediate === true) {
-        pending.immediate = true
-        if (pending.rootSignalled && ptyProcesses.get(id) === pending.proc) {
-          this.requestTrackedPtyShutdown(id, pending.proc, true)
-        }
-      }
-      await pending.promise
-      return
-    }
-    const proc = ptyProcesses.get(id)
-    if (!proc) {
-      return
-    }
-    const entry: PtyShutdownOperation = {
-      promise: Promise.resolve(),
-      immediate: opts.immediate === true,
-      rootSignalled: false,
-      proc
-    }
-    entry.promise = this.shutdownTrackedPty(id, proc, entry)
-    ptyShutdownOperations.set(id, entry)
-    try {
-      await entry.promise
-    } finally {
-      if (ptyShutdownOperations.get(id) === entry) {
-        ptyShutdownOperations.delete(id)
-      }
-    }
+  shutdown(id: string, opts: { immediate?: boolean; keepHistory?: boolean }): Promise<void> {
+    return shutdownLocalPty(id, opts)
   }
 
-  private async shutdownTrackedPty(
-    id: string,
-    proc: pty.IPty,
-    operation: PtyShutdownOperation
-  ): Promise<void> {
-    const physicalExit = ptyPhysicalExits.get(id)
-    const signalRoot = (): void => {
-      // Why: natural exit can race the sweep — never signal after this PTY loses ownership.
-      if (ptyProcesses.get(id) !== proc) {
-        return
-      }
-      // Cancel startup delivery now, but keep the exit listener and ownership maps until node-pty reports physical exit.
-      runPtyCleanup(id)
-      operation.rootSignalled = true
-      this.requestTrackedPtyShutdown(id, proc, operation.immediate)
-    }
-    if (ptyAgentSessionIds.has(id)) {
-      // Why: POSIX needs a pre-kill descendant snapshot; Windows tree-kills only when the
-      // identity probe returns `own` so agent/MCP orphans cannot hold the worktree cwd
-      // (#10004). `unknown`/`foreign`/`absent` skip taskkill and rely on root close alone.
-      await killWithDescendantSweep(proc.pid, signalRoot, {
-        ownsRoot: () => ptyProcesses.get(id) === proc,
-        terminateOwnedTree: () => terminatePtyJob(proc)
-      })
-    } else if (process.platform === 'win32' && operation.immediate) {
-      // Why: a plain shell's ConPTY teardown doesn't reap orphaned children (useConptyDll
-      // skips the console reap), so a live `pnpm i`/`node` keeps the ConPTY console alive and
-      // holds the worktree cwd. Tree kill runs only when the OS identity probe returns `own`;
-      // otherwise root close alone, and detached children may block physical stop (#10004).
-      await killWithDescendantSweep(proc.pid, signalRoot, {
-        ownsRoot: () => ptyProcesses.get(id) === proc,
-        terminateOwnedTree: () => terminatePtyJob(proc)
-      })
-    } else {
-      signalRoot()
-    }
-    await waitForPtyPhysicalExit(id, physicalExit)
+  sendSignal(id: string, signal: string): Promise<void> {
+    return sendLocalPtySignal(id, signal)
   }
 
-  private requestTrackedPtyShutdown(id: string, proc: pty.IPty, immediate: boolean): void {
-    const previousMode = ptyTerminationMode.get(id)
-    // Why: ConPTY has no graceful signal — its first bare kill closes the pseudoconsole, so treat it as a final force request.
-    const requestedMode = immediate || process.platform === 'win32' ? 'force' : 'graceful'
-    if (!previousMode || (requestedMode === 'force' && previousMode !== 'force')) {
-      ptyTerminationMode.set(id, requestedMode)
-      try {
-        killLocalPtyProcess(proc, immediate)
-        if (requestedMode === 'graceful') {
-          armLocalPtyForceKill(id, proc)
-        } else {
-          clearLocalPtyForceKillTimer(id)
-        }
-      } catch (error) {
-        if (previousMode) {
-          ptyTerminationMode.set(id, previousMode)
-        } else {
-          ptyTerminationMode.delete(id)
-        }
-        throw error
-      }
-    }
-  }
-
-  async sendSignal(id: string, signal: string): Promise<void> {
-    const proc = ptyProcesses.get(id)
-    if (!proc) {
-      return
-    }
-    const signalRootPid = (): void => {
-      try {
-        process.kill(proc.pid, signal)
-      } catch {
-        /* Process may already be dead */
-      }
-    }
-    // Why only SIGWINCH: see posix-pty-foreground-group — a real resize reaches the
-    // tty's foreground group, which proc.pid is never a member of.
-    if (signal === 'SIGWINCH') {
-      signalPosixPtyForegroundGroup(proc.pid, readPtsName(proc), signal, signalRootPid)
-      return
-    }
-    signalRootPid()
-  }
-
-  async getCwd(id: string): Promise<string> {
-    const proc = ptyProcesses.get(id)
-    // Why: '' not throw on unknown id — renderer reads empty as "try next fallback"; throwing is noisy for a normal case.
-    if (!proc) {
-      return ''
-    }
-    // Why: let resolveProcessCwd's '' surface for the renderer fallback chain; a fabricated cwd would short-circuit it.
-    return resolveProcessCwd(proc.pid)
+  getCwd(id: string): Promise<string> {
+    return getLocalPtyCwd(id)
   }
   async getInitialCwd(_id: string): Promise<string> {
     return ''
   }
-  async clearBuffer(id: string): Promise<void> {
-    // Why: ConPTY keeps its own screen buffer, so xterm clear() alone leaves a stale-cursor gap on the next prompt; POSIX no-op.
-    // No PSReadLine form-feed nudge here (unlike the daemon): safe only at an empty prompt, which this provider can't detect.
-    try {
-      startupIngressByPty.get(id)?.snapshotBarrier()
-      ptyProcesses.get(id)?.clear()
-    } catch {
-      /* PTY may have just exited */
-    }
+  clearBuffer(id: string): Promise<void> {
+    return clearLocalPtyBuffer(id)
   }
   closeStartupQueryAuthority(id: string): number {
-    return startupIngressByPty.get(id)?.closeQueryAuthority() ?? 0
+    return closeLocalPtyStartupQueryAuthority(id)
   }
   acknowledgeDataEvent(_id: string, _charCount: number): void {
     /* no flow control for local */
   }
 
-  async hasChildProcesses(id: string): Promise<boolean> {
-    const proc = ptyProcesses.get(id)
-    if (!proc) {
-      return false
-    }
-    try {
-      const foreground = proc.process
-      const shell = ptyShellName.get(id)
-      if (!shell) {
-        return true
-      }
-      return foreground !== shell
-    } catch {
-      return false
-    }
+  hasChildProcesses(id: string): Promise<boolean> {
+    return hasLocalPtyChildProcesses(id)
   }
 
-  async getForegroundProcess(id: string): Promise<string | null> {
-    return (await this.observeForegroundProcess(id)).processName
+  getForegroundProcess(id: string): Promise<string | null> {
+    return getLocalPtyForegroundProcess(id)
   }
 
-  /** The foreground read plus the evidence verdict behind it. `processName`
-   *  keeps the exact legacy collapse every existing caller sees; only
-   *  inspectProcess publishes the evidence. */
-  private async observeForegroundProcess(id: string): Promise<LocalForegroundObservation> {
-    const proc = ptyProcesses.get(id)
-    if (!proc) {
-      ptyLastRecognizedForeground.delete(id)
-      // The provider owns this table; a missing entry is a reaped PTY, not a
-      // failed probe.
-      return { processName: null, evidence: { verdict: 'observed', processName: null } }
-    }
-    const fallbackProcess = resolveForegroundFallbackProcess(
-      proc.process || null,
-      ptyShellName.get(id)
-    )
-    const cachedEntry = ptyLastRecognizedForeground.get(id)
-    const cachedAgent = cachedEntry?.name ?? null
-    let paneMembershipUnavailable = false
-    let cachedAgentAliveInJob = false
-    // Why: job membership preserves a live cached agent without the whole-table
-    // scan (incomplete under Windows load). Job, not console: this asks "is
-    // anything besides the shell alive?", which needs no console attachment and
-    // so needs no forked helper (#10857).
-    if (
-      process.platform === 'win32' &&
-      canRevalidateCachedAgentWithoutScan(cachedAgent, fallbackProcess)
-    ) {
-      try {
-        const paneProcessIds = readWindowsPtyJobProcessIds(proc)
-        if (ptyProcesses.get(id) !== proc) {
-          return {
-            processName: null,
-            evidence: { verdict: 'unverifiable', reason: 'pty replaced during inspection' }
-          }
-        }
-        const verdict = judgeCachedAgentJobEvidence({
-          jobProcessIds: paneProcessIds,
-          jobSupported: isWindowsPtyJobReadable(),
-          shellPid: proc.pid,
-          anchorProcessId: cachedEntry?.pid ?? null,
-          identityAgeMs: Date.now() - (cachedEntry?.at ?? 0)
-        })
-        if (verdict === 'confirmed' || verdict === 'unproven') {
-          // Both rest on a successful, complete job read that saw a live
-          // member: a positive observation, unlike the degraded reads below.
-          return {
-            processName: cachedAgent,
-            evidence: { verdict: 'observed', processName: cachedAgent }
-          }
-        }
-        if (verdict === 'exited') {
-          // The shell stands alone in a complete, inescapable job list: no
-          // successor is possible, so the identity retires before the scan.
-          ptyLastRecognizedForeground.delete(id)
-        } else if (verdict === 'anchor-exited' && cachedEntry) {
-          // The recognized process died but another member remains -- a
-          // leftover, or a restarted successor. Keep the name as unanchored,
-          // age-bounded evidence and let this cycle's scan decide: deleting
-          // here made a degraded scan read a mid-restart agent as an exit.
-          ptyLastRecognizedForeground.set(id, { ...cachedEntry, pid: null })
-        }
-        cachedAgentAliveInJob = verdict === 'recheck'
-        paneMembershipUnavailable = verdict === 'unavailable'
-      } catch {
-        paneMembershipUnavailable = true
-      }
-    }
-    try {
-      const resolution = await resolveAgentForegroundProcessWithAvailability(
-        proc.pid,
-        fallbackProcess,
-        {
-          contextPaths: ptyAgentForegroundContextPaths.get(id),
-          ...(cachedEntry?.pid != null
-            ? { anchorProcessId: cachedEntry.pid, anchorProcessName: cachedEntry.name }
-            : {})
-        }
-      )
-      // Why: the scan can outlive PTY teardown/id reuse; stale results must not resurrect cache for a foreign id.
-      if (ptyProcesses.get(id) !== proc) {
-        return {
-          processName: null,
-          evidence: { verdict: 'unverifiable', reason: 'pty replaced during inspection' }
-        }
-      }
-      // Why: a degraded scan reporting shell-as-foreground fires a false "agent done"; keep last recognized agent instead.
-      const lastRecognizedAgent = ptyLastRecognizedForeground.get(id)?.name ?? null
-      const resolvedAgent = resolution.processName
-        ? recognizeAgentProcessFromCommandLine(resolution.processName)
-        : null
-      // A recycled anchor pid keeps job membership truthful but the identity
-      // dead; the scan proving the pid now runs a non-agent settles it.
-      const anchorContradicted = resolution.anchorPidForeign === true
-      // Why: incomplete snapshot + unavailable job read isn't exit proof; and an
-      // anchor pid still alive in the job outranks a snapshot that lost its row.
-      const stableResolution =
-        (paneMembershipUnavailable || cachedAgentAliveInJob) &&
-        !anchorContradicted &&
-        resolvedAgent === null
-          ? { ...resolution, available: false }
-          : resolution
-      const stable = resolveStableForegroundProcess(stableResolution, lastRecognizedAgent)
-      if (stable.lastRecognizedAgent && stableResolution.available) {
-        // Only a positive recognition restarts the age bound.
-        ptyLastRecognizedForeground.set(id, {
-          name: stable.lastRecognizedAgent,
-          pid:
-            stable.lastRecognizedAgent === resolution.processName
-              ? (resolution.processId ?? null)
-              : null,
-          at: Date.now()
-        })
-      } else if (stable.lastRecognizedAgent && cachedAgentAliveInJob && !anchorContradicted) {
-        // The anchor pid in the job is proof of life; restamp so the
-        // short-circuit resumes instead of scanning on every call.
-        const entry = ptyLastRecognizedForeground.get(id)
-        if (entry) {
-          ptyLastRecognizedForeground.set(id, { ...entry, at: Date.now() })
-        }
-      } else if (!stable.lastRecognizedAgent) {
-        ptyLastRecognizedForeground.delete(id)
-      }
-      if (!stableResolution.available) {
-        // Legacy callers still get the stable-cache fallback; the evidence
-        // says "could not ask" so a degraded read is never exit evidence.
-        return {
-          processName: stable.processName,
-          evidence: {
-            verdict: 'unverifiable',
-            reason: paneMembershipUnavailable
-              ? 'pane membership read unavailable'
-              : 'process table scan degraded'
-          }
-        }
-      }
-      return {
-        processName: stable.processName,
-        evidence: { verdict: 'observed', processName: stable.processName }
-      }
-    } catch {
-      if (ptyProcesses.get(id) !== proc) {
-        return {
-          processName: null,
-          evidence: { verdict: 'unverifiable', reason: 'pty replaced during inspection' }
-        }
-      }
-      // Why: an inspection error is a degraded read; the legacy name keeps the
-      // stable-cache fallback, the evidence keeps it from reading as an exit.
-      return {
-        processName: ptyLastRecognizedForeground.get(id)?.name ?? null,
-        evidence: { verdict: 'unverifiable', reason: 'foreground inspection threw' }
-      }
-    }
+  confirmForegroundProcess(id: string): Promise<string | null> {
+    return confirmLocalPtyForegroundProcess(id)
   }
 
-  async confirmForegroundProcess(id: string): Promise<string | null> {
-    const proc = ptyProcesses.get(id)
-    if (!proc) {
-      return null
-    }
-    try {
-      const resolution = await resolveAgentForegroundProcessWithAvailability(
-        proc.pid,
-        resolveForegroundFallbackProcess(proc.process || null, ptyShellName.get(id)),
-        {
-          contextPaths: ptyAgentForegroundContextPaths.get(id),
-          fresh: true,
-          ...(process.platform === 'win32'
-            ? {
-                forceProcessScan: true,
-                readWindowsConsoleAttachedProcessIds: () =>
-                  readWindowsConsoleAttachedProcessIds(proc.pid)
-              }
-            : {})
-        }
-      )
-      // Why: a fresh scan can outlive this PTY id; never publish identity from an exited or same-id-reusing session.
-      if (ptyProcesses.get(id) !== proc) {
-        return null
-      }
-      return resolution.available ? resolution.processName : null
-    } catch {
-      return null
-    }
-  }
-
-  async confirmShellForeground(id: string): Promise<boolean> {
-    const proc = ptyProcesses.get(id)
-    if (!proc) {
-      return false
-    }
-    const confirmed = await confirmShellForegroundProcess(
-      proc.pid,
-      ptyShellName.get(id),
-      process.platform === 'win32'
-        ? { readWindowsPtyJobProcessIds: () => readWindowsPtyJobProcessIds(proc) }
-        : {}
-    )
-    return ptyProcesses.get(id) === proc && confirmed
+  confirmShellForeground(id: string): Promise<boolean> {
+    return confirmLocalPtyShellForeground(id)
   }
 
   async inspectProcess(id: string): Promise<PtyProcessInspection> {
-    const foreground = await this.observeForegroundProcess(id)
+    const foreground = await observeLocalPtyForegroundProcess(id)
     const proc = ptyProcesses.get(id)
     const children = classifyLocalPtyChildProcesses({
       procPresent: proc !== undefined,
@@ -1541,47 +158,20 @@ export class LocalPtyProvider implements IPtyProvider {
     /* re-spawning handles local revival */
   }
 
-  async listProcesses(): Promise<PtyProcessInfo[]> {
-    return Array.from(ptyProcesses.entries()).map(([id, proc]) => ({
-      id,
-      ...(ptyIncarnations.get(id) ? { incarnationId: ptyIncarnations.get(id) } : {}),
-      cwd: ptyInitialCwd.get(id) ?? '',
-      title: proc.process || ptyShellName.get(id) || 'shell',
-      ...(ptyWorktreeId.get(id) ? { worktreeId: ptyWorktreeId.get(id) } : {}),
-      ...(ptyTerminalHandle.get(id) ? { terminalHandle: ptyTerminalHandle.get(id) } : {}),
-      ...(ptyWslDistroById.has(id) ? { wslDistro: ptyWslDistroById.get(id) ?? null } : {})
-    }))
+  listProcesses(): Promise<PtyProcessInfo[]> {
+    return listLocalPtyProcesses()
   }
 
-  async getDefaultShell(): Promise<string> {
-    if (process.platform === 'win32') {
-      return this.opts.getWindowsShell?.() || process.env.COMSPEC || 'powershell.exe'
-    }
-    return process.env.SHELL || '/bin/zsh'
+  getDefaultShell(): Promise<string> {
+    return getDefaultLocalPtyShell(() => this.opts)
   }
 
-  async getProfiles(): Promise<{ name: string; path: string }[]> {
-    if (process.platform === 'win32') {
-      const profiles: { name: string; path: string }[] = [
-        { name: 'PowerShell', path: 'powershell.exe' },
-        { name: 'Command Prompt', path: 'cmd.exe' }
-      ]
-      const gitBashPath = resolveGitBashPath()
-      if (gitBashPath) {
-        profiles.push({ name: 'Git Bash', path: gitBashPath })
-      }
-      if (await isWslAvailableAsync()) {
-        profiles.push({ name: 'WSL', path: 'wsl.exe' })
-      }
-      return profiles
-    }
-    const shells = ['/bin/zsh', '/bin/bash', '/bin/sh']
-    return shells.filter((s) => existsSync(s)).map((s) => ({ name: basename(s), path: s }))
+  getProfiles(): Promise<{ name: string; path: string }[]> {
+    return getLocalPtyProfiles()
   }
 
   onData(callback: DataCallback): () => void {
-    dataListeners.add(callback)
-    return () => dataListeners.delete(callback)
+    return onLocalPtyData(callback)
   }
 
   // Local PTYs don't replay -- this is for remote reconnection
@@ -1590,54 +180,29 @@ export class LocalPtyProvider implements IPtyProvider {
   }
 
   onExit(callback: ExitCallback): () => void {
-    exitListeners.add(callback)
-    return () => exitListeners.delete(callback)
+    return onLocalPtyExit(callback)
   }
 
   // ─── Local-only helpers (not part of IPtyProvider interface) ───────
 
   /** Kill orphaned PTYs from previous page loads. */
   killOrphanedPtys(currentGeneration: number): { id: string }[] {
-    const killed: { id: string }[] = []
-    for (const [id, proc] of ptyProcesses) {
-      if ((ptyLoadGeneration.get(id) ?? -1) < currentGeneration) {
-        requestPtyTermination(id, proc)
-        killed.push({ id })
-      }
-    }
-    return killed
+    return killOrphanedLocalPtys(currentGeneration)
   }
 
   /** Advance the load generation counter (called on renderer reload). */
   advanceGeneration(): number {
-    return ++loadGeneration
+    return advanceLoadGeneration()
   }
 
   /** Get a writable reference to a PTY (for runtime controller). */
   getPtyProcess(id: string): pty.IPty | undefined {
-    return ptyProcesses.get(id)
+    return getLocalPtyProcess(id)
   }
 
   /** Kill all in-process local PTYs. Call on app quit. */
   killAll(): void {
-    cancelAllPendingLocalPtySpawns()
-    for (const [id, proc] of ptyProcesses) {
-      runPtyCleanup(id)
-      disposePtyListeners(id)
-      disposePtyExitListener(id)
-      if (!(process.platform === 'win32' && ptyTerminationMode.has(id))) {
-        try {
-          proc.kill()
-        } catch {
-          /* Process may already be dead. */
-        }
-      }
-      // Why: app quit can't retain NAPI callbacks into FreeEnvironment; process exit is the final handle boundary here.
-      destroyPtyProcess(proc, { alreadyKilled: true })
-      // Why: app quit replaces node-pty's onExit as final owner; overlapping shutdown waiters must join this boundary.
-      ptyPhysicalExits.get(id)?.markExited()
-      clearPtyState(id)
-    }
+    killAllLocalPtys()
   }
 }
 
@@ -1647,5 +212,5 @@ export function _resetLocalPtyProviderStateForTest(): void {
   for (const id of ptyProcesses.keys()) {
     clearPtyState(id)
   }
-  loadGeneration = 0
+  resetLoadGeneration()
 }
diff --git a/src/main/providers/local-pty-session-activation.ts b/src/main/providers/local-pty-session-activation.ts
new file mode 100644
index 00000000000..88278925081
--- /dev/null
+++ b/src/main/providers/local-pty-session-activation.ts
@@ -0,0 +1,186 @@
+import type * as pty from 'node-pty'
+import { isBracketedPasteSafeShell } from '../../shared/startup-command-submission'
+import { PtyStartupIngress, type PtyIngressEmission } from '../../shared/pty-startup-ingress'
+import { resolvePtyOwnerBackend } from '../../shared/pty-owner-backend'
+import { resolveProcessExitCause } from '../../shared/terminal-exit-cause'
+import { getAgentForegroundContextPaths } from './agent-foreground-context-paths'
+import { getSpawnedShellName } from './local-pty-launch-helpers'
+import type { LocalPtyLaunchPlan } from './local-pty-launch-plan'
+import type { LocalPtyProviderOptions } from './local-pty-provider-types'
+import {
+  clearPtyState,
+  dataListeners,
+  exitListeners,
+  getLoadGeneration,
+  ptyAgentForegroundContextPaths,
+  ptyAgentSessionIds,
+  ptyDisposables,
+  ptyExitDisposables,
+  ptyIncarnations,
+  ptyInitialCwd,
+  ptyLoadGeneration,
+  ptyPhysicalExits,
+  ptyProcesses,
+  ptyReportsChildExitStatus,
+  ptyShellName,
+  ptyTerminalHandle,
+  ptyTerminationMode,
+  ptyWorktreeId,
+  ptyWslDistroById,
+  startupIngressByPty
+} from './local-pty-provider-state'
+import { createLocalPtyShellReadinessSession } from './local-pty-shell-readiness-session'
+import { destroyPtyProcess, createPtyPhysicalExit } from './local-pty-termination'
+import { writeStartupCommandWhenShellReady } from './local-pty-shell-ready-startup-command'
+import type { PtySpawnOptions, PtySpawnResult } from './types'
+
+export function activateLocalPtySession(args: {
+  id: string
+  incarnationId: string
+  spawn: PtySpawnOptions
+  getOptions: () => LocalPtyProviderOptions
+  plan: LocalPtyLaunchPlan
+  env: Record<string, string>
+  proc: pty.IPty
+  reportsChildExitStatus: boolean
+  spawnedWslDistro: string | null | undefined
+}): PtySpawnResult {
+  const { id, incarnationId, spawn, getOptions, plan, env, proc, spawnedWslDistro } = args
+  createPtyPhysicalExit(id)
+  ptyReportsChildExitStatus.set(id, args.reportsChildExitStatus)
+  ptyProcesses.set(id, proc)
+  ptyInitialCwd.set(id, plan.cwd)
+  if (spawnedWslDistro !== undefined) {
+    ptyWslDistroById.set(id, spawnedWslDistro)
+  }
+  // Why both: launchAgent is explicit intent that survives command rewrites; recognition catches bare agent command lines.
+  if (spawn.launchAgent || plan.startupAgentRecognition) {
+    ptyAgentSessionIds.add(id)
+  }
+  ptyShellName.set(id, getSpawnedShellName(plan.shellPath))
+  if (env.ORCA_TERMINAL_HANDLE) {
+    ptyTerminalHandle.set(id, env.ORCA_TERMINAL_HANDLE)
+  }
+  if (spawn.worktreeId) {
+    ptyWorktreeId.set(id, spawn.worktreeId)
+  }
+  ptyAgentForegroundContextPaths.set(
+    id,
+    getAgentForegroundContextPaths({ cwd: spawn.cwd, worktreeId: spawn.worktreeId })
+  )
+  ptyLoadGeneration.set(id, getLoadGeneration())
+  ptyIncarnations.set(id, incarnationId)
+  getOptions().onSpawned?.(id, incarnationId)
+
+  const emitIngressData = (emission: PtyIngressEmission): void => {
+    const sequenceChars = emission.rawEndSeq - emission.rawStartSeq
+    if (emission.transformed || sequenceChars !== emission.data.length) {
+      getOptions().onData?.(id, emission.data, Date.now(), sequenceChars, true)
+    } else {
+      getOptions().onData?.(id, emission.data, Date.now())
+    }
+    for (const cb of dataListeners) {
+      cb(
+        emission.transformed || sequenceChars !== emission.data.length
+          ? {
+              id,
+              data: emission.data,
+              sequenceChars,
+              seq: emission.rawEndSeq,
+              transformed: true
+            }
+          : { id, data: emission.data }
+      )
+    }
+  }
+  const startupIngress = new PtyStartupIngress({
+    ...(spawn.startupIngress ? { intent: spawn.startupIngress } : {}),
+    ownerBackend: resolvePtyOwnerBackend({
+      platform: process.platform,
+      shellPath: plan.shellPath,
+      wslDistro: spawnedWslDistro
+    }),
+    write: (data) => proc.write(data),
+    onEmission: emitIngressData
+  })
+  startupIngressByPty.set(id, startupIngress)
+
+  // Shell-ready startup command support
+  const readiness = createLocalPtyShellReadinessSession({
+    id,
+    spawn,
+    plan,
+    env,
+    proc,
+    startupIngress
+  })
+  const disposables: { dispose: () => void }[] = []
+  const onDataDisposable = proc.onData((rawData) => {
+    readiness.acceptData(rawData)
+  })
+  if (onDataDisposable) {
+    disposables.push(onDataDisposable)
+  }
+
+  const onExitDisposable = proc.onExit(({ exitCode, signal }) => {
+    // Why: node-pty reports a signalled death as {exitCode: 0, signal: N}; the
+    // cause is built here, where the signal and the spawn's trustworthiness
+    // are both still in hand.
+    const cause = resolveProcessExitCause({
+      exitCode,
+      signal,
+      hostReportsChildExitStatus: ptyReportsChildExitStatus.get(id)
+    })
+    const wasTerminationRequested = ptyTerminationMode.has(id)
+    ptyPhysicalExits.get(id)?.markExited()
+    // Why: neutralize proc.kill before destroy — node-pty SIGHUPs on socket 'close', which can race here and signal a reaped/recycled pid.
+    if (process.platform !== 'win32') {
+      ;(proc as unknown as { kill: (sig?: string) => void }).kill = () => {}
+    }
+    readiness.prepareForExit()
+    clearPtyState(id)
+    startupIngress.drainAndClose()
+    startupIngressByPty.delete(id)
+    // Why: release the master ptmx fd on natural exit, else a clean exit leaks the fd until GC. See docs/fix-pty-fd-leak.md.
+    destroyPtyProcess(proc, { alreadyKilled: wasTerminationRequested })
+    ptyReportsChildExitStatus.delete(id)
+    getOptions().onExit?.(id, exitCode, incarnationId, cause)
+    for (const cb of exitListeners) {
+      cb({ id, code: exitCode, incarnationId, cause })
+    }
+  })
+  if (onExitDisposable) {
+    ptyExitDisposables.set(id, onExitDisposable)
+  }
+  ptyDisposables.set(id, disposables)
+
+  if (spawn.command && !plan.startupCommandDeliveredInShellArgs) {
+    // Why: shells with bracketed paste armed take a multiline startup prompt literally; others use raw submit.
+    const spawnedShellName = getSpawnedShellName(plan.shellPath).toLowerCase()
+    const bracketedPasteSafe =
+      process.platform !== 'win32' &&
+      isBracketedPasteSafeShell({
+        shellName: spawnedShellName,
+        waitsForShellReady: plan.shellReadyLaunch?.supportsReadyMarker === true
+      })
+    writeStartupCommandWhenShellReady(
+      readiness.shellReadyPromise,
+      proc,
+      spawn.command,
+      (cleanup) => {
+        readiness.setStartupCommandCleanup(cleanup)
+      },
+      { bracketedPasteSafe }
+    )
+  }
+
+  // Why: publish the OS pid for the memory collector; proc.pid can be briefly 0/undefined before node-pty sees the child.
+  const rawPid = proc.pid
+  const pid = typeof rawPid === 'number' && Number.isFinite(rawPid) && rawPid > 0 ? rawPid : null
+  return {
+    id,
+    incarnationId,
+    pid,
+    ...(spawnedWslDistro !== undefined ? { wslDistro: spawnedWslDistro } : {})
+  }
+}
diff --git a/src/main/providers/local-pty-session-operations.ts b/src/main/providers/local-pty-session-operations.ts
new file mode 100644
index 00000000000..0d02b45e5df
--- /dev/null
+++ b/src/main/providers/local-pty-session-operations.ts
@@ -0,0 +1,170 @@
+import { existsSync } from 'node:fs'
+import { basename } from 'node:path'
+import type * as pty from 'node-pty'
+import { readPtsName } from '../pty/node-pty-pts-name'
+import { signalPosixPtyForegroundGroup } from '../pty/posix-pty-foreground-group'
+import { isWslAvailableAsync } from '../wsl'
+import { resolveGitBashPath } from '../git-bash'
+import { resolveProcessCwd } from './process-cwd'
+import {
+  dataListeners,
+  exitListeners,
+  ptyIncarnations,
+  ptyInitialCwd,
+  ptyProcesses,
+  ptyShellName,
+  ptyTerminalHandle,
+  ptyWorktreeId,
+  ptyWslDistroById,
+  startupIngressByPty,
+  type DataCallback,
+  type ExitCallback
+} from './local-pty-provider-state'
+import type { LocalPtyProviderOptions } from './local-pty-provider-types'
+import type { PtyProcessInfo } from './types'
+
+export function writeLocalPty(id: string, data: string): boolean {
+  // Cooked PTYs echo private DSR/OSC replies; CPR/DA stay immediate unless one of
+  // those is still held, which they must not overtake (#13137, #7329, #15559).
+  if (startupIngressByPty.get(id)?.answerLiveQueryReply(data)) {
+    return true
+  }
+  const proc = ptyProcesses.get(id)
+  if (!proc) {
+    return false
+  }
+  proc.write(data)
+  return true
+}
+
+export function resizeLocalPty(id: string, cols: number, rows: number): void {
+  ptyProcesses.get(id)?.resize(cols, rows)
+}
+
+// Why: node-pty pause() stops reading the master fd, so a flooding child blocks on write — true producer backpressure.
+export function pauseLocalPtyProducer(id: string): void {
+  try {
+    ptyProcesses.get(id)?.pause()
+  } catch {
+    /* PTY already destroyed */
+  }
+}
+
+export function resumeLocalPtyProducer(id: string): void {
+  try {
+    ptyProcesses.get(id)?.resume()
+  } catch {
+    /* PTY already destroyed */
+  }
+}
+
+// Why: proc.cols/rows are node-pty's authoritative applied size (post-clamp/no-op), used by the renderer drift-check.
+export async function getLocalPtyAppliedSize(
+  id: string
+): Promise<{ cols: number; rows: number } | null> {
+  const proc = ptyProcesses.get(id)
+  if (!proc || proc.cols <= 0 || proc.rows <= 0) {
+    return null
+  }
+  return { cols: proc.cols, rows: proc.rows }
+}
+
+export async function sendLocalPtySignal(id: string, signal: string): Promise<void> {
+  const proc = ptyProcesses.get(id)
+  if (!proc) {
+    return
+  }
+  const signalRootPid = (): void => {
+    try {
+      process.kill(proc.pid, signal)
+    } catch {
+      /* Process may already be dead */
+    }
+  }
+  // Why only SIGWINCH: see posix-pty-foreground-group — a real resize reaches the
+  // tty's foreground group, which proc.pid is never a member of.
+  if (signal === 'SIGWINCH') {
+    signalPosixPtyForegroundGroup(proc.pid, readPtsName(proc), signal, signalRootPid)
+    return
+  }
+  signalRootPid()
+}
+
+export async function getLocalPtyCwd(id: string): Promise<string> {
+  const proc = ptyProcesses.get(id)
+  // Why: '' not throw on unknown id — renderer reads empty as "try next fallback"; throwing is noisy for a normal case.
+  if (!proc) {
+    return ''
+  }
+  // Why: let resolveProcessCwd's '' surface for the renderer fallback chain; a fabricated cwd would short-circuit it.
+  return resolveProcessCwd(proc.pid)
+}
+
+export async function clearLocalPtyBuffer(id: string): Promise<void> {
+  // Why: ConPTY keeps its own screen buffer, so xterm clear() alone leaves a stale-cursor gap on the next prompt; POSIX no-op.
+  // No PSReadLine form-feed nudge here (unlike the daemon): safe only at an empty prompt, which this provider can't detect.
+  try {
+    startupIngressByPty.get(id)?.snapshotBarrier()
+    ptyProcesses.get(id)?.clear()
+  } catch {
+    /* PTY may have just exited */
+  }
+}
+
+export function closeLocalPtyStartupQueryAuthority(id: string): number {
+  return startupIngressByPty.get(id)?.closeQueryAuthority() ?? 0
+}
+
+export async function listLocalPtyProcesses(): Promise<PtyProcessInfo[]> {
+  return Array.from(ptyProcesses.entries()).map(([id, proc]) => ({
+    id,
+    ...(ptyIncarnations.get(id) ? { incarnationId: ptyIncarnations.get(id) } : {}),
+    cwd: ptyInitialCwd.get(id) ?? '',
+    title: proc.process || ptyShellName.get(id) || 'shell',
+    ...(ptyWorktreeId.get(id) ? { worktreeId: ptyWorktreeId.get(id) } : {}),
+    ...(ptyTerminalHandle.get(id) ? { terminalHandle: ptyTerminalHandle.get(id) } : {}),
+    ...(ptyWslDistroById.has(id) ? { wslDistro: ptyWslDistroById.get(id) ?? null } : {})
+  }))
+}
+
+export async function getDefaultLocalPtyShell(
+  getOptions: () => LocalPtyProviderOptions
+): Promise<string> {
+  if (process.platform === 'win32') {
+    return getOptions().getWindowsShell?.() || process.env.COMSPEC || 'powershell.exe'
+  }
+  return process.env.SHELL || '/bin/zsh'
+}
+
+export async function getLocalPtyProfiles(): Promise<{ name: string; path: string }[]> {
+  if (process.platform === 'win32') {
+    const profiles: { name: string; path: string }[] = [
+      { name: 'PowerShell', path: 'powershell.exe' },
+      { name: 'Command Prompt', path: 'cmd.exe' }
+    ]
+    const gitBashPath = resolveGitBashPath()
+    if (gitBashPath) {
+      profiles.push({ name: 'Git Bash', path: gitBashPath })
+    }
+    if (await isWslAvailableAsync()) {
+      profiles.push({ name: 'WSL', path: 'wsl.exe' })
+    }
+    return profiles
+  }
+  const shells = ['/bin/zsh', '/bin/bash', '/bin/sh']
+  return shells.filter((s) => existsSync(s)).map((s) => ({ name: basename(s), path: s }))
+}
+
+export function onLocalPtyData(callback: DataCallback): () => void {
+  dataListeners.add(callback)
+  return () => dataListeners.delete(callback)
+}
+
+export function onLocalPtyExit(callback: ExitCallback): () => void {
+  exitListeners.add(callback)
+  return () => exitListeners.delete(callback)
+}
+
+export function getLocalPtyProcess(id: string): pty.IPty | undefined {
+  return ptyProcesses.get(id)
+}
diff --git a/src/main/providers/local-pty-shell-readiness-session.ts b/src/main/providers/local-pty-shell-readiness-session.ts
new file mode 100644
index 00000000000..4557f7a6928
--- /dev/null
+++ b/src/main/providers/local-pty-shell-readiness-session.ts
@@ -0,0 +1,148 @@
+import type * as pty from 'node-pty'
+import type { PtyStartupIngress } from '../../shared/pty-startup-ingress'
+import { readPtySlavePath } from '../../shared/pty-slave-line-discipline-echo'
+import {
+  createShellPromptReadinessProbe,
+  type ShellPromptReadinessProbe
+} from '../shell-prompt-readiness-probe'
+import {
+  createShellStartupOutputScanState,
+  drainShellStartupOutputScanState,
+  scanShellStartupOutput
+} from '../shell-startup-output-scanner'
+import type { LocalPtyLaunchPlan } from './local-pty-launch-plan'
+import { ptyCleanupCallbacks } from './local-pty-provider-state'
+import {
+  STARTUP_COMMAND_READY_MAX_WAIT_MS,
+  type ShellReadySignal
+} from './local-pty-shell-ready-startup-command'
+import type { PtySpawnOptions } from './types'
+
+export type LocalPtyShellReadinessSession = {
+  shellReadyPromise: Promise<ShellReadySignal>
+  acceptData(rawData: string): void
+  setStartupCommandCleanup(cleanup: () => void): void
+  prepareForExit(): void
+}
+
+export function createLocalPtyShellReadinessSession(args: {
+  id: string
+  spawn: PtySpawnOptions
+  plan: LocalPtyLaunchPlan
+  env: Record<string, string>
+  proc: pty.IPty
+  startupIngress: PtyStartupIngress
+}): LocalPtyShellReadinessSession {
+  const { id, spawn, plan, env, proc, startupIngress } = args
+  let resolveShellReady: ((signal: ShellReadySignal) => void) | null = null
+  let shellReadyTimeout: ReturnType<typeof setTimeout> | null = null
+  let shellStartupPid: number | null = null
+  let shellPromptReadinessProbe: ShellPromptReadinessProbe | null = null
+  let shellStartupOutputScanState = plan.shellReadyLaunch?.supportsReadyMarker
+    ? createShellStartupOutputScanState()
+    : null
+  const shellReadyPromise = spawn.command
+    ? new Promise<ShellReadySignal>((resolve) => {
+        resolveShellReady = resolve
+      })
+    : Promise.resolve({ postMarkerBytesObserved: false })
+  const finishShellReady = (signal: ShellReadySignal): void => {
+    if (!resolveShellReady) {
+      return
+    }
+    if (shellReadyTimeout) {
+      clearTimeout(shellReadyTimeout)
+      shellReadyTimeout = null
+    }
+    shellPromptReadinessProbe?.dispose()
+    shellPromptReadinessProbe = null
+    const resolve = resolveShellReady
+    resolveShellReady = null
+    resolve(signal)
+  }
+  const releaseHeldShellReadyBytes = (): void => {
+    if (!shellStartupOutputScanState) {
+      return
+    }
+    const heldBytes = drainShellStartupOutputScanState(shellStartupOutputScanState)
+    shellStartupOutputScanState = null
+    if (heldBytes.length === 0) {
+      return
+    }
+    startupIngress.accept(heldBytes)
+  }
+  if (shellStartupOutputScanState) {
+    shellPromptReadinessProbe = createShellPromptReadinessProbe({
+      slavePath: readPtySlavePath(proc),
+      shellPath: plan.shellPath,
+      shellCwd: plan.effectiveCwd,
+      shellPathEnv: env.PATH,
+      getShellPid: () => shellStartupPid,
+      onPromptReady: () => {
+        console.warn(
+          `[pty] ${id}: shell-ready wrapper was replaced before its marker; releasing at the identified shell prompt. OSC 133 integration may be unavailable.`
+        )
+        releaseHeldShellReadyBytes()
+        finishShellReady({ postMarkerBytesObserved: true })
+      }
+    })
+  }
+  if (spawn.command) {
+    if (plan.shellReadyLaunch?.supportsReadyMarker) {
+      shellReadyTimeout = setTimeout(() => {
+        releaseHeldShellReadyBytes()
+        finishShellReady({ postMarkerBytesObserved: false })
+      }, STARTUP_COMMAND_READY_MAX_WAIT_MS)
+    } else {
+      finishShellReady({ postMarkerBytesObserved: false })
+    }
+  }
+  let startupCommandCleanup: (() => void) | null = null
+  if (spawn.command) {
+    ptyCleanupCallbacks.set(id, () => {
+      if (shellReadyTimeout) {
+        clearTimeout(shellReadyTimeout)
+        shellReadyTimeout = null
+      }
+      releaseHeldShellReadyBytes()
+      startupCommandCleanup?.()
+      startupCommandCleanup = null
+      resolveShellReady = null
+      shellPromptReadinessProbe?.dispose()
+      shellPromptReadinessProbe = null
+    })
+  }
+
+  return {
+    shellReadyPromise,
+    acceptData: (rawData) => {
+      let data = rawData
+      if (shellStartupOutputScanState && resolveShellReady) {
+        const scanned = scanShellStartupOutput(shellStartupOutputScanState, data)
+        data = scanned.output
+        if (scanned.shellPid) {
+          shellStartupPid = scanned.shellPid
+        }
+        if (scanned.ready) {
+          finishShellReady({ postMarkerBytesObserved: scanned.postMarkerBytesObserved })
+        }
+      }
+      startupIngress.accept(data)
+      if (resolveShellReady && data.length > 0) {
+        shellPromptReadinessProbe?.notifyOutput(data)
+      }
+    },
+    setStartupCommandCleanup: (cleanup) => {
+      startupCommandCleanup = cleanup
+    },
+    prepareForExit: () => {
+      if (shellReadyTimeout) {
+        clearTimeout(shellReadyTimeout)
+        shellReadyTimeout = null
+      }
+      startupCommandCleanup?.()
+      shellPromptReadinessProbe?.dispose()
+      shellPromptReadinessProbe = null
+    }
+  }
+}
diff --git a/src/main/providers/local-pty-spawn-environment.ts b/src/main/providers/local-pty-spawn-environment.ts
new file mode 100644
index 00000000000..56b5ef08890
--- /dev/null
+++ b/src/main/providers/local-pty-spawn-environment.ts
@@ -0,0 +1,81 @@
+import { mergeGitConfigEnvProtocol } from '../../shared/git-credential-prompt-env'
+import { removeAppImageRuntimeEnv } from '../pty/appimage-terminal-env'
+import { stripInheritedBuildModeEnv } from '../pty/build-mode-env'
+import { removeInheritedNoColor } from '../pty/terminal-color-env'
+import { isWindowsGitBashShellPath } from '../git-bash'
+import { removeUnspecifiedPaneIdentityEnv } from './local-pty-launch-helpers'
+import type { LocalPtyLaunchPlan } from './local-pty-launch-plan'
+import type { LocalPtyProviderOptions } from './local-pty-provider-types'
+import { awaitCancelableLocalPtySpawn } from './local-pty-spawn-state'
+import type { PtySpawnOptions } from './types'
+
+export function buildLocalPtySpawnEnvironment(args: {
+  id: string
+  spawn: PtySpawnOptions
+  getOptions: () => LocalPtyProviderOptions
+  plan: LocalPtyLaunchPlan
+}): Record<string, string> | Promise<Record<string, string>> {
+  const { id, spawn, getOptions, plan } = args
+  const spawnEnv: Record<string, string> = {
+    ...mergeGitConfigEnvProtocol(stripInheritedBuildModeEnv(process.env), spawn.env),
+    TERM: 'xterm-256color',
+    COLORTERM: 'truecolor',
+    TERM_PROGRAM: 'Orca',
+    // Why: TUIs feature-gate on TERM_PROGRAM_VERSION; the fallback keeps tests and non-Electron runs working.
+    TERM_PROGRAM_VERSION: process.env.ORCA_APP_VERSION ?? '0.0.0-dev',
+    // Why: supports-hyperlinks rejects TERM_PROGRAM=Orca, so tools drop OSC 8 links; force it since xterm.js parses them.
+    FORCE_HYPERLINK: '1'
+  } as Record<string, string>
+  // Why: Orca can be launched from an Orca terminal; pane identity belongs to the child PTY, not the parent shell.
+  removeUnspecifiedPaneIdentityEnv(spawnEnv, spawn.env)
+  removeAppImageRuntimeEnv(spawnEnv)
+  removeInheritedNoColor(spawnEnv)
+  for (const key of spawn.envToDelete ?? []) {
+    delete spawnEnv[key]
+  }
+  if (spawn.env?.TERM) {
+    spawnEnv.TERM = spawn.env.TERM
+  }
+
+  spawnEnv.LANG ??= 'en_US.UTF-8'
+
+  // Why: on Windows LANG doesn't set the console code page; PYTHONUTF8=1 forces Python UTF-8 stdio to avoid garbled CJK.
+  if (process.platform === 'win32') {
+    spawnEnv.PYTHONUTF8 ??= '1'
+    if (isWindowsGitBashShellPath(plan.shellPath)) {
+      // Why: Git for Windows login files otherwise cd to $HOME, ignoring node-pty's cwd for repo-scoped terminals.
+      spawnEnv.CHERE_INVOKING ??= '1'
+    }
+  }
+
+  if (!getOptions().buildSpawnEnv) {
+    return spawnEnv
+  }
+  // Why (#16441): building the env now awaits Codex hook installs and trust
+  // grants, so shutdown must be able to cancel this session id here too.
+  return awaitCancelableLocalPtySpawn(
+    id,
+    getOptions().buildSpawnEnv!(id, spawnEnv, {
+      command: spawn.command,
+      launchAgent: spawn.launchAgent,
+      codexHomePathOverride: spawn.codexHomePathOverride,
+      cwd: plan.cwd,
+      shellPath: plan.shellPath,
+      isWsl: plan.isWslShell,
+      wslDistro: plan.launchWslDistro
+    })
+  )
+}
+
+export function enforceLocalPtySpawnEnvironmentOverrides(
+  spawn: PtySpawnOptions,
+  finalEnv: Record<string, string>
+): void {
+  // Why: app-level env hooks can re-add scrubbed vars; delete last so shims like Claude Agent Teams keep their PATH.
+  for (const key of spawn.envToDelete ?? []) {
+    delete finalEnv[key]
+  }
+  if (spawn.env?.TERM) {
+    finalEnv.TERM = spawn.env.TERM
+  }
+}
diff --git a/src/main/providers/local-pty-spawn-state.ts b/src/main/providers/local-pty-spawn-state.ts
new file mode 100644
index 00000000000..283f8b40c62
--- /dev/null
+++ b/src/main/providers/local-pty-spawn-state.ts
@@ -0,0 +1,65 @@
+import type { PtySpawnResult } from './types'
+import {
+  pendingLocalPtySpawns,
+  ptyProcesses,
+  ptyWslDistroById,
+  type PendingLocalPtySpawn
+} from './local-pty-provider-state'
+
+/** Awaits pre-launch work that shutdown must be able to cancel: no node-pty
+ *  process exists yet, so cancellation can only be observed after the await. */
+export async function awaitCancelableLocalPtySpawn<T>(
+  id: string,
+  operation: T | Promise<T>
+): Promise<T> {
+  const pendingSpawn: PendingLocalPtySpawn = { canceled: false }
+  const pending = pendingLocalPtySpawns.get(id) ?? new Set()
+  pending.add(pendingSpawn)
+  pendingLocalPtySpawns.set(id, pending)
+  try {
+    const result = await operation
+    if (pendingSpawn.canceled) {
+      throw new Error(`PTY spawn canceled: ${id}`)
+    }
+    return result
+  } finally {
+    pending.delete(pendingSpawn)
+    if (pending.size === 0) {
+      pendingLocalPtySpawns.delete(id)
+    }
+  }
+}
+
+export function cancelPendingLocalPtySpawns(id: string): void {
+  const pending = pendingLocalPtySpawns.get(id)
+  if (!pending) {
+    return
+  }
+  for (const pendingSpawn of pending) {
+    pendingSpawn.canceled = true
+  }
+}
+
+export function cancelAllPendingLocalPtySpawns(): void {
+  for (const id of pendingLocalPtySpawns.keys()) {
+    cancelPendingLocalPtySpawns(id)
+  }
+}
+
+export function reattachLocalPty(id: string, cols: number, rows: number): PtySpawnResult | null {
+  const existing = ptyProcesses.get(id)
+  if (!existing) {
+    return null
+  }
+  try {
+    existing.resize(cols, rows)
+  } catch {
+    /* Existing PTY may reject resize during teardown; still return the live handle. */
+  }
+  return {
+    id,
+    pid: existing.pid,
+    ...(ptyWslDistroById.has(id) ? { wslDistro: ptyWslDistroById.get(id) ?? null } : {}),
+    isReattach: true
+  }
+}
diff --git a/src/main/providers/local-pty-spawn.ts b/src/main/providers/local-pty-spawn.ts
new file mode 100644
index 00000000000..19436a8c405
--- /dev/null
+++ b/src/main/providers/local-pty-spawn.ts
@@ -0,0 +1,122 @@
+import { randomUUID } from 'node:crypto'
+import { win32 as pathWin32 } from 'node:path'
+import * as pty from 'node-pty'
+import { SessionNotFoundError } from '../daemon/daemon-errors'
+import { prepareMacosTccLoginShell } from './macos-tcc-login-shell'
+import { finalizeLocalPtySpawnEnvironment } from './local-pty-finalize-environment'
+import { normalizeLocalCallerSessionId } from './local-pty-launch-helpers'
+import { createLocalPtyLaunchPlan, DeferredLocalPtyLaunchPlan } from './local-pty-launch-plan'
+import type { LocalPtyProviderOptions } from './local-pty-provider-types'
+import { allocatePtyId, ptyShutdownOperations } from './local-pty-provider-state'
+import { activateLocalPtySession } from './local-pty-session-activation'
+import {
+  buildLocalPtySpawnEnvironment,
+  enforceLocalPtySpawnEnvironmentOverrides
+} from './local-pty-spawn-environment'
+import { awaitCancelableLocalPtySpawn, reattachLocalPty } from './local-pty-spawn-state'
+import { spawnShellWithFallback } from './local-pty-utils'
+import { updateHistoryEnvForFallback, type HistoryInjectionResult } from '../terminal-history'
+import type { PtySpawnOptions, PtySpawnResult } from './types'
+
+export async function spawnLocalPty(
+  args: PtySpawnOptions,
+  getOptions: () => LocalPtyProviderOptions
+): Promise<PtySpawnResult> {
+  const reattachId = normalizeLocalCallerSessionId(args.sessionId, args.attachOnly === true)
+  if (reattachId) {
+    const pendingShutdown = ptyShutdownOperations.get(reattachId)
+    if (pendingShutdown) {
+      await pendingShutdown.promise
+    }
+    const existing = reattachLocalPty(reattachId, args.cols, args.rows)
+    if (existing) {
+      return existing
+    }
+  }
+  if (args.attachOnly) {
+    throw new SessionNotFoundError(args.sessionId ?? '')
+  }
+  const id = allocatePtyId(reattachId ?? undefined)
+  const incarnationId = randomUUID()
+  const planResult = createLocalPtyLaunchPlan(args, getOptions)
+  const plan =
+    planResult instanceof DeferredLocalPtyLaunchPlan
+      ? planResult.finish(await planResult.availability)
+      : planResult
+  const envResult = buildLocalPtySpawnEnvironment({
+    id,
+    spawn: args,
+    getOptions,
+    plan
+  })
+  const finalEnv = envResult instanceof Promise ? await envResult : envResult
+  enforceLocalPtySpawnEnvironmentOverrides(args, finalEnv)
+  const historyResult = finalizeLocalPtySpawnEnvironment({
+    spawn: args,
+    getOptions,
+    plan,
+    env: finalEnv
+  })
+
+  // Why: the async macOS capability probe runs before node-pty exists.
+  await awaitCancelableLocalPtySpawn(id, prepareMacosTccLoginShell())
+  if (args.signal?.aborted) {
+    throw new Error('client_disconnected')
+  }
+  // Why: another same-id request can win while this one awaits preflight; attach before launching a redundant shell.
+  const concurrentWinner = reattachId ? reattachLocalPty(id, args.cols, args.rows) : null
+  if (concurrentWinner) {
+    return concurrentWinner
+  }
+  const spawnResult = spawnShellWithFallback({
+    shellPath: plan.shellPath,
+    shellArgs: plan.shellArgs,
+    cols: args.cols,
+    rows: args.rows,
+    cwd: plan.effectiveCwd,
+    env: finalEnv,
+    termName: finalEnv.TERM,
+    ptySpawn: pty.spawn,
+    getShellReadyConfig: plan.getFallbackShellReadyConfig,
+    launchEnvKeys: plan.primaryLaunchEnvKeys,
+    // Why: on zsh→bash fallback HISTFILE still points to zsh_history; update before spawn so the child inherits it (design doc §8).
+    onBeforeFallbackSpawn: historyResult?.historyDir
+      ? (env, fallbackShell) =>
+          updateHistoryEnvForFallback(env, fallbackShell, historyResult as HistoryInjectionResult)
+      : undefined,
+    windowsFallbackAttempts: plan.windowsFallbackAttempts
+  })
+  args.onPtySpawnCommitted?.()
+  plan.shellPath = spawnResult.shellPath
+  // Why: a Windows fallback embeds its startup command in argv; honor the winning shell's delivery flag to avoid a double write.
+  if (spawnResult.startupCommandDeliveredInShellArgs !== undefined) {
+    plan.startupCommandDeliveredInShellArgs = spawnResult.startupCommandDeliveredInShellArgs
+  }
+  if (args.command && plan.getFallbackShellReadyConfig) {
+    plan.shellReadyLaunch = plan.getFallbackShellReadyConfig(plan.shellPath)
+  }
+
+  if (process.platform !== 'win32') {
+    finalEnv.SHELL = plan.shellPath
+  }
+
+  const proc = spawnResult.process
+  const spawnedShellIsWsl =
+    process.platform === 'win32' && pathWin32.basename(plan.shellPath).toLowerCase() === 'wsl.exe'
+  const spawnedWslDistro = spawnedShellIsWsl
+    ? (plan.launchWslDistro ?? undefined)
+    : process.platform === 'win32'
+      ? null
+      : undefined
+  return activateLocalPtySession({
+    id,
+    incarnationId,
+    spawn: args,
+    getOptions,
+    plan,
+    env: finalEnv,
+    proc,
+    reportsChildExitStatus: spawnResult.reportsChildExitStatus !== false,
+    spawnedWslDistro
+  })
+}
diff --git a/src/main/providers/local-pty-termination.ts b/src/main/providers/local-pty-termination.ts
new file mode 100644
index 00000000000..470d5b600ab
--- /dev/null
+++ b/src/main/providers/local-pty-termination.ts
@@ -0,0 +1,268 @@
+import type * as pty from 'node-pty'
+import { PhysicalExitTracker } from '../../shared/physical-exit-tracker'
+import { killWithDescendantSweep } from '../pty-descendant-termination'
+import { forceKillPosixPtyProcessGroups } from '../pty/posix-pty-process-groups'
+import { terminatePtyJob } from '../windows/windows-pty-job'
+import {
+  clearLocalPtyForceKillTimer,
+  clearPtyState,
+  disposePtyExitListener,
+  disposePtyListeners,
+  ptyAgentSessionIds,
+  ptyForceKillTimers,
+  ptyPhysicalExits,
+  ptyProcesses,
+  ptyShutdownOperations,
+  ptyTerminationMode,
+  ptyLoadGeneration,
+  runPtyCleanup,
+  type PtyShutdownOperation
+} from './local-pty-provider-state'
+import {
+  cancelAllPendingLocalPtySpawns,
+  cancelPendingLocalPtySpawns
+} from './local-pty-spawn-state'
+
+export const LOCAL_PTY_PHYSICAL_EXIT_TIMEOUT_MS = 8_000
+export const LOCAL_PTY_GRACEFUL_FORCE_TIMEOUT_MS = 5_000
+export const LOCAL_PTY_FORCE_KILL_RETRY_MS = 250
+
+export function createPtyPhysicalExit(id: string): void {
+  ptyPhysicalExits.set(id, new PhysicalExitTracker())
+}
+
+function waitForPtyPhysicalExit(id: string, physicalExit?: PhysicalExitTracker): Promise<void> {
+  if (!physicalExit) {
+    return Promise.reject(new Error(`PTY "${id}" exit tracking unavailable`))
+  }
+  return physicalExit.waitForExit(
+    LOCAL_PTY_PHYSICAL_EXIT_TIMEOUT_MS,
+    () => new Error(`Timed out waiting for PTY process exit: ${id}`)
+  )
+}
+
+function killLocalPtyProcess(proc: pty.IPty, immediate: boolean): void {
+  if (process.platform === 'win32') {
+    proc.kill()
+    return
+  }
+  if (!immediate) {
+    proc.kill('SIGTERM')
+    return
+  }
+  forceKillPosixPtyProcessGroups(proc.pid, () => proc.kill('SIGKILL'))
+}
+
+function armLocalPtyForceKill(
+  id: string,
+  proc: pty.IPty,
+  options: { delayMs?: number; attemptsRemaining?: number } = {}
+): void {
+  if (ptyProcesses.get(id) !== proc || ptyTerminationMode.get(id) !== 'graceful') {
+    return
+  }
+  const attemptsRemaining = options.attemptsRemaining ?? 2
+  const timer = setTimeout(() => {
+    ptyForceKillTimers.delete(id)
+    if (ptyProcesses.get(id) !== proc || ptyTerminationMode.get(id) !== 'graceful') {
+      return
+    }
+    ptyTerminationMode.set(id, 'force')
+    try {
+      killLocalPtyProcess(proc, true)
+    } catch (error) {
+      ptyTerminationMode.set(id, 'graceful')
+      console.error('[pty] failed to force-kill PTY after graceful deadline', { id, error })
+      // Why: a transient native rejection must not consume the only SIGKILL owner while shutdown still awaits physical exit.
+      if (attemptsRemaining > 1) {
+        armLocalPtyForceKill(id, proc, {
+          delayMs: LOCAL_PTY_FORCE_KILL_RETRY_MS,
+          attemptsRemaining: attemptsRemaining - 1
+        })
+      }
+    }
+  }, options.delayMs ?? LOCAL_PTY_GRACEFUL_FORCE_TIMEOUT_MS)
+  timer.unref?.()
+  ptyForceKillTimers.set(id, timer)
+}
+
+/**
+ * Disposes the native PTY handle while avoiding recycled-pid signals on POSIX.
+ */
+export function destroyPtyProcess(proc: pty.IPty, options: { alreadyKilled?: boolean } = {}): void {
+  // Why: neutralize proc.kill before destroy(), whose close-listener SIGHUPs a possibly-recycled POSIX pid; destroy() frees the ptmx fd (docs/fix-pty-fd-leak.md); on Windows destroy() is itself kill().
+  if (process.platform === 'win32' && options.alreadyKilled) {
+    return
+  }
+  if (process.platform !== 'win32') {
+    ;(proc as unknown as { kill: (sig?: string) => void }).kill = () => {}
+  }
+  try {
+    ;(proc as unknown as { destroy?: () => void }).destroy?.()
+  } catch {
+    /* swallow — already torn down */
+  }
+}
+
+/**
+ * Requests local PTY termination while retaining physical-exit ownership.
+ */
+function requestPtyTermination(id: string, proc: pty.IPty): void {
+  runPtyCleanup(id)
+  disposePtyListeners(id)
+  const previousMode = ptyTerminationMode.get(id)
+  // Why: cleanup neutralizes proc.kill below, so escalate an outstanding graceful request before its deadline is disabled.
+  if (previousMode !== 'force') {
+    clearLocalPtyForceKillTimer(id)
+    ptyTerminationMode.set(id, 'force')
+    try {
+      killLocalPtyProcess(proc, true)
+    } catch {
+      if (previousMode === 'graceful') {
+        ptyTerminationMode.set(id, previousMode)
+        armLocalPtyForceKill(id, proc, {
+          delayMs: LOCAL_PTY_FORCE_KILL_RETRY_MS,
+          attemptsRemaining: 1
+        })
+      } else {
+        ptyTerminationMode.delete(id)
+      }
+      /* Process may already be dead. */
+      return
+    }
+  }
+  // Why: shutdown and orphan cleanup can race; keep onExit + tracker installed until the OS proves the child was reaped.
+  destroyPtyProcess(proc, { alreadyKilled: true })
+}
+
+function requestTrackedPtyShutdown(id: string, proc: pty.IPty, immediate: boolean): void {
+  const previousMode = ptyTerminationMode.get(id)
+  // Why: ConPTY has no graceful signal — its first bare kill closes the pseudoconsole, so treat it as a final force request.
+  const requestedMode = immediate || process.platform === 'win32' ? 'force' : 'graceful'
+  if (!previousMode || (requestedMode === 'force' && previousMode !== 'force')) {
+    ptyTerminationMode.set(id, requestedMode)
+    try {
+      killLocalPtyProcess(proc, immediate)
+      if (requestedMode === 'graceful') {
+        armLocalPtyForceKill(id, proc)
+      } else {
+        clearLocalPtyForceKillTimer(id)
+      }
+    } catch (error) {
+      if (previousMode) {
+        ptyTerminationMode.set(id, previousMode)
+      } else {
+        ptyTerminationMode.delete(id)
+      }
+      throw error
+    }
+  }
+}
+
+async function shutdownTrackedPty(
+  id: string,
+  proc: pty.IPty,
+  operation: PtyShutdownOperation
+): Promise<void> {
+  const physicalExit = ptyPhysicalExits.get(id)
+  const signalRoot = (): void => {
+    // Why: natural exit can race the sweep — never signal after this PTY loses ownership.
+    if (ptyProcesses.get(id) !== proc) {
+      return
+    }
+    // Cancel startup delivery now, but keep the exit listener and ownership maps until node-pty reports physical exit.
+    runPtyCleanup(id)
+    operation.rootSignalled = true
+    requestTrackedPtyShutdown(id, proc, operation.immediate)
+  }
+  if (ptyAgentSessionIds.has(id)) {
+    // Why: POSIX needs a pre-kill descendant snapshot; Windows tree-kills only when the
+    // identity probe returns `own` so agent/MCP orphans cannot hold the worktree cwd
+    // (#10004). `unknown`/`foreign`/`absent` skip taskkill and rely on root close alone.
+    await killWithDescendantSweep(proc.pid, signalRoot, {
+      ownsRoot: () => ptyProcesses.get(id) === proc,
+      terminateOwnedTree: () => terminatePtyJob(proc)
+    })
+  } else if (process.platform === 'win32' && operation.immediate) {
+    // Why: a plain shell's ConPTY teardown doesn't reap orphaned children (useConptyDll
+    // skips the console reap), so a live `pnpm i`/`node` keeps the ConPTY console alive and
+    // holds the worktree cwd. Tree kill runs only when the OS identity probe returns `own`;
+    // otherwise root close alone, and detached children may block physical stop (#10004).
+    await killWithDescendantSweep(proc.pid, signalRoot, {
+      ownsRoot: () => ptyProcesses.get(id) === proc,
+      terminateOwnedTree: () => terminatePtyJob(proc)
+    })
+  } else {
+    signalRoot()
+  }
+  await waitForPtyPhysicalExit(id, physicalExit)
+}
+
+export async function shutdownLocalPty(
+  id: string,
+  opts: { immediate?: boolean; keepHistory?: boolean }
+): Promise<void> {
+  cancelPendingLocalPtySpawns(id)
+  const pending = ptyShutdownOperations.get(id)
+  if (pending) {
+    if (opts.immediate === true) {
+      pending.immediate = true
+      if (pending.rootSignalled && ptyProcesses.get(id) === pending.proc) {
+        requestTrackedPtyShutdown(id, pending.proc, true)
+      }
+    }
+    await pending.promise
+    return
+  }
+  const proc = ptyProcesses.get(id)
+  if (!proc) {
+    return
+  }
+  const entry: PtyShutdownOperation = {
+    promise: Promise.resolve(),
+    immediate: opts.immediate === true,
+    rootSignalled: false,
+    proc
+  }
+  entry.promise = shutdownTrackedPty(id, proc, entry)
+  ptyShutdownOperations.set(id, entry)
+  try {
+    await entry.promise
+  } finally {
+    if (ptyShutdownOperations.get(id) === entry) {
+      ptyShutdownOperations.delete(id)
+    }
+  }
+}
+
+export function killOrphanedLocalPtys(currentGeneration: number): { id: string }[] {
+  const killed: { id: string }[] = []
+  for (const [id, proc] of ptyProcesses) {
+    if ((ptyLoadGeneration.get(id) ?? -1) < currentGeneration) {
+      requestPtyTermination(id, proc)
+      killed.push({ id })
+    }
+  }
+  return killed
+}
+
+export function killAllLocalPtys(): void {
+  cancelAllPendingLocalPtySpawns()
+  for (const [id, proc] of ptyProcesses) {
+    runPtyCleanup(id)
+    disposePtyListeners(id)
+    disposePtyExitListener(id)
+    if (!(process.platform === 'win32' && ptyTerminationMode.has(id))) {
+      try {
+        proc.kill()
+      } catch {
+        /* Process may already be dead. */
+      }
+    }
+    // Why: app quit can't retain NAPI callbacks into FreeEnvironment; process exit is the final handle boundary here.
+    destroyPtyProcess(proc, { alreadyKilled: true })
+    // Why: app quit replaces node-pty's onExit as final owner; overlapping shutdown waiters must join this boundary.
+    ptyPhysicalExits.get(id)?.markExited()
+    clearPtyState(id)
+  }
+}
diff --git a/src/main/providers/local-pty-windows-spawn-environment.ts b/src/main/providers/local-pty-windows-spawn-environment.ts
new file mode 100644
index 00000000000..f7967d710f7
--- /dev/null
+++ b/src/main/providers/local-pty-windows-spawn-environment.ts
@@ -0,0 +1,91 @@
+import { win32 as pathWin32 } from 'node:path'
+import { ORCA_HERMES_STARTUP_QUERY_ENV } from '../../shared/hermes-startup-query'
+import { isHostCodexHomeForWsl, isWslCodexHomeForHost } from '../pty/codex-home-wsl-env'
+import { addWslEnvKeys } from '../wsl-env'
+import { parseWslPath } from '../wsl'
+import { isWindowsGitBashShellPath } from '../git-bash'
+import type { LocalPtyLaunchPlan } from './local-pty-launch-plan'
+import {
+  ORCA_CODEX_LAUNCH_PREFLIGHT_CMD_QUOTE_ENV,
+  resolveWindowsShellLaunchArgs
+} from './windows-shell-args'
+import type { PtySpawnOptions } from './types'
+
+export function finalizeWindowsLocalPtySpawnEnvironment(args: {
+  spawn: PtySpawnOptions
+  plan: LocalPtyLaunchPlan
+  env: Record<string, string>
+}): void {
+  const { spawn, plan, env } = args
+  const codexHomeWslInfo = env.CODEX_HOME ? parseWslPath(env.CODEX_HOME) : null
+  if (pathWin32.basename(plan.shellPath).toLowerCase() === 'wsl.exe') {
+    if (codexHomeWslInfo) {
+      if (plan.launchWslDistro && plan.launchWslDistro !== codexHomeWslInfo.distro) {
+        delete env.CODEX_HOME
+        delete env.ORCA_CODEX_HOME
+      } else {
+        env.CODEX_HOME = codexHomeWslInfo.linuxPath
+        env.ORCA_CODEX_HOME = codexHomeWslInfo.linuxPath
+        // Why: wsl.exe only imports non-default env vars named in WSLENV.
+        addWslEnvKeys(env, ['CODEX_HOME', 'ORCA_CODEX_HOME'])
+        if (!plan.launchWslDistro) {
+          const resolved = resolveWindowsShellLaunchArgs(
+            plan.shellPath,
+            plan.cwd,
+            plan.defaultCwd,
+            {
+              distro: codexHomeWslInfo.distro
+            }
+          )
+          plan.shellArgs = resolved.shellArgs
+          plan.effectiveCwd = resolved.effectiveCwd
+          plan.validationCwd = resolved.validationCwd
+          plan.startupCommandDeliveredInShellArgs =
+            resolved.startupCommandDeliveredInShellArgs === true
+        }
+      }
+    } else if (isHostCodexHomeForWsl(env.CODEX_HOME)) {
+      // Why: Orca's Codex home is host-local; WSL Codex must use its Linux-side ~/.codex, not a Windows path.
+      delete env.CODEX_HOME
+      delete env.ORCA_CODEX_HOME
+    } else if (env.CODEX_HOME) {
+      addWslEnvKeys(env, ['CODEX_HOME', 'ORCA_CODEX_HOME'])
+    }
+    if (env.CLAUDE_CONFIG_DIR) {
+      // Why: managed WSL Claude passes a Linux CLAUDE_CONFIG_DIR through wsl.exe; non-default vars need WSLENV import.
+      addWslEnvKeys(env, ['CLAUDE_CONFIG_DIR'])
+    }
+    if (env[ORCA_HERMES_STARTUP_QUERY_ENV] !== undefined) {
+      // Why: wsl.exe drops custom Windows env vars; the startup wrapper needs this imported inside WSL.
+      addWslEnvKeys(env, [ORCA_HERMES_STARTUP_QUERY_ENV])
+    }
+  } else if (codexHomeWslInfo || isWslCodexHomeForHost(env.CODEX_HOME)) {
+    // Why: WSL Codex homes are Linux paths Windows can't use; also drop ORCA_CODEX_HOME (shell-ready restores CODEX_HOME from it).
+    delete env.CODEX_HOME
+    delete env.ORCA_CODEX_HOME
+  }
+
+  const shellBasename = pathWin32.basename(plan.shellPath).toLowerCase()
+  const codexLaunchPreflightCommand = env.ORCA_CODEX_LAUNCH_PREFLIGHT
+  if (
+    codexLaunchPreflightCommand &&
+    (shellBasename === 'cmd.exe' || isWindowsGitBashShellPath(plan.shellPath))
+  ) {
+    if (shellBasename === 'cmd.exe') {
+      // Why: node-pty backslash-escapes argv quotes; expand the quote inside cmd.exe instead.
+      env[ORCA_CODEX_LAUNCH_PREFLIGHT_CMD_QUOTE_ENV] = '"'
+    }
+    const resolved = resolveWindowsShellLaunchArgs(
+      plan.shellPath,
+      plan.cwd,
+      plan.defaultCwd,
+      plan.launchWslContext,
+      spawn.command,
+      codexLaunchPreflightCommand
+    )
+    plan.shellArgs = resolved.shellArgs
+    plan.effectiveCwd = resolved.effectiveCwd
+    plan.validationCwd = resolved.validationCwd
+    plan.startupCommandDeliveredInShellArgs = resolved.startupCommandDeliveredInShellArgs === true
+  }
+}
diff --git a/src/main/providers/ssh-git-provider-worktree.test.ts b/src/main/providers/ssh-git-provider-worktree.test.ts
index 10f36acc8fd..6ddff0a1f68 100644
--- a/src/main/providers/ssh-git-provider-worktree.test.ts
+++ b/src/main/providers/ssh-git-provider-worktree.test.ts
@@ -1,6 +1,16 @@
 import { describe, expect, it, vi, beforeEach } from 'vitest'
 import { SshGitProvider } from './ssh-git-provider'
-import { createMockMux, type MockMultiplexer } from './ssh-git-provider-test-harness'
+import {
+  createMockMux,
+  waitForRequestCount,
+  type MockMultiplexer
+} from './ssh-git-provider-test-harness'
+
+function methodNotFound(method: string): Error & { code: number } {
+  return Object.assign(new Error(`Method not found: ${method}`), { code: -32601 })
+}
+
+const CLEAN_STATUS = { entries: [], conflictOperation: 'unknown' }
 
 describe('SshGitProvider', () => {
   let mux: MockMultiplexer
@@ -67,6 +77,40 @@ describe('SshGitProvider', () => {
     expect(result).toEqual(cleanResult)
   })
 
+  it('keeps supported clean checks on the preferred relay RPC', async () => {
+    let resolveProbe!: (result: { clean: boolean }) => void
+    let resolveRemaining!: (result: { clean: boolean }) => void
+    const probe = new Promise<{ clean: boolean }>((resolve) => {
+      resolveProbe = resolve
+    })
+    const remaining = new Promise<{ clean: boolean }>((resolve) => {
+      resolveRemaining = resolve
+    })
+    let preferredRequestCount = 0
+    mux.request.mockImplementation((method) => {
+      expect(method).toBe('git.worktreeIsClean')
+      preferredRequestCount += 1
+      return preferredRequestCount === 1 ? probe : remaining
+    })
+    const checks = Array.from({ length: 10 }, (_, index) =>
+      provider.worktreeIsClean(`/repo/worktree-${index}`)
+    )
+
+    await waitForRequestCount(mux.request, 1)
+    expect(mux.request).toHaveBeenCalledOnce()
+    resolveProbe({ clean: true })
+    await waitForRequestCount(mux.request, 10)
+    expect(mux.request).toHaveBeenCalledTimes(10)
+    resolveRemaining({ clean: true })
+    await expect(Promise.all(checks)).resolves.toEqual(
+      Array.from({ length: 10 }, () => ({ clean: true }))
+    )
+    expect(
+      mux.request.mock.calls.filter(([method]) => method === 'git.worktreeIsClean')
+    ).toHaveLength(10)
+    expect(mux.request.mock.calls.some(([method]) => method === 'git.status')).toBe(false)
+  })
+
   it('worktreeIsClean can ignore untracked files', async () => {
     const cleanResult = { clean: true }
     mux.request.mockResolvedValue(cleanResult)
@@ -113,10 +157,7 @@ describe('SshGitProvider', () => {
   })
 
   it('worktreeIsClean falls back to git.status for old relays', async () => {
-    const methodNotFound = Object.assign(new Error('Method not found: git.worktreeIsClean'), {
-      code: -32601
-    })
-    mux.request.mockRejectedValueOnce(methodNotFound).mockResolvedValueOnce({
+    mux.request.mockRejectedValueOnce(methodNotFound('git.worktreeIsClean')).mockResolvedValueOnce({
       entries: [{ path: 'scratch.txt', status: 'untracked', area: 'untracked' }],
       conflictOperation: 'unknown'
     })
@@ -140,26 +181,180 @@ describe('SshGitProvider', () => {
     }
   })
 
-  it('worktreeIsClean filters untracked entries in old-relay fallback', async () => {
-    const methodNotFound = Object.assign(new Error('Method not found: git.worktreeIsClean'), {
-      code: -32601
+  it('probes an old relay once across sequential clean checks', async () => {
+    mux.request.mockImplementation(async (method) => {
+      if (method === 'git.worktreeIsClean') {
+        throw methodNotFound(method)
+      }
+      return CLEAN_STATUS
     })
-    mux.request.mockRejectedValueOnce(methodNotFound).mockResolvedValueOnce({
-      entries: [{ path: 'scratch.txt', status: 'untracked', area: 'untracked' }],
-      conflictOperation: 'unknown'
+    const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {})
+    const worktreePaths = Array.from({ length: 10 }, (_, index) => `/repo/worktree-${index}`)
+
+    try {
+      for (const worktreePath of worktreePaths) {
+        await expect(provider.worktreeIsClean(worktreePath)).resolves.toEqual({ clean: true })
+      }
+
+      expect(
+        mux.request.mock.calls.filter(([method]) => method === 'git.worktreeIsClean')
+      ).toHaveLength(1)
+      expect(mux.request.mock.calls.filter(([method]) => method === 'git.status')).toHaveLength(10)
+      expect(mux.request).toHaveBeenCalledTimes(11)
+      expect(warnSpy).toHaveBeenCalledOnce()
+    } finally {
+      warnSpy.mockRestore()
+    }
+  })
+
+  it('shares one old-relay probe across concurrent clean checks', async () => {
+    let rejectProbe!: (error: Error) => void
+    const probe = new Promise((_resolve, reject) => {
+      rejectProbe = reject
+    })
+    mux.request.mockImplementation((method) => {
+      if (method === 'git.worktreeIsClean') {
+        return probe
+      }
+      return Promise.resolve(CLEAN_STATUS)
+    })
+    const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {})
+    const checks = Array.from({ length: 10 }, (_, index) =>
+      provider.worktreeIsClean(`/repo/worktree-${index}`)
+    )
+
+    try {
+      await waitForRequestCount(mux.request, 1)
+      rejectProbe(methodNotFound('git.worktreeIsClean'))
+      await expect(Promise.all(checks)).resolves.toEqual(
+        Array.from({ length: 10 }, () => ({ clean: true }))
+      )
+
+      expect(
+        mux.request.mock.calls.filter(([method]) => method === 'git.worktreeIsClean')
+      ).toHaveLength(1)
+      expect(mux.request.mock.calls.filter(([method]) => method === 'git.status')).toHaveLength(10)
+      expect(mux.request).toHaveBeenCalledTimes(11)
+      expect(warnSpy).toHaveBeenCalledOnce()
+    } finally {
+      warnSpy.mockRestore()
+    }
+  })
+
+  it('retries the preferred clean RPC after a transport failure', async () => {
+    const transportError = Object.assign(new Error('Method not found: git.worktreeIsClean'), {
+      code: -32602
+    })
+    mux.request.mockRejectedValueOnce(transportError).mockResolvedValueOnce({ clean: true })
+    const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {})
+
+    try {
+      await expect(provider.worktreeIsClean('/repo/first')).rejects.toBe(transportError)
+      await expect(provider.worktreeIsClean('/repo/second')).resolves.toEqual({ clean: true })
+      expect(mux.request.mock.calls.map(([method]) => method)).toEqual([
+        'git.worktreeIsClean',
+        'git.worktreeIsClean'
+      ])
+      expect(warnSpy).not.toHaveBeenCalled()
+    } finally {
+      warnSpy.mockRestore()
+    }
+  })
+
+  it('lets concurrent waiters retry after a transient probe failure', async () => {
+    const transportError = new Error('connection closed')
+    let rejectProbe!: (error: Error) => void
+    let resolveRetries!: (result: { clean: boolean }) => void
+    const probe = new Promise((_resolve, reject) => {
+      rejectProbe = reject
+    })
+    const retries = new Promise<{ clean: boolean }>((resolve) => {
+      resolveRetries = resolve
+    })
+    let preferredRequestCount = 0
+    mux.request.mockImplementation((method) => {
+      expect(method).toBe('git.worktreeIsClean')
+      preferredRequestCount += 1
+      return preferredRequestCount === 1 ? probe : retries
+    })
+    const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {})
+    const checks = Array.from({ length: 3 }, (_, index) =>
+      provider.worktreeIsClean(`/repo/worktree-${index}`)
+    )
+    const settledChecks = Promise.allSettled(checks)
+
+    try {
+      await waitForRequestCount(mux.request, 1)
+      rejectProbe(transportError)
+      await waitForRequestCount(mux.request, 3)
+      resolveRetries({ clean: true })
+
+      const results = await settledChecks
+      expect(results[0]).toEqual({ status: 'rejected', reason: transportError })
+      expect(results.slice(1)).toEqual([
+        { status: 'fulfilled', value: { clean: true } },
+        { status: 'fulfilled', value: { clean: true } }
+      ])
+      await expect(provider.worktreeIsClean('/repo/later')).resolves.toEqual({ clean: true })
+      expect(mux.request).toHaveBeenCalledTimes(4)
+      expect(warnSpy).not.toHaveBeenCalled()
+    } finally {
+      warnSpy.mockRestore()
+    }
+  })
+
+  it('re-probes clean support after the provider is replaced', async () => {
+    mux.request.mockImplementation(async (method) => {
+      if (method === 'git.worktreeIsClean') {
+        throw methodNotFound(method)
+      }
+      return CLEAN_STATUS
     })
     const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {})
 
     try {
+      await expect(provider.worktreeIsClean('/repo/first')).resolves.toEqual({ clean: true })
+      const replacement = new SshGitProvider('conn-1', mux as never)
+      await expect(replacement.worktreeIsClean('/repo/second')).resolves.toEqual({ clean: true })
+
+      expect(
+        mux.request.mock.calls.filter(([method]) => method === 'git.worktreeIsClean')
+      ).toHaveLength(2)
+      expect(warnSpy).toHaveBeenCalledTimes(2)
+    } finally {
+      warnSpy.mockRestore()
+    }
+  })
+
+  it('worktreeIsClean filters untracked entries in old-relay fallback', async () => {
+    mux.request.mockImplementation(async (method) => {
+      if (method === 'git.worktreeIsClean') {
+        throw methodNotFound(method)
+      }
+      return {
+        entries: [{ path: 'scratch.txt', status: 'untracked', area: 'untracked' }],
+        conflictOperation: 'unknown'
+      }
+    })
+    const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {})
+
+    try {
+      await expect(provider.worktreeIsClean('/home/user/feat')).resolves.toEqual({
+        clean: false,
+        stdout: 'untracked untracked: scratch.txt'
+      })
       await expect(
         provider.worktreeIsClean('/home/user/feat', { includeUntracked: false })
       ).resolves.toEqual({ clean: true })
       expect(mux.request).toHaveBeenNthCalledWith(
-        2,
+        3,
         'git.status',
         { worktreePath: '/home/user/feat' },
         { signal: expect.any(AbortSignal) }
       )
+      expect(
+        mux.request.mock.calls.filter(([method]) => method === 'git.worktreeIsClean')
+      ).toHaveLength(1)
     } finally {
       warnSpy.mockRestore()
     }
@@ -183,11 +378,7 @@ describe('SshGitProvider', () => {
   })
 
   it('forceDeletePreservedBranch maps old relays to the reconnect message', async () => {
-    const methodNotFound = Object.assign(
-      new Error('Method not found: git.forceDeletePreservedBranch'),
-      { code: -32601 }
-    )
-    mux.request.mockRejectedValueOnce(methodNotFound)
+    mux.request.mockRejectedValueOnce(methodNotFound('git.forceDeletePreservedBranch'))
 
     await expect(
       provider.forceDeletePreservedBranch('/home/user/repo', 'you/fix-auth', 'abc123')
diff --git a/src/main/providers/ssh-git-worktree-provider.ts b/src/main/providers/ssh-git-worktree-provider.ts
index ce509ccf847..d5cf9b5a5e1 100644
--- a/src/main/providers/ssh-git-worktree-provider.ts
+++ b/src/main/providers/ssh-git-worktree-provider.ts
@@ -1,9 +1,12 @@
 import type { GitStatusResult } from '../../shared/git-status-types'
 import type { RemoveWorktreeResult } from '../../shared/worktree/create-types'
 import type { GitWorktreeInfo } from '../../shared/worktree/types'
+import { CapabilityProbeCache } from '../../shared/capability-probe-cache'
 import { isJsonRpcMethodNotFoundError } from './ssh-git-relay-errors'
 import { SshGitReviewHeadProvider } from './ssh-git-review-head-provider'
 
+const WORKTREE_IS_CLEAN_CAPABILITY = 'git.worktreeIsClean' as const
+
 function formatStatusEntriesForCleanCheck(entries: GitStatusResult['entries']): string | undefined {
   if (entries.length === 0) {
     return undefined
@@ -20,6 +23,10 @@ function filterUntrackedPorcelainStatus(stdout: string | undefined): string | un
 
 export class SshGitWorktreeProvider extends SshGitReviewHeadProvider {
   private loggedWorktreeIsCleanFallback = false
+  // Why: reconnect replaces this provider, so an upgraded relay is naturally re-probed.
+  private readonly worktreeIsCleanCapabilityCache = new CapabilityProbeCache<
+    typeof WORKTREE_IS_CLEAN_CAPABILITY
+  >(Number.POSITIVE_INFINITY)
 
   async listWorktrees(
     repoPath: string,
@@ -67,37 +74,39 @@ export class SshGitWorktreeProvider extends SshGitReviewHeadProvider {
     worktreePath: string,
     options: { includeUntracked?: boolean } = {}
   ): Promise<{ clean: boolean; stdout?: string }> {
-    try {
-      const result = (await this.mux.request('git.worktreeIsClean', {
-        worktreePath,
-        ...(options.includeUntracked === false ? { includeUntracked: false } : {})
-      })) as { clean: boolean; stdout?: string }
-      if (options.includeUntracked === false) {
-        if (!result.clean && result.stdout === undefined) {
-          return result
+    return this.worktreeIsCleanCapabilityCache.runWithFallback(
+      WORKTREE_IS_CLEAN_CAPABILITY,
+      async () => {
+        const result = (await this.mux.request('git.worktreeIsClean', {
+          worktreePath,
+          ...(options.includeUntracked === false ? { includeUntracked: false } : {})
+        })) as { clean: boolean; stdout?: string }
+        if (options.includeUntracked === false) {
+          if (!result.clean && result.stdout === undefined) {
+            return result
+          }
+          const trackedStdout = filterUntrackedPorcelainStatus(result.stdout)
+          return { clean: !trackedStdout, ...(trackedStdout ? { stdout: trackedStdout } : {}) }
         }
-        const trackedStdout = filterUntrackedPorcelainStatus(result.stdout)
-        return { clean: !trackedStdout, ...(trackedStdout ? { stdout: trackedStdout } : {}) }
-      }
-      return result
-    } catch (error) {
-      if (!isJsonRpcMethodNotFoundError(error)) {
-        throw error
-      }
-      if (!this.loggedWorktreeIsCleanFallback) {
-        this.loggedWorktreeIsCleanFallback = true
-        console.warn(
-          '[ssh-git] Relay does not implement git.worktreeIsClean; falling back to git.status clean check'
-        )
-      }
-      const status = await this.getStatus(worktreePath)
-      const entries =
-        options.includeUntracked === false
-          ? status.entries.filter((entry) => entry.area !== 'untracked')
-          : status.entries
-      const clean = entries.length === 0
-      return { clean, stdout: formatStatusEntriesForCleanCheck(entries) }
-    }
+        return result
+      },
+      async () => {
+        if (!this.loggedWorktreeIsCleanFallback) {
+          this.loggedWorktreeIsCleanFallback = true
+          console.warn(
+            '[ssh-git] Relay does not implement git.worktreeIsClean; falling back to git.status clean check'
+          )
+        }
+        const status = await this.getStatus(worktreePath)
+        const entries =
+          options.includeUntracked === false
+            ? status.entries.filter((entry) => entry.area !== 'untracked')
+            : status.entries
+        const clean = entries.length === 0
+        return { clean, stdout: formatStatusEntriesForCleanCheck(entries) }
+      },
+      isJsonRpcMethodNotFoundError
+    )
   }
 
   async refreshLocalBaseRefForWorktreeCreate(args: {
diff --git a/src/main/pty/omp-shell-wrapper.node-pty.test.ts b/src/main/pty/omp-shell-wrapper.node-pty.test.ts
index 6ab30dfdbae..15bc98bdb3b 100644
--- a/src/main/pty/omp-shell-wrapper.node-pty.test.ts
+++ b/src/main/pty/omp-shell-wrapper.node-pty.test.ts
@@ -1,11 +1,13 @@
 import { spawnSync } from 'node:child_process'
 import {
   chmodSync,
+  existsSync,
   mkdtempSync,
   mkdirSync,
   readFileSync,
   realpathSync,
   rmSync,
+  symlinkSync,
   writeFileSync
 } from 'node:fs'
 import { tmpdir } from 'node:os'
@@ -334,18 +336,82 @@ exit 0
     const homeDir = join(tempDir, 'home')
     const binDir = join(tempDir, 'bin')
     const extensionDir = join(tempDir, 'extensions')
+    const logicalProjectLink = join(tempDir, 'logical-project')
     mkdirSync(projectDir, { recursive: true })
     mkdirSync(homeDir)
     mkdirSync(binDir)
     mkdirSync(extensionDir)
+    symlinkSync(projectDir, logicalProjectLink)
     const expectedProjectDir = realpathSync(projectDir)
+    const expectedWorkspaceDir = realpathSync(workspaceDir)
     const statusExtension = join(extensionDir, 'orca-agent-status.ts')
     writeFileSync(statusExtension, 'export default {}')
     writeFakeOmp(binDir)
 
     const unsetPwdCaptureFile = join(tempDir, 'unset-pwd-capture')
+    const deletedLinkCaptureFile = join(tempDir, 'deleted-link-capture')
     const staleCaptureFile = join(tempDir, 'stale-cwd-capture')
+    const skipCaptureFile = join(tempDir, 'skip-capture')
+    const staleUnsetCaptureFile = join(tempDir, 'stale-unset-capture')
+    const noLogicalCaptureFile = join(tempDir, 'no-logical-capture')
     const resultFile = join(tempDir, 'stale-cwd-result')
+    const scenarioFile = join(tempDir, 'stale-cwd-scenario')
+    writeFileSync(
+      scenarioFile,
+      `ORCA_CAPTURE_FILE="$ORCA_UNSET_PWD_CAPTURE_FILE"
+unset PWD
+omp
+__orca_test_unset_status=$?
+if [[ -z "\${PWD+x}" ]]; then
+  __orca_test_pwd_state=unset
+else
+  __orca_test_pwd_state=set
+fi
+builtin cd -- "$ORCA_LOGICAL_PROJECT_LINK"
+/bin/rm -- "$ORCA_LOGICAL_PROJECT_LINK"
+ORCA_CAPTURE_FILE="$ORCA_DELETED_LINK_CAPTURE_FILE"
+omp
+__orca_test_deleted_link_status=$?
+builtin cd -P -- "$ORCA_STALE_PROJECT_DIR"
+ORCA_CAPTURE_FILE="$ORCA_STALE_CAPTURE_FILE"
+/bin/rm -rf -- "$ORCA_STALE_PROJECT_DIR"
+/bin/mkdir -p -- "$ORCA_STALE_PROJECT_DIR"
+omp
+__orca_test_first_status=$?
+ORCA_CAPTURE_FILE="$ORCA_SKIP_CAPTURE_FILE"
+omp --version
+__orca_test_skip_status=$?
+if [[ "$PWD" -ef . ]]; then
+  __orca_test_parent_state=live
+else
+  __orca_test_parent_state=stale
+fi
+unset PWD
+ORCA_CAPTURE_FILE="$ORCA_STALE_UNSET_CAPTURE_FILE"
+omp
+__orca_test_stale_unset_status=$?
+unset ORCA_WORKTREE_PATH ORCA_ROOT_PATH
+ORCA_CAPTURE_FILE="$ORCA_NO_LOGICAL_CAPTURE_FILE"
+omp
+__orca_test_no_logical_status=$?
+PWD="$ORCA_STALE_PROJECT_DIR"
+/bin/rm -rf -- "$ORCA_STALE_PROJECT_DIR"
+omp
+__orca_test_missing_status=$?
+{
+  echo "UNSET=$__orca_test_unset_status"
+  echo "PWD=$__orca_test_pwd_state"
+  echo "LINK=$__orca_test_deleted_link_status"
+  echo "FIRST=$__orca_test_first_status"
+  echo "SKIP=$__orca_test_skip_status"
+  echo "PARENT=$__orca_test_parent_state"
+  echo "STALE_UNSET=$__orca_test_stale_unset_status"
+  echo "NO_LOGICAL=$__orca_test_no_logical_status"
+  echo "MISSING=$__orca_test_missing_status"
+} > "$ORCA_RESULT_FILE"
+exit 0
+`
+    )
     const output = await runInteractivePosixPty({
       shell,
       cwd: projectDir,
@@ -355,47 +421,30 @@ ${getPosixOmpShellWrapper()}`,
         INPUTRC: '/dev/null',
         PROMPT_COMMAND: '',
         ORCA_STALE_PROJECT_DIR: projectDir,
+        ORCA_LOGICAL_PROJECT_LINK: logicalProjectLink,
         ORCA_UNSET_PWD_CAPTURE_FILE: unsetPwdCaptureFile,
+        ORCA_DELETED_LINK_CAPTURE_FILE: deletedLinkCaptureFile,
         ORCA_STALE_CAPTURE_FILE: staleCaptureFile,
+        ORCA_SKIP_CAPTURE_FILE: skipCaptureFile,
+        ORCA_STALE_UNSET_CAPTURE_FILE: staleUnsetCaptureFile,
+        ORCA_NO_LOGICAL_CAPTURE_FILE: noLogicalCaptureFile,
         ORCA_WORKTREE_PATH: workspaceDir,
         HOME: homeDir,
         PATH: `${binDir}:/usr/bin:/bin:/usr/sbin:/sbin`,
         ORCA_OMP_STATUS_EXTENSION: statusExtension,
         ORCA_CAPTURE_FILE: staleCaptureFile,
         ORCA_RESULT_FILE: resultFile,
+        ORCA_SCENARIO_FILE: scenarioFile,
         ORCA_TEST_FAKE_OMP_EXIT_CODE: '23',
         TERM: 'xterm-256color'
       },
-      input: `ORCA_CAPTURE_FILE="$ORCA_UNSET_PWD_CAPTURE_FILE"
-unset PWD
-omp
-__orca_test_unset_status=$?
-if [[ -z "\${PWD+x}" ]]; then
-  __orca_test_pwd_state=unset
-else
-  __orca_test_pwd_state=set
-fi
-builtin cd -P -- "$ORCA_STALE_PROJECT_DIR"
-ORCA_CAPTURE_FILE="$ORCA_STALE_CAPTURE_FILE"
-/bin/rm -rf -- "$ORCA_STALE_PROJECT_DIR"
-/bin/mkdir -p -- "$ORCA_STALE_PROJECT_DIR"
-omp
-__orca_test_first_status=$?
-if [[ "$PWD" -ef . ]]; then
-  __orca_test_parent_state=live
-else
-  __orca_test_parent_state=stale
-fi
-/bin/rm -rf -- "$ORCA_STALE_PROJECT_DIR"
-omp
-__orca_test_missing_status=$?
-printf 'UNSET=%s\nPWD=%s\nFIRST=%s\nPARENT=%s\nMISSING=%s\n' "$__orca_test_unset_status" "$__orca_test_pwd_state" "$__orca_test_first_status" "$__orca_test_parent_state" "$__orca_test_missing_status" > "$ORCA_RESULT_FILE"
-exit 0
-`
+      input: 'source "$ORCA_SCENARIO_FILE"\n'
     })
 
     const unsetPwdCapture = readFileSync(unsetPwdCaptureFile, 'utf8')
     expect(unsetPwdCapture).toContain(`CWD=${expectedProjectDir}`)
+    const deletedLinkCapture = readFileSync(deletedLinkCaptureFile, 'utf8')
+    expect(deletedLinkCapture).toContain(`CWD=${expectedProjectDir}`)
     const staleCapture = readFileSync(staleCaptureFile, 'utf8')
     expect(staleCapture).toContain(`CWD=${expectedProjectDir}`)
     expect(staleCapture.split('\n').filter((line) => line.startsWith('ARG'))).toEqual([
@@ -403,9 +452,17 @@ exit 0
       `ARG2=${statusExtension}`
     ])
     expect(staleCapture).not.toContain('--cwd')
+    const skipCapture = readFileSync(skipCaptureFile, 'utf8')
+    expect(skipCapture).toContain(`CWD=${expectedProjectDir}`)
+    expect(skipCapture).toContain('ARG1=--version')
+    expect(skipCapture).not.toContain('--extension')
+    const staleUnsetCapture = readFileSync(staleUnsetCaptureFile, 'utf8')
+    expect(staleUnsetCapture).toContain(`CWD=${expectedWorkspaceDir}`)
+    expect(existsSync(noLogicalCaptureFile)).toBe(false)
     expect(readFileSync(resultFile, 'utf8')).toBe(
-      'UNSET=23\nPWD=unset\nFIRST=23\nPARENT=stale\nMISSING=1\n'
+      'UNSET=23\nPWD=unset\nLINK=23\nFIRST=23\nSKIP=23\nPARENT=stale\nSTALE_UNSET=23\nNO_LOGICAL=1\nMISSING=1\n'
     )
+    expect(output).toContain('no terminal working directory is available')
     expect(output).toContain('Orca: OMP cannot access the terminal working directory')
   }
 
diff --git a/src/main/pty/omp-shell-wrapper.ts b/src/main/pty/omp-shell-wrapper.ts
index fb6d274dc57..f5bc25421bb 100644
--- a/src/main/pty/omp-shell-wrapper.ts
+++ b/src/main/pty/omp-shell-wrapper.ts
@@ -52,11 +52,14 @@ __orca_omp_should_skip_extension() {
   return 1
 }
 __orca_omp_cwd_is_usable() {
+  local __orca_physical_cwd
   [[ -x . ]] || return 1
-  if [[ -n "\${PWD:-}" ]]; then
-    [[ -d "\${PWD}" && "\${PWD}" -ef . ]]
+  if [[ -n "\${PWD:-}" && -d "\${PWD:-}" ]]; then
+    [[ "\${PWD}" -ef . ]]
   else
-    builtin pwd -P >/dev/null 2>&1
+    # Why compare the path: shell builtins can print a cached path for a deleted cwd.
+    __orca_physical_cwd="$(builtin pwd -P 2>/dev/null)" || return 1
+    [[ -d "$__orca_physical_cwd" && "$__orca_physical_cwd" -ef . ]]
   fi
 }
 __orca_omp_invoke() {
@@ -76,7 +79,7 @@ __orca_omp_invoke() {
 __orca_omp() {
   local __orca_use_extension=1
   __orca_omp_should_skip_extension "\${1:-}" && __orca_use_extension=0
-  if [[ $__orca_use_extension -eq 1 ]] && ! __orca_omp_cwd_is_usable; then
+  if ! __orca_omp_cwd_is_usable; then
     local __orca_logical_cwd="\${PWD:-\${ORCA_WORKTREE_PATH:-\${ORCA_ROOT_PATH:-}}}"
     # Why: a restored shell can retain the deleted directory inode after its path is recreated.
     (
diff --git a/src/main/rate-limits/service.ts b/src/main/rate-limits/service.ts
index d6f291d6b38..8ce0b167a4a 100644
--- a/src/main/rate-limits/service.ts
+++ b/src/main/rate-limits/service.ts
@@ -1938,16 +1938,14 @@ export class RateLimitService {
             allowPtyFallback: this.shouldAllowCodexPtyFallback(),
             signal
           })
-    ).catch(
-      (err): ProviderRateLimits => ({
-        provider: 'codex',
-        session: null,
-        weekly: null,
-        updatedAt: Date.now(),
-        error: err instanceof Error ? err.message : 'Unknown error',
-        status: 'error'
-      })
-    )
+    ).catch((err): ProviderRateLimits => ({
+      provider: 'codex',
+      session: null,
+      weekly: null,
+      updatedAt: Date.now(),
+      error: err instanceof Error ? err.message : 'Unknown error',
+      status: 'error'
+    }))
 
     if (signal.aborted) {
       return
@@ -2008,16 +2006,14 @@ export class RateLimitService {
       allowUsagePanelSupplement: this.shouldAllowClaudeUsagePanelSupplement(),
       networkProxySettings: this.networkProxySettingsResolver?.(),
       signal
-    }).catch(
-      (err): ProviderRateLimits => ({
-        provider: 'claude',
-        session: null,
-        weekly: null,
-        updatedAt: Date.now(),
-        error: err instanceof Error ? err.message : 'Unknown error',
-        status: 'error'
-      })
-    )
+    }).catch((err): ProviderRateLimits => ({
+      provider: 'claude',
+      session: null,
+      weekly: null,
+      updatedAt: Date.now(),
+      error: err instanceof Error ? err.message : 'Unknown error',
+      status: 'error'
+    }))
 
     if (signal.aborted) {
       return
@@ -2060,16 +2056,14 @@ export class RateLimitService {
     const grok = await fetchGrokRateLimits({
       signal,
       authReadResult: grokAuthReadResult
-    }).catch(
-      (err): ProviderRateLimits => ({
-        provider: 'grok',
-        session: null,
-        weekly: null,
-        updatedAt: Date.now(),
-        error: err instanceof Error ? err.message : 'Unknown error',
-        status: 'error'
-      })
-    )
+    }).catch((err): ProviderRateLimits => ({
+      provider: 'grok',
+      session: null,
+      weekly: null,
+      updatedAt: Date.now(),
+      error: err instanceof Error ? err.message : 'Unknown error',
+      status: 'error'
+    }))
 
     if (signal.aborted) {
       return
diff --git a/src/main/repo-worktrees.test.ts b/src/main/repo-worktrees.test.ts
index 3c6910991f0..d0c0ea5c617 100644
--- a/src/main/repo-worktrees.test.ts
+++ b/src/main/repo-worktrees.test.ts
@@ -1,18 +1,26 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
-const { listWorktreesMock } = vi.hoisted(() => ({
-  listWorktreesMock: vi.fn()
+const { listWorktreesMock, listWorktreesStrictMock } = vi.hoisted(() => ({
+  listWorktreesMock: vi.fn(),
+  listWorktreesStrictMock: vi.fn()
 }))
 
 vi.mock('./git/worktree', () => ({
-  listWorktrees: listWorktreesMock
+  listWorktrees: listWorktreesMock,
+  listWorktreesStrict: listWorktreesStrictMock
 }))
 
-import { createFolderWorktree, isRepoRoot, listRepoWorktrees } from './repo-worktrees'
+import {
+  createFolderWorktree,
+  isRepoRoot,
+  listLocalRepoWorktreesStrict,
+  listRepoWorktrees
+} from './repo-worktrees'
 
 describe('repo-worktrees', () => {
   beforeEach(() => {
     listWorktreesMock.mockReset()
+    listWorktreesStrictMock.mockReset()
   })
 
   it('creates a stable synthetic worktree for folder repos', () => {
@@ -56,6 +64,29 @@ describe('repo-worktrees', () => {
     expect(listWorktreesMock).not.toHaveBeenCalled()
   })
 
+  it('returns the synthetic folder worktree for strict local listing', async () => {
+    const result = await listLocalRepoWorktreesStrict({
+      id: 'repo-1',
+      path: '/workspace/folder',
+      displayName: 'folder',
+      badgeColor: '#000',
+      addedAt: 0,
+      kind: 'folder'
+    })
+
+    expect(result).toEqual([
+      createFolderWorktree({
+        id: 'repo-1',
+        path: '/workspace/folder',
+        displayName: 'folder',
+        badgeColor: '#000',
+        addedAt: 0,
+        kind: 'folder'
+      })
+    ])
+    expect(listWorktreesStrictMock).not.toHaveBeenCalled()
+  })
+
   it('delegates to git worktree listing for git repos', async () => {
     listWorktreesMock.mockResolvedValue([
       { path: '/workspace/repo', head: 'abc', branch: '', isBare: false, isMainWorktree: true }
@@ -78,6 +109,46 @@ describe('repo-worktrees', () => {
     expect(result).toHaveLength(1)
   })
 
+  it('delegates strict local listing with the signal and WSL options', async () => {
+    listWorktreesStrictMock.mockResolvedValue([
+      { path: '/workspace/repo', head: 'abc', branch: '', isBare: false, isMainWorktree: true }
+    ])
+    const signal = new AbortController().signal
+
+    const result = await listLocalRepoWorktreesStrict(
+      {
+        id: 'repo-1',
+        path: '/workspace/repo',
+        displayName: 'repo',
+        badgeColor: '#000',
+        addedAt: 0,
+        kind: 'git'
+      },
+      { signal, wslDistro: 'Ubuntu' }
+    )
+
+    expect(listWorktreesStrictMock).toHaveBeenCalledWith('/workspace/repo', {
+      signal,
+      wslDistro: 'Ubuntu'
+    })
+    expect(result).toHaveLength(1)
+  })
+
+  it('rejects strict listing for remote repos', async () => {
+    await expect(
+      listLocalRepoWorktreesStrict({
+        id: 'repo-1',
+        path: '/workspace/repo',
+        displayName: 'repo',
+        badgeColor: '#000',
+        addedAt: 0,
+        connectionId: 'ssh-1',
+        kind: 'git'
+      })
+    ).rejects.toThrow('remote repository')
+    expect(listWorktreesStrictMock).not.toHaveBeenCalled()
+  })
+
   it('treats Windows repo root casing differences as the same local root', () => {
     const repos = [
       {
diff --git a/src/main/repo-worktrees.ts b/src/main/repo-worktrees.ts
index f4123c18889..14751c17861 100644
--- a/src/main/repo-worktrees.ts
+++ b/src/main/repo-worktrees.ts
@@ -1,6 +1,6 @@
 import type { Repo } from '../shared/repo-types'
 import type { GitWorktreeInfo } from '../shared/worktree/types'
-import { listWorktrees } from './git/worktree'
+import { listWorktrees, listWorktreesStrict } from './git/worktree'
 import { isFolderRepo } from '../shared/repo-kind'
 import { getSshGitProvider } from './providers/ssh-git-dispatch'
 import { areWorktreePathsEqual } from './ipc/worktree-logic'
@@ -51,3 +51,18 @@ export async function listRepoWorktrees(
     ? await listWorktrees(repo.path, options)
     : await listWorktrees(repo.path)
 }
+
+export async function listLocalRepoWorktreesStrict(
+  repo: Repo,
+  options?: LocalRepoWorktreeListOptions
+): Promise<GitWorktreeInfo[]> {
+  if (repo.connectionId) {
+    throw new Error('Cannot list worktrees for a remote repository')
+  }
+  if (isFolderRepo(repo)) {
+    return [createFolderWorktree(repo)]
+  }
+  return hasLocalRepoWorktreeListOptions(options)
+    ? await listWorktreesStrict(repo.path, options)
+    : await listWorktreesStrict(repo.path)
+}
diff --git a/src/main/runtime/mobile-rpc-allowlist.test.ts b/src/main/runtime/mobile-rpc-allowlist.test.ts
index 5d0faab64f9..adf9223b39a 100644
--- a/src/main/runtime/mobile-rpc-allowlist.test.ts
+++ b/src/main/runtime/mobile-rpc-allowlist.test.ts
@@ -95,7 +95,10 @@ function mobileRpcMethods(): string[] {
 }
 
 function mobileRpcAllowlist(): Set<string> {
-  const source = readFileSync(join(process.cwd(), 'src/main/runtime/runtime-rpc.ts'), 'utf8')
+  const source = readFileSync(
+    join(process.cwd(), 'src/main/runtime/runtime-rpc/runtime-rpc-mobile-method-allowlist.ts'),
+    'utf8'
+  )
   const allowlist = source.match(/const MOBILE_RPC_METHOD_ALLOWLIST = new Set\(\[([\s\S]*?)\]\)/)
   if (!allowlist) {
     throw new Error('MOBILE_RPC_METHOD_ALLOWLIST not found')
diff --git a/src/main/runtime/orca-runtime.ts b/src/main/runtime/orca-runtime.ts
index 71f5b3b4cee..750d606c642 100644
--- a/src/main/runtime/orca-runtime.ts
+++ b/src/main/runtime/orca-runtime.ts
@@ -6071,22 +6071,18 @@ export class OrcaRuntimeService {
     )
     const worktrees = (await this.listResolvedWorktrees())
       .filter((worktree) => repos.has(getRepoIdFromWorktreeId(worktree.id)))
-      .map(
-        (worktree): SkillSshWorkspaceAuthority => ({
-          kind: 'worktree',
-          id: worktree.id,
-          path: worktree.path
-        })
-      )
+      .map((worktree): SkillSshWorkspaceAuthority => ({
+        kind: 'worktree',
+        id: worktree.id,
+        path: worktree.path
+      }))
     const folders = this.listFolderWorkspaces()
       .filter((folder) => folder.connectionId === connectionId)
-      .map(
-        (folder): SkillSshWorkspaceAuthority => ({
-          kind: 'folder',
-          id: folder.id,
-          path: folder.folderPath
-        })
-      )
+      .map((folder): SkillSshWorkspaceAuthority => ({
+        kind: 'folder',
+        id: folder.id,
+        path: folder.folderPath
+      }))
     return [...worktrees, ...folders]
   }
 
diff --git a/src/main/runtime/rpc/terminal-output-frame-chunks.ts b/src/main/runtime/rpc/terminal-output-frame-chunks.ts
index 91bbc506680..78d570b87e6 100644
--- a/src/main/runtime/rpc/terminal-output-frame-chunks.ts
+++ b/src/main/runtime/rpc/terminal-output-frame-chunks.ts
@@ -34,7 +34,7 @@ export function exceedsTerminalStreamChunkBytes(data: string): boolean {
     return false
   }
   let byteLength = 0
-  for (let start = 0; start < data.length; ) {
+  for (let start = 0; start < data.length;) {
     let end = Math.min(start + TERMINAL_STREAM_BYTE_PROBE_CODE_UNITS, data.length)
     const high = data.charCodeAt(end - 1)
     const low = data.charCodeAt(end)
diff --git a/src/main/runtime/runtime-rpc.ts b/src/main/runtime/runtime-rpc.ts
index b508f734c04..e7450ff5720 100644
--- a/src/main/runtime/runtime-rpc.ts
+++ b/src/main/runtime/runtime-rpc.ts
@@ -1,1894 +1,23 @@
-/* eslint-disable max-lines -- Why: this file is the single security boundary for the bundled CLI — transport setup, auth-token enforcement, admission control, keepalive framing, and orphan-socket sweeping all co-locate deliberately so a reviewer can audit the boundary in one sitting. Splitting this across files would scatter the invariants without reducing complexity. */
 // Why: the single security boundary for the bundled CLI — auth-token enforcement, metadata publication, transport orchestration.
-import { randomBytes } from 'node:crypto'
-import { readdirSync, rmSync } from 'node:fs'
-import { join } from 'node:path'
-import type { RuntimeMetadata, RuntimeTransportMetadata } from '../../shared/runtime-bootstrap'
-import type { OrcaRuntimeService } from './orca-runtime'
-import { NETWORK_EXPOSURE_FAILED_GUIDANCE } from './network-exposure-guidance'
-import { writeRuntimeMetadata } from './runtime-metadata'
-import {
-  RUNTIME_METADATA_OWNERSHIP_POLL_MS,
-  watchRuntimeMetadataOwnership,
-  type RuntimeMetadataOwnershipWatch
-} from './runtime-metadata-ownership-watch'
-import { RpcDispatcher } from './rpc/dispatcher'
-import { ALL_RPC_METHODS } from './rpc/methods'
-import type { RpcAnyMethod, RpcRequest, RpcResponse } from './rpc/core'
-import { errorResponse } from './rpc/errors'
-import { fingerprintAuthenticatedPairingCredential } from './rpc/orchestration-mutation-executor'
-import type { RpcMessageContext, RpcTransport } from './rpc/transport'
-import { UnixSocketTransport } from './rpc/unix-socket-transport'
-import { WebSocketTransport } from './rpc/ws-transport'
-import { readWsFallbackPort, writeWsFallbackPort } from './rpc/ws-fallback-port-store'
-import type { WebSocket } from 'ws'
-import { DeviceRegistry, type DeviceEntry, type DeviceScope } from './device-registry'
-import { loadOrCreateE2EEKeypair, type E2EEKeypair } from './e2ee-keypair'
-import { UnpairedDeviceAuthThrottle } from './rpc/unpaired-device-auth-throttle'
-import {
-  MobileSocketWiring,
-  type AuthenticatedMobileSocket,
-  type MobileSocketTransportMetadata
-} from './rpc/mobile-socket-wiring'
-import type { PairingRelay } from '../../shared/mobile-relay-pairing-offer'
-import type { MobilePairingConnectionMode } from '../../shared/mobile-pairing-connection-mode'
-import type { RuntimePairingReach } from '../../shared/runtime-pairing-reach'
-import {
-  mobileRelayMintFailureFromUnknown,
-  type MobileRelayMintFailure
-} from '../../shared/mobile-relay-mint-failure'
-import {
-  RelayRevokeOutbox,
-  type RelayDeviceBinding,
-  type RelayRevokeOutboxItem
-} from './relay/relay-revoke-outbox'
-import type {
-  DeviceCredentialInstalled,
-  PairingGetEndpointsParams,
-  PairingGetEndpointsResult,
-  PairingProvisionRelayParams
-} from '../../shared/mobile-relay-credential-contract'
-import { encodePairingOffer, PAIRING_OFFER_VERSION } from '../../shared/pairing'
-import { resolveAdvertisedPairingEndpoint } from './pairing-endpoint'
-import type { TerminalStreamFrame } from '../../shared/terminal-stream-protocol'
-import { RuntimeBinaryMessageRouter } from './runtime-binary-message-router'
+import { RuntimeRpcShutdown } from './runtime-rpc/runtime-rpc-shutdown'
+import type { OrcaRuntimeRpcServerOptions } from './runtime-rpc/runtime-rpc-pairing-types'
 
-const DEFAULT_WS_PORT = 6768
+export type {
+  PairingOfferUnavailableReason,
+  PairingOfferUnavailable
+} from './runtime-rpc/runtime-rpc-pairing-types'
+export type { MobilePairingConnectionContext } from './runtime-rpc/runtime-rpc-pairing-types'
+export type { RuntimeLongPollClass } from './runtime-rpc/runtime-rpc-long-poll'
+export { classifyRuntimeLongPoll } from './runtime-rpc/runtime-rpc-long-poll'
 
-// Why: STA-2370 — the WS listener defaults to loopback so a desktop with no paired device is not
-// reachable from the LAN; it widens to all interfaces only on explicit pairing (or `orca serve`).
-const WS_BIND_HOST_LOOPBACK = '127.0.0.1'
-const WS_BIND_HOST_ALL_INTERFACES = '0.0.0.0'
-
-// Why brackets: `ws://::1:6768` is not a URL, and every consumer of this endpoint parses it
-// with `new URL`. An IPv6 bind address would otherwise publish an unparseable endpoint.
-function formatWsEndpoint(host: string, port: number): string {
-  return `ws://${host.includes(':') ? `[${host}]` : host}:${port}`
-}
-
-type OrcaRuntimeRpcServerOptions = {
-  runtime: OrcaRuntimeService
-  userDataPath: string
-  pid?: number
-  platform?: NodeJS.Platform
-  enableWebSocket?: boolean
-  wsPort?: number
-  // Why: true when the caller pinned a port (`orca serve --port`) so bind order prefers it over a stale STA-1511 fallback (#8535).
-  preferPinnedWsPort?: boolean
-  // Why: STA-2370 — bind the WS listener to all interfaces at startup instead of loopback-until-paired.
-  // Only `orca serve` (explicit remote opt-in) and E2E set this; the desktop app widens lazily on pairing.
-  exposeNetworkByDefault?: boolean
-  /**
-   * Pin the WS listener to exactly this address for the process's whole life.
-   *
-   * Why a pin and not another default: the two paths below both widen on their own —
-   * `exposeNetworkByDefault` at startup, and a device that has connected once at every
-   * later startup. An unattended host (orcad) whose operator asked for loopback must
-   * still be on loopback after a client pairs and the service restarts, so the answer
-   * has to outrank both, and `ensureNetworkExposure()` has to refuse rather than widen.
-   */
-  pinnedBindHost?: string
-  webClientRoot?: string
-  // Why: test-only overrides for the two constants below; production must not pass these (defaults set by §3.1).
-  keepaliveIntervalMs?: number
-  longPollCap?: number
-  // Why: test-only override for the ownership reclaim cadence.
-  metadataOwnershipPollMs?: number
-  // Why: tests may inject inert protocol stages before production authorization registers them.
-  methods?: readonly RpcAnyMethod[]
-}
-
-export type PairingOfferUnavailableReason =
-  | 'websocket_unavailable'
-  | 'device_registry_unavailable'
-  | 'e2ee_key_unavailable'
-  | 'invalid_advertised_endpoint'
-  | 'relay_mint_failed'
-  | 'network_exposure_failed'
-
-export type PairingOfferUnavailable = {
-  available: false
-  reason: PairingOfferUnavailableReason
-  guidance: string
-  /** Present when an Anywhere mint refused to silently fall back to LAN-only. */
-  relayFailure?: MobileRelayMintFailure
-}
-
-type MobilePairingOfferAvailable = {
-  available: true
-  pairingUrl: string
-  endpoint: string
-  deviceId: string
-  webClientUrl: string | null
-  /** Mode the offer actually encodes. */
-  connectionMode: MobilePairingConnectionMode
-}
-
-type MobilePairingOffer = PairingOfferUnavailable | MobilePairingOfferAvailable
-
-type PairingIdentityInitialization =
-  | { ok: true; deviceRegistry: DeviceRegistry; e2eeKeypair: E2EEKeypair }
-  | { ok: false; failure: PairingOfferUnavailable }
-
-function pairingUnavailable(
-  reason: PairingOfferUnavailableReason,
-  guidance: string
-): PairingOfferUnavailable {
-  return { available: false, reason, guidance }
-}
-
-const DEVICE_REGISTRY_UNAVAILABLE_GUIDANCE =
-  'The pairing registry is unavailable. Verify that the Orca data directory is writable.'
-const E2EE_KEY_UNAVAILABLE_GUIDANCE =
-  'The E2EE identity is unavailable. Verify that the Orca data directory is writable.'
-
-type MobileRelayPairingProvider = {
-  createPairingRelay(
-    relayDeviceId: string
-  ): Promise<{ relay: PairingRelay; binding: RelayDeviceBinding }>
-  onDeviceRevokeQueued(item: RelayRevokeOutboxItem): void
-  onDemandStateChanged?(): void
-  getEndpoints(
-    context: MobilePairingConnectionContext,
-    params: PairingGetEndpointsParams
-  ): Promise<PairingGetEndpointsResult>
-  provisionRelay(
-    context: MobilePairingConnectionContext,
-    params: PairingProvisionRelayParams
-  ): Promise<DeviceCredentialInstalled>
-}
-
-export type MobilePairingConnectionContext = Readonly<{
-  deviceId: string
-  connectionId: string
-  transport: MobileSocketTransportMetadata
-}>
-
-// Why: keepalive frames count as socket activity, resetting both idle timers so long-polls outlive the 30s/60s idle caps. See §3.1.
-const KEEPALIVE_INTERVAL_MS = 10_000
-
-// Why: cap long-polls at half the 32-slot connection budget so they can't starve short RPCs; overflow → runtime_busy. See §7 risk #2.
-const LONG_POLL_CAP = 16
-
-// Why: orchestration.ask blocks on a human/agent reply for minutes, an order of
-// magnitude longer than terminal.wait or check --wait, so a fleet of asking
-// workers would otherwise hold every slot and starve the mobile/web/CLI/relay
-// clients sharing this runtime. Reserve half the budget for the other classes.
-const ASK_LONG_POLL_SHARE = 0.5
-// Why: eight host slots preserve four-host overlap for two independently paired desktops.
-const BROWSER_HOST_LONG_POLL_SHARE = 0.5
-// Why: asks and permanent hosts together retain the prior quarter-budget reservation for waits.
-const SPECIALIZED_LONG_POLL_SHARE = 0.75
-
-function createWebClientUrl(endpoint: string, pairingUrl: string): string {
-  const url = new URL(endpoint)
-  url.protocol = url.protocol === 'wss:' ? 'https:' : 'http:'
-  url.pathname = webClientPathForEndpoint(url.pathname)
-  url.search = ''
-  // Why: pairing URLs carry full credentials; the fragment keeps them out of proxy logs and Referer headers.
-  url.hash = `pairing=${encodeURIComponent(pairingUrl)}`
-  return url.toString()
-}
-
-function webClientPathForEndpoint(pathname: string): string {
-  if (!pathname || pathname === '/') {
-    return '/web-index.html'
-  }
-  return `${pathname.replace(/\/$/, '')}/web-index.html`
-}
-
-const MOBILE_RPC_METHOD_ALLOWLIST = new Set([
-  'accounts.list',
-  'accounts.consumeCodexResetCredit',
-  'accounts.selectClaude',
-  'accounts.selectCodex',
-  'accounts.selectCodexForTarget',
-  'accounts.subscribe',
-  'accounts.unsubscribe',
-  'aiVault.listSessions',
-  'aiVault.resolveSessionTitles',
-  'aiVault.prepareSessionResume',
-  'browser.back',
-  'browser.dialogAccept',
-  'browser.dialogDismiss',
-  'browser.forward',
-  'browser.goto',
-  'browser.keyboardInsertText',
-  'browser.keypress',
-  'browser.mouseDown',
-  'browser.mouseClick',
-  'browser.mouseMove',
-  'browser.mouseUp',
-  'browser.mouseWheel',
-  'browser.reload',
-  'browser.screencast',
-  'browser.screencast.unsubscribe',
-  'browser.tabCreate',
-  'browser.viewport',
-  'clipboard.abortImageUpload',
-  'clipboard.appendImageUploadChunk',
-  'clipboard.commitImageUpload',
-  'clipboard.saveImageAsTempFile',
-  'clipboard.startImageUpload',
-  'diagnostics.memory',
-  'files.browseServerDir',
-  'files.createFile',
-  'files.list',
-  'files.open',
-  'files.openDiff',
-  'files.read',
-  'files.readDocPreview',
-  'files.readChunk',
-  'files.readDir',
-  'files.readPreview',
-  'files.readTerminalArtifact',
-  'files.readTerminalArtifactPreview',
-  'files.resolveTerminalPath',
-  'files.searchPaths',
-  'files.writeTerminalArtifact',
-  'folderWorkspace.list',
-  'git.abortMerge',
-  'git.abortRebase',
-  'git.bulkStage',
-  'git.bulkUnstage',
-  'git.branchCompare',
-  'git.branchDiff',
-  'git.cancelGenerateCommitMessage',
-  'git.cancelGeneratePullRequestFields',
-  'git.checkout',
-  'git.commit',
-  'git.commitCompare',
-  'git.commitDiff',
-  'git.discard',
-  'git.discoverCommitMessageModels',
-  'git.diff',
-  'git.fetch',
-  'git.forkSync',
-  'git.fastForward',
-  'git.generateCommitMessage',
-  'git.generatePullRequestFields',
-  'git.history',
-  'git.localBranches',
-  'git.pull',
-  'git.push',
-  'git.rebaseFromBase',
-  'git.stage',
-  'git.status',
-  'git.unstage',
-  'git.upstreamStatus',
-  'github.createIssue',
-  'github.addIssueComment',
-  'github.addPRReviewComment',
-  'github.addPRReviewCommentReply',
-  'github.countWorkItems',
-  'github.listAssignableUsers',
-  'github.listLabels',
-  'github.listWorkItems',
-  'github.mergePR',
-  'github.setPRAutoMerge',
-  'github.requestPRReviewers',
-  'github.removePRReviewers',
-  'github.project.listAccessible',
-  'github.project.listAssignableUsersBySlug',
-  'github.project.listIssueTypesBySlug',
-  'github.project.listLabelsBySlug',
-  'github.project.listViews',
-  'github.project.resolveRef',
-  'github.project.addIssueCommentBySlug',
-  'github.project.updateIssueCommentBySlug',
-  'github.project.deleteIssueCommentBySlug',
-  'github.project.clearItemField',
-  'github.project.updateIssueBySlug',
-  'github.project.updateIssueTypeBySlug',
-  'github.project.updateItemField',
-  'github.project.updatePullRequestBySlug',
-  'github.project.viewTable',
-  'github.project.workItemDetailsBySlug',
-  'github.prForBranch',
-  'github.prFileContents',
-  'github.prChecks',
-  'github.prCheckDetails',
-  'github.rerunPRChecks',
-  'github.resolveReviewThread',
-  'github.setPRFileViewed',
-  'github.updateIssue',
-  'github.updatePR',
-  'github.updatePRTitle',
-  'github.updatePRState',
-  'github.repoSlug',
-  'github.workItem',
-  // Cross-repo lookup: lets the mobile Smart picker resolve a pasted github.com URL for a different repo.
-  'github.workItemByOwnerRepo',
-  'github.workItemDetails',
-  'gitlab.createIssue',
-  'gitlab.addIssueComment',
-  'gitlab.addMRComment',
-  'gitlab.listWorkItems',
-  // Mobile Smart picker: resolve a pasted GitLab URL to an exact issue/MR (MR listing reuses gitlab.listWorkItems).
-  'gitlab.workItemByPath',
-  'gitlab.mergeMR',
-  'gitlab.resolveMRDiscussion',
-  'gitlab.todos',
-  'gitlab.updateIssue',
-  'gitlab.updateMR',
-  'gitlab.updateMRState',
-  'gitlab.workItemDetails',
-  'host.gitBash.isAvailable',
-  'host.platform',
-  'host.pwsh.isAvailable',
-  'host.wsl.isAvailable',
-  'host.wsl.listDistros',
-  'hostedReview.create',
-  'hostedReview.createStacked',
-  'hostedReview.forBranch',
-  'hostedReview.getCreationEligibility',
-  'linear.getCustomView',
-  'linear.getIssue',
-  'linear.getProject',
-  'linear.agentSearchIssues',
-  'linear.issueContext',
-  'linear.resolveCurrentIssue',
-  'linear.addIssueComment',
-  'linear.connect',
-  'linear.createIssue',
-  'linear.createProject',
-  'linear.issueComments',
-  'linear.listCustomViewIssues',
-  'linear.listCustomViewProjects',
-  'linear.listCustomViews',
-  'linear.listIssues',
-  'linear.mcpListIssues',
-  'linear.listProjectIssues',
-  'linear.listProjects',
-  'linear.teamLabels',
-  'linear.teamMembers',
-  'linear.listTeams',
-  'linear.searchIssues',
-  'linear.selectWorkspace',
-  'linear.status',
-  'linear.teamStates',
-  'linear.updateIssue',
-  'markdown.readTab',
-  'markdown.saveTab',
-  'notifications.getMissedSince',
-  'notifications.subscribe',
-  'notifications.unsubscribe',
-  'pairing.getEndpoints',
-  'pairing.provisionRelay',
-  'preflight.check',
-  'preflight.detectAgents',
-  'preflight.detectRemoteAgents',
-  'projectGroup.list',
-  'repo.baseRefDefault',
-  'repo.gitAvailable',
-  'repo.hooks',
-  'repo.list',
-  'repo.saveSparsePreset',
-  'repo.searchRefs',
-  'repo.sparsePresets',
-  'repo.update',
-  'runtime.clientEvents.subscribe',
-  'runtime.clientEvents.unsubscribe',
-  'session.tabs.activate',
-  'session.tabs.close',
-  'session.tabs.closeLifecycle',
-  'session.tabs.createTerminal',
-  'session.tabs.list',
-  'session.tabs.listAll',
-  'session.tabs.move',
-  'session.tabs.subscribe',
-  'session.tabs.subscribeAll',
-  'session.tabs.unsubscribe',
-  'session.tabs.unsubscribeAll',
-  'nativeChat.readSession',
-  'nativeChat.subscribe',
-  'nativeChat.unsubscribe',
-  'settings.get',
-  'settings.getTerminalQuickCommands',
-  'settings.update',
-  'settings.updateTerminalQuickCommands',
-  'ssh.connect',
-  'ssh.getState',
-  'ssh.listRemovedTargetLabels',
-  'ssh.listTargets',
-  'ssh.listTargetSummaries',
-  'speech.dictation.cancel',
-  'speech.dictation.chunk',
-  'speech.dictation.finish',
-  'speech.dictation.setup',
-  'speech.dictation.start',
-  'speech.models.delete',
-  'speech.models.download',
-  'speech.models.list',
-  'stats.summary',
-  'status.get',
-  'agentTeams.prepareLaunch',
-  'agentTeams.tmuxCompat',
-  'terminal.clearBuffer',
-  'terminal.close',
-  'terminal.closeTab',
-  'terminal.create',
-  'terminal.createAgentSession',
-  'terminal.ensureAgentSession',
-  'terminal.focus',
-  'terminal.agentStatus',
-  'terminal.adoptOrphans',
-  'terminal.getAutoRestoreFit',
-  'terminal.isRunningAgent',
-  'terminal.list',
-  'terminal.multiplex',
-  'terminal.read',
-  'terminal.rename',
-  'terminal.send',
-  'terminal.setAutoRestoreFit',
-  'terminal.setDisplayMode',
-  'terminal.subscribe',
-  'terminal.unsubscribe',
-  'terminal.updateViewport',
-  'terminal.wait',
-  'ui.get',
-  'ui.recordFeatureInteraction',
-  'ui.set',
-  'worktree.activate',
-  'worktree.create',
-  'worktree.forceDeleteBranch',
-  'worktree.listRetiredNames',
-  'worktree.prefetchCreateBase',
-  'worktree.ps',
-  'worktree.show',
-  'worktree.resolveMrBase',
-  'worktree.resolvePrBase',
-  'worktree.rm',
-  'worktree.set',
-  'worktree.sleep'
-])
-
-// Why: 'ask' is metered separately from 'wait' — same keepalive/abort wiring, its own sub-cap.
-export type RuntimeLongPollClass = 'ask' | 'browser-host' | 'wait'
-
-// Why: single classifier for long-poll requests (handlers that block on an external event), shared by counter/abort/keepalive. See §3.1.
-export function classifyRuntimeLongPoll(request: RpcRequest): RuntimeLongPollClass | null {
-  // Worker start waits for readiness and then verifies the submitted prompt;
-  // the complete operation can run for 90–110s. Keep every local transport
-  // (Unix sockets and Windows named pipes) alive for that long poll.
-  if (request.method === 'orchestration.workerStart') {
-    return 'wait'
-  }
-  if (request.method === 'browser.clientHost.attach') {
-    return 'browser-host'
-  }
-  if (request.method === 'terminal.wait') {
-    return 'wait'
-  }
-  // Agent-prompt submission waits for the PTY's lifecycle transition (up to
-  // the verification budget); keep the local socket alive for that wait.
-  if (
-    request.method === 'terminal.send' &&
-    typeof request.params === 'object' &&
-    request.params !== null &&
-    (request.params as { agentPrompt?: unknown }).agentPrompt === true
-  ) {
-    return 'wait'
-  }
-  // Why: orchestration.ask blocks unconditionally (default 600 s) holding the
-  // RPC open until a reply lands or the deadline passes, so it needs the same
-  // keepalive as check --wait or the 30 s socket idle timer tears it down. It
-  // also relies on the abort signal (only wired for long-polls) to release the
-  // waiter when the asking client disconnects.
-  if (request.method === 'orchestration.ask') {
-    return 'ask'
-  }
-  if (request.method === 'orchestration.check') {
-    const params = request.params as { wait?: unknown } | undefined
-    return params?.wait === true ? 'wait' : null
-  }
-  return null
-}
-
-// Why: status.get has no per-connection context in the dispatcher, so stamp the scope here at the transport boundary.
-function injectDeviceScope(response: string, scope: DeviceScope): string {
-  try {
-    const parsed = JSON.parse(response) as RpcResponse
-    if (parsed.ok !== true || typeof parsed.result !== 'object' || parsed.result === null) {
-      return response
-    }
-    ;(parsed.result as Record<string, unknown>).deviceScope = scope
-    return JSON.stringify(parsed)
-  } catch {
-    return response
+export class OrcaRuntimeRpcServer extends RuntimeRpcShutdown {
+  constructor(options: OrcaRuntimeRpcServerOptions) {
+    super(options)
   }
 }
 
-export class OrcaRuntimeRpcServer {
-  private readonly runtime: OrcaRuntimeService
-  private readonly dispatcher: RpcDispatcher
-  private readonly userDataPath: string
-  private readonly pid: number
-  private readonly platform: NodeJS.Platform
-  private readonly enableWebSocket: boolean
-  private readonly wsPort: number
-  private readonly preferPinnedWsPort: boolean
-  private readonly exposeNetworkByDefault: boolean
-  private readonly pinnedBindHost: string | null
-  private readonly webClientRoot: string | undefined
-  // Why: STA-2370 — the host the WS listener is currently bound to, so pairing can widen loopback→all-interfaces once.
-  private wsBoundHost: string | null = null
-  // Why: STA-2370 — in-flight widen so concurrent pairing requests share a single rebind.
-  private networkExposurePromise: Promise<void> | null = null
-  // Why: STA-2370 — set by stop() so a racing pairing widen can't recreate a live wide listener into the
-  // cleared transport arrays after shutdown; stop() also awaits any in-flight widen before snapshotting.
-  private stopping = false
-  private readonly authToken = randomBytes(24).toString('hex')
-  private readonly keepaliveIntervalMs: number
-  private readonly longPollCap: number
-  private readonly metadataOwnershipPollMs: number
-  private readonly askLongPollCap: number
-  private readonly browserHostLongPollCap: number
-  private readonly browserHostLongPollCapPerDevice: number
-  private readonly specializedLongPollCap: number
-  private readonly relayRevokeOutbox: RelayRevokeOutbox
-  private deviceRegistry: DeviceRegistry | null = null
-  private e2eeKeypair: E2EEKeypair | null = null
-  private pairingInitializationFailure: PairingOfferUnavailable | null = null
-  private tlsFingerprint: string | null = null
-  private activeTransports: RpcTransport[] = []
-  private transports: RuntimeTransportMetadata[] = []
-  private metadataOwnershipWatch: RuntimeMetadataOwnershipWatch | null = null
-  private mobileSocketWiring: MobileSocketWiring | null = null
-  // Why: detaches the current WebSocketTransport from the session wiring so a pairing rebind can swap
-  // transports under the SAME wiring (see ensureMobileSocketWiring) instead of orphaning relay sockets.
-  private detachWebSocketWiring: (() => void) | null = null
-  private mobileRelayPairingProvider: MobileRelayPairingProvider | null = null
-  private mobileRelayPairingOfferQueue: Promise<void> = Promise.resolve()
-  private mobileRelayPairingOfferInFlight: {
-    generation: number
-    address: string | null
-    rotate: boolean
-    request: Promise<MobilePairingOffer>
-  } | null = null
-  private mobilePairingOfferGeneration = 0
-  private onUnpairedDeviceAuthFailure: (() => void) | null = null
-  private unpairedDeviceAuthThrottle: UnpairedDeviceAuthThrottle | null = null
-  private readonly binaryMessageRouter = new RuntimeBinaryMessageRouter()
-  private readonly wsDispatchAbortStates = new Map<
-    WebSocket,
-    { controllers: Set<AbortController>; abortOnClose: () => void }
-  >()
-  // Why: separate from server.maxConnections — count only long-running dispatches, not short RPCs. See §3.1 + §7 risk #2.
-  private activeLongPolls = 0
-  // Why: subset of activeLongPolls held by orchestration.ask, fenced by askLongPollCap.
-  private activeAskLongPolls = 0
-  private activeBrowserHostLongPolls = 0
-  private readonly activeBrowserHostLongPollsByDevice = new Map<string, number>()
-
-  constructor({
-    runtime,
-    userDataPath,
-    pid = process.pid,
-    platform = process.platform,
-    enableWebSocket = false,
-    wsPort = DEFAULT_WS_PORT,
-    preferPinnedWsPort = false,
-    exposeNetworkByDefault = false,
-    pinnedBindHost,
-    webClientRoot,
-    keepaliveIntervalMs = KEEPALIVE_INTERVAL_MS,
-    longPollCap = LONG_POLL_CAP,
-    metadataOwnershipPollMs = RUNTIME_METADATA_OWNERSHIP_POLL_MS,
-    methods
-  }: OrcaRuntimeRpcServerOptions) {
-    this.runtime = runtime
-    this.dispatcher = new RpcDispatcher({ runtime, methods: methods ?? ALL_RPC_METHODS })
-    this.userDataPath = userDataPath
-    this.pid = pid
-    this.platform = platform
-    this.enableWebSocket = enableWebSocket
-    this.wsPort = wsPort
-    this.preferPinnedWsPort = preferPinnedWsPort
-    this.exposeNetworkByDefault = exposeNetworkByDefault
-    this.pinnedBindHost = pinnedBindHost ?? null
-    this.webClientRoot = webClientRoot
-    this.keepaliveIntervalMs = keepaliveIntervalMs
-    this.longPollCap = longPollCap
-    this.metadataOwnershipPollMs = metadataOwnershipPollMs
-    // Why: derived, not configurable — the reservation must hold for whatever cap a caller picks.
-    this.askLongPollCap = Math.max(1, Math.floor(longPollCap * ASK_LONG_POLL_SHARE))
-    this.browserHostLongPollCap = Math.max(
-      1,
-      Math.floor(longPollCap * BROWSER_HOST_LONG_POLL_SHARE)
-    )
-    this.browserHostLongPollCapPerDevice = Math.max(1, Math.floor(this.browserHostLongPollCap / 2))
-    this.specializedLongPollCap = Math.max(1, Math.floor(longPollCap * SPECIALIZED_LONG_POLL_SHARE))
-    this.relayRevokeOutbox = new RelayRevokeOutbox(userDataPath)
-  }
-
-  getDeviceRegistry(): DeviceRegistry | null {
-    return this.deviceRegistry
-  }
-
-  getTlsFingerprint(): string | null {
-    return this.tlsFingerprint
-  }
-
-  getE2EEPublicKey(): string | null {
-    return this.e2eeKeypair?.publicKeyB64 ?? null
-  }
-
-  getE2EEKeypair(): E2EEKeypair | null {
-    return this.e2eeKeypair
-  }
-
-  getMobileSocketWiring(): MobileSocketWiring | null {
-    return this.mobileSocketWiring
-  }
-
-  getRelayRevokeOutbox(): RelayRevokeOutbox {
-    return this.relayRevokeOutbox
-  }
-
-  setMobileRelayBinding(deviceId: string, binding: RelayDeviceBinding): boolean {
-    const current = this.deviceRegistry?.getDevice(deviceId)
-    if (
-      current?.scope !== 'mobile' ||
-      this.deviceRegistry?.getMobilePairingConnectionMode(deviceId) === 'local-only'
-    ) {
-      return false
-    }
-    if (
-      current.relayBinding &&
-      (current.relayBinding.relayHostId !== binding.relayHostId ||
-        current.relayBinding.ownerIdentityKey !== binding.ownerIdentityKey)
-    ) {
-      // Why: switching the owning account/host must not strand the old cloud credential family, even if that account is offline.
-      if (!this.queueRelayDeviceRevoke(current.relayBinding)) {
-        return false
-      }
-    }
-    const updated = this.deviceRegistry?.setRelayBinding(deviceId, binding) ?? false
-    if (updated) {
-      this.mobileRelayPairingProvider?.onDemandStateChanged?.()
-    }
-    return updated
-  }
-
-  // Why: only the desktop shell can surface UI; headless serve leaves this unset.
-  setOnUnpairedDeviceAuthFailure(callback: (() => void) | null): void {
-    this.onUnpairedDeviceAuthFailure = callback
-  }
-
-  setMobileRelayPairingProvider(provider: MobileRelayPairingProvider | null): void {
-    this.mobileRelayPairingProvider = provider
-  }
-
-  async revokeMobileDevice(deviceId: string): Promise<boolean> {
-    const device = this.deviceRegistry?.getDevice(deviceId)
-    if (device?.scope !== 'mobile') {
-      return false
-    }
-    if (device.relayBinding) {
-      if (!this.queueRelayDeviceRevoke(device.relayBinding)) {
-        return false
-      }
-    }
-    if (!this.deviceRegistry?.removeDevice(deviceId)) {
-      return false
-    }
-    this.mobileRelayPairingProvider?.onDemandStateChanged?.()
-    this.runtime.forgetClientNavigationState(deviceId)
-    this.mobileSocketWiring?.terminateDeviceConnections(device.token)
-    return true
-  }
-
-  revokeRuntimeAccess(deviceId: string): boolean {
-    const device = this.deviceRegistry?.getDevice(deviceId)
-    if (device?.scope !== 'runtime' || !this.deviceRegistry?.removeDevice(deviceId)) {
-      return false
-    }
-    this.runtime.forgetClientNavigationState(deviceId)
-    this.mobileSocketWiring?.terminateDeviceConnections(device.token)
-    return true
-  }
-
-  getWebSocketEndpoint(): string | null {
-    const ws = this.transports.find((t) => t.kind === 'websocket')
-    return ws?.endpoint ?? null
-  }
-
-  createPairingOffer(args: {
-    address?: string | null
-    name?: string
-    rotate?: boolean
-    scope?: DeviceScope
-    // Why: STA-2370 — recorded on the grant so a "This computer only" client reconnecting cannot make the
-    // next launch bind every interface. Defaults to network reach, which is what every other caller means.
-    reach?: RuntimePairingReach
-  }):
-    | PairingOfferUnavailable
-    | {
-        available: true
-        pairingUrl: string
-        endpoint: string
-        deviceId: string
-        webClientUrl: string | null
-      } {
-    if (this.pairingInitializationFailure) {
-      return this.pairingInitializationFailure
-    }
-    const rawEndpoint = this.getWebSocketEndpoint()
-    if (!rawEndpoint) {
-      return pairingUnavailable(
-        'websocket_unavailable',
-        'WebSocket pairing is unavailable. Inspect preceding runtime errors and choose an unused --port if the listener failed.'
-      )
-    }
-    if (!this.deviceRegistry) {
-      return pairingUnavailable('device_registry_unavailable', DEVICE_REGISTRY_UNAVAILABLE_GUIDANCE)
-    }
-    const publicKeyB64 = this.getE2EEPublicKey()
-    if (!publicKeyB64) {
-      return pairingUnavailable('e2ee_key_unavailable', E2EE_KEY_UNAVAILABLE_GUIDANCE)
-    }
-
-    const advertised = resolveAdvertisedPairingEndpoint(rawEndpoint, args.address)
-    if (!advertised.ok) {
-      return pairingUnavailable(advertised.reason, advertised.guidance)
-    }
-    const endpoint = advertised.endpoint
-    const deviceName = args.name ?? `CLI ${new Date().toLocaleDateString()}`
-    const scope = args.scope ?? 'runtime'
-    let device: DeviceEntry
-    try {
-      const reach = args.reach ?? 'network'
-      device = args.rotate
-        ? this.deviceRegistry.rotatePendingDevice(deviceName, scope, reach)
-        : this.deviceRegistry.getOrCreatePendingDevice(deviceName, scope, reach)
-    } catch (error) {
-      console.error('[runtime] Failed to persist pairing credential:', error)
-      return pairingUnavailable('device_registry_unavailable', DEVICE_REGISTRY_UNAVAILABLE_GUIDANCE)
-    }
-    const pairingUrl = encodePairingOffer({
-      v: PAIRING_OFFER_VERSION,
-      endpoint,
-      deviceToken: device.token,
-      publicKeyB64,
-      pairedDeviceId: device.deviceId,
-      scope
-    })
-    return {
-      available: true,
-      pairingUrl,
-      endpoint,
-      deviceId: device.deviceId,
-      webClientUrl:
-        this.webClientRoot && scope === 'runtime' ? createWebClientUrl(endpoint, pairingUrl) : null
-    }
-  }
-
-  async createMobilePairingOffer(args: {
-    address?: string | null
-    connectionMode?: MobilePairingConnectionMode
-    name?: string
-    rotate?: boolean
-  }): Promise<MobilePairingOffer> {
-    // Why: STA-2370 — creating a mobile pairing offer is the user's explicit opt-in to LAN reach, so
-    // widen the loopback listener before advertising its LAN endpoint in the QR. If the widen fails the
-    // listener stays on loopback, so report unavailable rather than advertise a dead LAN endpoint.
-    try {
-      await this.ensureNetworkExposure()
-    } catch (error) {
-      console.error(
-        '[runtime] Network exposure failed while creating a mobile pairing offer:',
-        error
-      )
-      return pairingUnavailable('network_exposure_failed', NETWORK_EXPOSURE_FAILED_GUIDANCE)
-    }
-    if (args.connectionMode === 'local-only') {
-      this.mobilePairingOfferGeneration += 1
-      return this.createMobilePairingOfferSerial(args, this.mobilePairingOfferGeneration)
-    }
-    const address = args.address ?? null
-    const rotate = args.rotate === true
-    const inFlight = this.mobileRelayPairingOfferInFlight
-    if (
-      inFlight?.generation === this.mobilePairingOfferGeneration &&
-      inFlight.address === address &&
-      (inFlight.rotate || !rotate)
-    ) {
-      return inFlight.request
-    }
-    // Why: every request that is not coalesced above supersedes the older one, rotating or not.
-    const generation = ++this.mobilePairingOfferGeneration
-    const request = this.mobileRelayPairingOfferQueue.then(() =>
-      generation === this.mobilePairingOfferGeneration
-        ? this.createMobilePairingOfferSerial(args, generation)
-        : this.relayPairingRequestSuperseded()
-    )
-    this.mobileRelayPairingOfferQueue = request.then(
-      () => undefined,
-      () => undefined
-    )
-    this.mobileRelayPairingOfferInFlight = { generation, address, rotate, request }
-    void request.then(
-      () => {
-        if (this.mobileRelayPairingOfferInFlight?.request === request) {
-          this.mobileRelayPairingOfferInFlight = null
-        }
-      },
-      () => {
-        if (this.mobileRelayPairingOfferInFlight?.request === request) {
-          this.mobileRelayPairingOfferInFlight = null
-        }
-      }
-    )
-    return request
-  }
-
-  private async createMobilePairingOfferSerial(
-    args: {
-      address?: string | null
-      connectionMode?: MobilePairingConnectionMode
-      name?: string
-      rotate?: boolean
-    },
-    generation: number
-  ): Promise<MobilePairingOffer> {
-    // Why: the renderer is outside the trust boundary, so only an explicit local-only value may suppress Relay provisioning.
-    const connectionMode = args.connectionMode === 'local-only' ? 'local-only' : 'automatic'
-    const pending = this.deviceRegistry?.getPendingDevice('mobile')
-    // Why: connection policy is part of the credential, so rotate on any policy switch — an old-policy QR must not pair under the new one.
-    const switchingPendingMode =
-      pending != null &&
-      this.deviceRegistry?.getMobilePairingConnectionMode(pending.deviceId) !== connectionMode
-    if (args.rotate || switchingPendingMode) {
-      if (pending?.relayBinding) {
-        // Why: record the durable cloud revoke before rotating the local token so an old relay invite can't outlive the QR.
-        if (!this.queueRelayDeviceRevoke(pending.relayBinding)) {
-          return pairingUnavailable(
-            'device_registry_unavailable',
-            'Could not persist Relay cleanup before rotating the pairing code.'
-          )
-        }
-      }
-    }
-    const direct = this.createPairingOffer({
-      ...args,
-      rotate: args.rotate || switchingPendingMode,
-      scope: 'mobile'
-    })
-    if (!direct.available) {
-      return direct
-    }
-    const createdNewPendingDevice = pending?.deviceId !== direct.deviceId
-    let connectionModeStored = false
-    try {
-      connectionModeStored =
-        this.deviceRegistry?.setMobilePairingConnectionMode(direct.deviceId, connectionMode) ??
-        false
-    } catch (error) {
-      console.error('[runtime] Failed to persist the pairing connection mode:', error)
-    }
-    // Why: the mode is part of the credential — a QR whose policy was never stored must not pair under the default one.
-    if (!connectionModeStored) {
-      if (createdNewPendingDevice) {
-        this.discardPendingMobilePairingDevice(direct.deviceId)
-      }
-      return pairingUnavailable('device_registry_unavailable', DEVICE_REGISTRY_UNAVAILABLE_GUIDANCE)
-    }
-    // Why: explicit LAN path never needs Relay; mint the direct-only offer as selected.
-    if (connectionMode === 'local-only') {
-      return { ...direct, connectionMode: 'local-only' }
-    }
-    // Why: Anywhere must not silently ship a LAN-only QR under the Relay label.
-    // Fail closed, drop the unused pending credential, and let the UI offer Use LAN.
-    const refuseAutomaticWithoutRelay = (
-      relayFailure: MobileRelayMintFailure
-    ): PairingOfferUnavailable => {
-      if (createdNewPendingDevice) {
-        this.discardPendingMobilePairingDevice(direct.deviceId)
-      }
-      return {
-        available: false,
-        reason: 'relay_mint_failed',
-        guidance:
-          'Orca Relay could not create a pairing invite. Use LAN (Tailscale or same Wi‑Fi) or retry Relay.',
-        relayFailure
-      }
-    }
-    const relayProvider = this.mobileRelayPairingProvider
-    if (!relayProvider) {
-      return refuseAutomaticWithoutRelay({
-        code: 'relay_provider_unavailable',
-        stage: 'provider_missing',
-        message: 'Orca Relay is not available on this desktop'
-      })
-    }
-    const device = this.deviceRegistry?.getDevice(direct.deviceId)
-    const publicKeyB64 = this.getE2EEPublicKey()
-    if (!device || !publicKeyB64) {
-      return refuseAutomaticWithoutRelay({
-        code: 'e2ee_key_unavailable',
-        stage: 'e2ee_missing',
-        message: 'E2EE public key unavailable for Relay pairing'
-      })
-    }
-    let relayPairing: Awaited<ReturnType<MobileRelayPairingProvider['createPairingRelay']>>
-    try {
-      relayPairing = await relayProvider.createPairingRelay(device.deviceId)
-    } catch (error) {
-      // Why: the raw provider error can carry request metadata or credentials — log only the validated code.
-      const relayFailure = mobileRelayMintFailureFromUnknown({
-        stage: 'create_pairing_relay',
-        error,
-        fallbackCode: 'relay_mint_failed',
-        fallbackMessage: 'Relay pairing invite request failed'
-      })
-      console.warn(`[runtime] Failed to create Relay pairing invite: ${relayFailure.code}`)
-      return refuseAutomaticWithoutRelay(relayFailure)
-    }
-    const currentDevice = this.deviceRegistry?.getDevice(device.deviceId)
-    if (
-      generation !== this.mobilePairingOfferGeneration ||
-      relayProvider !== this.mobileRelayPairingProvider ||
-      currentDevice?.token !== device.token ||
-      this.deviceRegistry?.getMobilePairingConnectionMode(device.deviceId) !== 'automatic'
-    ) {
-      this.queueOrRetainRelayDeviceRevoke(device.deviceId, relayPairing.binding)
-      if (createdNewPendingDevice) {
-        this.discardPendingMobilePairingDevice(direct.deviceId)
-      }
-      return this.relayPairingRequestSuperseded()
-    }
-    try {
-      if (!this.setMobileRelayBinding(device.deviceId, relayPairing.binding)) {
-        this.queueOrRetainRelayDeviceRevoke(device.deviceId, relayPairing.binding)
-        return refuseAutomaticWithoutRelay({
-          code: 'relay_binding_failed',
-          stage: 'binding_failed',
-          message: 'Could not store Relay binding for the pairing device'
-        })
-      }
-    } catch (error) {
-      console.warn('[runtime] Failed to persist Relay pairing binding:', error)
-      this.queueOrRetainRelayDeviceRevoke(device.deviceId, relayPairing.binding)
-      return refuseAutomaticWithoutRelay({
-        code: 'relay_binding_failed',
-        stage: 'binding_failed',
-        message: 'Could not store Relay binding for the pairing device'
-      })
-    }
-    return {
-      ...direct,
-      connectionMode: 'automatic',
-      pairingUrl: encodePairingOffer({
-        v: PAIRING_OFFER_VERSION,
-        endpoint: direct.endpoint,
-        deviceToken: device.token,
-        publicKeyB64,
-        pairedDeviceId: device.deviceId,
-        scope: 'mobile',
-        relay: relayPairing.relay
-      })
-    }
-  }
-
-  private relayPairingRequestSuperseded(): PairingOfferUnavailable {
-    return {
-      available: false,
-      reason: 'relay_mint_failed',
-      guidance: 'The Relay pairing request was replaced by a newer connection choice.',
-      relayFailure: {
-        code: 'relay_request_superseded',
-        stage: 'binding_failed',
-        message: 'Relay pairing request superseded'
-      }
-    }
-  }
-
-  /** Drop a never-scanned mobile pending credential after a failed Anywhere mint. */
-  private discardPendingMobilePairingDevice(deviceId: string): void {
-    const device = this.deviceRegistry?.getDevice(deviceId)
-    if (!device || device.scope !== 'mobile' || device.lastSeenAt !== 0) {
-      return
-    }
-    if (device.relayBinding) {
-      if (!this.queueRelayDeviceRevoke(device.relayBinding)) {
-        return
-      }
-    }
-    try {
-      this.deviceRegistry?.removeDevice(deviceId)
-    } catch (error) {
-      console.error('[runtime] Failed to drop an unused mobile pairing credential:', error)
-    }
-  }
-
-  /**
-   * Why: the outbox is the only durable cleanup record for a minted invite. When it can't be
-   * written, keep the binding on the device so cleanup keeps a reference instead of orphaning it.
-   */
-  private queueOrRetainRelayDeviceRevoke(deviceId: string, binding: RelayDeviceBinding): void {
-    if (this.queueRelayDeviceRevoke(binding)) {
-      return
-    }
-    try {
-      this.deviceRegistry?.setRelayBinding(deviceId, binding)
-    } catch (error) {
-      console.error('[runtime] Failed to retain an unrevoked Relay binding:', error)
-    }
-  }
-
-  private queueRelayDeviceRevoke(binding: RelayDeviceBinding): boolean {
-    let item: RelayRevokeOutboxItem
-    try {
-      item = this.relayRevokeOutbox.enqueue(binding)
-    } catch (error) {
-      console.error('[runtime] Failed to persist Relay device cleanup:', error)
-      return false
-    }
-    try {
-      this.mobileRelayPairingProvider?.onDeviceRevokeQueued(item)
-    } catch (error) {
-      console.warn('[runtime] Failed to notify Relay cleanup worker:', error)
-    }
-    return true
-  }
-
-  private registerBinaryStreamHandler(
-    connectionId: string | undefined,
-    streamId: number,
-    handler: (frame: TerminalStreamFrame) => void
-  ): () => void {
-    return this.binaryMessageRouter.registerTerminalStream(connectionId, streamId, handler)
-  }
-
-  private registerBinaryMessageHandler(
-    connectionId: string | undefined,
-    handler: (bytes: Uint8Array<ArrayBufferLike>) => void
-  ): () => void {
-    return this.binaryMessageRouter.registerRawMessage(connectionId, handler)
-  }
-
-  private handleWebSocketBinaryMessage(bytes: Uint8Array<ArrayBufferLike>, ws: WebSocket): void {
-    this.binaryMessageRouter.dispatch(this.mobileSocketWiring?.getConnectionId(ws), bytes)
-  }
-
-  private registerWebSocketDispatchAbort(ws: WebSocket): {
-    signal: AbortSignal
-    dispose: () => void
-  } {
-    const abortController = new AbortController()
-    if (ws.readyState !== ws.OPEN) {
-      abortController.abort()
-      return { signal: abortController.signal, dispose: () => {} }
-    }
-
-    let state = this.wsDispatchAbortStates.get(ws)
-    if (!state) {
-      state = {
-        controllers: new Set(),
-        abortOnClose: () => this.abortWebSocketDispatches(ws)
-      }
-      this.wsDispatchAbortStates.set(ws, state)
-      // Why: many streaming RPCs share one WebSocket; one socket-level abort fan-out avoids MaxListenersExceededWarning.
-      ws.on('close', state.abortOnClose)
-      ws.on('error', state.abortOnClose)
-    }
-    state.controllers.add(abortController)
-
-    return {
-      signal: abortController.signal,
-      dispose: () => {
-        const current = this.wsDispatchAbortStates.get(ws)
-        if (!current) {
-          return
-        }
-        current.controllers.delete(abortController)
-        if (current.controllers.size > 0) {
-          return
-        }
-        this.wsDispatchAbortStates.delete(ws)
-        ws.off('close', current.abortOnClose)
-        ws.off('error', current.abortOnClose)
-      }
-    }
-  }
-
-  private abortWebSocketDispatches(ws: WebSocket): void {
-    const state = this.wsDispatchAbortStates.get(ws)
-    if (!state) {
-      return
-    }
-    this.wsDispatchAbortStates.delete(ws)
-    ws.off('close', state.abortOnClose)
-    ws.off('error', state.abortOnClose)
-    for (const controller of state.controllers) {
-      controller.abort()
-    }
-    state.controllers.clear()
-  }
-
-  private initializePairingIdentity(): PairingIdentityInitialization {
-    let deviceRegistry: DeviceRegistry
-    try {
-      deviceRegistry = new DeviceRegistry(this.userDataPath)
-    } catch (error) {
-      console.error('[runtime] Failed to initialize pairing registry:', error)
-      return {
-        ok: false,
-        failure: pairingUnavailable(
-          'device_registry_unavailable',
-          DEVICE_REGISTRY_UNAVAILABLE_GUIDANCE
-        )
-      }
-    }
-    let e2eeKeypair: E2EEKeypair
-    try {
-      e2eeKeypair = loadOrCreateE2EEKeypair(this.userDataPath)
-    } catch (error) {
-      console.error('[runtime] Failed to initialize E2EE identity:', error)
-      return {
-        ok: false,
-        failure: pairingUnavailable('e2ee_key_unavailable', E2EE_KEY_UNAVAILABLE_GUIDANCE)
-      }
-    }
-    return { ok: true, deviceRegistry, e2eeKeypair }
-  }
-
-  async start(): Promise<void> {
-    if (this.activeTransports.length > 0) {
-      return
-    }
-
-    // Why: SIGKILL/OOM skip stop(), orphaning `o-<pid>-*.sock` files; sweep them. Skipped on Windows: named pipes leave no filesystem entries.
-    if (this.platform !== 'win32') {
-      sweepOrphanedRuntimeSockets(this.userDataPath, this.pid)
-    }
-
-    const transportMeta = createRuntimeTransportMetadata(
-      this.userDataPath,
-      this.pid,
-      this.platform,
-      this.runtime.getRuntimeId()
-    )
-
-    const socketTransport = new UnixSocketTransport({
-      endpoint: transportMeta.endpoint,
-      kind: transportMeta.kind as 'unix' | 'named-pipe',
-      keepaliveIntervalMs: this.keepaliveIntervalMs
-    })
-
-    // Why: the `.catch` guarantees reply() always fires so a throw can't strand the client or leak the AbortController.
-    socketTransport.onMessage((msg, reply, context) => {
-      void this.handleMessage(msg, context)
-        .then((response) => {
-          reply(JSON.stringify(response))
-        })
-        .catch((error) => {
-          const message = error instanceof Error ? error.message : String(error)
-          // Why: best-effort id recovery so the client can correlate the error frame to its pending request.
-          let id = 'unknown'
-          try {
-            const parsed = JSON.parse(msg) as { id?: unknown }
-            if (typeof parsed.id === 'string' && parsed.id.length > 0) {
-              id = parsed.id
-            }
-          } catch {
-            // ignore — fall through with id='unknown'
-          }
-          reply(JSON.stringify(this.buildError(id, 'internal_error', message)))
-        })
-    })
-
-    await socketTransport.start()
-
-    const activeTransports: RpcTransport[] = [socketTransport]
-    const transportsMeta: RuntimeTransportMetadata[] = [transportMeta]
-
-    // Why: WebSocket uses per-device tokens + E2EE (tweetnacl) instead of TLS since React Native can't pin self-signed certs.
-    if (this.enableWebSocket) {
-      // Why: land any deferred lastSeen write before a replacement registry reads the same file.
-      this.deviceRegistry?.flushPendingLastSeen()
-      const pairingIdentity = this.initializePairingIdentity()
-      if (!pairingIdentity.ok) {
-        this.deviceRegistry = null
-        this.e2eeKeypair = null
-        this.pairingInitializationFailure = pairingIdentity.failure
-      } else {
-        this.deviceRegistry = pairingIdentity.deviceRegistry
-        this.e2eeKeypair = pairingIdentity.e2eeKeypair
-        this.pairingInitializationFailure = null
-        try {
-          const host = this.resolveInitialWebSocketBindHost()
-          const { transport, endpoint } = await this.startWebSocketTransport({
-            host,
-            port: this.wsPort,
-            preferPinnedPort: this.preferPinnedWsPort,
-            // Why: stable fallback port across restarts keeps paired devices' endpoints valid (STA-1511); wsPort 0 = random (E2E).
-            ...(this.wsPort !== 0 ? { fallbackPort: readWsFallbackPort(this.userDataPath) } : {})
-          })
-          if (this.wsPort !== 0 && transport.resolvedPort !== this.wsPort) {
-            writeWsFallbackPort(this.userDataPath, transport.resolvedPort)
-          }
-          activeTransports.push(transport)
-          transportsMeta.push({ kind: 'websocket', endpoint })
-        } catch (error) {
-          // Why: WebSocket transport is supplementary; on failure (e.g. port in use) continue with Unix socket only.
-          console.error('[runtime] Failed to start WebSocket transport:', error)
-          this.mobileSocketWiring = null
-        }
-      }
-    }
-
-    // Why: set in-memory transport state before writing metadata so the bootstrap file has the real endpoint/token pair.
-    this.activeTransports = activeTransports
-    this.transports = transportsMeta
-
-    try {
-      this.writeMetadata()
-    } catch (error) {
-      // Why: a runtime that can't publish metadata is invisible to the CLI — close transports rather than run undiscoverable.
-      this.activeTransports = []
-      this.transports = []
-      await Promise.all(activeTransports.map((t) => t.stop().catch(() => {}))).catch(() => {})
-      throw error
-    }
-
-    this.metadataOwnershipWatch = watchRuntimeMetadataOwnership({
-      userDataPath: this.userDataPath,
-      ownedPid: this.pid,
-      ownedRuntimeId: this.runtime.getRuntimeId(),
-      pollIntervalMs: this.metadataOwnershipPollMs,
-      republish: () => {
-        // Why: never advertise endpoints we already tore down.
-        if (this.activeTransports.length === 0) {
-          return
-        }
-        this.writeMetadata()
-      },
-      onReclaim: (previous) => {
-        console.warn(
-          `[runtime] Reclaimed orca-runtime.json from a dead runtime (pid ${previous?.pid ?? 'none'}); republished pid ${this.pid}.`
-        )
-      }
-    })
-  }
-
-  // Why: STA-2370 — a desktop with no previously-connected device stays on loopback until the user
-  // explicitly pairs; `orca serve`/E2E (exposeNetworkByDefault) and a reconnecting paired device bind wide.
-  // A grant minted for "This computer only" is excluded: its client is a browser on this machine, so
-  // counting it would republish the runtime on every interface one restart after the user declined that.
-  private resolveInitialWebSocketBindHost(): string {
-    if (this.pinnedBindHost) {
-      return this.pinnedBindHost
-    }
-    if (this.exposeNetworkByDefault) {
-      return WS_BIND_HOST_ALL_INTERFACES
-    }
-    const hasConnectedNetworkDevice =
-      this.deviceRegistry
-        ?.listDevices()
-        .some((device) => device.lastSeenAt > 0 && device.pairingReach !== 'this-computer') ?? false
-    return hasConnectedNetworkDevice ? WS_BIND_HOST_ALL_INTERFACES : WS_BIND_HOST_LOOPBACK
-  }
-
-  // Why: builds and starts a WS transport bound to `host`, wiring the session-scoped mobile socket
-  // handlers. Shared by initial start() and the pairing-time widen so both paths stay identical.
-  private async startWebSocketTransport(options: {
-    host: string
-    port: number
-    preferPinnedPort: boolean
-    fallbackPort?: number
-  }): Promise<{ transport: WebSocketTransport; endpoint: string }> {
-    const deviceRegistry = this.deviceRegistry
-    const e2eeKeypair = this.e2eeKeypair
-    if (!deviceRegistry || !e2eeKeypair) {
-      throw new Error('WebSocket transport requires an initialized pairing identity')
-    }
-    const wsTransport = new WebSocketTransport({
-      host: options.host,
-      port: options.port,
-      staticRoot: this.webClientRoot,
-      ...(options.fallbackPort !== undefined ? { fallbackPort: options.fallbackPort } : {}),
-      ...(options.preferPinnedPort ? { preferPinnedPort: true } : {})
-    })
-    const mobileSocketWiring = this.ensureMobileSocketWiring(deviceRegistry, e2eeKeypair)
-    this.detachWebSocketWiring = mobileSocketWiring.attachTransport(wsTransport)
-
-    try {
-      await wsTransport.start()
-    } catch (error) {
-      // Why: a listener that never bound must not stay attached to the session wiring (it would leak into
-      // terminateDeviceConnections); detach before propagating so the wiring only tracks live transports.
-      this.detachWebSocketWiring?.()
-      this.detachWebSocketWiring = null
-      throw error
-    }
-    this.wsBoundHost = options.host
-    return {
-      transport: wsTransport,
-      endpoint: formatWsEndpoint(options.host, wsTransport.resolvedPort)
-    }
-  }
-
-  // Why: one MobileSocketWiring per server session. Direct WS and cloud relay both attach to it, and
-  // DesktopRelayService captures it once at construction, so a loopback→wide pairing rebind must swap the
-  // transport under the SAME wiring — replacing the wiring would strand relay sockets (lost connection IDs,
-  // binary handling, and revocation targeting) on a dead object.
-  private ensureMobileSocketWiring(
-    deviceRegistry: DeviceRegistry,
-    e2eeKeypair: E2EEKeypair
-  ): MobileSocketWiring {
-    if (this.mobileSocketWiring) {
-      return this.mobileSocketWiring
-    }
-    // Why: session-scoped so each desktop launch may notify once (a mid-session rebind must not reset it).
-    this.unpairedDeviceAuthThrottle = new UnpairedDeviceAuthThrottle({
-      onTrigger: () => this.onUnpairedDeviceAuthFailure?.()
-    })
-    const mobileSocketWiring = new MobileSocketWiring({
-      deviceRegistry,
-      e2eeKeypair,
-      onText: (socket, plaintext, reply, sendBinary) => {
-        void this.handleWebSocketMessage(
-          plaintext,
-          reply,
-          sendBinary,
-          undefined,
-          socket.ws,
-          socket.device.deviceToken,
-          socket
-        )
-      },
-      onBinary: (socket, bytes) => this.handleWebSocketBinaryMessage(bytes, socket.ws),
-      onReady: () => {
-        // Why: first authenticated mobile/remote client (direct WS and
-        // cloud relay both attach here) starts path-candidate tracking.
-        // Activation is a local-host concern: candidate buffers live on the
-        // buffer-owning host's runtime, so a remote runtime proxy may
-        // legitimately lack this method (its own server activates it).
-        this.runtime.activateRecentPtyPathCandidateTracking?.()
-        this.mobileRelayPairingProvider?.onDemandStateChanged?.()
-      },
-      onClose: (socket, hasOtherConnections) => {
-        if (!socket) {
-          return
-        }
-        this.abortWebSocketDispatches(socket.ws)
-        // Why: subscriptions and binary streams are socket-scoped, but disconnect state is device-scoped across transports.
-        this.runtime.cleanupSubscriptionsForConnection(socket.connectionId)
-        this.runtime.cancelMobileDictationForConnection(socket.connectionId)
-        this.binaryMessageRouter.deleteConnection(socket.connectionId)
-        if (!hasOtherConnections) {
-          this.runtime.onClientDisconnected(socket.device.deviceToken)
-        }
-      },
-      // Why: relay attempts are authorized upstream; only direct failures should prompt local re-pairing.
-      onUnpairedDeviceAuthFailure: (metadata) => {
-        if (metadata.transport === 'direct') {
-          this.unpairedDeviceAuthThrottle?.recordFailure()
-        }
-      }
-    })
-    this.mobileSocketWiring = mobileSocketWiring
-    return mobileSocketWiring
-  }
-
-  // Why: STA-2370 — widen the loopback listener to all interfaces so a freshly generated pairing
-  // offer's advertised LAN endpoint is reachable. Idempotent, but it is no longer confined to the first
-  // pairing action: a "This computer only" link never widens, so live loopback clients can already be
-  // connected when a later LAN/QR offer opts in. Rebinding terminates them (ws cannot move a listener),
-  // so the resolved port is reused — already-issued endpoints stay valid and clients reconnect in place.
-  async ensureNetworkExposure(): Promise<void> {
-    if (this.pinnedBindHost && this.pinnedBindHost !== WS_BIND_HOST_ALL_INTERFACES) {
-      // Why throw and not return: callers widen so they can ADVERTISE a LAN endpoint. Returning
-      // quietly would let them publish one that nothing can reach; the throw lands in their
-      // existing network_exposure_failed branch, which reports the offer unavailable instead.
-      throw new Error(
-        `Runtime bind address is pinned to ${this.pinnedBindHost}; refusing to widen to all interfaces`
-      )
-    }
-    if (
-      !this.enableWebSocket ||
-      this.stopping ||
-      this.wsBoundHost === WS_BIND_HOST_ALL_INTERFACES
-    ) {
-      return
-    }
-    // Why: concurrent pairing requests must share one rebind — two simultaneous stop/start races would
-    // fight for the port and strand the listener on a random one.
-    if (!this.networkExposurePromise) {
-      this.networkExposurePromise = this.widenWebSocketBind().finally(() => {
-        this.networkExposurePromise = null
-      })
-    }
-    return this.networkExposurePromise
-  }
-
-  private async widenWebSocketBind(): Promise<void> {
-    const current = this.activeTransports.find(
-      (transport): transport is WebSocketTransport => transport instanceof WebSocketTransport
-    )
-    if (!current) {
-      return
-    }
-    const index = this.activeTransports.indexOf(current)
-    const previousPort = current.resolvedPort
-    let widened: { transport: WebSocketTransport; endpoint: string }
-    try {
-      // Why: detach the loopback listener from the session wiring before stopping it so terminateDevice-
-      // Connections never iterates a dead transport; the new listener re-attaches to the SAME wiring.
-      this.detachWebSocketWiring?.()
-      await current.stop()
-      widened = await this.startWebSocketTransport({
-        host: WS_BIND_HOST_ALL_INTERFACES,
-        port: previousPort,
-        preferPinnedPort: true
-      })
-    } catch (error) {
-      // Why: the wide bind failed after the loopback listener was already stopped. Restore a serving
-      // loopback listener on the same port (wsBoundHost stays loopback so a later offer retries), then
-      // propagate — the caller must not advertise a LAN endpoint with no LAN listener behind it (STA-2370).
-      console.error('[runtime] Failed to widen WebSocket transport for pairing:', error)
-      await this.recoverWebSocketBindAfterFailedWiden(index, previousPort)
-      throw error
-    }
-    // Why: register the live wide transport BEFORE persisting metadata so a metadata-write failure can
-    // never orphan a running 0.0.0.0 listener outside activeTransports (and thus outside stop()).
-    this.activeTransports[index] = widened.transport
-    const metaIndex = this.transports.findIndex((meta) => meta.kind === 'websocket')
-    if (metaIndex !== -1) {
-      this.transports[metaIndex] = { kind: 'websocket', endpoint: widened.endpoint }
-    }
-    try {
-      // Why: a rebind that lands on a different port (same-port bind refused) must be persisted so a
-      // later reconnect from a device paired to this port matches on the next launch (STA-1511).
-      if (this.wsPort !== 0 && widened.transport.resolvedPort !== this.wsPort) {
-        writeWsFallbackPort(this.userDataPath, widened.transport.resolvedPort)
-      }
-      this.writeMetadata()
-    } catch (persistError) {
-      // Why: the wide listener is live and tracked; a persistence failure must not tear it down. Keep
-      // serving — the in-memory endpoint is already correct.
-      console.error(
-        '[runtime] Widened WebSocket listener but failed to persist pairing metadata:',
-        persistError
-      )
-    }
-  }
-
-  // Why: a failed widen already tore down the loopback listener; bring one back on the same host/port so the
-  // runtime keeps serving locally (wsBoundHost stays loopback, so the next pairing offer retries the widen).
-  private async recoverWebSocketBindAfterFailedWiden(
-    index: number,
-    previousPort: number
-  ): Promise<void> {
-    let restored: { transport: WebSocketTransport; endpoint: string }
-    try {
-      restored = await this.startWebSocketTransport({
-        host: WS_BIND_HOST_LOOPBACK,
-        port: previousPort,
-        preferPinnedPort: true
-      })
-    } catch (recoveryError) {
-      // Why: even the loopback restore failed — drop the dead WebSocket transport so we never advertise an
-      // endpoint with no listener. The Unix socket keeps serving and a restart re-establishes the listener.
-      console.error(
-        '[runtime] Failed to restore WebSocket transport after widen failure:',
-        recoveryError
-      )
-      this.activeTransports.splice(index, 1)
-      const metaIndex = this.transports.findIndex((meta) => meta.kind === 'websocket')
-      if (metaIndex !== -1) {
-        this.transports.splice(metaIndex, 1)
-      }
-      this.wsBoundHost = null
-      try {
-        this.writeMetadata()
-      } catch {
-        // Why: metadata already reflects the torn-down listener; nothing else to recover here.
-      }
-      return
-    }
-    // Why: register the restored loopback listener BEFORE persisting metadata so a write failure can never
-    // orphan a live transport outside activeTransports (and thus outside stop()).
-    this.activeTransports[index] = restored.transport
-    const metaIndex = this.transports.findIndex((meta) => meta.kind === 'websocket')
-    if (metaIndex !== -1) {
-      this.transports[metaIndex] = { kind: 'websocket', endpoint: restored.endpoint }
-    }
-    try {
-      this.writeMetadata()
-    } catch (persistError) {
-      // Why: the loopback listener is live and tracked; a persistence failure must not tear it down.
-      console.error(
-        '[runtime] Restored loopback WebSocket listener but failed to persist metadata:',
-        persistError
-      )
-    }
-  }
-
-  /** Why: test-only seam — runs one ownership check instead of waiting out the poll interval. */
-  checkRuntimeMetadataOwnership(): void {
-    this.metadataOwnershipWatch?.check()
-  }
-
-  async stop(): Promise<void> {
-    // Why: STA-2370 — refuse new widens, then let any in-flight pairing widen settle into the live
-    // transport arrays before snapshotting them, so a racing rebind can't strand a wide 0.0.0.0 listener
-    // by writing it back into a cleared array after shutdown (see widenWebSocketBind).
-    this.stopping = true
-    const pendingExposure = this.networkExposurePromise
-    if (pendingExposure) {
-      await pendingExposure.catch(() => {
-        // Why: a failed widen already recovered/logged; we only need it to finish mutating the arrays.
-      })
-    }
-    const transports = this.activeTransports
-    this.activeTransports = []
-    this.transports = []
-    this.metadataOwnershipWatch?.stop()
-    this.metadataOwnershipWatch = null
-    this.mobileSocketWiring = null
-    this.detachWebSocketWiring = null
-    const stopResults = await Promise.allSettled(
-      transports.map(async (transport) => transport.stop())
-    )
-    // Why: before-quit fences relay input; direct auth can still refresh lastSeen while these transports close.
-    this.deviceRegistry?.flushPendingLastSeen()
-    const failedStop = stopResults.find((result) => result.status === 'rejected')
-    if (failedStop?.status === 'rejected') {
-      throw failedStop.reason
-    }
-    // Why: leave the metadata file on shutdown — shared userData may host another live runtime whose bootstrap file we'd erase.
-  }
-
-  // Why: Unix socket dispatch is one-shot and auths via the shared token from the 0o600 metadata file. See §3.1.
-  private async handleMessage(
-    rawMessage: string,
-    context?: RpcMessageContext
-  ): Promise<RpcResponse> {
-    // Why: the transport sends an empty message when a client exceeds max size, then closes the connection.
-    if (!rawMessage) {
-      return this.buildError('unknown', 'request_too_large', 'RPC request exceeds the maximum size')
-    }
-
-    const parsed = this.parseAndAuth(rawMessage)
-    if ('error' in parsed) {
-      return parsed.error
-    }
-    const request = parsed.request
-
-    // Why: long-poll admission fence; short RPCs bypass the counter. See §7 risk #2.
-    const longPoll = classifyRuntimeLongPoll(request)
-    const rejection = this.admitLongPoll(longPoll)
-    if (rejection) {
-      return this.buildError(request.id, 'runtime_busy', rejection)
-    }
-    if (longPoll) {
-      // Why: arm keepalive only for long-polls; short RPCs never create the setInterval. See §3.1.
-      context?.startKeepalive()
-    }
-
-    try {
-      return await this.dispatcher.dispatch(request, {
-        signal: longPoll ? context?.signal : undefined
-      })
-    } finally {
-      this.releaseLongPoll(longPoll)
-    }
-  }
-
-  // Why: one fence for both transports — the total cap protects short RPCs, the ask
-  // sub-cap protects terminal.wait / check --wait from slow reply-blocked asks.
-  // Returns the rejection message, or null once the slot is reserved.
-  private admitLongPoll(
-    longPoll: RuntimeLongPollClass | null,
-    pairedDeviceId?: string
-  ): string | null {
-    if (!longPoll) {
-      return null
-    }
-    if (this.activeLongPolls >= this.longPollCap) {
-      return 'long-poll capacity reached; retry with backoff'
-    }
-    if (
-      (longPoll === 'ask' || longPoll === 'browser-host') &&
-      this.activeAskLongPolls + this.activeBrowserHostLongPolls >= this.specializedLongPollCap
-    ) {
-      return longPoll === 'ask'
-        ? 'orchestration.ask capacity reached; retry with backoff'
-        : 'browser-host capacity reached; retry with backoff'
-    }
-    if (longPoll === 'ask' && this.activeAskLongPolls >= this.askLongPollCap) {
-      return 'orchestration.ask capacity reached; retry with backoff'
-    }
-    if (
-      longPoll === 'browser-host' &&
-      (this.activeBrowserHostLongPolls >= this.browserHostLongPollCap ||
-        (pairedDeviceId !== undefined &&
-          (this.activeBrowserHostLongPollsByDevice.get(pairedDeviceId) ?? 0) >=
-            this.browserHostLongPollCapPerDevice))
-    ) {
-      return 'browser-host capacity reached; retry with backoff'
-    }
-    this.activeLongPolls += 1
-    if (longPoll === 'ask') {
-      this.activeAskLongPolls += 1
-    } else if (longPoll === 'browser-host') {
-      this.activeBrowserHostLongPolls += 1
-      if (pairedDeviceId !== undefined) {
-        this.activeBrowserHostLongPollsByDevice.set(
-          pairedDeviceId,
-          (this.activeBrowserHostLongPollsByDevice.get(pairedDeviceId) ?? 0) + 1
-        )
-      }
-    }
-    return null
-  }
-
-  private releaseLongPoll(longPoll: RuntimeLongPollClass | null, pairedDeviceId?: string): void {
-    if (!longPoll) {
-      return
-    }
-    this.activeLongPolls = Math.max(0, this.activeLongPolls - 1)
-    if (longPoll === 'ask') {
-      this.activeAskLongPolls = Math.max(0, this.activeAskLongPolls - 1)
-    } else if (longPoll === 'browser-host') {
-      this.activeBrowserHostLongPolls = Math.max(0, this.activeBrowserHostLongPolls - 1)
-      if (pairedDeviceId !== undefined) {
-        const remaining = (this.activeBrowserHostLongPollsByDevice.get(pairedDeviceId) ?? 1) - 1
-        if (remaining > 0) {
-          this.activeBrowserHostLongPollsByDevice.set(pairedDeviceId, remaining)
-        } else {
-          this.activeBrowserHostLongPollsByDevice.delete(pairedDeviceId)
-        }
-      }
-    }
-  }
-
-  private parseAndAuth(rawMessage: string): { request: RpcRequest } | { error: RpcResponse } {
-    let request: RpcRequest
-    try {
-      request = JSON.parse(rawMessage) as RpcRequest
-    } catch {
-      return { error: this.buildError('unknown', 'bad_request', 'Invalid JSON request') }
-    }
-
-    if (typeof request.id !== 'string' || request.id.length === 0) {
-      return { error: this.buildError('unknown', 'bad_request', 'Missing request id') }
-    }
-    if (typeof request.method !== 'string' || request.method.length === 0) {
-      return { error: this.buildError(request.id, 'bad_request', 'Missing RPC method') }
-    }
-    if (typeof request.authToken !== 'string' || request.authToken.length === 0) {
-      return { error: this.buildError(request.id, 'unauthorized', 'Missing auth token') }
-    }
-    if (request.authToken !== this.authToken) {
-      return { error: this.buildError(request.id, 'unauthorized', 'Invalid auth token') }
-    }
-
-    return { request }
-  }
-
-  // Why: WebSocket dispatch is streaming (multiple responses) and auths via per-device tokens, not the shared token.
-  private async handleWebSocketMessage(
-    rawMessage: string,
-    reply: (response: string) => void,
-    sendBinary: (response: Uint8Array<ArrayBufferLike>) => boolean | void,
-    wsTransport?: WebSocketTransport,
-    ws?: WebSocket,
-    authenticatedDeviceToken?: string | null,
-    authenticatedSocket?: AuthenticatedMobileSocket
-  ): Promise<void> {
-    let request: RpcRequest
-    try {
-      request = JSON.parse(rawMessage) as RpcRequest
-    } catch {
-      reply(JSON.stringify(this.buildError('unknown', 'bad_request', 'Invalid JSON request')))
-      return
-    }
-
-    if (typeof request.id !== 'string' || request.id.length === 0) {
-      reply(JSON.stringify(this.buildError('unknown', 'bad_request', 'Missing request id')))
-      return
-    }
-    if (typeof request.method !== 'string' || request.method.length === 0) {
-      reply(JSON.stringify(this.buildError(request.id, 'bad_request', 'Missing RPC method')))
-      return
-    }
-
-    const requestToken =
-      typeof (request as Record<string, unknown>).deviceToken === 'string'
-        ? ((request as Record<string, unknown>).deviceToken as string)
-        : null
-    if (authenticatedDeviceToken && requestToken && requestToken !== authenticatedDeviceToken) {
-      reply(JSON.stringify(this.buildError(request.id, 'unauthorized', 'Device token mismatch')))
-      return
-    }
-    // Why: E2EE already authenticated the channel; authorize by that bound identity, not a repeated request field.
-    const token = authenticatedDeviceToken ?? requestToken
-    if (!token) {
-      reply(JSON.stringify(this.buildError(request.id, 'unauthorized', 'Missing device token')))
-      return
-    }
-    const device = this.deviceRegistry?.validateToken(token)
-    if (!device) {
-      reply(JSON.stringify(this.buildError(request.id, 'unauthorized', 'Invalid device token')))
-      return
-    }
-    if (device.scope === 'mobile' && !MOBILE_RPC_METHOD_ALLOWLIST.has(request.method)) {
-      reply(
-        JSON.stringify(
-          this.buildError(
-            request.id,
-            'forbidden',
-            `Method '${request.method}' is not available to mobile clients`
-          )
-        )
-      )
-      return
-    }
-
-    // Why: bind deviceToken to this socket so ws.on('close') knows which mobile client disconnected.
-    if (wsTransport && ws) {
-      wsTransport.setClientId(ws, token)
-    }
-
-    const longPoll = classifyRuntimeLongPoll(request)
-    const rejection = this.admitLongPoll(longPoll, device.deviceId)
-    if (rejection) {
-      reply(JSON.stringify(this.buildError(request.id, 'runtime_busy', rejection)))
-      return
-    }
-
-    const abortRegistration = ws ? this.registerWebSocketDispatchAbort(ws) : null
-
-    // Why: older pairings may lack scope metadata, so stamp the authenticated scope onto status.get.
-    const replyForRequest =
-      request.method === 'status.get'
-        ? (response: string): void => reply(injectDeviceScope(response, device.scope))
-        : reply
-
-    const connectionId = ws ? this.mobileSocketWiring?.getConnectionId(ws) : undefined
-    const pairingProvider = this.mobileRelayPairingProvider
-    const pairingContext =
-      pairingProvider && authenticatedSocket
-        ? {
-            getEndpoints: (params: PairingGetEndpointsParams) =>
-              pairingProvider.getEndpoints(
-                {
-                  deviceId: authenticatedSocket.device.deviceId,
-                  connectionId: authenticatedSocket.connectionId,
-                  transport: authenticatedSocket.transport
-                },
-                params
-              ),
-            provisionRelay: (params: PairingProvisionRelayParams) =>
-              pairingProvider.provisionRelay(
-                {
-                  deviceId: authenticatedSocket.device.deviceId,
-                  connectionId: authenticatedSocket.connectionId,
-                  transport: authenticatedSocket.transport
-                },
-                params
-              )
-          }
-        : undefined
-    try {
-      await this.dispatcher.dispatchStreaming(request, replyForRequest, {
-        // Why: the validated credential preserves existing federation ownership without trusting request fields.
-        authenticatedCallerFingerprint: fingerprintAuthenticatedPairingCredential(token),
-        connectionId,
-        clientId: token,
-        pairedDeviceId: device.deviceId,
-        // Why: gates the mobile-only payload diet so full-screen web/desktop clients aren't truncated.
-        clientKind: device.scope,
-        clientCapabilities: authenticatedSocket?.clientCapabilities,
-        pairing: pairingContext,
-        signal: abortRegistration?.signal,
-        sendBinary,
-        registerBinaryStreamHandler: (streamId, handler) =>
-          this.registerBinaryStreamHandler(connectionId, streamId, handler),
-        registerBinaryMessageHandler: (handler) =>
-          this.registerBinaryMessageHandler(connectionId, handler)
-      })
-    } finally {
-      abortRegistration?.dispose()
-      this.releaseLongPoll(longPoll, device.deviceId)
-    }
-  }
-
-  private buildError(id: string, code: string, message: string): RpcResponse {
-    return errorResponse(id, { runtimeId: this.runtime.getRuntimeId() }, code, message)
-  }
-
-  private writeMetadata(): void {
-    const metadata: RuntimeMetadata = {
-      runtimeId: this.runtime.getRuntimeId(),
-      pid: this.pid,
-      transports: this.transports,
-      authToken: this.authToken,
-      startedAt: this.runtime.getStartedAt()
-    }
-    writeRuntimeMetadata(this.userDataPath, metadata)
-  }
-}
-
-/** Why: MUST stay in lockstep with createRuntimeTransportMetadata()'s `o-${pid}-${suffix}.sock` shape (unit-test enforced). */
-export const RUNTIME_SOCKET_NAME_REGEX = /^o-(\d+)-[A-Za-z0-9_-]+\.sock$/
-
-export function sweepOrphanedRuntimeSockets(userDataPath: string, ownPid: number): void {
-  let entries: string[]
-  try {
-    entries = readdirSync(userDataPath)
-  } catch {
-    // Why: first-launch userData may not exist yet; nothing to sweep.
-    return
-  }
-  for (const entry of entries) {
-    const match = RUNTIME_SOCKET_NAME_REGEX.exec(entry)
-    if (!match) {
-      continue
-    }
-    const pid = Number(match[1])
-    if (!Number.isFinite(pid)) {
-      continue
-    }
-    // Why: never delete our own socket — a bug here would rmSync one we're about to bind.
-    if (pid === ownPid) {
-      continue
-    }
-    try {
-      // Why: signal 0 is the POSIX liveness probe (sends nothing); ESRCH = dead pid, EPERM = foreign owner (left alone).
-      process.kill(pid, 0)
-    } catch (error) {
-      if ((error as NodeJS.ErrnoException).code === 'ESRCH') {
-        try {
-          rmSync(join(userDataPath, entry), { force: true })
-        } catch {
-          // Why: best-effort sweep; a later start() or OS reboot cleans any socket we can't unlink.
-        }
-      }
-    }
-  }
-}
-
-export function createRuntimeTransportMetadata(
-  userDataPath: string,
-  pid: number,
-  platform: NodeJS.Platform,
-  runtimeId = 'runtime'
-): RuntimeTransportMetadata {
-  const endpointSuffix = runtimeId.replace(/[^a-zA-Z0-9_-]/g, '').slice(0, 4) || 'rt'
-  if (platform === 'win32') {
-    return {
-      kind: 'named-pipe',
-      // Why: named pipes lack the chmod hardening of Unix sockets; a per-runtime suffix avoids a stable, guessable endpoint name.
-      endpoint: `\\\\.\\pipe\\orca-${pid}-${endpointSuffix}`
-    }
-  }
-  return {
-    kind: 'unix',
-    endpoint: join(userDataPath, `o-${pid}-${endpointSuffix}.sock`)
-  }
-}
+export {
+  RUNTIME_SOCKET_NAME_REGEX,
+  sweepOrphanedRuntimeSockets,
+  createRuntimeTransportMetadata
+} from './runtime-rpc/runtime-rpc-socket-metadata'
diff --git a/src/main/runtime/runtime-rpc/runtime-rpc-binary-routing.ts b/src/main/runtime/runtime-rpc/runtime-rpc-binary-routing.ts
new file mode 100644
index 00000000000..20264112f48
--- /dev/null
+++ b/src/main/runtime/runtime-rpc/runtime-rpc-binary-routing.ts
@@ -0,0 +1,114 @@
+import type { WebSocket } from 'ws'
+import type { TerminalStreamFrame } from '../../../shared/terminal-stream-protocol'
+import { DeviceRegistry } from '../device-registry'
+import { loadOrCreateE2EEKeypair, type E2EEKeypair } from '../e2ee-keypair'
+import { RuntimeRpcState } from './runtime-rpc-state'
+import {
+  DEVICE_REGISTRY_UNAVAILABLE_GUIDANCE,
+  E2EE_KEY_UNAVAILABLE_GUIDANCE,
+  pairingUnavailable,
+  type PairingIdentityInitialization
+} from './runtime-rpc-pairing-types'
+
+export class RuntimeRpcBinaryRouting extends RuntimeRpcState {
+  protected registerBinaryStreamHandler(
+    connectionId: string | undefined,
+    streamId: number,
+    handler: (frame: TerminalStreamFrame) => void
+  ): () => void {
+    return this.binaryMessageRouter.registerTerminalStream(connectionId, streamId, handler)
+  }
+
+  protected registerBinaryMessageHandler(
+    connectionId: string | undefined,
+    handler: (bytes: Uint8Array<ArrayBufferLike>) => void
+  ): () => void {
+    return this.binaryMessageRouter.registerRawMessage(connectionId, handler)
+  }
+
+  protected handleWebSocketBinaryMessage(bytes: Uint8Array<ArrayBufferLike>, ws: WebSocket): void {
+    this.binaryMessageRouter.dispatch(this.mobileSocketWiring?.getConnectionId(ws), bytes)
+  }
+
+  protected registerWebSocketDispatchAbort(ws: WebSocket): {
+    signal: AbortSignal
+    dispose: () => void
+  } {
+    const abortController = new AbortController()
+    if (ws.readyState !== ws.OPEN) {
+      abortController.abort()
+      return { signal: abortController.signal, dispose: () => {} }
+    }
+
+    let state = this.wsDispatchAbortStates.get(ws)
+    if (!state) {
+      state = {
+        controllers: new Set(),
+        abortOnClose: () => this.abortWebSocketDispatches(ws)
+      }
+      this.wsDispatchAbortStates.set(ws, state)
+      // Why: many streaming RPCs share one WebSocket; one socket-level abort fan-out avoids MaxListenersExceededWarning.
+      ws.on('close', state.abortOnClose)
+      ws.on('error', state.abortOnClose)
+    }
+    state.controllers.add(abortController)
+
+    return {
+      signal: abortController.signal,
+      dispose: () => {
+        const current = this.wsDispatchAbortStates.get(ws)
+        if (!current) {
+          return
+        }
+        current.controllers.delete(abortController)
+        if (current.controllers.size > 0) {
+          return
+        }
+        this.wsDispatchAbortStates.delete(ws)
+        ws.off('close', current.abortOnClose)
+        ws.off('error', current.abortOnClose)
+      }
+    }
+  }
+
+  protected abortWebSocketDispatches(ws: WebSocket): void {
+    const state = this.wsDispatchAbortStates.get(ws)
+    if (!state) {
+      return
+    }
+    this.wsDispatchAbortStates.delete(ws)
+    ws.off('close', state.abortOnClose)
+    ws.off('error', state.abortOnClose)
+    for (const controller of state.controllers) {
+      controller.abort()
+    }
+    state.controllers.clear()
+  }
+
+  protected initializePairingIdentity(): PairingIdentityInitialization {
+    let deviceRegistry: DeviceRegistry
+    try {
+      deviceRegistry = new DeviceRegistry(this.userDataPath)
+    } catch (error) {
+      console.error('[runtime] Failed to initialize pairing registry:', error)
+      return {
+        ok: false,
+        failure: pairingUnavailable(
+          'device_registry_unavailable',
+          DEVICE_REGISTRY_UNAVAILABLE_GUIDANCE
+        )
+      }
+    }
+    let e2eeKeypair: E2EEKeypair
+    try {
+      e2eeKeypair = loadOrCreateE2EEKeypair(this.userDataPath)
+    } catch (error) {
+      console.error('[runtime] Failed to initialize E2EE identity:', error)
+      return {
+        ok: false,
+        failure: pairingUnavailable('e2ee_key_unavailable', E2EE_KEY_UNAVAILABLE_GUIDANCE)
+      }
+    }
+    return { ok: true, deviceRegistry, e2eeKeypair }
+  }
+}
diff --git a/src/main/runtime/runtime-rpc/runtime-rpc-lifecycle.ts b/src/main/runtime/runtime-rpc/runtime-rpc-lifecycle.ts
new file mode 100644
index 00000000000..9cfe31251b6
--- /dev/null
+++ b/src/main/runtime/runtime-rpc/runtime-rpc-lifecycle.ts
@@ -0,0 +1,261 @@
+import type { RuntimeTransportMetadata } from '../../../shared/runtime-bootstrap'
+import { watchRuntimeMetadataOwnership } from '../runtime-metadata-ownership-watch'
+import type { RpcTransport } from '../rpc/transport'
+import { UnixSocketTransport } from '../rpc/unix-socket-transport'
+import { WebSocketTransport } from '../rpc/ws-transport'
+import { readWsFallbackPort, writeWsFallbackPort } from '../rpc/ws-fallback-port-store'
+import type { DeviceRegistry } from '../device-registry'
+import type { E2EEKeypair } from '../e2ee-keypair'
+import { UnpairedDeviceAuthThrottle } from '../rpc/unpaired-device-auth-throttle'
+import { MobileSocketWiring } from '../rpc/mobile-socket-wiring'
+import { RuntimeRpcWebSocketDispatch } from './runtime-rpc-websocket-dispatch'
+import {
+  formatWsEndpoint,
+  WS_BIND_HOST_ALL_INTERFACES,
+  WS_BIND_HOST_LOOPBACK
+} from './runtime-rpc-pairing-types'
+import {
+  createRuntimeTransportMetadata,
+  sweepOrphanedRuntimeSockets
+} from './runtime-rpc-socket-metadata'
+
+export class RuntimeRpcLifecycle extends RuntimeRpcWebSocketDispatch {
+  async start(): Promise<void> {
+    if (this.activeTransports.length > 0) {
+      return
+    }
+
+    // Why: SIGKILL/OOM skip stop(), orphaning `o-<pid>-*.sock` files; sweep them. Skipped on Windows: named pipes leave no filesystem entries.
+    if (this.platform !== 'win32') {
+      sweepOrphanedRuntimeSockets(this.userDataPath, this.pid)
+    }
+
+    const transportMeta = createRuntimeTransportMetadata(
+      this.userDataPath,
+      this.pid,
+      this.platform,
+      this.runtime.getRuntimeId()
+    )
+
+    const socketTransport = new UnixSocketTransport({
+      endpoint: transportMeta.endpoint,
+      kind: transportMeta.kind as 'unix' | 'named-pipe',
+      keepaliveIntervalMs: this.keepaliveIntervalMs
+    })
+
+    // Why: the `.catch` guarantees reply() always fires so a throw can't strand the client or leak the AbortController.
+    socketTransport.onMessage((msg, reply, context) => {
+      void this.handleMessage(msg, context)
+        .then((response) => {
+          reply(JSON.stringify(response))
+        })
+        .catch((error) => {
+          const message = error instanceof Error ? error.message : String(error)
+          // Why: best-effort id recovery so the client can correlate the error frame to its pending request.
+          let id = 'unknown'
+          try {
+            const parsed = JSON.parse(msg) as { id?: unknown }
+            if (typeof parsed.id === 'string' && parsed.id.length > 0) {
+              id = parsed.id
+            }
+          } catch {
+            // ignore — fall through with id='unknown'
+          }
+          reply(JSON.stringify(this.buildError(id, 'internal_error', message)))
+        })
+    })
+
+    await socketTransport.start()
+
+    const activeTransports: RpcTransport[] = [socketTransport]
+    const transportsMeta: RuntimeTransportMetadata[] = [transportMeta]
+
+    // Why: WebSocket uses per-device tokens + E2EE (tweetnacl) instead of TLS since React Native can't pin self-signed certs.
+    if (this.enableWebSocket) {
+      // Why: land any deferred lastSeen write before a replacement registry reads the same file.
+      this.deviceRegistry?.flushPendingLastSeen()
+      const pairingIdentity = this.initializePairingIdentity()
+      if (!pairingIdentity.ok) {
+        this.deviceRegistry = null
+        this.e2eeKeypair = null
+        this.pairingInitializationFailure = pairingIdentity.failure
+      } else {
+        this.deviceRegistry = pairingIdentity.deviceRegistry
+        this.e2eeKeypair = pairingIdentity.e2eeKeypair
+        this.pairingInitializationFailure = null
+        try {
+          const host = this.resolveInitialWebSocketBindHost()
+          const { transport, endpoint } = await this.startWebSocketTransport({
+            host,
+            port: this.wsPort,
+            preferPinnedPort: this.preferPinnedWsPort,
+            // Why: stable fallback port across restarts keeps paired devices' endpoints valid (STA-1511); wsPort 0 = random (E2E).
+            ...(this.wsPort !== 0 ? { fallbackPort: readWsFallbackPort(this.userDataPath) } : {})
+          })
+          if (this.wsPort !== 0 && transport.resolvedPort !== this.wsPort) {
+            writeWsFallbackPort(this.userDataPath, transport.resolvedPort)
+          }
+          activeTransports.push(transport)
+          transportsMeta.push({ kind: 'websocket', endpoint })
+        } catch (error) {
+          // Why: WebSocket transport is supplementary; on failure (e.g. port in use) continue with Unix socket only.
+          console.error('[runtime] Failed to start WebSocket transport:', error)
+          this.mobileSocketWiring = null
+        }
+      }
+    }
+
+    // Why: set in-memory transport state before writing metadata so the bootstrap file has the real endpoint/token pair.
+    this.activeTransports = activeTransports
+    this.transports = transportsMeta
+
+    try {
+      this.writeMetadata()
+    } catch (error) {
+      // Why: a runtime that can't publish metadata is invisible to the CLI — close transports rather than run undiscoverable.
+      this.activeTransports = []
+      this.transports = []
+      await Promise.all(activeTransports.map((t) => t.stop().catch(() => {}))).catch(() => {})
+      throw error
+    }
+
+    this.metadataOwnershipWatch = watchRuntimeMetadataOwnership({
+      userDataPath: this.userDataPath,
+      ownedPid: this.pid,
+      ownedRuntimeId: this.runtime.getRuntimeId(),
+      pollIntervalMs: this.metadataOwnershipPollMs,
+      republish: () => {
+        // Why: never advertise endpoints we already tore down.
+        if (this.activeTransports.length === 0) {
+          return
+        }
+        this.writeMetadata()
+      },
+      onReclaim: (previous) => {
+        console.warn(
+          `[runtime] Reclaimed orca-runtime.json from a dead runtime (pid ${previous?.pid ?? 'none'}); republished pid ${this.pid}.`
+        )
+      }
+    })
+  }
+
+  // Why: STA-2370 — a desktop with no previously-connected device stays on loopback until the user
+  // explicitly pairs; `orca serve`/E2E (exposeNetworkByDefault) and a reconnecting paired device bind wide.
+  // A grant minted for "This computer only" is excluded: its client is a browser on this machine, so
+  // counting it would republish the runtime on every interface one restart after the user declined that.
+  protected resolveInitialWebSocketBindHost(): string {
+    if (this.pinnedBindHost) {
+      return this.pinnedBindHost
+    }
+    if (this.exposeNetworkByDefault) {
+      return WS_BIND_HOST_ALL_INTERFACES
+    }
+    const hasConnectedNetworkDevice =
+      this.deviceRegistry
+        ?.listDevices()
+        .some((device) => device.lastSeenAt > 0 && device.pairingReach !== 'this-computer') ?? false
+    return hasConnectedNetworkDevice ? WS_BIND_HOST_ALL_INTERFACES : WS_BIND_HOST_LOOPBACK
+  }
+
+  // Why: builds and starts a WS transport bound to `host`, wiring the session-scoped mobile socket
+  // handlers. Shared by initial start() and the pairing-time widen so both paths stay identical.
+  protected async startWebSocketTransport(options: {
+    host: string
+    port: number
+    preferPinnedPort: boolean
+    fallbackPort?: number
+  }): Promise<{ transport: WebSocketTransport; endpoint: string }> {
+    const deviceRegistry = this.deviceRegistry
+    const e2eeKeypair = this.e2eeKeypair
+    if (!deviceRegistry || !e2eeKeypair) {
+      throw new Error('WebSocket transport requires an initialized pairing identity')
+    }
+    const wsTransport = new WebSocketTransport({
+      host: options.host,
+      port: options.port,
+      staticRoot: this.webClientRoot,
+      ...(options.fallbackPort !== undefined ? { fallbackPort: options.fallbackPort } : {}),
+      ...(options.preferPinnedPort ? { preferPinnedPort: true } : {})
+    })
+    const mobileSocketWiring = this.ensureMobileSocketWiring(deviceRegistry, e2eeKeypair)
+    this.detachWebSocketWiring = mobileSocketWiring.attachTransport(wsTransport)
+
+    try {
+      await wsTransport.start()
+    } catch (error) {
+      // Why: a listener that never bound must not stay attached to the session wiring (it would leak into
+      // terminateDeviceConnections); detach before propagating so the wiring only tracks live transports.
+      this.detachWebSocketWiring?.()
+      this.detachWebSocketWiring = null
+      throw error
+    }
+    this.wsBoundHost = options.host
+    return {
+      transport: wsTransport,
+      endpoint: formatWsEndpoint(options.host, wsTransport.resolvedPort)
+    }
+  }
+
+  // Why: one MobileSocketWiring per server session. Direct WS and cloud relay both attach to it, and
+  // DesktopRelayService captures it once at construction, so a loopback→wide pairing rebind must swap the
+  // transport under the SAME wiring — replacing the wiring would strand relay sockets (lost connection IDs,
+  // binary handling, and revocation targeting) on a dead object.
+  protected ensureMobileSocketWiring(
+    deviceRegistry: DeviceRegistry,
+    e2eeKeypair: E2EEKeypair
+  ): MobileSocketWiring {
+    if (this.mobileSocketWiring) {
+      return this.mobileSocketWiring
+    }
+    // Why: session-scoped so each desktop launch may notify once (a mid-session rebind must not reset it).
+    this.unpairedDeviceAuthThrottle = new UnpairedDeviceAuthThrottle({
+      onTrigger: () => this.onUnpairedDeviceAuthFailure?.()
+    })
+    const mobileSocketWiring = new MobileSocketWiring({
+      deviceRegistry,
+      e2eeKeypair,
+      onText: (socket, plaintext, reply, sendBinary) => {
+        void this.handleWebSocketMessage(
+          plaintext,
+          reply,
+          sendBinary,
+          undefined,
+          socket.ws,
+          socket.device.deviceToken,
+          socket
+        )
+      },
+      onBinary: (socket, bytes) => this.handleWebSocketBinaryMessage(bytes, socket.ws),
+      onReady: () => {
+        // Why: first authenticated mobile/remote client (direct WS and
+        // cloud relay both attach here) starts path-candidate tracking.
+        // Activation is a local-host concern: candidate buffers live on the
+        // buffer-owning host's runtime, so a remote runtime proxy may
+        // legitimately lack this method (its own server activates it).
+        this.runtime.activateRecentPtyPathCandidateTracking?.()
+        this.mobileRelayPairingProvider?.onDemandStateChanged?.()
+      },
+      onClose: (socket, hasOtherConnections) => {
+        if (!socket) {
+          return
+        }
+        this.abortWebSocketDispatches(socket.ws)
+        // Why: subscriptions and binary streams are socket-scoped, but disconnect state is device-scoped across transports.
+        this.runtime.cleanupSubscriptionsForConnection(socket.connectionId)
+        this.runtime.cancelMobileDictationForConnection(socket.connectionId)
+        this.binaryMessageRouter.deleteConnection(socket.connectionId)
+        if (!hasOtherConnections) {
+          this.runtime.onClientDisconnected(socket.device.deviceToken)
+        }
+      },
+      // Why: relay attempts are authorized upstream; only direct failures should prompt local re-pairing.
+      onUnpairedDeviceAuthFailure: (metadata) => {
+        if (metadata.transport === 'direct') {
+          this.unpairedDeviceAuthThrottle?.recordFailure()
+        }
+      }
+    })
+    this.mobileSocketWiring = mobileSocketWiring
+    return mobileSocketWiring
+  }
+}
diff --git a/src/main/runtime/runtime-rpc/runtime-rpc-long-poll.ts b/src/main/runtime/runtime-rpc/runtime-rpc-long-poll.ts
new file mode 100644
index 00000000000..02d8422547e
--- /dev/null
+++ b/src/main/runtime/runtime-rpc/runtime-rpc-long-poll.ts
@@ -0,0 +1,58 @@
+import type { RpcRequest } from '../rpc/core'
+
+export const KEEPALIVE_INTERVAL_MS = 10_000
+
+// Why: cap long-polls at half the 32-slot connection budget so they can't starve short RPCs; overflow → runtime_busy. See §7 risk #2.
+export const LONG_POLL_CAP = 16
+
+// Why: orchestration.ask blocks on a human/agent reply for minutes, an order of
+// magnitude longer than terminal.wait or check --wait, so a fleet of asking
+// workers would otherwise hold every slot and starve the mobile/web/CLI/relay
+// clients sharing this runtime. Reserve half the budget for the other classes.
+export const ASK_LONG_POLL_SHARE = 0.5
+// Why: eight host slots preserve four-host overlap for two independently paired desktops.
+export const BROWSER_HOST_LONG_POLL_SHARE = 0.5
+// Why: asks and permanent hosts together retain the prior quarter-budget reservation for waits.
+export const SPECIALIZED_LONG_POLL_SHARE = 0.75
+
+// Why: 'ask' is metered separately from 'wait' — same keepalive/abort wiring, its own sub-cap.
+export type RuntimeLongPollClass = 'ask' | 'browser-host' | 'wait'
+
+// Why: single classifier for long-poll requests (handlers that block on an external event), shared by counter/abort/keepalive. See §3.1.
+export function classifyRuntimeLongPoll(request: RpcRequest): RuntimeLongPollClass | null {
+  // Worker start waits for readiness and then verifies the submitted prompt;
+  // the complete operation can run for 90–110s. Keep every local transport
+  // (Unix sockets and Windows named pipes) alive for that long poll.
+  if (request.method === 'orchestration.workerStart') {
+    return 'wait'
+  }
+  if (request.method === 'browser.clientHost.attach') {
+    return 'browser-host'
+  }
+  if (request.method === 'terminal.wait') {
+    return 'wait'
+  }
+  // Agent-prompt submission waits for the PTY's lifecycle transition (up to
+  // the verification budget); keep the local socket alive for that wait.
+  if (
+    request.method === 'terminal.send' &&
+    typeof request.params === 'object' &&
+    request.params !== null &&
+    (request.params as { agentPrompt?: unknown }).agentPrompt === true
+  ) {
+    return 'wait'
+  }
+  // Why: orchestration.ask blocks unconditionally (default 600 s) holding the
+  // RPC open until a reply lands or the deadline passes, so it needs the same
+  // keepalive as check --wait or the 30 s socket idle timer tears it down. It
+  // also relies on the abort signal (only wired for long-polls) to release the
+  // waiter when the asking client disconnects.
+  if (request.method === 'orchestration.ask') {
+    return 'ask'
+  }
+  if (request.method === 'orchestration.check') {
+    const params = request.params as { wait?: unknown } | undefined
+    return params?.wait === true ? 'wait' : null
+  }
+  return null
+}
diff --git a/src/main/runtime/runtime-rpc/runtime-rpc-mobile-method-allowlist.ts b/src/main/runtime/runtime-rpc/runtime-rpc-mobile-method-allowlist.ts
new file mode 100644
index 00000000000..461ec02ba69
--- /dev/null
+++ b/src/main/runtime/runtime-rpc/runtime-rpc-mobile-method-allowlist.ts
@@ -0,0 +1,265 @@
+export const MOBILE_RPC_METHOD_ALLOWLIST = new Set([
+  'accounts.list',
+  'accounts.consumeCodexResetCredit',
+  'accounts.selectClaude',
+  'accounts.selectCodex',
+  'accounts.selectCodexForTarget',
+  'accounts.subscribe',
+  'accounts.unsubscribe',
+  'aiVault.listSessions',
+  'aiVault.resolveSessionTitles',
+  'aiVault.prepareSessionResume',
+  'browser.back',
+  'browser.dialogAccept',
+  'browser.dialogDismiss',
+  'browser.forward',
+  'browser.goto',
+  'browser.keyboardInsertText',
+  'browser.keypress',
+  'browser.mouseDown',
+  'browser.mouseClick',
+  'browser.mouseMove',
+  'browser.mouseUp',
+  'browser.mouseWheel',
+  'browser.reload',
+  'browser.screencast',
+  'browser.screencast.unsubscribe',
+  'browser.tabCreate',
+  'browser.viewport',
+  'clipboard.abortImageUpload',
+  'clipboard.appendImageUploadChunk',
+  'clipboard.commitImageUpload',
+  'clipboard.saveImageAsTempFile',
+  'clipboard.startImageUpload',
+  'diagnostics.memory',
+  'files.browseServerDir',
+  'files.createFile',
+  'files.list',
+  'files.open',
+  'files.openDiff',
+  'files.read',
+  'files.readDocPreview',
+  'files.readChunk',
+  'files.readDir',
+  'files.readPreview',
+  'files.readTerminalArtifact',
+  'files.readTerminalArtifactPreview',
+  'files.resolveTerminalPath',
+  'files.searchPaths',
+  'files.writeTerminalArtifact',
+  'folderWorkspace.list',
+  'git.abortMerge',
+  'git.abortRebase',
+  'git.bulkStage',
+  'git.bulkUnstage',
+  'git.branchCompare',
+  'git.branchDiff',
+  'git.cancelGenerateCommitMessage',
+  'git.cancelGeneratePullRequestFields',
+  'git.checkout',
+  'git.commit',
+  'git.commitCompare',
+  'git.commitDiff',
+  'git.discard',
+  'git.discoverCommitMessageModels',
+  'git.diff',
+  'git.fetch',
+  'git.forkSync',
+  'git.fastForward',
+  'git.generateCommitMessage',
+  'git.generatePullRequestFields',
+  'git.history',
+  'git.localBranches',
+  'git.pull',
+  'git.push',
+  'git.rebaseFromBase',
+  'git.stage',
+  'git.status',
+  'git.unstage',
+  'git.upstreamStatus',
+  'github.createIssue',
+  'github.addIssueComment',
+  'github.addPRReviewComment',
+  'github.addPRReviewCommentReply',
+  'github.countWorkItems',
+  'github.listAssignableUsers',
+  'github.listLabels',
+  'github.listWorkItems',
+  'github.mergePR',
+  'github.setPRAutoMerge',
+  'github.requestPRReviewers',
+  'github.removePRReviewers',
+  'github.project.listAccessible',
+  'github.project.listAssignableUsersBySlug',
+  'github.project.listIssueTypesBySlug',
+  'github.project.listLabelsBySlug',
+  'github.project.listViews',
+  'github.project.resolveRef',
+  'github.project.addIssueCommentBySlug',
+  'github.project.updateIssueCommentBySlug',
+  'github.project.deleteIssueCommentBySlug',
+  'github.project.clearItemField',
+  'github.project.updateIssueBySlug',
+  'github.project.updateIssueTypeBySlug',
+  'github.project.updateItemField',
+  'github.project.updatePullRequestBySlug',
+  'github.project.viewTable',
+  'github.project.workItemDetailsBySlug',
+  'github.prForBranch',
+  'github.prFileContents',
+  'github.prChecks',
+  'github.prCheckDetails',
+  'github.rerunPRChecks',
+  'github.resolveReviewThread',
+  'github.setPRFileViewed',
+  'github.updateIssue',
+  'github.updatePR',
+  'github.updatePRTitle',
+  'github.updatePRState',
+  'github.repoSlug',
+  'github.workItem',
+  // Cross-repo lookup: lets the mobile Smart picker resolve a pasted github.com URL for a different repo.
+  'github.workItemByOwnerRepo',
+  'github.workItemDetails',
+  'gitlab.createIssue',
+  'gitlab.addIssueComment',
+  'gitlab.addMRComment',
+  'gitlab.listWorkItems',
+  // Mobile Smart picker: resolve a pasted GitLab URL to an exact issue/MR (MR listing reuses gitlab.listWorkItems).
+  'gitlab.workItemByPath',
+  'gitlab.mergeMR',
+  'gitlab.resolveMRDiscussion',
+  'gitlab.todos',
+  'gitlab.updateIssue',
+  'gitlab.updateMR',
+  'gitlab.updateMRState',
+  'gitlab.workItemDetails',
+  'host.gitBash.isAvailable',
+  'host.platform',
+  'host.pwsh.isAvailable',
+  'host.wsl.isAvailable',
+  'host.wsl.listDistros',
+  'hostedReview.create',
+  'hostedReview.createStacked',
+  'hostedReview.forBranch',
+  'hostedReview.getCreationEligibility',
+  'linear.getCustomView',
+  'linear.getIssue',
+  'linear.getProject',
+  'linear.agentSearchIssues',
+  'linear.issueContext',
+  'linear.resolveCurrentIssue',
+  'linear.addIssueComment',
+  'linear.connect',
+  'linear.createIssue',
+  'linear.createProject',
+  'linear.issueComments',
+  'linear.listCustomViewIssues',
+  'linear.listCustomViewProjects',
+  'linear.listCustomViews',
+  'linear.listIssues',
+  'linear.mcpListIssues',
+  'linear.listProjectIssues',
+  'linear.listProjects',
+  'linear.teamLabels',
+  'linear.teamMembers',
+  'linear.listTeams',
+  'linear.searchIssues',
+  'linear.selectWorkspace',
+  'linear.status',
+  'linear.teamStates',
+  'linear.updateIssue',
+  'markdown.readTab',
+  'markdown.saveTab',
+  'notifications.getMissedSince',
+  'notifications.subscribe',
+  'notifications.unsubscribe',
+  'pairing.getEndpoints',
+  'pairing.provisionRelay',
+  'preflight.check',
+  'preflight.detectAgents',
+  'preflight.detectRemoteAgents',
+  'projectGroup.list',
+  'repo.baseRefDefault',
+  'repo.gitAvailable',
+  'repo.hooks',
+  'repo.list',
+  'repo.saveSparsePreset',
+  'repo.searchRefs',
+  'repo.sparsePresets',
+  'repo.update',
+  'runtime.clientEvents.subscribe',
+  'runtime.clientEvents.unsubscribe',
+  'session.tabs.activate',
+  'session.tabs.close',
+  'session.tabs.closeLifecycle',
+  'session.tabs.createTerminal',
+  'session.tabs.list',
+  'session.tabs.listAll',
+  'session.tabs.move',
+  'session.tabs.subscribe',
+  'session.tabs.subscribeAll',
+  'session.tabs.unsubscribe',
+  'session.tabs.unsubscribeAll',
+  'nativeChat.readSession',
+  'nativeChat.subscribe',
+  'nativeChat.unsubscribe',
+  'settings.get',
+  'settings.getTerminalQuickCommands',
+  'settings.update',
+  'settings.updateTerminalQuickCommands',
+  'ssh.connect',
+  'ssh.getState',
+  'ssh.listRemovedTargetLabels',
+  'ssh.listTargets',
+  'ssh.listTargetSummaries',
+  'speech.dictation.cancel',
+  'speech.dictation.chunk',
+  'speech.dictation.finish',
+  'speech.dictation.setup',
+  'speech.dictation.start',
+  'speech.models.delete',
+  'speech.models.download',
+  'speech.models.list',
+  'stats.summary',
+  'status.get',
+  'agentTeams.prepareLaunch',
+  'agentTeams.tmuxCompat',
+  'terminal.clearBuffer',
+  'terminal.close',
+  'terminal.closeTab',
+  'terminal.create',
+  'terminal.createAgentSession',
+  'terminal.ensureAgentSession',
+  'terminal.focus',
+  'terminal.agentStatus',
+  'terminal.adoptOrphans',
+  'terminal.getAutoRestoreFit',
+  'terminal.isRunningAgent',
+  'terminal.list',
+  'terminal.multiplex',
+  'terminal.read',
+  'terminal.rename',
+  'terminal.send',
+  'terminal.setAutoRestoreFit',
+  'terminal.setDisplayMode',
+  'terminal.subscribe',
+  'terminal.unsubscribe',
+  'terminal.updateViewport',
+  'terminal.wait',
+  'ui.get',
+  'ui.recordFeatureInteraction',
+  'ui.set',
+  'worktree.activate',
+  'worktree.create',
+  'worktree.forceDeleteBranch',
+  'worktree.listRetiredNames',
+  'worktree.prefetchCreateBase',
+  'worktree.ps',
+  'worktree.show',
+  'worktree.resolveMrBase',
+  'worktree.resolvePrBase',
+  'worktree.rm',
+  'worktree.set',
+  'worktree.sleep'
+])
diff --git a/src/main/runtime/runtime-rpc/runtime-rpc-mobile-pairing.ts b/src/main/runtime/runtime-rpc/runtime-rpc-mobile-pairing.ts
new file mode 100644
index 00000000000..de4e1d3ce88
--- /dev/null
+++ b/src/main/runtime/runtime-rpc/runtime-rpc-mobile-pairing.ts
@@ -0,0 +1,260 @@
+import type { MobilePairingConnectionMode } from '../../../shared/mobile-pairing-connection-mode'
+import {
+  mobileRelayMintFailureFromUnknown,
+  type MobileRelayMintFailure
+} from '../../../shared/mobile-relay-mint-failure'
+import { encodePairingOffer, PAIRING_OFFER_VERSION } from '../../../shared/pairing'
+import { NETWORK_EXPOSURE_FAILED_GUIDANCE } from '../network-exposure-guidance'
+import { RuntimeRpcPairing } from './runtime-rpc-pairing'
+import {
+  DEVICE_REGISTRY_UNAVAILABLE_GUIDANCE,
+  pairingUnavailable,
+  type MobilePairingOffer,
+  type MobileRelayPairingProvider,
+  type PairingOfferUnavailable
+} from './runtime-rpc-pairing-types'
+
+export class RuntimeRpcMobilePairing extends RuntimeRpcPairing {
+  async createMobilePairingOffer(args: {
+    address?: string | null
+    connectionMode?: MobilePairingConnectionMode
+    name?: string
+    rotate?: boolean
+  }): Promise<MobilePairingOffer> {
+    // Why: STA-2370 — creating a mobile pairing offer is the user's explicit opt-in to LAN reach, so
+    // widen the loopback listener before advertising its LAN endpoint in the QR. If the widen fails the
+    // listener stays on loopback, so report unavailable rather than advertise a dead LAN endpoint.
+    try {
+      await this.ensureNetworkExposure()
+    } catch (error) {
+      console.error(
+        '[runtime] Network exposure failed while creating a mobile pairing offer:',
+        error
+      )
+      return pairingUnavailable('network_exposure_failed', NETWORK_EXPOSURE_FAILED_GUIDANCE)
+    }
+    if (args.connectionMode === 'local-only') {
+      this.mobilePairingOfferGeneration += 1
+      return this.createMobilePairingOfferSerial(args, this.mobilePairingOfferGeneration)
+    }
+    const address = args.address ?? null
+    const rotate = args.rotate === true
+    const inFlight = this.mobileRelayPairingOfferInFlight
+    if (
+      inFlight?.generation === this.mobilePairingOfferGeneration &&
+      inFlight.address === address &&
+      (inFlight.rotate || !rotate)
+    ) {
+      return inFlight.request
+    }
+    // Why: every request that is not coalesced above supersedes the older one, rotating or not.
+    const generation = ++this.mobilePairingOfferGeneration
+    const request = this.mobileRelayPairingOfferQueue.then(() =>
+      generation === this.mobilePairingOfferGeneration
+        ? this.createMobilePairingOfferSerial(args, generation)
+        : this.relayPairingRequestSuperseded()
+    )
+    this.mobileRelayPairingOfferQueue = request.then(
+      () => undefined,
+      () => undefined
+    )
+    this.mobileRelayPairingOfferInFlight = { generation, address, rotate, request }
+    void request.then(
+      () => {
+        if (this.mobileRelayPairingOfferInFlight?.request === request) {
+          this.mobileRelayPairingOfferInFlight = null
+        }
+      },
+      () => {
+        if (this.mobileRelayPairingOfferInFlight?.request === request) {
+          this.mobileRelayPairingOfferInFlight = null
+        }
+      }
+    )
+    return request
+  }
+
+  protected async createMobilePairingOfferSerial(
+    args: {
+      address?: string | null
+      connectionMode?: MobilePairingConnectionMode
+      name?: string
+      rotate?: boolean
+    },
+    generation: number
+  ): Promise<MobilePairingOffer> {
+    // Why: the renderer is outside the trust boundary, so only an explicit local-only value may suppress Relay provisioning.
+    const connectionMode = args.connectionMode === 'local-only' ? 'local-only' : 'automatic'
+    const pending = this.deviceRegistry?.getPendingDevice('mobile')
+    // Why: connection policy is part of the credential, so rotate on any policy switch — an old-policy QR must not pair under the new one.
+    const switchingPendingMode =
+      pending != null &&
+      this.deviceRegistry?.getMobilePairingConnectionMode(pending.deviceId) !== connectionMode
+    if (args.rotate || switchingPendingMode) {
+      if (pending?.relayBinding) {
+        // Why: record the durable cloud revoke before rotating the local token so an old relay invite can't outlive the QR.
+        if (!this.queueRelayDeviceRevoke(pending.relayBinding)) {
+          return pairingUnavailable(
+            'device_registry_unavailable',
+            'Could not persist Relay cleanup before rotating the pairing code.'
+          )
+        }
+      }
+    }
+    const direct = this.createPairingOffer({
+      ...args,
+      rotate: args.rotate || switchingPendingMode,
+      scope: 'mobile'
+    })
+    if (!direct.available) {
+      return direct
+    }
+    const createdNewPendingDevice = pending?.deviceId !== direct.deviceId
+    let connectionModeStored = false
+    try {
+      connectionModeStored =
+        this.deviceRegistry?.setMobilePairingConnectionMode(direct.deviceId, connectionMode) ??
+        false
+    } catch (error) {
+      console.error('[runtime] Failed to persist the pairing connection mode:', error)
+    }
+    // Why: the mode is part of the credential — a QR whose policy was never stored must not pair under the default one.
+    if (!connectionModeStored) {
+      if (createdNewPendingDevice) {
+        this.discardPendingMobilePairingDevice(direct.deviceId)
+      }
+      return pairingUnavailable('device_registry_unavailable', DEVICE_REGISTRY_UNAVAILABLE_GUIDANCE)
+    }
+    // Why: explicit LAN path never needs Relay; mint the direct-only offer as selected.
+    if (connectionMode === 'local-only') {
+      return { ...direct, connectionMode: 'local-only' }
+    }
+    // Why: Anywhere must not silently ship a LAN-only QR under the Relay label.
+    // Fail closed, drop the unused pending credential, and let the UI offer Use LAN.
+    const refuseAutomaticWithoutRelay = (
+      relayFailure: MobileRelayMintFailure
+    ): PairingOfferUnavailable => {
+      if (createdNewPendingDevice) {
+        this.discardPendingMobilePairingDevice(direct.deviceId)
+      }
+      return {
+        available: false,
+        reason: 'relay_mint_failed',
+        guidance:
+          'Orca Relay could not create a pairing invite. Use LAN (Tailscale or same Wi‑Fi) or retry Relay.',
+        relayFailure
+      }
+    }
+    const relayProvider = this.mobileRelayPairingProvider
+    if (!relayProvider) {
+      return refuseAutomaticWithoutRelay({
+        code: 'relay_provider_unavailable',
+        stage: 'provider_missing',
+        message: 'Orca Relay is not available on this desktop'
+      })
+    }
+    const device = this.deviceRegistry?.getDevice(direct.deviceId)
+    const publicKeyB64 = this.getE2EEPublicKey()
+    if (!device || !publicKeyB64) {
+      return refuseAutomaticWithoutRelay({
+        code: 'e2ee_key_unavailable',
+        stage: 'e2ee_missing',
+        message: 'E2EE public key unavailable for Relay pairing'
+      })
+    }
+    let relayPairing: Awaited<ReturnType<MobileRelayPairingProvider['createPairingRelay']>>
+    try {
+      relayPairing = await relayProvider.createPairingRelay(device.deviceId)
+    } catch (error) {
+      // Why: the raw provider error can carry request metadata or credentials — log only the validated code.
+      const relayFailure = mobileRelayMintFailureFromUnknown({
+        stage: 'create_pairing_relay',
+        error,
+        fallbackCode: 'relay_mint_failed',
+        fallbackMessage: 'Relay pairing invite request failed'
+      })
+      console.warn(`[runtime] Failed to create Relay pairing invite: ${relayFailure.code}`)
+      return refuseAutomaticWithoutRelay(relayFailure)
+    }
+    const currentDevice = this.deviceRegistry?.getDevice(device.deviceId)
+    if (
+      generation !== this.mobilePairingOfferGeneration ||
+      relayProvider !== this.mobileRelayPairingProvider ||
+      currentDevice?.token !== device.token ||
+      this.deviceRegistry?.getMobilePairingConnectionMode(device.deviceId) !== 'automatic'
+    ) {
+      this.queueOrRetainRelayDeviceRevoke(device.deviceId, relayPairing.binding)
+      if (createdNewPendingDevice) {
+        this.discardPendingMobilePairingDevice(direct.deviceId)
+      }
+      return this.relayPairingRequestSuperseded()
+    }
+    try {
+      if (!this.setMobileRelayBinding(device.deviceId, relayPairing.binding)) {
+        this.queueOrRetainRelayDeviceRevoke(device.deviceId, relayPairing.binding)
+        return refuseAutomaticWithoutRelay({
+          code: 'relay_binding_failed',
+          stage: 'binding_failed',
+          message: 'Could not store Relay binding for the pairing device'
+        })
+      }
+    } catch (error) {
+      console.warn('[runtime] Failed to persist Relay pairing binding:', error)
+      this.queueOrRetainRelayDeviceRevoke(device.deviceId, relayPairing.binding)
+      return refuseAutomaticWithoutRelay({
+        code: 'relay_binding_failed',
+        stage: 'binding_failed',
+        message: 'Could not store Relay binding for the pairing device'
+      })
+    }
+    return {
+      ...direct,
+      connectionMode: 'automatic',
+      pairingUrl: encodePairingOffer({
+        v: PAIRING_OFFER_VERSION,
+        endpoint: direct.endpoint,
+        deviceToken: device.token,
+        publicKeyB64,
+        pairedDeviceId: device.deviceId,
+        scope: 'mobile',
+        relay: relayPairing.relay
+      })
+    }
+  }
+
+  protected relayPairingRequestSuperseded(): PairingOfferUnavailable {
+    return {
+      available: false,
+      reason: 'relay_mint_failed',
+      guidance: 'The Relay pairing request was replaced by a newer connection choice.',
+      relayFailure: {
+        code: 'relay_request_superseded',
+        stage: 'binding_failed',
+        message: 'Relay pairing request superseded'
+      }
+    }
+  }
+
+  /** Drop a never-scanned mobile pending credential after a failed Anywhere mint. */
+  protected discardPendingMobilePairingDevice(deviceId: string): void {
+    const device = this.deviceRegistry?.getDevice(deviceId)
+    if (!device || device.scope !== 'mobile' || device.lastSeenAt !== 0) {
+      return
+    }
+    if (device.relayBinding) {
+      if (!this.queueRelayDeviceRevoke(device.relayBinding)) {
+        return
+      }
+    }
+    try {
+      this.deviceRegistry?.removeDevice(deviceId)
+    } catch (error) {
+      console.error('[runtime] Failed to drop an unused mobile pairing credential:', error)
+    }
+  }
+
+  /**
+   * Why: the outbox is the only durable cleanup record for a minted invite. When it can't be
+   * written, keep the binding on the device so cleanup keeps a reference instead of orphaning it.
+   */
+}
diff --git a/src/main/runtime/runtime-rpc/runtime-rpc-network-exposure.ts b/src/main/runtime/runtime-rpc/runtime-rpc-network-exposure.ts
new file mode 100644
index 00000000000..ee7e4c08d1a
--- /dev/null
+++ b/src/main/runtime/runtime-rpc/runtime-rpc-network-exposure.ts
@@ -0,0 +1,140 @@
+import { WebSocketTransport } from '../rpc/ws-transport'
+import { writeWsFallbackPort } from '../rpc/ws-fallback-port-store'
+import { RuntimeRpcLifecycle } from './runtime-rpc-lifecycle'
+import { WS_BIND_HOST_ALL_INTERFACES, WS_BIND_HOST_LOOPBACK } from './runtime-rpc-pairing-types'
+
+export class RuntimeRpcNetworkExposure extends RuntimeRpcLifecycle {
+  // Why: STA-2370 — widen the loopback listener to all interfaces so a freshly generated pairing
+  // offer's advertised LAN endpoint is reachable. Idempotent, but it is no longer confined to the first
+  // pairing action: a "This computer only" link never widens, so live loopback clients can already be
+  // connected when a later LAN/QR offer opts in. Rebinding terminates them (ws cannot move a listener),
+  // so the resolved port is reused — already-issued endpoints stay valid and clients reconnect in place.
+  async ensureNetworkExposure(): Promise<void> {
+    if (this.pinnedBindHost && this.pinnedBindHost !== WS_BIND_HOST_ALL_INTERFACES) {
+      // Why throw and not return: callers widen so they can ADVERTISE a LAN endpoint. Returning
+      // quietly would let them publish one that nothing can reach; the throw lands in their
+      // existing network_exposure_failed branch, which reports the offer unavailable instead.
+      throw new Error(
+        `Runtime bind address is pinned to ${this.pinnedBindHost}; refusing to widen to all interfaces`
+      )
+    }
+    if (
+      !this.enableWebSocket ||
+      this.stopping ||
+      this.wsBoundHost === WS_BIND_HOST_ALL_INTERFACES
+    ) {
+      return
+    }
+    // Why: concurrent pairing requests must share one rebind — two simultaneous stop/start races would
+    // fight for the port and strand the listener on a random one.
+    if (!this.networkExposurePromise) {
+      this.networkExposurePromise = this.widenWebSocketBind().finally(() => {
+        this.networkExposurePromise = null
+      })
+    }
+    return this.networkExposurePromise
+  }
+
+  protected async widenWebSocketBind(): Promise<void> {
+    const current = this.activeTransports.find(
+      (transport): transport is WebSocketTransport => transport instanceof WebSocketTransport
+    )
+    if (!current) {
+      return
+    }
+    const index = this.activeTransports.indexOf(current)
+    const previousPort = current.resolvedPort
+    let widened: { transport: WebSocketTransport; endpoint: string }
+    try {
+      // Why: detach the loopback listener from the session wiring before stopping it so terminateDevice-
+      // Connections never iterates a dead transport; the new listener re-attaches to the SAME wiring.
+      this.detachWebSocketWiring?.()
+      await current.stop()
+      widened = await this.startWebSocketTransport({
+        host: WS_BIND_HOST_ALL_INTERFACES,
+        port: previousPort,
+        preferPinnedPort: true
+      })
+    } catch (error) {
+      // Why: the wide bind failed after the loopback listener was already stopped. Restore a serving
+      // loopback listener on the same port (wsBoundHost stays loopback so a later offer retries), then
+      // propagate — the caller must not advertise a LAN endpoint with no LAN listener behind it (STA-2370).
+      console.error('[runtime] Failed to widen WebSocket transport for pairing:', error)
+      await this.recoverWebSocketBindAfterFailedWiden(index, previousPort)
+      throw error
+    }
+    // Why: register the live wide transport BEFORE persisting metadata so a metadata-write failure can
+    // never orphan a running 0.0.0.0 listener outside activeTransports (and thus outside stop()).
+    this.activeTransports[index] = widened.transport
+    const metaIndex = this.transports.findIndex((meta) => meta.kind === 'websocket')
+    if (metaIndex !== -1) {
+      this.transports[metaIndex] = { kind: 'websocket', endpoint: widened.endpoint }
+    }
+    try {
+      // Why: a rebind that lands on a different port (same-port bind refused) must be persisted so a
+      // later reconnect from a device paired to this port matches on the next launch (STA-1511).
+      if (this.wsPort !== 0 && widened.transport.resolvedPort !== this.wsPort) {
+        writeWsFallbackPort(this.userDataPath, widened.transport.resolvedPort)
+      }
+      this.writeMetadata()
+    } catch (persistError) {
+      // Why: the wide listener is live and tracked; a persistence failure must not tear it down. Keep
+      // serving — the in-memory endpoint is already correct.
+      console.error(
+        '[runtime] Widened WebSocket listener but failed to persist pairing metadata:',
+        persistError
+      )
+    }
+  }
+
+  // Why: a failed widen already tore down the loopback listener; bring one back on the same host/port so the
+  // runtime keeps serving locally (wsBoundHost stays loopback, so the next pairing offer retries the widen).
+  protected async recoverWebSocketBindAfterFailedWiden(
+    index: number,
+    previousPort: number
+  ): Promise<void> {
+    let restored: { transport: WebSocketTransport; endpoint: string }
+    try {
+      restored = await this.startWebSocketTransport({
+        host: WS_BIND_HOST_LOOPBACK,
+        port: previousPort,
+        preferPinnedPort: true
+      })
+    } catch (recoveryError) {
+      // Why: even the loopback restore failed — drop the dead WebSocket transport so we never advertise an
+      // endpoint with no listener. The Unix socket keeps serving and a restart re-establishes the listener.
+      console.error(
+        '[runtime] Failed to restore WebSocket transport after widen failure:',
+        recoveryError
+      )
+      this.activeTransports.splice(index, 1)
+      const metaIndex = this.transports.findIndex((meta) => meta.kind === 'websocket')
+      if (metaIndex !== -1) {
+        this.transports.splice(metaIndex, 1)
+      }
+      this.wsBoundHost = null
+      try {
+        this.writeMetadata()
+      } catch {
+        // Why: metadata already reflects the torn-down listener; nothing else to recover here.
+      }
+      return
+    }
+    // Why: register the restored loopback listener BEFORE persisting metadata so a write failure can never
+    // orphan a live transport outside activeTransports (and thus outside stop()).
+    this.activeTransports[index] = restored.transport
+    const metaIndex = this.transports.findIndex((meta) => meta.kind === 'websocket')
+    if (metaIndex !== -1) {
+      this.transports[metaIndex] = { kind: 'websocket', endpoint: restored.endpoint }
+    }
+    try {
+      this.writeMetadata()
+    } catch (persistError) {
+      // Why: the loopback listener is live and tracked; a persistence failure must not tear it down.
+      console.error(
+        '[runtime] Restored loopback WebSocket listener but failed to persist metadata:',
+        persistError
+      )
+    }
+  }
+}
diff --git a/src/main/runtime/runtime-rpc/runtime-rpc-pairing-types.ts b/src/main/runtime/runtime-rpc/runtime-rpc-pairing-types.ts
new file mode 100644
index 00000000000..3cd3c1a54fb
--- /dev/null
+++ b/src/main/runtime/runtime-rpc/runtime-rpc-pairing-types.ts
@@ -0,0 +1,145 @@
+import type { OrcaRuntimeService } from '../orca-runtime'
+import type { RpcAnyMethod } from '../rpc/core'
+import type { DeviceRegistry } from '../device-registry'
+import type { E2EEKeypair } from '../e2ee-keypair'
+import type { MobileSocketTransportMetadata } from '../rpc/mobile-socket-wiring'
+import type { PairingRelay } from '../../../shared/mobile-relay-pairing-offer'
+import type { MobilePairingConnectionMode } from '../../../shared/mobile-pairing-connection-mode'
+import type { MobileRelayMintFailure } from '../../../shared/mobile-relay-mint-failure'
+import type {
+  DeviceCredentialInstalled,
+  PairingGetEndpointsParams,
+  PairingGetEndpointsResult,
+  PairingProvisionRelayParams
+} from '../../../shared/mobile-relay-credential-contract'
+import type { RelayDeviceBinding, RelayRevokeOutboxItem } from '../relay/relay-revoke-outbox'
+
+export const DEFAULT_WS_PORT = 6768
+
+// Why: STA-2370 — the WS listener defaults to loopback so a desktop with no paired device is not
+// reachable from the LAN; it widens to all interfaces only on explicit pairing (or `orca serve`).
+export const WS_BIND_HOST_LOOPBACK = '127.0.0.1'
+export const WS_BIND_HOST_ALL_INTERFACES = '0.0.0.0'
+
+// Why brackets: `ws://::1:6768` is not a URL, and every consumer of this endpoint parses it
+// with `new URL`. An IPv6 bind address would otherwise publish an unparseable endpoint.
+export function formatWsEndpoint(host: string, port: number): string {
+  return `ws://${host.includes(':') ? `[${host}]` : host}:${port}`
+}
+
+export type OrcaRuntimeRpcServerOptions = {
+  runtime: OrcaRuntimeService
+  userDataPath: string
+  pid?: number
+  platform?: NodeJS.Platform
+  enableWebSocket?: boolean
+  wsPort?: number
+  // Why: true when the caller pinned a port (`orca serve --port`) so bind order prefers it over a stale STA-1511 fallback (#8535).
+  preferPinnedWsPort?: boolean
+  // Why: STA-2370 — bind the WS listener to all interfaces at startup instead of loopback-until-paired.
+  // Only `orca serve` (explicit remote opt-in) and E2E set this; the desktop app widens lazily on pairing.
+  exposeNetworkByDefault?: boolean
+  /**
+   * Pin the WS listener to exactly this address for the process's whole life.
+   *
+   * Why a pin and not another default: the two paths below both widen on their own —
+   * `exposeNetworkByDefault` at startup, and a device that has connected once at every
+   * later startup. An unattended host (orcad) whose operator asked for loopback must
+   * still be on loopback after a client pairs and the service restarts, so the answer
+   * has to outrank both, and `ensureNetworkExposure()` has to refuse rather than widen.
+   */
+  pinnedBindHost?: string
+  webClientRoot?: string
+  // Why: test-only overrides for the two constants below; production must not pass these (defaults set by §3.1).
+  keepaliveIntervalMs?: number
+  longPollCap?: number
+  // Why: test-only override for the ownership reclaim cadence.
+  metadataOwnershipPollMs?: number
+  // Why: tests may inject inert protocol stages before production authorization registers them.
+  methods?: readonly RpcAnyMethod[]
+}
+
+export type PairingOfferUnavailableReason =
+  | 'websocket_unavailable'
+  | 'device_registry_unavailable'
+  | 'e2ee_key_unavailable'
+  | 'invalid_advertised_endpoint'
+  | 'relay_mint_failed'
+  | 'network_exposure_failed'
+
+export type PairingOfferUnavailable = {
+  available: false
+  reason: PairingOfferUnavailableReason
+  guidance: string
+  /** Present when an Anywhere mint refused to silently fall back to LAN-only. */
+  relayFailure?: MobileRelayMintFailure
+}
+
+export type MobilePairingOfferAvailable = {
+  available: true
+  pairingUrl: string
+  endpoint: string
+  deviceId: string
+  webClientUrl: string | null
+  /** Mode the offer actually encodes. */
+  connectionMode: MobilePairingConnectionMode
+}
+
+export type MobilePairingOffer = PairingOfferUnavailable | MobilePairingOfferAvailable
+
+export type PairingIdentityInitialization =
+  | { ok: true; deviceRegistry: DeviceRegistry; e2eeKeypair: E2EEKeypair }
+  | { ok: false; failure: PairingOfferUnavailable }
+
+export function pairingUnavailable(
+  reason: PairingOfferUnavailableReason,
+  guidance: string
+): PairingOfferUnavailable {
+  return { available: false, reason, guidance }
+}
+
+export const DEVICE_REGISTRY_UNAVAILABLE_GUIDANCE =
+  'The pairing registry is unavailable. Verify that the Orca data directory is writable.'
+export const E2EE_KEY_UNAVAILABLE_GUIDANCE =
+  'The E2EE identity is unavailable. Verify that the Orca data directory is writable.'
+
+export type MobileRelayPairingProvider = {
+  createPairingRelay(
+    relayDeviceId: string
+  ): Promise<{ relay: PairingRelay; binding: RelayDeviceBinding }>
+  onDeviceRevokeQueued(item: RelayRevokeOutboxItem): void
+  onDemandStateChanged?(): void
+  getEndpoints(
+    context: MobilePairingConnectionContext,
+    params: PairingGetEndpointsParams
+  ): Promise<PairingGetEndpointsResult>
+  provisionRelay(
+    context: MobilePairingConnectionContext,
+    params: PairingProvisionRelayParams
+  ): Promise<DeviceCredentialInstalled>
+}
+
+export type MobilePairingConnectionContext = Readonly<{
+  deviceId: string
+  connectionId: string
+  transport: MobileSocketTransportMetadata
+}>
+
+// Why: keepalive frames count as socket activity, resetting both idle timers so long-polls outlive the 30s/60s idle caps. See §3.1.
+
+export function createWebClientUrl(endpoint: string, pairingUrl: string): string {
+  const url = new URL(endpoint)
+  url.protocol = url.protocol === 'wss:' ? 'https:' : 'http:'
+  url.pathname = webClientPathForEndpoint(url.pathname)
+  url.search = ''
+  // Why: pairing URLs carry full credentials; the fragment keeps them out of proxy logs and Referer headers.
+  url.hash = `pairing=${encodeURIComponent(pairingUrl)}`
+  return url.toString()
+}
+
+export function webClientPathForEndpoint(pathname: string): string {
+  if (!pathname || pathname === '/') {
+    return '/web-index.html'
+  }
+  return `${pathname.replace(/\/$/, '')}/web-index.html`
+}
diff --git a/src/main/runtime/runtime-rpc/runtime-rpc-pairing.ts b/src/main/runtime/runtime-rpc/runtime-rpc-pairing.ts
new file mode 100644
index 00000000000..592131779eb
--- /dev/null
+++ b/src/main/runtime/runtime-rpc/runtime-rpc-pairing.ts
@@ -0,0 +1,211 @@
+import type { DeviceEntry, DeviceRegistry, DeviceScope } from '../device-registry'
+import type { E2EEKeypair } from '../e2ee-keypair'
+import type { MobileSocketWiring } from '../rpc/mobile-socket-wiring'
+import type {
+  RelayDeviceBinding,
+  RelayRevokeOutbox,
+  RelayRevokeOutboxItem
+} from '../relay/relay-revoke-outbox'
+import { encodePairingOffer, PAIRING_OFFER_VERSION } from '../../../shared/pairing'
+import type { RuntimePairingReach } from '../../../shared/runtime-pairing-reach'
+import { resolveAdvertisedPairingEndpoint } from '../pairing-endpoint'
+import { RuntimeRpcNetworkExposure } from './runtime-rpc-network-exposure'
+import {
+  createWebClientUrl,
+  DEVICE_REGISTRY_UNAVAILABLE_GUIDANCE,
+  E2EE_KEY_UNAVAILABLE_GUIDANCE,
+  pairingUnavailable,
+  type MobileRelayPairingProvider,
+  type PairingOfferUnavailable
+} from './runtime-rpc-pairing-types'
+
+export class RuntimeRpcPairing extends RuntimeRpcNetworkExposure {
+  getDeviceRegistry(): DeviceRegistry | null {
+    return this.deviceRegistry
+  }
+
+  getTlsFingerprint(): string | null {
+    return this.tlsFingerprint
+  }
+
+  getE2EEPublicKey(): string | null {
+    return this.e2eeKeypair?.publicKeyB64 ?? null
+  }
+
+  getE2EEKeypair(): E2EEKeypair | null {
+    return this.e2eeKeypair
+  }
+
+  getMobileSocketWiring(): MobileSocketWiring | null {
+    return this.mobileSocketWiring
+  }
+
+  getRelayRevokeOutbox(): RelayRevokeOutbox {
+    return this.relayRevokeOutbox
+  }
+
+  setMobileRelayBinding(deviceId: string, binding: RelayDeviceBinding): boolean {
+    const current = this.deviceRegistry?.getDevice(deviceId)
+    if (
+      current?.scope !== 'mobile' ||
+      this.deviceRegistry?.getMobilePairingConnectionMode(deviceId) === 'local-only'
+    ) {
+      return false
+    }
+    if (
+      current.relayBinding &&
+      (current.relayBinding.relayHostId !== binding.relayHostId ||
+        current.relayBinding.ownerIdentityKey !== binding.ownerIdentityKey)
+    ) {
+      // Why: switching the owning account/host must not strand the old cloud credential family, even if that account is offline.
+      if (!this.queueRelayDeviceRevoke(current.relayBinding)) {
+        return false
+      }
+    }
+    const updated = this.deviceRegistry?.setRelayBinding(deviceId, binding) ?? false
+    if (updated) {
+      this.mobileRelayPairingProvider?.onDemandStateChanged?.()
+    }
+    return updated
+  }
+
+  // Why: only the desktop shell can surface UI; headless serve leaves this unset.
+  setOnUnpairedDeviceAuthFailure(callback: (() => void) | null): void {
+    this.onUnpairedDeviceAuthFailure = callback
+  }
+
+  setMobileRelayPairingProvider(provider: MobileRelayPairingProvider | null): void {
+    this.mobileRelayPairingProvider = provider
+  }
+
+  async revokeMobileDevice(deviceId: string): Promise<boolean> {
+    const device = this.deviceRegistry?.getDevice(deviceId)
+    if (device?.scope !== 'mobile') {
+      return false
+    }
+    if (device.relayBinding) {
+      if (!this.queueRelayDeviceRevoke(device.relayBinding)) {
+        return false
+      }
+    }
+    if (!this.deviceRegistry?.removeDevice(deviceId)) {
+      return false
+    }
+    this.mobileRelayPairingProvider?.onDemandStateChanged?.()
+    this.runtime.forgetClientNavigationState(deviceId)
+    this.mobileSocketWiring?.terminateDeviceConnections(device.token)
+    return true
+  }
+
+  revokeRuntimeAccess(deviceId: string): boolean {
+    const device = this.deviceRegistry?.getDevice(deviceId)
+    if (device?.scope !== 'runtime' || !this.deviceRegistry?.removeDevice(deviceId)) {
+      return false
+    }
+    this.runtime.forgetClientNavigationState(deviceId)
+    this.mobileSocketWiring?.terminateDeviceConnections(device.token)
+    return true
+  }
+
+  getWebSocketEndpoint(): string | null {
+    const ws = this.transports.find((t) => t.kind === 'websocket')
+    return ws?.endpoint ?? null
+  }
+
+  createPairingOffer(args: {
+    address?: string | null
+    name?: string
+    rotate?: boolean
+    scope?: DeviceScope
+    // Why: STA-2370 — recorded on the grant so a "This computer only" client reconnecting cannot make the
+    // next launch bind every interface. Defaults to network reach, which is what every other caller means.
+    reach?: RuntimePairingReach
+  }):
+    | PairingOfferUnavailable
+    | {
+        available: true
+        pairingUrl: string
+        endpoint: string
+        deviceId: string
+        webClientUrl: string | null
+      } {
+    if (this.pairingInitializationFailure) {
+      return this.pairingInitializationFailure
+    }
+    const rawEndpoint = this.getWebSocketEndpoint()
+    if (!rawEndpoint) {
+      return pairingUnavailable(
+        'websocket_unavailable',
+        'WebSocket pairing is unavailable. Inspect preceding runtime errors and choose an unused --port if the listener failed.'
+      )
+    }
+    if (!this.deviceRegistry) {
+      return pairingUnavailable('device_registry_unavailable', DEVICE_REGISTRY_UNAVAILABLE_GUIDANCE)
+    }
+    const publicKeyB64 = this.getE2EEPublicKey()
+    if (!publicKeyB64) {
+      return pairingUnavailable('e2ee_key_unavailable', E2EE_KEY_UNAVAILABLE_GUIDANCE)
+    }
+
+    const advertised = resolveAdvertisedPairingEndpoint(rawEndpoint, args.address)
+    if (!advertised.ok) {
+      return pairingUnavailable(advertised.reason, advertised.guidance)
+    }
+    const endpoint = advertised.endpoint
+    const deviceName = args.name ?? `CLI ${new Date().toLocaleDateString()}`
+    const scope = args.scope ?? 'runtime'
+    let device: DeviceEntry
+    try {
+      const reach = args.reach ?? 'network'
+      device = args.rotate
+        ? this.deviceRegistry.rotatePendingDevice(deviceName, scope, reach)
+        : this.deviceRegistry.getOrCreatePendingDevice(deviceName, scope, reach)
+    } catch (error) {
+      console.error('[runtime] Failed to persist pairing credential:', error)
+      return pairingUnavailable('device_registry_unavailable', DEVICE_REGISTRY_UNAVAILABLE_GUIDANCE)
+    }
+    const pairingUrl = encodePairingOffer({
+      v: PAIRING_OFFER_VERSION,
+      endpoint,
+      deviceToken: device.token,
+      publicKeyB64,
+      pairedDeviceId: device.deviceId,
+      scope
+    })
+    return {
+      available: true,
+      pairingUrl,
+      endpoint,
+      deviceId: device.deviceId,
+      webClientUrl:
+        this.webClientRoot && scope === 'runtime' ? createWebClientUrl(endpoint, pairingUrl) : null
+    }
+  }
+
+  protected queueOrRetainRelayDeviceRevoke(deviceId: string, binding: RelayDeviceBinding): void {
+    if (this.queueRelayDeviceRevoke(binding)) {
+      return
+    }
+    try {
+      this.deviceRegistry?.setRelayBinding(deviceId, binding)
+    } catch (error) {
+      console.error('[runtime] Failed to retain an unrevoked Relay binding:', error)
+    }
+  }
+
+  protected queueRelayDeviceRevoke(binding: RelayDeviceBinding): boolean {
+    let item: RelayRevokeOutboxItem
+    try {
+      item = this.relayRevokeOutbox.enqueue(binding)
+    } catch (error) {
+      console.error('[runtime] Failed to persist Relay device cleanup:', error)
+      return false
+    }
+    try {
+      this.mobileRelayPairingProvider?.onDeviceRevokeQueued(item)
+    } catch (error) {
+      console.warn('[runtime] Failed to notify Relay cleanup worker:', error)
+    }
+    return true
+  }
+}
diff --git a/src/main/runtime/runtime-rpc/runtime-rpc-request-admission.ts b/src/main/runtime/runtime-rpc/runtime-rpc-request-admission.ts
new file mode 100644
index 00000000000..b79b87a5be5
--- /dev/null
+++ b/src/main/runtime/runtime-rpc/runtime-rpc-request-admission.ts
@@ -0,0 +1,152 @@
+import type { RuntimeMetadata } from '../../../shared/runtime-bootstrap'
+import { writeRuntimeMetadata } from '../runtime-metadata'
+import type { RpcMessageContext } from '../rpc/transport'
+import type { RpcRequest, RpcResponse } from '../rpc/core'
+import { errorResponse } from '../rpc/errors'
+import { RuntimeRpcBinaryRouting } from './runtime-rpc-binary-routing'
+import { classifyRuntimeLongPoll, type RuntimeLongPollClass } from './runtime-rpc-long-poll'
+
+export class RuntimeRpcRequestAdmission extends RuntimeRpcBinaryRouting {
+  // Why: Unix socket dispatch is one-shot and auths via the shared token from the 0o600 metadata file. See §3.1.
+  protected async handleMessage(
+    rawMessage: string,
+    context?: RpcMessageContext
+  ): Promise<RpcResponse> {
+    // Why: the transport sends an empty message when a client exceeds max size, then closes the connection.
+    if (!rawMessage) {
+      return this.buildError('unknown', 'request_too_large', 'RPC request exceeds the maximum size')
+    }
+
+    const parsed = this.parseAndAuth(rawMessage)
+    if ('error' in parsed) {
+      return parsed.error
+    }
+    const request = parsed.request
+
+    // Why: long-poll admission fence; short RPCs bypass the counter. See §7 risk #2.
+    const longPoll = classifyRuntimeLongPoll(request)
+    const rejection = this.admitLongPoll(longPoll)
+    if (rejection) {
+      return this.buildError(request.id, 'runtime_busy', rejection)
+    }
+    if (longPoll) {
+      // Why: arm keepalive only for long-polls; short RPCs never create the setInterval. See §3.1.
+      context?.startKeepalive()
+    }
+
+    try {
+      return await this.dispatcher.dispatch(request, {
+        signal: longPoll ? context?.signal : undefined
+      })
+    } finally {
+      this.releaseLongPoll(longPoll)
+    }
+  }
+
+  // Why: one fence for both transports — the total cap protects short RPCs, the ask
+  // sub-cap protects terminal.wait / check --wait from slow reply-blocked asks.
+  // Returns the rejection message, or null once the slot is reserved.
+  protected admitLongPoll(
+    longPoll: RuntimeLongPollClass | null,
+    pairedDeviceId?: string
+  ): string | null {
+    if (!longPoll) {
+      return null
+    }
+    if (this.activeLongPolls >= this.longPollCap) {
+      return 'long-poll capacity reached; retry with backoff'
+    }
+    if (
+      (longPoll === 'ask' || longPoll === 'browser-host') &&
+      this.activeAskLongPolls + this.activeBrowserHostLongPolls >= this.specializedLongPollCap
+    ) {
+      return longPoll === 'ask'
+        ? 'orchestration.ask capacity reached; retry with backoff'
+        : 'browser-host capacity reached; retry with backoff'
+    }
+    if (longPoll === 'ask' && this.activeAskLongPolls >= this.askLongPollCap) {
+      return 'orchestration.ask capacity reached; retry with backoff'
+    }
+    if (
+      longPoll === 'browser-host' &&
+      (this.activeBrowserHostLongPolls >= this.browserHostLongPollCap ||
+        (pairedDeviceId !== undefined &&
+          (this.activeBrowserHostLongPollsByDevice.get(pairedDeviceId) ?? 0) >=
+            this.browserHostLongPollCapPerDevice))
+    ) {
+      return 'browser-host capacity reached; retry with backoff'
+    }
+    this.activeLongPolls += 1
+    if (longPoll === 'ask') {
+      this.activeAskLongPolls += 1
+    } else if (longPoll === 'browser-host') {
+      this.activeBrowserHostLongPolls += 1
+      if (pairedDeviceId !== undefined) {
+        this.activeBrowserHostLongPollsByDevice.set(
+          pairedDeviceId,
+          (this.activeBrowserHostLongPollsByDevice.get(pairedDeviceId) ?? 0) + 1
+        )
+      }
+    }
+    return null
+  }
+
+  protected releaseLongPoll(longPoll: RuntimeLongPollClass | null, pairedDeviceId?: string): void {
+    if (!longPoll) {
+      return
+    }
+    this.activeLongPolls = Math.max(0, this.activeLongPolls - 1)
+    if (longPoll === 'ask') {
+      this.activeAskLongPolls = Math.max(0, this.activeAskLongPolls - 1)
+    } else if (longPoll === 'browser-host') {
+      this.activeBrowserHostLongPolls = Math.max(0, this.activeBrowserHostLongPolls - 1)
+      if (pairedDeviceId !== undefined) {
+        const remaining = (this.activeBrowserHostLongPollsByDevice.get(pairedDeviceId) ?? 1) - 1
+        if (remaining > 0) {
+          this.activeBrowserHostLongPollsByDevice.set(pairedDeviceId, remaining)
+        } else {
+          this.activeBrowserHostLongPollsByDevice.delete(pairedDeviceId)
+        }
+      }
+    }
+  }
+
+  protected parseAndAuth(rawMessage: string): { request: RpcRequest } | { error: RpcResponse } {
+    let request: RpcRequest
+    try {
+      request = JSON.parse(rawMessage) as RpcRequest
+    } catch {
+      return { error: this.buildError('unknown', 'bad_request', 'Invalid JSON request') }
+    }
+
+    if (typeof request.id !== 'string' || request.id.length === 0) {
+      return { error: this.buildError('unknown', 'bad_request', 'Missing request id') }
+    }
+    if (typeof request.method !== 'string' || request.method.length === 0) {
+      return { error: this.buildError(request.id, 'bad_request', 'Missing RPC method') }
+    }
+    if (typeof request.authToken !== 'string' || request.authToken.length === 0) {
+      return { error: this.buildError(request.id, 'unauthorized', 'Missing auth token') }
+    }
+    if (request.authToken !== this.authToken) {
+      return { error: this.buildError(request.id, 'unauthorized', 'Invalid auth token') }
+    }
+
+    return { request }
+  }
+
+  protected buildError(id: string, code: string, message: string): RpcResponse {
+    return errorResponse(id, { runtimeId: this.runtime.getRuntimeId() }, code, message)
+  }
+
+  protected writeMetadata(): void {
+    const metadata: RuntimeMetadata = {
+      runtimeId: this.runtime.getRuntimeId(),
+      pid: this.pid,
+      transports: this.transports,
+      authToken: this.authToken,
+      startedAt: this.runtime.getStartedAt()
+    }
+    writeRuntimeMetadata(this.userDataPath, metadata)
+  }
+}
diff --git a/src/main/runtime/runtime-rpc/runtime-rpc-shutdown.ts b/src/main/runtime/runtime-rpc/runtime-rpc-shutdown.ts
new file mode 100644
index 00000000000..d6edaf78928
--- /dev/null
+++ b/src/main/runtime/runtime-rpc/runtime-rpc-shutdown.ts
@@ -0,0 +1,38 @@
+import { RuntimeRpcMobilePairing } from './runtime-rpc-mobile-pairing'
+
+export class RuntimeRpcShutdown extends RuntimeRpcMobilePairing {
+  /** Why: test-only seam — runs one ownership check instead of waiting out the poll interval. */
+  checkRuntimeMetadataOwnership(): void {
+    this.metadataOwnershipWatch?.check()
+  }
+
+  async stop(): Promise<void> {
+    // Why: STA-2370 — refuse new widens, then let any in-flight pairing widen settle into the live
+    // transport arrays before snapshotting them, so a racing rebind can't strand a wide 0.0.0.0 listener
+    // by writing it back into a cleared array after shutdown (see widenWebSocketBind).
+    this.stopping = true
+    const pendingExposure = this.networkExposurePromise
+    if (pendingExposure) {
+      await pendingExposure.catch(() => {
+        // Why: a failed widen already recovered/logged; we only need it to finish mutating the arrays.
+      })
+    }
+    const transports = this.activeTransports
+    this.activeTransports = []
+    this.transports = []
+    this.metadataOwnershipWatch?.stop()
+    this.metadataOwnershipWatch = null
+    this.mobileSocketWiring = null
+    this.detachWebSocketWiring = null
+    const stopResults = await Promise.allSettled(
+      transports.map(async (transport) => transport.stop())
+    )
+    // Why: before-quit fences relay input; direct auth can still refresh lastSeen while these transports close.
+    this.deviceRegistry?.flushPendingLastSeen()
+    const failedStop = stopResults.find((result) => result.status === 'rejected')
+    if (failedStop?.status === 'rejected') {
+      throw failedStop.reason
+    }
+    // Why: leave the metadata file on shutdown — shared userData may host another live runtime whose bootstrap file we'd erase.
+  }
+}
diff --git a/src/main/runtime/runtime-rpc/runtime-rpc-socket-metadata.ts b/src/main/runtime/runtime-rpc/runtime-rpc-socket-metadata.ts
new file mode 100644
index 00000000000..2e9f78b1adc
--- /dev/null
+++ b/src/main/runtime/runtime-rpc/runtime-rpc-socket-metadata.ts
@@ -0,0 +1,62 @@
+import { readdirSync, rmSync } from 'node:fs'
+import { join } from 'node:path'
+import type { RuntimeTransportMetadata } from '../../../shared/runtime-bootstrap'
+
+/** Why: MUST stay in lockstep with createRuntimeTransportMetadata()'s `o-${pid}-${suffix}.sock` shape (unit-test enforced). */
+export const RUNTIME_SOCKET_NAME_REGEX = /^o-(\d+)-[A-Za-z0-9_-]+\.sock$/
+
+export function sweepOrphanedRuntimeSockets(userDataPath: string, ownPid: number): void {
+  let entries: string[]
+  try {
+    entries = readdirSync(userDataPath)
+  } catch {
+    // Why: first-launch userData may not exist yet; nothing to sweep.
+    return
+  }
+  for (const entry of entries) {
+    const match = RUNTIME_SOCKET_NAME_REGEX.exec(entry)
+    if (!match) {
+      continue
+    }
+    const pid = Number(match[1])
+    if (!Number.isFinite(pid)) {
+      continue
+    }
+    // Why: never delete our own socket — a bug here would rmSync one we're about to bind.
+    if (pid === ownPid) {
+      continue
+    }
+    try {
+      // Why: signal 0 is the POSIX liveness probe (sends nothing); ESRCH = dead pid, EPERM = foreign owner (left alone).
+      process.kill(pid, 0)
+    } catch (error) {
+      if ((error as NodeJS.ErrnoException).code === 'ESRCH') {
+        try {
+          rmSync(join(userDataPath, entry), { force: true })
+        } catch {
+          // Why: best-effort sweep; a later start() or OS reboot cleans any socket we can't unlink.
+        }
+      }
+    }
+  }
+}
+
+export function createRuntimeTransportMetadata(
+  userDataPath: string,
+  pid: number,
+  platform: NodeJS.Platform,
+  runtimeId = 'runtime'
+): RuntimeTransportMetadata {
+  const endpointSuffix = runtimeId.replace(/[^a-zA-Z0-9_-]/g, '').slice(0, 4) || 'rt'
+  if (platform === 'win32') {
+    return {
+      kind: 'named-pipe',
+      // Why: named pipes lack the chmod hardening of Unix sockets; a per-runtime suffix avoids a stable, guessable endpoint name.
+      endpoint: `\\\\.\\pipe\\orca-${pid}-${endpointSuffix}`
+    }
+  }
+  return {
+    kind: 'unix',
+    endpoint: join(userDataPath, `o-${pid}-${endpointSuffix}.sock`)
+  }
+}
diff --git a/src/main/runtime/runtime-rpc/runtime-rpc-state.ts b/src/main/runtime/runtime-rpc/runtime-rpc-state.ts
new file mode 100644
index 00000000000..ca9ab173feb
--- /dev/null
+++ b/src/main/runtime/runtime-rpc/runtime-rpc-state.ts
@@ -0,0 +1,133 @@
+import { randomBytes } from 'node:crypto'
+import type { RuntimeTransportMetadata } from '../../../shared/runtime-bootstrap'
+import type { OrcaRuntimeService } from '../orca-runtime'
+import { RpcDispatcher } from '../rpc/dispatcher'
+import { ALL_RPC_METHODS } from '../rpc/methods'
+import type { RpcTransport } from '../rpc/transport'
+import type { WebSocket } from 'ws'
+import type { DeviceRegistry } from '../device-registry'
+import type { E2EEKeypair } from '../e2ee-keypair'
+import type { UnpairedDeviceAuthThrottle } from '../rpc/unpaired-device-auth-throttle'
+import type { MobileSocketWiring } from '../rpc/mobile-socket-wiring'
+import { RelayRevokeOutbox } from '../relay/relay-revoke-outbox'
+import { RuntimeBinaryMessageRouter } from '../runtime-binary-message-router'
+import type { RuntimeMetadataOwnershipWatch } from '../runtime-metadata-ownership-watch'
+import { RUNTIME_METADATA_OWNERSHIP_POLL_MS } from '../runtime-metadata-ownership-watch'
+import {
+  ASK_LONG_POLL_SHARE,
+  BROWSER_HOST_LONG_POLL_SHARE,
+  KEEPALIVE_INTERVAL_MS,
+  LONG_POLL_CAP,
+  SPECIALIZED_LONG_POLL_SHARE
+} from './runtime-rpc-long-poll'
+import type {
+  MobilePairingOffer,
+  MobileRelayPairingProvider,
+  OrcaRuntimeRpcServerOptions,
+  PairingOfferUnavailable
+} from './runtime-rpc-pairing-types'
+import { DEFAULT_WS_PORT } from './runtime-rpc-pairing-types'
+
+export class RuntimeRpcState {
+  protected readonly runtime: OrcaRuntimeService
+  protected readonly dispatcher: RpcDispatcher
+  protected readonly userDataPath: string
+  protected readonly pid: number
+  protected readonly platform: NodeJS.Platform
+  protected readonly enableWebSocket: boolean
+  protected readonly wsPort: number
+  protected readonly preferPinnedWsPort: boolean
+  protected readonly exposeNetworkByDefault: boolean
+  protected readonly pinnedBindHost: string | null
+  protected readonly webClientRoot: string | undefined
+  // Why: STA-2370 — the host the WS listener is currently bound to, so pairing can widen loopback→all-interfaces once.
+  protected wsBoundHost: string | null = null
+  // Why: STA-2370 — in-flight widen so concurrent pairing requests share a single rebind.
+  protected networkExposurePromise: Promise<void> | null = null
+  // Why: STA-2370 — set by stop() so a racing pairing widen can't recreate a live wide listener into the
+  // cleared transport arrays after shutdown; stop() also awaits any in-flight widen before snapshotting.
+  protected stopping = false
+  protected readonly authToken = randomBytes(24).toString('hex')
+  protected readonly keepaliveIntervalMs: number
+  protected readonly longPollCap: number
+  protected readonly metadataOwnershipPollMs: number
+  protected readonly askLongPollCap: number
+  protected readonly browserHostLongPollCap: number
+  protected readonly browserHostLongPollCapPerDevice: number
+  protected readonly specializedLongPollCap: number
+  protected readonly relayRevokeOutbox: RelayRevokeOutbox
+  protected deviceRegistry: DeviceRegistry | null = null
+  protected e2eeKeypair: E2EEKeypair | null = null
+  protected pairingInitializationFailure: PairingOfferUnavailable | null = null
+  protected tlsFingerprint: string | null = null
+  protected activeTransports: RpcTransport[] = []
+  protected transports: RuntimeTransportMetadata[] = []
+  protected metadataOwnershipWatch: RuntimeMetadataOwnershipWatch | null = null
+  protected mobileSocketWiring: MobileSocketWiring | null = null
+  // Why: detaches the current WebSocketTransport from the session wiring so a pairing rebind can swap
+  // transports under the SAME wiring (see ensureMobileSocketWiring) instead of orphaning relay sockets.
+  protected detachWebSocketWiring: (() => void) | null = null
+  protected mobileRelayPairingProvider: MobileRelayPairingProvider | null = null
+  protected mobileRelayPairingOfferQueue: Promise<void> = Promise.resolve()
+  protected mobileRelayPairingOfferInFlight: {
+    generation: number
+    address: string | null
+    rotate: boolean
+    request: Promise<MobilePairingOffer>
+  } | null = null
+  protected mobilePairingOfferGeneration = 0
+  protected onUnpairedDeviceAuthFailure: (() => void) | null = null
+  protected unpairedDeviceAuthThrottle: UnpairedDeviceAuthThrottle | null = null
+  protected readonly binaryMessageRouter = new RuntimeBinaryMessageRouter()
+  protected readonly wsDispatchAbortStates = new Map<
+    WebSocket,
+    { controllers: Set<AbortController>; abortOnClose: () => void }
+  >()
+  // Why: separate from server.maxConnections — count only long-running dispatches, not short RPCs. See §3.1 + §7 risk #2.
+  protected activeLongPolls = 0
+  // Why: subset of activeLongPolls held by orchestration.ask, fenced by askLongPollCap.
+  protected activeAskLongPolls = 0
+  protected activeBrowserHostLongPolls = 0
+  protected readonly activeBrowserHostLongPollsByDevice = new Map<string, number>()
+
+  constructor({
+    runtime,
+    userDataPath,
+    pid = process.pid,
+    platform = process.platform,
+    enableWebSocket = false,
+    wsPort = DEFAULT_WS_PORT,
+    preferPinnedWsPort = false,
+    exposeNetworkByDefault = false,
+    pinnedBindHost,
+    webClientRoot,
+    keepaliveIntervalMs = KEEPALIVE_INTERVAL_MS,
+    longPollCap = LONG_POLL_CAP,
+    metadataOwnershipPollMs = RUNTIME_METADATA_OWNERSHIP_POLL_MS,
+    methods
+  }: OrcaRuntimeRpcServerOptions) {
+    this.runtime = runtime
+    this.dispatcher = new RpcDispatcher({ runtime, methods: methods ?? ALL_RPC_METHODS })
+    this.userDataPath = userDataPath
+    this.pid = pid
+    this.platform = platform
+    this.enableWebSocket = enableWebSocket
+    this.wsPort = wsPort
+    this.preferPinnedWsPort = preferPinnedWsPort
+    this.exposeNetworkByDefault = exposeNetworkByDefault
+    this.pinnedBindHost = pinnedBindHost ?? null
+    this.webClientRoot = webClientRoot
+    this.keepaliveIntervalMs = keepaliveIntervalMs
+    this.longPollCap = longPollCap
+    this.metadataOwnershipPollMs = metadataOwnershipPollMs
+    // Why: derived, not configurable — the reservation must hold for whatever cap a caller picks.
+    this.askLongPollCap = Math.max(1, Math.floor(longPollCap * ASK_LONG_POLL_SHARE))
+    this.browserHostLongPollCap = Math.max(
+      1,
+      Math.floor(longPollCap * BROWSER_HOST_LONG_POLL_SHARE)
+    )
+    this.browserHostLongPollCapPerDevice = Math.max(1, Math.floor(this.browserHostLongPollCap / 2))
+    this.specializedLongPollCap = Math.max(1, Math.floor(longPollCap * SPECIALIZED_LONG_POLL_SHARE))
+    this.relayRevokeOutbox = new RelayRevokeOutbox(userDataPath)
+  }
+}
diff --git a/src/main/runtime/runtime-rpc/runtime-rpc-websocket-dispatch.ts b/src/main/runtime/runtime-rpc/runtime-rpc-websocket-dispatch.ts
new file mode 100644
index 00000000000..86732e7430c
--- /dev/null
+++ b/src/main/runtime/runtime-rpc/runtime-rpc-websocket-dispatch.ts
@@ -0,0 +1,157 @@
+import type { WebSocket } from 'ws'
+import type {
+  PairingGetEndpointsParams,
+  PairingProvisionRelayParams
+} from '../../../shared/mobile-relay-credential-contract'
+import { fingerprintAuthenticatedPairingCredential } from '../rpc/orchestration-mutation-executor'
+import type { AuthenticatedMobileSocket } from '../rpc/mobile-socket-wiring'
+import type { RpcRequest, RpcResponse } from '../rpc/core'
+import type { WebSocketTransport } from '../rpc/ws-transport'
+import type { DeviceScope } from '../device-registry'
+import { RuntimeRpcRequestAdmission } from './runtime-rpc-request-admission'
+import { classifyRuntimeLongPoll } from './runtime-rpc-long-poll'
+import { MOBILE_RPC_METHOD_ALLOWLIST } from './runtime-rpc-mobile-method-allowlist'
+
+// Why: status.get has no per-connection context in the dispatcher, so stamp the scope here at the transport boundary.
+function injectDeviceScope(response: string, scope: DeviceScope): string {
+  try {
+    const parsed = JSON.parse(response) as RpcResponse
+    if (parsed.ok !== true || typeof parsed.result !== 'object' || parsed.result === null) {
+      return response
+    }
+    ;(parsed.result as Record<string, unknown>).deviceScope = scope
+    return JSON.stringify(parsed)
+  } catch {
+    return response
+  }
+}
+
+export class RuntimeRpcWebSocketDispatch extends RuntimeRpcRequestAdmission {
+  // Why: WebSocket dispatch is streaming (multiple responses) and auths via per-device tokens, not the shared token.
+  protected async handleWebSocketMessage(
+    rawMessage: string,
+    reply: (response: string) => void,
+    sendBinary: (response: Uint8Array<ArrayBufferLike>) => boolean | void,
+    wsTransport?: WebSocketTransport,
+    ws?: WebSocket,
+    authenticatedDeviceToken?: string | null,
+    authenticatedSocket?: AuthenticatedMobileSocket
+  ): Promise<void> {
+    let request: RpcRequest
+    try {
+      request = JSON.parse(rawMessage) as RpcRequest
+    } catch {
+      reply(JSON.stringify(this.buildError('unknown', 'bad_request', 'Invalid JSON request')))
+      return
+    }
+
+    if (typeof request.id !== 'string' || request.id.length === 0) {
+      reply(JSON.stringify(this.buildError('unknown', 'bad_request', 'Missing request id')))
+      return
+    }
+    if (typeof request.method !== 'string' || request.method.length === 0) {
+      reply(JSON.stringify(this.buildError(request.id, 'bad_request', 'Missing RPC method')))
+      return
+    }
+
+    const requestToken =
+      typeof (request as Record<string, unknown>).deviceToken === 'string'
+        ? ((request as Record<string, unknown>).deviceToken as string)
+        : null
+    if (authenticatedDeviceToken && requestToken && requestToken !== authenticatedDeviceToken) {
+      reply(JSON.stringify(this.buildError(request.id, 'unauthorized', 'Device token mismatch')))
+      return
+    }
+    // Why: E2EE already authenticated the channel; authorize by that bound identity, not a repeated request field.
+    const token = authenticatedDeviceToken ?? requestToken
+    if (!token) {
+      reply(JSON.stringify(this.buildError(request.id, 'unauthorized', 'Missing device token')))
+      return
+    }
+    const device = this.deviceRegistry?.validateToken(token)
+    if (!device) {
+      reply(JSON.stringify(this.buildError(request.id, 'unauthorized', 'Invalid device token')))
+      return
+    }
+    if (device.scope === 'mobile' && !MOBILE_RPC_METHOD_ALLOWLIST.has(request.method)) {
+      reply(
+        JSON.stringify(
+          this.buildError(
+            request.id,
+            'forbidden',
+            `Method '${request.method}' is not available to mobile clients`
+          )
+        )
+      )
+      return
+    }
+
+    // Why: bind deviceToken to this socket so ws.on('close') knows which mobile client disconnected.
+    if (wsTransport && ws) {
+      wsTransport.setClientId(ws, token)
+    }
+
+    const longPoll = classifyRuntimeLongPoll(request)
+    const rejection = this.admitLongPoll(longPoll, device.deviceId)
+    if (rejection) {
+      reply(JSON.stringify(this.buildError(request.id, 'runtime_busy', rejection)))
+      return
+    }
+
+    const abortRegistration = ws ? this.registerWebSocketDispatchAbort(ws) : null
+
+    // Why: older pairings may lack scope metadata, so stamp the authenticated scope onto status.get.
+    const replyForRequest =
+      request.method === 'status.get'
+        ? (response: string): void => reply(injectDeviceScope(response, device.scope))
+        : reply
+
+    const connectionId = ws ? this.mobileSocketWiring?.getConnectionId(ws) : undefined
+    const pairingProvider = this.mobileRelayPairingProvider
+    const pairingContext =
+      pairingProvider && authenticatedSocket
+        ? {
+            getEndpoints: (params: PairingGetEndpointsParams) =>
+              pairingProvider.getEndpoints(
+                {
+                  deviceId: authenticatedSocket.device.deviceId,
+                  connectionId: authenticatedSocket.connectionId,
+                  transport: authenticatedSocket.transport
+                },
+                params
+              ),
+            provisionRelay: (params: PairingProvisionRelayParams) =>
+              pairingProvider.provisionRelay(
+                {
+                  deviceId: authenticatedSocket.device.deviceId,
+                  connectionId: authenticatedSocket.connectionId,
+                  transport: authenticatedSocket.transport
+                },
+                params
+              )
+          }
+        : undefined
+    try {
+      await this.dispatcher.dispatchStreaming(request, replyForRequest, {
+        // Why: the validated credential preserves existing federation ownership without trusting request fields.
+        authenticatedCallerFingerprint: fingerprintAuthenticatedPairingCredential(token),
+        connectionId,
+        clientId: token,
+        pairedDeviceId: device.deviceId,
+        // Why: gates the mobile-only payload diet so full-screen web/desktop clients aren't truncated.
+        clientKind: device.scope,
+        clientCapabilities: authenticatedSocket?.clientCapabilities,
+        pairing: pairingContext,
+        signal: abortRegistration?.signal,
+        sendBinary,
+        registerBinaryStreamHandler: (streamId, handler) =>
+          this.registerBinaryStreamHandler(connectionId, streamId, handler),
+        registerBinaryMessageHandler: (handler) =>
+          this.registerBinaryMessageHandler(connectionId, handler)
+      })
+    } finally {
+      abortRegistration?.dispose()
+      this.releaseLongPoll(longPoll, device.deviceId)
+    }
+  }
+}
diff --git a/src/main/skills/skill-install-filesystem.ts b/src/main/skills/skill-install-filesystem.ts
index d51929d79f6..123d500fe92 100644
--- a/src/main/skills/skill-install-filesystem.ts
+++ b/src/main/skills/skill-install-filesystem.ts
@@ -92,16 +92,14 @@ export const nativeSkillInstallFilesystem: SkillInstallFilesystem = {
   inspectPaths: async (paths) =>
     new Map(
       await runSkillCandidateTasks(
-        paths.map(
-          (path) => async (): Promise<[string, SkillPathInspection]> => [
-            path,
-            {
-              kind: statKind(await lstat(path).catch(() => null)),
-              realpath: await realpath(path).catch(() => null),
-              mtimeMs: (await stat(path).catch(() => null))?.mtimeMs ?? null
-            }
-          ]
-        )
+        paths.map((path) => async (): Promise<[string, SkillPathInspection]> => [
+          path,
+          {
+            kind: statKind(await lstat(path).catch(() => null)),
+            realpath: await realpath(path).catch(() => null),
+            mtimeMs: (await stat(path).catch(() => null))?.mtimeMs ?? null
+          }
+        ])
       )
     )
 }
diff --git a/src/main/source-control/hosted-review-creation-blocking.ts b/src/main/source-control/hosted-review-creation-blocking.ts
new file mode 100644
index 00000000000..455d55049ed
--- /dev/null
+++ b/src/main/source-control/hosted-review-creation-blocking.ts
@@ -0,0 +1,102 @@
+import type {
+  CreateHostedReviewResult,
+  HostedReviewCreationBlockedReason,
+  HostedReviewCreationEligibility,
+  HostedReviewProvider
+} from '../../shared/hosted-review'
+import { reviewCopy } from './hosted-review-creation-provider'
+
+function blockedCreateResultForReason(
+  reason: NonNullable<HostedReviewCreationBlockedReason>,
+  provider: HostedReviewProvider,
+  submittedBase?: string | null
+): CreateHostedReviewResult | null {
+  const copy = reviewCopy(provider)
+  const baseLabel = submittedBase?.trim() ? `"${submittedBase.trim()}" ` : ''
+  const blockedCreateResultByReason = {
+    auth_required: {
+      ok: false,
+      code: 'auth_required',
+      error: `Create ${copy.shortLabel} failed: ${copy.providerName} is not authenticated. Next step: ${copy.authInstruction} in this environment.`
+    },
+    unsupported_provider: {
+      ok: false,
+      code: 'unsupported_provider',
+      error: `Creating ${copy.reviewLabel}s requires a ${copy.providerName} remote.`
+    },
+    dirty: {
+      ok: false,
+      code: 'validation',
+      error: `Create ${copy.shortLabel} failed: commit or discard local changes before creating a ${copy.reviewLabel}.`
+    },
+    detached_head: {
+      ok: false,
+      code: 'validation',
+      error: `Create ${copy.shortLabel} failed: switch to a branch before creating a ${copy.reviewLabel}.`
+    },
+    default_branch: {
+      ok: false,
+      code: 'validation',
+      error: `Create ${copy.shortLabel} failed: choose a feature branch before creating a ${copy.reviewLabel}.`
+    },
+    no_upstream: {
+      ok: false,
+      code: 'validation',
+      error: `Create ${copy.shortLabel} failed: publish this branch before creating a ${copy.reviewLabel}.`
+    },
+    needs_push: {
+      ok: false,
+      code: 'validation',
+      error: `Create ${copy.shortLabel} failed: push this branch before creating a ${copy.reviewLabel}.`
+    },
+    needs_sync: {
+      ok: false,
+      code: 'validation',
+      error: `Create ${copy.shortLabel} failed: sync this branch before creating a ${copy.reviewLabel}.`
+    },
+    fork_head_unsupported: {
+      ok: false,
+      code: 'validation',
+      error: `Create ${copy.shortLabel} failed: refresh source control status and try again.`
+    },
+    base_not_on_remote: {
+      ok: false,
+      code: 'validation',
+      error: `Create ${copy.shortLabel} failed: the base branch ${baseLabel}hasn't been pushed to the remote. Choose a pushed base or push it first.`
+    }
+  } satisfies Partial<
+    Record<NonNullable<HostedReviewCreationBlockedReason>, CreateHostedReviewResult>
+  >
+  return blockedCreateResultByReason[reason] ?? null
+}
+
+export function blockedEligibilityToCreateResult(
+  eligibility: HostedReviewCreationEligibility,
+  submittedBase?: string | null
+): CreateHostedReviewResult | null {
+  if (eligibility.canCreate) {
+    return null
+  }
+  if (eligibility.review?.url) {
+    const copy = reviewCopy(eligibility.provider)
+    return {
+      ok: false,
+      code: 'already_exists',
+      error: `A ${copy.reviewLabel} already exists for this branch.`,
+      existingReview: eligibility.review
+    }
+  }
+  if (eligibility.blockedReason) {
+    return blockedCreateResultForReason(
+      eligibility.blockedReason,
+      eligibility.provider,
+      submittedBase
+    )
+  }
+  const copy = reviewCopy(eligibility.provider)
+  return {
+    ok: false,
+    code: 'validation',
+    error: `Create ${copy.shortLabel} failed: refresh source control status and try again.`
+  }
+}
diff --git a/src/main/source-control/hosted-review-creation-git-state.ts b/src/main/source-control/hosted-review-creation-git-state.ts
new file mode 100644
index 00000000000..5c891e97f06
--- /dev/null
+++ b/src/main/source-control/hosted-review-creation-git-state.ts
@@ -0,0 +1,179 @@
+import {
+  normalizeHostedReviewBaseRef,
+  normalizeHostedReviewHeadRef
+} from '../../shared/hosted-review-refs'
+import { isNoUpstreamError, normalizeGitErrorMessage } from '../../shared/git-remote-error'
+import type { GitUpstreamStatus } from '../../shared/git-status-types'
+import { gitExecFileAsync } from '../github/gh-utils'
+import { gitOptionalLocksDisabledEnv } from '../git/runner'
+import { parsePorcelainV1Records, type PorcelainV1Record } from '../git/porcelain-v1-records'
+import { resolveDefaultBaseRefViaExec } from '../git/repo'
+import { getUpstreamStatus } from '../git/upstream'
+import { findExistingWorktreeSymlinkPaths } from '../git/worktree-symlink-detection'
+import { getSshGitProvider } from '../providers/ssh-git-dispatch'
+import {
+  getHostedReviewLocalGitOptions,
+  type HostedReviewExecutionOptions
+} from './hosted-review-git-options'
+
+export function stripRefPrefix(ref: string): string {
+  return normalizeHostedReviewHeadRef(ref)
+}
+
+export function hostedReviewExecutionContext(
+  options: HostedReviewExecutionOptions = {}
+): HostedReviewExecutionOptions {
+  const localGitExecOptions = getHostedReviewLocalGitOptions(options)
+  return Object.keys(localGitExecOptions).length > 0 ? { localGitExecOptions } : {}
+}
+
+async function runGitForHostedReview(
+  repoPath: string,
+  args: string[],
+  connectionId?: string | null,
+  options: HostedReviewExecutionOptions = {}
+): Promise<{ stdout: string; stderr?: string }> {
+  if (connectionId) {
+    const provider = getSshGitProvider(connectionId)
+    if (!provider) {
+      throw new Error(
+        'Remote connection dropped. Click Reconnect on the SSH target before retrying.'
+      )
+    }
+    return provider.exec(args, repoPath)
+  }
+  return gitExecFileAsync(args, { cwd: repoPath, ...getHostedReviewLocalGitOptions(options) })
+}
+
+export async function getDefaultBaseRef(
+  repoPath: string,
+  connectionId?: string | null,
+  options: HostedReviewExecutionOptions = {}
+): Promise<string | null> {
+  return resolveDefaultBaseRefViaExec((argv) =>
+    runGitForHostedReview(repoPath, argv, connectionId, options)
+  )
+}
+
+/**
+ * Whether the candidate base resolves to a remote-tracking branch on the
+ * executing host.
+ *
+ * Why: matches under *any* remote (not just origin) and reads the local tracking snapshot, not the live remote.
+ */
+export async function baseRefExistsOnRemote(
+  candidate: string,
+  repoPath: string,
+  connectionId?: string | null,
+  options: HostedReviewExecutionOptions = {}
+): Promise<boolean> {
+  const base = normalizeHostedReviewBaseRef(candidate).trim()
+  if (!base) {
+    return false
+  }
+  const run = (argv: string[]): Promise<{ stdout: string }> =>
+    runGitForHostedReview(repoPath, argv, connectionId, options)
+
+  const patterns = [`refs/remotes/*/${base}`]
+  // `*` does not cross `/`, so a remote-qualified candidate (e.g. `fork/main`) needs its exact tracking ref too.
+  if (base.includes('/')) {
+    patterns.push(`refs/remotes/${base}`)
+  }
+
+  try {
+    // for-each-ref exits 0 on no match: empty means absent, a thrown error means transport failure (preserve the candidate).
+    const { stdout } = await run(['for-each-ref', '--count=1', '--format=%(refname)', ...patterns])
+    return stdout.trim().length > 0
+  } catch {
+    return true
+  }
+}
+
+export async function getCurrentBranch(
+  repoPath: string,
+  connectionId?: string | null,
+  options: HostedReviewExecutionOptions = {}
+): Promise<string> {
+  const { stdout } = await runGitForHostedReview(
+    repoPath,
+    ['rev-parse', '--abbrev-ref', 'HEAD'],
+    connectionId,
+    options
+  )
+  return stripRefPrefix(stdout.trim())
+}
+
+export async function hasUncommittedChanges(
+  repoPath: string,
+  connectionId?: string | null,
+  options: HostedReviewExecutionOptions = {}
+): Promise<boolean> {
+  if (connectionId) {
+    const provider = getSshGitProvider(connectionId)
+    if (!provider) {
+      throw new Error(
+        'Remote connection dropped. Click Reconnect on the SSH target before retrying.'
+      )
+    }
+    // Why: the relay restricts generic git.exec, so use the structured status RPC for SSH dirty checks.
+    // No shared-link exclusion here: remote worktree creation skips the symlink
+    // and shared-directory passes entirely, so a remote worktree never has one.
+    return (await provider.getStatus(repoPath)).entries.length > 0
+  }
+  // Why: `-z` keeps paths raw so the shared-link comparison below can't be
+  // defeated by Git quoting a path with spaces or non-ASCII bytes.
+  const { stdout } = await gitExecFileAsync(['status', '--porcelain', '-z'], {
+    cwd: repoPath,
+    ...getHostedReviewLocalGitOptions(options),
+    // Why: don't take Git's optional index lock while the user may be running fetch/pull/rebase in a terminal.
+    env: gitOptionalLocksDisabledEnv()
+  })
+  const records = parsePorcelainV1Records(stdout)
+  if (records.length === 0) {
+    return false
+  }
+  return await anyRecordIsUserDirt(repoPath, records, options.sharedLinkPaths ?? [])
+}
+
+/** True when any record is real user work rather than a shared symlink Orca put
+ *  in the worktree.
+ *
+ *  Fails closed on purpose: anything not positively identified as an Orca-owned
+ *  untracked symlink counts as dirty. A false "clean" would let a review be
+ *  created off a branch missing the user's work. */
+async function anyRecordIsUserDirt(
+  worktreePath: string,
+  records: readonly PorcelainV1Record[],
+  sharedLinkPaths: readonly string[]
+): Promise<boolean> {
+  if (sharedLinkPaths.length === 0 || !records.some((record) => record.xy === '??')) {
+    return true
+  }
+  // Why: only entries that are configured AND really symlinks are excluded, so a
+  // regular file the user created at a configured name still blocks creation.
+  const sharedLinks = new Set(await findExistingWorktreeSymlinkPaths(worktreePath, sharedLinkPaths))
+  return records.some((record) => record.xy !== '??' || !sharedLinks.has(record.path))
+}
+
+export async function getHostedReviewUpstreamStatus(
+  repoPath: string,
+  connectionId?: string | null,
+  options: HostedReviewExecutionOptions = {}
+): Promise<GitUpstreamStatus> {
+  if (!connectionId) {
+    return getUpstreamStatus(repoPath, undefined, getHostedReviewLocalGitOptions(options))
+  }
+  const provider = getSshGitProvider(connectionId)
+  if (!provider) {
+    throw new Error('Remote connection dropped. Click Reconnect on the SSH target before retrying.')
+  }
+  try {
+    // Why: the relay blocks generic git.exec, so use its dedicated upstream RPC for SSH divergence.
+    return await provider.getUpstreamStatus(repoPath)
+  } catch (error) {
+    if (isNoUpstreamError(error)) {
+      return { hasUpstream: false, ahead: 0, behind: 0 }
+    }
+    throw new Error(normalizeGitErrorMessage(error, 'upstream'))
+  }
+}
diff --git a/src/main/source-control/hosted-review-creation-provider.ts b/src/main/source-control/hosted-review-creation-provider.ts
new file mode 100644
index 00000000000..323497d2419
--- /dev/null
+++ b/src/main/source-control/hosted-review-creation-provider.ts
@@ -0,0 +1,137 @@
+import type { HostedReviewProvider } from '../../shared/hosted-review'
+import type { HostedReviewCreationProvider } from '../../shared/hosted-review-creation-providers'
+import { isAzureDevOpsReviewCreationAuthenticated } from '../azure-devops/pull-request-creation'
+import { isBitbucketReviewCreationAuthenticated } from '../bitbucket/pull-request-creation'
+import { isGiteaReviewCreationAuthenticated } from '../gitea/pull-request-creation'
+import { getEnterpriseGitHubRepoSlug } from '../github/github-enterprise-repository'
+import { acquire, ghExecFileAsync, release } from '../github/gh-utils'
+import { getProjectSlug } from '../gitlab/client'
+import {
+  acquire as acquireGlab,
+  glabExecFileAsync,
+  glabRepoExecOptions,
+  release as releaseGlab
+} from '../gitlab/gl-utils'
+import {
+  getHostedReviewLocalGitOptions,
+  type HostedReviewExecutionOptions
+} from './hosted-review-git-options'
+
+async function isGitHubAuthenticated(
+  repoPath: string,
+  connectionId?: string | null,
+  options: HostedReviewExecutionOptions = {}
+): Promise<boolean> {
+  // Why: a non-null enterprise slug already means gh is authenticated there, so skip a redundant probe (#8312).
+  if (await getEnterpriseGitHubRepoSlug(repoPath, connectionId, options)) {
+    return true
+  }
+  await acquire()
+  try {
+    // Why: `host` scopes any rate-limit breaker trip to github.com — the host
+    // this probe actually targets — instead of a GH_HOST-derived scope.
+    await ghExecFileAsync(
+      ['auth', 'status', '--hostname', 'github.com'],
+      connectionId
+        ? { host: 'github.com' }
+        : { cwd: repoPath, ...getHostedReviewLocalGitOptions(options), host: 'github.com' }
+    )
+    return true
+  } catch {
+    return false
+  } finally {
+    release()
+  }
+}
+
+async function isGitLabAuthenticated(
+  repoPath: string,
+  connectionId?: string | null,
+  options: HostedReviewExecutionOptions = {}
+): Promise<boolean> {
+  const projectRef = await getProjectSlug(repoPath, connectionId, options)
+  if (!projectRef) {
+    return false
+  }
+  await acquireGlab()
+  try {
+    await glabExecFileAsync(['auth', 'status', '--hostname', projectRef.host], {
+      ...glabRepoExecOptions(repoPath, connectionId),
+      ...(connectionId ? {} : getHostedReviewLocalGitOptions(options))
+    })
+    return true
+  } catch {
+    return false
+  } finally {
+    releaseGlab()
+  }
+}
+
+export function reviewCopy(provider: HostedReviewProvider): {
+  shortLabel: 'PR' | 'MR'
+  reviewLabel: 'pull request' | 'merge request'
+  providerName: string
+  authInstruction: string
+} {
+  if (provider === 'gitlab') {
+    return {
+      shortLabel: 'MR',
+      reviewLabel: 'merge request',
+      providerName: 'GitLab',
+      authInstruction: 'Run glab auth login'
+    }
+  }
+  if (provider === 'azure-devops') {
+    return {
+      shortLabel: 'PR',
+      reviewLabel: 'pull request',
+      providerName: 'Azure DevOps',
+      authInstruction: 'Set ORCA_AZURE_DEVOPS_TOKEN'
+    }
+  }
+  if (provider === 'gitea') {
+    return {
+      shortLabel: 'PR',
+      reviewLabel: 'pull request',
+      providerName: 'Gitea',
+      authInstruction: 'Set ORCA_GITEA_TOKEN'
+    }
+  }
+  if (provider === 'bitbucket') {
+    return {
+      shortLabel: 'PR',
+      reviewLabel: 'pull request',
+      providerName: 'Bitbucket',
+      authInstruction: 'Connect Bitbucket in Settings > Integrations'
+    }
+  }
+  return {
+    shortLabel: 'PR',
+    reviewLabel: 'pull request',
+    providerName: 'GitHub',
+    authInstruction: 'Run gh auth login'
+  }
+}
+
+export async function isProviderAuthenticated(
+  provider: HostedReviewCreationProvider,
+  repoPath: string,
+  connectionId?: string | null,
+  options: HostedReviewExecutionOptions = {}
+): Promise<boolean> {
+  if (provider === 'gitlab') {
+    return isGitLabAuthenticated(repoPath, connectionId, options)
+  }
+  if (provider === 'azure-devops') {
+    return isAzureDevOpsReviewCreationAuthenticated()
+  }
+  if (provider === 'gitea') {
+    return isGiteaReviewCreationAuthenticated()
+  }
+  if (provider === 'bitbucket') {
+    // Why: falling through to the GitHub check made Create PR unusable for
+    // anyone with Bitbucket connected but no `gh auth login`.
+    return isBitbucketReviewCreationAuthenticated()
+  }
+  return isGitHubAuthenticated(repoPath, connectionId, options)
+}
diff --git a/src/main/source-control/hosted-review-creation.ts b/src/main/source-control/hosted-review-creation.ts
index 9c9be75ab24..a3e06a3acc0 100644
--- a/src/main/source-control/hosted-review-creation.ts
+++ b/src/main/source-control/hosted-review-creation.ts
@@ -1,46 +1,28 @@
-/* eslint-disable max-lines -- Why: detection, eligibility, and creation preflight share one boundary so gating can't drift. */
 import type {
   CreateHostedReviewInput,
   CreateHostedReviewResult,
-  HostedReviewCreationBlockedReason,
   HostedReviewCreationEligibility,
   HostedReviewCreationEligibilityArgs,
-  HostedReviewLookupOutcome,
-  HostedReviewProvider
+  HostedReviewLookupOutcome
 } from '../../shared/hosted-review'
-import {
-  normalizeHostedReviewBaseRef,
-  normalizeHostedReviewHeadRef
-} from '../../shared/hosted-review-refs'
-import {
-  supportsHostedReviewCreation,
-  type HostedReviewCreationProvider
-} from '../../shared/hosted-review-creation-providers'
-import { isAzureDevOpsReviewCreationAuthenticated } from '../azure-devops/pull-request-creation'
-import { isGiteaReviewCreationAuthenticated } from '../gitea/pull-request-creation'
-import { isBitbucketReviewCreationAuthenticated } from '../bitbucket/pull-request-creation'
-import { getEnterpriseGitHubRepoSlug } from '../github/github-enterprise-repository'
+import { supportsHostedReviewCreation } from '../../shared/hosted-review-creation-providers'
+import { normalizeHostedReviewBaseRef } from '../../shared/hosted-review-refs'
 import { getRepoSlug } from '../github/client'
 import { isDefaultGitHubHost } from '../../shared/github/repository-identity-key'
-import { acquire, ghExecFileAsync, gitExecFileAsync, release } from '../github/gh-utils'
-import { isNoUpstreamError, normalizeGitErrorMessage } from '../../shared/git-remote-error'
-import type { GitUpstreamStatus } from '../../shared/git-status-types'
-import { gitOptionalLocksDisabledEnv } from '../git/runner'
-import { parsePorcelainV1Records, type PorcelainV1Record } from '../git/porcelain-v1-records'
-import { findExistingWorktreeSymlinkPaths } from '../git/worktree-symlink-detection'
-import { resolveDefaultBaseRefViaExec } from '../git/repo'
-import { getUpstreamStatus } from '../git/upstream'
-import { getProjectSlug } from '../gitlab/client'
-import {
-  acquire as acquireGlab,
-  glabExecFileAsync,
-  glabRepoExecOptions,
-  release as releaseGlab
-} from '../gitlab/gl-utils'
-import { getSshGitProvider } from '../providers/ssh-git-dispatch'
 import { detectHostedReviewProvider, getForgeProviderForRepository } from './forge-provider'
 import { invalidateHostedReviewBranchCache } from './hosted-review-branch-cache'
 import { getHostedReviewForBranch } from './hosted-review'
+import { blockedEligibilityToCreateResult } from './hosted-review-creation-blocking'
+import {
+  baseRefExistsOnRemote,
+  getCurrentBranch,
+  getDefaultBaseRef,
+  getHostedReviewUpstreamStatus,
+  hasUncommittedChanges,
+  hostedReviewExecutionContext,
+  stripRefPrefix
+} from './hosted-review-creation-git-state'
+import { isProviderAuthenticated, reviewCopy } from './hosted-review-creation-provider'
 import {
   getHostedReviewLocalGitOptions,
   type HostedReviewExecutionOptions
@@ -52,382 +34,6 @@ type HostedReviewCreationEligibilityInput = HostedReviewCreationEligibilityArgs
   enforceBaseOnRemote?: boolean
 } & HostedReviewExecutionOptions
 
-function stripRefPrefix(ref: string): string {
-  return normalizeHostedReviewHeadRef(ref)
-}
-
-function hostedReviewExecutionContext(
-  options: HostedReviewExecutionOptions = {}
-): HostedReviewExecutionOptions {
-  const localGitExecOptions = getHostedReviewLocalGitOptions(options)
-  return Object.keys(localGitExecOptions).length > 0 ? { localGitExecOptions } : {}
-}
-
-async function isGitHubAuthenticated(
-  repoPath: string,
-  connectionId?: string | null,
-  options: HostedReviewExecutionOptions = {}
-): Promise<boolean> {
-  // Why: a non-null enterprise slug already means gh is authenticated there, so skip a redundant probe (#8312).
-  if (await getEnterpriseGitHubRepoSlug(repoPath, connectionId, options)) {
-    return true
-  }
-  await acquire()
-  try {
-    // Why: `host` scopes any rate-limit breaker trip to github.com — the host
-    // this probe actually targets — instead of a GH_HOST-derived scope.
-    await ghExecFileAsync(
-      ['auth', 'status', '--hostname', 'github.com'],
-      connectionId
-        ? { host: 'github.com' }
-        : { cwd: repoPath, ...getHostedReviewLocalGitOptions(options), host: 'github.com' }
-    )
-    return true
-  } catch {
-    return false
-  } finally {
-    release()
-  }
-}
-
-async function isGitLabAuthenticated(
-  repoPath: string,
-  connectionId?: string | null,
-  options: HostedReviewExecutionOptions = {}
-): Promise<boolean> {
-  const projectRef = await getProjectSlug(repoPath, connectionId, options)
-  if (!projectRef) {
-    return false
-  }
-  await acquireGlab()
-  try {
-    await glabExecFileAsync(['auth', 'status', '--hostname', projectRef.host], {
-      ...glabRepoExecOptions(repoPath, connectionId),
-      ...(connectionId ? {} : getHostedReviewLocalGitOptions(options))
-    })
-    return true
-  } catch {
-    return false
-  } finally {
-    releaseGlab()
-  }
-}
-
-async function runGitForHostedReview(
-  repoPath: string,
-  args: string[],
-  connectionId?: string | null,
-  options: HostedReviewExecutionOptions = {}
-): Promise<{ stdout: string; stderr?: string }> {
-  if (connectionId) {
-    const provider = getSshGitProvider(connectionId)
-    if (!provider) {
-      throw new Error(
-        'Remote connection dropped. Click Reconnect on the SSH target before retrying.'
-      )
-    }
-    return provider.exec(args, repoPath)
-  }
-  return gitExecFileAsync(args, { cwd: repoPath, ...getHostedReviewLocalGitOptions(options) })
-}
-
-async function getDefaultBaseRef(
-  repoPath: string,
-  connectionId?: string | null,
-  options: HostedReviewExecutionOptions = {}
-): Promise<string | null> {
-  return resolveDefaultBaseRefViaExec((argv) =>
-    runGitForHostedReview(repoPath, argv, connectionId, options)
-  )
-}
-
-/**
- * Whether the candidate base resolves to a remote-tracking branch on the
- * executing host.
- *
- * Why: matches under *any* remote (not just origin) and reads the local tracking snapshot, not the live remote.
- */
-async function baseRefExistsOnRemote(
-  candidate: string,
-  repoPath: string,
-  connectionId?: string | null,
-  options: HostedReviewExecutionOptions = {}
-): Promise<boolean> {
-  const base = normalizeHostedReviewBaseRef(candidate).trim()
-  if (!base) {
-    return false
-  }
-  const run = (argv: string[]): Promise<{ stdout: string }> =>
-    runGitForHostedReview(repoPath, argv, connectionId, options)
-
-  const patterns = [`refs/remotes/*/${base}`]
-  // `*` does not cross `/`, so a remote-qualified candidate (e.g. `fork/main`) needs its exact tracking ref too.
-  if (base.includes('/')) {
-    patterns.push(`refs/remotes/${base}`)
-  }
-
-  try {
-    // for-each-ref exits 0 on no match: empty means absent, a thrown error means transport failure (preserve the candidate).
-    const { stdout } = await run(['for-each-ref', '--count=1', '--format=%(refname)', ...patterns])
-    return stdout.trim().length > 0
-  } catch {
-    return true
-  }
-}
-
-async function getCurrentBranch(
-  repoPath: string,
-  connectionId?: string | null,
-  options: HostedReviewExecutionOptions = {}
-): Promise<string> {
-  const { stdout } = await runGitForHostedReview(
-    repoPath,
-    ['rev-parse', '--abbrev-ref', 'HEAD'],
-    connectionId,
-    options
-  )
-  return stripRefPrefix(stdout.trim())
-}
-
-async function hasUncommittedChanges(
-  repoPath: string,
-  connectionId?: string | null,
-  options: HostedReviewExecutionOptions = {}
-): Promise<boolean> {
-  if (connectionId) {
-    const provider = getSshGitProvider(connectionId)
-    if (!provider) {
-      throw new Error(
-        'Remote connection dropped. Click Reconnect on the SSH target before retrying.'
-      )
-    }
-    // Why: the relay restricts generic git.exec, so use the structured status RPC for SSH dirty checks.
-    // No shared-link exclusion here: remote worktree creation skips the symlink
-    // and shared-directory passes entirely, so a remote worktree never has one.
-    return (await provider.getStatus(repoPath)).entries.length > 0
-  }
-  // Why: `-z` keeps paths raw so the shared-link comparison below can't be
-  // defeated by Git quoting a path with spaces or non-ASCII bytes.
-  const { stdout } = await gitExecFileAsync(['status', '--porcelain', '-z'], {
-    cwd: repoPath,
-    ...getHostedReviewLocalGitOptions(options),
-    // Why: don't take Git's optional index lock while the user may be running fetch/pull/rebase in a terminal.
-    env: gitOptionalLocksDisabledEnv()
-  })
-  const records = parsePorcelainV1Records(stdout)
-  if (records.length === 0) {
-    return false
-  }
-  return await anyRecordIsUserDirt(repoPath, records, options.sharedLinkPaths ?? [])
-}
-
-/** True when any record is real user work rather than a shared symlink Orca put
- *  in the worktree.
- *
- *  Fails closed on purpose: anything not positively identified as an Orca-owned
- *  untracked symlink counts as dirty. A false "clean" would let a review be
- *  created off a branch missing the user's work. */
-async function anyRecordIsUserDirt(
-  worktreePath: string,
-  records: readonly PorcelainV1Record[],
-  sharedLinkPaths: readonly string[]
-): Promise<boolean> {
-  if (sharedLinkPaths.length === 0 || !records.some((record) => record.xy === '??')) {
-    return true
-  }
-  // Why: only entries that are configured AND really symlinks are excluded, so a
-  // regular file the user created at a configured name still blocks creation.
-  const sharedLinks = new Set(await findExistingWorktreeSymlinkPaths(worktreePath, sharedLinkPaths))
-  return records.some((record) => record.xy !== '??' || !sharedLinks.has(record.path))
-}
-
-async function getHostedReviewUpstreamStatus(
-  repoPath: string,
-  connectionId?: string | null,
-  options: HostedReviewExecutionOptions = {}
-): Promise<GitUpstreamStatus> {
-  if (!connectionId) {
-    return getUpstreamStatus(repoPath, undefined, getHostedReviewLocalGitOptions(options))
-  }
-  const provider = getSshGitProvider(connectionId)
-  if (!provider) {
-    throw new Error('Remote connection dropped. Click Reconnect on the SSH target before retrying.')
-  }
-  try {
-    // Why: the relay blocks generic git.exec, so use its dedicated upstream RPC for SSH divergence.
-    return await provider.getUpstreamStatus(repoPath)
-  } catch (error) {
-    if (isNoUpstreamError(error)) {
-      return { hasUpstream: false, ahead: 0, behind: 0 }
-    }
-    throw new Error(normalizeGitErrorMessage(error, 'upstream'))
-  }
-}
-
-function reviewCopy(provider: HostedReviewProvider): {
-  shortLabel: 'PR' | 'MR'
-  reviewLabel: 'pull request' | 'merge request'
-  providerName: string
-  authInstruction: string
-} {
-  if (provider === 'gitlab') {
-    return {
-      shortLabel: 'MR',
-      reviewLabel: 'merge request',
-      providerName: 'GitLab',
-      authInstruction: 'Run glab auth login'
-    }
-  }
-  if (provider === 'azure-devops') {
-    return {
-      shortLabel: 'PR',
-      reviewLabel: 'pull request',
-      providerName: 'Azure DevOps',
-      authInstruction: 'Set ORCA_AZURE_DEVOPS_TOKEN'
-    }
-  }
-  if (provider === 'gitea') {
-    return {
-      shortLabel: 'PR',
-      reviewLabel: 'pull request',
-      providerName: 'Gitea',
-      authInstruction: 'Set ORCA_GITEA_TOKEN'
-    }
-  }
-  if (provider === 'bitbucket') {
-    return {
-      shortLabel: 'PR',
-      reviewLabel: 'pull request',
-      providerName: 'Bitbucket',
-      authInstruction: 'Connect Bitbucket in Settings > Integrations'
-    }
-  }
-  return {
-    shortLabel: 'PR',
-    reviewLabel: 'pull request',
-    providerName: 'GitHub',
-    authInstruction: 'Run gh auth login'
-  }
-}
-
-async function isProviderAuthenticated(
-  provider: HostedReviewCreationProvider,
-  repoPath: string,
-  connectionId?: string | null,
-  options: HostedReviewExecutionOptions = {}
-): Promise<boolean> {
-  if (provider === 'gitlab') {
-    return isGitLabAuthenticated(repoPath, connectionId, options)
-  }
-  if (provider === 'azure-devops') {
-    return isAzureDevOpsReviewCreationAuthenticated()
-  }
-  if (provider === 'gitea') {
-    return isGiteaReviewCreationAuthenticated()
-  }
-  if (provider === 'bitbucket') {
-    // Why: falling through to the GitHub check made Create PR unusable for
-    // anyone with Bitbucket connected but no `gh auth login`.
-    return isBitbucketReviewCreationAuthenticated()
-  }
-  return isGitHubAuthenticated(repoPath, connectionId, options)
-}
-
-function blockedCreateResultForReason(
-  reason: NonNullable<HostedReviewCreationBlockedReason>,
-  provider: HostedReviewProvider,
-  submittedBase?: string | null
-): CreateHostedReviewResult | null {
-  const copy = reviewCopy(provider)
-  const baseLabel = submittedBase?.trim() ? `"${submittedBase.trim()}" ` : ''
-  const blockedCreateResultByReason = {
-    auth_required: {
-      ok: false,
-      code: 'auth_required',
-      error: `Create ${copy.shortLabel} failed: ${copy.providerName} is not authenticated. Next step: ${copy.authInstruction} in this environment.`
-    },
-    unsupported_provider: {
-      ok: false,
-      code: 'unsupported_provider',
-      error: `Creating ${copy.reviewLabel}s requires a ${copy.providerName} remote.`
-    },
-    dirty: {
-      ok: false,
-      code: 'validation',
-      error: `Create ${copy.shortLabel} failed: commit or discard local changes before creating a ${copy.reviewLabel}.`
-    },
-    detached_head: {
-      ok: false,
-      code: 'validation',
-      error: `Create ${copy.shortLabel} failed: switch to a branch before creating a ${copy.reviewLabel}.`
-    },
-    default_branch: {
-      ok: false,
-      code: 'validation',
-      error: `Create ${copy.shortLabel} failed: choose a feature branch before creating a ${copy.reviewLabel}.`
-    },
-    no_upstream: {
-      ok: false,
-      code: 'validation',
-      error: `Create ${copy.shortLabel} failed: publish this branch before creating a ${copy.reviewLabel}.`
-    },
-    needs_push: {
-      ok: false,
-      code: 'validation',
-      error: `Create ${copy.shortLabel} failed: push this branch before creating a ${copy.reviewLabel}.`
-    },
-    needs_sync: {
-      ok: false,
-      code: 'validation',
-      error: `Create ${copy.shortLabel} failed: sync this branch before creating a ${copy.reviewLabel}.`
-    },
-    fork_head_unsupported: {
-      ok: false,
-      code: 'validation',
-      error: `Create ${copy.shortLabel} failed: refresh source control status and try again.`
-    },
-    base_not_on_remote: {
-      ok: false,
-      code: 'validation',
-      error: `Create ${copy.shortLabel} failed: the base branch ${baseLabel}hasn't been pushed to the remote. Choose a pushed base or push it first.`
-    }
-  } satisfies Partial<
-    Record<NonNullable<HostedReviewCreationBlockedReason>, CreateHostedReviewResult>
-  >
-  return blockedCreateResultByReason[reason] ?? null
-}
-
-function blockedEligibilityToCreateResult(
-  eligibility: HostedReviewCreationEligibility,
-  submittedBase?: string | null
-): CreateHostedReviewResult | null {
-  if (eligibility.canCreate) {
-    return null
-  }
-  if (eligibility.review?.url) {
-    const copy = reviewCopy(eligibility.provider)
-    return {
-      ok: false,
-      code: 'already_exists',
-      error: `A ${copy.reviewLabel} already exists for this branch.`,
-      existingReview: eligibility.review
-    }
-  }
-  if (eligibility.blockedReason) {
-    return blockedCreateResultForReason(
-      eligibility.blockedReason,
-      eligibility.provider,
-      submittedBase
-    )
-  }
-  const copy = reviewCopy(eligibility.provider)
-  return {
-    ok: false,
-    code: 'validation',
-    error: `Create ${copy.shortLabel} failed: refresh source control status and try again.`
-  }
-}
-
 async function validateCurrentBranchCanCreateReview(
   repoPath: string,
   connectionId: string | null | undefined,
diff --git a/src/main/speech/stt-service.ts b/src/main/speech/stt-service.ts
index a840d7aa256..21d3fba2714 100644
--- a/src/main/speech/stt-service.ts
+++ b/src/main/speech/stt-service.ts
@@ -1,16 +1,9 @@
-/* eslint-disable max-lines -- Why: speech worker ownership, warm reuse, and
-timeout teardown stay co-located so dictation lifecycle state cannot drift. */
-import { Worker } from 'node:worker_threads'
-import { getCatalogModel } from './model-catalog'
 import type { ModelManager } from './model-manager'
-import { OpenAiTranscriptionSession } from './openai-transcription-client'
-import { readOpenAiSpeechApiKey } from './openai-api-key-store'
-import { getSherpaModulePath, getSttWorkerPath } from './stt-worker-paths'
-import { waitForSttWorkerStop, type SttWorkerStopOutcome } from './stt-worker-stop'
+import { startSttDictation } from './stt-session-start'
+import { createSttSessionState, type SttSessionState } from './stt-session-state'
+import { prepareSttModelForDeletion, stopSttDictation } from './stt-session-stop'
 
-export const START_DICTATION_TIMEOUT_MS = 60_000
-const STOP_DICTATION_TIMEOUT_MS = 60_000
-export const IDLE_WORKER_TEARDOWN_MS = 60 * 60 * 1000
+export { IDLE_WORKER_TEARDOWN_MS, START_DICTATION_TIMEOUT_MS } from './stt-session-timeouts'
 
 export type SttEvent =
   | { type: 'ready' }
@@ -21,481 +14,58 @@ export type SttEvent =
 
 export type SttEventSink = (event: SttEvent) => void
 
-type StopInFlight = {
-  worker: Worker
-  owner: string
-  promise: Promise<void>
-}
-
 export class SttService {
-  private worker: Worker | null = null
-  private cloudSession: OpenAiTranscriptionSession | null = null
-  private modelManager: ModelManager
-  private activeModelId: string | null = null
-  private activeHotwordsFilePath: string | undefined
-  private activeOwner: string | null = null
-  private startingOwner: string | null = null
-  private startingModelId: string | null = null
-  private starting = false
-  private canceledOwners = new Set<string>()
-  private eventSink: SttEventSink | null = null
-  private idleTeardownTimer: NodeJS.Timeout | null = null
-  private stopInFlight: StopInFlight | null = null
-  // Why: stop resolves only after the worker flushes; in-flight feedAudio IPC
-  // must not enqueue samples after that flush or they stick on the warm worker
-  // and contaminate the next dictation session.
-  private stopping = false
-  // Why: warm workers intentionally keep lifecycle listeners while reusable;
-  // stale workers must not retain this service after error, exit, or teardown.
-  private cleanupWorkerLifecycleListeners: (() => void) | null = null
+  private readonly state: SttSessionState
 
   constructor(modelManager: ModelManager) {
-    this.modelManager = modelManager
+    this.state = createSttSessionState(modelManager)
   }
 
-  async startDictation(
+  startDictation(
     modelId: string,
     sink: SttEventSink,
     hotwordsFilePath?: string,
     owner = 'desktop'
   ): Promise<void> {
-    if (this.starting) {
-      if (this.startingOwner !== owner) {
-        throw new Error('dictation_already_active')
-      }
-      return
-    }
-    if ((this.worker || this.cloudSession) && this.activeOwner && this.activeOwner !== owner) {
-      throw new Error('dictation_already_active')
-    }
-    this.starting = true
-    this.startingOwner = owner
-    this.startingModelId = modelId
-    this.clearIdleTeardownTimer()
-
-    try {
-      await this._startDictation(modelId, sink, hotwordsFilePath, owner)
-      if (this.canceledOwners.delete(owner)) {
-        await this.stopDictation(owner, { cancelStarting: false })
-        throw new Error('dictation_canceled')
-      }
-      this.activeOwner = owner
-    } finally {
-      this.starting = false
-      this.startingOwner = null
-      this.startingModelId = null
-      this.canceledOwners.delete(owner)
-    }
-  }
-
-  private async _startDictation(
-    modelId: string,
-    sink: SttEventSink,
-    hotwordsFilePath?: string,
-    owner = 'desktop'
-  ): Promise<void> {
-    const manifest = getCatalogModel(modelId)
-    if (!manifest) {
-      throw new Error(`Unknown model: ${modelId}`)
-    }
-
-    if (manifest.provider === 'openai') {
-      if (this.worker) {
-        const existingWorker = this.worker
-        await this.stopDictation(owner, { cancelStarting: false })
-        await this.teardownWorker(existingWorker)
-      }
-
-      const modelState = await this.modelManager.getModelState(modelId)
-      if (modelState.status !== 'ready') {
-        throw new Error(`Model not ready: ${modelState.status}`)
-      }
-
-      this.cloudSession = new OpenAiTranscriptionSession(modelId, readOpenAiSpeechApiKey)
-      this.activeModelId = modelId
-      this.activeHotwordsFilePath = undefined
-      this.eventSink = sink
-      sink({ type: 'ready' })
-      return
-    }
-
-    if (this.cloudSession) {
-      await this.stopDictation(owner, { cancelStarting: false })
-    }
-
-    const reusableWorker = this.worker
-    if (
-      reusableWorker &&
-      this.activeModelId === modelId &&
-      this.activeHotwordsFilePath === hotwordsFilePath &&
-      this.stopInFlight?.worker !== reusableWorker
-    ) {
-      const worker = reusableWorker
-      if (!this.activeOwner) {
-        const modelState = await this.modelManager.getModelState(modelId)
-        if (modelState.status !== 'ready') {
-          await this.teardownWorker(worker)
-          throw new Error(`Model not ready: ${modelState.status}`)
-        }
-      }
-      if (
-        this.worker === worker &&
-        this.activeModelId === modelId &&
-        this.activeHotwordsFilePath === hotwordsFilePath &&
-        this.stopInFlight?.worker !== worker
-      ) {
-        this.eventSink = sink
-        sink({ type: 'ready' })
-        return
-      }
-    }
-
-    if (this.worker) {
-      const existingWorker = this.worker
-      await this.stopDictation(owner, { cancelStarting: false })
-      await this.teardownWorker(existingWorker)
-    }
-
-    const modelState = await this.modelManager.getModelState(modelId)
-    if (modelState.status !== 'ready') {
-      throw new Error(`Model not ready: ${modelState.status}`)
-    }
-
-    const workerPath = getSttWorkerPath()
-    const sherpaModulePath = getSherpaModulePath()
-
-    this.worker = new Worker(workerPath, {
-      workerData: { sherpaModulePath }
-    })
-    const worker = this.worker
-
-    this.activeModelId = modelId
-    this.activeHotwordsFilePath = hotwordsFilePath
-    this.eventSink = sink
-
-    const readyPromise = new Promise<void>((resolve, reject) => {
-      let settled = false
-      let startupTimeout: ReturnType<typeof setTimeout> | null = null
-      const cleanup = () => {
-        if (startupTimeout) {
-          clearTimeout(startupTimeout)
-          startupTimeout = null
-        }
-        worker.off('message', onReadyOrError)
-        worker.off('error', onStartupError)
-        worker.off('exit', onStartupExit)
-      }
-      const failStartup = (error: Error): void => {
-        if (settled) {
-          return
-        }
-        settled = true
-        cleanup()
-        reject(error)
-      }
-      const onReadyOrError = (msg: { type: string; text?: string; error?: string }) => {
-        if (settled) {
-          return
-        }
-        if (msg.type === 'ready') {
-          settled = true
-          cleanup()
-          resolve()
-        } else if (msg.type === 'error') {
-          failStartup(new Error(msg.error ?? 'Speech worker failed to initialize'))
-        }
-      }
-      const onStartupError = (err: Error) => {
-        failStartup(err)
-      }
-      const onStartupExit = (code: number) => {
-        failStartup(new Error(`Speech worker exited before ready: ${code}`))
-      }
-      worker.on('message', onReadyOrError)
-      worker.on('error', onStartupError)
-      worker.on('exit', onStartupExit)
-      // Why: a native STT worker can wedge while loading model bindings without
-      // emitting ready/error/exit; startup must leave the UI's Starting state.
-      startupTimeout = setTimeout(() => {
-        failStartup(new Error('Speech worker timed out while starting.'))
-      }, START_DICTATION_TIMEOUT_MS)
-      startupTimeout.unref?.()
-    })
-
-    const onWorkerMessage = (msg: SttEvent) => {
-      if (this.worker === worker) {
-        this.eventSink?.(msg)
-      }
-    }
-
-    const onWorkerError = (err: Error) => {
-      if (this.worker === worker) {
-        this.eventSink?.({ type: 'error', error: String(err) })
-        this.cleanupActiveWorkerLifecycleListeners()
-        this.worker = null
-        this.activeModelId = null
-        this.activeHotwordsFilePath = undefined
-        this.activeOwner = null
-        this.eventSink = null
-      }
-    }
-
-    const onWorkerExit = () => {
-      if (this.worker === worker) {
-        this.cleanupActiveWorkerLifecycleListeners()
-        this.worker = null
-        this.activeModelId = null
-        this.activeHotwordsFilePath = undefined
-        this.activeOwner = null
-        this.eventSink = null
-      }
-    }
-
-    worker.on('message', onWorkerMessage)
-    worker.on('error', onWorkerError)
-    worker.on('exit', onWorkerExit)
-    this.cleanupWorkerLifecycleListeners = () => {
-      worker.off('message', onWorkerMessage)
-      worker.off('error', onWorkerError)
-      worker.off('exit', onWorkerExit)
-    }
-
-    const modelDir = this.modelManager.getModelDir(modelId)
-    worker.postMessage({
-      type: 'init',
-      modelDir,
-      modelType: manifest.type,
-      streaming: manifest.streaming,
-      sampleRate: manifest.sampleRate,
-      files: manifest.files ?? [],
-      hotwordsFilePath,
-      modelingUnit: manifest.modelingUnit
-    })
-
-    try {
-      await readyPromise
-    } catch (error) {
-      this.cleanupActiveWorkerLifecycleListeners()
-      worker.removeAllListeners()
-      void worker.terminate()
-      if (this.worker === worker) {
-        this.worker = null
-        this.activeModelId = null
-        this.activeHotwordsFilePath = undefined
-        this.activeOwner = null
-        this.eventSink = null
-      }
-      throw error
-    }
+    return startSttDictation(this.state, modelId, sink, hotwordsFilePath, owner)
   }
 
   feedAudio(samples: Float32Array, sampleRate: number, owner = 'desktop'): void {
-    if (this.stopping) {
+    if (this.state.stopping) {
       return
     }
-    const currentOwner = this.activeOwner ?? this.startingOwner
+    const currentOwner = this.state.activeOwner ?? this.state.startingOwner
     if (!currentOwner) {
       return
     }
     if (currentOwner !== owner) {
       throw new Error('dictation_owner_mismatch')
     }
-    if (this.cloudSession) {
-      this.cloudSession.feedAudio(samples, sampleRate)
+    if (this.state.cloudSession) {
+      this.state.cloudSession.feedAudio(samples, sampleRate)
       return
     }
-    this.worker?.postMessage({ type: 'feed', samples, sampleRate }, [samples.buffer as ArrayBuffer])
+    this.state.worker?.postMessage({ type: 'feed', samples, sampleRate }, [
+      samples.buffer as ArrayBuffer
+    ])
   }
 
-  async stopDictation(
+  stopDictation(
     owner = 'desktop',
     options: { cancelStarting?: boolean } = { cancelStarting: true }
   ): Promise<void> {
-    if (options.cancelStarting !== false && this.startingOwner === owner) {
-      this.canceledOwners.add(owner)
-    }
-    if (!this.worker && !this.cloudSession) {
-      return
-    }
-    const currentOwner = this.activeOwner ?? this.startingOwner
-    if (currentOwner && currentOwner !== owner) {
-      throw new Error('dictation_owner_mismatch')
-    }
-
-    if (this.cloudSession) {
-      this.stopping = true
-      try {
-        const session = this.cloudSession
-        this.cloudSession = null
-        try {
-          const text = await session.finish()
-          if (text) {
-            this.eventSink?.({ type: 'final', text })
-          }
-        } catch (error) {
-          this.eventSink?.({
-            type: 'error',
-            error: error instanceof Error ? error.message : String(error)
-          })
-        } finally {
-          this.eventSink?.({ type: 'stopped' })
-          this.activeModelId = null
-          this.activeHotwordsFilePath = undefined
-          this.activeOwner = null
-          this.eventSink = null
-        }
-      } finally {
-        this.stopping = false
-      }
-      return
-    }
-
-    const worker = this.worker
-    if (!worker) {
-      return
-    }
-    if (this.stopInFlight?.worker === worker) {
-      if (this.stopInFlight.owner !== owner) {
-        throw new Error('dictation_owner_mismatch')
-      }
-      return this.stopInFlight.promise
-    }
-
-    const capturedSink = this.eventSink
-    let stopPromise!: Promise<void>
-    stopPromise = this.createStopPromise(worker, capturedSink).finally(() => {
-      if (this.stopInFlight?.worker === worker && this.stopInFlight.promise === stopPromise) {
-        this.stopInFlight = null
-      }
-    })
-    this.stopInFlight = { worker, owner, promise: stopPromise }
-    this.stopping = true
-    try {
-      // Why: keep the stop message inside the try so a postMessage throw still
-      // clears `stopping` — otherwise feedAudio silently drops all future audio.
-      worker.postMessage({ type: 'stop' })
-      await stopPromise
-    } finally {
-      this.stopping = false
-    }
-  }
-
-  private createStopPromise(worker: Worker, capturedSink: SttEventSink | null): Promise<void> {
-    return waitForSttWorkerStop({
-      worker,
-      capturedSink,
-      timeoutMs: STOP_DICTATION_TIMEOUT_MS,
-      finish: (outcome) => this.finishWorkerStop(worker, outcome)
-    })
-  }
-
-  private finishWorkerStop(worker: Worker, outcome: SttWorkerStopOutcome): void {
-    if (outcome === 'stopped') {
-      if (this.worker === worker) {
-        this.activeOwner = null
-        this.eventSink = null
-        this.scheduleIdleTeardown()
-      }
-      return
-    }
-    // Why: a worker that cannot finish dictation is no longer reusable; drop
-    // its lifecycle listeners so a stale worker can't retain this service.
-    this.cleanupActiveWorkerLifecycleListeners()
-    worker.removeAllListeners()
-    if (outcome !== 'exit') {
-      void worker.terminate().catch(() => undefined)
-    }
-    if (this.worker === worker) {
-      this.worker = null
-      this.activeModelId = null
-      this.activeHotwordsFilePath = undefined
-      this.activeOwner = null
-      this.eventSink = null
-    }
+    return stopSttDictation(this.state, owner, options)
   }
 
   isActive(): boolean {
-    return this.worker !== null || this.cloudSession !== null
+    return this.state.worker !== null || this.state.cloudSession !== null
   }
 
   getActiveModelId(): string | null {
-    return this.activeModelId
+    return this.state.activeModelId
   }
 
-  async prepareModelForDeletion(modelId: string): Promise<void> {
-    if (this.startingModelId === modelId || (this.activeOwner && this.activeModelId === modelId)) {
-      throw new Error('voice_model_in_use')
-    }
-    if (this.worker && this.activeModelId === modelId) {
-      await this.teardownIdleWorker({ ignoreTerminateErrors: false })
-      if (this.worker && this.activeModelId === modelId) {
-        throw new Error('voice_model_in_use')
-      }
-    }
-  }
-
-  private clearIdleTeardownTimer(): void {
-    if (this.idleTeardownTimer) {
-      clearTimeout(this.idleTeardownTimer)
-      this.idleTeardownTimer = null
-    }
-  }
-
-  private scheduleIdleTeardown(): void {
-    this.clearIdleTeardownTimer()
-    // Why: keep the native recognizer warm for repeated dictations, but release
-    // the ONNX model after a quiet period so long-running Orca sessions don't
-    // pin speech memory forever.
-    this.idleTeardownTimer = setTimeout(() => {
-      void this.teardownIdleWorker()
-    }, IDLE_WORKER_TEARDOWN_MS)
-    this.idleTeardownTimer.unref?.()
-  }
-
-  private async teardownIdleWorker(
-    options: { ignoreTerminateErrors?: boolean } = { ignoreTerminateErrors: true }
-  ): Promise<void> {
-    this.clearIdleTeardownTimer()
-    if (!this.worker || this.activeOwner || this.startingOwner) {
-      return
-    }
-    await this.teardownWorker(this.worker, options)
-  }
-
-  private async teardownWorker(
-    worker: Worker,
-    options: { ignoreTerminateErrors?: boolean } = { ignoreTerminateErrors: true }
-  ): Promise<void> {
-    this.clearIdleTeardownTimer()
-    if (this.stopInFlight?.worker === worker) {
-      await this.stopInFlight.promise
-    }
-    try {
-      worker.postMessage({ type: 'teardown' })
-    } catch {
-      // The worker may already have exited on a forced stop path.
-    }
-    this.cleanupActiveWorkerLifecycleListeners()
-    worker.removeAllListeners()
-    try {
-      await worker.terminate()
-    } catch (error) {
-      if (!options.ignoreTerminateErrors) {
-        throw error
-      }
-    }
-    if (this.worker === worker) {
-      this.worker = null
-      this.activeModelId = null
-      this.activeHotwordsFilePath = undefined
-      this.activeOwner = null
-      this.eventSink = null
-    }
-  }
-
-  private cleanupActiveWorkerLifecycleListeners(): void {
-    const cleanup = this.cleanupWorkerLifecycleListeners
-    this.cleanupWorkerLifecycleListeners = null
-    cleanup?.()
+  prepareModelForDeletion(modelId: string): Promise<void> {
+    return prepareSttModelForDeletion(this.state, modelId)
   }
 }
diff --git a/src/main/speech/stt-session-start.ts b/src/main/speech/stt-session-start.ts
new file mode 100644
index 00000000000..5377699b382
--- /dev/null
+++ b/src/main/speech/stt-session-start.ts
@@ -0,0 +1,164 @@
+import { Worker } from 'node:worker_threads'
+import { getCatalogModel } from './model-catalog'
+import { OpenAiTranscriptionSession } from './openai-transcription-client'
+import { readOpenAiSpeechApiKey } from './openai-api-key-store'
+import type { SttEventSink } from './stt-service'
+import type { SttSessionState } from './stt-session-state'
+import {
+  clearSttIdleTeardownTimer,
+  cleanupActiveSttWorkerLifecycleListeners,
+  handleSttWorkerFailure,
+  stopSttDictation,
+  teardownSttWorker
+} from './stt-session-stop'
+import { getSherpaModulePath, getSttWorkerPath } from './stt-worker-paths'
+import {
+  attachSttWorkerLifecycle,
+  initializeSttWorker,
+  waitForSttWorkerReady
+} from './stt-worker-startup'
+import { START_DICTATION_TIMEOUT_MS } from './stt-session-timeouts'
+
+export async function startSttDictation(
+  state: SttSessionState,
+  modelId: string,
+  sink: SttEventSink,
+  hotwordsFilePath?: string,
+  owner = 'desktop'
+): Promise<void> {
+  if (state.starting) {
+    if (state.startingOwner !== owner) {
+      throw new Error('dictation_already_active')
+    }
+    return
+  }
+  if ((state.worker || state.cloudSession) && state.activeOwner && state.activeOwner !== owner) {
+    throw new Error('dictation_already_active')
+  }
+  state.starting = true
+  state.startingOwner = owner
+  state.startingModelId = modelId
+  clearSttIdleTeardownTimer(state)
+
+  try {
+    await startSttSession(state, modelId, sink, hotwordsFilePath, owner)
+    if (state.canceledOwners.delete(owner)) {
+      await stopSttDictation(state, owner, { cancelStarting: false })
+      throw new Error('dictation_canceled')
+    }
+    state.activeOwner = owner
+  } finally {
+    state.starting = false
+    state.startingOwner = null
+    state.startingModelId = null
+    state.canceledOwners.delete(owner)
+  }
+}
+
+async function startSttSession(
+  state: SttSessionState,
+  modelId: string,
+  sink: SttEventSink,
+  hotwordsFilePath: string | undefined,
+  owner: string
+): Promise<void> {
+  const manifest = getCatalogModel(modelId)
+  if (!manifest) {
+    throw new Error(`Unknown model: ${modelId}`)
+  }
+
+  if (manifest.provider === 'openai') {
+    if (state.worker) {
+      const existingWorker = state.worker
+      await stopSttDictation(state, owner, { cancelStarting: false })
+      await teardownSttWorker(state, existingWorker)
+    }
+    const modelState = await state.modelManager.getModelState(modelId)
+    if (modelState.status !== 'ready') {
+      throw new Error(`Model not ready: ${modelState.status}`)
+    }
+    state.cloudSession = new OpenAiTranscriptionSession(modelId, readOpenAiSpeechApiKey)
+    state.activeModelId = modelId
+    state.activeHotwordsFilePath = undefined
+    state.eventSink = sink
+    sink({ type: 'ready' })
+    return
+  }
+
+  if (state.cloudSession) {
+    await stopSttDictation(state, owner, { cancelStarting: false })
+  }
+  const reusableWorker = state.worker
+  if (
+    reusableWorker &&
+    state.activeModelId === modelId &&
+    state.activeHotwordsFilePath === hotwordsFilePath &&
+    state.stopInFlight?.worker !== reusableWorker
+  ) {
+    if (!state.activeOwner) {
+      const modelState = await state.modelManager.getModelState(modelId)
+      if (modelState.status !== 'ready') {
+        await teardownSttWorker(state, reusableWorker)
+        throw new Error(`Model not ready: ${modelState.status}`)
+      }
+    }
+    if (
+      state.worker === reusableWorker &&
+      state.activeModelId === modelId &&
+      state.activeHotwordsFilePath === hotwordsFilePath &&
+      state.stopInFlight?.worker !== reusableWorker
+    ) {
+      state.eventSink = sink
+      sink({ type: 'ready' })
+      return
+    }
+  }
+
+  if (state.worker) {
+    const existingWorker = state.worker
+    await stopSttDictation(state, owner, { cancelStarting: false })
+    await teardownSttWorker(state, existingWorker)
+  }
+  const modelState = await state.modelManager.getModelState(modelId)
+  if (modelState.status !== 'ready') {
+    throw new Error(`Model not ready: ${modelState.status}`)
+  }
+
+  const worker = new Worker(getSttWorkerPath(), {
+    workerData: { sherpaModulePath: getSherpaModulePath() }
+  })
+  state.worker = worker
+  state.activeModelId = modelId
+  state.activeHotwordsFilePath = hotwordsFilePath
+  state.eventSink = sink
+
+  const readyPromise = waitForSttWorkerReady(worker, START_DICTATION_TIMEOUT_MS)
+  state.cleanupWorkerLifecycleListeners = attachSttWorkerLifecycle({
+    worker,
+    isCurrent: () => state.worker === worker,
+    onMessage: (event) => state.eventSink?.(event),
+    onError: (error) => handleSttWorkerFailure(state, error),
+    onExit: () => handleSttWorkerFailure(state)
+  })
+  initializeSttWorker(worker, {
+    modelDir: state.modelManager.getModelDir(modelId),
+    modelType: manifest.type,
+    streaming: manifest.streaming,
+    sampleRate: manifest.sampleRate,
+    files: manifest.files ?? [],
+    hotwordsFilePath,
+    modelingUnit: manifest.modelingUnit
+  })
+
+  try {
+    await readyPromise
+  } catch (error) {
+    cleanupActiveSttWorkerLifecycleListeners(state)
+    worker.removeAllListeners()
+    void worker.terminate()
+    if (state.worker === worker) {
+      handleSttWorkerFailure(state)
+    }
+    throw error
+  }
+}
diff --git a/src/main/speech/stt-session-state.ts b/src/main/speech/stt-session-state.ts
new file mode 100644
index 00000000000..f9054b41b8d
--- /dev/null
+++ b/src/main/speech/stt-session-state.ts
@@ -0,0 +1,48 @@
+import type { Worker } from 'node:worker_threads'
+import type { ModelManager } from './model-manager'
+import type { OpenAiTranscriptionSession } from './openai-transcription-client'
+import type { SttEventSink } from './stt-service'
+
+export type StopInFlight = {
+  worker: Worker
+  owner: string
+  promise: Promise<void>
+}
+
+export type SttSessionState = {
+  worker: Worker | null
+  cloudSession: OpenAiTranscriptionSession | null
+  modelManager: ModelManager
+  activeModelId: string | null
+  activeHotwordsFilePath: string | undefined
+  activeOwner: string | null
+  startingOwner: string | null
+  startingModelId: string | null
+  starting: boolean
+  canceledOwners: Set<string>
+  eventSink: SttEventSink | null
+  idleTeardownTimer: NodeJS.Timeout | null
+  stopInFlight: StopInFlight | null
+  stopping: boolean
+  cleanupWorkerLifecycleListeners: (() => void) | null
+}
+
+export function createSttSessionState(modelManager: ModelManager): SttSessionState {
+  return {
+    worker: null,
+    cloudSession: null,
+    modelManager,
+    activeModelId: null,
+    activeHotwordsFilePath: undefined,
+    activeOwner: null,
+    startingOwner: null,
+    startingModelId: null,
+    starting: false,
+    canceledOwners: new Set(),
+    eventSink: null,
+    idleTeardownTimer: null,
+    stopInFlight: null,
+    stopping: false,
+    cleanupWorkerLifecycleListeners: null
+  }
+}
diff --git a/src/main/speech/stt-session-stop.ts b/src/main/speech/stt-session-stop.ts
new file mode 100644
index 00000000000..f8f1893a493
--- /dev/null
+++ b/src/main/speech/stt-session-stop.ts
@@ -0,0 +1,197 @@
+import type { Worker } from 'node:worker_threads'
+import type { SttSessionState } from './stt-session-state'
+import { waitForSttWorkerStop, type SttWorkerStopOutcome } from './stt-worker-stop'
+import { IDLE_WORKER_TEARDOWN_MS } from './stt-session-timeouts'
+
+const STOP_DICTATION_TIMEOUT_MS = 60_000
+
+export async function stopSttDictation(
+  state: SttSessionState,
+  owner = 'desktop',
+  options: { cancelStarting?: boolean } = { cancelStarting: true }
+): Promise<void> {
+  if (options.cancelStarting !== false && state.startingOwner === owner) {
+    state.canceledOwners.add(owner)
+  }
+  if (!state.worker && !state.cloudSession) {
+    return
+  }
+  const currentOwner = state.activeOwner ?? state.startingOwner
+  if (currentOwner && currentOwner !== owner) {
+    throw new Error('dictation_owner_mismatch')
+  }
+
+  if (state.cloudSession) {
+    state.stopping = true
+    try {
+      const session = state.cloudSession
+      state.cloudSession = null
+      try {
+        const text = await session.finish()
+        if (text) {
+          state.eventSink?.({ type: 'final', text })
+        }
+      } catch (error) {
+        state.eventSink?.({
+          type: 'error',
+          error: error instanceof Error ? error.message : String(error)
+        })
+      } finally {
+        state.eventSink?.({ type: 'stopped' })
+        state.activeModelId = null
+        state.activeHotwordsFilePath = undefined
+        state.activeOwner = null
+        state.eventSink = null
+      }
+    } finally {
+      state.stopping = false
+    }
+    return
+  }
+
+  const worker = state.worker
+  if (!worker) {
+    return
+  }
+  if (state.stopInFlight?.worker === worker) {
+    if (state.stopInFlight.owner !== owner) {
+      throw new Error('dictation_owner_mismatch')
+    }
+    return state.stopInFlight.promise
+  }
+
+  const capturedSink = state.eventSink
+  let stopPromise!: Promise<void>
+  stopPromise = waitForSttWorkerStop({
+    worker,
+    capturedSink,
+    timeoutMs: STOP_DICTATION_TIMEOUT_MS,
+    finish: (outcome) => finishSttWorkerStop(state, worker, outcome)
+  }).finally(() => {
+    if (state.stopInFlight?.worker === worker && state.stopInFlight.promise === stopPromise) {
+      state.stopInFlight = null
+    }
+  })
+  state.stopInFlight = { worker, owner, promise: stopPromise }
+  state.stopping = true
+  try {
+    worker.postMessage({ type: 'stop' })
+    await stopPromise
+  } finally {
+    state.stopping = false
+  }
+}
+
+function finishSttWorkerStop(
+  state: SttSessionState,
+  worker: Worker,
+  outcome: SttWorkerStopOutcome
+): void {
+  if (outcome === 'stopped') {
+    if (state.worker === worker) {
+      state.activeOwner = null
+      state.eventSink = null
+      scheduleSttIdleTeardown(state)
+    }
+    return
+  }
+  cleanupActiveSttWorkerLifecycleListeners(state)
+  worker.removeAllListeners()
+  if (outcome !== 'exit') {
+    void worker.terminate().catch(() => undefined)
+  }
+  if (state.worker === worker) {
+    clearSttWorkerState(state)
+  }
+}
+
+export async function prepareSttModelForDeletion(
+  state: SttSessionState,
+  modelId: string
+): Promise<void> {
+  if (state.startingModelId === modelId || (state.activeOwner && state.activeModelId === modelId)) {
+    throw new Error('voice_model_in_use')
+  }
+  if (state.worker && state.activeModelId === modelId) {
+    await teardownIdleSttWorker(state, { ignoreTerminateErrors: false })
+    if (state.worker && state.activeModelId === modelId) {
+      throw new Error('voice_model_in_use')
+    }
+  }
+}
+
+export function clearSttIdleTeardownTimer(state: SttSessionState): void {
+  if (state.idleTeardownTimer) {
+    clearTimeout(state.idleTeardownTimer)
+    state.idleTeardownTimer = null
+  }
+}
+
+function scheduleSttIdleTeardown(state: SttSessionState): void {
+  clearSttIdleTeardownTimer(state)
+  state.idleTeardownTimer = setTimeout(() => {
+    void teardownIdleSttWorker(state)
+  }, IDLE_WORKER_TEARDOWN_MS)
+  state.idleTeardownTimer.unref?.()
+}
+
+async function teardownIdleSttWorker(
+  state: SttSessionState,
+  options: { ignoreTerminateErrors?: boolean } = { ignoreTerminateErrors: true }
+): Promise<void> {
+  clearSttIdleTeardownTimer(state)
+  if (!state.worker || state.activeOwner || state.startingOwner) {
+    return
+  }
+  await teardownSttWorker(state, state.worker, options)
+}
+
+export async function teardownSttWorker(
+  state: SttSessionState,
+  worker: Worker,
+  options: { ignoreTerminateErrors?: boolean } = { ignoreTerminateErrors: true }
+): Promise<void> {
+  clearSttIdleTeardownTimer(state)
+  if (state.stopInFlight?.worker === worker) {
+    await state.stopInFlight.promise
+  }
+  try {
+    worker.postMessage({ type: 'teardown' })
+  } catch {
+    // The worker may already have exited on a forced stop path.
+  }
+  cleanupActiveSttWorkerLifecycleListeners(state)
+  worker.removeAllListeners()
+  try {
+    await worker.terminate()
+  } catch (error) {
+    if (!options.ignoreTerminateErrors) {
+      throw error
+    }
+  }
+  if (state.worker === worker) {
+    clearSttWorkerState(state)
+  }
+}
+
+export function handleSttWorkerFailure(state: SttSessionState, error?: Error): void {
+  if (error) {
+    state.eventSink?.({ type: 'error', error: String(error) })
+  }
+  cleanupActiveSttWorkerLifecycleListeners(state)
+  clearSttWorkerState(state)
+}
+
+export function cleanupActiveSttWorkerLifecycleListeners(state: SttSessionState): void {
+  const cleanup = state.cleanupWorkerLifecycleListeners
+  state.cleanupWorkerLifecycleListeners = null
+  cleanup?.()
+}
+
+function clearSttWorkerState(state: SttSessionState): void {
+  state.worker = null
+  state.activeModelId = null
+  state.activeHotwordsFilePath = undefined
+  state.activeOwner = null
+  state.eventSink = null
+}
diff --git a/src/main/speech/stt-session-timeouts.ts b/src/main/speech/stt-session-timeouts.ts
new file mode 100644
index 00000000000..75dfddb845f
--- /dev/null
+++ b/src/main/speech/stt-session-timeouts.ts
@@ -0,0 +1,3 @@
+/** Single source for the dictation timeouts the start and stop paths share. */
+export const START_DICTATION_TIMEOUT_MS = 60_000
+export const IDLE_WORKER_TEARDOWN_MS = 60 * 60 * 1000
diff --git a/src/main/speech/stt-worker-startup.ts b/src/main/speech/stt-worker-startup.ts
new file mode 100644
index 00000000000..18653da1bd5
--- /dev/null
+++ b/src/main/speech/stt-worker-startup.ts
@@ -0,0 +1,97 @@
+import type { Worker } from 'node:worker_threads'
+import type { SttEvent } from './stt-service'
+
+export function waitForSttWorkerReady(worker: Worker, timeoutMs: number): Promise<void> {
+  const { promise, resolve, reject } = Promise.withResolvers<void>()
+  let settled = false
+  let startupTimeout: ReturnType<typeof setTimeout> | null = null
+  const cleanup = (): void => {
+    if (startupTimeout) {
+      clearTimeout(startupTimeout)
+      startupTimeout = null
+    }
+    worker.off('message', onReadyOrError)
+    worker.off('error', onStartupError)
+    worker.off('exit', onStartupExit)
+  }
+  const failStartup = (error: Error): void => {
+    if (settled) {
+      return
+    }
+    settled = true
+    cleanup()
+    reject(error)
+  }
+  const onReadyOrError = (message: { type: string; error?: string }): void => {
+    if (settled) {
+      return
+    }
+    if (message.type === 'ready') {
+      settled = true
+      cleanup()
+      resolve()
+    } else if (message.type === 'error') {
+      failStartup(new Error(message.error ?? 'Speech worker failed to initialize'))
+    }
+  }
+  const onStartupError = (error: Error): void => failStartup(error)
+  const onStartupExit = (code: number): void => {
+    failStartup(new Error(`Speech worker exited before ready: ${code}`))
+  }
+  worker.on('message', onReadyOrError)
+  worker.on('error', onStartupError)
+  worker.on('exit', onStartupExit)
+  startupTimeout = setTimeout(
+    () => failStartup(new Error('Speech worker timed out while starting.')),
+    timeoutMs
+  )
+  startupTimeout.unref?.()
+  return promise
+}
+
+export function attachSttWorkerLifecycle(args: {
+  worker: Worker
+  isCurrent: () => boolean
+  onMessage: (event: SttEvent) => void
+  onError: (error: Error) => void
+  onExit: () => void
+}): () => void {
+  const onWorkerMessage = (event: SttEvent): void => {
+    if (args.isCurrent()) {
+      args.onMessage(event)
+    }
+  }
+  const onWorkerError = (error: Error): void => {
+    if (args.isCurrent()) {
+      args.onError(error)
+    }
+  }
+  const onWorkerExit = (): void => {
+    if (args.isCurrent()) {
+      args.onExit()
+    }
+  }
+  args.worker.on('message', onWorkerMessage)
+  args.worker.on('error', onWorkerError)
+  args.worker.on('exit', onWorkerExit)
+  return () => {
+    args.worker.off('message', onWorkerMessage)
+    args.worker.off('error', onWorkerError)
+    args.worker.off('exit', onWorkerExit)
+  }
+}
+
+export function initializeSttWorker(
+  worker: Worker,
+  input: {
+    modelDir: string
+    modelType: string
+    streaming: boolean
+    sampleRate: number
+    files: readonly string[]
+    hotwordsFilePath?: string
+    modelingUnit?: string
+  }
+): void {
+  worker.postMessage({ type: 'init', ...input })
+}
diff --git a/src/main/startup/desktop-startup-ordering.test.ts b/src/main/startup/desktop-startup-ordering.test.ts
index 9c26b12292d..b80d7adee41 100644
--- a/src/main/startup/desktop-startup-ordering.test.ts
+++ b/src/main/startup/desktop-startup-ordering.test.ts
@@ -121,6 +121,7 @@ describe('startup ordering', () => {
     expect(desktopStartup).toContain(
       'openWindow: () => openMainWindow({ revealOnDidFinishLoad: true })'
     )
+    expect(desktopStartup).toContain('bindServices: bindTerminalRuntimeStartupServices')
     expect(desktopStartup).toContain('shellPathReady,')
     expect(desktopStartup).toContain('startServices: startTerminalRuntimeStartupServices')
     expect(barrier).toContain('managedWslCliStartupBarrierReady')
diff --git a/src/main/startup/headless-pty-hydration-ordering.test.ts b/src/main/startup/headless-pty-hydration-ordering.test.ts
new file mode 100644
index 00000000000..2263cdbf94f
--- /dev/null
+++ b/src/main/startup/headless-pty-hydration-ordering.test.ts
@@ -0,0 +1,52 @@
+import { readFileSync } from 'node:fs'
+import { join } from 'node:path'
+import { describe, expect, it } from 'vitest'
+
+describe('headless PTY registry hydration ordering', () => {
+  it('uses exactly one deferred-or-immediate desktop hydration path', () => {
+    const source = readFileSync(
+      join(process.cwd(), 'src/main/window/attach-main-window-services.ts'),
+      'utf8'
+    )
+    const start = source.indexOf('const localPtyProviderStartupReady =')
+    const end = source.indexOf('registerSshHandlers(', start)
+    const hydration = source.slice(start, end)
+
+    expect(start).toBeGreaterThanOrEqual(0)
+    expect(end).toBeGreaterThan(start)
+    expect(hydration).toContain('if (localPtyProviderStartupReady)')
+    expect(hydration).toContain('.then(() => hydrateLocalPtyRegistryAtBoot(store))')
+    expect(hydration).toContain('} else {\n    void hydrateLocalPtyRegistryAtBoot(store)')
+    expect(hydration.match(/hydrateLocalPtyRegistryAtBoot\(store\)/g)).toHaveLength(2)
+  })
+
+  it('hydrates Electron serve after provider and handler readiness but before RPC', () => {
+    const source = readFileSync(join(process.cwd(), 'src/main/index.ts'), 'utf8')
+    const serve = source.indexOf('if (serveOptions) {')
+    const provider = source.indexOf('await localPtyProviderStartupReady', serve)
+    const handlersAndHydration = source.indexOf('await registerHeadlessPtyRuntime(', provider)
+    const rpc = source.indexOf('await runtimeRpc.start()', handlersAndHydration)
+    const readiness = source.indexOf('await printServeReady(serveOptions)', rpc)
+
+    expect(serve).toBeGreaterThanOrEqual(0)
+    expect(provider).toBeGreaterThan(serve)
+    expect(handlersAndHydration).toBeGreaterThan(provider)
+    expect(rpc).toBeGreaterThan(handlersAndHydration)
+    expect(readiness).toBeGreaterThan(rpc)
+  })
+
+  it('hydrates orcad after Store and daemon readiness but before RPC and publication', () => {
+    const source = readFileSync(join(process.cwd(), 'src/main/orcad/orcad-entry.ts'), 'utf8')
+    const store = source.indexOf('const store = new Store(')
+    const daemon = source.indexOf('await startOrcadDaemon()', store)
+    const handlersAndHydration = source.indexOf('await registerHeadlessPtyRuntime(', daemon)
+    const rpc = source.indexOf('await rpc.start()', handlersAndHydration)
+    const readiness = source.indexOf('await new ServeReadinessPublisher().publish(', rpc)
+
+    expect(store).toBeGreaterThanOrEqual(0)
+    expect(daemon).toBeGreaterThan(store)
+    expect(handlersAndHydration).toBeGreaterThan(daemon)
+    expect(rpc).toBeGreaterThan(handlersAndHydration)
+    expect(readiness).toBeGreaterThan(rpc)
+  })
+})
diff --git a/src/main/startup/serve-desktop-activation-wiring.test.ts b/src/main/startup/serve-desktop-activation-wiring.test.ts
index 239a7618567..0aea295c657 100644
--- a/src/main/startup/serve-desktop-activation-wiring.test.ts
+++ b/src/main/startup/serve-desktop-activation-wiring.test.ts
@@ -21,12 +21,19 @@ describe('serve desktop activation wiring', () => {
     )
     const serveIndex = source.indexOf('if (serveOptions) {', appReadyIndex)
     const ptyReadyIndex = source.indexOf('await localPtyStartupReady', serveIndex)
-    const headlessRegistrationIndex = source.indexOf('registerHeadlessPtyRuntime(', serveIndex)
+    const providerReadyIndex = source.indexOf('await localPtyProviderStartupReady', serveIndex)
+    const headlessRegistrationIndex = source.indexOf(
+      'await registerHeadlessPtyRuntime(',
+      serveIndex
+    )
+    const rpcIndex = source.indexOf('await runtimeRpc.start()', serveIndex)
 
     expect(startupIndex).toBeGreaterThanOrEqual(0)
     expect(startupIndex).toBeLessThan(serveIndex)
     expect(ptyReadyIndex).toBeGreaterThan(serveIndex)
-    expect(headlessRegistrationIndex).toBeGreaterThan(ptyReadyIndex)
+    expect(providerReadyIndex).toBeGreaterThan(ptyReadyIndex)
+    expect(headlessRegistrationIndex).toBeGreaterThan(providerReadyIndex)
+    expect(headlessRegistrationIndex).toBeLessThan(rpcIndex)
     expect(source).not.toContain(
       'if (!isServeMode) {\n    startDesktopFirstWindowStartupServices()'
     )
diff --git a/src/main/startup/windows-desktop-shell-path-startup.test.ts b/src/main/startup/windows-desktop-shell-path-startup.test.ts
index 3778e0b2688..d38b24aa05e 100644
--- a/src/main/startup/windows-desktop-shell-path-startup.test.ts
+++ b/src/main/startup/windows-desktop-shell-path-startup.test.ts
@@ -10,6 +10,29 @@ function deferred(): { promise: Promise<void>; resolve: () => void } {
 }
 
 describe('Windows desktop shell PATH startup', () => {
+  it('binds the services promise before opening the window while shell PATH is unresolved', () => {
+    const shellPath = deferred()
+    const events: string[] = []
+    const bindServices = vi.fn(() => events.push('bind'))
+    const openWindow = vi.fn(() => events.push('open'))
+    const options = {
+      bindServices,
+      openWindow,
+      shellPathReady: shellPath.promise,
+      startServices: vi.fn(() => ({
+        firstWindowReady: Promise.resolve(),
+        localPtyReady: Promise.resolve(),
+        localPtyProviderReady: Promise.resolve()
+      }))
+    }
+
+    startWindowsDesktopBeforeShellPathReady(options)
+
+    expect(events).toEqual(['bind', 'open'])
+    expect(bindServices).toHaveBeenCalledOnce()
+    expect(options.startServices).not.toHaveBeenCalled()
+  })
+
   it('opens the first window while shell PATH hydration remains unresolved', async () => {
     const shellPath = deferred()
     const window = { visible: true }
@@ -21,6 +44,7 @@ describe('Windows desktop shell PATH startup', () => {
     }))
 
     const startup = startWindowsDesktopBeforeShellPathReady({
+      bindServices: vi.fn(),
       openWindow,
       shellPathReady: shellPath.promise,
       startServices
diff --git a/src/main/startup/windows-desktop-shell-path-startup.ts b/src/main/startup/windows-desktop-shell-path-startup.ts
index 3933a79b64b..3fda3fad168 100644
--- a/src/main/startup/windows-desktop-shell-path-startup.ts
+++ b/src/main/startup/windows-desktop-shell-path-startup.ts
@@ -5,6 +5,7 @@ export type WindowsDesktopStartupServices = {
 }
 
 type WindowsDesktopShellPathStartupOptions<TWindow> = {
+  bindServices: (services: Promise<WindowsDesktopStartupServices>) => void
   openWindow: () => TWindow
   shellPathReady: Promise<void>
   startServices: () => WindowsDesktopStartupServices
@@ -14,5 +15,6 @@ export function startWindowsDesktopBeforeShellPathReady<TWindow>(
   options: WindowsDesktopShellPathStartupOptions<TWindow>
 ): { window: TWindow; services: Promise<WindowsDesktopStartupServices> } {
   const services = options.shellPathReady.then(options.startServices)
+  options.bindServices(services)
   return { window: options.openWindow(), services }
 }
diff --git a/src/main/window/attach-main-window-services.test.ts b/src/main/window/attach-main-window-services.test.ts
index 8a340d840ec..ae83f5b7712 100644
--- a/src/main/window/attach-main-window-services.test.ts
+++ b/src/main/window/attach-main-window-services.test.ts
@@ -271,8 +271,8 @@ describe('attachMainWindowServices', () => {
     expect(mainWindow.webContents.reload).toHaveBeenCalledTimes(1)
   })
 
-  it('retries local PTY registry hydration after local startup services are ready', async () => {
-    const localStartup = deferred()
+  it('hydrates once after the local PTY provider barrier resolves', async () => {
+    const providerStartup = deferred()
     const store = createStore()
 
     attachMainWindowServices(
@@ -281,18 +281,17 @@ describe('attachMainWindowServices', () => {
       createRuntime() as never,
       undefined,
       undefined,
-      { awaitLocalPtyStartup: () => localStartup.promise }
+      { awaitLocalPtyProviderStartup: () => providerStartup.promise }
     )
 
-    expect(hydrateLocalPtyRegistryAtBootMock).toHaveBeenCalledTimes(1)
-    expect(hydrateLocalPtyRegistryAtBootMock).toHaveBeenCalledWith(store)
+    expect(hydrateLocalPtyRegistryAtBootMock).not.toHaveBeenCalled()
 
-    localStartup.resolve()
-    await localStartup.promise
+    providerStartup.resolve()
+    await providerStartup.promise
     await Promise.resolve()
 
-    expect(hydrateLocalPtyRegistryAtBootMock).toHaveBeenCalledTimes(2)
-    expect(hydrateLocalPtyRegistryAtBootMock).toHaveBeenLastCalledWith(store)
+    expect(hydrateLocalPtyRegistryAtBootMock).toHaveBeenCalledOnce()
+    expect(hydrateLocalPtyRegistryAtBootMock).toHaveBeenCalledWith(store)
   })
 
   it('passes injected update quit cleanup to the auto-updater', async () => {
diff --git a/src/main/window/attach-main-window-services.ts b/src/main/window/attach-main-window-services.ts
index ce62a6d3da4..128ff2e0e4e 100644
--- a/src/main/window/attach-main-window-services.ts
+++ b/src/main/window/attach-main-window-services.ts
@@ -1,13 +1,6 @@
-/* eslint-disable max-lines -- Why: this file is the central main-window IPC wiring point; splitting it during the mobile release compatibility rebase would increase release risk. */
-import { randomUUID } from 'node:crypto'
-
-import { app, ipcMain } from 'electron'
+import { ipcMain } from 'electron'
 import type { BrowserWindow, IpcMainInvokeEvent } from 'electron'
 import type { Store } from '../persistence'
-import type { ReleaseBuildListResult, UpdateCheckOptions } from '../../shared/update-status-types'
-import type { CreateWorktreeResult } from '../../shared/worktree/create-types'
-import type { WorktreeStartupLaunch } from '../../shared/worktree/launch-types'
-import { RELEASE_CHANNELS, type ReleaseChannel } from '../../shared/release-channel'
 import {
   acknowledgePendingTccPromptNotice,
   consumePendingTccPromptNotice,
@@ -32,60 +25,27 @@ import { registerRemoteWorkspaceHandlers } from '../ipc/remote-workspace'
 import { browserManager } from '../browser/browser-manager'
 import { hasSystemMediaAccess, requestSystemMediaAccess } from '../browser/browser-media-access'
 import type { OrcaRuntimeService, RuntimeWorktreeLifecycleEvent } from '../runtime/orca-runtime'
-import {
-  checkForUpdatesFromMenu,
-  downloadUpdate,
-  getLinuxPackageInstallInstructions,
-  getUpdateStatus,
-  quitAndInstall,
-  setupAutoUpdater,
-  showLinuxPackage,
-  dismissAvailableUpdate,
-  dismissNudge,
-  listAvailableReleaseBuilds,
-  type UpdateInstallMode
-} from '../updater'
-import { isTrustedUIRenderer } from '../ipc/ui'
+import type { UpdateInstallMode } from '../updater'
 import { scheduleHistoryGc } from '../terminal-history-gc'
 import { hydrateLocalPtyRegistryAtBoot } from '../memory/hydrate-local-pty-registry'
 import type { ClaudeRuntimeAuthPreparation } from '../claude-accounts/runtime-auth-service'
 import { getKnownWorktreeIdsForHistoryGc } from './history-gc-worktree-ids'
-import type {
-  RuntimeMarkdownReadTabResult,
-  RuntimeMarkdownSaveTabResult
-} from '../../shared/mobile-markdown-document'
-import type { RuntimeMobileSessionTabMove } from '../../shared/runtime-types'
-import type { TerminalTabCreateReply } from '../../shared/terminal-reveal-identity'
 import { isNativeFileDropPayload, type NativeFileDropPayload } from '../../shared/native-file-drop'
-import { requestMobileMarkdownFromRenderer } from './mobile-markdown-request-relay'
-import { requestSessionTabCloseFromRenderer } from './session-tab-close-request-relay'
-import { requestTerminalTabCloseFromRenderer } from './terminal-tab-close-request-relay'
 import type { ClaudeAccountSelectionTarget } from '../claude-accounts/runtime-selection'
-import { runWorktreeChangeInvalidators } from '../ipc/worktree-change-invalidators'
 import {
   scheduleWorktreeBaseDirectoryWatcherSync,
   setWorktreeBaseDirectoryWatcherSyncContext
 } from '../ipc/worktree-base-directory-watcher'
 import { startFolderRepoGitUpgradeWatch } from '../ipc/folder-repo-git-upgrade'
-import { logStartupMilestone } from '../startup/startup-diagnostics'
-import { createRuntimeRendererNotificationSender } from './runtime-renderer-notification-sender'
-import { registerRendererDocumentNavigation } from './renderer-document-navigation'
+import { scheduleMainWindowAutoUpdaterSetup } from './main-window-updater'
+import { registerRuntimeWindowLifecycle } from './runtime-window-lifecycle'
 
-const UPDATER_SETUP_FALLBACK_MS = 15_000
-
-// Why: a manual check can arrive before deferred setup runs, so entry points force this pending setup to configure the updater first.
-let pendingAutoUpdaterSetup: (() => void) | null = null
-
-export function ensureAutoUpdaterConfigured(): void {
-  pendingAutoUpdaterSetup?.()
-}
+export { ensureAutoUpdaterConfigured, registerUpdaterHandlers } from './main-window-updater'
 
 let appReloadHandlerTokenCounter = 0
 let activeAppReloadHandlerToken: number | null = null
 let tccPromptHandlerTokenCounter = 0
 let activeTccPromptHandlerToken: number | null = null
-let runtimeNotifierTokenCounter = 0
-let activeRuntimeNotifierToken: number | null = null
 
 export function attachMainWindowServices(
   mainWindow: BrowserWindow,
@@ -146,11 +106,9 @@ export function attachMainWindowServices(
   scheduleHistoryGc(async () => {
     return getKnownWorktreeIdsForHistoryGc(store)
   })
-  // Why: daemon PTYs survive renderer restarts, so at boot they're unregistered; hydrate so they aren't mislabeled REMOTE (idempotent, safe to re-run).
-  void hydrateLocalPtyRegistryAtBoot(store)
-  const localPtyStartupReady = options?.awaitLocalPtyStartup?.()
-  if (localPtyStartupReady) {
-    void localPtyStartupReady
+  const localPtyProviderStartupReady = options?.awaitLocalPtyProviderStartup?.()
+  if (localPtyProviderStartupReady) {
+    void localPtyProviderStartupReady
       .then(() => hydrateLocalPtyRegistryAtBoot(store))
       .catch((error) => {
         console.warn(
@@ -158,52 +116,14 @@ export function attachMainWindowServices(
           error instanceof Error ? error.message : String(error)
         )
       })
+  } else {
+    void hydrateLocalPtyRegistryAtBoot(store)
   }
   registerSshHandlers(store, () => mainWindow, runtime)
   registerRemoteWorkspaceHandlers(store, () => mainWindow)
   registerFileDropRelay(mainWindow)
   registerTccPromptNoticeHandlers(mainWindow)
-  // Why: setupAutoUpdater sync-require()s electron-updater (slow on cold Windows w/ Defender, #7225), so defer past first paint; timer fallback covers crash-looping renderers.
-  let updaterSetupDone = false
-  const setupAutoUpdaterDeferred = (): void => {
-    if (updaterSetupDone || mainWindow.isDestroyed()) {
-      return
-    }
-    updaterSetupDone = true
-    setupAutoUpdater(mainWindow, {
-      getLastUpdateCheckAt: () => store.getUI().lastUpdateCheckAt,
-      onBeforeQuit: async () => {
-        try {
-          await options?.onBeforeUpdateQuit?.()
-        } finally {
-          await store.flushPendingAsync()
-        }
-      },
-      setLastUpdateCheckAt: (timestamp) => {
-        store.updateUI({ lastUpdateCheckAt: timestamp })
-      },
-      getPendingUpdateNudgeId: () => store.getUI().pendingUpdateNudgeId ?? null,
-      getDismissedUpdateNudgeId: () => store.getUI().dismissedUpdateNudgeId ?? null,
-      setPendingUpdateNudgeId: (id) => {
-        // Why: only the apply branch also nulls dismissedUpdateVersion so relaunch can't resurrect the old hidden card; clearing must not, or it un-dismisses.
-        if (id) {
-          store.updateUI({ pendingUpdateNudgeId: id, dismissedUpdateVersion: null })
-        } else {
-          store.updateUI({ pendingUpdateNudgeId: null })
-        }
-      },
-      setDismissedUpdateNudgeId: (id) => {
-        store.updateUI({ dismissedUpdateNudgeId: id })
-      },
-      getReleaseChannelOverride: () => store.getUI().releaseChannelOverride ?? null,
-      installMode: options?.updateInstallMode
-    })
-    logStartupMilestone('updater-setup-done')
-  }
-  pendingAutoUpdaterSetup = setupAutoUpdaterDeferred
-  mainWindow.once('ready-to-show', () => setImmediate(setupAutoUpdaterDeferred))
-  const updaterSetupFallback = setTimeout(setupAutoUpdaterDeferred, UPDATER_SETUP_FALLBACK_MS)
-  updaterSetupFallback.unref?.()
+  scheduleMainWindowAutoUpdaterSetup(mainWindow, store, options)
   registerRuntimeWindowLifecycle(mainWindow, runtime)
 
   const allowedPermissions = new Set(['media', 'fullscreen', 'pointerLock'])
@@ -321,223 +241,6 @@ function registerAppReloadHandler(
   })
 }
 
-function registerRuntimeWindowLifecycle(
-  mainWindow: BrowserWindow,
-  runtime: OrcaRuntimeService
-): void {
-  const notifierToken = ++runtimeNotifierTokenCounter
-  activeRuntimeNotifierToken = notifierToken
-  runtime.attachWindow(mainWindow.id)
-  const mainWebContents = mainWindow.webContents
-  const rendererNotifications = createRuntimeRendererNotificationSender({
-    isWindowDestroyed: () => mainWindow.isDestroyed(),
-    webContents: mainWebContents,
-    onFailure: (reason) => runtime.markGraphReloadFailed(mainWindow.id, reason)
-  })
-  const send = rendererNotifications.send
-  runtime.setNotifier({
-    worktreesChanged: (repoId, renamed) => {
-      // Why: clear scan caches before the renderer handles this event, so it can't read stale TTL entries after a mutation.
-      runWorktreeChangeInvalidators(repoId)
-      send('worktrees:changed', renamed ? { repoId, renamed } : { repoId })
-    },
-    worktreeBaseStatus: (event) => send('worktree:baseStatus', event),
-    worktreeRemoteBranchConflict: (event) => send('worktree:remoteBranchConflict', event),
-    reposChanged: () => send('repos:changed'),
-    automationsChanged: (payload) => send('automations:changed', payload),
-    activateWorktree: (
-      repoId,
-      worktreeId,
-      setup?: CreateWorktreeResult['setup'],
-      startup?: WorktreeStartupLaunch,
-      defaultTabs?: CreateWorktreeResult['defaultTabs']
-    ) => {
-      send('ui:activateWorktree', {
-        repoId,
-        worktreeId,
-        ...(setup ? { setup } : {}),
-        ...(startup ? { startup } : {}),
-        ...(defaultTabs ? { defaultTabs } : {})
-      })
-    },
-    createTerminal: (worktreeId, opts) =>
-      send('ui:createTerminal', {
-        worktreeId,
-        command: opts.command,
-        ...(opts.cwd ? { cwd: opts.cwd } : {}),
-        ...(opts.env ? { env: opts.env } : {}),
-        title: opts.title,
-        ...(opts.presentation ? { presentation: opts.presentation } : {})
-      }),
-    revealTerminalSession: (worktreeId, opts) =>
-      new Promise((resolve, reject) => {
-        const requestId = randomUUID()
-        const expectedIdentity = opts.expectedProcessIdentity
-          ? opts.tabId && opts.leafId
-            ? { worktreeId, tabId: opts.tabId, leafId: opts.leafId, ptyId: opts.ptyId }
-            : null
-          : undefined
-        if (expectedIdentity === null) {
-          reject(new Error('terminal_reveal_identity_required'))
-          return
-        }
-        const timer = setTimeout(() => {
-          ipcMain.removeListener('terminal:tabCreateReply', handler)
-          reject(new Error('Terminal reveal timed out'))
-        }, 10_000)
-        const handler = (event: Electron.IpcMainEvent, reply: TerminalTabCreateReply): void => {
-          // Why: requestId is renderer-supplied, so only the targeted main window may satisfy the reveal.
-          if (event.sender !== mainWindow.webContents || reply.requestId !== requestId) {
-            return
-          }
-          clearTimeout(timer)
-          ipcMain.removeListener('terminal:tabCreateReply', handler)
-          if (reply.error) {
-            reject(new Error(reply.error))
-            return
-          }
-          if (
-            expectedIdentity &&
-            (!reply.identity ||
-              reply.identity.worktreeId !== expectedIdentity.worktreeId ||
-              reply.identity.tabId !== expectedIdentity.tabId ||
-              reply.identity.leafId !== expectedIdentity.leafId ||
-              reply.identity.ptyId !== expectedIdentity.ptyId)
-          ) {
-            reject(new Error('terminal_reveal_identity_mismatch'))
-            return
-          }
-          resolve({
-            tabId: reply.tabId!,
-            title: reply.title,
-            ...(reply.identity ? { identity: reply.identity } : {})
-          })
-        }
-        ipcMain.on('terminal:tabCreateReply', handler)
-        const sent = send('ui:createTerminal', {
-          requestId,
-          worktreeId,
-          ptyId: opts.ptyId,
-          title: opts.title ?? undefined,
-          ...(opts.cwd ? { cwd: opts.cwd } : {}),
-          ...(opts.launchConfig ? { launchConfig: opts.launchConfig } : {}),
-          ...(opts.launchToken ? { launchToken: opts.launchToken } : {}),
-          ...(opts.launchAgent ? { launchAgent: opts.launchAgent } : {}),
-          ...(opts.viewMode ? { viewMode: opts.viewMode } : {}),
-          activate: opts.activate !== false,
-          ...(opts.presentation ? { presentation: opts.presentation } : {}),
-          ...(opts.surfaceOwner === false ? { surfaceOwner: false } : {}),
-          // Why: pre-minted tabId aligns the renderer tab id with the paneKey baked into the PTY env, so hook events route right.
-          ...(opts.tabId !== undefined ? { tabId: opts.tabId } : {}),
-          ...(opts.leafId !== undefined ? { leafId: opts.leafId } : {}),
-          ...(opts.splitFromLeafId !== undefined ? { splitFromLeafId: opts.splitFromLeafId } : {}),
-          ...(opts.splitDirection !== undefined ? { splitDirection: opts.splitDirection } : {}),
-          ...(opts.splitTelemetrySource !== undefined
-            ? { splitTelemetrySource: opts.splitTelemetrySource }
-            : {}),
-          ...(opts.focus !== undefined ? { focus: opts.focus } : {})
-        })
-        if (!sent) {
-          clearTimeout(timer)
-          ipcMain.removeListener('terminal:tabCreateReply', handler)
-          reject(new Error('runtime_unavailable'))
-        }
-      }),
-    resolveLegacyWorkerTerminalRecovery: (paneKey, resolution, ptyId) =>
-      send('agentStatus:legacyWorkerTerminalRecovery', {
-        paneKey,
-        resolution,
-        ...(ptyId ? { ptyId } : {})
-      }),
-    splitTerminal: (tabId, paneRuntimeId, opts) => {
-      send('ui:splitTerminal', {
-        tabId,
-        paneRuntimeId,
-        direction: opts.direction,
-        command: opts.command,
-        telemetrySource: opts.telemetrySource
-      })
-    },
-    renameTerminal: (tabId, title) => send('ui:renameTerminal', { tabId, title }),
-    focusTerminal: (tabId, worktreeId, leafId) =>
-      send('ui:focusTerminal', { tabId, worktreeId, leafId }),
-    focusEditorTab: (tabId, worktreeId) => send('ui:focusEditorTab', { tabId, worktreeId }),
-    closeSessionTab: (tabId, worktreeId) =>
-      requestSessionTabCloseFromRenderer(mainWindow, tabId, worktreeId),
-    moveSessionTab: (worktreeId: string, move: RuntimeMobileSessionTabMove) =>
-      send('ui:moveSessionTab', { worktreeId, ...move }),
-    openFile: (worktreeId, filePath, relativePath, runtimeEnvironmentId?) =>
-      send('ui:openFileFromMobile', {
-        worktreeId,
-        filePath,
-        relativePath,
-        runtimeEnvironmentId
-      }),
-    openDiff: (worktreeId, filePath, relativePath, staged, runtimeEnvironmentId?) =>
-      send('ui:openDiffFromMobile', {
-        worktreeId,
-        filePath,
-        relativePath,
-        staged,
-        runtimeEnvironmentId
-      }),
-    readMobileMarkdownTab: (worktreeId, tabId) =>
-      requestMobileMarkdownFromRenderer(mainWindow, {
-        operation: 'read',
-        worktreeId,
-        tabId
-      }) as Promise<RuntimeMarkdownReadTabResult>,
-    saveMobileMarkdownTab: (worktreeId, tabId, baseVersion, content) =>
-      requestMobileMarkdownFromRenderer(mainWindow, {
-        operation: 'save',
-        worktreeId,
-        tabId,
-        baseVersion,
-        content
-      }) as Promise<RuntimeMarkdownSaveTabResult>,
-    closeTerminal: (tabId, paneRuntimeId) => send('ui:closeTerminal', { tabId, paneRuntimeId }),
-    closeTerminalTab: (tabId, options) =>
-      requestTerminalTabCloseFromRenderer(mainWindow, tabId, options),
-    sleepWorktree: (worktreeId) => send('ui:sleepWorktree', { worktreeId }),
-    resumeSleepingAgents: (worktreeId) => send('ui:resumeSleepingAgents', { worktreeId }),
-    terminalFitOverrideChanged: (ptyId, mode, cols, rows) =>
-      send('runtime:terminalFitOverrideChanged', { ptyId, mode, cols, rows }),
-    terminalDriverChanged: (ptyId, driver) =>
-      send('runtime:terminalDriverChanged', { ptyId, driver }),
-    nativeChatLaunchDraftResolved: (tabId, resolution) =>
-      send('runtime:nativeChatLaunchDraftResolved', { tabId, ...resolution }),
-    browserDriverChanged: (browserPageId, driver) =>
-      send('runtime:browserDriverChanged', { browserPageId, driver }),
-    browserRemoteViewersChanged: (browserPageId, hasRemoteViewers) =>
-      send('runtime:browserRemoteViewersChanged', { browserPageId, hasRemoteViewers }),
-    clientHostedBrowserRowsChanged: (event) => send('runtime:clientHostedBrowserRowsChanged', event)
-  })
-  registerRendererDocumentNavigation(mainWebContents, () => {
-    rendererNotifications.onMainFrameReloadStarted()
-    const fence = runtime.markRendererReloading(mainWindow.id)
-    return () => {
-      if (fence && runtime.markRendererReloadCancelled(mainWindow.id, fence)) {
-        rendererNotifications.onMainFrameReloadCancelled()
-      }
-    }
-  })
-  mainWebContents.on('did-finish-load', () => {
-    rendererNotifications.onMainFrameLoadFinished()
-  })
-  mainWebContents.on('render-process-gone', () => {
-    rendererNotifications.onRendererProcessGone()
-  })
-  mainWindow.on('closed', () => {
-    rendererNotifications.close()
-    runtime.markGraphUnavailable(mainWindow.id)
-    if (activeRuntimeNotifierToken === notifierToken) {
-      // Why: the notifier closes over the window; clear it in the no-window gap so the runtime can't retain destroyed graphs.
-      runtime.setNotifier(null)
-      activeRuntimeNotifierToken = null
-    }
-  })
-}
-
 function registerFileDropRelay(mainWindow: BrowserWindow): void {
   const channel = 'terminal:file-dropped-from-preload'
   const mainWebContents = mainWindow.webContents
@@ -563,58 +266,3 @@ function registerFileDropRelay(mainWindow: BrowserWindow): void {
     ipcMain.removeListener(channel, relayFileDrop)
   })
 }
-
-export function registerUpdaterHandlers(_store: Store): void {
-  ipcMain.removeHandler('updater:getStatus')
-  ipcMain.removeHandler('updater:getVersion')
-  ipcMain.removeHandler('updater:check')
-  ipcMain.removeHandler('updater:download')
-  ipcMain.removeHandler('updater:quitAndInstall')
-  ipcMain.removeHandler('updater:dismissNudge')
-  ipcMain.removeHandler('updater:dismissAvailableUpdate')
-  ipcMain.removeHandler('updater:getLinuxPackageInstallInstructions')
-  ipcMain.removeHandler('updater:showLinuxPackage')
-  ipcMain.removeHandler('updater:listBuilds')
-
-  ipcMain.handle('updater:getStatus', () => getUpdateStatus())
-  ipcMain.handle('updater:getVersion', () => app.getVersion())
-  ipcMain.handle('updater:check', (_event, options?: UpdateCheckOptions) => {
-    ensureAutoUpdaterConfigured()
-    return checkForUpdatesFromMenu(options)
-  })
-  ipcMain.handle('updater:download', () => downloadUpdate())
-  ipcMain.handle('updater:quitAndInstall', () => quitAndInstall())
-  ipcMain.handle('updater:dismissNudge', () => dismissNudge())
-  ipcMain.handle('updater:dismissAvailableUpdate', () => dismissAvailableUpdate())
-  // Why: the response carries a local package path and the reveal touches the native desktop, so
-  // neither may be reached from a guest, dashboard popout, stale window, or utility renderer.
-  ipcMain.handle('updater:getLinuxPackageInstallInstructions', (event) => {
-    assertTrustedUpdaterRecoverySender(event)
-    return getLinuxPackageInstallInstructions()
-  })
-  ipcMain.handle('updater:showLinuxPackage', (event) => {
-    assertTrustedUpdaterRecoverySender(event)
-    return showLinuxPackage()
-  })
-  ipcMain.handle(
-    'updater:listBuilds',
-    async (_event, channel: ReleaseChannel): Promise<ReleaseBuildListResult> => {
-      if (!RELEASE_CHANNELS.includes(channel)) {
-        return { ok: false, channel, message: `Unknown release channel "${channel}".` }
-      }
-      try {
-        return { ok: true, channel, builds: await listAvailableReleaseBuilds(channel) }
-      } catch (error) {
-        // Why: a network/rate-limit failure is expected here; return it as data so
-        // the picker can render the reason instead of rejecting the invoke.
-        return { ok: false, channel, message: String((error as Error)?.message ?? error) }
-      }
-    }
-  )
-}
-
-function assertTrustedUpdaterRecoverySender(event: IpcMainInvokeEvent): void {
-  if (!isTrustedUIRenderer(event.sender)) {
-    throw new Error('Unauthorized updater package recovery sender')
-  }
-}
diff --git a/src/main/window/main-window-updater.ts b/src/main/window/main-window-updater.ts
new file mode 100644
index 00000000000..51860db8dc5
--- /dev/null
+++ b/src/main/window/main-window-updater.ts
@@ -0,0 +1,135 @@
+import { app, ipcMain } from 'electron'
+import type { BrowserWindow, IpcMainInvokeEvent } from 'electron'
+import type { ReleaseBuildListResult, UpdateCheckOptions } from '../../shared/update-status-types'
+import { RELEASE_CHANNELS, type ReleaseChannel } from '../../shared/release-channel'
+import { isTrustedUIRenderer } from '../ipc/ui'
+import type { Store } from '../persistence'
+import { logStartupMilestone } from '../startup/startup-diagnostics'
+import {
+  checkForUpdatesFromMenu,
+  dismissAvailableUpdate,
+  dismissNudge,
+  downloadUpdate,
+  getLinuxPackageInstallInstructions,
+  getUpdateStatus,
+  listAvailableReleaseBuilds,
+  quitAndInstall,
+  setupAutoUpdater,
+  showLinuxPackage,
+  type UpdateInstallMode
+} from '../updater'
+
+const UPDATER_SETUP_FALLBACK_MS = 15_000
+
+// Why: a manual check can arrive before deferred setup runs, so entry points force this pending setup to configure the updater first.
+let pendingAutoUpdaterSetup: (() => void) | null = null
+
+export function ensureAutoUpdaterConfigured(): void {
+  pendingAutoUpdaterSetup?.()
+}
+
+export function scheduleMainWindowAutoUpdaterSetup(
+  mainWindow: BrowserWindow,
+  store: Store,
+  options?: {
+    onBeforeUpdateQuit?: () => void | Promise<void>
+    updateInstallMode?: UpdateInstallMode
+  }
+): void {
+  // Why: setupAutoUpdater sync-require()s electron-updater (slow on cold Windows w/ Defender, #7225), so defer past first paint; timer fallback covers crash-looping renderers.
+  let updaterSetupDone = false
+  const setupAutoUpdaterDeferred = (): void => {
+    if (updaterSetupDone || mainWindow.isDestroyed()) {
+      return
+    }
+    updaterSetupDone = true
+    setupAutoUpdater(mainWindow, {
+      getLastUpdateCheckAt: () => store.getUI().lastUpdateCheckAt,
+      onBeforeQuit: async () => {
+        try {
+          await options?.onBeforeUpdateQuit?.()
+        } finally {
+          await store.flushPendingAsync()
+        }
+      },
+      setLastUpdateCheckAt: (timestamp) => {
+        store.updateUI({ lastUpdateCheckAt: timestamp })
+      },
+      getPendingUpdateNudgeId: () => store.getUI().pendingUpdateNudgeId ?? null,
+      getDismissedUpdateNudgeId: () => store.getUI().dismissedUpdateNudgeId ?? null,
+      setPendingUpdateNudgeId: (id) => {
+        // Why: only the apply branch also nulls dismissedUpdateVersion so relaunch can't resurrect the old hidden card; clearing must not, or it un-dismisses.
+        if (id) {
+          store.updateUI({ pendingUpdateNudgeId: id, dismissedUpdateVersion: null })
+        } else {
+          store.updateUI({ pendingUpdateNudgeId: null })
+        }
+      },
+      setDismissedUpdateNudgeId: (id) => {
+        store.updateUI({ dismissedUpdateNudgeId: id })
+      },
+      getReleaseChannelOverride: () => store.getUI().releaseChannelOverride ?? null,
+      installMode: options?.updateInstallMode
+    })
+    logStartupMilestone('updater-setup-done')
+  }
+  pendingAutoUpdaterSetup = setupAutoUpdaterDeferred
+  mainWindow.once('ready-to-show', () => setImmediate(setupAutoUpdaterDeferred))
+  const updaterSetupFallback = setTimeout(setupAutoUpdaterDeferred, UPDATER_SETUP_FALLBACK_MS)
+  updaterSetupFallback.unref?.()
+}
+
+export function registerUpdaterHandlers(_store: Store): void {
+  ipcMain.removeHandler('updater:getStatus')
+  ipcMain.removeHandler('updater:getVersion')
+  ipcMain.removeHandler('updater:check')
+  ipcMain.removeHandler('updater:download')
+  ipcMain.removeHandler('updater:quitAndInstall')
+  ipcMain.removeHandler('updater:dismissNudge')
+  ipcMain.removeHandler('updater:dismissAvailableUpdate')
+  ipcMain.removeHandler('updater:getLinuxPackageInstallInstructions')
+  ipcMain.removeHandler('updater:showLinuxPackage')
+  ipcMain.removeHandler('updater:listBuilds')
+
+  ipcMain.handle('updater:getStatus', () => getUpdateStatus())
+  ipcMain.handle('updater:getVersion', () => app.getVersion())
+  ipcMain.handle('updater:check', (_event, options?: UpdateCheckOptions) => {
+    ensureAutoUpdaterConfigured()
+    return checkForUpdatesFromMenu(options)
+  })
+  ipcMain.handle('updater:download', () => downloadUpdate())
+  ipcMain.handle('updater:quitAndInstall', () => quitAndInstall())
+  ipcMain.handle('updater:dismissNudge', () => dismissNudge())
+  ipcMain.handle('updater:dismissAvailableUpdate', () => dismissAvailableUpdate())
+  // Why: the response carries a local package path and the reveal touches the native desktop, so
+  // neither may be reached from a guest, dashboard popout, stale window, or utility renderer.
+  ipcMain.handle('updater:getLinuxPackageInstallInstructions', (event) => {
+    assertTrustedUpdaterRecoverySender(event)
+    return getLinuxPackageInstallInstructions()
+  })
+  ipcMain.handle('updater:showLinuxPackage', (event) => {
+    assertTrustedUpdaterRecoverySender(event)
+    return showLinuxPackage()
+  })
+  ipcMain.handle(
+    'updater:listBuilds',
+    async (_event, channel: ReleaseChannel): Promise<ReleaseBuildListResult> => {
+      if (!RELEASE_CHANNELS.includes(channel)) {
+        return { ok: false, channel, message: `Unknown release channel "${channel}".` }
+      }
+      try {
+        return { ok: true, channel, builds: await listAvailableReleaseBuilds(channel) }
+      } catch (error) {
+        // Why: a network/rate-limit failure is expected here; return it as data so
+        // the picker can render the reason instead of rejecting the invoke.
+        return { ok: false, channel, message: String((error as Error)?.message ?? error) }
+      }
+    }
+  )
+}
+
+function assertTrustedUpdaterRecoverySender(event: IpcMainInvokeEvent): void {
+  if (!isTrustedUIRenderer(event.sender)) {
+    throw new Error('Unauthorized updater package recovery sender')
+  }
+}
diff --git a/src/main/window/runtime-window-lifecycle.ts b/src/main/window/runtime-window-lifecycle.ts
new file mode 100644
index 00000000000..cc6b6b47136
--- /dev/null
+++ b/src/main/window/runtime-window-lifecycle.ts
@@ -0,0 +1,239 @@
+import { randomUUID } from 'node:crypto'
+
+import { ipcMain } from 'electron'
+import type { BrowserWindow } from 'electron'
+import type { CreateWorktreeResult } from '../../shared/worktree/create-types'
+import type { WorktreeStartupLaunch } from '../../shared/worktree/launch-types'
+import type {
+  RuntimeMarkdownReadTabResult,
+  RuntimeMarkdownSaveTabResult
+} from '../../shared/mobile-markdown-document'
+import type { RuntimeMobileSessionTabMove } from '../../shared/runtime-types'
+import type { TerminalTabCreateReply } from '../../shared/terminal-reveal-identity'
+import { runWorktreeChangeInvalidators } from '../ipc/worktree-change-invalidators'
+import type { OrcaRuntimeService } from '../runtime/orca-runtime'
+import { requestMobileMarkdownFromRenderer } from './mobile-markdown-request-relay'
+import { registerRendererDocumentNavigation } from './renderer-document-navigation'
+import { createRuntimeRendererNotificationSender } from './runtime-renderer-notification-sender'
+import { requestSessionTabCloseFromRenderer } from './session-tab-close-request-relay'
+import { requestTerminalTabCloseFromRenderer } from './terminal-tab-close-request-relay'
+
+let runtimeNotifierTokenCounter = 0
+let activeRuntimeNotifierToken: number | null = null
+
+export function registerRuntimeWindowLifecycle(
+  mainWindow: BrowserWindow,
+  runtime: OrcaRuntimeService
+): void {
+  const notifierToken = ++runtimeNotifierTokenCounter
+  activeRuntimeNotifierToken = notifierToken
+  runtime.attachWindow(mainWindow.id)
+  const mainWebContents = mainWindow.webContents
+  const rendererNotifications = createRuntimeRendererNotificationSender({
+    isWindowDestroyed: () => mainWindow.isDestroyed(),
+    webContents: mainWebContents,
+    onFailure: (reason) => runtime.markGraphReloadFailed(mainWindow.id, reason)
+  })
+  const send = rendererNotifications.send
+  runtime.setNotifier({
+    worktreesChanged: (repoId, renamed) => {
+      // Why: clear scan caches before the renderer handles this event, so it can't read stale TTL entries after a mutation.
+      runWorktreeChangeInvalidators(repoId)
+      send('worktrees:changed', renamed ? { repoId, renamed } : { repoId })
+    },
+    worktreeBaseStatus: (event) => send('worktree:baseStatus', event),
+    worktreeRemoteBranchConflict: (event) => send('worktree:remoteBranchConflict', event),
+    reposChanged: () => send('repos:changed'),
+    automationsChanged: (payload) => send('automations:changed', payload),
+    activateWorktree: (
+      repoId,
+      worktreeId,
+      setup?: CreateWorktreeResult['setup'],
+      startup?: WorktreeStartupLaunch,
+      defaultTabs?: CreateWorktreeResult['defaultTabs']
+    ) => {
+      send('ui:activateWorktree', {
+        repoId,
+        worktreeId,
+        ...(setup ? { setup } : {}),
+        ...(startup ? { startup } : {}),
+        ...(defaultTabs ? { defaultTabs } : {})
+      })
+    },
+    createTerminal: (worktreeId, opts) =>
+      send('ui:createTerminal', {
+        worktreeId,
+        command: opts.command,
+        ...(opts.cwd ? { cwd: opts.cwd } : {}),
+        ...(opts.env ? { env: opts.env } : {}),
+        title: opts.title,
+        ...(opts.presentation ? { presentation: opts.presentation } : {})
+      }),
+    revealTerminalSession: (worktreeId, opts) =>
+      new Promise((resolve, reject) => {
+        const requestId = randomUUID()
+        const expectedIdentity = opts.expectedProcessIdentity
+          ? opts.tabId && opts.leafId
+            ? { worktreeId, tabId: opts.tabId, leafId: opts.leafId, ptyId: opts.ptyId }
+            : null
+          : undefined
+        if (expectedIdentity === null) {
+          reject(new Error('terminal_reveal_identity_required'))
+          return
+        }
+        const timer = setTimeout(() => {
+          ipcMain.removeListener('terminal:tabCreateReply', handler)
+          reject(new Error('Terminal reveal timed out'))
+        }, 10_000)
+        const handler = (event: Electron.IpcMainEvent, reply: TerminalTabCreateReply): void => {
+          // Why: requestId is renderer-supplied, so only the targeted main window may satisfy the reveal.
+          if (event.sender !== mainWindow.webContents || reply.requestId !== requestId) {
+            return
+          }
+          clearTimeout(timer)
+          ipcMain.removeListener('terminal:tabCreateReply', handler)
+          if (reply.error) {
+            reject(new Error(reply.error))
+            return
+          }
+          if (
+            expectedIdentity &&
+            (!reply.identity ||
+              reply.identity.worktreeId !== expectedIdentity.worktreeId ||
+              reply.identity.tabId !== expectedIdentity.tabId ||
+              reply.identity.leafId !== expectedIdentity.leafId ||
+              reply.identity.ptyId !== expectedIdentity.ptyId)
+          ) {
+            reject(new Error('terminal_reveal_identity_mismatch'))
+            return
+          }
+          resolve({
+            tabId: reply.tabId!,
+            title: reply.title,
+            ...(reply.identity ? { identity: reply.identity } : {})
+          })
+        }
+        ipcMain.on('terminal:tabCreateReply', handler)
+        const sent = send('ui:createTerminal', {
+          requestId,
+          worktreeId,
+          ptyId: opts.ptyId,
+          title: opts.title ?? undefined,
+          ...(opts.cwd ? { cwd: opts.cwd } : {}),
+          ...(opts.launchConfig ? { launchConfig: opts.launchConfig } : {}),
+          ...(opts.launchToken ? { launchToken: opts.launchToken } : {}),
+          ...(opts.launchAgent ? { launchAgent: opts.launchAgent } : {}),
+          ...(opts.viewMode ? { viewMode: opts.viewMode } : {}),
+          activate: opts.activate !== false,
+          ...(opts.presentation ? { presentation: opts.presentation } : {}),
+          ...(opts.surfaceOwner === false ? { surfaceOwner: false } : {}),
+          // Why: pre-minted tabId aligns the renderer tab id with the paneKey baked into the PTY env, so hook events route right.
+          ...(opts.tabId !== undefined ? { tabId: opts.tabId } : {}),
+          ...(opts.leafId !== undefined ? { leafId: opts.leafId } : {}),
+          ...(opts.splitFromLeafId !== undefined ? { splitFromLeafId: opts.splitFromLeafId } : {}),
+          ...(opts.splitDirection !== undefined ? { splitDirection: opts.splitDirection } : {}),
+          ...(opts.splitTelemetrySource !== undefined
+            ? { splitTelemetrySource: opts.splitTelemetrySource }
+            : {}),
+          ...(opts.focus !== undefined ? { focus: opts.focus } : {})
+        })
+        if (!sent) {
+          clearTimeout(timer)
+          ipcMain.removeListener('terminal:tabCreateReply', handler)
+          reject(new Error('runtime_unavailable'))
+        }
+      }),
+    resolveLegacyWorkerTerminalRecovery: (paneKey, resolution, ptyId) =>
+      send('agentStatus:legacyWorkerTerminalRecovery', {
+        paneKey,
+        resolution,
+        ...(ptyId ? { ptyId } : {})
+      }),
+    splitTerminal: (tabId, paneRuntimeId, opts) => {
+      send('ui:splitTerminal', {
+        tabId,
+        paneRuntimeId,
+        direction: opts.direction,
+        command: opts.command,
+        telemetrySource: opts.telemetrySource
+      })
+    },
+    renameTerminal: (tabId, title) => send('ui:renameTerminal', { tabId, title }),
+    focusTerminal: (tabId, worktreeId, leafId) =>
+      send('ui:focusTerminal', { tabId, worktreeId, leafId }),
+    focusEditorTab: (tabId, worktreeId) => send('ui:focusEditorTab', { tabId, worktreeId }),
+    closeSessionTab: (tabId, worktreeId) =>
+      requestSessionTabCloseFromRenderer(mainWindow, tabId, worktreeId),
+    moveSessionTab: (worktreeId: string, move: RuntimeMobileSessionTabMove) =>
+      send('ui:moveSessionTab', { worktreeId, ...move }),
+    openFile: (worktreeId, filePath, relativePath, runtimeEnvironmentId?) =>
+      send('ui:openFileFromMobile', {
+        worktreeId,
+        filePath,
+        relativePath,
+        runtimeEnvironmentId
+      }),
+    openDiff: (worktreeId, filePath, relativePath, staged, runtimeEnvironmentId?) =>
+      send('ui:openDiffFromMobile', {
+        worktreeId,
+        filePath,
+        relativePath,
+        staged,
+        runtimeEnvironmentId
+      }),
+    readMobileMarkdownTab: (worktreeId, tabId) =>
+      requestMobileMarkdownFromRenderer(mainWindow, {
+        operation: 'read',
+        worktreeId,
+        tabId
+      }) as Promise<RuntimeMarkdownReadTabResult>,
+    saveMobileMarkdownTab: (worktreeId, tabId, baseVersion, content) =>
+      requestMobileMarkdownFromRenderer(mainWindow, {
+        operation: 'save',
+        worktreeId,
+        tabId,
+        baseVersion,
+        content
+      }) as Promise<RuntimeMarkdownSaveTabResult>,
+    closeTerminal: (tabId, paneRuntimeId) => send('ui:closeTerminal', { tabId, paneRuntimeId }),
+    closeTerminalTab: (tabId, options) =>
+      requestTerminalTabCloseFromRenderer(mainWindow, tabId, options),
+    sleepWorktree: (worktreeId) => send('ui:sleepWorktree', { worktreeId }),
+    resumeSleepingAgents: (worktreeId) => send('ui:resumeSleepingAgents', { worktreeId }),
+    terminalFitOverrideChanged: (ptyId, mode, cols, rows) =>
+      send('runtime:terminalFitOverrideChanged', { ptyId, mode, cols, rows }),
+    terminalDriverChanged: (ptyId, driver) =>
+      send('runtime:terminalDriverChanged', { ptyId, driver }),
+    nativeChatLaunchDraftResolved: (tabId, resolution) =>
+      send('runtime:nativeChatLaunchDraftResolved', { tabId, ...resolution }),
+    browserDriverChanged: (browserPageId, driver) =>
+      send('runtime:browserDriverChanged', { browserPageId, driver }),
+    browserRemoteViewersChanged: (browserPageId, hasRemoteViewers) =>
+      send('runtime:browserRemoteViewersChanged', { browserPageId, hasRemoteViewers }),
+    clientHostedBrowserRowsChanged: (event) => send('runtime:clientHostedBrowserRowsChanged', event)
+  })
+  registerRendererDocumentNavigation(mainWebContents, () => {
+    rendererNotifications.onMainFrameReloadStarted()
+    const fence = runtime.markRendererReloading(mainWindow.id)
+    return () => {
+      if (fence && runtime.markRendererReloadCancelled(mainWindow.id, fence)) {
+        rendererNotifications.onMainFrameReloadCancelled()
+      }
+    }
+  })
+  mainWebContents.on('did-finish-load', () => {
+    rendererNotifications.onMainFrameLoadFinished()
+  })
+  mainWebContents.on('render-process-gone', () => {
+    rendererNotifications.onRendererProcessGone()
+  })
+  mainWindow.on('closed', () => {
+    rendererNotifications.close()
+    runtime.markGraphUnavailable(mainWindow.id)
+    if (activeRuntimeNotifierToken === notifierToken) {
+      // Why: the notifier closes over the window; clear it in the no-window gap so the runtime can't retain destroyed graphs.
+      runtime.setNotifier(null)
+      activeRuntimeNotifierToken = null
+    }
+  })
+}
diff --git a/src/main/worktree-lineage-pruning.test.ts b/src/main/worktree-lineage-pruning.test.ts
index db393e864d5..22b34f70104 100644
--- a/src/main/worktree-lineage-pruning.test.ts
+++ b/src/main/worktree-lineage-pruning.test.ts
@@ -57,6 +57,82 @@ function createStore(
 }
 
 describe('pruneLineageForMissingRepoWorktrees', () => {
+  it('keeps lineage stored under another spelling of a live worktree path', () => {
+    const parentId = 'repo-1::/repo'
+    const childId = 'repo-1::/repo/./child'
+    const edge = lineage(childId, parentId)
+    const worktreeLineageById = { [childId]: edge }
+    const workspaceLineageByChildKey = {
+      [worktreeWorkspaceKey(childId)]: workspaceLineage(childId, parentId)
+    }
+    const metaById = {
+      [parentId]: { instanceId: edge.parentWorktreeInstanceId } as WorktreeMeta
+    }
+    const store = createStore(worktreeLineageById, workspaceLineageByChildKey, metaById)
+
+    pruneLineageForMissingRepoWorktrees(
+      store as never,
+      repo,
+      [
+        { path: '/repo', head: 'a', branch: 'main', isBare: false, isMainWorktree: true },
+        { path: '/repo/child/', head: 'b', branch: 'child', isBare: false, isMainWorktree: false }
+      ],
+      { platform: 'linux' }
+    )
+
+    expect(store.removeWorktreeLineage).not.toHaveBeenCalled()
+    expect(store.removeWorkspaceLineage).not.toHaveBeenCalled()
+    expect(store.setWorktreeMeta).not.toHaveBeenCalled()
+    expect(worktreeLineageById[childId]).toBe(edge)
+  })
+
+  it('keeps captured metadata lineage not removed after Git canonicalizes paths', () => {
+    const parentId = 'repo-1::/alias/parent'
+    const childId = 'repo-1::/alias/child'
+    const edge = lineage(childId, parentId)
+    const worktreeLineageById = { [childId]: edge }
+    const workspaceLineageByChildKey = {
+      [worktreeWorkspaceKey(childId)]: workspaceLineage(childId, parentId)
+    }
+    const metaById = {
+      [childId]: { instanceId: edge.worktreeInstanceId } as WorktreeMeta,
+      [parentId]: { instanceId: edge.parentWorktreeInstanceId } as WorktreeMeta
+    }
+    const store = createStore(worktreeLineageById, workspaceLineageByChildKey, metaById)
+
+    pruneLineageForMissingRepoWorktrees(
+      store as never,
+      repo,
+      [
+        {
+          path: '/canonical/parent',
+          head: 'a',
+          branch: 'parent',
+          isBare: false,
+          isMainWorktree: false
+        },
+        {
+          path: '/canonical/child',
+          head: 'b',
+          branch: 'child',
+          isBare: false,
+          isMainWorktree: false
+        }
+      ],
+      {
+        platform: 'linux',
+        preservedMetadataCandidateIds: new Set([parentId, childId])
+      }
+    )
+
+    expect(store.removeWorktreeLineage).not.toHaveBeenCalled()
+    expect(store.removeWorkspaceLineage).not.toHaveBeenCalled()
+    expect(store.setWorktreeMeta).not.toHaveBeenCalled()
+    expect(worktreeLineageById[childId]).toBe(edge)
+    expect(workspaceLineageByChildKey[worktreeWorkspaceKey(childId)]).toBeDefined()
+    expect(metaById[parentId].instanceId).toBe(edge.parentWorktreeInstanceId)
+  })
+
   it('refuses an empty scan when the repo still has registered lineage', () => {
     const parentId = 'repo-1::/repo/parent'
     const childId = 'repo-1::/repo/child'
@@ -78,7 +154,7 @@ describe('pruneLineageForMissingRepoWorktrees', () => {
     expect(workspaceLineageByChildKey[worktreeWorkspaceKey(childId)]).toBe(workspaceEdge)
   })
 
-  it('prunes missing children and rotates missing parents after a trusted non-empty scan', () => {
+  it('prunes and rotates missing IDs absent from preserved metadata candidates', () => {
     const liveParentId = 'repo-1::/repo/live-parent'
     const missingChildId = 'repo-1::/repo/missing-child'
     const liveChildId = 'repo-1::/repo/live-child'
@@ -99,25 +175,31 @@ describe('pruneLineageForMissingRepoWorktrees', () => {
     }
     const store = createStore(worktreeLineageById, workspaceLineageByChildKey, metaById)
 
-    pruneLineageForMissingRepoWorktrees(store as never, repo, [
-      {
-        path: '/repo/live-parent',
-        head: 'a',
-        branch: 'main',
-        isBare: false,
-        isMainWorktree: false
-      },
-      {
-        path: '/repo/live-child',
-        head: 'b',
-        branch: 'child',
-        isBare: false,
-        isMainWorktree: false
-      }
-    ])
+    pruneLineageForMissingRepoWorktrees(
+      store as never,
+      repo,
+      [
+        {
+          path: '/repo/live-parent',
+          head: 'a',
+          branch: 'main',
+          isBare: false,
+          isMainWorktree: false
+        },
+        {
+          path: '/repo/live-child',
+          head: 'b',
+          branch: 'child',
+          isBare: false,
+          isMainWorktree: false
+        }
+      ],
+      { preservedMetadataCandidateIds: new Set([liveParentId, liveChildId]) }
+    )
 
     expect(store.removeWorktreeLineage).toHaveBeenCalledWith(missingChildId)
     expect(store.removeWorktreeLineage).not.toHaveBeenCalledWith(liveChildId)
+    expect(store.removeWorkspaceLineage).toHaveBeenCalledWith(worktreeWorkspaceKey(missingChildId))
     expect(store.setWorktreeMeta).toHaveBeenCalledWith(missingParentId, {
       instanceId: expect.any(String)
     })
@@ -126,4 +208,25 @@ describe('pruneLineageForMissingRepoWorktrees', () => {
       missingParentEdge.parentWorktreeInstanceId
     )
   })
+
+  it('does not rematerialize metadata already removed for a missing parent', () => {
+    const liveChildId = 'repo-1::/repo/live-child'
+    const removedParentId = 'repo-1::/repo/removed-parent'
+    const edge = lineage(liveChildId, removedParentId)
+    const worktreeLineageById = { [liveChildId]: edge }
+    const store = createStore(worktreeLineageById, {}, {})
+
+    pruneLineageForMissingRepoWorktrees(store as never, repo, [
+      {
+        path: '/repo/live-child',
+        head: 'child-head',
+        branch: 'child',
+        isBare: false,
+        isMainWorktree: false
+      }
+    ])
+
+    expect(store.setWorktreeMeta).not.toHaveBeenCalled()
+    expect(worktreeLineageById[liveChildId]).toBe(edge)
+  })
 })
diff --git a/src/main/worktree-lineage-pruning.ts b/src/main/worktree-lineage-pruning.ts
index 34a99ef6e95..6040f25c03d 100644
--- a/src/main/worktree-lineage-pruning.ts
+++ b/src/main/worktree-lineage-pruning.ts
@@ -4,6 +4,8 @@ import type { WorkspaceLineage, WorktreeLineage } from '../shared/worktree/linea
 import type { GitWorktreeInfo } from '../shared/worktree/types'
 import { getRepoExecutionHostId } from '../shared/execution-host'
 import { isWorkspaceKey, parseWorkspaceKey, worktreeWorkspaceKey } from '../shared/workspace-scope'
+import { splitWorktreeId } from '../shared/worktree/id'
+import { worktreeRetentionPathComparisonKey } from './worktree-retention-path-comparison'
 import type { Store } from './persistence'
 
 function worktreeIdBelongsToRepo(worktreeId: string, repoPrefix: string): boolean {
@@ -37,8 +39,13 @@ function hasStoredRepoLineage(
 export function pruneLineageForMissingRepoWorktrees(
   store: Store,
   repo: Repo,
-  gitWorktrees: GitWorktreeInfo[]
+  gitWorktrees: GitWorktreeInfo[],
+  options: {
+    platform?: NodeJS.Platform
+    preservedMetadataCandidateIds?: ReadonlySet<string>
+  } = {}
 ): void {
+  const { platform = process.platform, preservedMetadataCandidateIds } = options
   if (
     typeof store.getAllWorktreeLineage !== 'function' ||
     typeof store.removeWorktreeLineage !== 'function'
@@ -56,6 +63,24 @@ export function pruneLineageForMissingRepoWorktrees(
     return
   }
   const liveIds = new Set(gitWorktrees.map((worktree) => `${repo.id}::${worktree.path}`))
+  const livePathKeys = new Set(
+    [repo.path, ...gitWorktrees.map(({ path }) => path)].map((pathValue) =>
+      worktreeRetentionPathComparisonKey(pathValue, platform)
+    )
+  )
+  const isLive = (worktreeId: string): boolean => {
+    if (liveIds.has(worktreeId) || preservedMetadataCandidateIds?.has(worktreeId)) {
+      return true
+    }
+    const worktreePath = splitWorktreeId(worktreeId)?.worktreePath
+    if (!worktreePath) {
+      return false
+    }
+    if (livePathKeys.has(worktreeRetentionPathComparisonKey(worktreePath, platform))) {
+      return true
+    }
+    return false
+  }
   const expectedHostId = getRepoExecutionHostId(repo)
   const repoOwners = store.getRepos().filter((candidate) => candidate.id === repo.id)
   const canMutateWorktree = (worktreeId: string): boolean => {
@@ -68,7 +93,7 @@ export function pruneLineageForMissingRepoWorktrees(
       childScope?.type === 'worktree' &&
       worktreeIdBelongsToRepo(childScope.worktreeId, repoPrefix) &&
       canMutateWorktree(childScope.worktreeId) &&
-      !liveIds.has(childScope.worktreeId) &&
+      !isLive(childScope.worktreeId) &&
       isWorkspaceKey(childWorkspaceKey)
     ) {
       store.removeWorkspaceLineage?.(childWorkspaceKey)
@@ -78,7 +103,7 @@ export function pruneLineageForMissingRepoWorktrees(
     if (
       worktreeIdBelongsToRepo(childId, repoPrefix) &&
       canMutateWorktree(childId) &&
-      !liveIds.has(childId)
+      !isLive(childId)
     ) {
       // Why: a proven-missing path must not transfer its lineage to a future checkout at that path.
       store.removeWorktreeLineage(childId)
@@ -87,10 +112,10 @@ export function pruneLineageForMissingRepoWorktrees(
     if (
       worktreeIdBelongsToRepo(lineage.parentWorktreeId, repoPrefix) &&
       canMutateWorktree(lineage.parentWorktreeId) &&
-      !liveIds.has(lineage.parentWorktreeId)
+      !isLive(lineage.parentWorktreeId)
     ) {
       const parentMeta = store.getWorktreeMeta(lineage.parentWorktreeId)
-      if (!parentMeta || parentMeta.instanceId === lineage.parentWorktreeInstanceId) {
+      if (parentMeta?.instanceId === lineage.parentWorktreeInstanceId) {
         // Why: rotate a proven-missing parent's identity once so path reuse cannot validate old lineage.
         store.setWorktreeMeta(lineage.parentWorktreeId, { instanceId: randomUUID() })
       }
diff --git a/src/main/worktree-retention-path-comparison.ts b/src/main/worktree-retention-path-comparison.ts
new file mode 100644
index 00000000000..2ff3fd02990
--- /dev/null
+++ b/src/main/worktree-retention-path-comparison.ts
@@ -0,0 +1,24 @@
+import { splitWorktreeId } from '../shared/worktree/id'
+import { worktreePathComparisonKey } from './ipc/worktree-path-comparison'
+
+/** Comparison keys used only to retain state; canonical equivalence must never select a delete target. */
+export function worktreeRetentionPathComparisonKey(
+  pathValue: string,
+  platform: NodeJS.Platform
+): string {
+  return worktreePathComparisonKey(pathValue.normalize('NFC'), platform)
+}
+
+export function worktreeRetentionIdComparisonKey(
+  worktreeId: string,
+  platform: NodeJS.Platform
+): string | null {
+  const parsed = splitWorktreeId(worktreeId)
+  if (!parsed?.repoId || !parsed.worktreePath) {
+    return null
+  }
+  return JSON.stringify([
+    parsed.repoId,
+    worktreeRetentionPathComparisonKey(parsed.worktreePath, platform)
+  ])
+}
diff --git a/src/main/wsl/__fixtures__/wsl-invocation-allowlist.txt b/src/main/wsl/__fixtures__/wsl-invocation-allowlist.txt
index befefb5a2c8..fc1478330d9 100644
--- a/src/main/wsl/__fixtures__/wsl-invocation-allowlist.txt
+++ b/src/main/wsl/__fixtures__/wsl-invocation-allowlist.txt
@@ -26,7 +26,7 @@ main/git/command-runner/wsl-command-resolution.ts
 main/git/wsl-git-read-environment.ts
 main/ipc/filesystem-watcher-wsl.ts
 main/local-worktree-filesystem.ts
-main/providers/local-pty-provider.ts
+main/providers/local-pty-spawn.ts
 main/rate-limits/claude-pty.ts
 main/rate-limits/codex-fetcher.ts
 main/wsl-availability.ts
diff --git a/src/main/wsl/wsl-invocation-boundary.test.ts b/src/main/wsl/wsl-invocation-boundary.test.ts
index dbe708f4821..29906362a47 100644
--- a/src/main/wsl/wsl-invocation-boundary.test.ts
+++ b/src/main/wsl/wsl-invocation-boundary.test.ts
@@ -141,6 +141,22 @@ function bindsWslBinaryToASpawnedIdentifier(source: string): boolean {
   return false
 }
 
+function passesComparedWslShellPathToSpawnSpec(source: string): boolean {
+  for (const match of source.matchAll(
+    /\bbasename\(\s*([A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*)*)\s*\)\.toLowerCase\(\)\s*===\s*['"`]wsl\.exe['"`]/g
+  )) {
+    const shellPath = match[1]!.replace(/[.$]/g, '\\$&')
+    const spawnCall = new RegExp(
+      `\\b\\w*(?:spawn|exec|run)\\w*\\s*\\(\\s*(?:${shellPath}\\b|\\{[\\s\\S]{0,2000}?\\bshellPath\\s*:\\s*${shellPath}\\b)`,
+      'i'
+    )
+    if (spawnCall.test(source)) {
+      return true
+    }
+  }
+  return false
+}
+
 function findSpawnSites(): string[] {
   const offenders = new Set<string>()
   for (const path of collectSourceFiles(SOURCE_ROOT)) {
@@ -157,7 +173,10 @@ function findSpawnSites(): string[] {
         offenders.add(relativePath)
       }
     }
-    if (bindsWslBinaryToASpawnedIdentifier(source)) {
+    if (
+      bindsWslBinaryToASpawnedIdentifier(source) ||
+      passesComparedWslShellPathToSpawnSpec(source)
+    ) {
       offenders.add(relativePath)
     }
   }
@@ -346,6 +365,7 @@ describe('wsl.exe is spawned through one runner', () => {
     // so it passed even for a scanner that found nothing. This fails the moment
     // detection stops seeing a call that is definitely there.
     expect(offenders).toContain('main/git/command-runner/wsl-command-resolution.ts')
+    expect(offenders).toContain('main/providers/local-pty-spawn.ts')
   })
 
   it('adds no new direct wsl.exe spawn', () => {
diff --git a/src/preload/api/ui-command-event-api.ts b/src/preload/api/ui-command-event-api.ts
index c3eefb02115..f287d747aee 100644
--- a/src/preload/api/ui-command-event-api.ts
+++ b/src/preload/api/ui-command-event-api.ts
@@ -32,6 +32,8 @@ import type {
   SessionTabCloseResponse
 } from '../../shared/session-tab-close'
 
+export type CloseActiveTabPayload = { sourceId: string }
+
 export type UiCommandEventApi = {
   get: () => Promise<PersistedUIState>
   set: (args: Partial<PersistedUIState>) => Promise<void>
@@ -105,7 +107,7 @@ export type UiCommandEventApi = {
   onBrowserHistoryNavigate: (callback: (direction: 'back' | 'forward') => void) => () => void
   onZoomBrowserPage: (callback: (direction: 'in' | 'out' | 'reset') => void) => () => void
   onHardReloadBrowserPage: (callback: () => void) => () => void
-  onCloseActiveTab: (callback: () => void) => () => void
+  onCloseActiveTab: (callback: (payload?: CloseActiveTabPayload) => void) => () => void
   onCloseFloatingItem: (callback: (payload: { sourceId: string }) => void) => () => void
   onSelectFloatingIndex: (callback: (payload: { index: number }) => void) => () => void
   onSwitchTab: (callback: (direction: 1 | -1) => void) => () => void
diff --git a/src/preload/close-active-tab-payload-admission.test.ts b/src/preload/close-active-tab-payload-admission.test.ts
new file mode 100644
index 00000000000..76f0270c34c
--- /dev/null
+++ b/src/preload/close-active-tab-payload-admission.test.ts
@@ -0,0 +1,22 @@
+import { describe, expect, it } from 'vitest'
+import { admitCloseActiveTabPayload } from './close-active-tab-payload-admission'
+
+describe('admitCloseActiveTabPayload', () => {
+  it('preserves the legacy omitted payload', () => {
+    expect(admitCloseActiveTabPayload(undefined)).toEqual({ kind: 'legacy' })
+  })
+
+  it('admits a nonempty source id', () => {
+    expect(admitCloseActiveTabPayload({ sourceId: 'page-1' })).toEqual({
+      kind: 'source',
+      payload: { sourceId: 'page-1' }
+    })
+  })
+
+  it.each([null, {}, [], { sourceId: '' }, { sourceId: 1 }, 'page-1'])(
+    'rejects malformed payload %#',
+    (payload) => {
+      expect(admitCloseActiveTabPayload(payload)).toEqual({ kind: 'invalid' })
+    }
+  )
+})
diff --git a/src/preload/close-active-tab-payload-admission.ts b/src/preload/close-active-tab-payload-admission.ts
new file mode 100644
index 00000000000..17428cb6a7a
--- /dev/null
+++ b/src/preload/close-active-tab-payload-admission.ts
@@ -0,0 +1,25 @@
+import type { CloseActiveTabPayload } from './api/ui-command-event-api'
+
+export type AdmittedCloseActiveTabPayload =
+  | { kind: 'legacy' }
+  | { kind: 'source'; payload: CloseActiveTabPayload }
+  | { kind: 'invalid' }
+
+export function admitCloseActiveTabPayload(value: unknown): AdmittedCloseActiveTabPayload {
+  if (value === undefined) {
+    return { kind: 'legacy' }
+  }
+  if (
+    typeof value === 'object' &&
+    value !== null &&
+    !Array.isArray(value) &&
+    typeof (value as Record<string, unknown>).sourceId === 'string' &&
+    (value as Record<string, unknown>).sourceId !== ''
+  ) {
+    return {
+      kind: 'source',
+      payload: { sourceId: (value as Record<string, unknown>).sourceId as string }
+    }
+  }
+  return { kind: 'invalid' }
+}
diff --git a/src/preload/index.ts b/src/preload/index.ts
index 56b34e6fd45..8640d0f6f3f 100644
--- a/src/preload/index.ts
+++ b/src/preload/index.ts
@@ -3,6 +3,8 @@ import { contextBridge, ipcRenderer, webFrame, webUtils } from 'electron'
 import { electronAPI } from '@electron-toolkit/preload'
 import { preloadE2EConfig } from './e2e-config'
 import { glApi } from './gitlab'
+import { admitCloseActiveTabPayload } from './close-active-tab-payload-admission'
+import type { CloseActiveTabPayload } from './api/ui-command-event-api'
 import type {
   SkillDeletePlan,
   SkillDeleteRequest,
@@ -4052,8 +4054,15 @@ const api = {
       ipcRenderer.on('ui:hardReloadBrowserPage', listener)
       return () => ipcRenderer.removeListener('ui:hardReloadBrowserPage', listener)
     },
-    onCloseActiveTab: (callback: () => void): (() => void) => {
-      const listener = (_event: Electron.IpcRendererEvent) => callback()
+    onCloseActiveTab: (callback: (payload?: CloseActiveTabPayload) => void): (() => void) => {
+      const listener = (_event: Electron.IpcRendererEvent, payload?: unknown): void => {
+        const admitted = admitCloseActiveTabPayload(payload)
+        if (admitted.kind === 'legacy') {
+          callback()
+        } else if (admitted.kind === 'source') {
+          callback(admitted.payload)
+        }
+      }
       ipcRenderer.on('ui:closeActiveTab', listener)
       return () => ipcRenderer.removeListener('ui:closeActiveTab', listener)
     },
diff --git a/src/relay/dispatcher-capacity-signals.ts b/src/relay/dispatcher-capacity-signals.ts
new file mode 100644
index 00000000000..5f945f5c84f
--- /dev/null
+++ b/src/relay/dispatcher-capacity-signals.ts
@@ -0,0 +1,166 @@
+import {
+  DispatcherClientWriter,
+  type RelayClientSinkOptions,
+  type RelayClientWrite
+} from './dispatcher-client-writer'
+import type { RelayClient } from './dispatcher-contract'
+import { RelayDispatcherClientLifecycle } from './dispatcher-client-lifecycle'
+
+export abstract class RelayDispatcherCapacitySignals extends RelayDispatcherClientLifecycle {
+  onLegacyPtyCapacity(listener: () => void): () => void {
+    this.legacyCapacityListeners.add(listener)
+    return () => this.legacyCapacityListeners.delete(listener)
+  }
+
+  /**
+   * Ungated per-client writer capacity, for a frame that lost control-lane admission and must retry.
+   * onLegacyPtyCapacity cannot serve that: it is gated on producer retention, so it stays silent
+   * exactly under the dual-queue pressure that rejected the frame. Registered on the dispatcher, not
+   * the writer, so a retry survives setWrite() replacing the primary sink.
+   * Returns null only when the client is gone for good. A merely closed client still counts: setWrite
+   * marks the primary closed before replacing its sink, and that replacement is exactly when a frame
+   * stranded by the old writer must be armed to retry.
+   */
+  onClientCapacity(clientId: number, listener: () => void): (() => void) | null {
+    const client = this.clients.get(clientId)
+    if (this.disposed || !client) {
+      return null
+    }
+    const listeners = this.clientCapacityListeners.get(clientId) ?? new Set<() => void>()
+    listeners.add(listener)
+    this.clientCapacityListeners.set(clientId, listeners)
+    return () => {
+      const current = this.clientCapacityListeners.get(clientId)
+      if (!current?.delete(listener) || current.size > 0) {
+        return
+      }
+      this.clientCapacityListeners.delete(clientId)
+    }
+  }
+
+  /**
+   * Whether the id still names a client. A detach notification does not always mean it stopped:
+   * invalidateClient() detaches the primary without removing it, and setWrite() revives that same id.
+   */
+  isClientAttached(clientId: number): boolean {
+    return !this.disposed && this.clients.has(clientId)
+  }
+
+  canAdmitControlFrame(clientId: number, estimatedBytes: number): boolean {
+    const client = this.clients.get(clientId)
+    if (this.disposed || !client || client.closed) {
+      return false
+    }
+    return client.writer.canEnqueueControl(estimatedBytes)
+  }
+
+  get legacyRetentionBelowLowWater(): boolean {
+    return this.publicationLedger.belowLowWater(this.activeClientKeys())
+  }
+
+  /**
+   * Same reserve as legacyRetentionBelowLowWater, but scoped to one client: a paced bulk producer
+   * gated on the dispatcher-wide signal stops for a peer's stall and degrades a healthy link.
+   * The relay-wide aggregate still counts — that ceiling is shared by every client.
+   */
+  producerRetentionBelowLowWater(clientId: number): boolean {
+    const client = this.clients.get(clientId)
+    if (!client || client.closed) {
+      return false
+    }
+    return this.publicationLedger.belowLowWater([this.clientKey(client)])
+  }
+
+  writePrimaryBytes(data: Buffer, lane: 'control' | 'ordinary' = 'control'): boolean {
+    if (this.disposed || this.primaryClient.closed) {
+      return false
+    }
+    return this.primaryClient.writer.enqueue(lane, () => data, data.length)
+  }
+
+  protected activeClients(): RelayClient[] {
+    return Array.from(this.clients.values()).filter((client) => !client.closed)
+  }
+
+  protected admitsPtyDataPublication(
+    clientId: number,
+    params: Readonly<Record<string, unknown>>
+  ): boolean {
+    return this.ptyDataPublicationAdmission?.(clientId, params) ?? true
+  }
+
+  protected activeClientKeys(): string[] {
+    return this.activeClients().map((client) => this.clientKey(client))
+  }
+
+  protected clientKey(client: RelayClient): string {
+    return `${client.id}:${client.generation}`
+  }
+
+  protected createWriter(
+    client: RelayClient,
+    write: RelayClientWrite,
+    sinkOptions?: RelayClientSinkOptions
+  ): DispatcherClientWriter {
+    const writer = new DispatcherClientWriter(write, sinkOptions, (error) => {
+      this.closeClient(client, error, client !== this.primaryClient)
+    })
+    writer.onCapacity(() => {
+      this.notifyLegacyCapacityIfLow()
+      this.notifyClientCapacity(client.id)
+    })
+    return writer
+  }
+
+  protected notifyClientCapacity(clientId: number): void {
+    const listeners = this.clientCapacityListeners.get(clientId)
+    if (!listeners?.size) {
+      return
+    }
+    for (const listener of Array.from(listeners)) {
+      try {
+        listener()
+      } catch (err) {
+        process.stderr.write(
+          `[relay] Client capacity listener failed: ${err instanceof Error ? err.message : String(err)}\n`
+        )
+      }
+    }
+  }
+
+  protected notifyLegacyCapacityIfLow(): void {
+    this.notifyLegacyCapacity(false)
+  }
+
+  protected notifyLegacyCapacity(force: boolean): void {
+    if (this.publicationTransactionDepth > 0) {
+      this.deferredForcedLegacyCapacity ||= force
+      this.deferredLegacyCapacity ||= !force
+      return
+    }
+    if (!force && !this.publicationLedger.belowLowWater(this.activeClientKeys())) {
+      return
+    }
+    for (const listener of this.legacyCapacityListeners) {
+      listener()
+    }
+  }
+
+  protected runPublicationTransaction<T>(operation: () => T): T {
+    this.publicationTransactionDepth++
+    try {
+      return operation()
+    } finally {
+      this.publicationTransactionDepth--
+      if (this.publicationTransactionDepth === 0) {
+        const force = this.deferredForcedLegacyCapacity
+        const low = this.deferredLegacyCapacity
+        this.deferredForcedLegacyCapacity = false
+        this.deferredLegacyCapacity = false
+        if (force || low) {
+          this.notifyLegacyCapacity(force)
+        }
+      }
+    }
+  }
+}
diff --git a/src/relay/dispatcher-client-lifecycle.ts b/src/relay/dispatcher-client-lifecycle.ts
new file mode 100644
index 00000000000..0aff8d977ac
--- /dev/null
+++ b/src/relay/dispatcher-client-lifecycle.ts
@@ -0,0 +1,230 @@
+import { FrameDecoder, KEEPALIVE_SEND_MS, encodeKeepAliveFrame } from './protocol'
+import type { PtyConsumerCloseCause } from '../shared/pty-consumer-session-contract'
+import type {
+  DispatcherClientWriter,
+  RelayClientSinkOptions,
+  RelayClientWrite
+} from './dispatcher-client-writer'
+import type {
+  RelayClient,
+  RelayClientSessionIdentity,
+  RelayClientSourceOptions
+} from './dispatcher-contract'
+import { RelayDispatcherClientState } from './dispatcher-client-state'
+
+export abstract class RelayDispatcherClientLifecycle extends RelayDispatcherClientState {
+  // Why: redirect outgoing frames to the reconnected socket without rebuilding the dispatcher + handler tree.
+  // Why: a new multiplexer restarts at seq=1; reset state to avoid stalled acknowledgements.
+  setWrite(write: RelayClientWrite, sinkOptions?: RelayClientSinkOptions): void {
+    this.requestAborts.abortClient(this.primaryClient.id)
+    this.primaryClient.closed = true
+    this.primaryClient.writer.close(new Error('Relay primary sink replaced'))
+    this.resetClient(this.primaryClient)
+    this.primaryClient.writer = this.createWriter(this.primaryClient, write, sinkOptions)
+    // Why: a frame retained against the replaced sink would otherwise wait for traffic that may never come.
+    this.notifyClientCapacity(this.primaryClient.id)
+  }
+
+  // Why: mark in-flight requests stale on disconnect so a late pty.spawn/fs.watch can't create unowned remote state.
+  invalidateClient(cause: PtyConsumerCloseCause = 'local'): void {
+    this.closeClient(
+      this.primaryClient,
+      new Error('Relay primary client invalidated'),
+      false,
+      cause
+    )
+  }
+
+  // Why: seq numbers and request ids are per SSH channel, so each attached client needs independent protocol state.
+  attachClient(
+    write: RelayClientWrite,
+    sinkOptions?: RelayClientSinkOptions,
+    sessionIdentity?: RelayClientSessionIdentity,
+    sourceOptions?: RelayClientSourceOptions
+  ): number {
+    const client = this.createClient(write, sinkOptions, sessionIdentity, sourceOptions)
+    this.clients.set(client.id, client)
+    return client.id
+  }
+
+  detachClient(clientId: number, cause: PtyConsumerCloseCause = 'local'): void {
+    const client = this.clients.get(clientId)
+    if (!client || client === this.primaryClient) {
+      return
+    }
+    this.closeClient(client, new Error('Relay client detached'), true, cause)
+  }
+
+  // Why: a displaced owner must lose its transport whichever client holds it, and the launch channel is
+  // often the half-open one. The primary keeps its id for setWrite() revival, so invalidate it instead.
+  releaseDisplacedClient(clientId: number): void {
+    if (clientId === this.primaryClient.id) {
+      this.invalidateClient()
+      return
+    }
+    this.detachClient(clientId)
+  }
+
+  feedClient(clientId: number, data: Buffer): void {
+    const client = this.clients.get(clientId)
+    if (!client) {
+      return
+    }
+    this.feedForClient(client, data)
+  }
+
+  feed(data: Buffer): void {
+    this.feedForClient(this.primaryClient, data)
+  }
+
+  dispose(): void {
+    if (this.disposed) {
+      return
+    }
+    this.disposed = true
+    if (this.keepaliveTimer) {
+      clearInterval(this.keepaliveTimer)
+      this.keepaliveTimer = null
+    }
+    for (const [id, pending] of this.pendingRelayRequests) {
+      clearTimeout(pending.timer)
+      pending.reject(new Error('Relay dispatcher disposed'))
+      this.pendingRelayRequests.delete(id)
+    }
+    // Why: can't send responses after dispose; abort in-flight work so SSH-side scans/watchers release.
+    this.requestAborts.abortAll()
+    for (const client of this.clients.values()) {
+      client.closed = true
+      client.writer.close(new Error('Relay dispatcher disposed'))
+    }
+    for (const listener of Array.from(this.legacyCapacityListeners)) {
+      listener()
+    }
+    this.legacyCapacityListeners.clear()
+    this.clientCapacityListeners.clear()
+    for (const listener of Array.from(this.disposeListeners)) {
+      listener()
+    }
+    this.disposeListeners.clear()
+  }
+
+  protected createClient(
+    write: RelayClientWrite,
+    sinkOptions?: RelayClientSinkOptions,
+    sessionIdentity?: RelayClientSessionIdentity,
+    sourceOptions?: RelayClientSourceOptions
+  ): RelayClient {
+    const id = this.nextClientId++
+    const client = {
+      id,
+      decoder: undefined as unknown as FrameDecoder,
+      writer: undefined as unknown as DispatcherClientWriter,
+      bulkChain: Promise.resolve(),
+      nextOutgoingSeq: 1,
+      highestReceivedSeq: 0,
+      generation: 0,
+      closed: false,
+      droppedNotificationLog: null,
+      sessionIdentity: sessionIdentity ?? {
+        principal: `unproved:${id}`,
+        authenticated: false,
+        allowSessionOwner: false,
+        authenticationKind: 'unproved'
+      }
+    } satisfies RelayClient
+    client.decoder = new FrameDecoder(
+      (frame) => this.handleFrame(client, frame),
+      (error) => this.closeClient(client, error, client !== this.primaryClient),
+      { pause: sourceOptions?.pauseReads, resume: sourceOptions?.resumeReads }
+    )
+    client.writer = this.createWriter(client, write, sinkOptions)
+    return client
+  }
+
+  protected resetClient(client: RelayClient): void {
+    client.nextOutgoingSeq = 1
+    client.highestReceivedSeq = 0
+    client.decoder.reset()
+    client.generation++
+    client.closed = false
+  }
+
+  protected feedForClient(client: RelayClient, data: Buffer): void {
+    if (this.disposed) {
+      return
+    }
+    try {
+      client.decoder.feed(data)
+    } catch (err) {
+      process.stderr.write(
+        `[relay] Protocol error: ${err instanceof Error ? err.message : String(err)}\n`
+      )
+    }
+  }
+
+  protected startKeepalive(): void {
+    this.keepaliveTimer = setInterval(() => {
+      if (this.disposed) {
+        return
+      }
+      for (const client of this.clients.values()) {
+        if (client.closed) {
+          continue
+        }
+        client.writer.enqueue(
+          'liveness',
+          () => {
+            const seq = client.nextOutgoingSeq++
+            return encodeKeepAliveFrame(seq, client.highestReceivedSeq)
+          },
+          13
+        )
+      }
+    }, KEEPALIVE_SEND_MS)
+    // Why: unref so the keepalive interval doesn't pin the event loop and block process exit.
+    this.keepaliveTimer.unref()
+  }
+
+  protected closeClient(
+    client: RelayClient,
+    error: Error,
+    remove: boolean,
+    // Why the default is the cautious one: most closes here are the relay's own doing, and only the
+    // callers holding real evidence of a peer-side transport end may say so.
+    cause: PtyConsumerCloseCause = 'local'
+  ): void {
+    if (client.closed) {
+      return
+    }
+    client.closed = true
+    this.requestAborts.abortClient(client.id)
+    client.writer.close(error)
+    client.generation++
+    if (remove) {
+      this.clients.delete(client.id)
+    }
+    this.notifyClientDetached(client.id, cause)
+    if (remove) {
+      // Only for a client that is gone for good: an invalidated primary is revived by setWrite, and a
+      // frame stranded by its retired sink must stay armed to retry. After the detach fan-out, so a
+      // listener that unsubscribes on detach is not left holding a stale slot.
+      this.clientCapacityListeners.delete(client.id)
+    }
+    this.notifyLegacyCapacity(true)
+    if (!/^Relay (?:primary client invalidated|client detached)$/.test(error.message)) {
+      process.stderr.write(`[relay] Client write closed: ${error.message}\n`)
+    }
+  }
+
+  private notifyClientDetached(clientId: number, cause: PtyConsumerCloseCause): void {
+    for (const listener of this.clientDetachListeners) {
+      try {
+        listener(clientId, cause)
+      } catch (err) {
+        process.stderr.write(
+          `[relay] Client detach listener failed: ${err instanceof Error ? err.message : String(err)}\n`
+        )
+      }
+    }
+  }
+}
diff --git a/src/relay/dispatcher-client-state.ts b/src/relay/dispatcher-client-state.ts
new file mode 100644
index 00000000000..710a704e4d8
--- /dev/null
+++ b/src/relay/dispatcher-client-state.ts
@@ -0,0 +1,123 @@
+import type { DecodedFrame, JsonRpcNotification, JsonRpcRequest, JsonRpcResponse } from './protocol'
+import { ClientRequestAborts } from './client-request-aborts'
+import type { PtyConsumerCloseCause } from '../shared/pty-consumer-session-contract'
+import {
+  LegacyRelayPublicationLedger,
+  type LegacyPublicationLease
+} from './legacy-relay-publication-ledger'
+import type {
+  DispatcherClientWriter,
+  RelayClientSinkOptions,
+  RelayClientWrite,
+  SinkWriteSettlement
+} from './dispatcher-client-writer'
+import type {
+  MethodHandler,
+  NotificationHandler,
+  PendingRelayRequest,
+  PreparedRelayFrame,
+  PtyDataPublicationAdmission,
+  RelayClient,
+  RelayClientSessionIdentity,
+  RelayClientSourceOptions
+} from './dispatcher-contract'
+
+export abstract class RelayDispatcherClientState {
+  protected readonly primaryClient: RelayClient
+  protected readonly clients = new Map<number, RelayClient>()
+  protected requestHandlers = new Map<string, MethodHandler>()
+  protected notificationHandlers = new Map<string, NotificationHandler>()
+  protected readonly requestAborts = new ClientRequestAborts()
+  protected readonly publicationLedger = new LegacyRelayPublicationLedger()
+  protected pendingRelayRequests = new Map<number, PendingRelayRequest>()
+  protected clientDetachListeners = new Set<
+    (clientId: number, cause: PtyConsumerCloseCause) => void
+  >()
+  protected disposeListeners = new Set<() => void>()
+  protected legacyCapacityListeners = new Set<() => void>()
+  protected clientCapacityListeners = new Map<number, Set<() => void>>()
+  protected ptyDataPublicationAdmission: PtyDataPublicationAdmission | null = null
+  protected publicationTransactionDepth = 0
+  protected deferredLegacyCapacity = false
+  protected deferredForcedLegacyCapacity = false
+  protected keepaliveTimer: ReturnType<typeof setInterval> | null = null
+  protected disposed = false
+  protected nextClientId = 1
+  protected nextRequestId = 1
+
+  constructor(
+    write: RelayClientWrite,
+    sinkOptions?: RelayClientSinkOptions,
+    sessionIdentity?: RelayClientSessionIdentity,
+    sourceOptions?: RelayClientSourceOptions
+  ) {
+    this.primaryClient = this.createClient(write, sinkOptions, sessionIdentity, sourceOptions)
+    this.clients.set(this.primaryClient.id, this.primaryClient)
+    this.startKeepalive()
+  }
+
+  onRequest(method: string, handler: MethodHandler): void {
+    this.requestHandlers.set(method, handler)
+  }
+
+  // Why it throws: this is a single slot, so a second registration silently shadows the
+  // first and which one survives depends only on construction order. `pty.ackData` shipped
+  // that way — a no-op handler was saved from disabling credit acks purely by the adapter
+  // being constructed second (STA-4571). Fail loudly instead of encoding that ordering.
+  onNotification(method: string, handler: NotificationHandler): void {
+    if (this.notificationHandlers.has(method)) {
+      throw new Error(`Notification handler for ${method} is already registered`)
+    }
+    this.notificationHandlers.set(method, handler)
+  }
+
+  onClientDetached(listener: (clientId: number, cause: PtyConsumerCloseCause) => void): () => void {
+    this.clientDetachListeners.add(listener)
+    return () => this.clientDetachListeners.delete(listener)
+  }
+
+  onDisposed(listener: () => void): () => void {
+    this.disposeListeners.add(listener)
+    return () => this.disposeListeners.delete(listener)
+  }
+
+  // Why single-slot rather than a listener set: admission is a veto, so two registrations would have
+  // to agree on precedence. One owner (the PTY consumer session) holds it for the dispatcher's life.
+  registerPtyDataPublicationAdmission(admission: PtyDataPublicationAdmission): () => void {
+    if (this.ptyDataPublicationAdmission) {
+      throw new Error('PTY data publication admission is already registered')
+    }
+    this.ptyDataPublicationAdmission = admission
+    return () => {
+      if (this.ptyDataPublicationAdmission === admission) {
+        this.ptyDataPublicationAdmission = null
+      }
+    }
+  }
+
+  protected abstract createClient(
+    write: RelayClientWrite,
+    sinkOptions?: RelayClientSinkOptions,
+    sessionIdentity?: RelayClientSessionIdentity,
+    sourceOptions?: RelayClientSourceOptions
+  ): RelayClient
+  protected abstract createWriter(
+    client: RelayClient,
+    write: RelayClientWrite,
+    sinkOptions?: RelayClientSinkOptions
+  ): DispatcherClientWriter
+  protected abstract handleFrame(client: RelayClient, frame: DecodedFrame): void
+  protected abstract handleResponse(msg: JsonRpcResponse): void
+  protected abstract handleRequest(client: RelayClient, req: JsonRpcRequest): Promise<void>
+  protected abstract handleNotification(client: RelayClient, notif: JsonRpcNotification): void
+  protected abstract startKeepalive(): void
+  protected abstract notifyClientCapacity(clientId: number): void
+  protected abstract notifyLegacyCapacity(force: boolean): void
+  protected abstract enqueueLeasedFrame(
+    client: RelayClient,
+    frame: PreparedRelayFrame,
+    lane: 'interactive' | 'ordinary' | 'fixed-bulk' | 'bulk',
+    lease: LegacyPublicationLease,
+    onSettled?: (result: SinkWriteSettlement) => void
+  ): boolean
+}
diff --git a/src/relay/dispatcher-contract.ts b/src/relay/dispatcher-contract.ts
new file mode 100644
index 00000000000..15d4578c9bf
--- /dev/null
+++ b/src/relay/dispatcher-contract.ts
@@ -0,0 +1,81 @@
+import type {
+  FrameDecoder,
+  JsonRpcNotification,
+  JsonRpcRequest,
+  JsonRpcResponse,
+  PreparedJsonRpcPayload
+} from './protocol'
+import type { DispatcherClientWriter, SinkWriteSettlement } from './dispatcher-client-writer'
+
+export type RequestContext = {
+  clientId: number
+  isStale: () => boolean
+  signal?: AbortSignal
+  sessionIdentity?: RelayClientSessionIdentity
+  onResponseSettled?: (handler: (result: SinkWriteSettlement) => void) => void
+}
+
+export type RelayClientSessionIdentity = {
+  principal: string
+  authenticated: boolean
+  allowSessionOwner: boolean
+  authenticationKind: 'unproved' | 'launch-nonce' | 'endpoint-credential'
+}
+
+export type RelayClientSourceOptions = {
+  pauseReads?: () => void
+  resumeReads?: () => void
+}
+
+export type PtyDataPublicationAdmission = (
+  clientId: number,
+  params: Readonly<Record<string, unknown>>
+) => boolean
+
+export type MethodHandler = (
+  params: Record<string, unknown>,
+  context: RequestContext
+) => Promise<unknown>
+
+export type NotificationHandler = (params: Record<string, unknown>, context: RequestContext) => void
+
+export type DroppedProducerNotificationLog = {
+  generation: number
+  loggedKeys: Set<string>
+}
+
+export type RelayClient = {
+  id: number
+  decoder: FrameDecoder
+  writer: DispatcherClientWriter
+  bulkChain: Promise<void>
+  nextOutgoingSeq: number
+  highestReceivedSeq: number
+  generation: number
+  closed: boolean
+  droppedNotificationLog: DroppedProducerNotificationLog | null
+  sessionIdentity: RelayClientSessionIdentity
+}
+
+export type OutgoingJsonRpcMessage = JsonRpcRequest | JsonRpcResponse | JsonRpcNotification
+
+export type PreparedRelayFrame = Readonly<{
+  payload: PreparedJsonRpcPayload
+  frameBytes: number
+  ptyDataAdmissionParams: Readonly<Record<string, unknown>> | null
+}>
+
+export type PendingRelayRequest = {
+  resolve: (result: unknown) => void
+  reject: (error: Error) => void
+  timer: ReturnType<typeof setTimeout>
+}
+
+// Why: the log key set is rebuilt per generation, but a producer minting synthetic method names would still
+// grow it inside one generation — cap it well above the fixed relay method vocabulary.
+export const DROPPED_NOTIFICATION_LOG_KEY_LIMIT = 64
+
+export const RESPONSE_OVER_CAPACITY_MESSAGE =
+  'Relay response exceeded the bounded transport capacity'
+
+export const RELAY_TO_CLIENT_REQUEST_TIMEOUT_MS = 30_000
diff --git a/src/relay/dispatcher-frame-codec.ts b/src/relay/dispatcher-frame-codec.ts
new file mode 100644
index 00000000000..b25a0d608ee
--- /dev/null
+++ b/src/relay/dispatcher-frame-codec.ts
@@ -0,0 +1,120 @@
+import {
+  HEADER_LENGTH,
+  MessageType,
+  encodePreparedJsonRpcFrame,
+  parseJsonRpcMessage,
+  prepareJsonRpcPayload,
+  type DecodedFrame,
+  type JsonRpcNotification,
+  type JsonRpcRequest,
+  type JsonRpcResponse
+} from './protocol'
+import type { DispatcherWriterLane, SinkWriteSettlement } from './dispatcher-client-writer'
+import type { OutgoingJsonRpcMessage, PreparedRelayFrame, RelayClient } from './dispatcher-contract'
+import { RelayDispatcherCapacitySignals } from './dispatcher-capacity-signals'
+
+export abstract class RelayDispatcherFrameCodec extends RelayDispatcherCapacitySignals {
+  protected handleFrame(client: RelayClient, frame: DecodedFrame): void {
+    if (frame.id > client.highestReceivedSeq) {
+      client.highestReceivedSeq = frame.id
+    }
+
+    if (frame.type === MessageType.KeepAlive) {
+      return
+    }
+
+    if (frame.type === MessageType.Regular) {
+      try {
+        const msg = parseJsonRpcMessage(frame.payload)
+        this.handleMessage(client, msg)
+      } catch (err) {
+        process.stderr.write(
+          `[relay] Parse error: ${err instanceof Error ? err.message : String(err)}\n`
+        )
+      }
+    }
+  }
+
+  protected prepareFrame(msg: OutgoingJsonRpcMessage): PreparedRelayFrame {
+    const payload = prepareJsonRpcPayload(msg)
+    const params = 'method' in msg && msg.method === 'pty.data' ? (msg.params ?? {}) : null
+    return Object.freeze({
+      payload,
+      frameBytes: HEADER_LENGTH + payload.byteLength,
+      ptyDataAdmissionParams:
+        params === null
+          ? null
+          : Object.freeze({
+              id: params.id,
+              deliveryToken: params.deliveryToken,
+              clientGeneration: params.clientGeneration,
+              ownerGeneration: params.ownerGeneration,
+              ptyIncarnation: params.ptyIncarnation
+            })
+    })
+  }
+
+  protected estimateFrameBytes(msg: OutgoingJsonRpcMessage): number {
+    return HEADER_LENGTH + prepareJsonRpcPayload(msg).byteLength
+  }
+
+  protected enqueueFrame(
+    client: RelayClient,
+    msg: OutgoingJsonRpcMessage,
+    lane: DispatcherWriterLane,
+    onSettled: (result: SinkWriteSettlement) => void = () => {},
+    controlOverflow: 'close-client' | 'reject' = 'close-client'
+  ): boolean {
+    if (this.disposed || client.closed) {
+      return false
+    }
+    return this.enqueuePreparedFrame(
+      client,
+      this.prepareFrame(msg),
+      lane,
+      onSettled,
+      controlOverflow
+    )
+  }
+
+  protected enqueuePreparedFrame(
+    client: RelayClient,
+    frame: PreparedRelayFrame,
+    lane: DispatcherWriterLane,
+    onSettled: (result: SinkWriteSettlement) => void = () => {},
+    controlOverflow: 'close-client' | 'reject' = 'close-client'
+  ): boolean {
+    if (this.disposed || client.closed) {
+      return false
+    }
+    const encode = (): Buffer => {
+      const seq = client.nextOutgoingSeq++
+      return encodePreparedJsonRpcFrame(frame.payload, seq, client.highestReceivedSeq)
+    }
+    const admissionParams = frame.ptyDataAdmissionParams
+    const isStillAdmitted = admissionParams
+      ? () => this.admitsPtyDataPublication(client.id, admissionParams)
+      : undefined
+    return client.writer.enqueue(
+      lane,
+      encode,
+      frame.frameBytes,
+      onSettled,
+      lane === 'control' && controlOverflow === 'reject',
+      isStillAdmitted
+    )
+  }
+
+  private handleMessage(
+    client: RelayClient,
+    msg: JsonRpcRequest | JsonRpcNotification | JsonRpcResponse
+  ): void {
+    if ('id' in msg && 'method' in msg) {
+      void this.handleRequest(client, msg as JsonRpcRequest)
+    } else if ('id' in msg && ('result' in msg || 'error' in msg)) {
+      this.handleResponse(msg as JsonRpcResponse)
+    } else if ('method' in msg && !('id' in msg)) {
+      this.handleNotification(client, msg as JsonRpcNotification)
+    }
+  }
+}
diff --git a/src/relay/dispatcher-notification-publication.ts b/src/relay/dispatcher-notification-publication.ts
new file mode 100644
index 00000000000..ab0851b4203
--- /dev/null
+++ b/src/relay/dispatcher-notification-publication.ts
@@ -0,0 +1,221 @@
+import type { SinkWriteSettlement } from './dispatcher-client-writer'
+import type { JsonRpcNotification } from './protocol'
+import {
+  DROPPED_NOTIFICATION_LOG_KEY_LIMIT,
+  type PreparedRelayFrame,
+  type RelayClient
+} from './dispatcher-contract'
+import { RelayDispatcherPtyPublication } from './dispatcher-pty-publication'
+
+export abstract class RelayDispatcherNotificationPublication extends RelayDispatcherPtyPublication {
+  notify(method: string, params?: Record<string, unknown>): void {
+    if (this.disposed) {
+      return
+    }
+    const msg: JsonRpcNotification = {
+      jsonrpc: '2.0',
+      method,
+      ...(params !== undefined ? { params } : {})
+    }
+    this.runPublicationTransaction(() => {
+      let frame: PreparedRelayFrame | undefined
+      for (const client of this.clients.values()) {
+        if (client.closed) {
+          continue
+        }
+        if (method === 'pty.data' && !this.admitsPtyDataPublication(client.id, params ?? {})) {
+          continue
+        }
+        frame ??= this.prepareFrame(msg)
+        if (method === 'pty.replay') {
+          // Why: replay is never re-sent, so it takes the control lane where overflow is fatal — the
+          // writer closes the client and reconnect reloads history rather than stranding a short buffer.
+          this.enqueuePreparedFrame(client, frame, 'control')
+          continue
+        }
+        // Why: closing can never make an oversized frame sendable — the producer regenerates it after
+        // reattach and re-kills the link, turning a recoverable drop into an endless reconnect loop.
+        if (!this.publishPreparedToClient(client, frame, 'ordinary')) {
+          this.logDroppedProducerNotification(client, method, frame.frameBytes)
+        }
+      }
+    })
+  }
+
+  // Why: producer-lane publication for a single client; notifyClient/tryNotifyClient use the control lane,
+  // which floods must never occupy. Rejection drops the frame and never closes the client.
+  publishProducerNotification(
+    clientId: number,
+    method: string,
+    params?: Record<string, unknown>,
+    // Why: a caller that recovers from rejection itself (the watcher emitter re-sends the batch in
+    // chunks) would otherwise log "Dropped" for a frame it goes on to deliver in full.
+    options?: { logDrop?: boolean }
+  ): boolean {
+    if (this.disposed) {
+      return false
+    }
+    const client = this.clients.get(clientId)
+    if (!client || client.closed) {
+      return false
+    }
+    const msg: JsonRpcNotification = {
+      jsonrpc: '2.0',
+      method,
+      ...(params !== undefined ? { params } : {})
+    }
+    if (method === 'pty.data' && !this.admitsPtyDataPublication(client.id, params ?? {})) {
+      return false
+    }
+    const frame = this.prepareFrame(msg)
+    if (this.publishPreparedToClient(client, frame, 'ordinary')) {
+      return true
+    }
+    // Why: same diagnostics as notify() — a producer that drops here must not do so silently.
+    if (options?.logDrop !== false) {
+      this.logDroppedProducerNotification(client, method, frame.frameBytes)
+    }
+    return false
+  }
+
+  notifyClient(clientId: number, method: string, params?: Record<string, unknown>): void {
+    this.tryNotifyClient(clientId, method, params)
+  }
+
+  tryNotifyClient(
+    clientId: number,
+    method: string,
+    params?: Record<string, unknown>,
+    onSettled: (result: SinkWriteSettlement) => void = () => {},
+    options: {
+      controlOverflow?: 'close-client' | 'reject'
+    } = {}
+  ): boolean {
+    if (this.disposed) {
+      onSettled({ ok: false, error: new Error('Relay dispatcher is disposed') })
+      return false
+    }
+    const client = this.clients.get(clientId)
+    if (!client || client.closed) {
+      onSettled({ ok: false, error: new Error('Relay client is not connected') })
+      return false
+    }
+    return this.enqueueFrame(
+      client,
+      {
+        jsonrpc: '2.0',
+        method,
+        ...(params !== undefined ? { params } : {})
+      },
+      'control',
+      onSettled,
+      options.controlOverflow
+    )
+  }
+
+  notifyControl(method: string, params?: Record<string, unknown>): void {
+    if (this.disposed) {
+      return
+    }
+    const msg: JsonRpcNotification = {
+      jsonrpc: '2.0',
+      method,
+      ...(params !== undefined ? { params } : {})
+    }
+    const clients = this.activeClients()
+    if (clients.length === 0) {
+      return
+    }
+    const frame = this.prepareFrame(msg)
+    for (const client of clients) {
+      if (!this.enqueuePreparedFrame(client, frame, 'control')) {
+        this.closeClient(
+          client,
+          new Error('Relay control publication capacity exceeded'),
+          client !== this.primaryClient
+        )
+      }
+    }
+  }
+
+  /**
+   * Bulk-lane notification: sends are serialized per client and the promise
+   * resolves only after the sink accepted the frame (backpressure), so bulk
+   * producers await between frames and never starve interactive frames.
+   * With `clientId`, targets only that client — broadcasting would let one slow secondary stall everyone.
+   */
+  notifyBulk(
+    method: string,
+    params?: Record<string, unknown>,
+    opts?: { clientId?: number }
+  ): Promise<void> {
+    if (this.disposed) {
+      return Promise.resolve()
+    }
+    const targets =
+      opts?.clientId !== undefined
+        ? [this.clients.get(opts.clientId)].filter((c): c is RelayClient => c !== undefined)
+        : Array.from(this.clients.values())
+    const activeTargets = targets.filter((client) => !client.closed)
+    if (activeTargets.length === 0) {
+      return Promise.resolve()
+    }
+    const msg: JsonRpcNotification = {
+      jsonrpc: '2.0',
+      method,
+      ...(params !== undefined ? { params: { ...params } } : {})
+    }
+    let prepared:
+      | { ok: true; frame: PreparedRelayFrame }
+      | { ok: false; error: unknown }
+      | undefined
+    const prepareOnce = (): PreparedRelayFrame => {
+      if (!prepared) {
+        try {
+          prepared = { ok: true, frame: this.prepareFrame(msg) }
+        } catch (error) {
+          prepared = { ok: false, error }
+        }
+      }
+      if (!prepared.ok) {
+        throw prepared.error
+      }
+      return prepared.frame
+    }
+    const lane = method === 'fs.streamChunk' ? 'fixed-bulk' : 'bulk'
+    const waits: Promise<void>[] = []
+    for (const client of activeTargets) {
+      const step = client.bulkChain.then(() => {
+        if (this.disposed || client.closed) {
+          return
+        }
+        return this.publishBulkWhenAvailable(client, prepareOnce(), lane)
+      })
+      client.bulkChain = step.catch(() => {})
+      waits.push(step)
+    }
+    return Promise.all(waits).then(() => {})
+  }
+
+  // Why: one line per generation, method and drop reason — a flooding producer retries every batch and would
+  // spam stderr, but a transient queue-full drop must not consume the slot a real over-capacity drop needs.
+  private logDroppedProducerNotification(client: RelayClient, method: string, bytes: number): void {
+    const capacity = client.writer.producerFrameCapacity
+    const overCapacity = bytes > capacity
+    const key = `${method}:${overCapacity ? 'over-capacity' : 'queue-full'}`
+    let log = client.droppedNotificationLog
+    if (!log || log.generation !== client.generation) {
+      log = { generation: client.generation, loggedKeys: new Set() }
+      client.droppedNotificationLog = log
+    }
+    if (log.loggedKeys.has(key) || log.loggedKeys.size >= DROPPED_NOTIFICATION_LOG_KEY_LIMIT) {
+      return
+    }
+    log.loggedKeys.add(key)
+    process.stderr.write(
+      overCapacity
+        ? `[relay] Dropped ${method} (${bytes}B > producer frame capacity ${capacity}B)\n`
+        : `[relay] Dropped ${method} (${bytes}B, producer queue full; frame capacity ${capacity}B)\n`
+    )
+  }
+}
diff --git a/src/relay/dispatcher-producer-capacity.ts b/src/relay/dispatcher-producer-capacity.ts
new file mode 100644
index 00000000000..faec90e8b86
--- /dev/null
+++ b/src/relay/dispatcher-producer-capacity.ts
@@ -0,0 +1,108 @@
+import { RelayDispatcherProducerTransport } from './dispatcher-producer-transport'
+
+export abstract class RelayDispatcherProducerCapacity extends RelayDispatcherProducerTransport {
+  maxLegacyPtyDataChars(
+    params: Record<string, unknown>,
+    data: string,
+    limit = data.length
+  ): number {
+    const clients = this.activeClients().filter((client) =>
+      this.admitsPtyDataPublication(client.id, params)
+    )
+    const max = Math.min(data.length, limit)
+    if (clients.length === 0) {
+      return max
+    }
+    if (!(max > 0)) {
+      return 0
+    }
+    const fitsAll = (bytes: number): boolean =>
+      clients.every((client) => bytes <= client.writer.producerFrameCapacity)
+    const sizeFrame = (chunk: string): number =>
+      this.estimateFrameBytes({
+        jsonrpc: '2.0',
+        method: 'pty.data',
+        params: { ...params, data: chunk }
+      })
+    // Fast path: the whole chunk usually fits — one encode instead of log2(n).
+    if (fitsAll(sizeFrame(data.slice(0, max)))) {
+      return max
+    }
+    // Exact per-step size: only the escaped data string varies; its quotes are in baseBytes.
+    const baseBytes = sizeFrame('')
+    const bytesFor = (chars: number): number =>
+      baseBytes + Buffer.byteLength(JSON.stringify(data.slice(0, chars))) - 2
+    let low = 0
+    let high = max
+    while (low < high) {
+      const mid = Math.ceil((low + high) / 2)
+      if (fitsAll(bytesFor(mid))) {
+        low = mid
+      } else {
+        high = mid - 1
+      }
+    }
+    return low
+  }
+
+  activeClientIds(): number[] {
+    return this.activeClients().map((client) => client.id)
+  }
+
+  // Why: signed on purpose — `budget >= 0` is an exact fits-check that a floored budget cannot express.
+  producerEnvelopeBudget(
+    method: string,
+    params: Record<string, unknown>,
+    clientId?: number
+  ): number {
+    if (clientId !== undefined) {
+      const client = this.clients.get(clientId)
+      // Why: a detached or closed target has no room at all — reporting infinite capacity passes a
+      // fits-check and the frame is then dropped by the publish seam instead.
+      if (!client || client.closed) {
+        return Number.MIN_SAFE_INTEGER
+      }
+      return (
+        client.writer.producerFrameCapacity -
+        this.estimateFrameBytes({ jsonrpc: '2.0', method, params })
+      )
+    }
+    const targets = this.activeClients()
+    if (targets.length === 0) {
+      return Number.MAX_SAFE_INTEGER
+    }
+    const frameBytes = this.estimateFrameBytes({ jsonrpc: '2.0', method, params })
+    return Math.min(...targets.map((client) => client.writer.producerFrameCapacity - frameBytes))
+  }
+
+  producerDataBudget(
+    method: string,
+    paramsWithoutData: Record<string, unknown>,
+    clientId?: number
+  ): number {
+    return Math.max(
+      0,
+      this.producerEnvelopeBudget(method, { ...paramsWithoutData, data: '' }, clientId)
+    )
+  }
+
+  // notify() broadcasts one frame, so chunks must fit the smallest attached capacity.
+  broadcastProducerFrameCapacity(): number | undefined {
+    if (this.disposed) {
+      return undefined
+    }
+    const clients = this.activeClients()
+    if (clients.length === 0) {
+      return undefined
+    }
+    return Math.min(...clients.map((client) => client.writer.producerFrameCapacity))
+  }
+
+  notificationFrameBytes(method: string, params?: Record<string, unknown>): number {
+    return this.estimateFrameBytes({
+      jsonrpc: '2.0',
+      method,
+      ...(params !== undefined ? { params } : {})
+    })
+  }
+}
diff --git a/src/relay/dispatcher-producer-transport.ts b/src/relay/dispatcher-producer-transport.ts
new file mode 100644
index 00000000000..089a69577d1
--- /dev/null
+++ b/src/relay/dispatcher-producer-transport.ts
@@ -0,0 +1,164 @@
+import {
+  DEFAULT_PRODUCER_QUEUE_MAX_BYTES,
+  type SinkWriteSettlement
+} from './dispatcher-client-writer'
+import type { LegacyPublicationLease } from './legacy-relay-publication-ledger'
+import type { JsonRpcNotification } from './protocol'
+import type { PreparedRelayFrame, RelayClient } from './dispatcher-contract'
+import { RelayDispatcherRpcRouting } from './dispatcher-rpc-routing'
+
+export abstract class RelayDispatcherProducerTransport extends RelayDispatcherRpcRouting {
+  protected tryPublishToClients(
+    clients: readonly RelayClient[],
+    msg: JsonRpcNotification,
+    lane: 'interactive' | 'ordinary' | 'bulk'
+  ): boolean {
+    return this.runPublicationTransaction(() => {
+      if (clients.length === 0) {
+        return true
+      }
+      const frame = this.prepareFrame(msg)
+      const bytes = frame.frameBytes
+      if (clients.some((client) => !client.writer.canEnqueueProducer(bytes))) {
+        return false
+      }
+      const leases = this.publicationLedger.tryReserve(
+        clients.map((client) => ({ clientKey: this.clientKey(client), bytes }))
+      )
+      if (!leases) {
+        return false
+      }
+      for (let index = 0; index < clients.length; index++) {
+        if (!this.enqueueLeasedFrame(clients[index], frame, lane, leases[index])) {
+          if (this.disposed || clients[index].closed) {
+            continue
+          }
+          for (let remaining = index; remaining < leases.length; remaining++) {
+            leases[remaining].release()
+          }
+          return false
+        }
+      }
+      return true
+    })
+  }
+
+  protected projectToClients(
+    clients: readonly RelayClient[],
+    msg: JsonRpcNotification,
+    lane: 'interactive' | 'ordinary'
+  ): boolean {
+    return this.runPublicationTransaction(() => {
+      if (clients.length === 0) {
+        return true
+      }
+      const frame = this.prepareFrame(msg)
+      for (const client of clients) {
+        if (client.closed || this.publishPreparedToClient(client, frame, lane)) {
+          continue
+        }
+        this.closeClient(
+          client,
+          new Error('Relay PTY subscriber projection capacity exceeded'),
+          client !== this.primaryClient
+        )
+      }
+      return !this.disposed
+    })
+  }
+
+  protected publishToClient(
+    client: RelayClient,
+    msg: JsonRpcNotification,
+    lane: 'interactive' | 'ordinary' | 'fixed-bulk' | 'bulk',
+    onSettled: (result: SinkWriteSettlement) => void = () => {}
+  ): boolean {
+    if (this.disposed || client.closed) {
+      return false
+    }
+    return this.publishPreparedToClient(client, this.prepareFrame(msg), lane, onSettled)
+  }
+
+  protected publishPreparedToClient(
+    client: RelayClient,
+    frame: PreparedRelayFrame,
+    lane: 'interactive' | 'ordinary' | 'fixed-bulk' | 'bulk',
+    onSettled: (result: SinkWriteSettlement) => void = () => {}
+  ): boolean {
+    const bytes = frame.frameBytes
+    const fixedBlocked =
+      lane === 'fixed-bulk' &&
+      (client.writer.retainedProducerBytes > 0 || bytes > client.writer.fixedFrameCapacity)
+    if (fixedBlocked || (lane !== 'fixed-bulk' && !client.writer.canEnqueueProducer(bytes))) {
+      return false
+    }
+    const leases = this.publicationLedger.tryReserve([{ clientKey: this.clientKey(client), bytes }])
+    if (!leases) {
+      return false
+    }
+    return this.enqueueLeasedFrame(client, frame, lane, leases[0], onSettled)
+  }
+
+  protected publishBulkWhenAvailable(
+    client: RelayClient,
+    frame: PreparedRelayFrame,
+    lane: 'fixed-bulk' | 'bulk'
+  ): Promise<void> {
+    const bytes = frame.frameBytes
+    if (bytes > DEFAULT_PRODUCER_QUEUE_MAX_BYTES) {
+      return Promise.reject(new Error('Relay bulk frame exceeds sink producer capacity'))
+    }
+    if (lane === 'bulk' && bytes > client.writer.producerFrameCapacity) {
+      return Promise.reject(new Error('Relay bulk frame exceeds sink frame capacity'))
+    }
+    return new Promise<void>((resolve, reject) => {
+      let removeCapacityListener: (() => void) | null = null
+      const finish = (): void => {
+        removeCapacityListener?.()
+        removeCapacityListener = null
+      }
+      const tryPublish = (): void => {
+        if (this.disposed || client.closed) {
+          finish()
+          resolve()
+          return
+        }
+        if (
+          this.publishPreparedToClient(client, frame, lane, (result) => {
+            finish()
+            if (result.ok || this.disposed || client.closed) {
+              resolve()
+            } else {
+              reject(result.error)
+            }
+          })
+        ) {
+          return
+        }
+        if (!removeCapacityListener) {
+          removeCapacityListener = this.onLegacyPtyCapacity(tryPublish)
+        }
+      }
+      tryPublish()
+    })
+  }
+
+  protected enqueueLeasedFrame(
+    client: RelayClient,
+    frame: PreparedRelayFrame,
+    lane: 'interactive' | 'ordinary' | 'fixed-bulk' | 'bulk',
+    lease: LegacyPublicationLease,
+    onSettled: (result: SinkWriteSettlement) => void = () => {}
+  ): boolean {
+    const accepted = this.enqueuePreparedFrame(client, frame, lane, (result) => {
+      lease.release()
+      onSettled(result)
+      this.notifyLegacyCapacityIfLow()
+    })
+    if (!accepted) {
+      lease.release()
+      this.notifyLegacyCapacityIfLow()
+    }
+    return accepted
+  }
+}
diff --git a/src/relay/dispatcher-pty-publication.ts b/src/relay/dispatcher-pty-publication.ts
new file mode 100644
index 00000000000..40eb149f0f2
--- /dev/null
+++ b/src/relay/dispatcher-pty-publication.ts
@@ -0,0 +1,149 @@
+import type { SinkWriteSettlement } from './dispatcher-client-writer'
+import type { JsonRpcNotification } from './protocol'
+import { RelayDispatcherProducerCapacity } from './dispatcher-producer-capacity'
+
+export abstract class RelayDispatcherPtyPublication extends RelayDispatcherProducerCapacity {
+  tryNotifyPtyData(
+    params: Record<string, unknown>,
+    options: { interactive?: boolean } = {}
+  ): boolean {
+    if (this.disposed) {
+      return false
+    }
+    const msg: JsonRpcNotification = {
+      jsonrpc: '2.0',
+      method: 'pty.data',
+      params
+    }
+    return this.tryPublishToClients(
+      this.activeClients().filter((client) => this.admitsPtyDataPublication(client.id, params)),
+      msg,
+      options.interactive ? 'interactive' : 'ordinary'
+    )
+  }
+
+  tryNotifyPtyDataToMatchingClients(
+    matchesClient: (clientId: number) => boolean,
+    params: Record<string, unknown>,
+    options: { interactive?: boolean } = {}
+  ): boolean {
+    if (this.disposed) {
+      return false
+    }
+    return this.tryPublishToClients(
+      this.activeClients().filter(
+        (client) => matchesClient(client.id) && this.admitsPtyDataPublication(client.id, params)
+      ),
+      { jsonrpc: '2.0', method: 'pty.data', params },
+      options.interactive ? 'interactive' : 'ordinary'
+    )
+  }
+
+  projectPtyDataToMatchingClients(
+    matchesClient: (clientId: number) => boolean,
+    params: Record<string, unknown>,
+    options: { interactive?: boolean } = {}
+  ): boolean {
+    if (this.disposed) {
+      return false
+    }
+    return this.projectToClients(
+      this.activeClients().filter(
+        (client) => matchesClient(client.id) && this.admitsPtyDataPublication(client.id, params)
+      ),
+      { jsonrpc: '2.0', method: 'pty.data', params },
+      options.interactive ? 'interactive' : 'ordinary'
+    )
+  }
+
+  tryNotifyPtyDataToClient(
+    clientId: number,
+    params: Record<string, unknown>,
+    onSettled: (result: SinkWriteSettlement) => void
+  ): boolean {
+    if (this.disposed) {
+      onSettled({ ok: false, error: new Error('Relay dispatcher is disposed') })
+      return false
+    }
+    const client = this.clients.get(clientId)
+    if (!client || client.closed) {
+      onSettled({ ok: false, error: new Error('Relay client is not connected') })
+      return false
+    }
+    if (!this.admitsPtyDataPublication(clientId, params)) {
+      onSettled({ ok: false, error: new Error('PTY publication is not admitted') })
+      return false
+    }
+    return this.publishToClient(
+      client,
+      { jsonrpc: '2.0', method: 'pty.data', params },
+      'ordinary',
+      onSettled
+    )
+  }
+
+  tryNotifyPtyExit(params: Record<string, unknown>): boolean {
+    if (this.disposed) {
+      return false
+    }
+    return this.tryPublishToClients(
+      this.activeClients(),
+      {
+        jsonrpc: '2.0',
+        method: 'pty.exit',
+        params
+      },
+      'ordinary'
+    )
+  }
+
+  tryNotifyPtyExitToMatchingClients(
+    matchesClient: (clientId: number) => boolean,
+    params: Record<string, unknown>
+  ): boolean {
+    if (this.disposed) {
+      return false
+    }
+    return this.tryPublishToClients(
+      this.activeClients().filter((client) => matchesClient(client.id)),
+      { jsonrpc: '2.0', method: 'pty.exit', params },
+      'ordinary'
+    )
+  }
+
+  projectPtyExitToMatchingClients(
+    matchesClient: (clientId: number) => boolean,
+    params: Record<string, unknown>
+  ): boolean {
+    if (this.disposed) {
+      return false
+    }
+    return this.projectToClients(
+      this.activeClients().filter((client) => matchesClient(client.id)),
+      { jsonrpc: '2.0', method: 'pty.exit', params },
+      'ordinary'
+    )
+  }
+
+  tryNotifyPtyExitToClient(
+    clientId: number,
+    params: Record<string, unknown>,
+    onSettled: (result: SinkWriteSettlement) => void
+  ): boolean {
+    if (this.disposed) {
+      onSettled({ ok: false, error: new Error('Relay dispatcher is disposed') })
+      return false
+    }
+    const client = this.clients.get(clientId)
+    if (!client || client.closed) {
+      onSettled({ ok: false, error: new Error('Relay client is not connected') })
+      return false
+    }
+    return this.publishToClient(
+      client,
+      { jsonrpc: '2.0', method: 'pty.exit', params },
+      'ordinary',
+      onSettled
+    )
+  }
+}
diff --git a/src/relay/dispatcher-rpc-routing.ts b/src/relay/dispatcher-rpc-routing.ts
new file mode 100644
index 00000000000..c30d222ff3d
--- /dev/null
+++ b/src/relay/dispatcher-rpc-routing.ts
@@ -0,0 +1,261 @@
+import { MAX_TIMER_DELAY_MS, isSafeTimerDelayMs } from '../shared/timer-delay'
+import {
+  SKILL_INSTALL_RPC_ERROR_CODE,
+  SkillInstallFailureSchema
+} from '../shared/skill-install-failure'
+import {
+  RelayErrorCode,
+  type JsonRpcNotification,
+  type JsonRpcRequest,
+  type JsonRpcResponse
+} from './protocol'
+import {
+  DISPATCHER_CONTROL_QUEUE_MAX_BYTES,
+  type SinkWriteSettlement
+} from './dispatcher-client-writer'
+import {
+  RELAY_TO_CLIENT_REQUEST_TIMEOUT_MS,
+  RESPONSE_OVER_CAPACITY_MESSAGE,
+  type RelayClient,
+  type RequestContext
+} from './dispatcher-contract'
+import { RelayDispatcherFrameCodec } from './dispatcher-frame-codec'
+
+export abstract class RelayDispatcherRpcRouting extends RelayDispatcherFrameCodec {
+  requestPrimary(
+    method: string,
+    params?: Record<string, unknown>,
+    options?: { timeoutMs?: number }
+  ) {
+    return this.requestClient(this.primaryClient.id, method, params, options)
+  }
+
+  requestAnyClient(
+    method: string,
+    params?: Record<string, unknown>,
+    options?: { timeoutMs?: number; excludeClientId?: number }
+  ): Promise<unknown> {
+    const candidates = Array.from(this.clients.values()).filter(
+      (client) => !client.closed && client.id !== options?.excludeClientId
+    )
+    // Why: prefer a real socket client over the synthetic primary so requests don't forward to a dead stdout.
+    const target = candidates.find((client) => client !== this.primaryClient) ?? candidates[0]
+    if (!target) {
+      return Promise.reject(new Error('No owning Orca client is connected to the relay'))
+    }
+    return this.requestClient(target.id, method, params, options)
+  }
+
+  protected handleResponse(msg: JsonRpcResponse): void {
+    const pending = this.pendingRelayRequests.get(msg.id)
+    if (!pending) {
+      return
+    }
+    clearTimeout(pending.timer)
+    this.pendingRelayRequests.delete(msg.id)
+    if (msg.error) {
+      const error = new Error(msg.error.message) as Error & { code?: number; data?: unknown }
+      error.code = msg.error.code
+      error.data = msg.error.data
+      pending.reject(error)
+      return
+    }
+    pending.resolve(msg.result)
+  }
+
+  protected async handleRequest(client: RelayClient, req: JsonRpcRequest): Promise<void> {
+    const handler = this.requestHandlers.get(req.method)
+    if (!handler) {
+      this.sendResponse(client, req.id, undefined, {
+        code: -32601,
+        message: `Method not found: ${req.method}`
+      })
+      return
+    }
+
+    // Why: snapshot generation before the await to detect if the client disconnected mid-flight.
+    const gen = client.generation
+    const { key: abortKey, controller: abortController } = this.requestAborts.create(
+      client.id,
+      req.id
+    )
+    const responseSettledHandlers = new Set<(result: SinkWriteSettlement) => void>()
+    let responseSettled = false
+    const settleResponse = (result: SinkWriteSettlement): void => {
+      if (responseSettled) {
+        return
+      }
+      responseSettled = true
+      for (const callback of responseSettledHandlers) {
+        try {
+          callback(result)
+        } catch (err) {
+          process.stderr.write(
+            `[relay] Response settlement callback failed: ${err instanceof Error ? err.message : String(err)}\n`
+          )
+        }
+      }
+      responseSettledHandlers.clear()
+      this.requestAborts.delete(abortKey)
+    }
+    const context: RequestContext = {
+      clientId: client.id,
+      isStale: () =>
+        client.generation !== gen || !this.clients.has(client.id) || abortController.signal.aborted,
+      signal: abortController.signal,
+      sessionIdentity: client.sessionIdentity,
+      onResponseSettled: (handler) => {
+        if (responseSettled) {
+          throw new Error('Response settlement callback registered after settlement')
+        }
+        responseSettledHandlers.add(handler)
+      }
+    }
+    try {
+      const result = await handler(req.params ?? {}, context)
+      if (context.isStale()) {
+        settleResponse({ ok: false, error: new Error('Relay request became stale') })
+        return
+      }
+      const accepted = this.sendResponse(client, req.id, result, undefined, (settlement) => {
+        settleResponse(
+          context.isStale()
+            ? { ok: false, error: new Error('Relay request became stale') }
+            : settlement
+        )
+      })
+      if (!accepted) {
+        settleResponse({ ok: false, error: new Error('Relay response was not admitted') })
+      }
+    } catch (err) {
+      if (context.isStale()) {
+        settleResponse({ ok: false, error: new Error('Relay request became stale') })
+        return
+      }
+      const message = err instanceof Error ? err.message : String(err)
+      const errorCode = (err as { code?: unknown }).code
+      const code = typeof errorCode === 'number' ? errorCode : -32000
+      const skillFailure =
+        errorCode === SKILL_INSTALL_RPC_ERROR_CODE
+          ? SkillInstallFailureSchema.safeParse((err as { data?: unknown }).data)
+          : null
+      const data = skillFailure?.success === true ? skillFailure.data : undefined
+      const accepted = this.sendResponse(
+        client,
+        req.id,
+        undefined,
+        { code, message, ...(data === undefined ? {} : { data }) },
+        (result) => {
+          settleResponse({
+            ok: false,
+            error: result.ok ? new Error(message) : result.error
+          })
+        }
+      )
+      if (!accepted) {
+        settleResponse({ ok: false, error: new Error('Relay error response was not admitted') })
+      }
+    }
+  }
+
+  protected handleNotification(client: RelayClient, notif: JsonRpcNotification): void {
+    if (notif.method === 'rpc.cancel') {
+      const id = Number((notif.params ?? {}).id)
+      const controller = this.requestAborts.get(client.id, id)
+      controller?.abort()
+      return
+    }
+    const handler = this.notificationHandlers.get(notif.method)
+    if (handler) {
+      const gen = client.generation
+      handler(notif.params ?? {}, {
+        clientId: client.id,
+        isStale: () => client.generation !== gen || !this.clients.has(client.id),
+        sessionIdentity: client.sessionIdentity,
+        onResponseSettled: () => {
+          throw new Error('Notifications do not have response publication fences')
+        }
+      })
+    }
+  }
+
+  protected sendResponse(
+    client: RelayClient,
+    id: number,
+    result?: unknown,
+    error?: { code: number; message: string; data?: unknown },
+    onSettled: (result: SinkWriteSettlement) => void = () => {}
+  ): boolean {
+    const msg: JsonRpcResponse = {
+      jsonrpc: '2.0',
+      id,
+      ...(error ? { error } : { result: result ?? null })
+    }
+    const frame = this.prepareFrame(msg)
+    const lane =
+      frame.frameBytes > DISPATCHER_CONTROL_QUEUE_MAX_BYTES ? 'legacy-response' : 'control'
+    const accepted = this.enqueuePreparedFrame(client, frame, lane, onSettled)
+    if (accepted) {
+      return true
+    }
+    // Why: an oversized response must fail its own request; closing would kill every pane on the host.
+    // A rejected first enqueue either left onSettled untouched or closed the client, so exactly one settlement happens.
+    return this.enqueuePreparedFrame(
+      client,
+      this.prepareFrame({
+        jsonrpc: '2.0',
+        id,
+        error: {
+          code: RelayErrorCode.ResponseOverCapacity,
+          message: RESPONSE_OVER_CAPACITY_MESSAGE
+        }
+      }),
+      'control',
+      // Why: writing the substitute is not delivering the result — a settlement fence must never read
+      // the capacity error's successful write as "the peer received your result".
+      (settlement) =>
+        onSettled(
+          settlement.ok
+            ? { ok: false, error: new Error(RESPONSE_OVER_CAPACITY_MESSAGE) }
+            : settlement
+        )
+    )
+  }
+
+  private requestClient(
+    clientId: number,
+    method: string,
+    params?: Record<string, unknown>,
+    options?: { timeoutMs?: number }
+  ): Promise<unknown> {
+    const client = this.clients.get(clientId)
+    if (this.disposed || !client || client.closed) {
+      return Promise.reject(new Error('Relay client is not connected'))
+    }
+    const timeoutMs = options?.timeoutMs ?? RELAY_TO_CLIENT_REQUEST_TIMEOUT_MS
+    if (!isSafeTimerDelayMs(timeoutMs)) {
+      return Promise.reject(
+        new Error(`Request timeout must be an integer between 0 and ${MAX_TIMER_DELAY_MS}ms`)
+      )
+    }
+    const id = this.nextRequestId++
+    const msg: JsonRpcRequest = {
+      jsonrpc: '2.0',
+      id,
+      method,
+      ...(params !== undefined ? { params } : {})
+    }
+    return new Promise((resolve, reject) => {
+      const timer = setTimeout(() => {
+        this.pendingRelayRequests.delete(id)
+        reject(new Error(`Request "${method}" timed out after ${timeoutMs}ms`))
+      }, timeoutMs)
+      this.pendingRelayRequests.set(id, { resolve, reject, timer })
+      if (!this.enqueueFrame(client, msg, 'control', () => {}, 'reject')) {
+        clearTimeout(timer)
+        this.pendingRelayRequests.delete(id)
+        reject(new Error(`Request "${method}" exceeded the relay control transport capacity`))
+      }
+    })
+  }
+}
diff --git a/src/relay/dispatcher.ts b/src/relay/dispatcher.ts
index 00e1836d9d7..dbf70abd906 100644
--- a/src/relay/dispatcher.ts
+++ b/src/relay/dispatcher.ts
@@ -1,1516 +1,17 @@
-/* eslint-disable max-lines -- dispatcher keeps client routing, cancellation, and framing state together */
-import {
-  FrameDecoder,
-  HEADER_LENGTH,
-  MessageType,
-  encodePreparedJsonRpcFrame,
-  encodeKeepAliveFrame,
-  parseJsonRpcMessage,
-  prepareJsonRpcPayload,
-  KEEPALIVE_SEND_MS,
-  RelayErrorCode,
-  type DecodedFrame,
-  type JsonRpcRequest,
-  type JsonRpcNotification,
-  type JsonRpcResponse,
-  type PreparedJsonRpcPayload
-} from './protocol'
-import { ClientRequestAborts } from './client-request-aborts'
-import { MAX_TIMER_DELAY_MS, isSafeTimerDelayMs } from '../shared/timer-delay'
-import {
-  DISPATCHER_CONTROL_QUEUE_MAX_BYTES,
-  DEFAULT_PRODUCER_QUEUE_MAX_BYTES,
-  DispatcherClientWriter,
-  type DispatcherWriterLane,
-  type RelayClientSinkOptions,
-  type RelayClientWrite,
-  type SinkWriteSettlement
-} from './dispatcher-client-writer'
-import {
-  LegacyRelayPublicationLedger,
-  type LegacyPublicationLease
-} from './legacy-relay-publication-ledger'
-import type { PtyConsumerCloseCause } from '../shared/pty-consumer-session-contract'
-import {
-  SKILL_INSTALL_RPC_ERROR_CODE,
-  SkillInstallFailureSchema
-} from '../shared/skill-install-failure'
+import { RelayDispatcherNotificationPublication } from './dispatcher-notification-publication'
 
 export type {
   RelayClientSinkOptions,
   RelayClientWrite,
   SinkWriteSettlement
 } from './dispatcher-client-writer'
-
-export type RequestContext = {
-  clientId: number
-  isStale: () => boolean
-  signal?: AbortSignal
-  sessionIdentity?: RelayClientSessionIdentity
-  onResponseSettled?: (handler: (result: SinkWriteSettlement) => void) => void
-}
-
-export type RelayClientSessionIdentity = {
-  principal: string
-  authenticated: boolean
-  allowSessionOwner: boolean
-  authenticationKind: 'unproved' | 'launch-nonce' | 'endpoint-credential'
-}
-
-export type RelayClientSourceOptions = {
-  pauseReads?: () => void
-  resumeReads?: () => void
-}
-
-export type PtyDataPublicationAdmission = (
-  clientId: number,
-  params: Readonly<Record<string, unknown>>
-) => boolean
-
-export type MethodHandler = (
-  params: Record<string, unknown>,
-  context: RequestContext
-) => Promise<unknown>
-
-export type NotificationHandler = (params: Record<string, unknown>, context: RequestContext) => void
-
-type RelayClient = {
-  id: number
-  decoder: FrameDecoder
-  writer: DispatcherClientWriter
-  bulkChain: Promise<void>
-  nextOutgoingSeq: number
-  highestReceivedSeq: number
-  generation: number
-  closed: boolean
-  droppedNotificationLog: DroppedProducerNotificationLog | null
-  sessionIdentity: RelayClientSessionIdentity
-}
-
-type OutgoingJsonRpcMessage = JsonRpcRequest | JsonRpcResponse | JsonRpcNotification
-
-type PreparedRelayFrame = Readonly<{
-  payload: PreparedJsonRpcPayload
-  frameBytes: number
-  ptyDataAdmissionParams: Readonly<Record<string, unknown>> | null
-}>
-
-// Why: the log key set is rebuilt per generation, but a producer minting synthetic method names would still
-// grow it inside one generation — cap it well above the fixed relay method vocabulary.
-const DROPPED_NOTIFICATION_LOG_KEY_LIMIT = 64
-
-const RESPONSE_OVER_CAPACITY_MESSAGE = 'Relay response exceeded the bounded transport capacity'
-
-type DroppedProducerNotificationLog = {
-  generation: number
-  loggedKeys: Set<string>
-}
-
-type PendingRelayRequest = {
-  resolve: (result: unknown) => void
-  reject: (error: Error) => void
-  timer: ReturnType<typeof setTimeout>
-}
-
-const RELAY_TO_CLIENT_REQUEST_TIMEOUT_MS = 30_000
-
-export class RelayDispatcher {
-  private readonly primaryClient: RelayClient
-  private readonly clients = new Map<number, RelayClient>()
-  private requestHandlers = new Map<string, MethodHandler>()
-  private notificationHandlers = new Map<string, NotificationHandler>()
-  private readonly requestAborts = new ClientRequestAborts()
-  private readonly publicationLedger = new LegacyRelayPublicationLedger()
-  private pendingRelayRequests = new Map<number, PendingRelayRequest>()
-  private clientDetachListeners = new Set<
-    (clientId: number, cause: PtyConsumerCloseCause) => void
-  >()
-  private disposeListeners = new Set<() => void>()
-  private legacyCapacityListeners = new Set<() => void>()
-  private clientCapacityListeners = new Map<number, Set<() => void>>()
-  private ptyDataPublicationAdmission: PtyDataPublicationAdmission | null = null
-  private publicationTransactionDepth = 0
-  private deferredLegacyCapacity = false
-  private deferredForcedLegacyCapacity = false
-  private keepaliveTimer: ReturnType<typeof setInterval> | null = null
-  private disposed = false
-  private nextClientId = 1
-  private nextRequestId = 1
-
-  constructor(
-    write: RelayClientWrite,
-    sinkOptions?: RelayClientSinkOptions,
-    sessionIdentity?: RelayClientSessionIdentity,
-    sourceOptions?: RelayClientSourceOptions
-  ) {
-    this.primaryClient = this.createClient(write, sinkOptions, sessionIdentity, sourceOptions)
-    this.clients.set(this.primaryClient.id, this.primaryClient)
-    this.startKeepalive()
-  }
-
-  // Why: redirect outgoing frames to the reconnected socket without rebuilding the dispatcher + handler tree.
-  // Why: a new multiplexer restarts at seq=1; reset state to avoid stalled acknowledgements.
-  setWrite(write: RelayClientWrite, sinkOptions?: RelayClientSinkOptions): void {
-    this.requestAborts.abortClient(this.primaryClient.id)
-    this.primaryClient.closed = true
-    this.primaryClient.writer.close(new Error('Relay primary sink replaced'))
-    this.resetClient(this.primaryClient)
-    this.primaryClient.writer = this.createWriter(this.primaryClient, write, sinkOptions)
-    // Why: a frame retained against the replaced sink would otherwise wait for traffic that may never come.
-    this.notifyClientCapacity(this.primaryClient.id)
-  }
-
-  // Why: mark in-flight requests stale on disconnect so a late pty.spawn/fs.watch can't create unowned remote state.
-  invalidateClient(cause: PtyConsumerCloseCause = 'local'): void {
-    this.closeClient(
-      this.primaryClient,
-      new Error('Relay primary client invalidated'),
-      false,
-      cause
-    )
-  }
-
-  // Why: seq numbers and request ids are per SSH channel, so each attached client needs independent protocol state.
-  attachClient(
-    write: RelayClientWrite,
-    sinkOptions?: RelayClientSinkOptions,
-    sessionIdentity?: RelayClientSessionIdentity,
-    sourceOptions?: RelayClientSourceOptions
-  ): number {
-    const client = this.createClient(write, sinkOptions, sessionIdentity, sourceOptions)
-    this.clients.set(client.id, client)
-    return client.id
-  }
-
-  detachClient(clientId: number, cause: PtyConsumerCloseCause = 'local'): void {
-    const client = this.clients.get(clientId)
-    if (!client || client === this.primaryClient) {
-      return
-    }
-    this.closeClient(client, new Error('Relay client detached'), true, cause)
-  }
-
-  // Why: a displaced owner must lose its transport whichever client holds it, and the launch channel is
-  // often the half-open one. The primary keeps its id for setWrite() revival, so invalidate it instead.
-  releaseDisplacedClient(clientId: number): void {
-    if (clientId === this.primaryClient.id) {
-      this.invalidateClient()
-      return
-    }
-    this.detachClient(clientId)
-  }
-
-  feedClient(clientId: number, data: Buffer): void {
-    const client = this.clients.get(clientId)
-    if (!client) {
-      return
-    }
-    this.feedForClient(client, data)
-  }
-
-  onRequest(method: string, handler: MethodHandler): void {
-    this.requestHandlers.set(method, handler)
-  }
-
-  // Why it throws: this is a single slot, so a second registration silently shadows the
-  // first and which one survives depends only on construction order. `pty.ackData` shipped
-  // that way — a no-op handler was saved from disabling credit acks purely by the adapter
-  // being constructed second (STA-4571). Fail loudly instead of encoding that ordering.
-  onNotification(method: string, handler: NotificationHandler): void {
-    if (this.notificationHandlers.has(method)) {
-      throw new Error(`Notification handler for ${method} is already registered`)
-    }
-    this.notificationHandlers.set(method, handler)
-  }
-
-  onClientDetached(listener: (clientId: number, cause: PtyConsumerCloseCause) => void): () => void {
-    this.clientDetachListeners.add(listener)
-    return () => this.clientDetachListeners.delete(listener)
-  }
-
-  onDisposed(listener: () => void): () => void {
-    this.disposeListeners.add(listener)
-    return () => this.disposeListeners.delete(listener)
-  }
-
-  // Why single-slot rather than a listener set: admission is a veto, so two registrations would have
-  // to agree on precedence. One owner (the PTY consumer session) holds it for the dispatcher's life.
-  registerPtyDataPublicationAdmission(admission: PtyDataPublicationAdmission): () => void {
-    if (this.ptyDataPublicationAdmission) {
-      throw new Error('PTY data publication admission is already registered')
-    }
-    this.ptyDataPublicationAdmission = admission
-    return () => {
-      if (this.ptyDataPublicationAdmission === admission) {
-        this.ptyDataPublicationAdmission = null
-      }
-    }
-  }
-
-  onLegacyPtyCapacity(listener: () => void): () => void {
-    this.legacyCapacityListeners.add(listener)
-    return () => this.legacyCapacityListeners.delete(listener)
-  }
-
-  /**
-   * Ungated per-client writer capacity, for a frame that lost control-lane admission and must retry.
-   * onLegacyPtyCapacity cannot serve that: it is gated on producer retention, so it stays silent
-   * exactly under the dual-queue pressure that rejected the frame. Registered on the dispatcher, not
-   * the writer, so a retry survives setWrite() replacing the primary sink.
-   * Returns null only when the client is gone for good. A merely closed client still counts: setWrite
-   * marks the primary closed before replacing its sink, and that replacement is exactly when a frame
-   * stranded by the old writer must be armed to retry.
-   */
-  onClientCapacity(clientId: number, listener: () => void): (() => void) | null {
-    const client = this.clients.get(clientId)
-    if (this.disposed || !client) {
-      return null
-    }
-    const listeners = this.clientCapacityListeners.get(clientId) ?? new Set<() => void>()
-    listeners.add(listener)
-    this.clientCapacityListeners.set(clientId, listeners)
-    return () => {
-      const current = this.clientCapacityListeners.get(clientId)
-      if (!current?.delete(listener) || current.size > 0) {
-        return
-      }
-      this.clientCapacityListeners.delete(clientId)
-    }
-  }
-
-  /**
-   * Whether the id still names a client. A detach notification does not always mean it stopped:
-   * invalidateClient() detaches the primary without removing it, and setWrite() revives that same id.
-   */
-  isClientAttached(clientId: number): boolean {
-    return !this.disposed && this.clients.has(clientId)
-  }
-
-  canAdmitControlFrame(clientId: number, estimatedBytes: number): boolean {
-    const client = this.clients.get(clientId)
-    if (this.disposed || !client || client.closed) {
-      return false
-    }
-    return client.writer.canEnqueueControl(estimatedBytes)
-  }
-
-  get legacyRetentionBelowLowWater(): boolean {
-    return this.publicationLedger.belowLowWater(this.activeClientKeys())
-  }
-
-  /**
-   * Same reserve as legacyRetentionBelowLowWater, but scoped to one client: a paced bulk producer
-   * gated on the dispatcher-wide signal stops for a peer's stall and degrades a healthy link.
-   * The relay-wide aggregate still counts — that ceiling is shared by every client.
-   */
-  producerRetentionBelowLowWater(clientId: number): boolean {
-    const client = this.clients.get(clientId)
-    if (!client || client.closed) {
-      return false
-    }
-    return this.publicationLedger.belowLowWater([this.clientKey(client)])
-  }
-
-  writePrimaryBytes(data: Buffer, lane: 'control' | 'ordinary' = 'control'): boolean {
-    if (this.disposed || this.primaryClient.closed) {
-      return false
-    }
-    return this.primaryClient.writer.enqueue(lane, () => data, data.length)
-  }
-
-  maxLegacyPtyDataChars(
-    params: Record<string, unknown>,
-    data: string,
-    limit = data.length
-  ): number {
-    const clients = this.activeClients().filter((client) =>
-      this.admitsPtyDataPublication(client.id, params)
-    )
-    const max = Math.min(data.length, limit)
-    if (clients.length === 0) {
-      return max
-    }
-    if (!(max > 0)) {
-      return 0
-    }
-    const fitsAll = (bytes: number): boolean =>
-      clients.every((client) => bytes <= client.writer.producerFrameCapacity)
-    const sizeFrame = (chunk: string): number =>
-      this.estimateFrameBytes({
-        jsonrpc: '2.0',
-        method: 'pty.data',
-        params: { ...params, data: chunk }
-      })
-    // Fast path: the whole chunk usually fits — one encode instead of log2(n).
-    if (fitsAll(sizeFrame(data.slice(0, max)))) {
-      return max
-    }
-    // Exact per-step size: only the escaped data string varies; its quotes are in baseBytes.
-    const baseBytes = sizeFrame('')
-    const bytesFor = (chars: number): number =>
-      baseBytes + Buffer.byteLength(JSON.stringify(data.slice(0, chars))) - 2
-    let low = 0
-    let high = max
-    while (low < high) {
-      const mid = Math.ceil((low + high) / 2)
-      if (fitsAll(bytesFor(mid))) {
-        low = mid
-      } else {
-        high = mid - 1
-      }
-    }
-    return low
-  }
-
-  tryNotifyPtyData(
-    params: Record<string, unknown>,
-    options: { interactive?: boolean } = {}
-  ): boolean {
-    if (this.disposed) {
-      return false
-    }
-    const msg: JsonRpcNotification = {
-      jsonrpc: '2.0',
-      method: 'pty.data',
-      params
-    }
-    return this.tryPublishToClients(
-      this.activeClients().filter((client) => this.admitsPtyDataPublication(client.id, params)),
-      msg,
-      options.interactive ? 'interactive' : 'ordinary'
-    )
-  }
-
-  tryNotifyPtyDataToMatchingClients(
-    matchesClient: (clientId: number) => boolean,
-    params: Record<string, unknown>,
-    options: { interactive?: boolean } = {}
-  ): boolean {
-    if (this.disposed) {
-      return false
-    }
-    return this.tryPublishToClients(
-      this.activeClients().filter(
-        (client) => matchesClient(client.id) && this.admitsPtyDataPublication(client.id, params)
-      ),
-      { jsonrpc: '2.0', method: 'pty.data', params },
-      options.interactive ? 'interactive' : 'ordinary'
-    )
-  }
-
-  projectPtyDataToMatchingClients(
-    matchesClient: (clientId: number) => boolean,
-    params: Record<string, unknown>,
-    options: { interactive?: boolean } = {}
-  ): boolean {
-    if (this.disposed) {
-      return false
-    }
-    return this.projectToClients(
-      this.activeClients().filter(
-        (client) => matchesClient(client.id) && this.admitsPtyDataPublication(client.id, params)
-      ),
-      { jsonrpc: '2.0', method: 'pty.data', params },
-      options.interactive ? 'interactive' : 'ordinary'
-    )
-  }
-
-  tryNotifyPtyDataToClient(
-    clientId: number,
-    params: Record<string, unknown>,
-    onSettled: (result: SinkWriteSettlement) => void
-  ): boolean {
-    if (this.disposed) {
-      onSettled({ ok: false, error: new Error('Relay dispatcher is disposed') })
-      return false
-    }
-    const client = this.clients.get(clientId)
-    if (!client || client.closed) {
-      onSettled({ ok: false, error: new Error('Relay client is not connected') })
-      return false
-    }
-    if (!this.admitsPtyDataPublication(clientId, params)) {
-      onSettled({ ok: false, error: new Error('PTY publication is not admitted') })
-      return false
-    }
-    return this.publishToClient(
-      client,
-      { jsonrpc: '2.0', method: 'pty.data', params },
-      'ordinary',
-      onSettled
-    )
-  }
-
-  tryNotifyPtyExit(params: Record<string, unknown>): boolean {
-    if (this.disposed) {
-      return false
-    }
-    return this.tryPublishToClients(
-      this.activeClients(),
-      {
-        jsonrpc: '2.0',
-        method: 'pty.exit',
-        params
-      },
-      'ordinary'
-    )
-  }
-
-  tryNotifyPtyExitToMatchingClients(
-    matchesClient: (clientId: number) => boolean,
-    params: Record<string, unknown>
-  ): boolean {
-    if (this.disposed) {
-      return false
-    }
-    return this.tryPublishToClients(
-      this.activeClients().filter((client) => matchesClient(client.id)),
-      { jsonrpc: '2.0', method: 'pty.exit', params },
-      'ordinary'
-    )
-  }
-
-  projectPtyExitToMatchingClients(
-    matchesClient: (clientId: number) => boolean,
-    params: Record<string, unknown>
-  ): boolean {
-    if (this.disposed) {
-      return false
-    }
-    return this.projectToClients(
-      this.activeClients().filter((client) => matchesClient(client.id)),
-      { jsonrpc: '2.0', method: 'pty.exit', params },
-      'ordinary'
-    )
-  }
-
-  tryNotifyPtyExitToClient(
-    clientId: number,
-    params: Record<string, unknown>,
-    onSettled: (result: SinkWriteSettlement) => void
-  ): boolean {
-    if (this.disposed) {
-      onSettled({ ok: false, error: new Error('Relay dispatcher is disposed') })
-      return false
-    }
-    const client = this.clients.get(clientId)
-    if (!client || client.closed) {
-      onSettled({ ok: false, error: new Error('Relay client is not connected') })
-      return false
-    }
-    return this.publishToClient(
-      client,
-      { jsonrpc: '2.0', method: 'pty.exit', params },
-      'ordinary',
-      onSettled
-    )
-  }
-
-  activeClientIds(): number[] {
-    return this.activeClients().map((client) => client.id)
-  }
-
-  // Why: signed on purpose — `budget >= 0` is an exact fits-check that a floored budget cannot express.
-  producerEnvelopeBudget(
-    method: string,
-    params: Record<string, unknown>,
-    clientId?: number
-  ): number {
-    if (clientId !== undefined) {
-      const client = this.clients.get(clientId)
-      // Why: a detached or closed target has no room at all — reporting infinite capacity passes a
-      // fits-check and the frame is then dropped by the publish seam instead.
-      if (!client || client.closed) {
-        return Number.MIN_SAFE_INTEGER
-      }
-      return (
-        client.writer.producerFrameCapacity -
-        this.estimateFrameBytes({ jsonrpc: '2.0', method, params })
-      )
-    }
-    const targets = this.activeClients()
-    if (targets.length === 0) {
-      return Number.MAX_SAFE_INTEGER
-    }
-    const frameBytes = this.estimateFrameBytes({ jsonrpc: '2.0', method, params })
-    return Math.min(...targets.map((client) => client.writer.producerFrameCapacity - frameBytes))
-  }
-
-  producerDataBudget(
-    method: string,
-    paramsWithoutData: Record<string, unknown>,
-    clientId?: number
-  ): number {
-    return Math.max(
-      0,
-      this.producerEnvelopeBudget(method, { ...paramsWithoutData, data: '' }, clientId)
-    )
-  }
-
-  // notify() broadcasts one frame, so chunks must fit the smallest attached capacity.
-  broadcastProducerFrameCapacity(): number | undefined {
-    if (this.disposed) {
-      return undefined
-    }
-    const clients = this.activeClients()
-    if (clients.length === 0) {
-      return undefined
-    }
-    return Math.min(...clients.map((client) => client.writer.producerFrameCapacity))
-  }
-
-  notificationFrameBytes(method: string, params?: Record<string, unknown>): number {
-    return this.estimateFrameBytes({
-      jsonrpc: '2.0',
-      method,
-      ...(params !== undefined ? { params } : {})
-    })
-  }
-
-  feed(data: Buffer): void {
-    this.feedForClient(this.primaryClient, data)
-  }
-
-  private feedForClient(client: RelayClient, data: Buffer): void {
-    if (this.disposed) {
-      return
-    }
-    try {
-      client.decoder.feed(data)
-    } catch (err) {
-      process.stderr.write(
-        `[relay] Protocol error: ${err instanceof Error ? err.message : String(err)}\n`
-      )
-    }
-  }
-
-  notify(method: string, params?: Record<string, unknown>): void {
-    if (this.disposed) {
-      return
-    }
-    const msg: JsonRpcNotification = {
-      jsonrpc: '2.0',
-      method,
-      ...(params !== undefined ? { params } : {})
-    }
-    this.runPublicationTransaction(() => {
-      let frame: PreparedRelayFrame | undefined
-      for (const client of this.clients.values()) {
-        if (client.closed) {
-          continue
-        }
-        if (method === 'pty.data' && !this.admitsPtyDataPublication(client.id, params ?? {})) {
-          continue
-        }
-        frame ??= this.prepareFrame(msg)
-        if (method === 'pty.replay') {
-          // Why: replay is never re-sent, so it takes the control lane where overflow is fatal — the
-          // writer closes the client and reconnect reloads history rather than stranding a short buffer.
-          this.enqueuePreparedFrame(client, frame, 'control')
-          continue
-        }
-        // Why: closing can never make an oversized frame sendable — the producer regenerates it after
-        // reattach and re-kills the link, turning a recoverable drop into an endless reconnect loop.
-        if (!this.publishPreparedToClient(client, frame, 'ordinary')) {
-          this.logDroppedProducerNotification(client, method, frame.frameBytes)
-        }
-      }
-    })
-  }
-
-  // Why: producer-lane publication for a single client; notifyClient/tryNotifyClient use the control lane,
-  // which floods must never occupy. Rejection drops the frame and never closes the client.
-  publishProducerNotification(
-    clientId: number,
-    method: string,
-    params?: Record<string, unknown>,
-    // Why: a caller that recovers from rejection itself (the watcher emitter re-sends the batch in
-    // chunks) would otherwise log "Dropped" for a frame it goes on to deliver in full.
-    options?: { logDrop?: boolean }
-  ): boolean {
-    if (this.disposed) {
-      return false
-    }
-    const client = this.clients.get(clientId)
-    if (!client || client.closed) {
-      return false
-    }
-    const msg: JsonRpcNotification = {
-      jsonrpc: '2.0',
-      method,
-      ...(params !== undefined ? { params } : {})
-    }
-    if (method === 'pty.data' && !this.admitsPtyDataPublication(client.id, params ?? {})) {
-      return false
-    }
-    const frame = this.prepareFrame(msg)
-    if (this.publishPreparedToClient(client, frame, 'ordinary')) {
-      return true
-    }
-    // Why: same diagnostics as notify() — a producer that drops here must not do so silently.
-    if (options?.logDrop !== false) {
-      this.logDroppedProducerNotification(client, method, frame.frameBytes)
-    }
-    return false
-  }
-
-  // Why: one line per generation, method and drop reason — a flooding producer retries every batch and would
-  // spam stderr, but a transient queue-full drop must not consume the slot a real over-capacity drop needs.
-  private logDroppedProducerNotification(client: RelayClient, method: string, bytes: number): void {
-    const capacity = client.writer.producerFrameCapacity
-    const overCapacity = bytes > capacity
-    const key = `${method}:${overCapacity ? 'over-capacity' : 'queue-full'}`
-    let log = client.droppedNotificationLog
-    if (!log || log.generation !== client.generation) {
-      log = { generation: client.generation, loggedKeys: new Set() }
-      client.droppedNotificationLog = log
-    }
-    if (log.loggedKeys.has(key) || log.loggedKeys.size >= DROPPED_NOTIFICATION_LOG_KEY_LIMIT) {
-      return
-    }
-    log.loggedKeys.add(key)
-    process.stderr.write(
-      overCapacity
-        ? `[relay] Dropped ${method} (${bytes}B > producer frame capacity ${capacity}B)\n`
-        : `[relay] Dropped ${method} (${bytes}B, producer queue full; frame capacity ${capacity}B)\n`
-    )
-  }
-
-  notifyClient(clientId: number, method: string, params?: Record<string, unknown>): void {
-    this.tryNotifyClient(clientId, method, params)
-  }
-
-  tryNotifyClient(
-    clientId: number,
-    method: string,
-    params?: Record<string, unknown>,
-    onSettled: (result: SinkWriteSettlement) => void = () => {},
-    options: {
-      controlOverflow?: 'close-client' | 'reject'
-    } = {}
-  ): boolean {
-    if (this.disposed) {
-      onSettled({ ok: false, error: new Error('Relay dispatcher is disposed') })
-      return false
-    }
-    const client = this.clients.get(clientId)
-    if (!client || client.closed) {
-      onSettled({ ok: false, error: new Error('Relay client is not connected') })
-      return false
-    }
-    return this.enqueueFrame(
-      client,
-      {
-        jsonrpc: '2.0',
-        method,
-        ...(params !== undefined ? { params } : {})
-      },
-      'control',
-      onSettled,
-      options.controlOverflow
-    )
-  }
-
-  notifyControl(method: string, params?: Record<string, unknown>): void {
-    if (this.disposed) {
-      return
-    }
-    const msg: JsonRpcNotification = {
-      jsonrpc: '2.0',
-      method,
-      ...(params !== undefined ? { params } : {})
-    }
-    const clients = this.activeClients()
-    if (clients.length === 0) {
-      return
-    }
-    const frame = this.prepareFrame(msg)
-    for (const client of clients) {
-      if (!this.enqueuePreparedFrame(client, frame, 'control')) {
-        this.closeClient(
-          client,
-          new Error('Relay control publication capacity exceeded'),
-          client !== this.primaryClient
-        )
-      }
-    }
-  }
-
-  /**
-   * Bulk-lane notification: sends are serialized per client and the promise
-   * resolves only after the sink accepted the frame (backpressure), so bulk
-   * producers await between frames and never starve interactive frames.
-   * With `clientId`, targets only that client — broadcasting would let one slow secondary stall everyone.
-   */
-  notifyBulk(
-    method: string,
-    params?: Record<string, unknown>,
-    opts?: { clientId?: number }
-  ): Promise<void> {
-    if (this.disposed) {
-      return Promise.resolve()
-    }
-    const targets =
-      opts?.clientId !== undefined
-        ? [this.clients.get(opts.clientId)].filter((c): c is RelayClient => c !== undefined)
-        : Array.from(this.clients.values())
-    const activeTargets = targets.filter((client) => !client.closed)
-    if (activeTargets.length === 0) {
-      return Promise.resolve()
-    }
-    const msg: JsonRpcNotification = {
-      jsonrpc: '2.0',
-      method,
-      ...(params !== undefined ? { params: { ...params } } : {})
-    }
-    let prepared:
-      | { ok: true; frame: PreparedRelayFrame }
-      | { ok: false; error: unknown }
-      | undefined
-    const prepareOnce = (): PreparedRelayFrame => {
-      if (!prepared) {
-        try {
-          prepared = { ok: true, frame: this.prepareFrame(msg) }
-        } catch (error) {
-          prepared = { ok: false, error }
-        }
-      }
-      if (!prepared.ok) {
-        throw prepared.error
-      }
-      return prepared.frame
-    }
-    const lane = method === 'fs.streamChunk' ? 'fixed-bulk' : 'bulk'
-    const waits: Promise<void>[] = []
-    for (const client of activeTargets) {
-      const step = client.bulkChain.then(() => {
-        if (this.disposed || client.closed) {
-          return
-        }
-        return this.publishBulkWhenAvailable(client, prepareOnce(), lane)
-      })
-      client.bulkChain = step.catch(() => {})
-      waits.push(step)
-    }
-    return Promise.all(waits).then(() => {})
-  }
-
-  requestPrimary(
-    method: string,
-    params?: Record<string, unknown>,
-    options?: { timeoutMs?: number }
-  ) {
-    return this.requestClient(this.primaryClient.id, method, params, options)
-  }
-
-  requestAnyClient(
-    method: string,
-    params?: Record<string, unknown>,
-    options?: { timeoutMs?: number; excludeClientId?: number }
-  ): Promise<unknown> {
-    const candidates = Array.from(this.clients.values()).filter(
-      (client) => !client.closed && client.id !== options?.excludeClientId
-    )
-    // Why: prefer a real socket client over the synthetic primary so requests don't forward to a dead stdout.
-    const target = candidates.find((client) => client !== this.primaryClient) ?? candidates[0]
-    if (!target) {
-      return Promise.reject(new Error('No owning Orca client is connected to the relay'))
-    }
-    return this.requestClient(target.id, method, params, options)
-  }
-
-  private requestClient(
-    clientId: number,
-    method: string,
-    params?: Record<string, unknown>,
-    options?: { timeoutMs?: number }
-  ): Promise<unknown> {
-    const client = this.clients.get(clientId)
-    if (this.disposed || !client || client.closed) {
-      return Promise.reject(new Error('Relay client is not connected'))
-    }
-    const timeoutMs = options?.timeoutMs ?? RELAY_TO_CLIENT_REQUEST_TIMEOUT_MS
-    if (!isSafeTimerDelayMs(timeoutMs)) {
-      return Promise.reject(
-        new Error(`Request timeout must be an integer between 0 and ${MAX_TIMER_DELAY_MS}ms`)
-      )
-    }
-    const id = this.nextRequestId++
-    const msg: JsonRpcRequest = {
-      jsonrpc: '2.0',
-      id,
-      method,
-      ...(params !== undefined ? { params } : {})
-    }
-    return new Promise((resolve, reject) => {
-      const timer = setTimeout(() => {
-        this.pendingRelayRequests.delete(id)
-        reject(new Error(`Request "${method}" timed out after ${timeoutMs}ms`))
-      }, timeoutMs)
-      this.pendingRelayRequests.set(id, { resolve, reject, timer })
-      if (!this.enqueueFrame(client, msg, 'control', () => {}, 'reject')) {
-        clearTimeout(timer)
-        this.pendingRelayRequests.delete(id)
-        reject(new Error(`Request "${method}" exceeded the relay control transport capacity`))
-      }
-    })
-  }
-
-  dispose(): void {
-    if (this.disposed) {
-      return
-    }
-    this.disposed = true
-    if (this.keepaliveTimer) {
-      clearInterval(this.keepaliveTimer)
-      this.keepaliveTimer = null
-    }
-    for (const [id, pending] of this.pendingRelayRequests) {
-      clearTimeout(pending.timer)
-      pending.reject(new Error('Relay dispatcher disposed'))
-      this.pendingRelayRequests.delete(id)
-    }
-    // Why: can't send responses after dispose; abort in-flight work so SSH-side scans/watchers release.
-    this.requestAborts.abortAll()
-    for (const client of this.clients.values()) {
-      client.closed = true
-      client.writer.close(new Error('Relay dispatcher disposed'))
-    }
-    for (const listener of Array.from(this.legacyCapacityListeners)) {
-      listener()
-    }
-    this.legacyCapacityListeners.clear()
-    this.clientCapacityListeners.clear()
-    for (const listener of Array.from(this.disposeListeners)) {
-      listener()
-    }
-    this.disposeListeners.clear()
-  }
-
-  private createClient(
-    write: RelayClientWrite,
-    sinkOptions?: RelayClientSinkOptions,
-    sessionIdentity?: RelayClientSessionIdentity,
-    sourceOptions?: RelayClientSourceOptions
-  ): RelayClient {
-    const id = this.nextClientId++
-    const client = {
-      id,
-      decoder: undefined as unknown as FrameDecoder,
-      writer: undefined as unknown as DispatcherClientWriter,
-      bulkChain: Promise.resolve(),
-      nextOutgoingSeq: 1,
-      highestReceivedSeq: 0,
-      generation: 0,
-      closed: false,
-      droppedNotificationLog: null,
-      sessionIdentity: sessionIdentity ?? {
-        principal: `unproved:${id}`,
-        authenticated: false,
-        allowSessionOwner: false,
-        authenticationKind: 'unproved'
-      }
-    } satisfies RelayClient
-    client.decoder = new FrameDecoder(
-      (frame) => this.handleFrame(client, frame),
-      (error) => this.closeClient(client, error, client !== this.primaryClient),
-      { pause: sourceOptions?.pauseReads, resume: sourceOptions?.resumeReads }
-    )
-    client.writer = this.createWriter(client, write, sinkOptions)
-    return client
-  }
-
-  private resetClient(client: RelayClient): void {
-    client.nextOutgoingSeq = 1
-    client.highestReceivedSeq = 0
-    client.decoder.reset()
-    client.generation++
-    client.closed = false
-  }
-
-  private handleFrame(client: RelayClient, frame: DecodedFrame): void {
-    if (frame.id > client.highestReceivedSeq) {
-      client.highestReceivedSeq = frame.id
-    }
-
-    if (frame.type === MessageType.KeepAlive) {
-      return
-    }
-
-    if (frame.type === MessageType.Regular) {
-      try {
-        const msg = parseJsonRpcMessage(frame.payload)
-        this.handleMessage(client, msg)
-      } catch (err) {
-        process.stderr.write(
-          `[relay] Parse error: ${err instanceof Error ? err.message : String(err)}\n`
-        )
-      }
-    }
-  }
-
-  private handleMessage(
-    client: RelayClient,
-    msg: JsonRpcRequest | JsonRpcNotification | JsonRpcResponse
-  ): void {
-    if ('id' in msg && 'method' in msg) {
-      void this.handleRequest(client, msg as JsonRpcRequest)
-    } else if ('id' in msg && ('result' in msg || 'error' in msg)) {
-      this.handleResponse(msg as JsonRpcResponse)
-    } else if ('method' in msg && !('id' in msg)) {
-      this.handleNotification(client, msg as JsonRpcNotification)
-    }
-  }
-
-  private handleResponse(msg: JsonRpcResponse): void {
-    const pending = this.pendingRelayRequests.get(msg.id)
-    if (!pending) {
-      return
-    }
-    clearTimeout(pending.timer)
-    this.pendingRelayRequests.delete(msg.id)
-    if (msg.error) {
-      const error = new Error(msg.error.message) as Error & { code?: number; data?: unknown }
-      error.code = msg.error.code
-      error.data = msg.error.data
-      pending.reject(error)
-      return
-    }
-    pending.resolve(msg.result)
-  }
-
-  private async handleRequest(client: RelayClient, req: JsonRpcRequest): Promise<void> {
-    const handler = this.requestHandlers.get(req.method)
-    if (!handler) {
-      this.sendResponse(client, req.id, undefined, {
-        code: -32601,
-        message: `Method not found: ${req.method}`
-      })
-      return
-    }
-
-    // Why: snapshot generation before the await to detect if the client disconnected mid-flight.
-    const gen = client.generation
-    const { key: abortKey, controller: abortController } = this.requestAborts.create(
-      client.id,
-      req.id
-    )
-    const responseSettledHandlers = new Set<(result: SinkWriteSettlement) => void>()
-    let responseSettled = false
-    const settleResponse = (result: SinkWriteSettlement): void => {
-      if (responseSettled) {
-        return
-      }
-      responseSettled = true
-      for (const callback of responseSettledHandlers) {
-        try {
-          callback(result)
-        } catch (err) {
-          process.stderr.write(
-            `[relay] Response settlement callback failed: ${err instanceof Error ? err.message : String(err)}\n`
-          )
-        }
-      }
-      responseSettledHandlers.clear()
-      this.requestAborts.delete(abortKey)
-    }
-    const context: RequestContext = {
-      clientId: client.id,
-      isStale: () =>
-        client.generation !== gen || !this.clients.has(client.id) || abortController.signal.aborted,
-      signal: abortController.signal,
-      sessionIdentity: client.sessionIdentity,
-      onResponseSettled: (handler) => {
-        if (responseSettled) {
-          throw new Error('Response settlement callback registered after settlement')
-        }
-        responseSettledHandlers.add(handler)
-      }
-    }
-    try {
-      const result = await handler(req.params ?? {}, context)
-      if (context.isStale()) {
-        settleResponse({ ok: false, error: new Error('Relay request became stale') })
-        return
-      }
-      const accepted = this.sendResponse(client, req.id, result, undefined, (settlement) => {
-        settleResponse(
-          context.isStale()
-            ? { ok: false, error: new Error('Relay request became stale') }
-            : settlement
-        )
-      })
-      if (!accepted) {
-        settleResponse({ ok: false, error: new Error('Relay response was not admitted') })
-      }
-    } catch (err) {
-      if (context.isStale()) {
-        settleResponse({ ok: false, error: new Error('Relay request became stale') })
-        return
-      }
-      const message = err instanceof Error ? err.message : String(err)
-      const errorCode = (err as { code?: unknown }).code
-      const code = typeof errorCode === 'number' ? errorCode : -32000
-      const skillFailure =
-        errorCode === SKILL_INSTALL_RPC_ERROR_CODE
-          ? SkillInstallFailureSchema.safeParse((err as { data?: unknown }).data)
-          : null
-      const data = skillFailure?.success === true ? skillFailure.data : undefined
-      const accepted = this.sendResponse(
-        client,
-        req.id,
-        undefined,
-        { code, message, ...(data === undefined ? {} : { data }) },
-        (result) => {
-          settleResponse({
-            ok: false,
-            error: result.ok ? new Error(message) : result.error
-          })
-        }
-      )
-      if (!accepted) {
-        settleResponse({ ok: false, error: new Error('Relay error response was not admitted') })
-      }
-    }
-  }
-
-  private handleNotification(client: RelayClient, notif: JsonRpcNotification): void {
-    if (notif.method === 'rpc.cancel') {
-      const id = Number((notif.params ?? {}).id)
-      const controller = this.requestAborts.get(client.id, id)
-      controller?.abort()
-      return
-    }
-    const handler = this.notificationHandlers.get(notif.method)
-    if (handler) {
-      const gen = client.generation
-      handler(notif.params ?? {}, {
-        clientId: client.id,
-        isStale: () => client.generation !== gen || !this.clients.has(client.id),
-        sessionIdentity: client.sessionIdentity,
-        onResponseSettled: () => {
-          throw new Error('Notifications do not have response publication fences')
-        }
-      })
-    }
-  }
-
-  private sendResponse(
-    client: RelayClient,
-    id: number,
-    result?: unknown,
-    error?: { code: number; message: string; data?: unknown },
-    onSettled: (result: SinkWriteSettlement) => void = () => {}
-  ): boolean {
-    const msg: JsonRpcResponse = {
-      jsonrpc: '2.0',
-      id,
-      ...(error ? { error } : { result: result ?? null })
-    }
-    const frame = this.prepareFrame(msg)
-    const lane =
-      frame.frameBytes > DISPATCHER_CONTROL_QUEUE_MAX_BYTES ? 'legacy-response' : 'control'
-    const accepted = this.enqueuePreparedFrame(client, frame, lane, onSettled)
-    if (accepted) {
-      return true
-    }
-    // Why: an oversized response must fail its own request; closing would kill every pane on the host.
-    // A rejected first enqueue either left onSettled untouched or closed the client, so exactly one settlement happens.
-    return this.enqueuePreparedFrame(
-      client,
-      this.prepareFrame({
-        jsonrpc: '2.0',
-        id,
-        error: {
-          code: RelayErrorCode.ResponseOverCapacity,
-          message: RESPONSE_OVER_CAPACITY_MESSAGE
-        }
-      }),
-      'control',
-      // Why: writing the substitute is not delivering the result — a settlement fence must never read
-      // the capacity error's successful write as "the peer received your result".
-      (settlement) =>
-        onSettled(
-          settlement.ok
-            ? { ok: false, error: new Error(RESPONSE_OVER_CAPACITY_MESSAGE) }
-            : settlement
-        )
-    )
-  }
-
-  private enqueueFrame(
-    client: RelayClient,
-    msg: OutgoingJsonRpcMessage,
-    lane: DispatcherWriterLane,
-    onSettled: (result: SinkWriteSettlement) => void = () => {},
-    controlOverflow: 'close-client' | 'reject' = 'close-client'
-  ): boolean {
-    if (this.disposed || client.closed) {
-      return false
-    }
-    return this.enqueuePreparedFrame(
-      client,
-      this.prepareFrame(msg),
-      lane,
-      onSettled,
-      controlOverflow
-    )
-  }
-
-  private enqueuePreparedFrame(
-    client: RelayClient,
-    frame: PreparedRelayFrame,
-    lane: DispatcherWriterLane,
-    onSettled: (result: SinkWriteSettlement) => void = () => {},
-    controlOverflow: 'close-client' | 'reject' = 'close-client'
-  ): boolean {
-    if (this.disposed || client.closed) {
-      return false
-    }
-    const encode = (): Buffer => {
-      const seq = client.nextOutgoingSeq++
-      return encodePreparedJsonRpcFrame(frame.payload, seq, client.highestReceivedSeq)
-    }
-    const admissionParams = frame.ptyDataAdmissionParams
-    const isStillAdmitted = admissionParams
-      ? () => this.admitsPtyDataPublication(client.id, admissionParams)
-      : undefined
-    return client.writer.enqueue(
-      lane,
-      encode,
-      frame.frameBytes,
-      onSettled,
-      lane === 'control' && controlOverflow === 'reject',
-      isStillAdmitted
-    )
-  }
-
-  private startKeepalive(): void {
-    this.keepaliveTimer = setInterval(() => {
-      if (this.disposed) {
-        return
-      }
-      for (const client of this.clients.values()) {
-        if (client.closed) {
-          continue
-        }
-        client.writer.enqueue(
-          'liveness',
-          () => {
-            const seq = client.nextOutgoingSeq++
-            return encodeKeepAliveFrame(seq, client.highestReceivedSeq)
-          },
-          13
-        )
-      }
-    }, KEEPALIVE_SEND_MS)
-    // Why: unref so the keepalive interval doesn't pin the event loop and block process exit.
-    this.keepaliveTimer.unref()
-  }
-
-  private activeClients(): RelayClient[] {
-    return Array.from(this.clients.values()).filter((client) => !client.closed)
-  }
-
-  private admitsPtyDataPublication(
-    clientId: number,
-    params: Readonly<Record<string, unknown>>
-  ): boolean {
-    return this.ptyDataPublicationAdmission?.(clientId, params) ?? true
-  }
-
-  private activeClientKeys(): string[] {
-    return this.activeClients().map((client) => this.clientKey(client))
-  }
-
-  private clientKey(client: RelayClient): string {
-    return `${client.id}:${client.generation}`
-  }
-
-  private prepareFrame(msg: OutgoingJsonRpcMessage): PreparedRelayFrame {
-    const payload = prepareJsonRpcPayload(msg)
-    const params = 'method' in msg && msg.method === 'pty.data' ? (msg.params ?? {}) : null
-    return Object.freeze({
-      payload,
-      frameBytes: HEADER_LENGTH + payload.byteLength,
-      ptyDataAdmissionParams:
-        params === null
-          ? null
-          : Object.freeze({
-              id: params.id,
-              deliveryToken: params.deliveryToken,
-              clientGeneration: params.clientGeneration,
-              ownerGeneration: params.ownerGeneration,
-              ptyIncarnation: params.ptyIncarnation
-            })
-    })
-  }
-
-  private estimateFrameBytes(msg: OutgoingJsonRpcMessage): number {
-    return HEADER_LENGTH + prepareJsonRpcPayload(msg).byteLength
-  }
-
-  private tryPublishToClients(
-    clients: readonly RelayClient[],
-    msg: JsonRpcNotification,
-    lane: 'interactive' | 'ordinary' | 'bulk'
-  ): boolean {
-    return this.runPublicationTransaction(() => {
-      if (clients.length === 0) {
-        return true
-      }
-      const frame = this.prepareFrame(msg)
-      const bytes = frame.frameBytes
-      if (clients.some((client) => !client.writer.canEnqueueProducer(bytes))) {
-        return false
-      }
-      const leases = this.publicationLedger.tryReserve(
-        clients.map((client) => ({ clientKey: this.clientKey(client), bytes }))
-      )
-      if (!leases) {
-        return false
-      }
-      for (let index = 0; index < clients.length; index++) {
-        if (!this.enqueueLeasedFrame(clients[index], frame, lane, leases[index])) {
-          if (this.disposed || clients[index].closed) {
-            continue
-          }
-          for (let remaining = index; remaining < leases.length; remaining++) {
-            leases[remaining].release()
-          }
-          return false
-        }
-      }
-      return true
-    })
-  }
-
-  private projectToClients(
-    clients: readonly RelayClient[],
-    msg: JsonRpcNotification,
-    lane: 'interactive' | 'ordinary'
-  ): boolean {
-    return this.runPublicationTransaction(() => {
-      if (clients.length === 0) {
-        return true
-      }
-      const frame = this.prepareFrame(msg)
-      for (const client of clients) {
-        if (client.closed || this.publishPreparedToClient(client, frame, lane)) {
-          continue
-        }
-        this.closeClient(
-          client,
-          new Error('Relay PTY subscriber projection capacity exceeded'),
-          client !== this.primaryClient
-        )
-      }
-      return !this.disposed
-    })
-  }
-
-  private publishToClient(
-    client: RelayClient,
-    msg: JsonRpcNotification,
-    lane: 'interactive' | 'ordinary' | 'fixed-bulk' | 'bulk',
-    onSettled: (result: SinkWriteSettlement) => void = () => {}
-  ): boolean {
-    if (this.disposed || client.closed) {
-      return false
-    }
-    return this.publishPreparedToClient(client, this.prepareFrame(msg), lane, onSettled)
-  }
-
-  private publishPreparedToClient(
-    client: RelayClient,
-    frame: PreparedRelayFrame,
-    lane: 'interactive' | 'ordinary' | 'fixed-bulk' | 'bulk',
-    onSettled: (result: SinkWriteSettlement) => void = () => {}
-  ): boolean {
-    const bytes = frame.frameBytes
-    const fixedBlocked =
-      lane === 'fixed-bulk' &&
-      (client.writer.retainedProducerBytes > 0 || bytes > client.writer.fixedFrameCapacity)
-    if (fixedBlocked || (lane !== 'fixed-bulk' && !client.writer.canEnqueueProducer(bytes))) {
-      return false
-    }
-    const leases = this.publicationLedger.tryReserve([{ clientKey: this.clientKey(client), bytes }])
-    if (!leases) {
-      return false
-    }
-    return this.enqueueLeasedFrame(client, frame, lane, leases[0], onSettled)
-  }
-
-  private publishBulkWhenAvailable(
-    client: RelayClient,
-    frame: PreparedRelayFrame,
-    lane: 'fixed-bulk' | 'bulk'
-  ): Promise<void> {
-    const bytes = frame.frameBytes
-    if (bytes > DEFAULT_PRODUCER_QUEUE_MAX_BYTES) {
-      return Promise.reject(new Error('Relay bulk frame exceeds sink producer capacity'))
-    }
-    if (lane === 'bulk' && bytes > client.writer.producerFrameCapacity) {
-      return Promise.reject(new Error('Relay bulk frame exceeds sink frame capacity'))
-    }
-    return new Promise<void>((resolve, reject) => {
-      let removeCapacityListener: (() => void) | null = null
-      const finish = (): void => {
-        removeCapacityListener?.()
-        removeCapacityListener = null
-      }
-      const tryPublish = (): void => {
-        if (this.disposed || client.closed) {
-          finish()
-          resolve()
-          return
-        }
-        if (
-          this.publishPreparedToClient(client, frame, lane, (result) => {
-            finish()
-            if (result.ok || this.disposed || client.closed) {
-              resolve()
-            } else {
-              reject(result.error)
-            }
-          })
-        ) {
-          return
-        }
-        if (!removeCapacityListener) {
-          removeCapacityListener = this.onLegacyPtyCapacity(tryPublish)
-        }
-      }
-      tryPublish()
-    })
-  }
-
-  private enqueueLeasedFrame(
-    client: RelayClient,
-    frame: PreparedRelayFrame,
-    lane: 'interactive' | 'ordinary' | 'fixed-bulk' | 'bulk',
-    lease: LegacyPublicationLease,
-    onSettled: (result: SinkWriteSettlement) => void = () => {}
-  ): boolean {
-    const accepted = this.enqueuePreparedFrame(client, frame, lane, (result) => {
-      lease.release()
-      onSettled(result)
-      this.notifyLegacyCapacityIfLow()
-    })
-    if (!accepted) {
-      lease.release()
-      this.notifyLegacyCapacityIfLow()
-    }
-    return accepted
-  }
-
-  private createWriter(
-    client: RelayClient,
-    write: RelayClientWrite,
-    sinkOptions?: RelayClientSinkOptions
-  ): DispatcherClientWriter {
-    const writer = new DispatcherClientWriter(write, sinkOptions, (error) => {
-      this.closeClient(client, error, client !== this.primaryClient)
-    })
-    writer.onCapacity(() => {
-      this.notifyLegacyCapacityIfLow()
-      this.notifyClientCapacity(client.id)
-    })
-    return writer
-  }
-
-  private notifyClientCapacity(clientId: number): void {
-    const listeners = this.clientCapacityListeners.get(clientId)
-    if (!listeners?.size) {
-      return
-    }
-    for (const listener of Array.from(listeners)) {
-      try {
-        listener()
-      } catch (err) {
-        process.stderr.write(
-          `[relay] Client capacity listener failed: ${err instanceof Error ? err.message : String(err)}\n`
-        )
-      }
-    }
-  }
-
-  private closeClient(
-    client: RelayClient,
-    error: Error,
-    remove: boolean,
-    // Why the default is the cautious one: most closes here are the relay's own doing, and only the
-    // callers holding real evidence of a peer-side transport end may say so.
-    cause: PtyConsumerCloseCause = 'local'
-  ): void {
-    if (client.closed) {
-      return
-    }
-    client.closed = true
-    this.requestAborts.abortClient(client.id)
-    client.writer.close(error)
-    client.generation++
-    if (remove) {
-      this.clients.delete(client.id)
-    }
-    this.notifyClientDetached(client.id, cause)
-    if (remove) {
-      // Only for a client that is gone for good: an invalidated primary is revived by setWrite, and a
-      // frame stranded by its retired sink must stay armed to retry. After the detach fan-out, so a
-      // listener that unsubscribes on detach is not left holding a stale slot.
-      this.clientCapacityListeners.delete(client.id)
-    }
-    this.notifyLegacyCapacity(true)
-    if (!/^Relay (?:primary client invalidated|client detached)$/.test(error.message)) {
-      process.stderr.write(`[relay] Client write closed: ${error.message}\n`)
-    }
-  }
-
-  private notifyLegacyCapacityIfLow(): void {
-    this.notifyLegacyCapacity(false)
-  }
-
-  private notifyLegacyCapacity(force: boolean): void {
-    if (this.publicationTransactionDepth > 0) {
-      this.deferredForcedLegacyCapacity ||= force
-      this.deferredLegacyCapacity ||= !force
-      return
-    }
-    if (!force && !this.publicationLedger.belowLowWater(this.activeClientKeys())) {
-      return
-    }
-    for (const listener of this.legacyCapacityListeners) {
-      listener()
-    }
-  }
-
-  private runPublicationTransaction<T>(operation: () => T): T {
-    this.publicationTransactionDepth++
-    try {
-      return operation()
-    } finally {
-      this.publicationTransactionDepth--
-      if (this.publicationTransactionDepth === 0) {
-        const force = this.deferredForcedLegacyCapacity
-        const low = this.deferredLegacyCapacity
-        this.deferredForcedLegacyCapacity = false
-        this.deferredLegacyCapacity = false
-        if (force || low) {
-          this.notifyLegacyCapacity(force)
-        }
-      }
-    }
-  }
-
-  private notifyClientDetached(clientId: number, cause: PtyConsumerCloseCause): void {
-    for (const listener of this.clientDetachListeners) {
-      try {
-        listener(clientId, cause)
-      } catch (err) {
-        process.stderr.write(
-          `[relay] Client detach listener failed: ${err instanceof Error ? err.message : String(err)}\n`
-        )
-      }
-    }
-  }
-}
+export type {
+  MethodHandler,
+  NotificationHandler,
+  PtyDataPublicationAdmission,
+  RelayClientSessionIdentity,
+  RelayClientSourceOptions,
+  RequestContext
+} from './dispatcher-contract'
+
+export class RelayDispatcher extends RelayDispatcherNotificationPublication {}
diff --git a/src/relay/git-handler-command-termination.ts b/src/relay/git-handler-command-termination.ts
new file mode 100644
index 00000000000..0cb6bc08995
--- /dev/null
+++ b/src/relay/git-handler-command-termination.ts
@@ -0,0 +1,53 @@
+import { runProcess } from '../shared/child-process/run-process'
+
+export const MAX_GIT_BUFFER = 10 * 1024 * 1024
+const GIT_REBASE_PROCESS_FALLBACK_TIMEOUT_MS = 2_147_000_000
+
+type GitTerminationOptions = {
+  cwd?: string
+  env?: NodeJS.ProcessEnv
+  timeout?: number
+  maxBuffer?: number
+  signal?: AbortSignal
+}
+
+export async function runGitToTermination(
+  args: string[],
+  options: GitTerminationOptions,
+  stdin: string | undefined
+): Promise<{ stdout: string; stderr: string }> {
+  const result = await runProcess({
+    program: 'git',
+    args,
+    cwd: typeof options.cwd === 'string' ? options.cwd : undefined,
+    env: options.env,
+    timeoutMs:
+      typeof options.timeout === 'number'
+        ? options.timeout
+        : GIT_REBASE_PROCESS_FALLBACK_TIMEOUT_MS,
+    maxOutputBytes: typeof options.maxBuffer === 'number' ? options.maxBuffer : MAX_GIT_BUFFER,
+    signal: options.signal,
+    terminationBarrier: true,
+    ...(stdin === undefined ? {} : { input: stdin })
+  })
+  if (result.code === 0 && !result.timedOut && !options.signal?.aborted) {
+    return { stdout: result.stdout, stderr: result.stderr }
+  }
+  const error = new Error(
+    result.timedOut
+      ? `git ${args[0] ?? 'command'} timed out.`
+      : options.signal?.aborted
+        ? 'The operation was aborted.'
+        : result.stderr.trim() || `git ${args[0] ?? 'command'} failed.`
+  )
+  if (options.signal?.aborted) {
+    error.name = 'AbortError'
+  }
+  throw Object.assign(error, {
+    code: result.code,
+    killed: result.timedOut || result.signal !== null || options.signal?.aborted === true,
+    signal: result.signal,
+    stdout: result.stdout,
+    stderr: result.stderr
+  })
+}
diff --git a/src/relay/git-handler-comparison-operations.ts b/src/relay/git-handler-comparison-operations.ts
new file mode 100644
index 00000000000..e5ebe65365b
--- /dev/null
+++ b/src/relay/git-handler-comparison-operations.ts
@@ -0,0 +1,87 @@
+import { GitHandlerOperationContext } from './git-handler-operation-context'
+import { branchCompare as branchCompareOp } from './git-handler-ops'
+import { commitCompare as commitCompareOp } from './git-handler-commit-diff-ops'
+import { parseBranchDiff } from './git-handler-utils'
+import { parseNumstat } from '../shared/git-uncommitted-line-stats'
+import { isNoUpstreamError, normalizeGitErrorMessage } from '../shared/git-remote-error'
+import { upstreamOnlyCommitsArePatchEquivalent } from '../shared/git-upstream-status'
+import { assertGitPushTargetShape } from '../shared/git-push-target-validation'
+import { getPublishTargetStatus, type GitCommandRunner } from '../shared/git-publish-target-status'
+import type { GitPushTarget } from '../shared/worktree/types'
+import { getEffectiveGitUpstreamStatus } from '../shared/git-effective-upstream'
+
+export class GitHandlerComparisonOperations extends GitHandlerOperationContext {
+  async branchCompare(params: Record<string, unknown>) {
+    const worktreePath = params.worktreePath as string
+    const baseRef = params.baseRef as string
+    // Why: reject flag-like base refs to prevent rev-parse option injection.
+    if (baseRef.startsWith('-')) {
+      throw new Error('Base ref must not start with "-"')
+    }
+    const gitBound = this.git.bind(this)
+    return branchCompareOp(gitBound, worktreePath, baseRef, async (mergeBase, headOid) => {
+      // Why: preserve non-ASCII filenames as UTF-8 for parseBranchDiff.
+      const [{ stdout }, { stdout: numstat }] = await Promise.all([
+        gitBound(
+          ['-c', 'core.quotePath=false', 'diff', '--name-status', '-M', '-C', mergeBase, headOid],
+          worktreePath
+        ),
+        gitBound(
+          ['-c', 'core.quotePath=false', 'diff', '--numstat', '-M', '-C', mergeBase, headOid],
+          worktreePath
+        )
+      ])
+      return parseBranchDiff(stdout, parseNumstat(numstat))
+    })
+  }
+
+  async commitCompare(params: Record<string, unknown>) {
+    const worktreePath = params.worktreePath as string
+    const commitId = params.commitId as string
+    return commitCompareOp(this.git.bind(this), worktreePath, commitId)
+  }
+
+  async upstreamStatus(params: Record<string, unknown>) {
+    const worktreePath = params.worktreePath as string
+
+    try {
+      if (params.pushTarget !== undefined) {
+        assertGitPushTargetShape(params.pushTarget)
+        const pushTarget = params.pushTarget as GitPushTarget
+        await this.git(['check-ref-format', '--branch', pushTarget.branchName], worktreePath)
+        return await getPublishTargetStatus(
+          ((args) => this.git(args, worktreePath)) as GitCommandRunner,
+          pushTarget,
+          (upstreamName) => this.getBehindCommitsArePatchEquivalent(worktreePath, upstreamName)
+        )
+      }
+      return await getEffectiveGitUpstreamStatus(
+        (args) => this.git(args, worktreePath),
+        (upstreamName) => this.getBehindCommitsArePatchEquivalent(worktreePath, upstreamName)
+      )
+    } catch (error) {
+      // Why: suppress only the expected no-upstream error; surface all others.
+      if (isNoUpstreamError(error)) {
+        return { hasUpstream: false, ahead: 0, behind: 0 }
+      }
+      // Why: match fetch/push/pull normalization so execFile preamble and local paths don't leak to the renderer.
+      throw new Error(normalizeGitErrorMessage(error, 'upstream'))
+    }
+  }
+
+  private async getBehindCommitsArePatchEquivalent(
+    worktreePath: string,
+    upstreamName: string
+  ): Promise<boolean> {
+    try {
+      const { stdout } = await this.git(
+        ['log', '--oneline', '--cherry-mark', '--right-only', `HEAD...${upstreamName}`, '--'],
+        worktreePath
+      )
+      return upstreamOnlyCommitsArePatchEquivalent(stdout)
+    } catch {
+      // Why: this only identifies stale post-rebase upstreams; if the probe fails over SSH, keep the conservative pull-first sync path.
+      return false
+    }
+  }
+}
diff --git a/src/relay/git-handler-discard-operations.ts b/src/relay/git-handler-discard-operations.ts
new file mode 100644
index 00000000000..c87d13c74ff
--- /dev/null
+++ b/src/relay/git-handler-discard-operations.ts
@@ -0,0 +1,149 @@
+import * as path from 'node:path'
+import { GitHandlerOperationContext, GIT_BULK_CHUNK_SIZE } from './git-handler-operation-context'
+import {
+  removeSafeUntrackedDiscardTarget,
+  removeSafeUntrackedDiscardTargets
+} from '../shared/git-discard-path-safety'
+import { detectConflictOperation } from './git-handler-status-ops'
+
+const BULK_CHUNK_SIZE = GIT_BULK_CHUNK_SIZE
+
+export class GitHandlerDiscardOperations extends GitHandlerOperationContext {
+  private normalizeGitPathForCompare(filePath: string): string {
+    return filePath.replace(/\\/g, '/').replace(/\/+$/, '')
+  }
+
+  private isTrackedPathSpec(filePath: string, trackedPaths: readonly string[]): boolean {
+    const normalized = this.normalizeGitPathForCompare(filePath)
+    return trackedPaths.some((trackedPath) => {
+      const normalizedTracked = this.normalizeGitPathForCompare(trackedPath)
+      return normalizedTracked === normalized || normalizedTracked.startsWith(`${normalized}/`)
+    })
+  }
+
+  private assertInWorktree(worktreePath: string, filePath: string): string {
+    const resolved = path.resolve(worktreePath, filePath)
+    const rel = path.relative(path.resolve(worktreePath), resolved)
+    // Why: empty rel or '.' means the path IS the worktree root; reject (with parent-escaping paths) so a discard can't wipe the whole worktree.
+    if (
+      !rel ||
+      rel === '.' ||
+      rel === '..' ||
+      rel.startsWith(`..${path.sep}`) ||
+      path.isAbsolute(rel)
+    ) {
+      throw new Error(`Path "${filePath}" resolves outside the worktree`)
+    }
+    return resolved
+  }
+
+  async discard(params: Record<string, unknown>) {
+    this.clearGitMutationReadCaches()
+    const worktreePath = params.worktreePath as string
+    const filePath = params.filePath as string
+    try {
+      this.assertInWorktree(worktreePath, filePath)
+
+      let tracked = false
+      try {
+        await this.git(
+          ['ls-files', '--error-unmatch', '--', this.literalPathspec(filePath)],
+          worktreePath
+        )
+        tracked = true
+      } catch {
+        // untracked
+      }
+
+      if (tracked) {
+        await this.git(
+          ['restore', '--worktree', '--source=HEAD', '--', this.literalPathspec(filePath)],
+          worktreePath
+        )
+        return
+      }
+
+      await removeSafeUntrackedDiscardTarget(worktreePath, filePath, (targetPath) =>
+        this.cleanUntrackedPaths(worktreePath, [targetPath])
+      )
+    } finally {
+      this.clearGitMutationReadCaches()
+    }
+  }
+
+  async bulkDiscard(params: Record<string, unknown>) {
+    this.clearGitMutationReadCaches()
+    const worktreePath = params.worktreePath as string
+    const filePaths = params.filePaths as string[]
+    if (filePaths.length === 0) {
+      return
+    }
+    try {
+      for (const filePath of filePaths) {
+        this.assertInWorktree(worktreePath, filePath)
+      }
+
+      const trackedPathSpecs: string[] = []
+      for (let i = 0; i < filePaths.length; i += BULK_CHUNK_SIZE) {
+        const chunk = filePaths.slice(i, i + BULK_CHUNK_SIZE)
+        const { stdout } = await this.git(
+          ['ls-files', '-z', '--', ...chunk.map((p) => this.literalPathspec(p))],
+          worktreePath
+        )
+        // Why: a selected tracked directory can make `ls-files -z` return enough descendants for push(...split) to exceed the argument limit.
+        for (const trackedPathSpec of stdout.split('\0')) {
+          if (trackedPathSpec) {
+            trackedPathSpecs.push(trackedPathSpec)
+          }
+        }
+      }
+
+      const trackedPaths = filePaths.filter((filePath) =>
+        this.isTrackedPathSpec(filePath, trackedPathSpecs)
+      )
+      const untrackedPaths = filePaths.filter(
+        (filePath) => !this.isTrackedPathSpec(filePath, trackedPathSpecs)
+      )
+      await removeSafeUntrackedDiscardTargets(
+        worktreePath,
+        untrackedPaths,
+        (targetPaths) => this.cleanUntrackedPaths(worktreePath, targetPaths),
+        async () => {
+          for (let i = 0; i < trackedPaths.length; i += BULK_CHUNK_SIZE) {
+            const chunk = trackedPaths.slice(i, i + BULK_CHUNK_SIZE)
+            await this.git(
+              [
+                'restore',
+                '--worktree',
+                '--source=HEAD',
+                '--',
+                ...chunk.map((p) => this.literalPathspec(p))
+              ],
+              worktreePath
+            )
+          }
+        }
+      )
+    } finally {
+      this.clearGitMutationReadCaches()
+    }
+  }
+
+  private async cleanUntrackedPaths(worktreePath: string, filePaths: readonly string[]) {
+    for (let i = 0; i < filePaths.length; i += BULK_CHUNK_SIZE) {
+      const chunk = filePaths.slice(i, i + BULK_CHUNK_SIZE)
+      if (chunk.length > 0) {
+        // Why: Git pathspec cleanup avoids raw recursive deletion through symlinked parents.
+        await this.git(
+          ['clean', '-ffdx', '--', ...chunk.map((p) => this.literalPathspec(p))],
+          worktreePath
+        )
+      }
+    }
+  }
+
+  async conflictOperation(params: Record<string, unknown>) {
+    const worktreePath = params.worktreePath as string
+    return detectConflictOperation(worktreePath)
+  }
+}
diff --git a/src/relay/git-handler-exec-operations.ts b/src/relay/git-handler-exec-operations.ts
new file mode 100644
index 00000000000..510b7d0b9ee
--- /dev/null
+++ b/src/relay/git-handler-exec-operations.ts
@@ -0,0 +1,76 @@
+import type { RequestContext } from './dispatcher'
+import { GitHandlerOperationContext } from './git-handler-operation-context'
+import { validateGitExecArgs } from './git-handler-ops'
+import { gitExecMutatesRepository } from '../shared/git-exec-mutation'
+import { normalizeGitErrorMessage } from '../shared/git-remote-error'
+import { forceDeletePreservedRelayBranch } from './git-handler-branch-cleanup'
+
+export class GitHandlerExecOperations extends GitHandlerOperationContext {
+  async exec(params: Record<string, unknown>, context?: RequestContext) {
+    const args = params.args as string[]
+    const cwd = params.cwd as string
+
+    validateGitExecArgs(args)
+    const run = () => this.git(args, cwd, { signal: context?.signal })
+    const { stdout, stderr } = gitExecMutatesRepository(args)
+      ? await this.runWithGitReadCacheClear(run)
+      : await run()
+    return this.maybeStreamResponse({ stdout, stderr }, params, context)
+  }
+
+  async clone(params: Record<string, unknown>, context?: RequestContext) {
+    const args = params.args as string[]
+    const cwd = params.cwd as string
+    const progressId = params.progressId
+    validateGitExecArgs(args)
+    if (typeof progressId !== 'string' || progressId.length === 0) {
+      throw new Error('Missing clone progress id.')
+    }
+    if (args[0] !== 'clone') {
+      throw new Error('git.clone only supports clone commands.')
+    }
+    return await this.runWithGitReadCacheClear(() =>
+      this.spawnClone(args, cwd, progressId, context)
+    )
+  }
+
+  async renameCurrentBranch(params: Record<string, unknown>) {
+    return this.runWithGitReadCacheClear(async () => {
+      const worktreePath = params.worktreePath
+      const newBranch = params.newBranch
+      if (typeof worktreePath !== 'string' || typeof newBranch !== 'string') {
+        throw new Error('Invalid branch rename request.')
+      }
+      if (newBranch.startsWith('-')) {
+        throw new Error('Branch name must not start with "-".')
+      }
+      try {
+        // Why: generic git.exec blocks destructive branch flags; this narrow RPC permits only the already-checked current-branch rename.
+        await this.git(['check-ref-format', '--branch', newBranch], worktreePath)
+        await this.git(['branch', '-m', newBranch], worktreePath)
+      } catch (error) {
+        throw new Error(normalizeGitErrorMessage(error))
+      }
+    })
+  }
+
+  async forceDeletePreservedBranch(params: Record<string, unknown>) {
+    const repoPath = params.repoPath
+    const branchName = params.branchName
+    const expectedHead = params.expectedHead
+    if (
+      typeof repoPath !== 'string' ||
+      typeof branchName !== 'string' ||
+      typeof expectedHead !== 'string'
+    ) {
+      throw new Error('Invalid preserved branch force-delete request.')
+    }
+    // Why: empty repoPath would target the relay's own cwd with a destructive update-ref, and NUL bytes can't reach git safely — reject both.
+    if (!repoPath || repoPath.includes('\0') || expectedHead.includes('\0')) {
+      throw new Error('Invalid preserved branch force-delete request.')
+    }
+    return this.runWithGitReadCacheClear(() =>
+      forceDeletePreservedRelayBranch(this.git.bind(this), repoPath, branchName, expectedHead)
+    )
+  }
+}
diff --git a/src/relay/git-handler-fetch-operations.ts b/src/relay/git-handler-fetch-operations.ts
new file mode 100644
index 00000000000..cd3a86fcb63
--- /dev/null
+++ b/src/relay/git-handler-fetch-operations.ts
@@ -0,0 +1,217 @@
+import type { RequestContext } from './dispatcher'
+import { GitHandlerOperationContext } from './git-handler-operation-context'
+import { assertGitPushTargetShape } from '../shared/git-push-target-validation'
+import type { GitPushTarget } from '../shared/worktree/types'
+import { normalizeGitErrorMessage, isExecKilledError } from '../shared/git-remote-error'
+import { syncForkDefaultBranch, validateGitForkSyncExpectedUpstream } from '../shared/git-fork-sync'
+import { GIT_FETCH_SKIP_AUTO_MAINTENANCE_CONFIG_ARGS } from '../shared/git-fetch-auto-maintenance'
+import {
+  githubPullRequestHeadLocalRef,
+  gitlabMergeRequestHeadLocalRef,
+  isSafeReviewHeadFetchRemote,
+  isValidReviewHeadNumber,
+  reviewHeadRemoteRefComponent,
+  REVIEW_HEAD_FETCH_TIMEOUT_MS
+} from '../shared/review-head-tracking-ref'
+
+export class GitHandlerFetchOperations extends GitHandlerOperationContext {
+  async fetch(params: Record<string, unknown>) {
+    this.clearGitMutationReadCaches()
+    const worktreePath = params.worktreePath as string
+    try {
+      try {
+        if (params.pushTarget !== undefined) {
+          assertGitPushTargetShape(params.pushTarget)
+          const pushTarget = params.pushTarget as GitPushTarget
+          await this.git(['check-ref-format', '--branch', pushTarget.branchName], worktreePath)
+          await this.git(['fetch', '--prune', pushTarget.remoteName], worktreePath)
+          return
+        }
+        await this.git(['fetch', '--prune'], worktreePath)
+      } catch (error) {
+        // Why: normalize like local gitFetch so SSH users get actionable messages, not raw stderr (may embed credentials).
+        throw new Error(normalizeGitErrorMessage(error, 'fetch'))
+      }
+    } finally {
+      this.clearGitMutationReadCaches()
+    }
+  }
+
+  async forkSync(params: Record<string, unknown>, context?: RequestContext) {
+    return this.runWithGitReadCacheClear(async () => {
+      const worktreePath = params.worktreePath as string
+      const expectedUpstream = validateGitForkSyncExpectedUpstream(params.expectedUpstream, {
+        required: true
+      })
+      const controller = new AbortController()
+      const abortFromContext = () => controller.abort()
+      if (context?.signal?.aborted) {
+        controller.abort()
+      } else {
+        context?.signal?.addEventListener('abort', abortFromContext, { once: true })
+      }
+      const timeout = setTimeout(() => controller.abort(), 60_000)
+      try {
+        return await syncForkDefaultBranch(
+          (args) =>
+            this.git(args, worktreePath, {
+              nonInteractive: true,
+              signal: controller.signal
+            }),
+          { expectedUpstream }
+        )
+      } catch (error) {
+        throw new Error(normalizeGitErrorMessage(error, 'push'))
+      } finally {
+        clearTimeout(timeout)
+        context?.signal?.removeEventListener('abort', abortFromContext)
+      }
+    })
+  }
+
+  async fetchRemoteTrackingRef(params: Record<string, unknown>) {
+    this.clearGitMutationReadCaches()
+    const worktreePath = params.worktreePath as string
+    const remote = params.remote
+    const branch = params.branch
+    const ref = params.ref
+    const skipAutoMaintenance = params.skipAutoMaintenance
+    try {
+      if (typeof remote !== 'string' || typeof branch !== 'string' || typeof ref !== 'string') {
+        throw new Error('Invalid remote-tracking fetch request.')
+      }
+      if (skipAutoMaintenance !== undefined && typeof skipAutoMaintenance !== 'boolean') {
+        throw new Error('Invalid remote-tracking fetch maintenance option.')
+      }
+      if (remote.startsWith('-') || branch.startsWith('-')) {
+        throw new Error('Remote-tracking fetch inputs must not start with "-".')
+      }
+      if (ref !== `refs/remotes/${remote}/${branch}`) {
+        throw new Error('Remote-tracking ref does not match the requested remote and branch.')
+      }
+
+      try {
+        const { stdout } = await this.git(['remote'], worktreePath)
+        const remotes = stdout
+          .split(/\r?\n/)
+          .map((line) => line.trim())
+          .filter(Boolean)
+        if (!remotes.includes(remote)) {
+          throw new Error(`Remote "${remote}" is not configured.`)
+        }
+        await this.git(['check-ref-format', `refs/heads/${branch}`], worktreePath)
+        await this.git(['check-ref-format', ref], worktreePath)
+        await this.git(
+          [
+            ...(skipAutoMaintenance ? GIT_FETCH_SKIP_AUTO_MAINTENANCE_CONFIG_ARGS : []),
+            'fetch',
+            '--no-tags',
+            remote,
+            `+refs/heads/${branch}:${ref}`
+          ],
+          worktreePath
+        )
+      } catch (error) {
+        // Why: create-worktree needs a write-capable fetch that generic git.exec rejects; narrow RPC keeps the allowlist tight.
+        throw new Error(normalizeGitErrorMessage(error, 'fetch'))
+      }
+    } finally {
+      this.clearGitMutationReadCaches()
+    }
+  }
+
+  // Why: the durable review-head ref embeds the remote's identity, and a
+  // missing remote must fail with an actionable message, not a raw fetch error.
+  private async reviewHeadRemoteComponent(worktreePath: string, remote: string): Promise<string> {
+    let remoteUrl: string
+    try {
+      const { stdout } = await this.git(['remote', 'get-url', remote], worktreePath)
+      remoteUrl = stdout.trim()
+    } catch {
+      remoteUrl = ''
+    }
+    if (!remoteUrl) {
+      throw new Error(`Remote "${remote}" is not configured.`)
+    }
+    return reviewHeadRemoteRefComponent(remote, remoteUrl)
+  }
+
+  async fetchGitLabMergeRequestHead(params: Record<string, unknown>) {
+    this.clearGitMutationReadCaches()
+    const worktreePath = params.worktreePath as string
+    const remote = params.remote
+    const mrIid = params.mrIid
+    try {
+      if (typeof remote !== 'string' || !isValidReviewHeadNumber(mrIid)) {
+        throw new Error('Invalid GitLab merge request fetch request.')
+      }
+      const mergeRequestIid = mrIid
+      if (!isSafeReviewHeadFetchRemote(remote)) {
+        throw new Error('GitLab merge request fetch remote must not start with "-".')
+      }
+
+      try {
+        const remoteComponent = await this.reviewHeadRemoteComponent(worktreePath, remote)
+        // Why: GitLab fork heads need a dedicated write RPC and ref outside refs/heads/*.
+        // Return the exact written path so the client does not re-hash a second get-url.
+        const localRef = gitlabMergeRequestHeadLocalRef(remoteComponent, mergeRequestIid)
+        await this.git(
+          [
+            'fetch',
+            '--no-tags',
+            remote,
+            `+refs/merge-requests/${mergeRequestIid}/head:${localRef}`
+          ],
+          worktreePath,
+          { timeout: REVIEW_HEAD_FETCH_TIMEOUT_MS }
+        )
+        return { localRef }
+      } catch (error) {
+        // Why: a timeout kill has no git stderr; name it so the client can classify it as transient.
+        if (isExecKilledError(error)) {
+          throw new Error(
+            `Fetching refs/merge-requests/${mergeRequestIid}/head from "${remote}" timed out.`
+          )
+        }
+        throw new Error(normalizeGitErrorMessage(error, 'fetch'))
+      }
+    } finally {
+      this.clearGitMutationReadCaches()
+    }
+  }
+
+  async fetchGitHubPullRequestHead(params: Record<string, unknown>) {
+    this.clearGitMutationReadCaches()
+    const worktreePath = params.worktreePath as string
+    const remote = params.remote
+    const prNumber = params.prNumber
+    try {
+      if (typeof remote !== 'string' || !isValidReviewHeadNumber(prNumber)) {
+        throw new Error('Invalid GitHub pull request fetch request.')
+      }
+      if (!isSafeReviewHeadFetchRemote(remote)) {
+        throw new Error('GitHub pull request fetch remote must not start with "-".')
+      }
+
+      try {
+        const remoteComponent = await this.reviewHeadRemoteComponent(worktreePath, remote)
+        // Why: return the written path so resolve can rev-parse the same ref the host wrote.
+        const localRef = githubPullRequestHeadLocalRef(remoteComponent, prNumber)
+        await this.git(
+          ['fetch', '--no-tags', remote, `+refs/pull/${prNumber}/head:${localRef}`],
+          worktreePath,
+          { timeout: REVIEW_HEAD_FETCH_TIMEOUT_MS }
+        )
+        return { localRef }
+      } catch (error) {
+        // Why: a timeout kill has no git stderr; name it so the client can classify it as transient.
+        if (isExecKilledError(error)) {
+          throw new Error(`Fetching refs/pull/${prNumber}/head from "${remote}" timed out.`)
+        }
+        throw new Error(normalizeGitErrorMessage(error, 'fetch'))
+      }
+    } finally {
+      this.clearGitMutationReadCaches()
+    }
+  }
+}
diff --git a/src/relay/git-handler-object-diff-operations.ts b/src/relay/git-handler-object-diff-operations.ts
new file mode 100644
index 00000000000..819cf5e0f4a
--- /dev/null
+++ b/src/relay/git-handler-object-diff-operations.ts
@@ -0,0 +1,85 @@
+import type { RequestContext } from './dispatcher'
+import { GitHandlerOperationContext } from './git-handler-operation-context'
+import { branchDiffEntries } from './git-handler-ops'
+import {
+  branchDiffEntryAtPinnedOids,
+  isFullGitObjectId,
+  parseOptionalBranchDiffHeadOid
+} from './git-handler-branch-diff-ops'
+import { commitDiffEntry } from './git-handler-commit-diff-ops'
+import { stableInFlightKey } from '../shared/in-flight-promise-dedupe'
+
+export class GitHandlerObjectDiffOperations extends GitHandlerOperationContext {
+  async branchDiff(params: Record<string, unknown>, context?: RequestContext) {
+    const worktreePath = params.worktreePath as string
+    const baseRef = params.baseRef as string
+    if (baseRef.startsWith('-')) {
+      throw new Error('Base ref must not start with "-"')
+    }
+    const headOid = parseOptionalBranchDiffHeadOid(params)
+    const options = {
+      includePatch: params.includePatch as boolean | undefined,
+      filePath: params.filePath as string | undefined,
+      oldPath: params.oldPath as string | undefined
+    }
+    const result = await this.gitDiffReadDedupe.run(
+      stableInFlightKey([
+        'branchDiff',
+        worktreePath,
+        baseRef,
+        headOid ?? null,
+        options.includePatch ?? null,
+        options.filePath ?? null,
+        options.oldPath ?? null
+      ]),
+      () => {
+        if (
+          headOid &&
+          isFullGitObjectId(baseRef) &&
+          options.includePatch === true &&
+          typeof options.filePath === 'string' &&
+          options.filePath.length > 0
+        ) {
+          return branchDiffEntryAtPinnedOids(
+            this.gitBuffer.bind(this),
+            worktreePath,
+            baseRef,
+            headOid,
+            options.filePath,
+            options.oldPath
+          )
+        }
+        return branchDiffEntries(
+          this.git.bind(this),
+          this.gitBuffer.bind(this),
+          worktreePath,
+          baseRef,
+          options
+        )
+      }
+    )
+    return this.maybeStreamResponse(result, params, context)
+  }
+
+  async commitDiff(params: Record<string, unknown>, context?: RequestContext) {
+    const worktreePath = params.worktreePath as string
+    const args = {
+      commitOid: params.commitOid as string,
+      parentOid: params.parentOid as string | null | undefined,
+      filePath: params.filePath as string,
+      oldPath: params.oldPath as string | undefined
+    }
+    const result = await this.gitDiffReadDedupe.run(
+      stableInFlightKey([
+        'commitDiff',
+        worktreePath,
+        args.commitOid,
+        args.parentOid ?? null,
+        args.filePath,
+        args.oldPath ?? null
+      ]),
+      () => commitDiffEntry(this.gitBuffer.bind(this), worktreePath, args)
+    )
+    return this.maybeStreamResponse(result, params, context)
+  }
+}
diff --git a/src/relay/git-handler-operation-context.ts b/src/relay/git-handler-operation-context.ts
new file mode 100644
index 00000000000..85d2d908097
--- /dev/null
+++ b/src/relay/git-handler-operation-context.ts
@@ -0,0 +1,108 @@
+import type { RequestContext } from './dispatcher'
+import type { InFlightPromiseDedupe } from '../shared/in-flight-promise-dedupe'
+import type { GitCapabilityCache } from '../shared/git-capability-cache'
+import type { SubmodulePathsCache } from './git-handler-submodule-ops'
+import type { RelayFilesystemWatchRegistry } from './relay-filesystem-watch-registry'
+
+export const GIT_BULK_CHUNK_SIZE = 100
+
+export type GitHandlerCommandOptions = {
+  maxBuffer?: number
+  disableOptionalLocks?: boolean
+  signal?: AbortSignal
+  nonInteractive?: boolean
+  stdin?: string
+  timeout?: number
+  terminationBarrier?: boolean
+}
+
+export type GitHandlerCommandResult = { stdout: string; stderr: string }
+export type GitHandlerWatcherRegistry = Pick<RelayFilesystemWatchRegistry, 'runWithRemovalFence'>
+
+export type GitHandlerOperationHost = {
+  readonly gitDiffReadDedupe: InFlightPromiseDedupe<unknown>
+  readonly gitCapabilities: GitCapabilityCache
+  readonly submodulePathsCache: SubmodulePathsCache
+  readonly watcherRegistry: GitHandlerWatcherRegistry | undefined
+  git(
+    args: string[],
+    cwd: string,
+    opts?: GitHandlerCommandOptions
+  ): Promise<GitHandlerCommandResult>
+  gitBuffer(args: string[], cwd: string): Promise<Buffer>
+  spawnClone(
+    args: string[],
+    cwd: string,
+    progressId: string,
+    context?: RequestContext
+  ): Promise<GitHandlerCommandResult>
+  clearGitMutationReadCaches(): void
+  runWithGitReadCacheClear<T>(run: () => Promise<T>): Promise<T>
+  maybeStreamResponse(
+    result: unknown,
+    params: Record<string, unknown>,
+    context: RequestContext | undefined
+  ): unknown
+}
+
+export abstract class GitHandlerOperationContext {
+  constructor(private readonly host: GitHandlerOperationHost) {}
+
+  protected get gitDiffReadDedupe(): InFlightPromiseDedupe<unknown> {
+    return this.host.gitDiffReadDedupe
+  }
+
+  protected get gitCapabilities(): GitCapabilityCache {
+    return this.host.gitCapabilities
+  }
+
+  protected get submodulePathsCache(): SubmodulePathsCache {
+    return this.host.submodulePathsCache
+  }
+
+  protected get watcherRegistry(): GitHandlerWatcherRegistry | undefined {
+    return this.host.watcherRegistry
+  }
+
+  protected git(
+    args: string[],
+    cwd: string,
+    opts?: GitHandlerCommandOptions
+  ): Promise<GitHandlerCommandResult> {
+    return this.host.git(args, cwd, opts)
+  }
+
+  protected gitBuffer(args: string[], cwd: string): Promise<Buffer> {
+    return this.host.gitBuffer(args, cwd)
+  }
+
+  protected spawnClone(
+    args: string[],
+    cwd: string,
+    progressId: string,
+    context?: RequestContext
+  ): Promise<GitHandlerCommandResult> {
+    return this.host.spawnClone(args, cwd, progressId, context)
+  }
+
+  protected clearGitMutationReadCaches(): void {
+    this.host.clearGitMutationReadCaches()
+  }
+
+  protected runWithGitReadCacheClear<T>(run: () => Promise<T>): Promise<T> {
+    return this.host.runWithGitReadCacheClear(run)
+  }
+
+  protected maybeStreamResponse(
+    result: unknown,
+    params: Record<string, unknown>,
+    context: RequestContext | undefined
+  ): unknown {
+    return this.host.maybeStreamResponse(result, params, context)
+  }
+
+  protected literalPathspec(filePath: string): string {
+    // Why: source-control selections are concrete paths, not user-authored Git globs.
+    return `:(literal)${filePath}`
+  }
+}
diff --git a/src/relay/git-handler-operation-set.ts b/src/relay/git-handler-operation-set.ts
new file mode 100644
index 00000000000..fda295edb7e
--- /dev/null
+++ b/src/relay/git-handler-operation-set.ts
@@ -0,0 +1,36 @@
+import type { GitHandlerOperationHost } from './git-handler-operation-context'
+import { GitHandlerReadOperations } from './git-handler-read-operations'
+import { GitHandlerWorktreeChangeOperations } from './git-handler-worktree-change-operations'
+import { GitHandlerDiscardOperations } from './git-handler-discard-operations'
+import { GitHandlerComparisonOperations } from './git-handler-comparison-operations'
+import { GitHandlerFetchOperations } from './git-handler-fetch-operations'
+import { GitHandlerSyncOperations } from './git-handler-sync-operations'
+import { GitHandlerObjectDiffOperations } from './git-handler-object-diff-operations'
+import { GitHandlerExecOperations } from './git-handler-exec-operations'
+import { GitHandlerWorktreeOperations } from './git-handler-worktree-operations'
+
+export function createGitHandlerOperationSet(host: GitHandlerOperationHost) {
+  const read = new GitHandlerReadOperations(host)
+  const changes = new GitHandlerWorktreeChangeOperations(host)
+  const discard = new GitHandlerDiscardOperations(host)
+  const comparison = new GitHandlerComparisonOperations(host)
+  const fetch = new GitHandlerFetchOperations(host)
+  const sync = new GitHandlerSyncOperations(host)
+  const objectDiff = new GitHandlerObjectDiffOperations(host)
+  const exec = new GitHandlerExecOperations(host)
+  const worktree = new GitHandlerWorktreeOperations(host)
+
+  return {
+    read,
+    changes,
+    discard,
+    comparison,
+    fetch,
+    sync,
+    objectDiff,
+    exec,
+    worktree
+  }
+}
+
+export type GitHandlerOperationSet = ReturnType<typeof createGitHandlerOperationSet>
diff --git a/src/relay/git-handler-read-operations.ts b/src/relay/git-handler-read-operations.ts
new file mode 100644
index 00000000000..5976573b5a3
--- /dev/null
+++ b/src/relay/git-handler-read-operations.ts
@@ -0,0 +1,176 @@
+import * as path from 'node:path'
+import type { RequestContext } from './dispatcher'
+import { GitHandlerOperationContext } from './git-handler-operation-context'
+import { getStatusOp } from './git-handler-status-ops'
+import { streamRelayGitStdout } from './git-stdout-stream'
+import { capGitStatusEntries, resolveGitStatusLimit } from '../shared/git-status-limit'
+import {
+  buildSubmoduleInnerCommitRangeDiff,
+  computeSubmodulePointerDiff,
+  computeSubmoduleRangeEntries,
+  findContainingSubmodule,
+  listSubmodulePathsCached,
+  resolveSubmoduleWorktreePath,
+  resolveSubmoduleCommitRange
+} from './git-handler-submodule-ops'
+import { computeDiff, type GitExec } from './git-handler-ops'
+import { checkIgnoredPathsOp } from './git-handler-check-ignore'
+import { loadGitHistoryFromExecutor } from '../shared/git-history'
+import { stableInFlightKey } from '../shared/in-flight-promise-dedupe'
+
+function resolveSubmoduleStatusArea(
+  params: Record<string, unknown>
+): 'staged' | 'unstaged' | 'untracked' {
+  if (params.area === 'staged' || params.area === 'unstaged' || params.area === 'untracked') {
+    return params.area
+  }
+  return 'unstaged'
+}
+
+export class GitHandlerReadOperations extends GitHandlerOperationContext {
+  async getStatus(params: Record<string, unknown>, context: RequestContext) {
+    this.gitDiffReadDedupe.clear()
+    return getStatusOp(this.git.bind(this), streamRelayGitStdout, params, {
+      signal: context.signal
+    })
+  }
+
+  // Why: fetch per-file submodule changes from the submodule worktree.
+  async getSubmoduleStatus(params: Record<string, unknown>, context: RequestContext) {
+    const worktreePath = params.worktreePath as string
+    const submodulePath = params.submodulePath as string
+    const area = resolveSubmoduleStatusArea(params)
+    const staged = area === 'staged'
+    const resolved = resolveSubmoduleWorktreePath(worktreePath, submodulePath)
+    const limit = resolveGitStatusLimit(params.limit)
+    // Why: staged expansion only represents HEAD→index; scanning the submodule worktree is wasted work.
+    const workingResult = staged
+      ? { entries: [], conflictOperation: 'unknown' }
+      : await getStatusOp(
+          this.git.bind(this),
+          streamRelayGitStdout,
+          {
+            ...params,
+            worktreePath: resolved
+          },
+          { signal: context.signal }
+        )
+    // Why: pointer/range probes are part of the same SSH request and must not outlive its cancellation.
+    const requestGit: GitExec = (args, cwd, options) =>
+      this.git(args, cwd, { ...options, signal: context.signal })
+    // Why: moved clean gitlinks need committed changes surfaced.
+    const { fromOid, toOid } = await resolveSubmoduleCommitRange(
+      requestGit,
+      worktreePath,
+      submodulePath,
+      staged
+    )
+    if (fromOid && toOid && fromOid !== toOid) {
+      const rangeEntries = await computeSubmoduleRangeEntries(requestGit, resolved, fromOid, toOid)
+      if (staged) {
+        return { ...workingResult, ...capGitStatusEntries(rangeEntries, limit) }
+      }
+      const rangePaths = new Set(rangeEntries.map((entry) => entry.path))
+      const entries = [
+        ...rangeEntries,
+        ...workingResult.entries.filter((entry) => !rangePaths.has(entry.path))
+      ]
+      return {
+        ...workingResult,
+        ...capGitStatusEntries(entries, limit, workingResult)
+      }
+    }
+    if (staged) {
+      return { ...workingResult, entries: [] }
+    }
+    return workingResult
+  }
+
+  async checkIgnored(params: Record<string, unknown>) {
+    return checkIgnoredPathsOp(this.git.bind(this), params)
+  }
+
+  async history(params: Record<string, unknown>) {
+    const worktreePath = params.worktreePath as string
+    return loadGitHistoryFromExecutor(this.git.bind(this), worktreePath, {
+      limit: typeof params.limit === 'number' ? params.limit : undefined,
+      baseRef: typeof params.baseRef === 'string' ? params.baseRef : null
+    })
+  }
+
+  async getDiff(params: Record<string, unknown>, context?: RequestContext) {
+    const worktreePath = params.worktreePath as string
+    const filePath = params.filePath as string
+    // Why: validate relative paths to prevent traversal outside the worktree.
+    const resolved = path.resolve(worktreePath, filePath)
+    const rel = path.relative(path.resolve(worktreePath), resolved)
+    if (rel === '..' || rel.startsWith(`..${path.sep}`) || path.isAbsolute(rel)) {
+      throw new Error(`Path "${filePath}" resolves outside the worktree`)
+    }
+    const staged = params.staged as boolean
+    const compareAgainstHead = params.compareAgainstHead as boolean | undefined
+    // Why: register dedupe before awaiting so identical reads coalesce.
+    const result = await this.gitDiffReadDedupe.run(
+      stableInFlightKey(['diff', worktreePath, filePath, staged, compareAgainstHead]),
+      async () => {
+        // Why: route gitlink roots to pointer diffs and inner files to their submodule worktree.
+        const submodulePaths = await listSubmodulePathsCached(
+          this.git.bind(this),
+          worktreePath,
+          this.submodulePathsCache
+        )
+        if (submodulePaths.length > 0) {
+          const matchedSubmodule = findContainingSubmodule(submodulePaths, filePath)
+          if (matchedSubmodule) {
+            const normalizedFilePath = filePath.replace(/\\/g, '/').replace(/\/+$/, '')
+            if (normalizedFilePath === matchedSubmodule) {
+              return computeSubmodulePointerDiff(
+                this.git.bind(this),
+                worktreePath,
+                matchedSubmodule,
+                staged,
+                compareAgainstHead
+              )
+            }
+            const submoduleWorktreePath = resolveSubmoduleWorktreePath(
+              worktreePath,
+              matchedSubmodule
+            )
+            const innerPath = normalizedFilePath.slice(matchedSubmodule.length + 1)
+            const { fromOid, toOid } = await resolveSubmoduleCommitRange(
+              this.git.bind(this),
+              worktreePath,
+              matchedSubmodule,
+              staged
+            )
+            // Why: a moved gitlink (clean worktree) keeps inner changes in committed history, so diff the two commits; otherwise read the working-tree blob.
+            if (fromOid && toOid && fromOid !== toOid) {
+              return buildSubmoduleInnerCommitRangeDiff(
+                this.gitBuffer.bind(this),
+                submoduleWorktreePath,
+                innerPath,
+                fromOid,
+                toOid
+              )
+            }
+            return computeDiff(
+              this.gitBuffer.bind(this),
+              submoduleWorktreePath,
+              innerPath,
+              staged,
+              compareAgainstHead
+            )
+          }
+        }
+        return computeDiff(
+          this.gitBuffer.bind(this),
+          worktreePath,
+          filePath,
+          staged,
+          compareAgainstHead
+        )
+      }
+    )
+    return this.maybeStreamResponse(result, params, context)
+  }
+}
diff --git a/src/relay/git-handler-registration.ts b/src/relay/git-handler-registration.ts
new file mode 100644
index 00000000000..a9f11445dd1
--- /dev/null
+++ b/src/relay/git-handler-registration.ts
@@ -0,0 +1,79 @@
+import type { RelayDispatcher, RequestContext } from './dispatcher'
+import type { GitHandlerOperationSet } from './git-handler-operation-set'
+
+export function registerGitHandlers(
+  dispatcher: RelayDispatcher,
+  handlers: GitHandlerOperationSet,
+  responseAck: (params: Record<string, unknown>, context: RequestContext) => void,
+  cancelResponseStream: (params: Record<string, unknown>, context: RequestContext) => void
+): void {
+  dispatcher.onRequest('git.status', (p, context) => handlers.read.getStatus(p, context))
+  dispatcher.onRequest('git.submoduleStatus', (p, context) =>
+    handlers.read.getSubmoduleStatus(p, context)
+  )
+  dispatcher.onRequest('git.checkIgnored', (p) => handlers.read.checkIgnored(p))
+  dispatcher.onRequest('git.history', (p) => handlers.read.history(p))
+  dispatcher.onRequest('git.commit', (p) => handlers.changes.commit(p))
+  dispatcher.onRequest('git.diff', (p, context) => handlers.read.getDiff(p, context))
+  dispatcher.onRequest('git.stage', (p) => handlers.changes.stage(p))
+  dispatcher.onRequest('git.unstage', (p) => handlers.changes.unstage(p))
+  dispatcher.onRequest('git.bulkStage', (p) => handlers.changes.bulkStage(p))
+  dispatcher.onRequest('git.bulkUnstage', (p) => handlers.changes.bulkUnstage(p))
+  dispatcher.onRequest('git.abortMerge', (p) => handlers.changes.abortMerge(p))
+  dispatcher.onRequest('git.abortRebase', (p) => handlers.changes.abortRebase(p))
+  dispatcher.onRequest('git.checkout', (p) => handlers.changes.checkout(p))
+  dispatcher.onRequest('git.localBranches', (p) => handlers.changes.localBranches(p))
+  dispatcher.onRequest('git.discard', (p) => handlers.discard.discard(p))
+  dispatcher.onRequest('git.bulkDiscard', (p) => handlers.discard.bulkDiscard(p))
+  dispatcher.onRequest('git.conflictOperation', (p) => handlers.discard.conflictOperation(p))
+  dispatcher.onRequest('git.branchCompare', (p) => handlers.comparison.branchCompare(p))
+  dispatcher.onRequest('git.commitCompare', (p) => handlers.comparison.commitCompare(p))
+  dispatcher.onRequest('git.upstreamStatus', (p) => handlers.comparison.upstreamStatus(p))
+  dispatcher.onRequest('git.fetch', (p) => handlers.fetch.fetch(p))
+  dispatcher.onRequest('git.forkSync', (p, context) => handlers.fetch.forkSync(p, context))
+  dispatcher.onRequest('git.fetchRemoteTrackingRef', (p) =>
+    handlers.fetch.fetchRemoteTrackingRef(p)
+  )
+  dispatcher.onRequest('git.fetchGitHubPullRequestHead', (p) =>
+    handlers.fetch.fetchGitHubPullRequestHead(p)
+  )
+  dispatcher.onRequest('git.fetchGitLabMergeRequestHead', (p) =>
+    handlers.fetch.fetchGitLabMergeRequestHead(p)
+  )
+  // Why: the durable-ref variant is a distinct method name so an old relay
+  // (which only knows FETCH_HEAD-semantics git.fetchGitLabMergeRequestHead)
+  // returns -32601 and the client can prompt a reconnect instead of silently
+  // resolving a stale/missing ref. Both names share the durable handler: a
+  // refspec fetch still writes FETCH_HEAD, so old clients keep their semantics.
+  dispatcher.onRequest('git.fetchGitLabMergeRequestHeadRef', (p) =>
+    handlers.fetch.fetchGitLabMergeRequestHead(p)
+  )
+  dispatcher.onRequest('git.push', (p) => handlers.sync.push(p))
+  dispatcher.onRequest('git.pull', (p, context) => handlers.sync.pull(p, context))
+  dispatcher.onRequest('git.fastForward', (p, context) => handlers.sync.fastForward(p, context))
+  dispatcher.onRequest('git.rebaseFromBase', (p, context) =>
+    handlers.sync.rebaseFromBase(p, context)
+  )
+  dispatcher.onRequest('git.branchDiff', (p, context) => handlers.objectDiff.branchDiff(p, context))
+  dispatcher.onRequest('git.commitDiff', (p, context) => handlers.objectDiff.commitDiff(p, context))
+  dispatcher.onRequest('git.listWorktrees', (p, context) =>
+    handlers.worktree.listWorktrees(p, context)
+  )
+  dispatcher.onRequest('git.addWorktree', (p) => handlers.worktree.addWorktree(p))
+  dispatcher.onRequest('git.removeWorktree', (p) => handlers.worktree.removeWorktree(p))
+  dispatcher.onRequest('git.worktreeIsClean', (p) => handlers.worktree.worktreeIsClean(p))
+  dispatcher.onRequest('git.refreshLocalBaseRefForWorktreeCreate', (p) =>
+    handlers.worktree.refreshLocalBaseRefForWorktreeCreate(p)
+  )
+  dispatcher.onRequest('git.renameCurrentBranch', (p) => handlers.exec.renameCurrentBranch(p))
+  dispatcher.onRequest('git.forceDeletePreservedBranch', (p) =>
+    handlers.exec.forceDeletePreservedBranch(p)
+  )
+  dispatcher.onRequest('git.exec', (p, context) => handlers.exec.exec(p, context))
+  dispatcher.onRequest('git.clone', (p, context) => handlers.exec.clone(p, context))
+  dispatcher.onRequest('git.isGitRepo', (p) => handlers.worktree.isGitRepo(p))
+  dispatcher.onNotification('git.responseAck', (p, context) => responseAck(p, context))
+  dispatcher.onNotification('git.cancelResponseStream', (p, context) =>
+    cancelResponseStream(p, context)
+  )
+}
diff --git a/src/relay/git-handler-sync-operations.ts b/src/relay/git-handler-sync-operations.ts
new file mode 100644
index 00000000000..262517b33cc
--- /dev/null
+++ b/src/relay/git-handler-sync-operations.ts
@@ -0,0 +1,205 @@
+import { randomUUID } from 'node:crypto'
+import type { RequestContext } from './dispatcher'
+import { GitHandlerOperationContext } from './git-handler-operation-context'
+import { resolveRelayPushTarget } from './git-handler-push-target'
+import { normalizeGitErrorMessage, runPullWithDivergenceFallback } from '../shared/git-remote-error'
+import { assertGitPushTargetShape } from '../shared/git-push-target-validation'
+import type { GitCommandRunner } from '../shared/git-publish-target-status'
+import type { GitPushTarget } from '../shared/worktree/types'
+import { resolveEffectiveGitUpstream } from '../shared/git-effective-upstream'
+import { runWithGitWorktreeOperationLock } from '../shared/git-worktree-operation-lock'
+import {
+  REBASE_FROM_BASE_OPERATION_TIMEOUT_MS,
+  REBASE_SOURCE_FETCH_TIMEOUT_MS,
+  resolveGitRemoteRebaseSource
+} from '../shared/git-rebase-source'
+import { isNoWriteFetchHeadUnsupportedError } from '../shared/git-fetch-head-capability'
+
+export class GitHandlerSyncOperations extends GitHandlerOperationContext {
+  async push(params: Record<string, unknown>) {
+    this.clearGitMutationReadCaches()
+    const worktreePath = params.worktreePath as string
+    // Why: mirror src/main/git/remote.ts — push to a configured upstream when present so SSH worktrees with non-origin targets aren't repointed.
+    void params.publish
+    try {
+      try {
+        const target = await resolveRelayPushTarget(
+          this.git.bind(this),
+          worktreePath,
+          params.pushTarget
+        )
+        const args = [
+          'push',
+          ...(params.forceWithLease === true ? ['--force-with-lease'] : []),
+          '--set-upstream',
+          ...(target ? [target.remote, target.refspec] : ['origin', 'HEAD'])
+        ]
+        await this.git(args, worktreePath)
+      } catch (error) {
+        // Why: mirror local gitPush normalization so SSH users get "non-fast-forward / pull first" guidance instead of raw git stderr.
+        throw new Error(normalizeGitErrorMessage(error, 'push'))
+      }
+    } finally {
+      this.clearGitMutationReadCaches()
+    }
+  }
+
+  private async pullWithArgs(
+    params: Record<string, unknown>,
+    pullArgs: string[],
+    signal?: AbortSignal
+  ) {
+    const worktreePath = params.worktreePath as string
+    return runWithGitWorktreeOperationLock(worktreePath, signal, () =>
+      this.runPullWithArgsUnlocked(params, pullArgs)
+    )
+  }
+
+  private async runPullWithArgsUnlocked(
+    params: Record<string, unknown>,
+    pullArgs: string[]
+  ): Promise<void> {
+    this.clearGitMutationReadCaches()
+    const worktreePath = params.worktreePath as string
+    const runPull = async (effectiveArgs: string[]): Promise<void> => {
+      if (params.pushTarget !== undefined) {
+        assertGitPushTargetShape(params.pushTarget)
+        const pushTarget = params.pushTarget as GitPushTarget
+        await this.git(['check-ref-format', '--branch', pushTarget.branchName], worktreePath)
+        await this.git(
+          ['pull', ...effectiveArgs, pushTarget.remoteName, pushTarget.branchName],
+          worktreePath
+        )
+        return
+      }
+      const upstream = await resolveEffectiveGitUpstream((args) => this.git(args, worktreePath))
+      if (upstream && !upstream.isConfiguredUpstream) {
+        // Why: legacy Orca branches may track origin/main while pushes target origin/<branch>; pull the same effective branch the UI reports.
+        await this.git(
+          ['pull', ...effectiveArgs, upstream.remoteName, upstream.branchName],
+          worktreePath
+        )
+        return
+      }
+      await this.git(['pull', ...effectiveArgs], worktreePath)
+    }
+
+    try {
+      try {
+        await runPullWithDivergenceFallback(pullArgs, runPull)
+      } catch (error) {
+        // Why: mirror local gitPull normalization so SSH users get actionable messages instead of raw git stderr.
+        throw new Error(normalizeGitErrorMessage(error, 'pull'))
+      }
+    } finally {
+      this.clearGitMutationReadCaches()
+    }
+  }
+
+  async pull(params: Record<string, unknown>, context?: RequestContext) {
+    // Why: plain `git pull` honors user merge/rebase/ff policy.
+    await this.pullWithArgs(params, [], context?.signal)
+  }
+
+  async fastForward(params: Record<string, unknown>, context?: RequestContext) {
+    await this.pullWithArgs(params, ['--ff-only'], context?.signal)
+  }
+
+  async rebaseFromBase(params: Record<string, unknown>, context?: RequestContext) {
+    return runWithGitWorktreeOperationLock(params.worktreePath as string, context?.signal, () =>
+      this.runRebaseFromBase(params, context)
+    )
+  }
+
+  private async runRebaseFromBase(params: Record<string, unknown>, context?: RequestContext) {
+    this.clearGitMutationReadCaches()
+    const worktreePath = params.worktreePath as string
+    const baseRef = params.baseRef as string
+    let rebaseRef: string | null = null
+    const controller = new AbortController()
+    const abortFromContext = () => controller.abort()
+    if (context?.signal?.aborted) {
+      controller.abort()
+    } else {
+      context?.signal?.addEventListener('abort', abortFromContext, { once: true })
+    }
+    const timeout = setTimeout(() => controller.abort(), REBASE_FROM_BASE_OPERATION_TIMEOUT_MS)
+    try {
+      try {
+        const source = await resolveGitRemoteRebaseSource(
+          ((args) =>
+            this.git(args, worktreePath, {
+              signal: controller.signal,
+              terminationBarrier: true
+            })) as GitCommandRunner,
+          baseRef
+        )
+        let forkPoint: string | null = null
+        let hasHead = true
+        try {
+          const { stdout } = await this.git(
+            ['merge-base', '--fork-point', `refs/remotes/${source.displayName}`, 'HEAD'],
+            worktreePath,
+            { signal: controller.signal, terminationBarrier: true }
+          )
+          forkPoint = stdout.trim() || null
+        } catch {
+          // A first fetch or an unhelpful reflog falls back to Git's merge-base behavior.
+          try {
+            await this.git(['rev-parse', '--verify', 'HEAD'], worktreePath, {
+              signal: controller.signal,
+              terminationBarrier: true
+            })
+          } catch {
+            hasHead = false
+          }
+        }
+        // Why: concurrent fetches can replace FETCH_HEAD and remote-tracking refs between fetch and rebase.
+        rebaseRef = `refs/orca/rebase/${randomUUID()}`
+        const fetchArgs = [
+          source.remoteName,
+          `+refs/heads/${source.branchName}:${rebaseRef}`,
+          `+refs/heads/${source.branchName}:refs/remotes/${source.displayName}`
+        ]
+        await this.gitCapabilities.runWithFallback(
+          'fetch-no-write-fetch-head',
+          () =>
+            this.git(['fetch', '--no-write-fetch-head', ...fetchArgs], worktreePath, {
+              timeout: REBASE_SOURCE_FETCH_TIMEOUT_MS,
+              signal: controller.signal,
+              terminationBarrier: true
+            }),
+          () =>
+            this.git(['fetch', ...fetchArgs], worktreePath, {
+              timeout: REBASE_SOURCE_FETCH_TIMEOUT_MS,
+              signal: controller.signal,
+              terminationBarrier: true
+            }),
+          isNoWriteFetchHeadUnsupportedError
+        )
+        await this.git(
+          hasHead
+            ? forkPoint
+              ? ['rebase', '--onto', rebaseRef, forkPoint]
+              : ['rebase', rebaseRef]
+            : ['merge', '--ff-only', rebaseRef],
+          worktreePath,
+          { signal: controller.signal, terminationBarrier: true }
+        )
+      } catch (error) {
+        throw new Error(normalizeGitErrorMessage(error, 'pull'))
+      }
+    } finally {
+      if (rebaseRef) {
+        try {
+          await this.git(['update-ref', '-d', rebaseRef], worktreePath)
+        } catch {
+          // Cleanup must not hide the fetch or rebase result.
+        }
+      }
+      clearTimeout(timeout)
+      context?.signal?.removeEventListener('abort', abortFromContext)
+      this.clearGitMutationReadCaches()
+    }
+  }
+}
diff --git a/src/relay/git-handler-worktree-change-operations.ts b/src/relay/git-handler-worktree-change-operations.ts
new file mode 100644
index 00000000000..907e5dba50d
--- /dev/null
+++ b/src/relay/git-handler-worktree-change-operations.ts
@@ -0,0 +1,134 @@
+import { GitHandlerOperationContext, GIT_BULK_CHUNK_SIZE } from './git-handler-operation-context'
+import { commitChangesRelay } from './git-handler-worktree-ops'
+
+const BULK_CHUNK_SIZE = GIT_BULK_CHUNK_SIZE
+
+export class GitHandlerWorktreeChangeOperations extends GitHandlerOperationContext {
+  async stage(params: Record<string, unknown>) {
+    this.clearGitMutationReadCaches()
+    const worktreePath = params.worktreePath as string
+    const filePath = params.filePath as string
+    try {
+      await this.git(['add', '--', this.literalPathspec(filePath)], worktreePath)
+    } finally {
+      this.clearGitMutationReadCaches()
+    }
+  }
+
+  async commit(params: Record<string, unknown>): Promise<{ success: boolean; error?: string }> {
+    this.clearGitMutationReadCaches()
+    const worktreePath = params.worktreePath as string
+    const message = params.message as string
+    try {
+      return await commitChangesRelay(this.git.bind(this), worktreePath, message)
+    } finally {
+      this.clearGitMutationReadCaches()
+    }
+  }
+
+  async unstage(params: Record<string, unknown>) {
+    this.clearGitMutationReadCaches()
+    const worktreePath = params.worktreePath as string
+    const filePath = params.filePath as string
+    try {
+      await this.git(['restore', '--staged', '--', this.literalPathspec(filePath)], worktreePath)
+    } finally {
+      this.clearGitMutationReadCaches()
+    }
+  }
+
+  async bulkStage(params: Record<string, unknown>) {
+    this.clearGitMutationReadCaches()
+    const worktreePath = params.worktreePath as string
+    const filePaths = params.filePaths as string[]
+    try {
+      for (let i = 0; i < filePaths.length; i += BULK_CHUNK_SIZE) {
+        const chunk = filePaths.slice(i, i + BULK_CHUNK_SIZE)
+        await this.git(
+          ['add', '--', ...chunk.map((filePath) => this.literalPathspec(filePath))],
+          worktreePath
+        )
+      }
+    } finally {
+      this.clearGitMutationReadCaches()
+    }
+  }
+
+  async bulkUnstage(params: Record<string, unknown>) {
+    this.clearGitMutationReadCaches()
+    const worktreePath = params.worktreePath as string
+    const filePaths = params.filePaths as string[]
+    try {
+      for (let i = 0; i < filePaths.length; i += BULK_CHUNK_SIZE) {
+        const chunk = filePaths.slice(i, i + BULK_CHUNK_SIZE)
+        await this.git(
+          ['restore', '--staged', '--', ...chunk.map((filePath) => this.literalPathspec(filePath))],
+          worktreePath
+        )
+      }
+    } finally {
+      this.clearGitMutationReadCaches()
+    }
+  }
+
+  async abortMerge(params: Record<string, unknown>) {
+    this.clearGitMutationReadCaches()
+    const worktreePath = params.worktreePath as string
+    try {
+      await this.git(['merge', '--abort'], worktreePath)
+    } finally {
+      this.clearGitMutationReadCaches()
+    }
+  }
+
+  async abortRebase(params: Record<string, unknown>) {
+    this.clearGitMutationReadCaches()
+    const worktreePath = params.worktreePath as string
+    try {
+      await this.git(['rebase', '--abort'], worktreePath)
+    } finally {
+      this.clearGitMutationReadCaches()
+    }
+  }
+
+  async checkout(params: Record<string, unknown>) {
+    this.clearGitMutationReadCaches()
+    const worktreePath = params.worktreePath as string
+    const branch = params.branch as string
+    // Defense-in-depth: reject `-`-prefixed branch tokens to block flag injection (this relay entrypoint is reachable independently of the RPC schema).
+    if (typeof branch !== 'string' || branch.length === 0 || branch.startsWith('-')) {
+      throw new Error('invalid_branch_name')
+    }
+    try {
+      await this.git(['checkout', branch, '--'], worktreePath)
+      return { ok: true as const, branch }
+    } finally {
+      this.clearGitMutationReadCaches()
+    }
+  }
+
+  async localBranches(params: Record<string, unknown>) {
+    const worktreePath = params.worktreePath as string
+    const { stdout } = await this.git(
+      ['for-each-ref', '--format=%(HEAD)%09%(refname:short)', 'refs/heads/'],
+      worktreePath
+    )
+    let current: string | null = null
+    const branches: string[] = []
+    for (const line of stdout.split('\n')) {
+      if (line.length === 0) {
+        continue
+      }
+      const [marker, name] = line.split('\t')
+      if (!name) {
+        continue
+      }
+      if (marker === '*') {
+        current = name
+      }
+      branches.push(name)
+    }
+    branches.sort((a, b) => (a === current ? -1 : b === current ? 1 : 0))
+    return { current, branches }
+  }
+}
diff --git a/src/relay/git-handler-worktree-operations.ts b/src/relay/git-handler-worktree-operations.ts
new file mode 100644
index 00000000000..32993dd845b
--- /dev/null
+++ b/src/relay/git-handler-worktree-operations.ts
@@ -0,0 +1,179 @@
+import * as path from 'node:path'
+import type { RequestContext } from './dispatcher'
+import { expandTilde } from './context'
+import { GitHandlerOperationContext } from './git-handler-operation-context'
+import { isUnsupportedWorktreeListZError, parseWorktreeList } from './git-handler-utils'
+import {
+  addWorktreeOp,
+  areRelayWorktreePathsEqual,
+  removeWorktreeOp,
+  worktreeIsCleanOp
+} from './git-handler-worktree-ops'
+import { annotatePrunableWorktreesByExistence } from './git-handler-worktree-list'
+import { refreshLocalBaseRefForWorktreeCreateOp } from './git-handler-local-base-ref-refresh'
+import {
+  hasUnsupportedRevParsePathFormatEcho,
+  isUnsupportedRevParsePathFormatError
+} from '../shared/git-worktree-command-capabilities'
+
+function isWindowsAbsolutePath(value: string): boolean {
+  return /^[A-Za-z]:[\\/]/.test(value) || value.startsWith('\\\\')
+}
+
+function resolveRelayPath(repoPath: string, value: string): string {
+  if (path.posix.isAbsolute(value) || path.win32.isAbsolute(value)) {
+    return value
+  }
+  // Old Git ignores `--path-format=absolute`; resolve relative paths against repoPath by path shape.
+  return isWindowsAbsolutePath(repoPath)
+    ? path.win32.resolve(repoPath, value)
+    : path.posix.resolve(repoPath, value)
+}
+
+type RelayRepoLocation = { topLevel: string; commonDir: string }
+
+function parseRelayRepoLocation(repoPath: string, output: string): RelayRepoLocation | undefined {
+  // Old git (pre `--path-format`) echoes the unknown flag and exits 0; drop `-`-prefixed lines, take the last two paths.
+  // Strip only the trailing CR, not surrounding spaces — git paths may legitimately start or end with a space.
+  const lines = output
+    .split('\n')
+    .map((line) => (line.endsWith('\r') ? line.slice(0, -1) : line))
+    .filter((line) => line.length > 0 && !line.startsWith('-'))
+  if (lines.length < 2) {
+    return undefined
+  }
+  const [topLevel, commonDir] = lines.slice(-2)
+  return {
+    topLevel: resolveRelayPath(repoPath, topLevel),
+    commonDir: resolveRelayPath(repoPath, commonDir)
+  }
+}
+
+export class GitHandlerWorktreeOperations extends GitHandlerOperationContext {
+  async isGitRepo(params: Record<string, unknown>) {
+    const dirPath = params.dirPath as string
+    try {
+      const { stdout } = await this.git(['rev-parse', '--show-toplevel'], dirPath)
+      return { isRepo: true, rootPath: stdout.trim() }
+    } catch {
+      return { isRepo: false, rootPath: null }
+    }
+  }
+
+  private async readRepoLocation(repoPath: string): Promise<RelayRepoLocation | undefined> {
+    try {
+      return await this.gitCapabilities.runWithFallback(
+        'rev-parse-path-format',
+        async () => {
+          const { stdout } = await this.git(
+            ['rev-parse', '--path-format=absolute', '--show-toplevel', '--git-common-dir'],
+            repoPath
+          )
+          if (hasUnsupportedRevParsePathFormatEcho(stdout)) {
+            // Why: old Git echoes the unknown option and exits zero; remember the signal though the paths still parse.
+            this.gitCapabilities.rememberUnsupported('rev-parse-path-format')
+          }
+          return parseRelayRepoLocation(repoPath, stdout)
+        },
+        async () => {
+          const { stdout } = await this.git(
+            ['rev-parse', '--show-toplevel', '--git-common-dir'],
+            repoPath
+          )
+          return parseRelayRepoLocation(repoPath, stdout)
+        },
+        isUnsupportedRevParsePathFormatError
+      )
+    } catch {
+      return undefined
+    }
+  }
+
+  private async normalizeMainWorktreePath(
+    repoPath: string,
+    worktrees: Record<string, unknown>[]
+  ): Promise<Record<string, unknown>[]> {
+    const mainIndex = worktrees.findIndex((worktree) => worktree.isMainWorktree === true)
+    const mainWorktree = worktrees[mainIndex]
+    const mainPath = typeof mainWorktree?.path === 'string' ? mainWorktree.path : ''
+    // Expand `~` so legacy tilde SSH repo paths match git's absolute path, sparing a rev-parse per poll.
+    const resolvedRepoPath = expandTilde(repoPath)
+    if (!mainPath || areRelayWorktreePathsEqual(mainPath, resolvedRepoPath)) {
+      return worktrees
+    }
+
+    const location = await this.readRepoLocation(resolvedRepoPath)
+    if (!location) {
+      return worktrees
+    }
+
+    // Why: only separate-git-dir/submodule repos have main entry == git-common-dir; gate on it so we don't clobber a linked worktree's real root.
+    if (!areRelayWorktreePathsEqual(mainPath, location.commonDir)) {
+      return worktrees
+    }
+
+    const normalized = [...worktrees]
+    normalized[mainIndex] = { ...mainWorktree, path: location.topLevel }
+    return normalized
+  }
+
+  async listWorktrees(params: Record<string, unknown>, context?: RequestContext) {
+    const repoPath = params.repoPath as string
+    return this.gitCapabilities
+      .runWithFallback(
+        'worktree-list-z',
+        async () => {
+          const { stdout } = await this.git(['worktree', 'list', '--porcelain', '-z'], repoPath, {
+            signal: context?.signal
+          })
+          return this.normalizeMainWorktreePath(
+            repoPath,
+            parseWorktreeList(stdout, { nulDelimited: true })
+          )
+        },
+        async () => {
+          // Why: Git <2.36 lacks worktree-list `-z`, so fall back to the newline-block parser (loses newline-in-path safety).
+          try {
+            const { stdout } = await this.git(['worktree', 'list', '--porcelain'], repoPath, {
+              signal: context?.signal
+            })
+            const normalized = await this.normalizeMainWorktreePath(
+              repoPath,
+              parseWorktreeList(stdout)
+            )
+            // Why: Git <2.31 emits no `prunable` annotation, so probe each linked worktree's existence instead of trusting stale registrations (issue #8389).
+            return annotatePrunableWorktreesByExistence(normalized)
+          } catch {
+            return []
+          }
+        },
+        isUnsupportedWorktreeListZError
+      )
+      .catch(() => [])
+  }
+
+  async addWorktree(params: Record<string, unknown>) {
+    return this.runWithGitReadCacheClear(() => addWorktreeOp(this.git.bind(this), params))
+  }
+
+  async removeWorktree(params: Record<string, unknown>) {
+    const remove = () =>
+      this.runWithGitReadCacheClear(() =>
+        removeWorktreeOp(this.git.bind(this), params, this.gitCapabilities)
+      )
+    const worktreePath = params.worktreePath
+    return this.watcherRegistry && typeof worktreePath === 'string'
+      ? this.watcherRegistry.runWithRemovalFence(expandTilde(worktreePath), remove)
+      : remove()
+  }
+
+  async worktreeIsClean(params: Record<string, unknown>) {
+    return worktreeIsCleanOp(this.git.bind(this), params)
+  }
+
+  async refreshLocalBaseRefForWorktreeCreate(params: Record<string, unknown>) {
+    return this.runWithGitReadCacheClear(() =>
+      refreshLocalBaseRefForWorktreeCreateOp(this.git.bind(this), params, this.gitCapabilities)
+    )
+  }
+}
diff --git a/src/relay/git-handler.ts b/src/relay/git-handler.ts
index b3e5cb96fcb..58f47da9fce 100644
--- a/src/relay/git-handler.ts
+++ b/src/relay/git-handler.ts
@@ -1,157 +1,33 @@
-/* eslint-disable max-lines -- Why: centralizes the git RPC protocol surface so local and SSH git behavior stay in one dispatch table. */
-import { randomUUID } from 'node:crypto'
 import { execFile, spawn, type ExecFileOptions } from 'node:child_process'
 import { promisify } from 'node:util'
-import * as path from 'node:path'
 import type { RelayDispatcher, RequestContext } from './dispatcher'
 import type { RelayContext } from './context'
 import { expandTilde } from './context'
-import {
-  isUnsupportedWorktreeListZError,
-  parseBranchDiff,
-  parseWorktreeList
-} from './git-handler-utils'
-import { parseNumstat } from '../shared/git-uncommitted-line-stats'
-import {
-  computeDiff,
-  branchCompare as branchCompareOp,
-  branchDiffEntries,
-  validateGitExecArgs,
-  type GitExec
-} from './git-handler-ops'
-import {
-  branchDiffEntryAtPinnedOids,
-  isFullGitObjectId,
-  parseOptionalBranchDiffHeadOid
-} from './git-handler-branch-diff-ops'
-import {
-  buildSubmoduleInnerCommitRangeDiff,
-  computeSubmodulePointerDiff,
-  computeSubmoduleRangeEntries,
-  clearSubmodulePathsCache,
-  createSubmodulePathsCache,
-  findContainingSubmodule,
-  listSubmodulePathsCached,
-  resolveSubmoduleWorktreePath,
-  resolveSubmoduleCommitRange,
-  type SubmodulePathsCache
-} from './git-handler-submodule-ops'
-import { commitCompare as commitCompareOp, commitDiffEntry } from './git-handler-commit-diff-ops'
-import {
-  areRelayWorktreePathsEqual,
-  commitChangesRelay,
-  addWorktreeOp,
-  removeWorktreeOp,
-  worktreeIsCleanOp
-} from './git-handler-worktree-ops'
-import { annotatePrunableWorktreesByExistence } from './git-handler-worktree-list'
-import { forceDeletePreservedRelayBranch } from './git-handler-branch-cleanup'
-import { refreshLocalBaseRefForWorktreeCreateOp } from './git-handler-local-base-ref-refresh'
-import { gitExecMutatesRepository } from '../shared/git-exec-mutation'
-import { detectConflictOperation, getStatusOp } from './git-handler-status-ops'
-import { capGitStatusEntries, resolveGitStatusLimit } from '../shared/git-status-limit'
-import { checkIgnoredPathsOp } from './git-handler-check-ignore'
-import { resolveRelayPushTarget } from './git-handler-push-target'
-import {
-  isExecKilledError,
-  isNoUpstreamError,
-  normalizeGitErrorMessage,
-  runPullWithDivergenceFallback
-} from '../shared/git-remote-error'
-import { upstreamOnlyCommitsArePatchEquivalent } from '../shared/git-upstream-status'
-import { assertGitPushTargetShape } from '../shared/git-push-target-validation'
-import { getPublishTargetStatus, type GitCommandRunner } from '../shared/git-publish-target-status'
-import { isNoWriteFetchHeadUnsupportedError } from '../shared/git-fetch-head-capability'
-import { runWithGitWorktreeOperationLock } from '../shared/git-worktree-operation-lock'
-import { resolveGitFetchHeadCommand, runWithGitFetchHeadLock } from '../shared/git-fetch-head-lock'
-import {
-  REBASE_FROM_BASE_OPERATION_TIMEOUT_MS,
-  REBASE_SOURCE_FETCH_TIMEOUT_MS,
-  resolveGitRemoteRebaseSource
-} from '../shared/git-rebase-source'
-import type { GitPushTarget } from '../shared/worktree/types'
-import {
-  getEffectiveGitUpstreamStatus,
-  resolveEffectiveGitUpstream
-} from '../shared/git-effective-upstream'
-import { loadGitHistoryFromExecutor } from '../shared/git-history'
-import { buildRelayGitEnv, buildRelayUnattendedGitEnv } from './relay-command-env'
-import {
-  removeSafeUntrackedDiscardTarget,
-  removeSafeUntrackedDiscardTargets
-} from '../shared/git-discard-path-safety'
-import { getGitCloneFailureMessage } from '../shared/git-clone-failure-message'
-import { syncForkDefaultBranch, validateGitForkSyncExpectedUpstream } from '../shared/git-fork-sync'
-import { InFlightPromiseDedupe, stableInFlightKey } from '../shared/in-flight-promise-dedupe'
-import { GIT_FETCH_SKIP_AUTO_MAINTENANCE_CONFIG_ARGS } from '../shared/git-fetch-auto-maintenance'
+import { InFlightPromiseDedupe } from '../shared/in-flight-promise-dedupe'
 import { GitCapabilityCache } from '../shared/git-capability-cache'
 import {
-  githubPullRequestHeadLocalRef,
-  gitlabMergeRequestHeadLocalRef,
-  isSafeReviewHeadFetchRemote,
-  isValidReviewHeadNumber,
-  reviewHeadRemoteRefComponent,
-  REVIEW_HEAD_FETCH_TIMEOUT_MS
-} from '../shared/review-head-tracking-ref'
-import type { RelayFilesystemWatchRegistry } from './relay-filesystem-watch-registry'
-import {
-  hasUnsupportedRevParsePathFormatEcho,
-  isUnsupportedRevParsePathFormatError
-} from '../shared/git-worktree-command-capabilities'
+  clearSubmodulePathsCache,
+  createSubmodulePathsCache,
+  type SubmodulePathsCache
+} from './git-handler-submodule-ops'
 import { GitResponseStreamRegistry } from './git-response-stream'
 import { GIT_RESPONSE_STREAM_THRESHOLD } from './protocol'
-import { endSubprocessStdin } from '../shared/subprocess-stdin-write'
 import { clearGitStatusLineStatsCache } from '../shared/git-status-line-stats-cache'
 import { invalidateGitBranchLineTotalInFlight } from '../shared/git-branch-line-total'
-import { streamRelayGitStdout } from './git-stdout-stream'
-import { runProcess } from '../shared/child-process/run-process'
+import { buildRelayGitEnv, buildRelayUnattendedGitEnv } from './relay-command-env'
+import { getGitCloneFailureMessage } from '../shared/git-clone-failure-message'
+import type {
+  GitHandlerCommandOptions,
+  GitHandlerCommandResult,
+  GitHandlerWatcherRegistry
+} from './git-handler-operation-context'
+import { createGitHandlerOperationSet } from './git-handler-operation-set'
+import { registerGitHandlers } from './git-handler-registration'
+import { resolveGitFetchHeadCommand, runWithGitFetchHeadLock } from '../shared/git-fetch-head-lock'
+import { endSubprocessStdin } from '../shared/subprocess-stdin-write'
+import { MAX_GIT_BUFFER, runGitToTermination } from './git-handler-command-termination'
 
 const execFileAsync = promisify(execFile)
-const MAX_GIT_BUFFER = 10 * 1024 * 1024
-const BULK_CHUNK_SIZE = 100
-const GIT_REBASE_PROCESS_FALLBACK_TIMEOUT_MS = 2_147_000_000
-
-function resolveSubmoduleStatusArea(
-  params: Record<string, unknown>
-): 'staged' | 'unstaged' | 'untracked' {
-  if (params.area === 'staged' || params.area === 'unstaged' || params.area === 'untracked') {
-    return params.area
-  }
-  return 'unstaged'
-}
-
-function isWindowsAbsolutePath(value: string): boolean {
-  return /^[A-Za-z]:[\\/]/.test(value) || value.startsWith('\\\\')
-}
-
-function resolveRelayPath(repoPath: string, value: string): string {
-  if (path.posix.isAbsolute(value) || path.win32.isAbsolute(value)) {
-    return value
-  }
-  // Old Git ignores `--path-format=absolute`; resolve relative paths against repoPath by path shape.
-  return isWindowsAbsolutePath(repoPath)
-    ? path.win32.resolve(repoPath, value)
-    : path.posix.resolve(repoPath, value)
-}
-
-type RelayRepoLocation = { topLevel: string; commonDir: string }
-
-function parseRelayRepoLocation(repoPath: string, output: string): RelayRepoLocation | undefined {
-  // Old git (pre `--path-format`) echoes the unknown flag and exits 0; drop `-`-prefixed lines, take the last two paths.
-  // Strip only the trailing CR, not surrounding spaces — git paths may legitimately start or end with a space.
-  const lines = output
-    .split('\n')
-    .map((line) => (line.endsWith('\r') ? line.slice(0, -1) : line))
-    .filter((line) => line.length > 0 && !line.startsWith('-'))
-  if (lines.length < 2) {
-    return undefined
-  }
-  const [topLevel, commonDir] = lines.slice(-2)
-  return {
-    topLevel: resolveRelayPath(repoPath, topLevel),
-    commonDir: resolveRelayPath(repoPath, commonDir)
-  }
-}
 
 function execFileWithStdin(
   command: string,
@@ -188,47 +64,6 @@ function execFileWithStdin(
   })
 }
 
-async function runGitToTermination(
-  args: string[],
-  options: ExecFileOptions,
-  stdin: string | undefined
-): Promise<{ stdout: string; stderr: string }> {
-  const result = await runProcess({
-    program: 'git',
-    args,
-    cwd: typeof options.cwd === 'string' ? options.cwd : undefined,
-    env: options.env,
-    timeoutMs:
-      typeof options.timeout === 'number'
-        ? options.timeout
-        : GIT_REBASE_PROCESS_FALLBACK_TIMEOUT_MS,
-    maxOutputBytes: typeof options.maxBuffer === 'number' ? options.maxBuffer : MAX_GIT_BUFFER,
-    signal: options.signal,
-    terminationBarrier: true,
-    ...(stdin === undefined ? {} : { input: stdin })
-  })
-  if (result.code === 0 && !result.timedOut && !options.signal?.aborted) {
-    return { stdout: result.stdout, stderr: result.stderr }
-  }
-  const error = new Error(
-    result.timedOut
-      ? `git ${args[0] ?? 'command'} timed out.`
-      : options.signal?.aborted
-        ? 'The operation was aborted.'
-        : result.stderr.trim() || `git ${args[0] ?? 'command'} failed.`
-  )
-  if (options.signal?.aborted) {
-    error.name = 'AbortError'
-  }
-  throw Object.assign(error, {
-    code: result.code,
-    killed: result.timedOut || result.signal !== null || options.signal?.aborted === true,
-    signal: result.signal,
-    stdout: result.stdout,
-    stderr: result.stderr
-  })
-}
-
 export class GitHandler {
   private dispatcher: RelayDispatcher
   private readonly gitDiffReadDedupe = new InFlightPromiseDedupe<unknown>()
@@ -243,10 +78,30 @@ export class GitHandler {
   constructor(
     dispatcher: RelayDispatcher,
     _context: RelayContext,
-    private readonly watcherRegistry?: Pick<RelayFilesystemWatchRegistry, 'runWithRemovalFence'>
+    private readonly watcherRegistry?: GitHandlerWatcherRegistry
   ) {
     this.dispatcher = dispatcher
-    this.registerHandlers()
+    const handlers = createGitHandlerOperationSet({
+      gitDiffReadDedupe: this.gitDiffReadDedupe,
+      gitCapabilities: this.gitCapabilities,
+      submodulePathsCache: this.submodulePathsCache,
+      watcherRegistry: this.watcherRegistry,
+      git: (args, cwd, opts) =>
+        opts === undefined ? this.git(args, cwd) : this.git(args, cwd, opts),
+      gitBuffer: (args, cwd) => this.gitBuffer(args, cwd),
+      spawnClone: (args, cwd, progressId, context) =>
+        this.spawnClone(args, cwd, progressId, context),
+      clearGitMutationReadCaches: () => this.clearGitMutationReadCaches(),
+      runWithGitReadCacheClear: (run) => this.runWithGitReadCacheClear(run),
+      maybeStreamResponse: (result, params, context) =>
+        this.maybeStreamResponse(result, params, context)
+    })
+    registerGitHandlers(
+      this.dispatcher,
+      handlers,
+      (params, context) => this.responseAck(params, context),
+      (params, context) => this.cancelResponseStream(params, context)
+    )
     // Why: a detached client's git.responseAck frames never arrive; wake any pump parked on the ack window so it re-checks staleness and exits.
     this.dispatcher.onClientDetached?.(() => this.responseStreams.wakeAll())
   }
@@ -256,72 +111,6 @@ export class GitHandler {
     this.clearGitMutationReadCaches()
   }
 
-  private registerHandlers(): void {
-    this.dispatcher.onRequest('git.status', (p, context) => this.getStatus(p, context))
-    this.dispatcher.onRequest('git.submoduleStatus', (p, context) =>
-      this.getSubmoduleStatus(p, context)
-    )
-    this.dispatcher.onRequest('git.checkIgnored', (p) => this.checkIgnored(p))
-    this.dispatcher.onRequest('git.history', (p) => this.history(p))
-    this.dispatcher.onRequest('git.commit', (p) => this.commit(p))
-    this.dispatcher.onRequest('git.diff', (p, context) => this.getDiff(p, context))
-    this.dispatcher.onRequest('git.stage', (p) => this.stage(p))
-    this.dispatcher.onRequest('git.unstage', (p) => this.unstage(p))
-    this.dispatcher.onRequest('git.bulkStage', (p) => this.bulkStage(p))
-    this.dispatcher.onRequest('git.bulkUnstage', (p) => this.bulkUnstage(p))
-    this.dispatcher.onRequest('git.abortMerge', (p) => this.abortMerge(p))
-    this.dispatcher.onRequest('git.abortRebase', (p) => this.abortRebase(p))
-    this.dispatcher.onRequest('git.checkout', (p) => this.checkout(p))
-    this.dispatcher.onRequest('git.localBranches', (p) => this.localBranches(p))
-    this.dispatcher.onRequest('git.discard', (p) => this.discard(p))
-    this.dispatcher.onRequest('git.bulkDiscard', (p) => this.bulkDiscard(p))
-    this.dispatcher.onRequest('git.conflictOperation', (p) => this.conflictOperation(p))
-    this.dispatcher.onRequest('git.branchCompare', (p) => this.branchCompare(p))
-    this.dispatcher.onRequest('git.commitCompare', (p) => this.commitCompare(p))
-    this.dispatcher.onRequest('git.upstreamStatus', (p) => this.upstreamStatus(p))
-    this.dispatcher.onRequest('git.fetch', (p) => this.fetch(p))
-    this.dispatcher.onRequest('git.forkSync', (p, context) => this.forkSync(p, context))
-    this.dispatcher.onRequest('git.fetchRemoteTrackingRef', (p) => this.fetchRemoteTrackingRef(p))
-    this.dispatcher.onRequest('git.fetchGitHubPullRequestHead', (p) =>
-      this.fetchGitHubPullRequestHead(p)
-    )
-    this.dispatcher.onRequest('git.fetchGitLabMergeRequestHead', (p) =>
-      this.fetchGitLabMergeRequestHead(p)
-    )
-    // Why: the durable-ref variant is a distinct method name so an old relay
-    // (which only knows FETCH_HEAD-semantics git.fetchGitLabMergeRequestHead)
-    // returns -32601 and the client can prompt a reconnect instead of silently
-    // resolving a stale/missing ref. Both names share the durable handler: a
-    // refspec fetch still writes FETCH_HEAD, so old clients keep their semantics.
-    this.dispatcher.onRequest('git.fetchGitLabMergeRequestHeadRef', (p) =>
-      this.fetchGitLabMergeRequestHead(p)
-    )
-    this.dispatcher.onRequest('git.push', (p) => this.push(p))
-    this.dispatcher.onRequest('git.pull', (p, context) => this.pull(p, context))
-    this.dispatcher.onRequest('git.fastForward', (p, context) => this.fastForward(p, context))
-    this.dispatcher.onRequest('git.rebaseFromBase', (p, context) => this.rebaseFromBase(p, context))
-    this.dispatcher.onRequest('git.branchDiff', (p, context) => this.branchDiff(p, context))
-    this.dispatcher.onRequest('git.commitDiff', (p, context) => this.commitDiff(p, context))
-    this.dispatcher.onRequest('git.listWorktrees', (p, context) => this.listWorktrees(p, context))
-    this.dispatcher.onRequest('git.addWorktree', (p) => this.addWorktree(p))
-    this.dispatcher.onRequest('git.removeWorktree', (p) => this.removeWorktree(p))
-    this.dispatcher.onRequest('git.worktreeIsClean', (p) => this.worktreeIsClean(p))
-    this.dispatcher.onRequest('git.refreshLocalBaseRefForWorktreeCreate', (p) =>
-      this.refreshLocalBaseRefForWorktreeCreate(p)
-    )
-    this.dispatcher.onRequest('git.renameCurrentBranch', (p) => this.renameCurrentBranch(p))
-    this.dispatcher.onRequest('git.forceDeletePreservedBranch', (p) =>
-      this.forceDeletePreservedBranch(p)
-    )
-    this.dispatcher.onRequest('git.exec', (p, context) => this.exec(p, context))
-    this.dispatcher.onRequest('git.clone', (p, context) => this.clone(p, context))
-    this.dispatcher.onRequest('git.isGitRepo', (p) => this.isGitRepo(p))
-    this.dispatcher.onNotification('git.responseAck', (p, context) => this.responseAck(p, context))
-    this.dispatcher.onNotification('git.cancelResponseStream', (p, context) =>
-      this.cancelResponseStream(p, context)
-    )
-  }
-
   private responseAck(params: Record<string, unknown>, context: RequestContext): void {
     const streamId = params.streamId
     const seq = params.seq
@@ -373,16 +162,8 @@ export class GitHandler {
   private async git(
     args: string[],
     cwd: string,
-    opts?: {
-      maxBuffer?: number
-      disableOptionalLocks?: boolean
-      signal?: AbortSignal
-      nonInteractive?: boolean
-      stdin?: string
-      timeout?: number
-      terminationBarrier?: boolean
-    }
-  ): Promise<{ stdout: string; stderr: string }> {
+    opts?: GitHandlerCommandOptions
+  ): Promise<GitHandlerCommandResult> {
     const expandedCwd = expandTilde(cwd)
     const run = async (): Promise<{ stdout: string; stderr: string }> => {
       const env = opts?.nonInteractive ? buildRelayUnattendedGitEnv() : buildRelayGitEnv()
@@ -422,987 +203,6 @@ export class GitHandler {
     return stdout
   }
 
-  private async getStatus(params: Record<string, unknown>, context: RequestContext) {
-    this.gitDiffReadDedupe.clear()
-    return getStatusOp(this.git.bind(this), streamRelayGitStdout, params, {
-      signal: context.signal
-    })
-  }
-
-  // Why: fetch per-file submodule changes from the submodule worktree.
-  private async getSubmoduleStatus(params: Record<string, unknown>, context: RequestContext) {
-    const worktreePath = params.worktreePath as string
-    const submodulePath = params.submodulePath as string
-    const area = resolveSubmoduleStatusArea(params)
-    const staged = area === 'staged'
-    const resolved = resolveSubmoduleWorktreePath(worktreePath, submodulePath)
-    const limit = resolveGitStatusLimit(params.limit)
-    // Why: staged expansion only represents HEAD→index; scanning the submodule worktree is wasted work.
-    const workingResult = staged
-      ? { entries: [], conflictOperation: 'unknown' }
-      : await getStatusOp(
-          this.git.bind(this),
-          streamRelayGitStdout,
-          {
-            ...params,
-            worktreePath: resolved
-          },
-          { signal: context.signal }
-        )
-    // Why: pointer/range probes are part of the same SSH request and must not outlive its cancellation.
-    const requestGit: GitExec = (args, cwd, options) =>
-      this.git(args, cwd, { ...options, signal: context.signal })
-    // Why: moved clean gitlinks need committed changes surfaced.
-    const { fromOid, toOid } = await resolveSubmoduleCommitRange(
-      requestGit,
-      worktreePath,
-      submodulePath,
-      staged
-    )
-    if (fromOid && toOid && fromOid !== toOid) {
-      const rangeEntries = await computeSubmoduleRangeEntries(requestGit, resolved, fromOid, toOid)
-      if (staged) {
-        return { ...workingResult, ...capGitStatusEntries(rangeEntries, limit) }
-      }
-      const rangePaths = new Set(rangeEntries.map((entry) => entry.path))
-      const entries = [
-        ...rangeEntries,
-        ...workingResult.entries.filter((entry) => !rangePaths.has(entry.path))
-      ]
-      return {
-        ...workingResult,
-        ...capGitStatusEntries(entries, limit, workingResult)
-      }
-    }
-    if (staged) {
-      return { ...workingResult, entries: [] }
-    }
-    return workingResult
-  }
-
-  private async checkIgnored(params: Record<string, unknown>) {
-    return checkIgnoredPathsOp(this.git.bind(this), params)
-  }
-
-  private async history(params: Record<string, unknown>) {
-    const worktreePath = params.worktreePath as string
-    return loadGitHistoryFromExecutor(this.git.bind(this), worktreePath, {
-      limit: typeof params.limit === 'number' ? params.limit : undefined,
-      baseRef: typeof params.baseRef === 'string' ? params.baseRef : null
-    })
-  }
-
-  private async getDiff(params: Record<string, unknown>, context?: RequestContext) {
-    const worktreePath = params.worktreePath as string
-    const filePath = params.filePath as string
-    // Why: validate relative paths to prevent traversal outside the worktree.
-    const resolved = path.resolve(worktreePath, filePath)
-    const rel = path.relative(path.resolve(worktreePath), resolved)
-    if (rel === '..' || rel.startsWith(`..${path.sep}`) || path.isAbsolute(rel)) {
-      throw new Error(`Path "${filePath}" resolves outside the worktree`)
-    }
-    const staged = params.staged as boolean
-    const compareAgainstHead = params.compareAgainstHead as boolean | undefined
-    // Why: register dedupe before awaiting so identical reads coalesce.
-    const result = await this.gitDiffReadDedupe.run(
-      stableInFlightKey(['diff', worktreePath, filePath, staged, compareAgainstHead]),
-      async () => {
-        // Why: route gitlink roots to pointer diffs and inner files to their submodule worktree.
-        const submodulePaths = await listSubmodulePathsCached(
-          this.git.bind(this),
-          worktreePath,
-          this.submodulePathsCache
-        )
-        if (submodulePaths.length > 0) {
-          const matchedSubmodule = findContainingSubmodule(submodulePaths, filePath)
-          if (matchedSubmodule) {
-            const normalizedFilePath = filePath.replace(/\\/g, '/').replace(/\/+$/, '')
-            if (normalizedFilePath === matchedSubmodule) {
-              return computeSubmodulePointerDiff(
-                this.git.bind(this),
-                worktreePath,
-                matchedSubmodule,
-                staged,
-                compareAgainstHead
-              )
-            }
-            const submoduleWorktreePath = resolveSubmoduleWorktreePath(
-              worktreePath,
-              matchedSubmodule
-            )
-            const innerPath = normalizedFilePath.slice(matchedSubmodule.length + 1)
-            const { fromOid, toOid } = await resolveSubmoduleCommitRange(
-              this.git.bind(this),
-              worktreePath,
-              matchedSubmodule,
-              staged
-            )
-            // Why: a moved gitlink (clean worktree) keeps inner changes in committed history, so diff the two commits; otherwise read the working-tree blob.
-            if (fromOid && toOid && fromOid !== toOid) {
-              return buildSubmoduleInnerCommitRangeDiff(
-                this.gitBuffer.bind(this),
-                submoduleWorktreePath,
-                innerPath,
-                fromOid,
-                toOid
-              )
-            }
-            return computeDiff(
-              this.gitBuffer.bind(this),
-              submoduleWorktreePath,
-              innerPath,
-              staged,
-              compareAgainstHead
-            )
-          }
-        }
-        return computeDiff(
-          this.gitBuffer.bind(this),
-          worktreePath,
-          filePath,
-          staged,
-          compareAgainstHead
-        )
-      }
-    )
-    return this.maybeStreamResponse(result, params, context)
-  }
-
-  private async stage(params: Record<string, unknown>) {
-    this.clearGitMutationReadCaches()
-    const worktreePath = params.worktreePath as string
-    const filePath = params.filePath as string
-    try {
-      await this.git(['add', '--', this.literalPathspec(filePath)], worktreePath)
-    } finally {
-      this.clearGitMutationReadCaches()
-    }
-  }
-
-  private async commit(
-    params: Record<string, unknown>
-  ): Promise<{ success: boolean; error?: string }> {
-    this.clearGitMutationReadCaches()
-    const worktreePath = params.worktreePath as string
-    const message = params.message as string
-    try {
-      return await commitChangesRelay(this.git.bind(this), worktreePath, message)
-    } finally {
-      this.clearGitMutationReadCaches()
-    }
-  }
-
-  private async unstage(params: Record<string, unknown>) {
-    this.clearGitMutationReadCaches()
-    const worktreePath = params.worktreePath as string
-    const filePath = params.filePath as string
-    try {
-      await this.git(['restore', '--staged', '--', this.literalPathspec(filePath)], worktreePath)
-    } finally {
-      this.clearGitMutationReadCaches()
-    }
-  }
-
-  private async bulkStage(params: Record<string, unknown>) {
-    this.clearGitMutationReadCaches()
-    const worktreePath = params.worktreePath as string
-    const filePaths = params.filePaths as string[]
-    try {
-      for (let i = 0; i < filePaths.length; i += BULK_CHUNK_SIZE) {
-        const chunk = filePaths.slice(i, i + BULK_CHUNK_SIZE)
-        await this.git(
-          ['add', '--', ...chunk.map((filePath) => this.literalPathspec(filePath))],
-          worktreePath
-        )
-      }
-    } finally {
-      this.clearGitMutationReadCaches()
-    }
-  }
-
-  private async bulkUnstage(params: Record<string, unknown>) {
-    this.clearGitMutationReadCaches()
-    const worktreePath = params.worktreePath as string
-    const filePaths = params.filePaths as string[]
-    try {
-      for (let i = 0; i < filePaths.length; i += BULK_CHUNK_SIZE) {
-        const chunk = filePaths.slice(i, i + BULK_CHUNK_SIZE)
-        await this.git(
-          ['restore', '--staged', '--', ...chunk.map((filePath) => this.literalPathspec(filePath))],
-          worktreePath
-        )
-      }
-    } finally {
-      this.clearGitMutationReadCaches()
-    }
-  }
-
-  private async abortMerge(params: Record<string, unknown>) {
-    this.clearGitMutationReadCaches()
-    const worktreePath = params.worktreePath as string
-    try {
-      await this.git(['merge', '--abort'], worktreePath)
-    } finally {
-      this.clearGitMutationReadCaches()
-    }
-  }
-
-  private async abortRebase(params: Record<string, unknown>) {
-    this.clearGitMutationReadCaches()
-    const worktreePath = params.worktreePath as string
-    try {
-      await this.git(['rebase', '--abort'], worktreePath)
-    } finally {
-      this.clearGitMutationReadCaches()
-    }
-  }
-
-  private async checkout(params: Record<string, unknown>) {
-    this.clearGitMutationReadCaches()
-    const worktreePath = params.worktreePath as string
-    const branch = params.branch as string
-    // Defense-in-depth: reject `-`-prefixed branch tokens to block flag injection (this relay entrypoint is reachable independently of the RPC schema).
-    if (typeof branch !== 'string' || branch.length === 0 || branch.startsWith('-')) {
-      throw new Error('invalid_branch_name')
-    }
-    try {
-      await this.git(['checkout', branch, '--'], worktreePath)
-      return { ok: true as const, branch }
-    } finally {
-      this.clearGitMutationReadCaches()
-    }
-  }
-
-  private async localBranches(params: Record<string, unknown>) {
-    const worktreePath = params.worktreePath as string
-    const { stdout } = await this.git(
-      ['for-each-ref', '--format=%(HEAD)%09%(refname:short)', 'refs/heads/'],
-      worktreePath
-    )
-    let current: string | null = null
-    const branches: string[] = []
-    for (const line of stdout.split('\n')) {
-      if (line.length === 0) {
-        continue
-      }
-      const [marker, name] = line.split('\t')
-      if (!name) {
-        continue
-      }
-      if (marker === '*') {
-        current = name
-      }
-      branches.push(name)
-    }
-    branches.sort((a, b) => (a === current ? -1 : b === current ? 1 : 0))
-    return { current, branches }
-  }
-
-  private normalizeGitPathForCompare(filePath: string): string {
-    return filePath.replace(/\\/g, '/').replace(/\/+$/, '')
-  }
-
-  private isTrackedPathSpec(filePath: string, trackedPaths: readonly string[]): boolean {
-    const normalized = this.normalizeGitPathForCompare(filePath)
-    return trackedPaths.some((trackedPath) => {
-      const normalizedTracked = this.normalizeGitPathForCompare(trackedPath)
-      return normalizedTracked === normalized || normalizedTracked.startsWith(`${normalized}/`)
-    })
-  }
-
-  private assertInWorktree(worktreePath: string, filePath: string): string {
-    const resolved = path.resolve(worktreePath, filePath)
-    const rel = path.relative(path.resolve(worktreePath), resolved)
-    // Why: empty rel or '.' means the path IS the worktree root; reject (with parent-escaping paths) so a discard can't wipe the whole worktree.
-    if (
-      !rel ||
-      rel === '.' ||
-      rel === '..' ||
-      rel.startsWith(`..${path.sep}`) ||
-      path.isAbsolute(rel)
-    ) {
-      throw new Error(`Path "${filePath}" resolves outside the worktree`)
-    }
-    return resolved
-  }
-
-  private async discard(params: Record<string, unknown>) {
-    this.clearGitMutationReadCaches()
-    const worktreePath = params.worktreePath as string
-    const filePath = params.filePath as string
-    try {
-      this.assertInWorktree(worktreePath, filePath)
-
-      let tracked = false
-      try {
-        await this.git(
-          ['ls-files', '--error-unmatch', '--', this.literalPathspec(filePath)],
-          worktreePath
-        )
-        tracked = true
-      } catch {
-        // untracked
-      }
-
-      if (tracked) {
-        await this.git(
-          ['restore', '--worktree', '--source=HEAD', '--', this.literalPathspec(filePath)],
-          worktreePath
-        )
-        return
-      }
-
-      await removeSafeUntrackedDiscardTarget(worktreePath, filePath, (targetPath) =>
-        this.cleanUntrackedPaths(worktreePath, [targetPath])
-      )
-    } finally {
-      this.clearGitMutationReadCaches()
-    }
-  }
-
-  private async bulkDiscard(params: Record<string, unknown>) {
-    this.clearGitMutationReadCaches()
-    const worktreePath = params.worktreePath as string
-    const filePaths = params.filePaths as string[]
-    if (filePaths.length === 0) {
-      return
-    }
-    try {
-      for (const filePath of filePaths) {
-        this.assertInWorktree(worktreePath, filePath)
-      }
-
-      const trackedPathSpecs: string[] = []
-      for (let i = 0; i < filePaths.length; i += BULK_CHUNK_SIZE) {
-        const chunk = filePaths.slice(i, i + BULK_CHUNK_SIZE)
-        const { stdout } = await this.git(
-          ['ls-files', '-z', '--', ...chunk.map((p) => this.literalPathspec(p))],
-          worktreePath
-        )
-        // Why: a selected tracked directory can make `ls-files -z` return enough descendants for push(...split) to exceed the argument limit.
-        for (const trackedPathSpec of stdout.split('\0')) {
-          if (trackedPathSpec) {
-            trackedPathSpecs.push(trackedPathSpec)
-          }
-        }
-      }
-
-      const trackedPaths = filePaths.filter((filePath) =>
-        this.isTrackedPathSpec(filePath, trackedPathSpecs)
-      )
-      const untrackedPaths = filePaths.filter(
-        (filePath) => !this.isTrackedPathSpec(filePath, trackedPathSpecs)
-      )
-      await removeSafeUntrackedDiscardTargets(
-        worktreePath,
-        untrackedPaths,
-        (targetPaths) => this.cleanUntrackedPaths(worktreePath, targetPaths),
-        async () => {
-          for (let i = 0; i < trackedPaths.length; i += BULK_CHUNK_SIZE) {
-            const chunk = trackedPaths.slice(i, i + BULK_CHUNK_SIZE)
-            await this.git(
-              [
-                'restore',
-                '--worktree',
-                '--source=HEAD',
-                '--',
-                ...chunk.map((p) => this.literalPathspec(p))
-              ],
-              worktreePath
-            )
-          }
-        }
-      )
-    } finally {
-      this.clearGitMutationReadCaches()
-    }
-  }
-
-  private literalPathspec(filePath: string): string {
-    // Why: source-control selections are concrete paths, not user-authored Git globs.
-    return `:(literal)${filePath}`
-  }
-
-  private async cleanUntrackedPaths(worktreePath: string, filePaths: readonly string[]) {
-    for (let i = 0; i < filePaths.length; i += BULK_CHUNK_SIZE) {
-      const chunk = filePaths.slice(i, i + BULK_CHUNK_SIZE)
-      if (chunk.length > 0) {
-        // Why: Git pathspec cleanup avoids raw recursive deletion through symlinked parents.
-        await this.git(
-          ['clean', '-ffdx', '--', ...chunk.map((p) => this.literalPathspec(p))],
-          worktreePath
-        )
-      }
-    }
-  }
-
-  private async conflictOperation(params: Record<string, unknown>) {
-    const worktreePath = params.worktreePath as string
-    return detectConflictOperation(worktreePath)
-  }
-
-  private async branchCompare(params: Record<string, unknown>) {
-    const worktreePath = params.worktreePath as string
-    const baseRef = params.baseRef as string
-    // Why: reject flag-like base refs to prevent rev-parse option injection.
-    if (baseRef.startsWith('-')) {
-      throw new Error('Base ref must not start with "-"')
-    }
-    const gitBound = this.git.bind(this)
-    return branchCompareOp(gitBound, worktreePath, baseRef, async (mergeBase, headOid) => {
-      // Why: preserve non-ASCII filenames as UTF-8 for parseBranchDiff.
-      const [{ stdout }, { stdout: numstat }] = await Promise.all([
-        gitBound(
-          ['-c', 'core.quotePath=false', 'diff', '--name-status', '-M', '-C', mergeBase, headOid],
-          worktreePath
-        ),
-        gitBound(
-          ['-c', 'core.quotePath=false', 'diff', '--numstat', '-M', '-C', mergeBase, headOid],
-          worktreePath
-        )
-      ])
-      return parseBranchDiff(stdout, parseNumstat(numstat))
-    })
-  }
-
-  private async commitCompare(params: Record<string, unknown>) {
-    const worktreePath = params.worktreePath as string
-    const commitId = params.commitId as string
-    return commitCompareOp(this.git.bind(this), worktreePath, commitId)
-  }
-
-  private async upstreamStatus(params: Record<string, unknown>) {
-    const worktreePath = params.worktreePath as string
-
-    try {
-      if (params.pushTarget !== undefined) {
-        assertGitPushTargetShape(params.pushTarget)
-        const pushTarget = params.pushTarget as GitPushTarget
-        await this.git(['check-ref-format', '--branch', pushTarget.branchName], worktreePath)
-        return await getPublishTargetStatus(
-          ((args) => this.git(args, worktreePath)) as GitCommandRunner,
-          pushTarget,
-          (upstreamName) => this.getBehindCommitsArePatchEquivalent(worktreePath, upstreamName)
-        )
-      }
-      return await getEffectiveGitUpstreamStatus(
-        (args) => this.git(args, worktreePath),
-        (upstreamName) => this.getBehindCommitsArePatchEquivalent(worktreePath, upstreamName)
-      )
-    } catch (error) {
-      // Why: suppress only the expected no-upstream error; surface all others.
-      if (isNoUpstreamError(error)) {
-        return { hasUpstream: false, ahead: 0, behind: 0 }
-      }
-      // Why: match fetch/push/pull normalization so execFile preamble and local paths don't leak to the renderer.
-      throw new Error(normalizeGitErrorMessage(error, 'upstream'))
-    }
-  }
-
-  private async getBehindCommitsArePatchEquivalent(
-    worktreePath: string,
-    upstreamName: string
-  ): Promise<boolean> {
-    try {
-      const { stdout } = await this.git(
-        ['log', '--oneline', '--cherry-mark', '--right-only', `HEAD...${upstreamName}`, '--'],
-        worktreePath
-      )
-      return upstreamOnlyCommitsArePatchEquivalent(stdout)
-    } catch {
-      // Why: this only identifies stale post-rebase upstreams; if the probe fails over SSH, keep the conservative pull-first sync path.
-      return false
-    }
-  }
-
-  private async fetch(params: Record<string, unknown>) {
-    this.clearGitMutationReadCaches()
-    const worktreePath = params.worktreePath as string
-    try {
-      try {
-        if (params.pushTarget !== undefined) {
-          assertGitPushTargetShape(params.pushTarget)
-          const pushTarget = params.pushTarget as GitPushTarget
-          await this.git(['check-ref-format', '--branch', pushTarget.branchName], worktreePath)
-          await this.git(['fetch', '--prune', pushTarget.remoteName], worktreePath)
-          return
-        }
-        await this.git(['fetch', '--prune'], worktreePath)
-      } catch (error) {
-        // Why: normalize like local gitFetch so SSH users get actionable messages, not raw stderr (may embed credentials).
-        throw new Error(normalizeGitErrorMessage(error, 'fetch'))
-      }
-    } finally {
-      this.clearGitMutationReadCaches()
-    }
-  }
-
-  private async forkSync(params: Record<string, unknown>, context?: RequestContext) {
-    return this.runWithGitReadCacheClear(async () => {
-      const worktreePath = params.worktreePath as string
-      const expectedUpstream = validateGitForkSyncExpectedUpstream(params.expectedUpstream, {
-        required: true
-      })
-      const controller = new AbortController()
-      const abortFromContext = () => controller.abort()
-      if (context?.signal?.aborted) {
-        controller.abort()
-      } else {
-        context?.signal?.addEventListener('abort', abortFromContext, { once: true })
-      }
-      const timeout = setTimeout(() => controller.abort(), 60_000)
-      try {
-        return await syncForkDefaultBranch(
-          (args) =>
-            this.git(args, worktreePath, {
-              nonInteractive: true,
-              signal: controller.signal
-            }),
-          { expectedUpstream }
-        )
-      } catch (error) {
-        throw new Error(normalizeGitErrorMessage(error, 'push'))
-      } finally {
-        clearTimeout(timeout)
-        context?.signal?.removeEventListener('abort', abortFromContext)
-      }
-    })
-  }
-
-  private async fetchRemoteTrackingRef(params: Record<string, unknown>) {
-    this.clearGitMutationReadCaches()
-    const worktreePath = params.worktreePath as string
-    const remote = params.remote
-    const branch = params.branch
-    const ref = params.ref
-    const skipAutoMaintenance = params.skipAutoMaintenance
-    try {
-      if (typeof remote !== 'string' || typeof branch !== 'string' || typeof ref !== 'string') {
-        throw new Error('Invalid remote-tracking fetch request.')
-      }
-      if (skipAutoMaintenance !== undefined && typeof skipAutoMaintenance !== 'boolean') {
-        throw new Error('Invalid remote-tracking fetch maintenance option.')
-      }
-      if (remote.startsWith('-') || branch.startsWith('-')) {
-        throw new Error('Remote-tracking fetch inputs must not start with "-".')
-      }
-      if (ref !== `refs/remotes/${remote}/${branch}`) {
-        throw new Error('Remote-tracking ref does not match the requested remote and branch.')
-      }
-
-      try {
-        const { stdout } = await this.git(['remote'], worktreePath)
-        const remotes = stdout
-          .split(/\r?\n/)
-          .map((line) => line.trim())
-          .filter(Boolean)
-        if (!remotes.includes(remote)) {
-          throw new Error(`Remote "${remote}" is not configured.`)
-        }
-        await this.git(['check-ref-format', `refs/heads/${branch}`], worktreePath)
-        await this.git(['check-ref-format', ref], worktreePath)
-        await this.git(
-          [
-            ...(skipAutoMaintenance ? GIT_FETCH_SKIP_AUTO_MAINTENANCE_CONFIG_ARGS : []),
-            'fetch',
-            '--no-tags',
-            remote,
-            `+refs/heads/${branch}:${ref}`
-          ],
-          worktreePath
-        )
-      } catch (error) {
-        // Why: create-worktree needs a write-capable fetch that generic git.exec rejects; narrow RPC keeps the allowlist tight.
-        throw new Error(normalizeGitErrorMessage(error, 'fetch'))
-      }
-    } finally {
-      this.clearGitMutationReadCaches()
-    }
-  }
-
-  // Why: the durable review-head ref embeds the remote's identity, and a
-  // missing remote must fail with an actionable message, not a raw fetch error.
-  private async reviewHeadRemoteComponent(worktreePath: string, remote: string): Promise<string> {
-    let remoteUrl: string
-    try {
-      const { stdout } = await this.git(['remote', 'get-url', remote], worktreePath)
-      remoteUrl = stdout.trim()
-    } catch {
-      remoteUrl = ''
-    }
-    if (!remoteUrl) {
-      throw new Error(`Remote "${remote}" is not configured.`)
-    }
-    return reviewHeadRemoteRefComponent(remote, remoteUrl)
-  }
-
-  private async fetchGitLabMergeRequestHead(params: Record<string, unknown>) {
-    this.clearGitMutationReadCaches()
-    const worktreePath = params.worktreePath as string
-    const remote = params.remote
-    const mrIid = params.mrIid
-    try {
-      if (typeof remote !== 'string' || !isValidReviewHeadNumber(mrIid)) {
-        throw new Error('Invalid GitLab merge request fetch request.')
-      }
-      const mergeRequestIid = mrIid
-      if (!isSafeReviewHeadFetchRemote(remote)) {
-        throw new Error('GitLab merge request fetch remote must not start with "-".')
-      }
-
-      try {
-        const remoteComponent = await this.reviewHeadRemoteComponent(worktreePath, remote)
-        // Why: GitLab fork heads need a dedicated write RPC and ref outside refs/heads/*.
-        // Return the exact written path so the client does not re-hash a second get-url.
-        const localRef = gitlabMergeRequestHeadLocalRef(remoteComponent, mergeRequestIid)
-        await this.git(
-          [
-            'fetch',
-            '--no-tags',
-            remote,
-            `+refs/merge-requests/${mergeRequestIid}/head:${localRef}`
-          ],
-          worktreePath,
-          { timeout: REVIEW_HEAD_FETCH_TIMEOUT_MS }
-        )
-        return { localRef }
-      } catch (error) {
-        // Why: a timeout kill has no git stderr; name it so the client can classify it as transient.
-        if (isExecKilledError(error)) {
-          throw new Error(
-            `Fetching refs/merge-requests/${mergeRequestIid}/head from "${remote}" timed out.`
-          )
-        }
-        throw new Error(normalizeGitErrorMessage(error, 'fetch'))
-      }
-    } finally {
-      this.clearGitMutationReadCaches()
-    }
-  }
-
-  private async fetchGitHubPullRequestHead(params: Record<string, unknown>) {
-    this.clearGitMutationReadCaches()
-    const worktreePath = params.worktreePath as string
-    const remote = params.remote
-    const prNumber = params.prNumber
-    try {
-      if (typeof remote !== 'string' || !isValidReviewHeadNumber(prNumber)) {
-        throw new Error('Invalid GitHub pull request fetch request.')
-      }
-      if (!isSafeReviewHeadFetchRemote(remote)) {
-        throw new Error('GitHub pull request fetch remote must not start with "-".')
-      }
-
-      try {
-        const remoteComponent = await this.reviewHeadRemoteComponent(worktreePath, remote)
-        // Why: return the written path so resolve can rev-parse the same ref the host wrote.
-        const localRef = githubPullRequestHeadLocalRef(remoteComponent, prNumber)
-        await this.git(
-          ['fetch', '--no-tags', remote, `+refs/pull/${prNumber}/head:${localRef}`],
-          worktreePath,
-          { timeout: REVIEW_HEAD_FETCH_TIMEOUT_MS }
-        )
-        return { localRef }
-      } catch (error) {
-        // Why: a timeout kill has no git stderr; name it so the client can classify it as transient.
-        if (isExecKilledError(error)) {
-          throw new Error(`Fetching refs/pull/${prNumber}/head from "${remote}" timed out.`)
-        }
-        throw new Error(normalizeGitErrorMessage(error, 'fetch'))
-      }
-    } finally {
-      this.clearGitMutationReadCaches()
-    }
-  }
-
-  private async push(params: Record<string, unknown>) {
-    this.clearGitMutationReadCaches()
-    const worktreePath = params.worktreePath as string
-    // Why: mirror src/main/git/remote.ts — push to a configured upstream when present so SSH worktrees with non-origin targets aren't repointed.
-    void params.publish
-    try {
-      try {
-        const target = await resolveRelayPushTarget(
-          this.git.bind(this),
-          worktreePath,
-          params.pushTarget
-        )
-        const args = [
-          'push',
-          ...(params.forceWithLease === true ? ['--force-with-lease'] : []),
-          '--set-upstream',
-          ...(target ? [target.remote, target.refspec] : ['origin', 'HEAD'])
-        ]
-        await this.git(args, worktreePath)
-      } catch (error) {
-        // Why: mirror local gitPush normalization so SSH users get "non-fast-forward / pull first" guidance instead of raw git stderr.
-        throw new Error(normalizeGitErrorMessage(error, 'push'))
-      }
-    } finally {
-      this.clearGitMutationReadCaches()
-    }
-  }
-
-  private async pullWithArgs(
-    params: Record<string, unknown>,
-    pullArgs: string[],
-    signal?: AbortSignal
-  ) {
-    const worktreePath = params.worktreePath as string
-    return runWithGitWorktreeOperationLock(worktreePath, signal, () =>
-      this.runPullWithArgsUnlocked(params, pullArgs)
-    )
-  }
-
-  private async runPullWithArgsUnlocked(
-    params: Record<string, unknown>,
-    pullArgs: string[]
-  ): Promise<void> {
-    this.clearGitMutationReadCaches()
-    const worktreePath = params.worktreePath as string
-    const runPull = async (effectiveArgs: string[]): Promise<void> => {
-      if (params.pushTarget !== undefined) {
-        assertGitPushTargetShape(params.pushTarget)
-        const pushTarget = params.pushTarget as GitPushTarget
-        await this.git(['check-ref-format', '--branch', pushTarget.branchName], worktreePath)
-        await this.git(
-          ['pull', ...effectiveArgs, pushTarget.remoteName, pushTarget.branchName],
-          worktreePath
-        )
-        return
-      }
-      const upstream = await resolveEffectiveGitUpstream((args) => this.git(args, worktreePath))
-      if (upstream && !upstream.isConfiguredUpstream) {
-        // Why: legacy Orca branches may track origin/main while pushes target origin/<branch>; pull the same effective branch the UI reports.
-        await this.git(
-          ['pull', ...effectiveArgs, upstream.remoteName, upstream.branchName],
-          worktreePath
-        )
-        return
-      }
-      await this.git(['pull', ...effectiveArgs], worktreePath)
-    }
-
-    try {
-      try {
-        await runPullWithDivergenceFallback(pullArgs, runPull)
-      } catch (error) {
-        // Why: mirror local gitPull normalization so SSH users get actionable messages instead of raw git stderr.
-        throw new Error(normalizeGitErrorMessage(error, 'pull'))
-      }
-    } finally {
-      this.clearGitMutationReadCaches()
-    }
-  }
-
-  private async pull(params: Record<string, unknown>, context?: RequestContext) {
-    // Why: plain `git pull` honors user merge/rebase/ff policy.
-    await this.pullWithArgs(params, [], context?.signal)
-  }
-
-  private async fastForward(params: Record<string, unknown>, context?: RequestContext) {
-    await this.pullWithArgs(params, ['--ff-only'], context?.signal)
-  }
-
-  private async rebaseFromBase(params: Record<string, unknown>, context?: RequestContext) {
-    return runWithGitWorktreeOperationLock(params.worktreePath as string, context?.signal, () =>
-      this.runRebaseFromBase(params, context)
-    )
-  }
-
-  private async runRebaseFromBase(params: Record<string, unknown>, context?: RequestContext) {
-    this.clearGitMutationReadCaches()
-    const worktreePath = params.worktreePath as string
-    const baseRef = params.baseRef as string
-    let rebaseRef: string | null = null
-    const controller = new AbortController()
-    const abortFromContext = () => controller.abort()
-    if (context?.signal?.aborted) {
-      controller.abort()
-    } else {
-      context?.signal?.addEventListener('abort', abortFromContext, { once: true })
-    }
-    const timeout = setTimeout(() => controller.abort(), REBASE_FROM_BASE_OPERATION_TIMEOUT_MS)
-    try {
-      try {
-        const source = await resolveGitRemoteRebaseSource(
-          ((args) =>
-            this.git(args, worktreePath, {
-              signal: controller.signal,
-              terminationBarrier: true
-            })) as GitCommandRunner,
-          baseRef
-        )
-        let forkPoint: string | null = null
-        let hasHead = true
-        try {
-          const { stdout } = await this.git(
-            ['merge-base', '--fork-point', `refs/remotes/${source.displayName}`, 'HEAD'],
-            worktreePath,
-            { signal: controller.signal, terminationBarrier: true }
-          )
-          forkPoint = stdout.trim() || null
-        } catch {
-          // A first fetch or an unhelpful reflog falls back to Git's merge-base behavior.
-          try {
-            await this.git(['rev-parse', '--verify', 'HEAD'], worktreePath, {
-              signal: controller.signal,
-              terminationBarrier: true
-            })
-          } catch {
-            hasHead = false
-          }
-        }
-        // Why: concurrent fetches can replace FETCH_HEAD and remote-tracking refs between fetch and rebase.
-        rebaseRef = `refs/orca/rebase/${randomUUID()}`
-        const fetchArgs = [
-          source.remoteName,
-          `+refs/heads/${source.branchName}:${rebaseRef}`,
-          `+refs/heads/${source.branchName}:refs/remotes/${source.displayName}`
-        ]
-        await this.gitCapabilities.runWithFallback(
-          'fetch-no-write-fetch-head',
-          () =>
-            this.git(['fetch', '--no-write-fetch-head', ...fetchArgs], worktreePath, {
-              timeout: REBASE_SOURCE_FETCH_TIMEOUT_MS,
-              signal: controller.signal,
-              terminationBarrier: true
-            }),
-          () =>
-            this.git(['fetch', ...fetchArgs], worktreePath, {
-              timeout: REBASE_SOURCE_FETCH_TIMEOUT_MS,
-              signal: controller.signal,
-              terminationBarrier: true
-            }),
-          isNoWriteFetchHeadUnsupportedError
-        )
-        await this.git(
-          hasHead
-            ? forkPoint
-              ? ['rebase', '--onto', rebaseRef, forkPoint]
-              : ['rebase', rebaseRef]
-            : ['merge', '--ff-only', rebaseRef],
-          worktreePath,
-          { signal: controller.signal, terminationBarrier: true }
-        )
-      } catch (error) {
-        throw new Error(normalizeGitErrorMessage(error, 'pull'))
-      }
-    } finally {
-      if (rebaseRef) {
-        try {
-          await this.git(['update-ref', '-d', rebaseRef], worktreePath)
-        } catch {
-          // Cleanup must not hide the fetch or rebase result.
-        }
-      }
-      clearTimeout(timeout)
-      context?.signal?.removeEventListener('abort', abortFromContext)
-      this.clearGitMutationReadCaches()
-    }
-  }
-
-  private async branchDiff(params: Record<string, unknown>, context?: RequestContext) {
-    const worktreePath = params.worktreePath as string
-    const baseRef = params.baseRef as string
-    if (baseRef.startsWith('-')) {
-      throw new Error('Base ref must not start with "-"')
-    }
-    const headOid = parseOptionalBranchDiffHeadOid(params)
-    const options = {
-      includePatch: params.includePatch as boolean | undefined,
-      filePath: params.filePath as string | undefined,
-      oldPath: params.oldPath as string | undefined
-    }
-    const result = await this.gitDiffReadDedupe.run(
-      stableInFlightKey([
-        'branchDiff',
-        worktreePath,
-        baseRef,
-        headOid ?? null,
-        options.includePatch ?? null,
-        options.filePath ?? null,
-        options.oldPath ?? null
-      ]),
-      () => {
-        if (
-          headOid &&
-          isFullGitObjectId(baseRef) &&
-          options.includePatch === true &&
-          typeof options.filePath === 'string' &&
-          options.filePath.length > 0
-        ) {
-          return branchDiffEntryAtPinnedOids(
-            this.gitBuffer.bind(this),
-            worktreePath,
-            baseRef,
-            headOid,
-            options.filePath,
-            options.oldPath
-          )
-        }
-        return branchDiffEntries(
-          this.git.bind(this),
-          this.gitBuffer.bind(this),
-          worktreePath,
-          baseRef,
-          options
-        )
-      }
-    )
-    return this.maybeStreamResponse(result, params, context)
-  }
-
-  private async commitDiff(params: Record<string, unknown>, context?: RequestContext) {
-    const worktreePath = params.worktreePath as string
-    const args = {
-      commitOid: params.commitOid as string,
-      parentOid: params.parentOid as string | null | undefined,
-      filePath: params.filePath as string,
-      oldPath: params.oldPath as string | undefined
-    }
-    const result = await this.gitDiffReadDedupe.run(
-      stableInFlightKey([
-        'commitDiff',
-        worktreePath,
-        args.commitOid,
-        args.parentOid ?? null,
-        args.filePath,
-        args.oldPath ?? null
-      ]),
-      () => commitDiffEntry(this.gitBuffer.bind(this), worktreePath, args)
-    )
-    return this.maybeStreamResponse(result, params, context)
-  }
-
-  private async exec(params: Record<string, unknown>, context?: RequestContext) {
-    const args = params.args as string[]
-    const cwd = params.cwd as string
-
-    validateGitExecArgs(args)
-    const run = () => this.git(args, cwd, { signal: context?.signal })
-    const { stdout, stderr } = gitExecMutatesRepository(args)
-      ? await this.runWithGitReadCacheClear(run)
-      : await run()
-    return this.maybeStreamResponse({ stdout, stderr }, params, context)
-  }
-
-  private async clone(params: Record<string, unknown>, context?: RequestContext) {
-    const args = params.args as string[]
-    const cwd = params.cwd as string
-    const progressId = params.progressId
-    validateGitExecArgs(args)
-    if (typeof progressId !== 'string' || progressId.length === 0) {
-      throw new Error('Missing clone progress id.')
-    }
-    if (args[0] !== 'clone') {
-      throw new Error('git.clone only supports clone commands.')
-    }
-    return await this.runWithGitReadCacheClear(() =>
-      this.spawnClone(args, cwd, progressId, context)
-    )
-  }
-
   private async spawnClone(
     args: string[],
     cwd: string,
@@ -1468,171 +268,4 @@ export class GitHandler {
       })
     })
   }
-
-  private async renameCurrentBranch(params: Record<string, unknown>) {
-    return this.runWithGitReadCacheClear(async () => {
-      const worktreePath = params.worktreePath
-      const newBranch = params.newBranch
-      if (typeof worktreePath !== 'string' || typeof newBranch !== 'string') {
-        throw new Error('Invalid branch rename request.')
-      }
-      if (newBranch.startsWith('-')) {
-        throw new Error('Branch name must not start with "-".')
-      }
-      try {
-        // Why: generic git.exec blocks destructive branch flags; this narrow RPC permits only the already-checked current-branch rename.
-        await this.git(['check-ref-format', '--branch', newBranch], worktreePath)
-        await this.git(['branch', '-m', newBranch], worktreePath)
-      } catch (error) {
-        throw new Error(normalizeGitErrorMessage(error))
-      }
-    })
-  }
-
-  private async forceDeletePreservedBranch(params: Record<string, unknown>) {
-    const repoPath = params.repoPath
-    const branchName = params.branchName
-    const expectedHead = params.expectedHead
-    if (
-      typeof repoPath !== 'string' ||
-      typeof branchName !== 'string' ||
-      typeof expectedHead !== 'string'
-    ) {
-      throw new Error('Invalid preserved branch force-delete request.')
-    }
-    // Why: empty repoPath would target the relay's own cwd with a destructive update-ref, and NUL bytes can't reach git safely — reject both.
-    if (!repoPath || repoPath.includes('\0') || expectedHead.includes('\0')) {
-      throw new Error('Invalid preserved branch force-delete request.')
-    }
-    return this.runWithGitReadCacheClear(() =>
-      forceDeletePreservedRelayBranch(this.git.bind(this), repoPath, branchName, expectedHead)
-    )
-  }
-
-  private async isGitRepo(params: Record<string, unknown>) {
-    const dirPath = params.dirPath as string
-    try {
-      const { stdout } = await this.git(['rev-parse', '--show-toplevel'], dirPath)
-      return { isRepo: true, rootPath: stdout.trim() }
-    } catch {
-      return { isRepo: false, rootPath: null }
-    }
-  }
-
-  private async readRepoLocation(repoPath: string): Promise<RelayRepoLocation | undefined> {
-    try {
-      return await this.gitCapabilities.runWithFallback(
-        'rev-parse-path-format',
-        async () => {
-          const { stdout } = await this.git(
-            ['rev-parse', '--path-format=absolute', '--show-toplevel', '--git-common-dir'],
-            repoPath
-          )
-          if (hasUnsupportedRevParsePathFormatEcho(stdout)) {
-            // Why: old Git echoes the unknown option and exits zero; remember the signal though the paths still parse.
-            this.gitCapabilities.rememberUnsupported('rev-parse-path-format')
-          }
-          return parseRelayRepoLocation(repoPath, stdout)
-        },
-        async () => {
-          const { stdout } = await this.git(
-            ['rev-parse', '--show-toplevel', '--git-common-dir'],
-            repoPath
-          )
-          return parseRelayRepoLocation(repoPath, stdout)
-        },
-        isUnsupportedRevParsePathFormatError
-      )
-    } catch {
-      return undefined
-    }
-  }
-
-  private async normalizeMainWorktreePath(
-    repoPath: string,
-    worktrees: Record<string, unknown>[]
-  ): Promise<Record<string, unknown>[]> {
-    const mainIndex = worktrees.findIndex((worktree) => worktree.isMainWorktree === true)
-    const mainWorktree = worktrees[mainIndex]
-    const mainPath = typeof mainWorktree?.path === 'string' ? mainWorktree.path : ''
-    // Expand `~` so legacy tilde SSH repo paths match git's absolute path, sparing a rev-parse per poll.
-    const resolvedRepoPath = expandTilde(repoPath)
-    if (!mainPath || areRelayWorktreePathsEqual(mainPath, resolvedRepoPath)) {
-      return worktrees
-    }
-
-    const location = await this.readRepoLocation(resolvedRepoPath)
-    if (!location) {
-      return worktrees
-    }
-
-    // Why: only separate-git-dir/submodule repos have main entry == git-common-dir; gate on it so we don't clobber a linked worktree's real root.
-    if (!areRelayWorktreePathsEqual(mainPath, location.commonDir)) {
-      return worktrees
-    }
-
-    const normalized = [...worktrees]
-    normalized[mainIndex] = { ...mainWorktree, path: location.topLevel }
-    return normalized
-  }
-
-  private async listWorktrees(params: Record<string, unknown>, context?: RequestContext) {
-    const repoPath = params.repoPath as string
-    return this.gitCapabilities
-      .runWithFallback(
-        'worktree-list-z',
-        async () => {
-          const { stdout } = await this.git(['worktree', 'list', '--porcelain', '-z'], repoPath, {
-            signal: context?.signal
-          })
-          return this.normalizeMainWorktreePath(
-            repoPath,
-            parseWorktreeList(stdout, { nulDelimited: true })
-          )
-        },
-        async () => {
-          // Why: Git <2.36 lacks worktree-list `-z`, so fall back to the newline-block parser (loses newline-in-path safety).
-          try {
-            const { stdout } = await this.git(['worktree', 'list', '--porcelain'], repoPath, {
-              signal: context?.signal
-            })
-            const normalized = await this.normalizeMainWorktreePath(
-              repoPath,
-              parseWorktreeList(stdout)
-            )
-            // Why: Git <2.31 emits no `prunable` annotation, so probe each linked worktree's existence instead of trusting stale registrations (issue #8389).
-            return annotatePrunableWorktreesByExistence(normalized)
-          } catch {
-            return []
-          }
-        },
-        isUnsupportedWorktreeListZError
-      )
-      .catch(() => [])
-  }
-
-  private async addWorktree(params: Record<string, unknown>) {
-    return this.runWithGitReadCacheClear(() => addWorktreeOp(this.git.bind(this), params))
-  }
-
-  private async removeWorktree(params: Record<string, unknown>) {
-    const remove = () =>
-      this.runWithGitReadCacheClear(() =>
-        removeWorktreeOp(this.git.bind(this), params, this.gitCapabilities)
-      )
-    const worktreePath = params.worktreePath
-    return this.watcherRegistry && typeof worktreePath === 'string'
-      ? this.watcherRegistry.runWithRemovalFence(expandTilde(worktreePath), remove)
-      : remove()
-  }
-
-  private async worktreeIsClean(params: Record<string, unknown>) {
-    return worktreeIsCleanOp(this.git.bind(this), params)
-  }
-
-  private async refreshLocalBaseRefForWorktreeCreate(params: Record<string, unknown>) {
-    return this.runWithGitReadCacheClear(() =>
-      refreshLocalBaseRefForWorktreeCreateOp(this.git.bind(this), params, this.gitCapabilities)
-    )
-  }
 }
diff --git a/src/relay/pty-handler-source-publication.test.ts b/src/relay/pty-handler-source-publication.test.ts
index f0041a57ce5..f8082b20af5 100644
--- a/src/relay/pty-handler-source-publication.test.ts
+++ b/src/relay/pty-handler-source-publication.test.ts
@@ -654,7 +654,10 @@ describe('PtyHandler negotiated source publication', () => {
 
     expect(mockPtySpawn).toHaveBeenCalledOnce()
     expect(
-      responseResult(replacementWrites.find((buffer) => responseResult(buffer, 4))!, 4)
+      responseResult(
+        replacementWrites.find((buffer) => responseResult(buffer, 4))!,
+        4
+      )
     ).toMatchObject({
       id: 'pty-1',
       incarnationId: expect.any(String),
diff --git a/src/relay/workspace-space-scan.ts b/src/relay/workspace-space-scan.ts
index d66f0d0e618..73a68454833 100644
--- a/src/relay/workspace-space-scan.ts
+++ b/src/relay/workspace-space-scan.ts
@@ -1,5 +1,3 @@
-/* eslint-disable max-lines -- Why: local and relay Space scans share the same
-   cancellation, symlink, and top-level compaction semantics in one scanner. */
 import { execFile } from 'node:child_process'
 import type { Dirent } from 'node:fs'
 import { lstat, opendir } from 'node:fs/promises'
diff --git a/src/renderer/src/app-shell/use-persisted-ui-writer.ts b/src/renderer/src/app-shell/use-persisted-ui-writer.ts
index f16346b25fb..7d21726619e 100644
--- a/src/renderer/src/app-shell/use-persisted-ui-writer.ts
+++ b/src/renderer/src/app-shell/use-persisted-ui-writer.ts
@@ -96,34 +96,32 @@ export function usePersistedUIWriter(): void {
   const persistedUIReady = useAppStore((s) => s.persistedUIReady)
   const activeView = useAppStore((s) => s.activeView)
   const ui = useAppStore(
-    useShallow(
-      (s): PersistedUIWriteBaseline => ({
-        sidebarWidth: s.sidebarWidth,
-        rightSidebarOpen: s.rightSidebarOpen,
-        rightSidebarTab: s.rightSidebarTab,
-        rightSidebarExplorerView: s.rightSidebarExplorerView,
-        rightSidebarWidth: s.rightSidebarWidth,
-        markdownTocPanelWidth: s.markdownTocPanelWidth,
-        combinedDiffFileTreeWidth: s.combinedDiffFileTreeWidth,
-        groupBy: s.groupBy,
-        sortBy: s.sortBy,
-        projectOrderBy: s.projectOrderBy,
-        showSleepingWorkspaces: s.showSleepingWorkspaces,
-        hideDefaultBranchWorkspace: s.hideDefaultBranchWorkspace,
-        hideAutomationGeneratedWorkspaces: s.hideAutomationGeneratedWorkspaces,
-        hideCliCreatedWorkspaces: s.hideCliCreatedWorkspaces,
-        hideDetachedHeadWorkspaces: s.hideDetachedHeadWorkspaces,
-        hideWorkspacesFromOtherDevices: s.hideWorkspacesFromOtherDevices,
-        alwaysShowDefaultBranchWorkspace: s.alwaysShowDefaultBranchWorkspace,
-        showDotfilesByWorktree: s.showDotfilesByWorktree,
-        filterRepoIds: s.filterRepoIds,
-        // Why: dashboard auto-acks (fire on focus/visibility) and the in-memory ack cleanup
-        // paths in agent-status.ts (close/dismiss) flow to disk through map identity changes.
-        // Without persisting, agent rows that survive restart come back bold even when the
-        // user had already visited them.
-        acknowledgedAgentsByPaneKey: s.acknowledgedAgentsByPaneKey
-      })
-    )
+    useShallow((s): PersistedUIWriteBaseline => ({
+      sidebarWidth: s.sidebarWidth,
+      rightSidebarOpen: s.rightSidebarOpen,
+      rightSidebarTab: s.rightSidebarTab,
+      rightSidebarExplorerView: s.rightSidebarExplorerView,
+      rightSidebarWidth: s.rightSidebarWidth,
+      markdownTocPanelWidth: s.markdownTocPanelWidth,
+      combinedDiffFileTreeWidth: s.combinedDiffFileTreeWidth,
+      groupBy: s.groupBy,
+      sortBy: s.sortBy,
+      projectOrderBy: s.projectOrderBy,
+      showSleepingWorkspaces: s.showSleepingWorkspaces,
+      hideDefaultBranchWorkspace: s.hideDefaultBranchWorkspace,
+      hideAutomationGeneratedWorkspaces: s.hideAutomationGeneratedWorkspaces,
+      hideCliCreatedWorkspaces: s.hideCliCreatedWorkspaces,
+      hideDetachedHeadWorkspaces: s.hideDetachedHeadWorkspaces,
+      hideWorkspacesFromOtherDevices: s.hideWorkspacesFromOtherDevices,
+      alwaysShowDefaultBranchWorkspace: s.alwaysShowDefaultBranchWorkspace,
+      showDotfilesByWorktree: s.showDotfilesByWorktree,
+      filterRepoIds: s.filterRepoIds,
+      // Why: dashboard auto-acks (fire on focus/visibility) and the in-memory ack cleanup
+      // paths in agent-status.ts (close/dismiss) flow to disk through map identity changes.
+      // Without persisting, agent rows that survive restart come back bold even when the
+      // user had already visited them.
+      acknowledgedAgentsByPaneKey: s.acknowledgedAgentsByPaneKey
+    }))
   )
   useEffect(() => {
     // The baseline holds the values this client last saw persisted (newest
diff --git a/src/renderer/src/app-shell/workspace-view-cross-client-sync.test.tsx b/src/renderer/src/app-shell/workspace-view-cross-client-sync.test.tsx
index 839b74f73d4..8049890b968 100644
--- a/src/renderer/src/app-shell/workspace-view-cross-client-sync.test.tsx
+++ b/src/renderer/src/app-shell/workspace-view-cross-client-sync.test.tsx
@@ -8,8 +8,8 @@
 //   mobile client     = mobile/src/worktree/workspace-view-settings mapping; the ui.set
 //                       payload uses the shipping buildWorkspaceViewSettingsUpdate when
 //                       exported, else the legacy whole-snapshot shape — the source-pin
-//                       test asserts index.tsx matches whichever path is active, so the
-//                       model stays tethered to shipping code on baseline and candidate.
+//                       test asserts use-host-view-settings.ts matches whichever path is
+//                       active, so the model stays tethered to shipping code.
 //
 // Invariant: when two independently identified clients change DISJOINT workspace-view
 // fields concurrently or across stale-mirror windows, both changes survive and all
@@ -175,8 +175,11 @@ function createMobileClient(authority: Authority) {
   }
 }
 
-function readMobileHostScreenSource(): string {
-  return readFileSync(join(__dirname, '../../../../mobile/app/h/[hostId]/index.tsx'), 'utf-8')
+function readMobileViewSettingsHookSource(): string {
+  return readFileSync(
+    join(__dirname, '../../../../mobile/src/host-screen/use-host-view-settings.ts'),
+    'utf-8'
+  )
 }
 
 function readMobileViewSettingsSource(): string {
@@ -601,9 +604,9 @@ describe('workspace view preferences: cross-client persistence (STA-5781)', () =
   })
 
   it('pins the modeled mobile ui.set payload to the shipping source', async () => {
-    const source = readMobileHostScreenSource()
+    const source = readMobileViewSettingsHookSource()
     if (mobileHasPatchOnlyBuilder()) {
-      // Candidate: index.tsx must push through the patch-only builder this model uses.
+      // Candidate: the persistence hook must push through the patch-only builder this model uses.
       expect(source).toContain('buildWorkspaceViewSettingsUpdate(patch, next)')
       const builderSource = readMobileViewSettingsSource()
       for (const guard of [
diff --git a/src/renderer/src/components/GitLabItemDialog.tsx b/src/renderer/src/components/GitLabItemDialog.tsx
index 1d32d254084..1cae8854a08 100644
--- a/src/renderer/src/components/GitLabItemDialog.tsx
+++ b/src/renderer/src/components/GitLabItemDialog.tsx
@@ -1,84 +1,23 @@
-/* eslint-disable max-lines -- Why: dialog co-locates header, three
-   tabs (Description / Conversation / Pipeline), comment composer,
-   and four mutation actions. Splitting any of these into separate
-   components would make the close/reopen/merge state coupling
-   non-obvious. The GitHub-side equivalent (GitHubItemDialog) carries
-   the same disable for the same reason. */
-/* oxlint-disable react-doctor/no-adjust-state-on-prop-change -- Why: GitLab item dialogs reset draft/provider state and hydrate details from GitLab IPC when the selected item identity changes. */
 /* Why: GitLab counterpart to GitHubItemDialog. Side sheet with three
    tabs (Description / Conversation / Pipeline) and footer actions —
    close/reopen, merge, and a top-level comment composer. Files /
    inline review-comment positioning / approvals are deferred to v1.5
    since they mirror substantial GitHub-side surface area. */
-import React, { useCallback, useEffect, useMemo, useState } from 'react'
-import {
-  Check,
-  CircleDot,
-  ExternalLink,
-  GitMerge,
-  LoaderCircle,
-  Pencil,
-  RefreshCw,
-  Send,
-  X
-} from 'lucide-react'
-import { toast } from 'sonner'
-import { Button } from '@/components/ui/button'
-import {
-  Sheet,
-  SheetClose,
-  SheetContent,
-  SheetDescription,
-  SheetTitle
-} from '@/components/ui/sheet'
-import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs'
-import { VisuallyHidden } from 'radix-ui'
-import CommentMarkdown from '@/components/sidebar/CommentMarkdown'
-import { isScreenSubmitShortcut } from '@/lib/screen-submit-shortcut'
-import { useMountedRef } from '@/hooks/useMountedRef'
-import { cn } from '@/lib/utils'
-import {
-  getCommentBodySubmitState,
-  hasBoundedCommentBodyText
-} from '@/lib/comment-body-submit-state'
-import { useAppStore } from '@/store'
+import { useCallback, useMemo } from 'react'
+import { GitLabItemDialogView } from './gitlab-item-dialog/gitlab-item-dialog-view'
 import type {
-  GitLabAssignableUser,
-  GitLabMRUpdate,
-  GitLabPipelineJob,
-  GitLabWorkItem,
-  GitLabWorkItemDetails
-} from '../../../shared/gitlab-types'
-import type { TaskSourceContext } from '../../../shared/task-source-context'
-import { translate } from '@/i18n/i18n'
+  GitLabDialogRepoSelector,
+  GitLabItemDialogProps
+} from './gitlab-item-dialog/gitlab-item-dialog-types'
+import { useGitLabDetailsEditing } from './gitlab-item-dialog/use-gitlab-details-editing'
 import {
-  CommentCard,
-  PipelineJobRow,
-  StateBadge,
-  dedupeGitLabUsers,
-  formatGitLabLabelDraft,
-  gitLabUserKey,
-  normalizeGitLabLabels,
-  parseGitLabLabelDraft,
-  showGitLabMutationError,
-  toggleGitLabLabelDraft,
-  type JobTraceState
-} from './gitlab-item-dialog-parts'
-
-type Props = {
-  item: GitLabWorkItem | null
-  repoPath: string | null
-  repoId?: string | null
-  sourceContext?: TaskSourceContext | null
-  onClose: () => void
-  onCreateWorkspace?: (item: GitLabWorkItem) => void
-}
-
-type GitLabDialogRepoSelector = {
-  repoPath: string
-  repoId?: string | null
-  sourceContext?: TaskSourceContext | null
-}
+  useGitLabItemDetailsEffect,
+  useGitLabItemScopeResetEffect
+} from './gitlab-item-dialog/use-gitlab-item-dialog-effects'
+import { useGitLabItemDialogState } from './gitlab-item-dialog/use-gitlab-item-dialog-state'
+import { useGitLabPipelineActions } from './gitlab-item-dialog/use-gitlab-pipeline-actions'
+import { useGitLabPrimaryActions } from './gitlab-item-dialog/use-gitlab-primary-actions'
+import { useGitLabReviewActions } from './gitlab-item-dialog/use-gitlab-review-actions'
 
 export default function GitLabItemDialog({
   item,
@@ -87,44 +26,10 @@ export default function GitLabItemDialog({
   sourceContext,
   onClose,
   onCreateWorkspace
-}: Props): React.JSX.Element {
-  const [details, setDetails] = useState<GitLabWorkItemDetails | null>(null)
-  const [loading, setLoading] = useState(false)
-  const [error, setError] = useState<string | null>(null)
-  const [refreshNonce, setRefreshNonce] = useState(0)
+}: GitLabItemDialogProps) {
   const itemId = item?.id ?? null
-  const [commentDraftState, setCommentDraftState] = useState<{
-    itemId: string | null
-    value: string
-  }>(() => ({ itemId, value: '' }))
-  const commentDraft = commentDraftState.itemId === itemId ? commentDraftState.value : ''
-  if (commentDraftState.itemId !== itemId) {
-    // Why: comment drafts are tied to one GitLab item, so switching the sheet
-    // target must not leave a draft that could post to the wrong MR/issue.
-    setCommentDraftState({ itemId, value: '' })
-  }
-  const [commentSubmitting, setCommentSubmitting] = useState(false)
-  const [resolvingThreadId, setResolvingThreadId] = useState<string | null>(null)
-  const [editingDetails, setEditingDetails] = useState(false)
-  const [titleDraft, setTitleDraft] = useState('')
-  const [bodyDraft, setBodyDraft] = useState('')
-  const [labelDraft, setLabelDraft] = useState('')
-  const [labelOptions, setLabelOptions] = useState<string[] | null>(null)
-  const [labelOptionsLoading, setLabelOptionsLoading] = useState(false)
-  const [detailsSaving, setDetailsSaving] = useState(false)
-  const [reviewerOptions, setReviewerOptions] = useState<GitLabAssignableUser[] | null>(null)
-  const [reviewerOptionsLoading, setReviewerOptionsLoading] = useState(false)
-  const [reviewerUpdating, setReviewerUpdating] = useState(false)
-  const [reviewerDraftId, setReviewerDraftId] = useState('')
-  const [inlineCommentFilePath, setInlineCommentFilePath] = useState('')
-  const [inlineCommentLine, setInlineCommentLine] = useState('')
-  const [inlineCommentBody, setInlineCommentBody] = useState('')
-  const [inlineCommentSubmitting, setInlineCommentSubmitting] = useState(false)
-  const [expandedJobId, setExpandedJobId] = useState<number | null>(null)
-  const [jobTraceById, setJobTraceById] = useState<Record<number, JobTraceState>>({})
-  const [retryingJobId, setRetryingJobId] = useState<number | null>(null)
-  const [actionInFlight, setActionInFlight] = useState<'close' | 'reopen' | 'merge' | null>(null)
-  const mountedRef = useMountedRef()
+  const state = useGitLabItemDialogState(itemId)
+  const { setRefreshNonce } = state
   const repoSelector = useMemo<GitLabDialogRepoSelector | null>(() => {
     if (!repoPath) {
       return null
@@ -135,1377 +40,31 @@ export default function GitLabItemDialog({
       ...(sourceContext ? { sourceContext } : {})
     }
   }, [repoId, repoPath, sourceContext])
-  const updateCommentDraft = useCallback(
-    (value: string): void => {
-      setCommentDraftState({ itemId, value })
-    },
-    [itemId]
-  )
+  const updateCommentDraft = state.updateCommentDraft
 
-  useEffect(() => {
-    if (!item || !repoSelector) {
-      setDetails(null)
-      setLoading(false)
-      setError(null)
-      setEditingDetails(false)
-      return
-    }
-    let stale = false
-    setLoading(true)
-    setError(null)
-    void window.api.gl
-      .workItemDetails({ ...repoSelector, iid: item.number, type: item.type })
-      .then((data) => {
-        if (stale) {
-          return
-        }
-        if (!data) {
-          setError('Item not found.')
-          return
-        }
-        setDetails(data as GitLabWorkItemDetails)
-      })
-      .catch((err) => {
-        if (!stale) {
-          setError(err instanceof Error ? err.message : String(err))
-        }
-      })
-      .finally(() => {
-        if (!stale) {
-          setLoading(false)
-        }
-      })
-    return () => {
-      stale = true
-    }
-  }, [item, repoSelector, refreshNonce])
-
-  // Why: clear item-scoped dialog state when the sheet target changes. The
-  // top-level comment draft is reconciled during render so it cannot flash stale.
-  useEffect(() => {
-    setEditingDetails(false)
-    setTitleDraft('')
-    setBodyDraft('')
-    setLabelDraft('')
-    setLabelOptions(null)
-    setLabelOptionsLoading(false)
-    setReviewerOptions(null)
-    setReviewerOptionsLoading(false)
-    setReviewerUpdating(false)
-    setReviewerDraftId('')
-    setInlineCommentFilePath('')
-    setInlineCommentLine('')
-    setInlineCommentBody('')
-    setInlineCommentSubmitting(false)
-    setExpandedJobId(null)
-    setJobTraceById({})
-    setRetryingJobId(null)
-  }, [item?.id])
+  useGitLabItemDetailsEffect(item, repoSelector, state)
+  useGitLabItemScopeResetEffect(itemId, state)
 
   const handleRefresh = useCallback(() => {
     setRefreshNonce((n) => n + 1)
   }, [])
-
-  const loadGitLabLabelOptions = useCallback(async (): Promise<void> => {
-    if (!repoSelector || labelOptions !== null || labelOptionsLoading) {
-      return
-    }
-    setLabelOptionsLoading(true)
-    try {
-      const labels = await window.api.gl.listLabels(repoSelector)
-      if (mountedRef.current) {
-        setLabelOptions(normalizeGitLabLabels(labels))
-      }
-    } catch {
-      if (mountedRef.current) {
-        setLabelOptions([])
-      }
-    } finally {
-      if (mountedRef.current) {
-        setLabelOptionsLoading(false)
-      }
-    }
-  }, [labelOptions, labelOptionsLoading, mountedRef, repoSelector])
-
-  const loadGitLabReviewerOptions = useCallback(async (): Promise<void> => {
-    if (!repoSelector || reviewerOptions !== null || reviewerOptionsLoading) {
-      return
-    }
-    setReviewerOptionsLoading(true)
-    try {
-      const users = await window.api.gl.listAssignableUsers(repoSelector)
-      if (mountedRef.current) {
-        setReviewerOptions(dedupeGitLabUsers(users))
-      }
-    } catch {
-      if (mountedRef.current) {
-        setReviewerOptions([])
-      }
-    } finally {
-      if (mountedRef.current) {
-        setReviewerOptionsLoading(false)
-      }
-    }
-  }, [mountedRef, repoSelector, reviewerOptions, reviewerOptionsLoading])
-
-  const handleStartDetailsEdit = useCallback((): void => {
-    if (!item || !details || item.type !== 'mr') {
-      return
-    }
-    setTitleDraft(details.item.title || item.title)
-    setBodyDraft(details.body)
-    setLabelDraft(formatGitLabLabelDraft(details.item.labels ?? item.labels))
-    setEditingDetails(true)
-    void loadGitLabLabelOptions()
-  }, [details, item, loadGitLabLabelOptions])
-
-  const handleCancelDetailsEdit = useCallback((): void => {
-    setEditingDetails(false)
-    setTitleDraft('')
-    setBodyDraft('')
-    setLabelDraft('')
-  }, [])
-
-  const handleSaveDetails = useCallback(async (): Promise<void> => {
-    if (!item || !details || !repoSelector || item.type !== 'mr') {
-      return
-    }
-    const currentTitle = details.item.title || item.title
-    const currentBody = details.body
-    const currentLabels = normalizeGitLabLabels(details.item.labels ?? item.labels)
-    const nextTitle = titleDraft.trim()
-    const nextBody = bodyDraft
-    const nextLabels = parseGitLabLabelDraft(labelDraft)
-    if (!nextTitle) {
-      toast.error(translate('auto.components.GitLabItemDialog.98718490e4', 'MR title is required.'))
-      return
-    }
-
-    const currentLabelKeys = new Set(currentLabels.map((label) => label.toLowerCase()))
-    const nextLabelKeys = new Set(nextLabels.map((label) => label.toLowerCase()))
-    const addLabels = nextLabels.filter((label) => !currentLabelKeys.has(label.toLowerCase()))
-    const removeLabels = currentLabels.filter((label) => !nextLabelKeys.has(label.toLowerCase()))
-    const updates: GitLabMRUpdate = {}
-    if (nextTitle !== currentTitle) {
-      updates.title = nextTitle
-    }
-    if (nextBody !== currentBody) {
-      updates.body = nextBody
-    }
-    if (addLabels.length > 0) {
-      updates.addLabels = addLabels
-    }
-    if (removeLabels.length > 0) {
-      updates.removeLabels = removeLabels
-    }
-    if (Object.keys(updates).length === 0) {
-      handleCancelDetailsEdit()
-      return
-    }
-
-    setDetailsSaving(true)
-    try {
-      const res = await window.api.gl.updateMR({ ...repoSelector, iid: item.number, updates })
-      if (res.ok) {
-        if (mountedRef.current) {
-          setDetails((current) =>
-            current
-              ? {
-                  ...current,
-                  body: nextBody,
-                  item: { ...current.item, title: nextTitle, labels: nextLabels }
-                }
-              : current
-          )
-          setLabelOptions((current) =>
-            current ? normalizeGitLabLabels([...current, ...nextLabels]) : current
-          )
-          setEditingDetails(false)
-          setTitleDraft('')
-          setBodyDraft('')
-          setLabelDraft('')
-          useAppStore.getState().recordFeatureInteraction('gitlab-tasks')
-        }
-      } else if (mountedRef.current) {
-        toast.error(res.error)
-      }
-    } catch (error) {
-      if (mountedRef.current) {
-        showGitLabMutationError(error)
-      }
-    } finally {
-      if (mountedRef.current) {
-        setDetailsSaving(false)
-      }
-    }
-  }, [
-    bodyDraft,
-    details,
-    handleCancelDetailsEdit,
-    item,
-    labelDraft,
-    mountedRef,
-    repoSelector,
-    titleDraft
-  ])
-
-  const handleToggleJobTrace = useCallback(
-    async (job: GitLabPipelineJob): Promise<void> => {
-      if (expandedJobId === job.id) {
-        setExpandedJobId(null)
-        return
-      }
-      setExpandedJobId(job.id)
-      if (!repoSelector || !item || jobTraceById[job.id]?.trace || jobTraceById[job.id]?.error) {
-        return
-      }
-      setJobTraceById((current) => ({
-        ...current,
-        [job.id]: { loading: true }
-      }))
-      try {
-        const result = await window.api.gl.jobTrace({
-          ...repoSelector,
-          jobId: job.id,
-          projectRef: details?.item.projectRef ?? item.projectRef ?? null
-        })
-        if (!mountedRef.current) {
-          return
-        }
-        setJobTraceById((current) => ({
-          ...current,
-          [job.id]: result.ok
-            ? { loading: false, trace: result.trace }
-            : { loading: false, error: result.error }
-        }))
-      } catch (error) {
-        if (mountedRef.current) {
-          setJobTraceById((current) => ({
-            ...current,
-            [job.id]: {
-              loading: false,
-              error: error instanceof Error ? error.message : String(error)
-            }
-          }))
-        }
-      }
-    },
-    [details?.item.projectRef, expandedJobId, item, jobTraceById, mountedRef, repoSelector]
-  )
-
-  const handleRetryJob = useCallback(
-    async (job: GitLabPipelineJob): Promise<void> => {
-      if (!repoSelector || !item) {
-        return
-      }
-      setRetryingJobId(job.id)
-      try {
-        const result = await window.api.gl.retryJob({
-          ...repoSelector,
-          jobId: job.id,
-          projectRef: details?.item.projectRef ?? item.projectRef ?? null
-        })
-        if (!mountedRef.current) {
-          return
-        }
-        if (result.ok) {
-          toast.success(
-            translate('auto.components.GitLabItemDialog.f7cb495a12', 'Retried {{value0}}', {
-              value0: job.name
-            })
-          )
-          if (result.job) {
-            setDetails((current) =>
-              current
-                ? {
-                    ...current,
-                    pipelineJobs: (current.pipelineJobs ?? []).map((existing) =>
-                      existing.id === job.id ? result.job! : existing
-                    )
-                  }
-                : current
-            )
-          }
-          handleRefresh()
-        } else {
-          toast.error(result.error)
-        }
-      } catch (error) {
-        if (mountedRef.current) {
-          showGitLabMutationError(error)
-        }
-      } finally {
-        if (mountedRef.current) {
-          setRetryingJobId(null)
-        }
-      }
-    },
-    [details?.item.projectRef, handleRefresh, item, mountedRef, repoSelector]
-  )
-
-  const handleSetReviewers = useCallback(
-    async (nextReviewers: GitLabAssignableUser[]): Promise<void> => {
-      if (!repoSelector || !item || !details || item.type !== 'mr') {
-        return
-      }
-      const reviewerIds = nextReviewers
-        .map((reviewer) => reviewer.id)
-        .filter((id): id is number => typeof id === 'number')
-      if (reviewerIds.length !== nextReviewers.length) {
-        toast.error(
-          translate(
-            'auto.components.GitLabItemDialog.ceaf7c30c7',
-            'Reviewer id is unavailable for this GitLab user.'
-          )
-        )
-        return
-      }
-      setReviewerUpdating(true)
-      try {
-        const result = await window.api.gl.updateMRReviewers({
-          ...repoSelector,
-          iid: item.number,
-          reviewerIds,
-          projectRef: details.item.projectRef ?? item.projectRef ?? null
-        })
-        if (!mountedRef.current) {
-          return
-        }
-        if (result.ok) {
-          setDetails((current) =>
-            current ? { ...current, reviewers: dedupeGitLabUsers(result.reviewers) } : current
-          )
-          setReviewerDraftId('')
-          setReviewerOptions((current) =>
-            current ? dedupeGitLabUsers([...current, ...result.reviewers]) : current
-          )
-          useAppStore.getState().recordFeatureInteraction('gitlab-tasks')
-        } else {
-          toast.error(result.error)
-        }
-      } catch (error) {
-        if (mountedRef.current) {
-          showGitLabMutationError(error)
-        }
-      } finally {
-        if (mountedRef.current) {
-          setReviewerUpdating(false)
-        }
-      }
-    },
-    [details, item, mountedRef, repoSelector]
-  )
-
-  const handleSubmitInlineComment = useCallback(async (): Promise<void> => {
-    if (!repoSelector || !item || !details || item.type !== 'mr') {
-      return
-    }
-    const file = (details.files ?? []).find((row) => row.path === inlineCommentFilePath)
-    const line = Number.parseInt(inlineCommentLine, 10)
-    const bodyState = getCommentBodySubmitState(inlineCommentBody)
-    if (!file || !Number.isFinite(line) || line <= 0 || bodyState.status === 'empty') {
-      toast.error(
-        translate(
-          'auto.components.GitLabItemDialog.00d0d25825',
-          'File, line, and comment are required.'
-        )
-      )
-      return
-    }
-    if (bodyState.status === 'too-large-leading-whitespace') {
-      toast.error(
-        translate(
-          'auto.components.GitLabItemDialog.commentTooLarge',
-          'Comment is too large to submit safely.'
-        )
-      )
-      return
-    }
-    if (!details.baseSha || !details.startSha || !details.headSha) {
-      toast.error(
-        translate(
-          'auto.components.GitLabItemDialog.ffdd9a78e1',
-          'MR diff refs are unavailable for inline comments.'
-        )
-      )
-      return
-    }
-    setInlineCommentSubmitting(true)
-    try {
-      const result = await window.api.gl.addMRInlineComment({
-        ...repoSelector,
-        iid: item.number,
-        projectRef: details.item.projectRef ?? item.projectRef ?? null,
-        input: {
-          body: bodyState.body,
-          path: file.path,
-          ...(file.oldPath ? { oldPath: file.oldPath } : {}),
-          line,
-          baseSha: details.baseSha,
-          startSha: details.startSha,
-          headSha: details.headSha
-        }
-      })
-      if (!mountedRef.current) {
-        return
-      }
-      if (result.ok) {
-        setDetails((current) =>
-          current ? { ...current, comments: [...current.comments, result.comment] } : current
-        )
-        setInlineCommentBody('')
-        useAppStore.getState().recordFeatureInteraction('gitlab-tasks')
-        toast.success(
-          translate('auto.components.GitLabItemDialog.60c13320c4', 'Inline comment added')
-        )
-      } else {
-        toast.error(result.error)
-      }
-    } catch (error) {
-      if (mountedRef.current) {
-        showGitLabMutationError(error)
-      }
-    } finally {
-      if (mountedRef.current) {
-        setInlineCommentSubmitting(false)
-      }
-    }
-  }, [
-    details,
-    inlineCommentBody,
-    inlineCommentFilePath,
-    inlineCommentLine,
-    item,
-    mountedRef,
-    repoSelector
-  ])
-
-  const handleClose = useCallback(async (): Promise<void> => {
-    if (!item || !repoSelector || item.type !== 'mr') {
-      return
-    }
-    setActionInFlight('close')
-    try {
-      const res = await window.api.gl.closeMR({ ...repoSelector, iid: item.number })
-      if (res.ok) {
-        if (mountedRef.current) {
-          useAppStore.getState().recordFeatureInteraction('gitlab-tasks')
-          toast.success(
-            translate('auto.components.GitLabItemDialog.9b11cd233f', 'Closed MR !{{value0}}', {
-              value0: item.number
-            })
-          )
-          handleRefresh()
-        }
-      } else {
-        if (mountedRef.current) {
-          toast.error(res.error)
-        }
-      }
-    } catch (error) {
-      if (mountedRef.current) {
-        showGitLabMutationError(error)
-      }
-    } finally {
-      if (mountedRef.current) {
-        setActionInFlight(null)
-      }
-    }
-  }, [item, repoSelector, mountedRef, handleRefresh])
-
-  const handleReopen = useCallback(async (): Promise<void> => {
-    if (!item || !repoSelector || item.type !== 'mr') {
-      return
-    }
-    setActionInFlight('reopen')
-    try {
-      const res = await window.api.gl.reopenMR({ ...repoSelector, iid: item.number })
-      if (res.ok) {
-        if (mountedRef.current) {
-          useAppStore.getState().recordFeatureInteraction('gitlab-tasks')
-          toast.success(
-            translate('auto.components.GitLabItemDialog.865ea2703e', 'Reopened MR !{{value0}}', {
-              value0: item.number
-            })
-          )
-          handleRefresh()
-        }
-      } else {
-        if (mountedRef.current) {
-          toast.error(res.error)
-        }
-      }
-    } catch (error) {
-      if (mountedRef.current) {
-        showGitLabMutationError(error)
-      }
-    } finally {
-      if (mountedRef.current) {
-        setActionInFlight(null)
-      }
-    }
-  }, [item, repoSelector, mountedRef, handleRefresh])
-
-  const handleMerge = useCallback(async (): Promise<void> => {
-    if (!item || !repoSelector || item.type !== 'mr') {
-      return
-    }
-    setActionInFlight('merge')
-    try {
-      const res = await window.api.gl.mergeMR({ ...repoSelector, iid: item.number })
-      if (res.ok) {
-        if (mountedRef.current) {
-          useAppStore.getState().recordFeatureInteraction('gitlab-tasks')
-          toast.success(
-            translate('auto.components.GitLabItemDialog.e089f62594', 'Merged MR !{{value0}}', {
-              value0: item.number
-            })
-          )
-          handleRefresh()
-        }
-      } else {
-        if (mountedRef.current) {
-          toast.error(res.error)
-        }
-      }
-    } catch (error) {
-      if (mountedRef.current) {
-        showGitLabMutationError(error)
-      }
-    } finally {
-      if (mountedRef.current) {
-        setActionInFlight(null)
-      }
-    }
-  }, [item, repoSelector, mountedRef, handleRefresh])
-
-  const handleSubmitComment = useCallback(async (): Promise<void> => {
-    const bodyState = getCommentBodySubmitState(commentDraft)
-    if (bodyState.status === 'empty' || !item || !repoSelector) {
-      return
-    }
-    if (bodyState.status === 'too-large-leading-whitespace') {
-      toast.error(
-        translate(
-          'auto.components.GitLabItemDialog.commentTooLarge',
-          'Comment is too large to submit safely.'
-        )
-      )
-      return
-    }
-    setCommentSubmitting(true)
-    try {
-      // Why: the IPC for issue comments takes `number`, MR takes `iid`.
-      // Branch on the item type to hit the right channel.
-      const res =
-        item.type === 'mr'
-          ? await window.api.gl.addMRComment({
-              ...repoSelector,
-              iid: item.number,
-              body: bodyState.body
-            })
-          : await window.api.gl.addIssueComment({
-              ...repoSelector,
-              number: item.number,
-              body: bodyState.body
-            })
-      if (res.ok) {
-        if (mountedRef.current) {
-          setCommentDraftState((current) =>
-            current.itemId === itemId ? { itemId, value: '' } : current
-          )
-          useAppStore.getState().recordFeatureInteraction('gitlab-tasks')
-          handleRefresh()
-        }
-      } else {
-        if (mountedRef.current) {
-          toast.error(res.error)
-        }
-      }
-    } catch (error) {
-      if (mountedRef.current) {
-        showGitLabMutationError(error)
-      }
-    } finally {
-      if (mountedRef.current) {
-        setCommentSubmitting(false)
-      }
-    }
-  }, [commentDraft, item, itemId, repoSelector, mountedRef, handleRefresh])
-  const canSubmitInlineComment = hasBoundedCommentBodyText(inlineCommentBody)
-  const canSubmitComment = hasBoundedCommentBodyText(commentDraft)
-
-  const handleResolveDiscussion = useCallback(
-    async (threadId: string, resolved: boolean): Promise<void> => {
-      if (!item || !repoSelector || item.type !== 'mr') {
-        return
-      }
-      setResolvingThreadId(threadId)
-      try {
-        const res = await window.api.gl.resolveMRDiscussion({
-          ...repoSelector,
-          iid: item.number,
-          discussionId: threadId,
-          resolved
-        })
-        if (res.ok) {
-          if (mountedRef.current) {
-            setDetails((current) =>
-              current
-                ? {
-                    ...current,
-                    comments: current.comments.map((comment) =>
-                      comment.threadId === threadId ? { ...comment, isResolved: resolved } : comment
-                    )
-                  }
-                : current
-            )
-            useAppStore.getState().recordFeatureInteraction('gitlab-tasks')
-          }
-        } else if (mountedRef.current) {
-          toast.error(res.error)
-        }
-      } catch (error) {
-        if (mountedRef.current) {
-          showGitLabMutationError(error)
-        }
-      } finally {
-        if (mountedRef.current) {
-          setResolvingThreadId(null)
-        }
-      }
-    },
-    [item, repoSelector, mountedRef]
-  )
-
-  // Why: GitMerge for MRs visually disambiguates from GitBranch (and
-  // matches gitlab.com's MR iconography); CircleDot stays on issues.
-  const Icon = item?.type === 'mr' ? GitMerge : CircleDot
-  const prefix = item?.type === 'mr' ? '!' : '#'
-  const isMR = item?.type === 'mr'
-  const canClose = isMR && item?.state === 'opened'
-  const canReopen = isMR && item?.state === 'closed'
-  const canMerge = isMR && item?.state === 'opened'
-  const visibleTitle = details?.item.title || item?.title || ''
-  const visibleLabels = normalizeGitLabLabels(details?.item.labels ?? item?.labels ?? [])
-  const labelSuggestionOptions = normalizeGitLabLabels([
-    ...(labelOptions ?? []),
-    ...visibleLabels,
-    ...parseGitLabLabelDraft(labelDraft)
-  ])
-  const currentReviewers = dedupeGitLabUsers(details?.reviewers ?? [])
-  const currentReviewerKeys = new Set(currentReviewers.map(gitLabUserKey))
-  const reviewerOptionRows = dedupeGitLabUsers([
-    ...(reviewerOptions ?? []),
-    ...currentReviewers
-  ]).filter((user) => !currentReviewerKeys.has(gitLabUserKey(user)))
-  const approvalState = details?.approvalState
+  const detailsEditing = useGitLabDetailsEditing(item, repoSelector, state)
+  const pipelineActions = useGitLabPipelineActions(item, repoSelector, state, handleRefresh)
+  const reviewActions = useGitLabReviewActions(item, repoSelector, state)
+  const primaryActions = useGitLabPrimaryActions(item, itemId, repoSelector, state, handleRefresh)
 
   return (
-    <Sheet open={item !== null} onOpenChange={(open) => !open && onClose()}>
-      {/* Why: the sheet's absolute default close control would overlap this header's actions. */}
-      <SheetContent
-        side="right"
-        showCloseButton={false}
-        className="flex w-full flex-col gap-0 p-0 sm:max-w-2xl"
-      >
-        <VisuallyHidden.Root>
-          <SheetTitle>
-            {item
-              ? visibleTitle
-              : translate('auto.components.GitLabItemDialog.3a051b8ade', 'Work item')}
-          </SheetTitle>
-          <SheetDescription>
-            {translate('auto.components.GitLabItemDialog.30c97083c2', 'GitLab work item detail')}
-          </SheetDescription>
-        </VisuallyHidden.Root>
-
-        {item ? (
-          <>
-            <header className="flex-none border-b border-border/40 px-5 py-4">
-              <div className="flex items-start gap-3">
-                <Icon className="mt-0.5 size-5 text-muted-foreground" />
-                <div className="min-w-0 flex-1">
-                  <div className="flex items-center gap-2 text-xs text-muted-foreground">
-                    <span className="font-mono">
-                      {prefix}
-                      {item.number}
-                    </span>
-                    <StateBadge state={item.state} />
-                    {item.author ? (
-                      <span>
-                        {translate('auto.components.GitLabItemDialog.9bfb4a24d7', 'by')}{' '}
-                        {item.author}
-                      </span>
-                    ) : null}
-                  </div>
-                  <h2 className="mt-1.5 text-lg font-semibold leading-tight text-foreground">
-                    {visibleTitle}
-                  </h2>
-                  {visibleLabels.length > 0 ? (
-                    <div className="mt-2 flex flex-wrap gap-1">
-                      {visibleLabels.map((label) => (
-                        <span
-                          key={label}
-                          className="rounded-full border border-border/50 bg-muted/40 px-2 py-0.5 text-[10px] font-medium text-muted-foreground"
-                        >
-                          {label}
-                        </span>
-                      ))}
-                    </div>
-                  ) : null}
-                </div>
-                <div className="flex shrink-0 items-center gap-1">
-                  <Button
-                    variant="ghost"
-                    size="icon-sm"
-                    aria-label={translate('auto.components.GitLabItemDialog.b3c156dd51', 'Refresh')}
-                    disabled={loading}
-                    onClick={handleRefresh}
-                    className="size-7"
-                  >
-                    {loading ? (
-                      <LoaderCircle className="size-3.5 animate-spin" />
-                    ) : (
-                      <RefreshCw className="size-3.5" />
-                    )}
-                  </Button>
-                  <SheetClose asChild>
-                    <Button
-                      variant="ghost"
-                      size="icon-sm"
-                      className="size-7"
-                      aria-label={translate('auto.components.GitLabItemDialog.a199eb364b', 'Close')}
-                    >
-                      <X className="size-3.5" />
-                    </Button>
-                  </SheetClose>
-                </div>
-              </div>
-            </header>
-
-            <Tabs defaultValue="description" className="flex min-h-0 flex-1 flex-col">
-              <TabsList className="mx-5 mt-3 self-start">
-                <TabsTrigger value="description">
-                  {translate('auto.components.GitLabItemDialog.908d8d2a73', 'Description')}
-                </TabsTrigger>
-                <TabsTrigger value="conversation">
-                  {translate('auto.components.GitLabItemDialog.c996e2962c', 'Conversation')}
-                  {details?.comments?.length ? (
-                    <span className="ml-1.5 rounded-full bg-muted px-1.5 text-[10px] font-medium">
-                      {details.comments.length}
-                    </span>
-                  ) : null}
-                </TabsTrigger>
-                {isMR ? (
-                  <TabsTrigger value="files">
-                    {translate('auto.components.GitLabItemDialog.be3d291837', 'Files')}
-                    {details?.files?.length ? (
-                      <span className="ml-1.5 rounded-full bg-muted px-1.5 text-[10px] font-medium">
-                        {details.files.length}
-                      </span>
-                    ) : null}
-                  </TabsTrigger>
-                ) : null}
-                {isMR ? (
-                  <TabsTrigger value="pipeline">
-                    {translate('auto.components.GitLabItemDialog.02cbe2de44', 'Pipeline')}
-                    {details?.pipelineJobs?.length ? (
-                      <span className="ml-1.5 rounded-full bg-muted px-1.5 text-[10px] font-medium">
-                        {details.pipelineJobs.length}
-                      </span>
-                    ) : null}
-                  </TabsTrigger>
-                ) : null}
-              </TabsList>
-
-              <div className="min-h-0 flex-1 overflow-y-auto px-5 py-4 scrollbar-sleek">
-                {error ? (
-                  <div className="rounded-md bg-destructive/10 px-3 py-2 text-sm text-destructive">
-                    {error}
-                  </div>
-                ) : null}
-
-                <TabsContent value="description" className="mt-0">
-                  {!loading && details && isMR ? (
-                    <div className="mb-4 rounded-md border border-border/50 bg-muted/20 p-3">
-                      <div className="flex items-center justify-between gap-2">
-                        <div>
-                          <div className="text-xs font-medium text-foreground">
-                            {translate('auto.components.GitLabItemDialog.4f9313984d', 'Reviewers')}
-                          </div>
-                          {approvalState ? (
-                            <div className="mt-0.5 text-[11px] text-muted-foreground">
-                              {approvalState.approvalsLeft === 0
-                                ? translate(
-                                    'auto.components.GitLabItemDialog.22511537d2',
-                                    'Approved'
-                                  )
-                                : translate(
-                                    'auto.components.GitLabItemDialog.40c56b95e2',
-                                    '{{value0}} approval{{value1}} remaining',
-                                    {
-                                      value0: approvalState.approvalsLeft ?? 0,
-                                      value1: approvalState.approvalsLeft === 1 ? '' : 's'
-                                    }
-                                  )}
-                              {typeof approvalState.approvalsRequired === 'number'
-                                ? translate(
-                                    'auto.components.GitLabItemDialog.00f3bab87b',
-                                    ' of {{value0}} required',
-                                    { value0: approvalState.approvalsRequired }
-                                  )
-                                : ''}
-                            </div>
-                          ) : null}
-                        </div>
-                        <Button
-                          type="button"
-                          variant="outline"
-                          size="xs"
-                          disabled={reviewerOptionsLoading}
-                          onClick={() => void loadGitLabReviewerOptions()}
-                        >
-                          {reviewerOptionsLoading ? (
-                            <LoaderCircle className="size-3 animate-spin" />
-                          ) : null}
-                          {translate('auto.components.GitLabItemDialog.cb55b0390f', 'Manage')}
-                        </Button>
-                      </div>
-                      <div className="mt-2 flex flex-wrap gap-1.5">
-                        {currentReviewers.length > 0 ? (
-                          currentReviewers.map((reviewer) => (
-                            <span
-                              key={gitLabUserKey(reviewer)}
-                              className="inline-flex h-6 items-center gap-1 rounded-full border border-border/50 bg-background px-2 text-[11px] text-foreground"
-                            >
-                              {reviewer.username}
-                              <button
-                                type="button"
-                                disabled={reviewerUpdating}
-                                onClick={() =>
-                                  void handleSetReviewers(
-                                    currentReviewers.filter(
-                                      (row) => gitLabUserKey(row) !== gitLabUserKey(reviewer)
-                                    )
-                                  )
-                                }
-                                className="rounded-full p-0.5 text-muted-foreground hover:bg-muted hover:text-foreground disabled:opacity-50"
-                                aria-label={translate(
-                                  'auto.components.GitLabItemDialog.1b19cdc510',
-                                  'Remove reviewer {{value0}}',
-                                  { value0: reviewer.username }
-                                )}
-                              >
-                                <X className="size-3" />
-                              </button>
-                            </span>
-                          ))
-                        ) : (
-                          <span className="text-[11px] text-muted-foreground">
-                            {translate(
-                              'auto.components.GitLabItemDialog.474b50d988',
-                              'No reviewers.'
-                            )}
-                          </span>
-                        )}
-                      </div>
-                      {reviewerOptions ? (
-                        <div className="mt-2 flex items-center gap-2">
-                          <select
-                            value={reviewerDraftId}
-                            disabled={reviewerUpdating || reviewerOptionRows.length === 0}
-                            onChange={(event) => setReviewerDraftId(event.target.value)}
-                            className="h-8 min-w-0 flex-1 rounded-md border border-input bg-background px-2 text-xs text-foreground"
-                          >
-                            <option value="">
-                              {translate(
-                                'auto.components.GitLabItemDialog.05939e977d',
-                                'Add reviewer'
-                              )}
-                            </option>
-                            {reviewerOptionRows.map((reviewer) => (
-                              <option key={gitLabUserKey(reviewer)} value={gitLabUserKey(reviewer)}>
-                                {reviewer.username}
-                              </option>
-                            ))}
-                          </select>
-                          <Button
-                            type="button"
-                            size="xs"
-                            disabled={!reviewerDraftId || reviewerUpdating}
-                            onClick={() => {
-                              const reviewer = reviewerOptionRows.find(
-                                (user) => gitLabUserKey(user) === reviewerDraftId
-                              )
-                              if (reviewer) {
-                                void handleSetReviewers([...currentReviewers, reviewer])
-                              }
-                            }}
-                          >
-                            {reviewerUpdating ? (
-                              <LoaderCircle className="size-3 animate-spin" />
-                            ) : null}
-                            {translate('auto.components.GitLabItemDialog.7a2117129a', 'Add')}
-                          </Button>
-                        </div>
-                      ) : null}
-                      {approvalState?.rules.length ? (
-                        <div className="mt-2 space-y-1 border-t border-border/40 pt-2">
-                          {approvalState.rules.map((rule) => (
-                            <div
-                              key={rule.id}
-                              className="flex items-center justify-between gap-2 text-[11px] text-muted-foreground"
-                            >
-                              <span className="min-w-0 truncate">{rule.name}</span>
-                              <span>
-                                {rule.approved
-                                  ? translate(
-                                      'auto.components.GitLabItemDialog.22511537d2',
-                                      'Approved'
-                                    )
-                                  : translate(
-                                      'auto.components.GitLabItemDialog.6de8ce0cc6',
-                                      '{{value0}} required',
-                                      { value0: rule.approvalsRequired }
-                                    )}
-                              </span>
-                            </div>
-                          ))}
-                        </div>
-                      ) : null}
-                    </div>
-                  ) : null}
-                  {loading && !details ? (
-                    <div className="flex items-center justify-center py-12">
-                      <LoaderCircle className="size-5 animate-spin text-muted-foreground" />
-                    </div>
-                  ) : editingDetails ? (
-                    <div className="space-y-3">
-                      <div>
-                        <label className="mb-1 block text-xs font-medium text-muted-foreground">
-                          {translate('auto.components.GitLabItemDialog.89f3f19368', 'Title')}
-                        </label>
-                        <input
-                          value={titleDraft}
-                          onChange={(event) => setTitleDraft(event.target.value)}
-                          disabled={detailsSaving}
-                          className="h-9 w-full rounded-md border border-input bg-transparent px-2.5 text-sm shadow-xs focus:border-ring focus:outline-none focus:ring-[3px] focus:ring-ring/50"
-                        />
-                      </div>
-                      <div>
-                        <label className="mb-1 block text-xs font-medium text-muted-foreground">
-                          {translate('auto.components.GitLabItemDialog.908d8d2a73', 'Description')}
-                        </label>
-                        <textarea
-                          value={bodyDraft}
-                          onChange={(event) => setBodyDraft(event.target.value)}
-                          rows={8}
-                          disabled={detailsSaving}
-                          className="min-h-40 w-full resize-y rounded-md border border-input bg-transparent px-2.5 py-2 text-sm shadow-xs focus:border-ring focus:outline-none focus:ring-[3px] focus:ring-ring/50"
-                        />
-                      </div>
-                      <div>
-                        <label className="mb-1 block text-xs font-medium text-muted-foreground">
-                          {translate('auto.components.GitLabItemDialog.dde24ade55', 'Labels')}
-                        </label>
-                        <input
-                          value={labelDraft}
-                          onChange={(event) => setLabelDraft(event.target.value)}
-                          disabled={detailsSaving}
-                          placeholder={translate(
-                            'auto.components.GitLabItemDialog.3c0b6ccca7',
-                            'bug, backend'
-                          )}
-                          className="h-9 w-full rounded-md border border-input bg-transparent px-2.5 text-sm shadow-xs focus:border-ring focus:outline-none focus:ring-[3px] focus:ring-ring/50"
-                        />
-                        {labelOptionsLoading || labelSuggestionOptions.length > 0 ? (
-                          <div className="mt-2 flex flex-wrap gap-1.5">
-                            {labelOptionsLoading ? (
-                              <span className="inline-flex h-6 items-center gap-1 rounded-full border border-border/50 px-2 text-[11px] text-muted-foreground">
-                                <LoaderCircle className="size-3 animate-spin" />
-                                {translate(
-                                  'auto.components.GitLabItemDialog.717b706849',
-                                  'Loading labels'
-                                )}
-                              </span>
-                            ) : null}
-                            {labelSuggestionOptions.map((label) => {
-                              const selected = parseGitLabLabelDraft(labelDraft).some(
-                                (item) => item.toLowerCase() === label.toLowerCase()
-                              )
-                              return (
-                                <button
-                                  key={label}
-                                  type="button"
-                                  disabled={detailsSaving}
-                                  onClick={() =>
-                                    setLabelDraft(toggleGitLabLabelDraft(labelDraft, label))
-                                  }
-                                  className={cn(
-                                    'inline-flex h-6 items-center gap-1 rounded-full border px-2 text-[11px] transition-colors',
-                                    selected
-                                      ? 'border-primary/40 bg-primary/10 text-primary'
-                                      : 'border-border/50 bg-muted/30 text-muted-foreground hover:bg-muted/60'
-                                  )}
-                                >
-                                  {selected ? <Check className="size-3" /> : null}
-                                  {label}
-                                </button>
-                              )
-                            })}
-                          </div>
-                        ) : null}
-                      </div>
-                      <div className="flex justify-end gap-2">
-                        <Button
-                          type="button"
-                          variant="outline"
-                          size="sm"
-                          disabled={detailsSaving}
-                          onClick={handleCancelDetailsEdit}
-                        >
-                          <X className="size-3.5" />
-                          {translate('auto.components.GitLabItemDialog.f72fad3b16', 'Cancel')}
-                        </Button>
-                        <Button
-                          type="button"
-                          size="sm"
-                          disabled={detailsSaving || !titleDraft.trim()}
-                          onClick={() => void handleSaveDetails()}
-                        >
-                          {detailsSaving ? (
-                            <LoaderCircle className="size-3.5 animate-spin" />
-                          ) : (
-                            <Check className="size-3.5" />
-                          )}
-                          {translate('auto.components.GitLabItemDialog.93f79a3fc1', 'Save')}
-                        </Button>
-                      </div>
-                    </div>
-                  ) : details?.body ? (
-                    <div>
-                      {isMR && details ? (
-                        <div className="mb-3 flex justify-end">
-                          <Button
-                            type="button"
-                            variant="outline"
-                            size="sm"
-                            onClick={handleStartDetailsEdit}
-                            className="gap-1.5"
-                          >
-                            <Pencil className="size-3.5" />
-                            {translate('auto.components.GitLabItemDialog.da4174b00f', 'Edit')}
-                          </Button>
-                        </div>
-                      ) : null}
-                      <CommentMarkdown
-                        content={details.body}
-                        variant="document"
-                        className="min-w-0 max-w-full overflow-hidden break-words text-[13px] leading-relaxed [&_a]:break-all [&_code]:break-words [&_pre]:max-w-full"
-                      />
-                    </div>
-                  ) : (
-                    <div>
-                      {isMR && details ? (
-                        <div className="mb-3 flex justify-end">
-                          <Button
-                            type="button"
-                            variant="outline"
-                            size="sm"
-                            onClick={handleStartDetailsEdit}
-                            className="gap-1.5"
-                          >
-                            <Pencil className="size-3.5" />
-                            {translate('auto.components.GitLabItemDialog.da4174b00f', 'Edit')}
-                          </Button>
-                        </div>
-                      ) : null}
-                      <p className="text-sm text-muted-foreground">
-                        {translate(
-                          'auto.components.GitLabItemDialog.14423484db',
-                          'No description.'
-                        )}
-                      </p>
-                    </div>
-                  )}
-                </TabsContent>
-
-                <TabsContent value="conversation" className="mt-0 space-y-3">
-                  {loading && !details ? (
-                    <div className="flex items-center justify-center py-12">
-                      <LoaderCircle className="size-5 animate-spin text-muted-foreground" />
-                    </div>
-                  ) : details?.comments?.length ? (
-                    details.comments.map((c) => (
-                      <CommentCard
-                        key={c.id}
-                        comment={c}
-                        canResolve={isMR}
-                        resolving={resolvingThreadId === c.threadId}
-                        onResolve={(threadId, resolved) =>
-                          void handleResolveDiscussion(threadId, resolved)
-                        }
-                      />
-                    ))
-                  ) : (
-                    <p className="text-sm text-muted-foreground">
-                      {translate('auto.components.GitLabItemDialog.85a8170279', 'No comments yet.')}
-                    </p>
-                  )}
-                </TabsContent>
-
-                {isMR ? (
-                  <TabsContent value="files" className="mt-0 space-y-3">
-                    {loading && !details ? (
-                      <div className="flex items-center justify-center py-12">
-                        <LoaderCircle className="size-5 animate-spin text-muted-foreground" />
-                      </div>
-                    ) : details?.files?.length ? (
-                      <>
-                        <div className="rounded-md border border-border/50 bg-muted/20 p-3">
-                          <div className="grid grid-cols-[minmax(0,1fr)_80px] gap-2">
-                            <select
-                              value={inlineCommentFilePath}
-                              onChange={(event) => setInlineCommentFilePath(event.target.value)}
-                              className="h-8 min-w-0 rounded-md border border-input bg-background px-2 text-xs text-foreground"
-                            >
-                              <option value="">
-                                {translate('auto.components.GitLabItemDialog.ceb08a733d', 'File')}
-                              </option>
-                              {details.files.map((file) => (
-                                <option key={file.path} value={file.path}>
-                                  {file.path}
-                                </option>
-                              ))}
-                            </select>
-                            <input
-                              value={inlineCommentLine}
-                              onChange={(event) => setInlineCommentLine(event.target.value)}
-                              inputMode="numeric"
-                              placeholder={translate(
-                                'auto.components.GitLabItemDialog.7a7204417f',
-                                'Line'
-                              )}
-                              className="h-8 rounded-md border border-input bg-background px-2 text-xs text-foreground"
-                            />
-                          </div>
-                          <textarea
-                            value={inlineCommentBody}
-                            onChange={(event) => setInlineCommentBody(event.target.value)}
-                            rows={2}
-                            placeholder={translate(
-                              'auto.components.GitLabItemDialog.21f8dde18a',
-                              'Inline comment'
-                            )}
-                            className="mt-2 w-full resize-none rounded-md border border-input bg-background px-2.5 py-1.5 text-sm shadow-xs focus:border-ring focus:outline-none focus:ring-[3px] focus:ring-ring/50"
-                          />
-                          <div className="mt-2 flex justify-end">
-                            <Button
-                              type="button"
-                              size="sm"
-                              disabled={
-                                inlineCommentSubmitting ||
-                                !inlineCommentFilePath ||
-                                !inlineCommentLine.trim() ||
-                                !canSubmitInlineComment
-                              }
-                              onClick={() => void handleSubmitInlineComment()}
-                            >
-                              {inlineCommentSubmitting ? (
-                                <LoaderCircle className="size-3.5 animate-spin" />
-                              ) : (
-                                <Send className="size-3.5" />
-                              )}
-                              {translate('auto.components.GitLabItemDialog.84012fa8fb', 'Comment')}
-                            </Button>
-                          </div>
-                        </div>
-                        <div className="space-y-2">
-                          {details.files.map((file) => (
-                            <div
-                              key={file.path}
-                              className="rounded-md border border-border/50 bg-muted/10"
-                            >
-                              <div className="flex items-center justify-between gap-2 border-b border-border/40 px-3 py-2">
-                                <div className="min-w-0">
-                                  <div className="break-all font-mono text-xs text-foreground">
-                                    {file.path}
-                                  </div>
-                                  {file.oldPath ? (
-                                    <div className="break-all font-mono text-[11px] text-muted-foreground">
-                                      {translate(
-                                        'auto.components.GitLabItemDialog.a7eb4f4916',
-                                        'from'
-                                      )}{' '}
-                                      {file.oldPath}
-                                    </div>
-                                  ) : null}
-                                </div>
-                                <div className="shrink-0 text-[11px] text-muted-foreground">
-                                  <span className="text-emerald-600">+{file.additions}</span>{' '}
-                                  <span className="text-rose-600">-{file.deletions}</span>
-                                </div>
-                              </div>
-                              {file.diff ? (
-                                <pre className="max-h-80 overflow-auto whitespace-pre-wrap break-words px-3 py-2 font-mono text-[11px] leading-4 text-foreground scrollbar-sleek">
-                                  {file.diff}
-                                </pre>
-                              ) : (
-                                <div className="px-3 py-3 text-xs text-muted-foreground">
-                                  {translate(
-                                    'auto.components.GitLabItemDialog.007423f585',
-                                    'Diff content unavailable.'
-                                  )}
-                                </div>
-                              )}
-                            </div>
-                          ))}
-                        </div>
-                      </>
-                    ) : (
-                      <p className="text-sm text-muted-foreground">
-                        {translate(
-                          'auto.components.GitLabItemDialog.808b1ca1ba',
-                          'No changed files.'
-                        )}
-                      </p>
-                    )}
-                  </TabsContent>
-                ) : null}
-
-                {isMR ? (
-                  <TabsContent value="pipeline" className="mt-0">
-                    {loading && !details ? (
-                      <div className="flex items-center justify-center py-12">
-                        <LoaderCircle className="size-5 animate-spin text-muted-foreground" />
-                      </div>
-                    ) : details?.pipelineJobs?.length ? (
-                      <div className="space-y-1">
-                        {details.pipelineJobs.map((j) => (
-                          <PipelineJobRow
-                            key={j.id}
-                            job={j}
-                            expanded={expandedJobId === j.id}
-                            traceState={jobTraceById[j.id]}
-                            retrying={retryingJobId === j.id}
-                            onToggleTrace={(job) => void handleToggleJobTrace(job)}
-                            onRetry={(job) => void handleRetryJob(job)}
-                          />
-                        ))}
-                      </div>
-                    ) : (
-                      <p className="text-sm text-muted-foreground">
-                        {translate(
-                          'auto.components.GitLabItemDialog.f11e3e7675',
-                          'No pipeline runs for this MR.'
-                        )}
-                      </p>
-                    )}
-                  </TabsContent>
-                ) : null}
-              </div>
-            </Tabs>
-
-            <footer className="flex-none space-y-3 border-t border-border/40 px-5 py-3">
-              {/* Why: comment composer at the top of the footer so the
-                  primary actions row stays visually grouped at the bottom. */}
-              <div className="flex items-end gap-2">
-                <textarea
-                  value={commentDraft}
-                  onChange={(e) => updateCommentDraft(e.target.value)}
-                  placeholder={translate(
-                    'auto.components.GitLabItemDialog.c08e1d5a57',
-                    'Comment on {{value0}}{{value1}}…',
-                    { value0: prefix, value1: item.number }
-                  )}
-                  rows={2}
-                  disabled={commentSubmitting}
-                  className="min-h-9 w-full resize-none rounded-md border border-input bg-transparent px-2.5 py-1.5 text-sm shadow-xs focus:border-ring focus:outline-none focus:ring-[3px] focus:ring-ring/50"
-                  onKeyDown={(e) => {
-                    // Why: this is local textarea submit behavior; Settings
-                    // keybindings only cover app commands.
-                    if (isScreenSubmitShortcut(e) && canSubmitComment && !commentSubmitting) {
-                      e.preventDefault()
-                      void handleSubmitComment()
-                    }
-                  }}
-                />
-                <Button
-                  size="sm"
-                  disabled={!canSubmitComment || commentSubmitting}
-                  onClick={() => void handleSubmitComment()}
-                  className="shrink-0 gap-1.5"
-                >
-                  {commentSubmitting ? (
-                    <LoaderCircle className="size-3.5 animate-spin" />
-                  ) : (
-                    <Send className="size-3.5" />
-                  )}
-                  {translate('auto.components.GitLabItemDialog.84012fa8fb', 'Comment')}
-                </Button>
-              </div>
-
-              <div className="flex items-center justify-between gap-2">
-                <Button
-                  variant="outline"
-                  size="sm"
-                  onClick={() => void window.api.shell.openUrl(item.url)}
-                  className="gap-1.5"
-                >
-                  <ExternalLink className="size-3.5" />
-                  {translate('auto.components.GitLabItemDialog.f2e64d1c20', 'Open in GitLab')}
-                </Button>
-                <div className="flex items-center gap-2">
-                  {onCreateWorkspace ? (
-                    <Button variant="outline" size="sm" onClick={() => onCreateWorkspace(item)}>
-                      {translate('auto.components.GitLabItemDialog.131865e231', 'Create workspace')}
-                    </Button>
-                  ) : null}
-                  {canMerge ? (
-                    <Button
-                      size="sm"
-                      disabled={actionInFlight !== null}
-                      onClick={() => void handleMerge()}
-                    >
-                      {actionInFlight === 'merge' ? (
-                        <LoaderCircle className="size-3.5 animate-spin" />
-                      ) : null}
-                      {translate('auto.components.GitLabItemDialog.16b3412570', 'Merge')}
-                    </Button>
-                  ) : null}
-                  {canClose ? (
-                    <Button
-                      variant="outline"
-                      size="sm"
-                      disabled={actionInFlight !== null}
-                      onClick={() => void handleClose()}
-                    >
-                      {actionInFlight === 'close' ? (
-                        <LoaderCircle className="size-3.5 animate-spin" />
-                      ) : null}
-                      {translate('auto.components.GitLabItemDialog.a199eb364b', 'Close')}
-                    </Button>
-                  ) : null}
-                  {canReopen ? (
-                    <Button
-                      variant="outline"
-                      size="sm"
-                      disabled={actionInFlight !== null}
-                      onClick={() => void handleReopen()}
-                    >
-                      {actionInFlight === 'reopen' ? (
-                        <LoaderCircle className="size-3.5 animate-spin" />
-                      ) : null}
-                      {translate('auto.components.GitLabItemDialog.65e784c1f1', 'Reopen')}
-                    </Button>
-                  ) : null}
-                </div>
-              </div>
-            </footer>
-          </>
-        ) : null}
-      </SheetContent>
-    </Sheet>
+    <GitLabItemDialogView
+      item={item}
+      onClose={onClose}
+      onCreateWorkspace={onCreateWorkspace}
+      state={state}
+      detailsEditing={detailsEditing}
+      pipelineActions={pipelineActions}
+      primaryActions={primaryActions}
+      reviewActions={reviewActions}
+      handleRefresh={handleRefresh}
+      updateCommentDraft={updateCommentDraft}
+    />
   )
 }
diff --git a/src/renderer/src/components/LinearItemDrawer.tsx b/src/renderer/src/components/LinearItemDrawer.tsx
index d544b58eebe..6cb74ef71b1 100644
--- a/src/renderer/src/components/LinearItemDrawer.tsx
+++ b/src/renderer/src/components/LinearItemDrawer.tsx
@@ -1,1237 +1,27 @@
-/* eslint-disable max-lines -- Why: the Linear drawer co-locates read-only preview, edit controls, and comment input so the full issue surface stays in one file. */
 /* oxlint-disable react-doctor/no-adjust-state-on-prop-change -- Why: Linear drawer state hydrates full issue details and comments from provider IPC for the selected issue. */
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import {
-  ArrowRight,
-  ChevronDown,
-  ExternalLink,
-  FolderOpen,
-  Gauge,
-  LoaderCircle,
-  Plus,
-  Send,
-  Tag,
-  UserRound,
-  X
-} from 'lucide-react'
-import { toast } from 'sonner'
 
-import { Button } from '@/components/ui/button'
-import { ButtonGroup } from '@/components/ui/button-group'
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuTrigger
-} from '@/components/ui/dropdown-menu'
-import { Input } from '@/components/ui/input'
-import { LinearIssueTextEditor } from '@/components/LinearIssueTextEditor'
-import { Sheet, SheetContent, SheetDescription, SheetTitle } from '@/components/ui/sheet'
-import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
-import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
-import { VisuallyHidden } from 'radix-ui'
-import CommentMarkdown from '@/components/sidebar/CommentMarkdown'
-import { cn } from '@/lib/utils'
-import {
-  getCommentBodySubmitState,
-  hasBoundedCommentBodyText
-} from '@/lib/comment-body-submit-state'
 import { findLinearIssueWorkspaceAttachment } from '@/lib/linear-issue-workspace-attachment'
 import { openLinearIssueWorkspaceOrStart } from '@/lib/linear-issue-workspace-open'
 import { getWorktreeAttachmentLabel } from '@/lib/worktree-attachment-label'
 import { folderWorkspaceToWorktree } from '../../../shared/folder-workspace-worktree'
 import { useAppStore } from '@/store'
 import { useAllWorktrees } from '@/store/selectors'
-import { getScreenSubmitShortcutLabel, isScreenSubmitShortcut } from '@/lib/screen-submit-shortcut'
-import { createBrowserUuid } from '@/lib/browser-uuid'
-import {
-  useTeamStates,
-  useTeamLabels,
-  useTeamMembers,
-  useImmediateMutation
-} from '@/hooks/useIssueMetadata'
-import {
-  getLinearStateMarkerStyle,
-  getLinearStatePillStyle
-} from '@/components/linear-state-pill-style'
-import { LinearPriorityIcon } from '@/components/linear-priority-icon'
 import type { LinearComment, LinearIssue } from '../../../shared/linear/issue-types'
-import type { TaskSourceContext } from '../../../shared/task-source-context'
+import { linearGetIssue, linearIssueComments } from '@/runtime/runtime-linear-issue-mutations'
 import {
-  linearAddIssueComment,
-  linearGetIssue,
-  linearIssueComments,
-  linearUpdateIssue
-} from '@/runtime/runtime-linear-issue-mutations'
-import { translate } from '@/i18n/i18n'
-import { formatUiRelativeTimeFromDate } from '@/i18n/relative-time-format'
+  initLinearIssueEditState,
+  type LinearEditState,
+  type LinearItemDrawerProps,
+  type LinearLocalComment
+} from '@/components/linear-item-drawer-types'
+import { renderLinearItemDrawerSheet } from '@/components/linear-item-drawer-sheet'
 
-function LinearIcon({ className }: { className?: string }): React.JSX.Element {
-  return (
-    <svg viewBox="0 0 24 24" aria-hidden className={className} fill="currentColor">
-      <path d="M2.886 4.18A11.982 11.982 0 0 1 11.99 0C18.624 0 24 5.376 24 12.009c0 3.64-1.62 6.903-4.18 9.105L2.887 4.18ZM1.817 5.626l16.556 16.556c-.524.33-1.075.62-1.65.866L.951 7.277c.247-.575.537-1.126.866-1.65ZM.322 9.163l14.515 14.515c-.71.172-1.443.282-2.195.322L0 11.358a12 12 0 0 1 .322-2.195Zm-.17 4.862 9.823 9.824a12.02 12.02 0 0 1-9.824-9.824Z" />
-    </svg>
-  )
-}
-
-const PRIORITY_LABELS: Record<number, string> = {
-  0: 'No priority',
-  1: 'Urgent',
-  2: 'High',
-  3: 'Medium',
-  4: 'Low'
-}
-
-const LINEAR_EDIT_CHIP_CLASS =
-  'inline-flex h-6 min-w-0 max-w-[14rem] cursor-pointer items-center gap-1.5 rounded-full border border-border/70 bg-background/70 px-2.5 text-[11px] font-medium leading-none text-muted-foreground shadow-xs transition-[background-color,border-color,color,box-shadow] hover:border-border hover:bg-accent hover:text-accent-foreground hover:[--linear-state-pill-current-background:var(--linear-state-pill-hover-background)] hover:[--linear-state-pill-current-border:var(--linear-state-pill-hover-border)] hover:[--linear-state-pill-current-foreground:var(--linear-state-pill-hover-foreground)] focus-visible:outline-none focus-visible:ring-[3px] focus-visible:ring-ring/50 disabled:pointer-events-none disabled:opacity-80'
-
-const LINEAR_EDIT_MENU_ITEM_CLASS =
-  'flex w-full cursor-pointer items-center rounded-sm px-2 py-1.5 text-[12px] hover:bg-accent'
-
-const LINEAR_EDIT_MENU_ITEM_WITH_ICON_CLASS =
-  'flex w-full cursor-pointer items-center gap-2 rounded-sm px-2 py-1.5 text-[12px] hover:bg-accent'
-
-const LINEAR_ESTIMATE_PRESETS = [1, 2, 3, 5, 8] as const
-
-export function formatLinearEstimateLabel(estimate: number | null | undefined): string {
-  return estimate === null || estimate === undefined ? 'Set estimate' : `Estimate ${estimate}`
-}
-
-function formatLinearEstimateInput(estimate: number | null | undefined): string {
-  return estimate === null || estimate === undefined ? '' : String(estimate)
-}
-
-function LinearEditChipAdornment({
-  loading,
-  pending
-}: {
-  loading?: boolean
-  pending?: boolean
-}): React.JSX.Element {
-  if (loading || pending) {
-    return <LoaderCircle className="size-3 shrink-0 animate-spin opacity-70" />
-  }
-
-  return <ChevronDown className="size-3 shrink-0 opacity-55" />
-}
-
-function formatRelativeTime(input: string): string {
-  return formatUiRelativeTimeFromDate(input)
-}
-
-type LinearItemDrawerProps = {
-  issue: LinearIssue | null
-  onUse: (issue: LinearIssue) => void
-  onClose: () => void
-  sourceContext?: TaskSourceContext | null
-}
-
-export type LinearEditState = {
-  state: LinearIssue['state']
-  priority: number
-  estimate: number | null | undefined
-  assignee: LinearIssue['assignee']
-  labelIds: string[]
-  labels: string[]
-}
-
-type EditSectionProps = {
-  issue: LinearIssue
-  editState: LinearEditState
-  onEditStateChange: (patch: Partial<LinearEditState>) => void
-  layout?: 'chips' | 'properties'
-  sourceContext?: TaskSourceContext | null
-}
-
-export function LinearIssueEditSection({
-  issue,
-  editState,
-  onEditStateChange,
-  layout = 'chips',
-  sourceContext
-}: EditSectionProps): React.JSX.Element {
-  const [labelPopoverOpen, setLabelPopoverOpen] = useState(false)
-  const [estimatePopoverOpen, setEstimatePopoverOpen] = useState(false)
-  const patchLinearIssue = useAppStore((s) => s.patchLinearIssue)
-  const settings = useAppStore((s) => s.settings)
-  const providerSettings = sourceContext ?? settings
-  const { isPending, run } = useImmediateMutation()
-
-  const {
-    state: localState,
-    priority: localPriority,
-    estimate: localEstimate,
-    assignee: localAssignee,
-    labelIds: localLabelIds,
-    labels: localLabels
-  } = editState
-  const [estimateInput, setEstimateInput] = useState(() => formatLinearEstimateInput(localEstimate))
-
-  const teamId = issue.team?.id || null
-  const states = useTeamStates(teamId, providerSettings, issue.workspaceId)
-  const labels = useTeamLabels(teamId, providerSettings, issue.workspaceId)
-  const members = useTeamMembers(teamId, providerSettings, issue.workspaceId)
-
-  const handleEstimatePopoverOpenChange = useCallback(
-    (open: boolean) => {
-      setEstimatePopoverOpen(open)
-      if (open) {
-        setEstimateInput(formatLinearEstimateInput(localEstimate))
-      }
-    },
-    [localEstimate]
-  )
-
-  const handleStateChange = useCallback(
-    (stateId: string) => {
-      const newState = states.data.find((s) => s.id === stateId)
-      if (!newState) {
-        return
-      }
-
-      const prevState = localState
-      const stateValue = { name: newState.name, type: newState.type, color: newState.color }
-
-      run('state', {
-        mutate: () => linearUpdateIssue(providerSettings, issue.id, { stateId }, issue.workspaceId),
-        onOptimistic: () => {
-          onEditStateChange({ state: stateValue })
-          patchLinearIssue(issue.id, { state: stateValue }, { sourceContext })
-        },
-        onRevert: () => {
-          onEditStateChange({ state: prevState })
-          patchLinearIssue(issue.id, { state: prevState }, { sourceContext })
-        },
-        onSuccess: () => {
-          useAppStore.getState().invalidateLinearIssueLists({ sourceContext })
-          useAppStore.getState().recordFeatureInteraction('linear-tasks')
-        },
-        onError: (err) => toast.error(err)
-      })
-    },
-    [
-      issue.id,
-      issue.workspaceId,
-      localState,
-      providerSettings,
-      states.data,
-      patchLinearIssue,
-      run,
-      onEditStateChange,
-      sourceContext
-    ]
-  )
-
-  const handlePriorityChange = useCallback(
-    (value: string) => {
-      const priority = Number.parseInt(value, 10)
-      const prevPriority = localPriority
-      run('priority', {
-        mutate: () =>
-          linearUpdateIssue(providerSettings, issue.id, { priority }, issue.workspaceId),
-        onOptimistic: () => {
-          onEditStateChange({ priority })
-          patchLinearIssue(issue.id, { priority }, { sourceContext })
-        },
-        onRevert: () => {
-          onEditStateChange({ priority: prevPriority })
-          patchLinearIssue(issue.id, { priority: prevPriority }, { sourceContext })
-        },
-        onSuccess: () => {
-          useAppStore.getState().invalidateLinearIssueLists({ sourceContext })
-          useAppStore.getState().recordFeatureInteraction('linear-tasks')
-        },
-        onError: (err) => toast.error(err)
-      })
-    },
-    [
-      issue.id,
-      issue.workspaceId,
-      localPriority,
-      providerSettings,
-      patchLinearIssue,
-      run,
-      onEditStateChange,
-      sourceContext
-    ]
-  )
-
-  const handleEstimateChange = useCallback(
-    (estimate: number | null) => {
-      const prevEstimate = localEstimate
-      run('estimate', {
-        mutate: () =>
-          linearUpdateIssue(providerSettings, issue.id, { estimate }, issue.workspaceId),
-        onOptimistic: () => {
-          onEditStateChange({ estimate })
-          patchLinearIssue(issue.id, { estimate }, { sourceContext })
-          setEstimatePopoverOpen(false)
-        },
-        onRevert: () => {
-          onEditStateChange({ estimate: prevEstimate })
-          patchLinearIssue(issue.id, { estimate: prevEstimate }, { sourceContext })
-        },
-        onSuccess: () => {
-          useAppStore.getState().recordFeatureInteraction('linear-tasks')
-        },
-        onError: (err) => toast.error(err)
-      })
-    },
-    [
-      issue.id,
-      issue.workspaceId,
-      localEstimate,
-      providerSettings,
-      patchLinearIssue,
-      run,
-      onEditStateChange,
-      sourceContext
-    ]
-  )
-
-  const handleEstimateSubmit = useCallback(() => {
-    const trimmed = estimateInput.trim()
-    if (!trimmed) {
-      handleEstimateChange(null)
-      return
-    }
-
-    const estimate = Number(trimmed)
-    if (!Number.isInteger(estimate) || estimate < 0) {
-      toast.error(
-        translate(
-          'auto.components.LinearItemDrawer.0be31fef8e',
-          'Estimate must be a non-negative integer'
-        )
-      )
-      return
-    }
-
-    handleEstimateChange(estimate)
-  }, [estimateInput, handleEstimateChange])
-
-  const handleAssigneeChange = useCallback(
-    (memberId: string) => {
-      const assigneeId = memberId === '__unassign__' ? null : memberId
-      const member = members.data.find((m) => m.id === memberId)
-      const prevAssignee = localAssignee
-      const newAssignee = member
-        ? { id: member.id, displayName: member.displayName, avatarUrl: member.avatarUrl }
-        : undefined
-      run('assignee', {
-        mutate: () =>
-          linearUpdateIssue(providerSettings, issue.id, { assigneeId }, issue.workspaceId),
-        onOptimistic: () => {
-          onEditStateChange({ assignee: newAssignee })
-          patchLinearIssue(issue.id, { assignee: newAssignee }, { sourceContext })
-        },
-        onRevert: () => {
-          onEditStateChange({ assignee: prevAssignee })
-          patchLinearIssue(issue.id, { assignee: prevAssignee }, { sourceContext })
-        },
-        onSuccess: () => {
-          useAppStore.getState().invalidateLinearIssueLists({ sourceContext })
-          useAppStore.getState().recordFeatureInteraction('linear-tasks')
-        },
-        onError: (err) => toast.error(err)
-      })
-    },
-    [
-      issue.id,
-      issue.workspaceId,
-      localAssignee,
-      providerSettings,
-      members.data,
-      patchLinearIssue,
-      run,
-      onEditStateChange,
-      sourceContext
-    ]
-  )
-
-  const handleLabelToggle = useCallback(
-    (labelId: string) => {
-      const prevLabelIds = localLabelIds
-      const prevLabels = localLabels
-      const isRemoving = prevLabelIds.includes(labelId)
-      const newLabelIds = isRemoving
-        ? prevLabelIds.filter((id) => id !== labelId)
-        : [...prevLabelIds, labelId]
-      const newLabels = newLabelIds
-        .map((id) => labels.data.find((l) => l.id === id)?.name)
-        .filter((n): n is string => !!n)
-
-      run('labels', {
-        mutate: () =>
-          linearUpdateIssue(
-            providerSettings,
-            issue.id,
-            { labelIds: newLabelIds },
-            issue.workspaceId
-          ),
-        onOptimistic: () => {
-          onEditStateChange({ labelIds: newLabelIds, labels: newLabels })
-          patchLinearIssue(
-            issue.id,
-            { labelIds: newLabelIds, labels: newLabels },
-            { sourceContext }
-          )
-        },
-        onRevert: () => {
-          onEditStateChange({ labelIds: prevLabelIds, labels: prevLabels })
-          patchLinearIssue(
-            issue.id,
-            { labelIds: prevLabelIds, labels: prevLabels },
-            { sourceContext }
-          )
-        },
-        onSuccess: () => {
-          useAppStore.getState().invalidateLinearIssueLists({ sourceContext })
-          useAppStore.getState().recordFeatureInteraction('linear-tasks')
-        },
-        onError: (err) => toast.error(err)
-      })
-    },
-    [
-      issue.id,
-      issue.workspaceId,
-      localLabelIds,
-      localLabels,
-      providerSettings,
-      labels.data,
-      patchLinearIssue,
-      run,
-      onEditStateChange,
-      sourceContext
-    ]
-  )
-
-  const currentStateId = states.data.find(
-    (s) => s.name === localState.name && s.type === localState.type
-  )?.id
-  const statePending = isPending('state')
-  const priorityPending = isPending('priority')
-  const estimatePending = isPending('estimate')
-  const assigneePending = isPending('assignee')
-  const labelsPending = isPending('labels')
-  const labelSummary =
-    localLabels.length === 0
-      ? '+ Label'
-      : localLabels.length === 1
-        ? localLabels[0]
-        : `${localLabels[0]} +${localLabels.length - 1}`
-
-  const checkIcon = (
-    <svg className="size-2.5" viewBox="0 0 12 12" fill="none">
-      <path
-        d="M2 6l3 3 5-5"
-        stroke="currentColor"
-        strokeWidth="2"
-        strokeLinecap="round"
-        strokeLinejoin="round"
-      />
-    </svg>
-  )
-
-  if (layout === 'properties') {
-    const propertyRowClass =
-      'flex min-h-9 w-full cursor-pointer items-center gap-2 rounded-md px-2 py-1.5 text-left text-sm text-foreground transition hover:bg-accent hover:text-accent-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-80'
-    const propertyIconClass = 'size-4 shrink-0 text-muted-foreground'
-
-    return (
-      <div className="space-y-3">
-        <section className="rounded-xl border border-border/60 bg-card text-card-foreground shadow-xs">
-          <div className="flex h-10 items-center gap-1 border-b border-border/50 px-4 text-sm font-medium text-muted-foreground">
-            <span>{translate('auto.components.LinearItemDrawer.dd304de85a', 'Properties')}</span>
-            <ChevronDown className="size-3.5" />
-          </div>
-          <div className="space-y-1 p-3">
-            <Popover>
-              <PopoverTrigger asChild>
-                <button
-                  type="button"
-                  disabled={statePending}
-                  className={propertyRowClass}
-                  aria-busy={statePending || states.loading}
-                >
-                  <span
-                    className="inline-block size-2.5 shrink-0 rounded-full"
-                    style={getLinearStateMarkerStyle(localState.color)}
-                  />
-                  <span className="min-w-0 flex-1 truncate">{localState.name}</span>
-                  <LinearEditChipAdornment loading={states.loading} pending={statePending} />
-                </button>
-              </PopoverTrigger>
-              <PopoverContent
-                className="popover-scroll-content scrollbar-sleek w-48 p-1"
-                align="start"
-              >
-                {states.error ? (
-                  <div className="px-2 py-3 text-center text-[12px] text-destructive">
-                    {states.error}
-                  </div>
-                ) : states.loading ? (
-                  <div className="flex items-center gap-2 px-2 py-3 text-[12px] text-muted-foreground">
-                    <LoaderCircle className="size-3 animate-spin" />
-                    {translate('auto.components.LinearItemDrawer.59b6cd3706', 'Loading states')}
-                  </div>
-                ) : states.data.length > 0 ? (
-                  <div>
-                    {states.data.map((s) => (
-                      <button
-                        key={s.id}
-                        type="button"
-                        onClick={() => handleStateChange(s.id)}
-                        className={cn(
-                          LINEAR_EDIT_MENU_ITEM_WITH_ICON_CLASS,
-                          currentStateId === s.id && 'bg-accent/50'
-                        )}
-                      >
-                        <span
-                          className="inline-block size-2 rounded-full"
-                          style={{ backgroundColor: s.color }}
-                        />
-                        {s.name}
-                      </button>
-                    ))}
-                  </div>
-                ) : (
-                  <div className="px-2 py-3 text-center text-[12px] text-muted-foreground">
-                    {translate('auto.components.LinearItemDrawer.780ea6ed89', 'No states found')}
-                  </div>
-                )}
-              </PopoverContent>
-            </Popover>
-
-            <Popover>
-              <PopoverTrigger asChild>
-                <button
-                  type="button"
-                  disabled={priorityPending}
-                  className={propertyRowClass}
-                  aria-busy={priorityPending}
-                >
-                  <LinearPriorityIcon priority={localPriority} />
-                  <span className="min-w-0 flex-1 truncate">
-                    {PRIORITY_LABELS[localPriority] ?? `P${localPriority}`}
-                  </span>
-                  <LinearEditChipAdornment pending={priorityPending} />
-                </button>
-              </PopoverTrigger>
-              <PopoverContent className="w-36 p-1" align="start">
-                {[0, 1, 2, 3, 4].map((p) => (
-                  <button
-                    key={p}
-                    type="button"
-                    onClick={() => handlePriorityChange(String(p))}
-                    className={cn(
-                      LINEAR_EDIT_MENU_ITEM_WITH_ICON_CLASS,
-                      localPriority === p && 'bg-accent/50'
-                    )}
-                  >
-                    <LinearPriorityIcon priority={p} />
-                    {PRIORITY_LABELS[p]}
-                  </button>
-                ))}
-              </PopoverContent>
-            </Popover>
-
-            <Popover>
-              <PopoverTrigger asChild>
-                <button
-                  type="button"
-                  disabled={assigneePending}
-                  className={propertyRowClass}
-                  aria-busy={assigneePending || members.loading}
-                >
-                  {localAssignee?.avatarUrl ? (
-                    <img
-                      src={localAssignee.avatarUrl}
-                      alt=""
-                      className="size-4 shrink-0 rounded-full"
-                    />
-                  ) : (
-                    <UserRound className={propertyIconClass} />
-                  )}
-                  <span className="min-w-0 flex-1 truncate">
-                    {localAssignee
-                      ? localAssignee.displayName
-                      : translate('auto.components.LinearItemDrawer.866316f22c', 'Unassigned')}
-                  </span>
-                  <LinearEditChipAdornment loading={members.loading} pending={assigneePending} />
-                </button>
-              </PopoverTrigger>
-              <PopoverContent
-                className="popover-scroll-content scrollbar-sleek w-48 p-1"
-                align="start"
-              >
-                <div>
-                  <button
-                    type="button"
-                    onClick={() => handleAssigneeChange('__unassign__')}
-                    className={cn(LINEAR_EDIT_MENU_ITEM_CLASS, !localAssignee && 'bg-accent/50')}
-                  >
-                    {translate('auto.components.LinearItemDrawer.866316f22c', 'Unassigned')}
-                  </button>
-                  {members.error ? (
-                    <div className="px-2 py-3 text-center text-[12px] text-destructive">
-                      {members.error}
-                    </div>
-                  ) : members.loading ? (
-                    <div className="flex items-center gap-2 px-2 py-3 text-[12px] text-muted-foreground">
-                      <LoaderCircle className="size-3 animate-spin" />
-                      {translate('auto.components.LinearItemDrawer.b2376d0179', 'Loading members')}
-                    </div>
-                  ) : (
-                    members.data.map((m) => (
-                      <button
-                        key={m.id}
-                        type="button"
-                        onClick={() => handleAssigneeChange(m.id)}
-                        className={cn(
-                          LINEAR_EDIT_MENU_ITEM_CLASS,
-                          localAssignee?.id === m.id && 'bg-accent/50'
-                        )}
-                      >
-                        {m.displayName}
-                      </button>
-                    ))
-                  )}
-                </div>
-              </PopoverContent>
-            </Popover>
-
-            <Popover open={estimatePopoverOpen} onOpenChange={handleEstimatePopoverOpenChange}>
-              <PopoverTrigger asChild>
-                <button
-                  type="button"
-                  disabled={estimatePending}
-                  className={propertyRowClass}
-                  aria-busy={estimatePending}
-                >
-                  <Gauge className={propertyIconClass} />
-                  <span className="min-w-0 flex-1 truncate">
-                    {formatLinearEstimateLabel(localEstimate)}
-                  </span>
-                  <LinearEditChipAdornment pending={estimatePending} />
-                </button>
-              </PopoverTrigger>
-              <PopoverContent className="w-64 p-3" align="start">
-                <div className="space-y-3">
-                  <div className="grid grid-cols-5 gap-1.5">
-                    {LINEAR_ESTIMATE_PRESETS.map((estimate) => (
-                      <button
-                        key={estimate}
-                        type="button"
-                        onClick={() => handleEstimateChange(estimate)}
-                        className={cn(
-                          'flex h-8 items-center justify-center rounded-md border border-border text-sm hover:bg-accent',
-                          localEstimate === estimate && 'border-primary bg-accent text-foreground'
-                        )}
-                      >
-                        {estimate}
-                      </button>
-                    ))}
-                  </div>
-                  <Input
-                    value={estimateInput}
-                    onChange={(event) => setEstimateInput(event.target.value)}
-                    onKeyDown={(event) => {
-                      if (event.key === 'Enter') {
-                        event.preventDefault()
-                        handleEstimateSubmit()
-                      }
-                    }}
-                    inputMode="numeric"
-                    placeholder={translate(
-                      'auto.components.LinearItemDrawer.fbb90300e2',
-                      'Custom estimate'
-                    )}
-                    className="h-8 text-sm"
-                  />
-                  <div className="flex items-center justify-between gap-2">
-                    <Button
-                      type="button"
-                      variant="ghost"
-                      size="sm"
-                      onClick={() => handleEstimateChange(null)}
-                    >
-                      {translate('auto.components.LinearItemDrawer.ceeb8c6153', 'Clear')}
-                    </Button>
-                    <Button
-                      type="button"
-                      size="sm"
-                      onClick={handleEstimateSubmit}
-                      disabled={estimatePending}
-                    >
-                      {estimatePending ? <LoaderCircle className="size-3.5 animate-spin" /> : null}
-                      {translate('auto.components.LinearItemDrawer.b5675b0694', 'Save')}
-                    </Button>
-                  </div>
-                </div>
-              </PopoverContent>
-            </Popover>
-          </div>
-        </section>
-
-        <section className="rounded-xl border border-border/60 bg-card text-card-foreground shadow-xs">
-          <div className="flex h-10 items-center gap-1 border-b border-border/50 px-4 text-sm font-medium text-muted-foreground">
-            <span>{translate('auto.components.LinearItemDrawer.64bfffc4dd', 'Labels')}</span>
-            <ChevronDown className="size-3.5" />
-          </div>
-          <div className="p-3">
-            <Popover open={labelPopoverOpen} onOpenChange={setLabelPopoverOpen}>
-              <PopoverTrigger asChild>
-                <button
-                  type="button"
-                  disabled={labelsPending}
-                  className={propertyRowClass}
-                  aria-label={
-                    localLabels.length
-                      ? translate(
-                          'auto.components.LinearItemDrawer.7f7b89b631',
-                          'Labels: {{value0}}',
-                          { value0: localLabels.join(', ') }
-                        )
-                      : translate('auto.components.LinearItemDrawer.23886c7eec', 'Add label')
-                  }
-                  aria-busy={labelsPending || labels.loading}
-                >
-                  <Tag className={propertyIconClass} />
-                  <span className="min-w-0 flex-1 truncate">
-                    {localLabels.length
-                      ? labelSummary
-                      : translate('auto.components.LinearItemDrawer.23886c7eec', 'Add label')}
-                  </span>
-                  <LinearEditChipAdornment loading={labels.loading} pending={labelsPending} />
-                </button>
-              </PopoverTrigger>
-              <PopoverContent
-                className="popover-scroll-content scrollbar-sleek w-52 p-1"
-                align="start"
-              >
-                {labels.error ? (
-                  <div className="px-2 py-3 text-center text-[12px] text-destructive">
-                    {labels.error}
-                  </div>
-                ) : labels.loading ? (
-                  <div className="flex items-center gap-2 px-2 py-3 text-[12px] text-muted-foreground">
-                    <LoaderCircle className="size-3 animate-spin" />
-                    {translate('auto.components.LinearItemDrawer.cddd9b04a7', 'Loading labels')}
-                  </div>
-                ) : labels.data.length > 0 ? (
-                  <div>
-                    {labels.data.map((label) => (
-                      <button
-                        key={label.id}
-                        type="button"
-                        onClick={() => handleLabelToggle(label.id)}
-                        className={LINEAR_EDIT_MENU_ITEM_WITH_ICON_CLASS}
-                      >
-                        <span
-                          className={cn(
-                            'flex size-3.5 items-center justify-center rounded-sm border',
-                            localLabelIds.includes(label.id)
-                              ? 'border-primary bg-primary text-primary-foreground'
-                              : 'border-input'
-                          )}
-                        >
-                          {localLabelIds.includes(label.id) && checkIcon}
-                        </span>
-                        <span
-                          className="inline-block size-2 rounded-full"
-                          style={{ backgroundColor: label.color }}
-                        />
-                        {label.name}
-                      </button>
-                    ))}
-                  </div>
-                ) : (
-                  <div className="px-2 py-3 text-center text-[12px] text-muted-foreground">
-                    {translate('auto.components.LinearItemDrawer.367f828482', 'No labels found')}
-                  </div>
-                )}
-              </PopoverContent>
-            </Popover>
-          </div>
-        </section>
-      </div>
-    )
-  }
-
-  return (
-    <div className="flex flex-wrap items-center gap-x-3 gap-y-2 border-b border-border/60 px-4 py-2.5">
-      {/* Status */}
-      <Popover>
-        <PopoverTrigger asChild>
-          <button
-            type="button"
-            disabled={statePending}
-            className={LINEAR_EDIT_CHIP_CLASS}
-            style={getLinearStatePillStyle(localState.color)}
-            aria-busy={statePending || states.loading}
-          >
-            <span
-              className="inline-block size-2 shrink-0 rounded-full"
-              style={getLinearStateMarkerStyle(localState.color)}
-            />
-            <span className="truncate">{localState.name}</span>
-            <LinearEditChipAdornment loading={states.loading} pending={statePending} />
-          </button>
-        </PopoverTrigger>
-        <PopoverContent className="popover-scroll-content scrollbar-sleek w-48 p-1" align="start">
-          {states.error ? (
-            <div className="px-2 py-3 text-center text-[12px] text-destructive">{states.error}</div>
-          ) : states.loading ? (
-            <div className="flex items-center gap-2 px-2 py-3 text-[12px] text-muted-foreground">
-              <LoaderCircle className="size-3 animate-spin" />
-              {translate('auto.components.LinearItemDrawer.59b6cd3706', 'Loading states')}
-            </div>
-          ) : states.data.length > 0 ? (
-            <div>
-              {states.data.map((s) => (
-                <button
-                  key={s.id}
-                  type="button"
-                  onClick={() => handleStateChange(s.id)}
-                  className={cn(
-                    LINEAR_EDIT_MENU_ITEM_WITH_ICON_CLASS,
-                    currentStateId === s.id && 'bg-accent/50'
-                  )}
-                >
-                  <span
-                    className="inline-block size-2 rounded-full"
-                    style={{ backgroundColor: s.color }}
-                  />
-                  {s.name}
-                </button>
-              ))}
-            </div>
-          ) : (
-            <div className="px-2 py-3 text-center text-[12px] text-muted-foreground">
-              {translate('auto.components.LinearItemDrawer.780ea6ed89', 'No states found')}
-            </div>
-          )}
-        </PopoverContent>
-      </Popover>
-
-      {/* Priority */}
-      <Popover>
-        <PopoverTrigger asChild>
-          <button
-            type="button"
-            disabled={priorityPending}
-            className={LINEAR_EDIT_CHIP_CLASS}
-            aria-busy={priorityPending}
-          >
-            <LinearPriorityIcon priority={localPriority} />
-            <span className="truncate">
-              {PRIORITY_LABELS[localPriority] ?? `P${localPriority}`}
-            </span>
-            <LinearEditChipAdornment pending={priorityPending} />
-          </button>
-        </PopoverTrigger>
-        <PopoverContent className="w-36 p-1" align="start">
-          {[0, 1, 2, 3, 4].map((p) => (
-            <button
-              key={p}
-              type="button"
-              onClick={() => handlePriorityChange(String(p))}
-              className={cn(
-                LINEAR_EDIT_MENU_ITEM_WITH_ICON_CLASS,
-                localPriority === p && 'bg-accent/50'
-              )}
-            >
-              <LinearPriorityIcon priority={p} />
-              {PRIORITY_LABELS[p]}
-            </button>
-          ))}
-        </PopoverContent>
-      </Popover>
-
-      {/* Estimate */}
-      <Popover open={estimatePopoverOpen} onOpenChange={handleEstimatePopoverOpenChange}>
-        <PopoverTrigger asChild>
-          <button
-            type="button"
-            disabled={estimatePending}
-            className={LINEAR_EDIT_CHIP_CLASS}
-            aria-busy={estimatePending}
-          >
-            <span className="truncate">{formatLinearEstimateLabel(localEstimate)}</span>
-            <LinearEditChipAdornment pending={estimatePending} />
-          </button>
-        </PopoverTrigger>
-        <PopoverContent className="w-64 p-3" align="start">
-          <div className="space-y-3">
-            <div className="grid grid-cols-5 gap-1.5">
-              {LINEAR_ESTIMATE_PRESETS.map((estimate) => (
-                <button
-                  key={estimate}
-                  type="button"
-                  onClick={() => handleEstimateChange(estimate)}
-                  className={cn(
-                    'flex h-8 items-center justify-center rounded-md border border-border text-sm hover:bg-accent',
-                    localEstimate === estimate && 'border-primary bg-accent text-foreground'
-                  )}
-                >
-                  {estimate}
-                </button>
-              ))}
-            </div>
-            <Input
-              value={estimateInput}
-              onChange={(event) => setEstimateInput(event.target.value)}
-              onKeyDown={(event) => {
-                if (event.key === 'Enter') {
-                  event.preventDefault()
-                  handleEstimateSubmit()
-                }
-              }}
-              inputMode="numeric"
-              placeholder={translate(
-                'auto.components.LinearItemDrawer.fbb90300e2',
-                'Custom estimate'
-              )}
-              className="h-8 text-sm"
-            />
-            <div className="flex items-center justify-between gap-2">
-              <Button
-                type="button"
-                variant="ghost"
-                size="sm"
-                onClick={() => handleEstimateChange(null)}
-              >
-                {translate('auto.components.LinearItemDrawer.ceeb8c6153', 'Clear')}
-              </Button>
-              <Button
-                type="button"
-                size="sm"
-                onClick={handleEstimateSubmit}
-                disabled={estimatePending}
-              >
-                {estimatePending ? <LoaderCircle className="size-3.5 animate-spin" /> : null}
-                {translate('auto.components.LinearItemDrawer.b5675b0694', 'Save')}
-              </Button>
-            </div>
-          </div>
-        </PopoverContent>
-      </Popover>
-
-      {/* Assignee */}
-      <Popover>
-        <PopoverTrigger asChild>
-          <button
-            type="button"
-            disabled={assigneePending}
-            className={LINEAR_EDIT_CHIP_CLASS}
-            aria-busy={assigneePending || members.loading}
-          >
-            <span className="truncate">
-              {localAssignee
-                ? localAssignee.displayName
-                : translate('auto.components.LinearItemDrawer.d71cd3003e', '+ Assignee')}
-            </span>
-            <LinearEditChipAdornment loading={members.loading} pending={assigneePending} />
-          </button>
-        </PopoverTrigger>
-        <PopoverContent className="popover-scroll-content scrollbar-sleek w-48 p-1" align="start">
-          <div>
-            <button
-              type="button"
-              onClick={() => handleAssigneeChange('__unassign__')}
-              className={cn(LINEAR_EDIT_MENU_ITEM_CLASS, !localAssignee && 'bg-accent/50')}
-            >
-              {translate('auto.components.LinearItemDrawer.866316f22c', 'Unassigned')}
-            </button>
-            {members.error ? (
-              <div className="px-2 py-3 text-center text-[12px] text-destructive">
-                {members.error}
-              </div>
-            ) : members.loading ? (
-              <div className="flex items-center gap-2 px-2 py-3 text-[12px] text-muted-foreground">
-                <LoaderCircle className="size-3 animate-spin" />
-                {translate('auto.components.LinearItemDrawer.b2376d0179', 'Loading members')}
-              </div>
-            ) : (
-              members.data.map((m) => (
-                <button
-                  key={m.id}
-                  type="button"
-                  onClick={() => handleAssigneeChange(m.id)}
-                  className={cn(
-                    LINEAR_EDIT_MENU_ITEM_CLASS,
-                    localAssignee?.id === m.id && 'bg-accent/50'
-                  )}
-                >
-                  {m.displayName}
-                </button>
-              ))
-            )}
-          </div>
-        </PopoverContent>
-      </Popover>
-
-      {/* Labels */}
-      <Popover open={labelPopoverOpen} onOpenChange={setLabelPopoverOpen}>
-        <PopoverTrigger asChild>
-          <button
-            type="button"
-            disabled={labelsPending}
-            className={LINEAR_EDIT_CHIP_CLASS}
-            aria-label={
-              localLabels.length
-                ? translate('auto.components.LinearItemDrawer.7f7b89b631', 'Labels: {{value0}}', {
-                    value0: localLabels.join(', ')
-                  })
-                : translate('auto.components.LinearItemDrawer.23886c7eec', 'Add label')
-            }
-            aria-busy={labelsPending || labels.loading}
-          >
-            <span className="truncate">{labelSummary}</span>
-            <LinearEditChipAdornment loading={labels.loading} pending={labelsPending} />
-          </button>
-        </PopoverTrigger>
-        <PopoverContent className="popover-scroll-content scrollbar-sleek w-52 p-1" align="start">
-          {labels.error ? (
-            <div className="px-2 py-3 text-center text-[12px] text-destructive">{labels.error}</div>
-          ) : labels.loading ? (
-            <div className="flex items-center gap-2 px-2 py-3 text-[12px] text-muted-foreground">
-              <LoaderCircle className="size-3 animate-spin" />
-              {translate('auto.components.LinearItemDrawer.cddd9b04a7', 'Loading labels')}
-            </div>
-          ) : labels.data.length > 0 ? (
-            <div>
-              {labels.data.map((label) => (
-                <button
-                  key={label.id}
-                  type="button"
-                  onClick={() => handleLabelToggle(label.id)}
-                  className={LINEAR_EDIT_MENU_ITEM_WITH_ICON_CLASS}
-                >
-                  <span
-                    className={cn(
-                      'flex size-3.5 items-center justify-center rounded-sm border',
-                      localLabelIds.includes(label.id)
-                        ? 'border-primary bg-primary text-primary-foreground'
-                        : 'border-input'
-                    )}
-                  >
-                    {localLabelIds.includes(label.id) && checkIcon}
-                  </span>
-                  <span
-                    className="inline-block size-2 rounded-full"
-                    style={{ backgroundColor: label.color }}
-                  />
-                  {label.name}
-                </button>
-              ))}
-            </div>
-          ) : (
-            <div className="px-2 py-3 text-center text-[12px] text-muted-foreground">
-              {translate('auto.components.LinearItemDrawer.367f828482', 'No labels found')}
-            </div>
-          )}
-        </PopoverContent>
-      </Popover>
-    </div>
-  )
-}
-
-export type LinearLocalComment = { id: string; body: string; createdAt: string }
-
-export function LinearIssueCommentFooter({
-  issueId,
-  workspaceId,
-  onCommentAdded,
-  variant = 'compact',
-  sourceContext
-}: {
-  issueId: string
-  workspaceId?: string | null
-  onCommentAdded: (comment: LinearLocalComment) => void
-  variant?: 'compact' | 'linear-page'
-  sourceContext?: TaskSourceContext | null
-}): React.JSX.Element {
-  const settings = useAppStore((s) => s.settings)
-  const providerSettings = sourceContext ?? settings
-  const submitShortcutLabel = getScreenSubmitShortcutLabel()
-  const [body, setBody] = useState('')
-  const [submitting, setSubmitting] = useState(false)
-  const textareaRef = useRef<HTMLTextAreaElement>(null)
-  const mountedRef = useRef(true)
-
-  const handleFooterRef = useCallback((node: HTMLDivElement | null): void => {
-    // Why: comment submission can resolve after the footer unmounts; the root
-    // ref keeps that completion from writing stale local state without an Effect.
-    mountedRef.current = node !== null
-  }, [])
-
-  const autoGrow = useCallback(() => {
-    const el = textareaRef.current
-    if (!el) {
-      return
-    }
-    el.style.height = 'auto'
-    el.style.height = `${Math.min(el.scrollHeight, 96)}px`
-  }, [])
-
-  const handleSubmit = useCallback(async () => {
-    const bodyState = getCommentBodySubmitState(body)
-    if (bodyState.status === 'empty') {
-      return
-    }
-    if (bodyState.status === 'too-large-leading-whitespace') {
-      toast.error(
-        translate(
-          'auto.components.LinearItemDrawer.commentTooLarge',
-          'Comment is too large to submit safely.'
-        )
-      )
-      return
-    }
-    setSubmitting(true)
-    try {
-      const result = await linearAddIssueComment(
-        providerSettings,
-        issueId,
-        bodyState.body,
-        workspaceId
-      )
-      const typed = result as { ok: boolean; id?: string; error?: string }
-      if (!mountedRef.current) {
-        return
-      }
-      if (typed.ok) {
-        setBody('')
-        useAppStore.getState().recordFeatureInteraction('linear-tasks')
-        onCommentAdded({
-          id: typed.id ?? createBrowserUuid(),
-          body: bodyState.body,
-          createdAt: new Date().toISOString()
-        })
-      } else {
-        toast.error(
-          typed.error ??
-            translate('auto.components.LinearItemDrawer.6ab35eafd5', 'Failed to add comment')
-        )
-      }
-    } catch (err) {
-      if (mountedRef.current) {
-        toast.error(
-          err instanceof Error
-            ? err.message
-            : translate('auto.components.LinearItemDrawer.6ab35eafd5', 'Failed to add comment')
-        )
-      }
-    } finally {
-      if (mountedRef.current) {
-        setSubmitting(false)
-      }
-    }
-  }, [body, issueId, onCommentAdded, providerSettings, workspaceId])
-  const canSubmitComment = hasBoundedCommentBodyText(body)
-
-  const handleKeyDown = useCallback(
-    (e: React.KeyboardEvent) => {
-      if (isScreenSubmitShortcut(e)) {
-        e.preventDefault()
-        handleSubmit()
-      }
-    },
-    [handleSubmit]
-  )
-
-  if (variant === 'linear-page') {
-    return (
-      <div
-        ref={handleFooterRef}
-        className="rounded-xl border border-border/70 bg-background shadow-xs"
-      >
-        <textarea
-          ref={textareaRef}
-          value={body}
-          onChange={(e) => {
-            setBody(e.target.value)
-            autoGrow()
-          }}
-          onKeyDown={handleKeyDown}
-          placeholder={translate(
-            'auto.components.LinearItemDrawer.2820f0f0f0',
-            'Leave a comment...'
-          )}
-          rows={3}
-          className="scrollbar-sleek min-h-24 max-h-40 w-full resize-none overflow-y-auto rounded-t-xl bg-transparent px-5 py-4 text-sm placeholder:text-muted-foreground focus-visible:outline-none"
-        />
-        <div className="flex items-center justify-between px-4 pb-3">
-          <span className="text-[11px] text-muted-foreground">
-            {submitShortcutLabel !== 'Unassigned'
-              ? translate('auto.components.LinearItemDrawer.fda549766e', '{{value0}} to comment', {
-                  value0: submitShortcutLabel
-                })
-              : ''}
-          </span>
-          <Button
-            size="icon-sm"
-            onClick={handleSubmit}
-            disabled={!canSubmitComment || submitting}
-            aria-label={translate('auto.components.LinearItemDrawer.d369841269', 'Send comment')}
-          >
-            {submitting ? (
-              <LoaderCircle className="size-3.5 animate-spin" />
-            ) : (
-              <Send className="size-3.5" />
-            )}
-          </Button>
-        </div>
-      </div>
-    )
-  }
-
-  return (
-    <div
-      ref={handleFooterRef}
-      className="flex items-end gap-2 border-t border-border/60 bg-background/40 px-4 py-3"
-    >
-      <textarea
-        ref={textareaRef}
-        value={body}
-        onChange={(e) => {
-          setBody(e.target.value)
-          autoGrow()
-        }}
-        onKeyDown={handleKeyDown}
-        placeholder={translate('auto.components.LinearItemDrawer.2fcff829a8', 'Add a comment…')}
-        rows={1}
-        className="scrollbar-sleek min-h-[32px] max-h-[96px] flex-1 resize-none overflow-y-auto rounded-md border border-input bg-transparent px-3 py-2 text-[13px] placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
-      />
-      <Button
-        size="icon"
-        onClick={handleSubmit}
-        disabled={!canSubmitComment || submitting}
-        className="size-8 shrink-0"
-        aria-label={translate('auto.components.LinearItemDrawer.d369841269', 'Send comment')}
-      >
-        {submitting ? (
-          <LoaderCircle className="size-3.5 animate-spin" />
-        ) : (
-          <Send className="size-3.5" />
-        )}
-      </Button>
-    </div>
-  )
-}
-
-export function initLinearIssueEditState(issue: LinearIssue): LinearEditState {
-  return {
-    state: issue.state,
-    priority: issue.priority,
-    estimate: issue.estimate,
-    assignee: issue.assignee,
-    labelIds: issue.labelIds,
-    labels: issue.labels
-  }
-}
+export { LinearIssueEditSection } from '@/components/linear-item-drawer-edit-section'
+export { LinearIssueCommentFooter } from '@/components/linear-item-drawer-comment-footer'
+export { formatLinearEstimateLabel } from '@/components/linear-item-drawer-edit-controls'
+export { initLinearIssueEditState } from '@/components/linear-item-drawer-types'
+export type { LinearEditState, LinearLocalComment } from '@/components/linear-item-drawer-types'
 
 export default function LinearItemDrawer({
   issue,
@@ -1392,247 +182,20 @@ export default function LinearItemDrawer({
     openLinearIssueWorkspaceOrStart(displayed, () => onUse(displayed))
   }, [displayed, onUse])
 
-  return (
-    <Sheet open={issue !== null} onOpenChange={(open) => !open && onClose()}>
-      <SheetContent
-        side="right"
-        showCloseButton={false}
-        className="w-full p-0 sm:max-w-[640px]"
-        onOpenAutoFocus={(event) => {
-          event.preventDefault()
-        }}
-      >
-        <VisuallyHidden.Root asChild>
-          <SheetTitle>
-            {displayed?.title ??
-              translate('auto.components.LinearItemDrawer.39883467f4', 'Linear issue')}
-          </SheetTitle>
-        </VisuallyHidden.Root>
-        <VisuallyHidden.Root asChild>
-          <SheetDescription>
-            {translate(
-              'auto.components.LinearItemDrawer.04a442f796',
-              'Preview and edit the selected Linear issue.'
-            )}
-          </SheetDescription>
-        </VisuallyHidden.Root>
-
-        {displayed && (
-          <div className="flex h-full min-h-0 flex-col">
-            {/* Header */}
-            <div className="flex-none border-b border-border/60 px-4 py-3">
-              <div className="flex items-start gap-2">
-                <LinearIcon className="mt-1 size-4 shrink-0 text-muted-foreground" />
-                <div className="min-w-0 flex-1">
-                  <span className="font-mono text-[12px] text-muted-foreground">
-                    {displayed.identifier}
-                  </span>
-                  <div className="mt-1">
-                    <LinearIssueTextEditor
-                      issue={displayed}
-                      onIssueChange={handleIssueTextChange}
-                      density="drawer"
-                      fields="title"
-                      sourceContext={sourceContext}
-                    />
-                  </div>
-                  <div className="mt-1 flex flex-wrap items-center gap-x-2 gap-y-1 text-[11px] text-muted-foreground">
-                    {displayed.workspaceName && <span>{displayed.workspaceName}</span>}
-                    {displayed.team?.name && <span>{displayed.team.name}</span>}
-                    <span>· {formatRelativeTime(displayed.updatedAt)}</span>
-                  </div>
-                </div>
-                <div className="flex shrink-0 items-center gap-1">
-                  <Tooltip>
-                    <TooltipTrigger asChild>
-                      <Button
-                        variant="ghost"
-                        size="icon"
-                        className="size-7"
-                        onClick={() => window.api.shell.openUrl(displayed.url)}
-                        aria-label={translate(
-                          'auto.components.LinearItemDrawer.0190b760c1',
-                          'Open on Linear'
-                        )}
-                      >
-                        <ExternalLink className="size-4" />
-                      </Button>
-                    </TooltipTrigger>
-                    <TooltipContent side="bottom" sideOffset={6}>
-                      {translate('auto.components.LinearItemDrawer.0190b760c1', 'Open on Linear')}
-                    </TooltipContent>
-                  </Tooltip>
-                  <Tooltip>
-                    <TooltipTrigger asChild>
-                      <Button
-                        variant="ghost"
-                        size="icon"
-                        className="size-7"
-                        onClick={onClose}
-                        aria-label={translate(
-                          'auto.components.LinearItemDrawer.858d0630da',
-                          'Close preview'
-                        )}
-                      >
-                        <X className="size-4" />
-                      </Button>
-                    </TooltipTrigger>
-                    <TooltipContent side="bottom" sideOffset={6}>
-                      {translate('auto.components.LinearItemDrawer.9dc54172db', 'Close · Esc')}
-                    </TooltipContent>
-                  </Tooltip>
-                </div>
-              </div>
-            </div>
-
-            {/* Edit section */}
-            {editState && (
-              <LinearIssueEditSection
-                issue={displayed}
-                editState={editState}
-                onEditStateChange={handleEditStateChange}
-                sourceContext={sourceContext}
-              />
-            )}
-
-            {/* Body + comments */}
-            <div className="min-h-0 flex-1 overflow-y-auto scrollbar-sleek">
-              <div className="px-4 py-4">
-                <LinearIssueTextEditor
-                  issue={displayed}
-                  onIssueChange={handleIssueTextChange}
-                  density="drawer"
-                  fields="description"
-                  sourceContext={sourceContext}
-                />
-              </div>
-
-              <div className="border-t border-border/40 px-4 py-4">
-                <div className="flex items-center gap-2 pb-3">
-                  <span className="text-[13px] font-medium text-foreground">
-                    {translate('auto.components.LinearItemDrawer.fde849b2b6', 'Comments')}
-                  </span>
-                  {comments.length > 0 && (
-                    <span className="text-[12px] text-muted-foreground">{comments.length}</span>
-                  )}
-                </div>
-                {commentsLoading && comments.length === 0 ? (
-                  <div className="flex items-center justify-center py-6">
-                    <LoaderCircle className="size-4 animate-spin text-muted-foreground" />
-                  </div>
-                ) : comments.length === 0 ? (
-                  <p className="text-[13px] text-muted-foreground">
-                    {translate('auto.components.LinearItemDrawer.a4fcc57522', 'No comments yet.')}
-                  </p>
-                ) : (
-                  <div className="flex flex-col gap-3">
-                    {comments.map((comment) => (
-                      <div
-                        key={comment.id}
-                        className="rounded-lg border border-border/40 bg-background/30"
-                      >
-                        <div className="flex items-center gap-2 border-b border-border/40 px-3 py-2">
-                          {comment.user?.avatarUrl && (
-                            <img
-                              src={comment.user.avatarUrl}
-                              alt={comment.user.displayName}
-                              className="size-5 shrink-0 rounded-full"
-                            />
-                          )}
-                          <span className="text-[13px] font-semibold text-foreground">
-                            {comment.user?.displayName ??
-                              translate('auto.components.LinearItemDrawer.48e17e8cbd', 'Unknown')}
-                          </span>
-                          <span className="text-[12px] text-muted-foreground">
-                            · {formatRelativeTime(comment.createdAt)}
-                          </span>
-                        </div>
-                        <div className="px-3 py-2">
-                          <CommentMarkdown
-                            content={comment.body}
-                            className="text-[13px] leading-relaxed"
-                          />
-                        </div>
-                      </div>
-                    ))}
-                  </div>
-                )}
-              </div>
-            </div>
-
-            {/* Comment footer + Start/Open workspace */}
-            <LinearIssueCommentFooter
-              issueId={displayed.id}
-              workspaceId={displayed.workspaceId}
-              onCommentAdded={handleCommentAdded}
-              sourceContext={sourceContext}
-            />
-            <div className="flex-none space-y-2 border-t border-border/60 bg-background/40 px-4 py-3">
-              {attachedWorkspaceLabel ? (
-                <div className="flex min-w-0 items-center gap-1.5 text-[12px] text-muted-foreground">
-                  <FolderOpen className="size-3.5 shrink-0" />
-                  <span className="truncate">{attachedWorkspaceLabel}</span>
-                </div>
-              ) : null}
-              {attachedWorkspace ? (
-                <DropdownMenu modal={false}>
-                  <ButtonGroup className="w-full">
-                    <Button
-                      onClick={handleOpenOrUseIssue}
-                      className="flex-1 justify-center gap-2"
-                      aria-label={translate(
-                        'auto.components.LinearItemDrawer.openAttachedWorkspace',
-                        'Open workspace attached to issue'
-                      )}
-                    >
-                      <FolderOpen className="size-4" />
-                      {translate(
-                        'auto.components.LinearItemDrawer.openWorkspace',
-                        'Open workspace'
-                      )}
-                    </Button>
-                    <DropdownMenuTrigger asChild>
-                      <Button
-                        size="icon"
-                        aria-label={translate(
-                          'auto.components.LinearItemDrawer.moreWorkspaceActions',
-                          'More issue workspace actions'
-                        )}
-                      >
-                        <ChevronDown className="size-4" />
-                      </Button>
-                    </DropdownMenuTrigger>
-                  </ButtonGroup>
-                  <DropdownMenuContent align="end">
-                    <DropdownMenuItem onSelect={() => onUse(displayed)}>
-                      <Plus className="size-4" />
-                      {translate(
-                        'auto.components.LinearItemDrawer.startNewWorkspace',
-                        'Start new workspace'
-                      )}
-                    </DropdownMenuItem>
-                  </DropdownMenuContent>
-                </DropdownMenu>
-              ) : (
-                <Button
-                  onClick={handleOpenOrUseIssue}
-                  className="w-full justify-center gap-2"
-                  aria-label={translate(
-                    'auto.components.LinearItemDrawer.04008e6c46',
-                    'Start workspace from issue'
-                  )}
-                >
-                  {translate(
-                    'auto.components.LinearItemDrawer.04008e6c46',
-                    'Start workspace from issue'
-                  )}
-                  <ArrowRight className="size-4" />
-                </Button>
-              )}
-            </div>
-          </div>
-        )}
-      </SheetContent>
-    </Sheet>
-  )
+  return renderLinearItemDrawerSheet({
+    issue,
+    onClose,
+    displayed,
+    handleIssueTextChange,
+    sourceContext,
+    editState,
+    handleEditStateChange,
+    commentsLoading,
+    comments,
+    handleCommentAdded,
+    attachedWorkspaceLabel,
+    attachedWorkspace,
+    handleOpenOrUseIssue,
+    onUse
+  })
 }
diff --git a/src/renderer/src/components/TaskPage.tsx b/src/renderer/src/components/TaskPage.tsx
index 82e3680b2cf..06cd8e745c9 100644
--- a/src/renderer/src/components/TaskPage.tsx
+++ b/src/renderer/src/components/TaskPage.tsx
@@ -758,8 +758,8 @@ export default function TaskPage(): React.JSX.Element {
     // Hard guarantee (K4): always overlay pending after reconcile so list
     // fetch clobbers never paint unprotected coordinator fields.
     setPages((current) =>
-      reconcileTaskPagePagesWithWorkItemsCache(current, selectedWorkItemsCacheEntries).map((page) =>
-        page ? (overlayPendingOnTaskPagePages([page])[0] ?? []) : null
+      reconcileTaskPagePagesWithWorkItemsCache(current, selectedWorkItemsCacheEntries).map(
+        (page) => (page ? (overlayPendingOnTaskPagePages([page])[0] ?? []) : null)
       )
     )
   }, [githubMode, selectedWorkItemsCacheEntries, taskSource, setPages])
diff --git a/src/renderer/src/components/WorktreeJumpPalette.tsx b/src/renderer/src/components/WorktreeJumpPalette.tsx
index d729bc3cbef..4e39baf2bea 100644
--- a/src/renderer/src/components/WorktreeJumpPalette.tsx
+++ b/src/renderer/src/components/WorktreeJumpPalette.tsx
@@ -8,6 +8,7 @@ import React, {
   useRef,
   useState
 } from 'react'
+import { flushSync } from 'react-dom'
 import { useShallow } from 'zustand/react/shallow'
 import { useTranslation } from 'react-i18next'
 import { toast } from 'sonner'
@@ -42,7 +43,6 @@ import {
   CommandEmpty,
   CommandItem
 } from '@/components/ui/command'
-import { Button } from '@/components/ui/button'
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip'
 import { parseGitHubIssueOrPRNumber, parseGitHubIssueOrPRLink } from '@/lib/github-links'
 import { getLinkedWorkItemSuggestedName, getLinkedWorkItemWorkspaceName } from '@/lib/new-workspace'
@@ -568,7 +568,7 @@ function PaletteOpenTabPrimaryLine({
     <div className="flex min-w-0 items-center gap-2 overflow-hidden">
       <span
         data-slot="palette-open-tab-title"
-        className="min-w-0 truncate text-[14px] font-semibold tracking-[-0.01em] text-foreground"
+        className="min-w-0 flex-1 truncate text-[14px] font-semibold tracking-[-0.01em] text-foreground"
       >
         <HighlightedText text={title} matchRanges={titleRanges} />
       </span>
@@ -2022,13 +2022,11 @@ function WorktreeJumpPaletteContent({
       fetchLinearIssue: state.fetchLinearIssue
     })
       .catch(() => null)
-      .then(
-        (issue): CmdJLinearIssuePreview => ({
-          ...pendingPreview,
-          issue,
-          loading: false
-        })
-      )
+      .then((issue): CmdJLinearIssuePreview => ({
+        ...pendingPreview,
+        issue,
+        loading: false
+      }))
     linearIssueLookupRef.current = { query: createWorktreeName, promise }
     void promise.then((preview) => {
       if (linearIssueLookupGenerationRef.current === generation) {
@@ -2077,13 +2075,11 @@ function WorktreeJumpPaletteContent({
       sourceContext
     })
       .catch(() => null)
-      .then(
-        (item): CmdJGitHubWorkItemPreview => ({
-          ...pendingPreview,
-          item: item ?? null,
-          loading: false
-        })
-      )
+      .then((item): CmdJGitHubWorkItemPreview => ({
+        ...pendingPreview,
+        item: item ?? null,
+        loading: false
+      }))
     githubLookupRef.current = { query: createWorktreeName, promise }
     void promise.then((preview) => {
       if (githubLookupGenerationRef.current === generation) {
@@ -3262,30 +3258,33 @@ function WorktreeJumpPaletteContent({
               }
 
               if (entry.type === 'hint') {
-                // Why: plain div (not CommandItem) so cmdk can't select it; arrow keys skip it via selectableItems.
                 return (
-                  <div
+                  <CommandItem
                     key={renderKey}
-                    className="mx-0.5 mt-1 flex items-center gap-2 px-3 py-1.5 text-[12px] text-muted-foreground"
+                    value={renderKey}
+                    onSelect={() => {
+                      const previousIndex = selectionItemIds.indexOf(renderKey)
+                      flushSync(() => entry.onSeeMore?.())
+                      const expandedItemId = Array.from(
+                        listRef.current?.querySelectorAll<HTMLElement>('[cmdk-item]') ?? []
+                      )[previousIndex]?.getAttribute('data-value')
+                      if (expandedItemId) {
+                        setSelectedItemId(expandedItemId)
+                      }
+                      inputRef.current?.focus()
+                    }}
+                    className={cn(
+                      JUMP_PALETTE_ITEM_CLASSNAME,
+                      'mt-1 min-h-0 gap-2 py-1.5 text-[12px] text-muted-foreground'
+                    )}
                   >
                     <span className="truncate">{entry.label}</span>
                     {entry.onSeeMore ? (
-                      <Button
-                        type="button"
-                        variant="outline"
-                        size="xs"
-                        className="h-6 shrink-0 px-2 text-xs font-medium text-foreground hover:bg-accent"
-                        onClick={(event) => {
-                          event.preventDefault()
-                          event.stopPropagation()
-                          entry.onSeeMore?.()
-                          inputRef.current?.focus()
-                        }}
-                      >
+                      <span className="h-6 shrink-0 rounded-md border border-input bg-background px-2 text-xs font-medium leading-6 text-foreground">
                         {translate('worktreeJumpPalette.seeMore', 'See more')}
-                      </Button>
+                      </span>
                     ) : null}
-                  </div>
+                  </CommandItem>
                 )
               }
 
diff --git a/src/renderer/src/components/activity/ActivityPrototypePage.tsx b/src/renderer/src/components/activity/ActivityPrototypePage.tsx
index dcc068d88f8..59fa8a0f1a0 100644
--- a/src/renderer/src/components/activity/ActivityPrototypePage.tsx
+++ b/src/renderer/src/components/activity/ActivityPrototypePage.tsx
@@ -1,52 +1,8 @@
-/* eslint-disable max-lines -- Why: prototype keeps the real-data adapter and visual skeleton together until a refinement pass splits them into modules. */
 import React, { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react'
 import { useShallow } from 'zustand/react/shallow'
-import {
-  Bell,
-  BellDot,
-  ExternalLink,
-  MessageSquareText,
-  MoreVertical,
-  Search,
-  TerminalSquare
-} from 'lucide-react'
-
-import { AgentStateDot, agentStateLabel, type AgentDotState } from '@/components/AgentStateDot'
-import { AgentIcon } from '@/lib/agent-catalog'
-import {
-  agentTypeToIconAgent,
-  formatAgentTypeLabel,
-  isExplicitAgentStatusFresh
-} from '@/lib/agent-status'
-import { activateTabAndFocusPane } from '@/lib/activate-tab-and-focus-pane'
-import { activateAndRevealWorktree } from '@/lib/worktree-activation'
-import { useAppStore } from '@/store'
-import type { RetainedAgentEntry } from '@/store/slices/agent-status'
-import { getRepoMapFromState, getWorktreeMapFromState } from '@/store/selectors'
 import { useSidebarResize } from '@/hooks/useSidebarResize'
-import { Button } from '@/components/ui/button'
-import { RepoBadgeMark } from '@/components/repo/RepoBadgeLabel'
-import {
-  DropdownMenu,
-  DropdownMenuCheckboxItem,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuSeparator,
-  DropdownMenuTrigger
-} from '@/components/ui/dropdown-menu'
-import { Input } from '@/components/ui/input'
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue
-} from '@/components/ui/select'
-import { Toggle } from '@/components/ui/toggle'
-import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
-import { cn } from '@/lib/utils'
-import { FilledBellIcon } from '../sidebar/WorktreeCardHelpers'
-import CommentMarkdown from '../sidebar/CommentMarkdown'
+import { useAppStore } from '@/store'
+import { getRepoMapFromState, getWorktreeMapFromState } from '@/store/selectors'
 import {
   setActivityTerminalPortals,
   type ActivityTerminalPortalTarget
@@ -55,1375 +11,29 @@ import {
   reconcileActivityPortalThreads,
   resolveActivityPortalSwap
 } from './activity-portal-thread-reconciliation'
+import { buildActivityEvents } from './activity-event-builder'
+import { buildAgentPaneThreads } from './activity-thread-builder'
 import {
-  ACTIVITY_PORTAL_READINESS_BURST_WINDOW_MS,
-  createActivityPortalReadinessLatch,
-  type ActivityPortalReadinessLatch,
-  type ActivityPortalReadinessStatus
-} from './activity-portal-readiness-oscillation'
-import type { Repo } from '../../../../shared/repo-types'
-import type { TerminalTab } from '../../../../shared/terminal-tab-types'
-import type { Worktree } from '../../../../shared/worktree/types'
-import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../shared/constants'
+  activityThreadMatchesSearchQuery,
+  buildActivityThreadGroups,
+  isActivitySearchQueryTooLarge
+} from './activity-thread-grouping'
+import { handleActivityFilterFocusShortcut } from './activity-filter-focus-shortcut'
+import { createActivityThreadActions } from './activity-thread-actions'
+import { ActivityThreadListPane } from './activity-thread-list-pane'
+import { ActivityThreadDetailPane } from './activity-thread-detail-pane'
 import {
-  AGENT_STATUS_STALE_AFTER_MS,
-  type AgentStateHistoryEntry,
-  type AgentStatusEntry,
-  type AgentStatusState,
-  type AgentType,
-  type MigrationUnsupportedPtyEntry
-} from '../../../../shared/agent-status-types'
-import { parsePaneKey } from '../../../../shared/stable-pane-id'
-import { isClipboardTextByteLengthOverLimit } from '../../../../shared/clipboard-text'
-import { migrationUnsupportedToAgentStatusEntry } from '@/lib/migration-unsupported-agent-entry'
-import { translate } from '@/i18n/i18n'
-import { formatUiRelativeTime } from '@/i18n/relative-time-format'
-import {
-  getActivityThreadTaskTitle,
-  getActivityThreadWorkspaceTitle,
-  resolveActivityThreadStatusPreview
-} from '@/lib/activity-thread-display'
-import { getAgentRowPrimaryText } from '@/lib/agent-row-primary-text'
-
-type ThreadReadFilter = 'all' | 'unread'
-type ActivityGroupBy = 'status' | 'project' | 'worktree' | 'agent'
-type ActivityEventState = Extract<AgentStatusState, 'done' | 'blocked' | 'waiting'>
-type ActivityHookLiveAgentState = Extract<AgentStatusState, 'working' | 'blocked' | 'waiting'>
-type ActivityLiveAgentState = ActivityHookLiveAgentState | 'monitoring'
-type ActivityStatusGroupId =
-  | 'working'
-  | 'monitoring'
-  | 'blocked'
-  | 'waiting'
-  | 'done'
-  | 'interrupted'
-
-type ActivityEvent = {
-  id: string
-  state: ActivityEventState
-  timestamp: number
-  worktree: Worktree
-  repo: Repo | null
-  entry: AgentStatusEntry
-  tab: TerminalTab
-  agentType: AgentType
-  agentAlive: boolean
-  migrationUnsupportedPtyId?: string
-  unread: boolean
-}
-
-type ActivityLiveAgentSnapshot = {
-  state: ActivityLiveAgentState
-  timestamp: number
-  worktree: Worktree
-  repo: Repo | null
-  entry: AgentStatusEntry
-  tab: TerminalTab
-  agentType: AgentType
-}
-
-// Why: keyed per agent pane (tab + leaf id), not per workspace, so the list shows one row per agent; paneKey is `${tabId}:${leafId}`.
-type AgentPaneThread = {
-  paneKey: string
-  paneTitle: string
-  worktree: Worktree
-  repo: Repo | null
-  tab: TerminalTab
-  agentType: AgentType
-  currentAgentState: ActivityLiveAgentState | null
-  currentAgentEntry: AgentStatusEntry | null
-  responsePreview: string
-  latestTimestamp: number
-  latestEvent: ActivityEvent | null
-  events: ActivityEvent[]
-  migrationUnsupportedPtyId?: string
-  unread: boolean
-}
-
-type ActivityThreadGroup = {
-  key: string
-  id?: ActivityStatusGroupId
-  label: string
-  state?: AgentDotState
-  threads: AgentPaneThread[]
-}
-
-type ActivityTerminalPortalReadiness = {
-  target: HTMLElement | null
-  paneKey: string | null
-  status: ActivityPortalReadinessStatus
-}
-
-type ActivityTerminalPortalDomStatus = {
-  ready: boolean
-  unavailable: boolean
-}
-
-type ActivityTerminalPortalSlotId = 'primary' | 'secondary'
-
-const ACTIVITY_TERMINAL_LOADING_LABEL_DELAY_MS = 180
-const ACTIVITY_THREAD_RESPONSE_RENDER_PREVIEW_MAX_LENGTH = 320
-const ACTIVITY_STATUS_GROUP_ORDER: ActivityStatusGroupId[] = [
-  'working',
-  'monitoring',
-  'blocked',
-  'waiting',
-  'done',
-  'interrupted'
-]
-const STANDALONE_ACTIVITY_WORKTREE_REPO_ID = '__activity_standalone__'
-
-const absoluteDateFormatter = new Intl.DateTimeFormat(undefined, {
-  year: 'numeric',
-  month: 'short',
-  day: 'numeric',
-  hour: 'numeric',
-  minute: '2-digit'
-})
-
-function formatAbsoluteDate(timestamp: number): string {
-  return absoluteDateFormatter.format(new Date(timestamp))
-}
-
-function formatRelativeTime(timestamp: number): string {
-  return formatUiRelativeTime(timestamp - Date.now())
-}
-
-function findActivityTerminalPane(
-  root: HTMLElement,
-  leafId: string
-): { foundAnyPane: boolean; pane: HTMLElement | null } {
-  let foundAnyPane = false
-  for (const candidate of root.querySelectorAll<HTMLElement>('[data-leaf-id]')) {
-    foundAnyPane = true
-    if (candidate.dataset.leafId === leafId) {
-      return { foundAnyPane, pane: candidate }
-    }
-  }
-  return { foundAnyPane, pane: null }
-}
-
-function hasInlineDisplayNoneBetween(element: HTMLElement, root: HTMLElement): boolean {
-  let current: HTMLElement | null = element
-  while (current) {
-    if (current.style.display === 'none') {
-      return true
-    }
-    if (current === root) {
-      return false
-    }
-    current = current.parentElement
-  }
-  return false
-}
-
-function hasUnhiddenSiblingPane(root: HTMLElement, selectedPane: HTMLElement): boolean {
-  for (const candidate of root.querySelectorAll<HTMLElement>('[data-leaf-id]')) {
-    if (candidate !== selectedPane && !hasInlineDisplayNoneBetween(candidate, root)) {
-      return true
-    }
-  }
-  return false
-}
-
-function truncatePreservingSurrogates(value: string, maxLength: number): string {
-  if (value.length <= maxLength) {
-    return value
-  }
-  const truncated = value.slice(0, maxLength)
-  const lastCode = truncated.charCodeAt(truncated.length - 1)
-  if (lastCode >= 0xd800 && lastCode <= 0xdbff) {
-    return truncated.slice(0, -1)
-  }
-  return truncated
-}
-
-export function activityThreadResponseRenderPreview({
-  responsePreview
-}: {
-  responsePreview: string
-}): string {
-  const trimmed = responsePreview.trim()
-  if (trimmed.length <= ACTIVITY_THREAD_RESPONSE_RENDER_PREVIEW_MAX_LENGTH) {
-    return trimmed
-  }
-  return `${truncatePreservingSurrogates(
-    trimmed,
-    ACTIVITY_THREAD_RESPONSE_RENDER_PREVIEW_MAX_LENGTH
-  ).trimEnd()}...`
-}
-
-function getSelectedActivityTerminalPortalStatus(
-  target: HTMLElement,
-  paneKey: string
-): ActivityTerminalPortalDomStatus {
-  const parsed = parsePaneKey(paneKey)
-  if (!parsed) {
-    return { ready: false, unavailable: true }
-  }
-  let selectedRoot: HTMLElement | null = null
-  for (const candidate of target.querySelectorAll<HTMLElement>('[data-terminal-tab-id]')) {
-    if (candidate.dataset.terminalTabId === parsed.tabId) {
-      selectedRoot = candidate
-      break
-    }
-  }
-  if (!selectedRoot) {
-    return { ready: false, unavailable: false }
-  }
-
-  const { foundAnyPane, pane: selectedPane } = findActivityTerminalPane(selectedRoot, parsed.leafId)
-  if (!selectedPane) {
-    return { ready: false, unavailable: foundAnyPane }
-  }
-
-  const unavailable = hasInlineDisplayNoneBetween(selectedPane, selectedRoot)
-  const hasUnisolatedSibling = hasUnhiddenSiblingPane(selectedRoot, selectedPane)
-  const isVisibleRoot =
-    !unavailable && (selectedPane.offsetParent !== null || selectedPane.getClientRects().length > 0)
-  const hasPtyBinding =
-    selectedPane.hasAttribute('data-pty-id') ||
-    selectedPane.querySelector<HTMLElement>('[data-pty-id]') !== null
-  const hasXtermScreen = selectedPane.querySelector<HTMLElement>('.xterm-screen') !== null
-  return {
-    ready: isVisibleRoot && !hasUnisolatedSibling && hasPtyBinding && hasXtermScreen,
-    unavailable
-  }
-}
-
-export function useActivityTerminalPortalStatus(
-  target: HTMLElement | null,
-  paneKey: string | null,
-  forceUnavailable = false
-): ActivityTerminalPortalReadiness['status'] {
-  const [readiness, setReadiness] = useState<ActivityTerminalPortalReadiness>({
-    target: null,
-    paneKey: null,
-    status: 'loading'
-  })
-  // Why: portal churn replaces every subscription identity, so the burst budget must outlive it.
-  const readinessLatchRef = useRef<ActivityPortalReadinessLatch | null>(null)
-
-  useLayoutEffect(() => {
-    let disposed = false
-    let readinessFrame: number | null = null
-    let readinessReleaseTimer: number | null = null
-    let pendingStatus: ActivityTerminalPortalReadiness['status'] | null = null
-
-    // Why: coalesce observer bursts and cancel frames from stale portal subscriptions.
-    const scheduleReadiness = (status: ActivityTerminalPortalReadiness['status']): void => {
-      if (disposed) {
-        return
-      }
-      pendingStatus = status
-      if (readinessFrame !== null) {
-        return
-      }
-      readinessFrame = requestAnimationFrame(() => {
-        readinessFrame = null
-        const nextStatus = pendingStatus
-        pendingStatus = null
-        if (disposed || nextStatus === null) {
-          return
-        }
-        setReadiness((prev) =>
-          prev.target === target && prev.paneKey === paneKey && prev.status === nextStatus
-            ? prev
-            : { target, paneKey, status: nextStatus }
-        )
-      })
-    }
-
-    const disposeFrame = (): void => {
-      disposed = true
-      if (readinessFrame !== null) {
-        cancelAnimationFrame(readinessFrame)
-        readinessFrame = null
-      }
-      if (readinessReleaseTimer !== null) {
-        window.clearTimeout(readinessReleaseTimer)
-        readinessReleaseTimer = null
-      }
-    }
-
-    if (!target || !paneKey) {
-      scheduleReadiness('loading')
-      return disposeFrame
-    }
-    if (forceUnavailable) {
-      scheduleReadiness('unavailable')
-      return disposeFrame
-    }
-
-    const readinessLatch = (readinessLatchRef.current ??= createActivityPortalReadinessLatch())
-
-    const updateReadiness = (status: ActivityTerminalPortalReadiness['status']): void => {
-      const nextStatus = readinessLatch.next(status)
-      scheduleReadiness(nextStatus)
-      if (readinessReleaseTimer !== null) {
-        window.clearTimeout(readinessReleaseTimer)
-        readinessReleaseTimer = null
-      }
-      if (nextStatus !== status) {
-        // Why: a quiet loading pane has no mutation to release the burst latch on its own.
-        readinessReleaseTimer = window.setTimeout(
-          checkReadiness,
-          ACTIVITY_PORTAL_READINESS_BURST_WINDOW_MS
-        )
-      }
-    }
-
-    const checkReadiness = (): void => {
-      const status = getSelectedActivityTerminalPortalStatus(target, paneKey)
-      if (status.unavailable) {
-        updateReadiness('unavailable')
-        return
-      }
-      if (status.ready) {
-        updateReadiness('ready')
-        return
-      }
-      updateReadiness('loading')
-    }
-
-    checkReadiness()
-
-    const observer = new MutationObserver(checkReadiness)
-    observer.observe(target, {
-      childList: true,
-      subtree: true,
-      attributes: true,
-      attributeFilter: ['data-terminal-tab-id', 'data-leaf-id', 'data-pty-id', 'style']
-    })
-
-    return () => {
-      disposeFrame()
-      observer.disconnect()
-    }
-  }, [target, paneKey, forceUnavailable])
-
-  return readiness.target === target && readiness.paneKey === paneKey ? readiness.status : 'loading'
-}
-
-function otherActivityTerminalSlot(
-  slotId: ActivityTerminalPortalSlotId
-): ActivityTerminalPortalSlotId {
-  return slotId === 'primary' ? 'secondary' : 'primary'
-}
-
-function useActivityTerminalLoadingLabel(loading: boolean): boolean {
-  const [visible, setVisible] = useState(false)
-  const [visibleLoading, setVisibleLoading] = useState(loading)
-
-  if (visibleLoading !== loading) {
-    setVisibleLoading(loading)
-    if (visible) {
-      setVisible(false)
-    }
-  }
-
-  useEffect(() => {
-    if (!loading) {
-      return
-    }
-    const timer = setTimeout(() => setVisible(true), ACTIVITY_TERMINAL_LOADING_LABEL_DELAY_MS)
-    return () => clearTimeout(timer)
-  }, [loading])
-
-  return loading && visible
-}
-
-function agentTitle(event: ActivityEvent): string {
-  if (event.state === 'done') {
-    return event.entry.interrupted ? 'Agent interrupted' : 'Agent finished'
-  }
-  return event.state === 'waiting' ? 'Agent waiting for input' : 'Agent needs input'
-}
-
-function agentSummary(event: ActivityEvent): string {
-  const prompt = getAgentRowPrimaryText(event.entry)
-  if (event.state === 'done') {
-    const message = event.entry.lastAssistantMessage?.trim()
-    return message || prompt || 'Completed the current turn.'
-  }
-  return prompt || event.entry.lastAssistantMessage?.trim() || 'The agent paused for user input.'
-}
-
-function agentMeta(event: ActivityEvent): string {
-  const agent = formatAgentTypeLabel(event.agentType)
-  if (event.state === 'done') {
-    return event.entry.interrupted ? `${agent} interrupted` : `${agent} completed`
-  }
-  return event.state === 'waiting' ? `${agent} waiting` : `${agent} blocked`
-}
-
-// Why: rows need a stable task identity across follow-up turns; the live turn prompt ("yes", "ok proceed") must not replace the task title.
-function paneTitleForEntry(
-  entry: AgentStatusEntry,
-  tab: TerminalTab,
-  generatedTitlesEnabled: boolean
-): string {
-  return getActivityThreadTaskTitle({ entry, tab, generatedTitlesEnabled })
-}
-
-function paneTitleForEvent(event: ActivityEvent, generatedTitlesEnabled: boolean): string {
-  return paneTitleForEntry(event.entry, event.tab, generatedTitlesEnabled)
-}
-
-function statusPreviewForEntry(
-  entry: AgentStatusEntry,
-  agentState?: AgentStatusState | null,
-  previousPreview?: string
-): string {
-  return resolveActivityThreadStatusPreview(entry, agentState, previousPreview)
-}
-
-function isActivityEventState(state: AgentStatusState): state is ActivityEventState {
-  return state === 'done' || state === 'blocked' || state === 'waiting'
-}
-
-function isActivityHookLiveAgentState(
-  state: AgentStatusState
-): state is ActivityHookLiveAgentState {
-  return state === 'working' || state === 'blocked' || state === 'waiting'
-}
-
-function freshActivityLiveAgentState(
-  entry: AgentStatusEntry,
-  now: number
-): ActivityLiveAgentState | null {
-  if (
-    !isActivityHookLiveAgentState(entry.state) ||
-    !isExplicitAgentStatusFresh(entry, now, AGENT_STATUS_STALE_AFTER_MS)
-  ) {
-    return null
-  }
-  return entry.state === 'working' && entry.workingMode === 'monitoring'
-    ? 'monitoring'
-    : entry.state
-}
-
-function standaloneActivityWorktree(worktreeId: string): Worktree {
-  const displayName =
-    worktreeId === FLOATING_TERMINAL_WORKTREE_ID ? 'Floating terminal' : 'Standalone terminal'
-  return {
-    id: worktreeId,
-    repoId: STANDALONE_ACTIVITY_WORKTREE_REPO_ID,
-    path: '',
-    head: '',
-    branch: displayName,
-    isBare: false,
-    isMainWorktree: false,
-    displayName,
-    comment: '',
-    linkedIssue: null,
-    linkedPR: null,
-    linkedLinearIssue: null,
-    isArchived: false,
-    isUnread: false,
-    isPinned: false,
-    sortOrder: 0,
-    lastActivityAt: 0
-  }
-}
-
-// Why: per-pane cap guarantees each agent appears in the left list even when one pane has a long history.
-const EVENTS_PER_PANE_CAP = 5
-
-function historyEntrySnapshot(
-  entry: AgentStatusEntry,
-  history: AgentStateHistoryEntry
-): AgentStatusEntry {
-  return {
-    ...entry,
-    state: history.state,
-    prompt: history.prompt,
-    updatedAt: history.startedAt,
-    stateStartedAt: history.startedAt,
-    stateHistory: [],
-    toolName: undefined,
-    toolInput: undefined,
-    lastAssistantMessage: undefined,
-    interrupted: history.interrupted
-  }
-}
-
-function appendActivityEvent(args: {
-  events: ActivityEvent[]
-  seenEventIds: Set<string>
-  state: ActivityEventState
-  timestamp: number
-  worktree: Worktree
-  repo: Repo | null
-  entry: AgentStatusEntry
-  tab: TerminalTab
-  agentType: AgentType
-  agentAlive: boolean
-  acknowledgedAt: number
-  migrationUnsupportedPtyId?: string
-}): void {
-  const id = `agent:${args.entry.paneKey}:${args.state}:${args.timestamp}`
-  if (args.seenEventIds.has(id)) {
-    return
-  }
-  args.seenEventIds.add(id)
-  args.events.push({
-    id,
-    state: args.state,
-    timestamp: args.timestamp,
-    worktree: args.worktree,
-    repo: args.repo,
-    entry: args.entry,
-    tab: args.tab,
-    agentType: args.agentType,
-    agentAlive: args.agentAlive,
-    migrationUnsupportedPtyId: args.migrationUnsupportedPtyId,
-    unread: args.acknowledgedAt < args.timestamp
-  })
-}
-
-function appendActivityEventsForEntry(args: {
-  events: ActivityEvent[]
-  seenEventIds: Set<string>
-  entry: AgentStatusEntry
-  worktree: Worktree
-  repo: Repo | null
-  tab: TerminalTab
-  agentType: AgentType
-  agentAlive: boolean
-  acknowledgedAt: number
-  migrationUnsupportedPtyId?: string
-}): void {
-  // Why: Activity is append-only; when a pane continues (done→working), stateHistory is the only record of the previous done/blocking event.
-  for (const history of args.entry.stateHistory) {
-    if (!isActivityEventState(history.state)) {
-      continue
-    }
-    appendActivityEvent({
-      ...args,
-      state: history.state,
-      timestamp: history.startedAt,
-      entry: historyEntrySnapshot(args.entry, history)
-    })
-  }
-
-  // Why: SessionStart creates an idle row, not an "Agent finished" activity event (STA-3386).
-  if (!isActivityEventState(args.entry.state) || args.entry.sessionBoundary === true) {
-    return
-  }
-  appendActivityEvent({
-    ...args,
-    state: args.entry.state,
-    timestamp: args.entry.stateStartedAt
-  })
-}
-
-export function buildActivityEvents(args: {
-  agentStatusByPaneKey: Record<string, AgentStatusEntry>
-  migrationUnsupportedByPtyId?: Record<string, MigrationUnsupportedPtyEntry>
-  retainedAgentsByPaneKey: Record<string, RetainedAgentEntry>
-  tabsByWorktree: Record<string, TerminalTab[]>
-  worktreeMap: Map<string, Worktree>
-  repoMap: Map<string, Repo>
-  acknowledgedAgentsByPaneKey: Record<string, number>
-  now: number
-}): {
-  events: ActivityEvent[]
-  liveAgentByPaneKey: Record<string, ActivityLiveAgentSnapshot>
-} {
-  const events: ActivityEvent[] = []
-  const seenEventIds = new Set<string>()
-  const tabContext = new Map<string, { worktree: Worktree; tab: TerminalTab }>()
-  const liveAgentByPaneKey: Record<string, ActivityLiveAgentSnapshot> = {}
-
-  for (const [worktreeId, tabs] of Object.entries(args.tabsByWorktree)) {
-    const worktree = args.worktreeMap.get(worktreeId) ?? standaloneActivityWorktree(worktreeId)
-    for (const tab of tabs) {
-      tabContext.set(tab.id, { worktree, tab })
-    }
-  }
-
-  for (const [paneKey, entry] of Object.entries(args.agentStatusByPaneKey)) {
-    const parsed = parsePaneKey(paneKey)
-    if (!parsed) {
-      continue
-    }
-    const context = tabContext.get(parsed.tabId)
-    if (!context) {
-      continue
-    }
-    const ackAt = args.acknowledgedAgentsByPaneKey[paneKey] ?? 0
-    // Why: live status is separate from history; a fresh working turn updates the thread without counting as an unread done/blocked/waiting event.
-    const liveState = freshActivityLiveAgentState(entry, args.now)
-    if (liveState) {
-      liveAgentByPaneKey[paneKey] = {
-        state: liveState,
-        timestamp: entry.stateStartedAt,
-        worktree: context.worktree,
-        repo: args.repoMap.get(context.worktree.repoId) ?? null,
-        entry,
-        tab: context.tab,
-        agentType: entry.agentType ?? 'unknown'
-      }
-    }
-    appendActivityEventsForEntry({
-      events,
-      seenEventIds,
-      worktree: context.worktree,
-      repo: args.repoMap.get(context.worktree.repoId) ?? null,
-      entry,
-      tab: context.tab,
-      agentType: entry.agentType ?? 'unknown',
-      agentAlive: true,
-      acknowledgedAt: ackAt
-    })
-  }
-
-  for (const unsupported of Object.values(args.migrationUnsupportedByPtyId ?? {})) {
-    const entry = migrationUnsupportedToAgentStatusEntry(unsupported)
-    if (!entry) {
-      continue
-    }
-    const parsed = parsePaneKey(entry.paneKey)
-    if (!parsed) {
-      continue
-    }
-    const context = tabContext.get(parsed.tabId)
-    if (!context) {
-      continue
-    }
-    const ackAt = args.acknowledgedAgentsByPaneKey[entry.paneKey] ?? 0
-    liveAgentByPaneKey[entry.paneKey] = {
-      state: 'blocked',
-      timestamp: entry.stateStartedAt,
-      worktree: context.worktree,
-      repo: args.repoMap.get(context.worktree.repoId) ?? null,
-      entry,
-      tab: context.tab,
-      agentType: entry.agentType ?? 'unknown'
-    }
-    appendActivityEventsForEntry({
-      events,
-      seenEventIds,
-      worktree: context.worktree,
-      repo: args.repoMap.get(context.worktree.repoId) ?? null,
-      entry,
-      tab: context.tab,
-      agentType: entry.agentType ?? 'unknown',
-      agentAlive: false,
-      acknowledgedAt: ackAt,
-      migrationUnsupportedPtyId: unsupported.ptyId
-    })
-  }
-
-  for (const [paneKey, retained] of Object.entries(args.retainedAgentsByPaneKey)) {
-    if (!parsePaneKey(paneKey)) {
-      continue
-    }
-    const worktree =
-      args.worktreeMap.get(retained.worktreeId) ??
-      (args.tabsByWorktree[retained.worktreeId]
-        ? standaloneActivityWorktree(retained.worktreeId)
-        : null)
-    if (!worktree) {
-      continue
-    }
-    const ackAt = args.acknowledgedAgentsByPaneKey[paneKey] ?? 0
-    appendActivityEventsForEntry({
-      events,
-      seenEventIds,
-      worktree,
-      repo: args.repoMap.get(worktree.repoId) ?? null,
-      entry: retained.entry,
-      tab: retained.tab,
-      agentType: retained.agentType,
-      agentAlive: false,
-      acknowledgedAt: ackAt
-    })
-  }
-
-  const sorted = events.sort((a, b) => b.timestamp - a.timestamp)
-  const perPaneCount = new Map<string, number>()
-  const includedEventIds = new Set<string>()
-  const capped: ActivityEvent[] = []
-  // Why: reserve each pane's newest event before the global 80-event cap so the validator's >16 panes × ≥5 events can't push a pane out of the window and hide it.
-  for (const event of sorted) {
-    const paneKey = event.entry.paneKey
-    if (perPaneCount.has(paneKey)) {
-      continue
-    }
-    if (capped.length >= 80) {
-      break
-    }
-    perPaneCount.set(paneKey, 1)
-    includedEventIds.add(event.id)
-    capped.push(event)
-  }
-  for (const event of sorted) {
-    if (includedEventIds.has(event.id)) {
-      continue
-    }
-    if (capped.length >= 80) {
-      break
-    }
-    const paneKey = event.entry.paneKey
-    const count = perPaneCount.get(paneKey) ?? 0
-    if (count >= EVENTS_PER_PANE_CAP) {
-      continue
-    }
-    perPaneCount.set(paneKey, count + 1)
-    includedEventIds.add(event.id)
-    capped.push(event)
-  }
-  return { events: capped.sort((a, b) => b.timestamp - a.timestamp), liveAgentByPaneKey }
-}
-
-export function buildAgentPaneThreads(args: {
-  events: ActivityEvent[]
-  liveAgentByPaneKey: Record<string, ActivityLiveAgentSnapshot>
-  generatedTitlesEnabled?: boolean
-}): AgentPaneThread[] {
-  const generatedTitlesEnabled = args.generatedTitlesEnabled === true
-  const byPaneKey = new Map<string, AgentPaneThread>()
-  for (const event of args.events) {
-    const paneKey = event.entry.paneKey
-    const existing = byPaneKey.get(paneKey)
-    if (!existing) {
-      byPaneKey.set(paneKey, {
-        paneKey,
-        paneTitle: paneTitleForEvent(event, generatedTitlesEnabled),
-        worktree: event.worktree,
-        repo: event.repo,
-        tab: event.tab,
-        agentType: event.agentType,
-        currentAgentState: null,
-        currentAgentEntry: null,
-        responsePreview: statusPreviewForEntry(event.entry, event.state),
-        latestTimestamp: event.timestamp,
-        latestEvent: event,
-        events: [event],
-        migrationUnsupportedPtyId: event.migrationUnsupportedPtyId,
-        unread: event.unread
-      })
-      continue
-    }
-    existing.events.push(event)
-    existing.unread = existing.unread || event.unread
-    existing.migrationUnsupportedPtyId =
-      existing.migrationUnsupportedPtyId ?? event.migrationUnsupportedPtyId
-    if (!existing.latestEvent || event.timestamp > existing.latestEvent.timestamp) {
-      existing.latestEvent = event
-      existing.paneTitle = paneTitleForEvent(event, generatedTitlesEnabled)
-      existing.agentType = event.agentType
-      existing.tab = event.tab
-      existing.responsePreview = statusPreviewForEntry(
-        event.entry,
-        event.state,
-        existing.responsePreview
-      )
-      existing.latestTimestamp = event.timestamp
-    }
-  }
-
-  for (const [paneKey, liveAgent] of Object.entries(args.liveAgentByPaneKey)) {
-    const existing = byPaneKey.get(paneKey)
-    if (!existing) {
-      byPaneKey.set(paneKey, {
-        paneKey,
-        paneTitle: paneTitleForEntry(liveAgent.entry, liveAgent.tab, generatedTitlesEnabled),
-        worktree: liveAgent.worktree,
-        repo: liveAgent.repo,
-        tab: liveAgent.tab,
-        agentType: liveAgent.agentType,
-        currentAgentState: liveAgent.state,
-        currentAgentEntry: liveAgent.entry,
-        responsePreview: statusPreviewForEntry(liveAgent.entry, liveAgent.entry.state),
-        latestTimestamp: liveAgent.timestamp,
-        latestEvent: null,
-        events: [],
-        unread: false
-      })
-      continue
-    }
-    // Why: row title/time/target must follow the active turn (not historical events) so a running agent never shows the previous prompt as primary.
-    existing.paneTitle = paneTitleForEntry(liveAgent.entry, liveAgent.tab, generatedTitlesEnabled)
-    existing.worktree = liveAgent.worktree
-    existing.repo = liveAgent.repo
-    existing.tab = liveAgent.tab
-    existing.agentType = liveAgent.agentType
-    existing.currentAgentState = liveAgent.state
-    existing.currentAgentEntry = liveAgent.entry
-    existing.responsePreview = statusPreviewForEntry(
-      liveAgent.entry,
-      liveAgent.entry.state,
-      existing.responsePreview
-    )
-    existing.latestTimestamp = liveAgent.timestamp
-  }
-
-  return Array.from(byPaneKey.values())
-    .map((thread) => ({
-      ...thread,
-      events: [...thread.events].sort((a, b) => b.timestamp - a.timestamp)
-    }))
-    .sort((a, b) => b.latestTimestamp - a.latestTimestamp)
-}
-
-function EventTime({ timestamp }: { timestamp: number }): React.JSX.Element {
-  const absolute = formatAbsoluteDate(timestamp)
-  return (
-    <Tooltip>
-      <TooltipTrigger asChild>
-        <button
-          type="button"
-          className="rounded px-1 py-0.5 text-xs text-muted-foreground hover:text-foreground focus-visible:ring-[3px] focus-visible:ring-ring/50 focus-visible:outline-none"
-          aria-label={absolute}
-          onClick={(event) => event.stopPropagation()}
-        >
-          {formatRelativeTime(timestamp)}
-        </button>
-      </TooltipTrigger>
-      <TooltipContent side="right" sideOffset={6}>
-        {absolute}
-      </TooltipContent>
-    </Tooltip>
-  )
-}
-
-export function ActivityThreadOptionsMenu({
-  compactMode,
-  hasUnreadThreads,
-  onCompactModeChange,
-  onMarkAllThreadsRead
-}: {
-  compactMode: boolean
-  hasUnreadThreads: boolean
-  onCompactModeChange: (compactMode: boolean) => void
-  onMarkAllThreadsRead: () => void
-}): React.JSX.Element {
-  return (
-    <DropdownMenu>
-      <Tooltip>
-        <TooltipTrigger asChild>
-          {/* Why: keep Tooltip and Dropdown from composing refs onto the same button (Radix setRef crash loop). */}
-          <span className="inline-flex shrink-0">
-            <DropdownMenuTrigger asChild>
-              <Button
-                type="button"
-                variant="outline"
-                size="sm"
-                className="size-8 shrink-0 border-input bg-transparent p-0 text-muted-foreground shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-transparent dark:hover:bg-accent dark:hover:text-accent-foreground"
-                aria-label={translate(
-                  'auto.components.activity.ActivityPrototypePage.db8a1878b5',
-                  'Thread list options'
-                )}
-              >
-                <MoreVertical className="size-3.5" />
-              </Button>
-            </DropdownMenuTrigger>
-          </span>
-        </TooltipTrigger>
-        <TooltipContent side="bottom">
-          {translate('auto.components.activity.ActivityPrototypePage.a472a14700', 'More options')}
-        </TooltipContent>
-      </Tooltip>
-      <DropdownMenuContent align="end" sideOffset={6}>
-        <DropdownMenuCheckboxItem
-          checked={compactMode}
-          onCheckedChange={(checked) => onCompactModeChange(checked === true)}
-          onSelect={(event) => event.preventDefault()}
-        >
-          {translate('auto.components.activity.ActivityPrototypePage.f70e4bec47', 'Compact mode')}
-        </DropdownMenuCheckboxItem>
-        <DropdownMenuSeparator />
-        <DropdownMenuItem onSelect={onMarkAllThreadsRead} disabled={!hasUnreadThreads}>
-          {translate('auto.components.activity.ActivityPrototypePage.023ff75afe', 'Mark all read')}
-        </DropdownMenuItem>
-      </DropdownMenuContent>
-    </DropdownMenu>
-  )
-}
-
-function ActivityProjectLabel({ repo }: { repo: Repo | null }): React.JSX.Element {
-  const label =
-    repo?.displayName?.trim() ||
-    translate('auto.components.activity.ActivityPrototypePage.5651b216c6', 'Unknown project')
-  return (
-    <div className="flex min-w-0 items-center gap-1.5">
-      {repo ? <RepoBadgeMark color={repo.badgeColor} /> : null}
-      <span
-        className="min-w-0 truncate text-[11px] font-semibold uppercase tracking-[0.04em] text-muted-foreground"
-        title={label}
-      >
-        {label}
-      </span>
-    </div>
-  )
-}
-
-function EventRepoBadge({ repo }: { repo: Repo | null }): React.JSX.Element | null {
-  if (!repo) {
-    return null
-  }
-  return (
-    <div className="flex min-w-0 shrink-0 items-center gap-1.5 rounded-[4px] border border-border bg-accent px-1.5 py-0.5 dark:border-border/60 dark:bg-accent/50">
-      <RepoBadgeMark color={repo.badgeColor} />
-      <span className="max-w-[6rem] truncate text-[10px] font-semibold leading-none text-foreground lowercase">
-        {repo.displayName}
-      </span>
-    </div>
-  )
-}
-
-function threadAgentState(thread: AgentPaneThread): AgentDotState {
-  return thread.currentAgentState ?? thread.latestEvent?.state ?? 'done'
-}
-
-function threadAgentStateLabel(thread: AgentPaneThread): string {
-  const state = threadAgentState(thread)
-  if (!thread.currentAgentState && state === 'done' && thread.latestEvent?.entry.interrupted) {
-    return 'Interrupted'
-  }
-  return agentStateLabel(state)
-}
-
-export function getActivityThreadGroup(
-  thread: AgentPaneThread,
-  groupBy: ActivityGroupBy
-): { key: string; label: string } {
-  if (groupBy === 'status') {
-    const state = threadAgentState(thread)
-    if (!thread.currentAgentState && state === 'done' && thread.latestEvent?.entry.interrupted) {
-      return { key: 'done:interrupted', label: threadAgentStateLabel(thread) }
-    }
-    return { key: state, label: threadAgentStateLabel(thread) }
-  }
-  if (groupBy === 'project') {
-    return thread.repo
-      ? { key: `project:${thread.repo.id}`, label: thread.repo.displayName }
-      : {
-          key: 'project:unknown',
-          label: translate(
-            'auto.components.activity.ActivityPrototypePage.5651b216c6',
-            'Unknown project'
-          )
-        }
-  }
-  if (groupBy === 'worktree') {
-    return { key: `worktree:${thread.worktree.id}`, label: thread.worktree.displayName }
-  }
-  return { key: `agent:${thread.agentType}`, label: formatAgentTypeLabel(thread.agentType) }
-}
-
-export function buildActivityThreadGroups(
-  threads: AgentPaneThread[],
-  groupBy: ActivityGroupBy
-): ActivityThreadGroup[] {
-  const groups: ActivityThreadGroup[] = []
-  const groupIndexByKey = new Map<string, number>()
-  for (const thread of threads) {
-    const group = getActivityThreadGroup(thread, groupBy)
-    const existingIndex = groupIndexByKey.get(group.key)
-    if (existingIndex === undefined) {
-      groups.push({ key: group.key, label: group.label, threads: [thread] })
-      groupIndexByKey.set(group.key, groups.length - 1)
-      continue
-    }
-    groups[existingIndex].threads.push(thread)
-  }
-  return groups
-}
-
-function threadStatusGroupId(thread: AgentPaneThread): ActivityStatusGroupId {
-  const state = threadAgentState(thread)
-  if (!thread.currentAgentState && state === 'done' && thread.latestEvent?.entry.interrupted) {
-    return 'interrupted'
-  }
-  return state === 'working' || state === 'monitoring' || state === 'blocked' || state === 'waiting'
-    ? state
-    : 'done'
-}
-
-function threadStatusGroupState(id: ActivityStatusGroupId): AgentDotState {
-  return id === 'interrupted' ? 'done' : id
-}
-
-function threadStatusGroupLabel(id: ActivityStatusGroupId): string {
-  if (id === 'interrupted') {
-    return 'Interrupted'
-  }
-  return agentStateLabel(threadStatusGroupState(id))
-}
-
-export function groupActivityThreadsByStatus(threads: AgentPaneThread[]): ActivityThreadGroup[] {
-  const groups = new Map<ActivityStatusGroupId, AgentPaneThread[]>()
-  for (const thread of threads) {
-    const groupId = threadStatusGroupId(thread)
-    groups.set(groupId, [...(groups.get(groupId) ?? []), thread])
-  }
-  return ACTIVITY_STATUS_GROUP_ORDER.flatMap((id) => {
-    const groupThreads = groups.get(id) ?? []
-    if (groupThreads.length === 0) {
-      return []
-    }
-    return [
-      {
-        key: id,
-        id,
-        label: threadStatusGroupLabel(id),
-        state: threadStatusGroupState(id),
-        threads: groupThreads
-      }
-    ]
-  })
-}
-
-function threadSearchText(thread: AgentPaneThread): string {
-  const latest = thread.latestEvent
-  const stateLabel = threadAgentStateLabel(thread)
-  const currentPrompt = thread.currentAgentEntry
-    ? getAgentRowPrimaryText(thread.currentAgentEntry)
-    : ''
-  const rawCurrentPrompt = thread.currentAgentEntry?.prompt.trim() ?? ''
-  const currentSummary = thread.currentAgentEntry?.lastAssistantMessage?.trim() ?? ''
-  const latestEventText = latest
-    ? `${agentTitle(latest)} ${agentSummary(latest)} ${agentMeta(latest)}`
-    : ''
-  return `${thread.paneTitle} ${getActivityThreadWorkspaceTitle(thread.worktree)} ${thread.worktree.branch ?? ''} ${thread.repo?.displayName ?? ''} ${formatAgentTypeLabel(thread.agentType)} ${stateLabel} ${currentPrompt} ${rawCurrentPrompt} ${currentSummary} ${thread.responsePreview} ${latestEventText}`.toLowerCase()
-}
-
-export const ACTIVITY_SEARCH_QUERY_MAX_BYTES = 2 * 1024
-
-export function isActivitySearchQueryTooLarge(
-  query: string,
-  maxBytes = ACTIVITY_SEARCH_QUERY_MAX_BYTES
-): boolean {
-  return isClipboardTextByteLengthOverLimit(query, maxBytes)
-}
-
-export function activityThreadMatchesSearchQuery({
-  thread,
-  searchQuery
-}: {
-  thread: AgentPaneThread
-  searchQuery: string
-}): boolean {
-  if (isActivitySearchQueryTooLarge(searchQuery)) {
-    return false
-  }
-  const trimmedQuery = searchQuery.trim()
-  if (!trimmedQuery) {
-    return true
-  }
-  return threadSearchText(thread).includes(trimmedQuery.toLowerCase())
-}
-
-export function isActivityFilterFocusShortcut(
-  event: Pick<KeyboardEvent, 'altKey' | 'ctrlKey' | 'key' | 'metaKey' | 'shiftKey'>,
-  isMac = navigator.userAgent.includes('Mac')
-): boolean {
-  if (event.key.toLowerCase() !== 'f' || event.shiftKey || event.altKey) {
-    return false
-  }
-  return isMac ? event.metaKey && !event.ctrlKey : event.ctrlKey && !event.metaKey
-}
-
-export function shouldIgnoreActivityFilterFocusShortcutTarget(
-  target: Element | null,
-  terminalPortalTargets: (HTMLElement | null)[]
-): boolean {
-  if (!target) {
-    return false
-  }
-  // Why: workspace terminal stays mounted while Activity is open; only the Activity-portaled terminal keeps Cmd/Ctrl+F for terminal search.
-  return terminalPortalTargets.some((portalTarget) => portalTarget?.contains(target) ?? false)
-}
-
-export function handleActivityFilterFocusShortcut({
-  activeElement,
-  event,
-  input,
-  isMac,
-  terminalPortalTargets
-}: {
-  activeElement: Element | null
-  event: Pick<
-    KeyboardEvent,
-    | 'altKey'
-    | 'ctrlKey'
-    | 'key'
-    | 'metaKey'
-    | 'preventDefault'
-    | 'shiftKey'
-    | 'stopImmediatePropagation'
-    | 'stopPropagation'
-  >
-  input: Pick<HTMLInputElement, 'focus' | 'select'> | null
-  isMac?: boolean
-  terminalPortalTargets: (HTMLElement | null)[]
-}): boolean {
-  if (shouldIgnoreActivityFilterFocusShortcutTarget(activeElement, terminalPortalTargets)) {
-    return false
-  }
-  if (!isActivityFilterFocusShortcut(event, isMac)) {
-    return false
-  }
-  if (!input) {
-    return false
-  }
-  event.preventDefault()
-  // Why: hidden workspace xterms can retain focus behind Activity; stop the chord before xterm forwards it to a local/SSH PTY.
-  event.stopPropagation()
-  event.stopImmediatePropagation()
-  input.focus()
-  input.select()
-  return true
-}
-
-export function ThreadAgentStateIndicator({
-  thread
-}: {
-  thread: AgentPaneThread
-}): React.JSX.Element {
-  const state = threadAgentState(thread)
-  const label = threadAgentStateLabel(thread)
-  return (
-    <Tooltip>
-      <TooltipTrigger asChild>
-        <span className="inline-flex size-4 shrink-0 items-center justify-center">
-          <AgentStateDot state={state} size="md" title={null} />
-        </span>
-      </TooltipTrigger>
-      <TooltipContent side="top" sideOffset={4}>
-        {label}
-      </TooltipContent>
-    </Tooltip>
-  )
-}
-
-function ActivityStatusGroupHeader({ group }: { group: ActivityThreadGroup }): React.JSX.Element {
-  return (
-    <div className="sticky top-0 z-10 flex items-center gap-2 border-b border-border bg-background/95 px-3 py-1.5 backdrop-blur supports-[backdrop-filter]:bg-background/80">
-      {group.state ? (
-        <span className="inline-flex size-4 shrink-0 items-center justify-center">
-          <AgentStateDot state={group.state} size="sm" />
-        </span>
-      ) : null}
-      <span className="min-w-0 flex-1 truncate text-[11px] font-semibold uppercase tracking-[0.05em] text-muted-foreground">
-        {group.label}
-      </span>
-      <span className="rounded-full border border-border bg-accent px-1.5 py-0.5 text-[10px] font-semibold leading-none text-muted-foreground">
-        {group.threads.length}
-      </span>
-    </div>
-  )
-}
-
-function isEventFromNestedInteractiveElement(
-  target: EventTarget | null,
-  currentTarget: HTMLElement
-): boolean {
-  if (!(target instanceof HTMLElement)) {
-    return false
-  }
-  const interactiveTarget = target.closest(
-    'a, button, input, select, textarea, [role="button"], [role="link"], [tabindex]:not([tabindex="-1"])'
-  )
-  return (
-    interactiveTarget instanceof HTMLElement &&
-    interactiveTarget !== currentTarget &&
-    currentTarget.contains(interactiveTarget)
-  )
-}
-
-function ThreadRow({
-  thread,
-  selected,
-  onSelect,
-  onJump,
-  onMarkUnread,
-  canJump,
-  compactMode
-}: {
-  thread: AgentPaneThread
-  selected: boolean
-  onSelect: () => void
-  onJump: () => void
-  onMarkUnread: () => void
-  canJump: boolean
-  compactMode: boolean
-}): React.JSX.Element {
-  const renderedResponsePreview = activityThreadResponseRenderPreview({
-    responsePreview: thread.responsePreview
-  })
-  const workspaceTitle = getActivityThreadWorkspaceTitle(thread.worktree)
-  const taskTitle = thread.paneTitle
-  const agentLabel = formatAgentTypeLabel(thread.agentType)
-  const showStatusPreview =
-    !compactMode &&
-    renderedResponsePreview.length > 0 &&
-    renderedResponsePreview !== taskTitle &&
-    renderedResponsePreview !== workspaceTitle
-  return (
-    <div
-      data-current={selected ? 'true' : undefined}
-      onClick={onSelect}
-      role="button"
-      tabIndex={0}
-      onKeyDown={(event) => {
-        // Why: markdown responses can contain links; keyboard activation on a nested link follows the link instead of selecting the row.
-        if (isEventFromNestedInteractiveElement(event.target, event.currentTarget)) {
-          return
-        }
-        if (event.key === 'Enter' || event.key === ' ') {
-          event.preventDefault()
-          onSelect()
-        }
-      }}
-      className={cn(
-        // Why (WorktreeCard cues): selected = tint+shadow, beats hover; unread = weight + left bar only; stacking all three confused selected vs unread on hover.
-        // Why (asymmetric padding): title leading-snug adds ~3px above cap-height; smaller top pad evens the row.
-        'group relative flex w-full cursor-pointer flex-col gap-1 border-b border-border px-3 pt-2.5 pb-3 text-left transition-colors',
-        selected
-          ? 'bg-black/[0.08] shadow-[0_1px_2px_rgba(0,0,0,0.04)] dark:bg-white/[0.10] dark:shadow-[0_1px_2px_rgba(0,0,0,0.03)]'
-          : 'hover:bg-accent/40'
-      )}
-    >
-      {thread.unread ? (
-        <span className="absolute left-0 top-1.5 bottom-1.5 w-0.5 rounded-r-full bg-primary" />
-      ) : null}
-      <div className="flex min-w-0 items-start gap-2">
-        <span className="inline-flex shrink-0 items-start gap-1">
-          <ThreadAgentStateIndicator thread={thread} />
-          <span className="inline-flex shrink-0 pt-px">
-            <AgentIcon agent={agentTypeToIconAgent(thread.agentType)} size={14} />
-          </span>
-        </span>
-        <div className="min-w-0 flex-1">
-          <div className="flex min-w-0 items-start gap-2">
-            <div className="min-w-0 flex-1 space-y-0.5">
-              <ActivityProjectLabel repo={thread.repo} />
-              <div
-                className={cn(
-                  'min-w-0 text-[13px] leading-snug',
-                  compactMode ? 'truncate' : 'line-clamp-2 break-words',
-                  thread.unread ? 'font-semibold text-foreground' : 'font-medium text-foreground'
-                )}
-                title={workspaceTitle}
-              >
-                {workspaceTitle}
-              </div>
-              {taskTitle !== workspaceTitle ? (
-                <div
-                  className={cn(
-                    'min-w-0 text-[12px] leading-snug text-muted-foreground',
-                    compactMode ? 'truncate' : 'line-clamp-2 break-words'
-                  )}
-                  title={taskTitle}
-                >
-                  {taskTitle}
-                </div>
-              ) : null}
-              {showStatusPreview ? (
-                <CommentMarkdown
-                  content={renderedResponsePreview}
-                  className={cn(
-                    'h-[1lh] min-w-0 overflow-hidden truncate whitespace-nowrap text-[11px] font-normal leading-snug text-muted-foreground/80',
-                    '[&_*]:inline [&_*]:!m-0 [&_*]:!p-0 [&_*]:!whitespace-nowrap [&_br]:hidden [&_ol]:list-none [&_ul]:list-none'
-                  )}
-                  title={thread.responsePreview}
-                />
-              ) : null}
-              <div className="flex min-w-0 items-center gap-1.5 pt-0.5">
-                <span className="shrink-0 text-[10px] text-muted-foreground/80">{agentLabel}</span>
-                {canJump ? (
-                  <span
-                    className={cn(
-                      'ml-auto inline-flex shrink-0 items-center transition-opacity',
-                      'can-hover:pointer-events-none can-hover:invisible can-hover:opacity-0',
-                      'group-hover:pointer-events-auto group-hover:visible group-hover:opacity-100'
-                    )}
-                  >
-                    <Tooltip>
-                      <TooltipTrigger asChild>
-                        <Button
-                          type="button"
-                          variant="outline"
-                          size="icon-xs"
-                          aria-label={translate(
-                            'auto.components.activity.ActivityPrototypePage.4616ea39fd',
-                            'Jump to workspace'
-                          )}
-                          onClick={(event) => {
-                            event.stopPropagation()
-                            onJump()
-                          }}
-                          onMouseDown={(event) => event.stopPropagation()}
-                        >
-                          <ExternalLink className="size-3" />
-                        </Button>
-                      </TooltipTrigger>
-                      <TooltipContent side="left">
-                        {translate(
-                          'auto.components.activity.ActivityPrototypePage.4616ea39fd',
-                          'Jump to workspace'
-                        )}
-                      </TooltipContent>
-                    </Tooltip>
-                  </span>
-                ) : null}
-              </div>
-            </div>
-            <span className="inline-flex shrink-0 items-center gap-1.5 pt-px">
-              <span className="inline-flex size-4 shrink-0 items-center justify-center">
-                {thread.unread ? (
-                  <FilledBellIcon
-                    className="size-[13px] shrink-0 text-amber-500 drop-shadow-sm"
-                    aria-label={translate(
-                      'auto.components.activity.ActivityPrototypePage.beb2c19173',
-                      'Unread'
-                    )}
-                  />
-                ) : (
-                  <Tooltip>
-                    <TooltipTrigger asChild>
-                      <button
-                        type="button"
-                        onClick={(event) => {
-                          event.stopPropagation()
-                          onMarkUnread()
-                        }}
-                        onMouseDown={(event) => event.stopPropagation()}
-                        className={cn(
-                          'group/unread flex size-4 shrink-0 cursor-pointer items-center justify-center rounded transition-all',
-                          'hover:bg-accent/80 active:scale-95',
-                          'focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring'
-                        )}
-                        aria-label={translate(
-                          'auto.components.activity.ActivityPrototypePage.59b131fbd9',
-                          'Mark thread unread'
-                        )}
-                      >
-                        <Bell className="size-3 text-muted-foreground/40 can-hover:opacity-0 transition-opacity group-hover:opacity-100 group-hover/unread:opacity-100" />
-                      </button>
-                    </TooltipTrigger>
-                    <TooltipContent side="left">
-                      {translate(
-                        'auto.components.activity.ActivityPrototypePage.59b131fbd9',
-                        'Mark thread unread'
-                      )}
-                    </TooltipContent>
-                  </Tooltip>
-                )}
-              </span>
-              <EventTime timestamp={thread.latestTimestamp} />
-            </span>
-          </div>
-        </div>
-      </div>
-    </div>
-  )
-}
+  otherActivityTerminalSlot,
+  useActivityTerminalLoadingLabel,
+  useActivityTerminalPortalStatus
+} from './activity-terminal-portal-status'
+import type {
+  ActivityGroupBy,
+  ActivityTerminalPortalSlotId,
+  ThreadReadFilter
+} from './activity-thread-types'
+
+export * from './activity-prototype-page-exports'
 
 export default function ActivityPrototypePage(): React.JSX.Element {
   const [readFilter, setReadFilter] = useState<ThreadReadFilter>('all')
@@ -1688,45 +298,13 @@ export default function ActivityPrototypePage(): React.JSX.Element {
     return () => window.removeEventListener('keydown', focusActivityFilter, { capture: true })
   }, [activePortalTargetEl, inactivePortalTargetEl])
 
-  const markThreadRead = (thread: AgentPaneThread): void => {
-    storeData.acknowledgeAgents([thread.paneKey])
-  }
-
-  const markThreadUnread = (thread: AgentPaneThread): void => {
-    storeData.unacknowledgeAgents([thread.paneKey])
-  }
-
-  const activateThreadTerminal = (thread: AgentPaneThread): void => {
-    const state = useAppStore.getState()
-    const worktree = getWorktreeMapFromState(state).get(thread.worktree.id)
-    if (!worktree) {
-      return
-    }
-    // Why: retained-agent threads can outlive their tab; without a live tab, reorienting the workspace and focusing a dead tab id would just confuse the user.
-    const liveTabs = state.tabsByWorktree[worktree.id] ?? []
-    const hasLiveTab = liveTabs.some((t) => t.id === thread.tab.id)
-    if (!hasLiveTab) {
-      return
-    }
-    if (state.activeRepoId !== worktree.repoId) {
-      state.setActiveRepo(worktree.repoId)
-    }
-    if (state.activeWorktreeId !== worktree.id) {
-      state.setActiveWorktree(worktree.id)
-    }
-    state.setActiveTabType('terminal')
-    const parsed = parsePaneKey(thread.paneKey)
-    activateTabAndFocusPane(
-      thread.tab.id,
-      parsed && parsed.tabId === thread.tab.id ? parsed.leafId : null,
-      { scrollToBottomIfOutputSinceLastView: true }
-    )
-  }
-
-  const selectThread = (thread: AgentPaneThread): void => {
-    setSelectedPaneKey(thread.paneKey)
-    activateThreadTerminal(thread)
-  }
+  const { hasUnreadThreads, markThreadUnread, selectThread, jumpToWorkspace, markAllThreadsRead } =
+    createActivityThreadActions({
+      allThreads,
+      acknowledgeAgents: storeData.acknowledgeAgents,
+      unacknowledgeAgents: storeData.unacknowledgeAgents,
+      setSelectedPaneKey
+    })
 
   useEffect(() => {
     if (
@@ -1763,311 +341,50 @@ export default function ActivityPrototypePage(): React.JSX.Element {
     visibleThread
   ])
 
-  const jumpToWorkspace = (thread: AgentPaneThread): void => {
-    const state = useAppStore.getState()
-    if (!getWorktreeMapFromState(state).has(thread.worktree.id)) {
-      return
-    }
-    markThreadRead(thread)
-    activateAndRevealWorktree(thread.worktree.id)
-  }
-
-  const hasUnreadThreads = allThreads.some((thread) => thread.unread)
-
-  const markAllThreadsRead = (): void => {
-    const unreadKeys = allThreads.filter((t) => t.unread).map((t) => t.paneKey)
-    if (unreadKeys.length === 0) {
-      return
-    }
-    storeData.acknowledgeAgents(unreadKeys)
-  }
-
   // Why (page padding): no top/horizontal padding so the page reaches the window edges; the titlebar and the right pane's title row (pt-2) supply the top spacing.
   return (
     <div ref={setActivityPageRef} className="flex h-full min-h-0 flex-col bg-background pb-3">
       <main className="flex min-h-0 flex-1 overflow-hidden">
-        <aside
-          ref={threadListRef}
-          className="relative flex min-h-0 shrink-0 flex-col border-r border-border"
-          style={{ width: threadListWidth }}
-        >
-          <div className="shrink-0 border-b border-border px-2 pt-2 pb-2">
-            <div className="flex items-center gap-2">
-              <div className="relative min-w-0 flex-1">
-                <Search className="pointer-events-none absolute left-2 top-1/2 size-3.5 -translate-y-1/2 text-muted-foreground" />
-                <Input
-                  ref={activityFilterInputRef}
-                  value={query}
-                  onChange={(event) => setQuery(event.target.value)}
-                  placeholder={translate(
-                    'auto.components.activity.ActivityPrototypePage.795cbf26e2',
-                    'Filter...'
-                  )}
-                  className="h-8 w-full pl-7 text-xs"
-                />
-              </div>
-              <Select
-                value={groupBy}
-                onValueChange={(value) => setGroupBy(value as ActivityGroupBy)}
-              >
-                <SelectTrigger
-                  size="sm"
-                  className="h-8 w-[128px] shrink-0 px-2 text-xs"
-                  aria-label={translate(
-                    'auto.components.activity.ActivityPrototypePage.770d458144',
-                    'Group agent activity by'
-                  )}
-                >
-                  <SelectValue />
-                </SelectTrigger>
-                <SelectContent align="end">
-                  <SelectItem value="status">
-                    {translate(
-                      'auto.components.activity.ActivityPrototypePage.4a3986b200',
-                      'Status'
-                    )}
-                  </SelectItem>
-                  <SelectItem value="project">
-                    {translate(
-                      'auto.components.activity.ActivityPrototypePage.8c3b621ddf',
-                      'Project'
-                    )}
-                  </SelectItem>
-                  <SelectItem value="worktree">
-                    {translate(
-                      'auto.components.activity.ActivityPrototypePage.b29191b3e0',
-                      'Worktree'
-                    )}
-                  </SelectItem>
-                  <SelectItem value="agent">
-                    {translate(
-                      'auto.components.activity.ActivityPrototypePage.f6396e1f85',
-                      'Agent'
-                    )}
-                  </SelectItem>
-                </SelectContent>
-              </Select>
-              <Tooltip>
-                <TooltipTrigger asChild>
-                  <Toggle
-                    pressed={readFilter === 'unread'}
-                    onPressedChange={(pressed) => setReadFilter(pressed ? 'unread' : 'all')}
-                    variant="outline"
-                    size="sm"
-                    className={cn(
-                      'size-8 shrink-0 p-0',
-                      readFilter === 'unread'
-                        ? '!border-primary !bg-primary !text-primary-foreground shadow-xs ring-2 ring-primary/35 hover:!bg-primary/90 hover:!text-primary-foreground'
-                        : 'text-muted-foreground hover:text-foreground'
-                    )}
-                    aria-label={translate(
-                      'auto.components.activity.ActivityPrototypePage.d1a88df9a8',
-                      'Show unread threads only'
-                    )}
-                  >
-                    <BellDot className="size-3.5" />
-                  </Toggle>
-                </TooltipTrigger>
-                <TooltipContent side="bottom">
-                  {translate(
-                    'auto.components.activity.ActivityPrototypePage.d1a88df9a8',
-                    'Show unread threads only'
-                  )}
-                </TooltipContent>
-              </Tooltip>
-              {/* Why (overflow menu): "Mark all read" is low-frequency and destructive-feeling; behind `…` keeps the toolbar on the frequent Filter + unread toggle. */}
-              <ActivityThreadOptionsMenu
-                compactMode={compactMode}
-                hasUnreadThreads={hasUnreadThreads}
-                onCompactModeChange={setCompactMode}
-                onMarkAllThreadsRead={markAllThreadsRead}
-              />
-            </div>
-          </div>
-          <div className="min-h-0 flex-1 overflow-auto scrollbar-sleek">
-            {visibleThreadGroups.map((group) => (
-              <section
-                key={group.key}
-                aria-label={translate(
-                  'auto.components.activity.ActivityPrototypePage.a2b4437bfb',
-                  '{{value0}} activity',
-                  { value0: group.label }
-                )}
-              >
-                <ActivityStatusGroupHeader group={group} />
-                {group.threads.map((thread) => (
-                  <ThreadRow
-                    key={thread.paneKey}
-                    thread={thread}
-                    selected={thread.paneKey === selectedThread?.paneKey}
-                    onSelect={() => selectThread(thread)}
-                    onJump={() => jumpToWorkspace(thread)}
-                    onMarkUnread={() => markThreadUnread(thread)}
-                    canJump={storeData.worktreeMap.has(thread.worktree.id)}
-                    compactMode={compactMode}
-                  />
-                ))}
-              </section>
-            ))}
-            {visibleThreads.length === 0 ? (
-              <div className="px-3 py-8 text-sm text-muted-foreground">
-                {translate(
-                  'auto.components.activity.ActivityPrototypePage.7cd632006b',
-                  'No agent activity matches these filters.'
-                )}
-              </div>
-            ) : null}
-          </div>
-          <div
-            aria-label={translate(
-              'auto.components.activity.ActivityPrototypePage.443690186e',
-              'Resize activity thread list'
-            )}
-            title={translate(
-              'auto.components.activity.ActivityPrototypePage.866083500b',
-              'Drag to resize'
-            )}
-            className={cn(
-              'group absolute -right-1.5 top-0 z-20 flex h-full w-3 cursor-col-resize items-stretch justify-center',
-              isThreadListResizing && 'bg-ring/10'
-            )}
-            onMouseDown={onResizeStart}
-            role="separator"
-          >
-            <div
-              className={cn(
-                'h-full w-px bg-border transition-colors group-hover:bg-ring/50',
-                isThreadListResizing && 'bg-ring'
-              )}
-            />
-          </div>
-        </aside>
-
-        <section className="min-w-0 flex-1 overflow-hidden">
-          {selectedThread ? (
-            <div className="flex h-full min-h-0 flex-col">
-              {/* Why (no header action button): per-card hover actions (Mark unread, Open) are the primary controls now, so the header keeps just the thread identity. */}
-              <div className="flex shrink-0 items-start gap-4 border-b border-border px-4 pt-2 pb-3">
-                <div className="min-w-0">
-                  <div className="flex min-w-0 items-start gap-2">
-                    <span className="inline-flex shrink-0 items-start gap-1">
-                      <ThreadAgentStateIndicator thread={selectedThread} />
-                      <span className="inline-flex shrink-0 pt-[3px]">
-                        <AgentIcon
-                          agent={agentTypeToIconAgent(selectedThread.agentType)}
-                          size={16}
-                        />
-                      </span>
-                    </span>
-                    <h2 className="line-clamp-3 break-words text-sm font-semibold leading-snug">
-                      {selectedThread.paneTitle}
-                    </h2>
-                  </div>
-                  <div className="mt-1 flex min-w-0 items-center gap-1.5 pl-11">
-                    <EventRepoBadge repo={selectedThread.repo} />
-                    <span className="truncate text-xs text-muted-foreground">
-                      {selectedThread.worktree.displayName}
-                    </span>
-                  </div>
-                </div>
-              </div>
-              {/* Why: Terminal stays mounted in the hidden workspace tree; this target moves that existing TerminalPane here instead of spawning a second PTY/xterm owner. */}
-              {(() => {
-                // Why: retained threads can outlive their tab; portal needs a live TerminalPane to render into.
-                if (!selectedHasLiveTab) {
-                  return (
-                    <div className="flex min-h-0 flex-1 flex-col items-center justify-center gap-2 p-4 text-sm text-muted-foreground">
-                      <TerminalSquare className="size-7" />
-                      {storeData.worktreeMap.has(selectedThread.worktree.id)
-                        ? translate(
-                            'auto.components.activity.ActivityPrototypePage.afdc2139a8',
-                            'Agent terminal closed. Open a new terminal in this workspace to continue.'
-                          )
-                        : translate(
-                            'auto.components.activity.ActivityPrototypePage.22b22034bc',
-                            'Standalone terminal unavailable in Activity.'
-                          )}
-                    </div>
-                  )
-                }
-                return (
-                  <div className="relative min-h-0 flex-1 overflow-hidden bg-editor-surface">
-                    <div
-                      ref={setPrimaryPortalTarget}
-                      className={cn(
-                        'absolute inset-0 min-h-0 min-w-0',
-                        activePortalSlotId === 'primary'
-                          ? 'z-10 opacity-100'
-                          : 'pointer-events-none z-0 opacity-0'
-                      )}
-                      aria-hidden={activePortalSlotId !== 'primary'}
-                      data-activity-terminal-slot-id="primary"
-                    />
-                    <div
-                      ref={setSecondaryPortalTarget}
-                      className={cn(
-                        'absolute inset-0 min-h-0 min-w-0',
-                        activePortalSlotId === 'secondary'
-                          ? 'z-10 opacity-100'
-                          : 'pointer-events-none z-0 opacity-0'
-                      )}
-                      aria-hidden={activePortalSlotId !== 'secondary'}
-                      data-activity-terminal-slot-id="secondary"
-                    />
-                    {visibleThread && !stagedThread && !visiblePortalReady ? (
-                      <div
-                        className="pointer-events-none absolute inset-0 z-20 bg-editor-surface"
-                        aria-hidden="true"
-                      >
-                        {visiblePortalUnavailable ? (
-                          <div className="ml-3 mt-3 inline-flex items-center gap-2 rounded-md border border-border bg-background/85 px-2 py-1 text-xs text-muted-foreground shadow-xs">
-                            <span className="h-3 w-1.5 rounded-sm bg-muted-foreground/70" />
-                            <span>
-                              {translate(
-                                'auto.components.activity.ActivityPrototypePage.8de7c5beaa',
-                                'Terminal unavailable'
-                              )}
-                            </span>
-                          </div>
-                        ) : showTerminalLoadingLabel ? (
-                          <div className="ml-3 mt-3 inline-flex items-center gap-2 rounded-md border border-border bg-background/85 px-2 py-1 text-xs text-muted-foreground shadow-xs">
-                            <span className="h-3 w-1.5 animate-pulse rounded-sm bg-muted-foreground/70" />
-                            <span>
-                              {translate(
-                                'auto.components.activity.ActivityPrototypePage.1b633f5c1e',
-                                'Connecting terminal...'
-                              )}
-                            </span>
-                          </div>
-                        ) : null}
-                      </div>
-                    ) : null}
-                  </div>
-                )
-              })()}
-            </div>
-          ) : (
-            <div className="flex h-full min-h-[240px] flex-col items-center justify-center gap-2 text-sm text-muted-foreground">
-              {visibleThreads.length === 0 ? (
-                <>
-                  <MessageSquareText className="size-7" />
-                  {translate(
-                    'auto.components.activity.ActivityPrototypePage.e3db9892f6',
-                    'No activity yet.'
-                  )}
-                </>
-              ) : (
-                <>
-                  <TerminalSquare className="size-7" />
-                  {translate(
-                    'auto.components.activity.ActivityPrototypePage.cf780197a1',
-                    'Select an agent to view its activity'
-                  )}
-                </>
-              )}
-            </div>
+        <ActivityThreadListPane
+          threadListRef={threadListRef}
+          threadListWidth={threadListWidth}
+          activityFilterInputRef={activityFilterInputRef}
+          query={query}
+          onQueryChange={setQuery}
+          groupBy={groupBy}
+          onGroupByChange={setGroupBy}
+          readFilter={readFilter}
+          onReadFilterChange={setReadFilter}
+          compactMode={compactMode}
+          hasUnreadThreads={hasUnreadThreads}
+          onCompactModeChange={setCompactMode}
+          onMarkAllThreadsRead={markAllThreadsRead}
+          visibleThreadGroups={visibleThreadGroups}
+          visibleThreadCount={visibleThreads.length}
+          selectedPaneKey={selectedThread?.paneKey ?? null}
+          onSelectThread={selectThread}
+          onJumpToWorkspace={jumpToWorkspace}
+          onMarkThreadUnread={markThreadUnread}
+          canJumpToWorkspace={(thread) => storeData.worktreeMap.has(thread.worktree.id)}
+          isThreadListResizing={isThreadListResizing}
+          onResizeStart={onResizeStart}
+        />
+        <ActivityThreadDetailPane
+          selectedThread={selectedThread}
+          selectedHasLiveTab={Boolean(selectedHasLiveTab)}
+          selectedWorktreeAvailable={Boolean(
+            selectedThread && storeData.worktreeMap.has(selectedThread.worktree.id)
           )}
-        </section>
+          visibleThread={visibleThread}
+          stagedThread={stagedThread}
+          activePortalSlotId={activePortalSlotId}
+          setPrimaryPortalTarget={setPrimaryPortalTarget}
+          setSecondaryPortalTarget={setSecondaryPortalTarget}
+          visiblePortalReady={visiblePortalReady}
+          visiblePortalUnavailable={visiblePortalUnavailable}
+          showTerminalLoadingLabel={showTerminalLoadingLabel}
+          visibleThreadCount={visibleThreads.length}
+        />
       </main>
     </div>
   )
diff --git a/src/renderer/src/components/activity/activity-event-builder.ts b/src/renderer/src/components/activity/activity-event-builder.ts
new file mode 100644
index 00000000000..11e66f65bb2
--- /dev/null
+++ b/src/renderer/src/components/activity/activity-event-builder.ts
@@ -0,0 +1,294 @@
+import { isExplicitAgentStatusFresh } from '@/lib/agent-status'
+import { migrationUnsupportedToAgentStatusEntry } from '@/lib/migration-unsupported-agent-entry'
+import type { RetainedAgentEntry } from '@/store/slices/agent-status'
+import {
+  AGENT_STATUS_STALE_AFTER_MS,
+  type AgentStateHistoryEntry,
+  type AgentStatusEntry,
+  type AgentStatusState,
+  type AgentType,
+  type MigrationUnsupportedPtyEntry
+} from '../../../../shared/agent-status-types'
+import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../shared/constants'
+import type { Repo } from '../../../../shared/repo-types'
+import { parsePaneKey } from '../../../../shared/stable-pane-id'
+import type { TerminalTab } from '../../../../shared/terminal-tab-types'
+import type { Worktree } from '../../../../shared/worktree/types'
+import type {
+  ActivityEvent,
+  ActivityEventState,
+  ActivityHookLiveAgentState,
+  ActivityLiveAgentSnapshot,
+  ActivityLiveAgentState
+} from './activity-thread-types'
+import { capActivityEvents } from './activity-event-cap'
+
+const STANDALONE_ACTIVITY_WORKTREE_REPO_ID = '__activity_standalone__'
+
+function isActivityEventState(state: AgentStatusState): state is ActivityEventState {
+  return state === 'done' || state === 'blocked' || state === 'waiting'
+}
+
+function isActivityHookLiveAgentState(
+  state: AgentStatusState
+): state is ActivityHookLiveAgentState {
+  return state === 'working' || state === 'blocked' || state === 'waiting'
+}
+
+function freshActivityLiveAgentState(
+  entry: AgentStatusEntry,
+  now: number
+): ActivityLiveAgentState | null {
+  if (
+    !isActivityHookLiveAgentState(entry.state) ||
+    !isExplicitAgentStatusFresh(entry, now, AGENT_STATUS_STALE_AFTER_MS)
+  ) {
+    return null
+  }
+  return entry.state === 'working' && entry.workingMode === 'monitoring'
+    ? 'monitoring'
+    : entry.state
+}
+
+function standaloneActivityWorktree(worktreeId: string): Worktree {
+  const displayName =
+    worktreeId === FLOATING_TERMINAL_WORKTREE_ID ? 'Floating terminal' : 'Standalone terminal'
+  return {
+    id: worktreeId,
+    repoId: STANDALONE_ACTIVITY_WORKTREE_REPO_ID,
+    path: '',
+    head: '',
+    branch: displayName,
+    isBare: false,
+    isMainWorktree: false,
+    displayName,
+    comment: '',
+    linkedIssue: null,
+    linkedPR: null,
+    linkedLinearIssue: null,
+    isArchived: false,
+    isUnread: false,
+    isPinned: false,
+    sortOrder: 0,
+    lastActivityAt: 0
+  }
+}
+
+function historyEntrySnapshot(
+  entry: AgentStatusEntry,
+  history: AgentStateHistoryEntry
+): AgentStatusEntry {
+  return {
+    ...entry,
+    state: history.state,
+    prompt: history.prompt,
+    updatedAt: history.startedAt,
+    stateStartedAt: history.startedAt,
+    stateHistory: [],
+    toolName: undefined,
+    toolInput: undefined,
+    lastAssistantMessage: undefined,
+    interrupted: history.interrupted
+  }
+}
+
+function appendActivityEvent(args: {
+  events: ActivityEvent[]
+  seenEventIds: Set<string>
+  state: ActivityEventState
+  timestamp: number
+  worktree: Worktree
+  repo: Repo | null
+  entry: AgentStatusEntry
+  tab: TerminalTab
+  agentType: AgentType
+  agentAlive: boolean
+  acknowledgedAt: number
+  migrationUnsupportedPtyId?: string
+}): void {
+  const id = `agent:${args.entry.paneKey}:${args.state}:${args.timestamp}`
+  if (args.seenEventIds.has(id)) {
+    return
+  }
+  args.seenEventIds.add(id)
+  args.events.push({
+    id,
+    state: args.state,
+    timestamp: args.timestamp,
+    worktree: args.worktree,
+    repo: args.repo,
+    entry: args.entry,
+    tab: args.tab,
+    agentType: args.agentType,
+    agentAlive: args.agentAlive,
+    migrationUnsupportedPtyId: args.migrationUnsupportedPtyId,
+    unread: args.acknowledgedAt < args.timestamp
+  })
+}
+
+function appendActivityEventsForEntry(args: {
+  events: ActivityEvent[]
+  seenEventIds: Set<string>
+  entry: AgentStatusEntry
+  worktree: Worktree
+  repo: Repo | null
+  tab: TerminalTab
+  agentType: AgentType
+  agentAlive: boolean
+  acknowledgedAt: number
+  migrationUnsupportedPtyId?: string
+}): void {
+  // Why: Activity is append-only; when a pane continues (done→working), stateHistory is the only record of the previous done/blocking event.
+  for (const history of args.entry.stateHistory) {
+    if (!isActivityEventState(history.state)) {
+      continue
+    }
+    appendActivityEvent({
+      ...args,
+      state: history.state,
+      timestamp: history.startedAt,
+      entry: historyEntrySnapshot(args.entry, history)
+    })
+  }
+
+  // Why: SessionStart creates an idle row, not an "Agent finished" activity event (STA-3386).
+  if (!isActivityEventState(args.entry.state) || args.entry.sessionBoundary === true) {
+    return
+  }
+  appendActivityEvent({
+    ...args,
+    state: args.entry.state,
+    timestamp: args.entry.stateStartedAt
+  })
+}
+
+type BuildActivityEventsArgs = {
+  agentStatusByPaneKey: Record<string, AgentStatusEntry>
+  migrationUnsupportedByPtyId?: Record<string, MigrationUnsupportedPtyEntry>
+  retainedAgentsByPaneKey: Record<string, RetainedAgentEntry>
+  tabsByWorktree: Record<string, TerminalTab[]>
+  worktreeMap: Map<string, Worktree>
+  repoMap: Map<string, Repo>
+  acknowledgedAgentsByPaneKey: Record<string, number>
+  now: number
+}
+
+export function buildActivityEvents(args: BuildActivityEventsArgs): {
+  events: ActivityEvent[]
+  liveAgentByPaneKey: Record<string, ActivityLiveAgentSnapshot>
+} {
+  const events: ActivityEvent[] = []
+  const seenEventIds = new Set<string>()
+  const tabContext = new Map<string, { worktree: Worktree; tab: TerminalTab }>()
+  const liveAgentByPaneKey: Record<string, ActivityLiveAgentSnapshot> = {}
+
+  for (const [worktreeId, tabs] of Object.entries(args.tabsByWorktree)) {
+    const worktree = args.worktreeMap.get(worktreeId) ?? standaloneActivityWorktree(worktreeId)
+    for (const tab of tabs) {
+      tabContext.set(tab.id, { worktree, tab })
+    }
+  }
+
+  for (const [paneKey, entry] of Object.entries(args.agentStatusByPaneKey)) {
+    const parsed = parsePaneKey(paneKey)
+    if (!parsed) {
+      continue
+    }
+    const context = tabContext.get(parsed.tabId)
+    if (!context) {
+      continue
+    }
+    const ackAt = args.acknowledgedAgentsByPaneKey[paneKey] ?? 0
+    // Why: live status is separate from history; a fresh working turn updates the thread without counting as an unread done/blocked/waiting event.
+    const liveState = freshActivityLiveAgentState(entry, args.now)
+    if (liveState) {
+      liveAgentByPaneKey[paneKey] = {
+        state: liveState,
+        timestamp: entry.stateStartedAt,
+        worktree: context.worktree,
+        repo: args.repoMap.get(context.worktree.repoId) ?? null,
+        entry,
+        tab: context.tab,
+        agentType: entry.agentType ?? 'unknown'
+      }
+    }
+    appendActivityEventsForEntry({
+      events,
+      seenEventIds,
+      worktree: context.worktree,
+      repo: args.repoMap.get(context.worktree.repoId) ?? null,
+      entry,
+      tab: context.tab,
+      agentType: entry.agentType ?? 'unknown',
+      agentAlive: true,
+      acknowledgedAt: ackAt
+    })
+  }
+
+  appendUnsupportedAndRetainedEvents(args, events, seenEventIds, liveAgentByPaneKey, tabContext)
+  return { events: capActivityEvents(events), liveAgentByPaneKey }
+}
+
+function appendUnsupportedAndRetainedEvents(
+  args: BuildActivityEventsArgs,
+  events: ActivityEvent[],
+  seenEventIds: Set<string>,
+  liveAgentByPaneKey: Record<string, ActivityLiveAgentSnapshot>,
+  tabContext: Map<string, { worktree: Worktree; tab: TerminalTab }>
+): void {
+  for (const unsupported of Object.values(args.migrationUnsupportedByPtyId ?? {})) {
+    const entry = migrationUnsupportedToAgentStatusEntry(unsupported)
+    const parsed = entry ? parsePaneKey(entry.paneKey) : null
+    const context = parsed ? tabContext.get(parsed.tabId) : null
+    if (!entry || !context) {
+      continue
+    }
+    const ackAt = args.acknowledgedAgentsByPaneKey[entry.paneKey] ?? 0
+    liveAgentByPaneKey[entry.paneKey] = {
+      state: 'blocked',
+      timestamp: entry.stateStartedAt,
+      worktree: context.worktree,
+      repo: args.repoMap.get(context.worktree.repoId) ?? null,
+      entry,
+      tab: context.tab,
+      agentType: entry.agentType ?? 'unknown'
+    }
+    appendActivityEventsForEntry({
+      events,
+      seenEventIds,
+      worktree: context.worktree,
+      repo: args.repoMap.get(context.worktree.repoId) ?? null,
+      entry,
+      tab: context.tab,
+      agentType: entry.agentType ?? 'unknown',
+      agentAlive: false,
+      acknowledgedAt: ackAt,
+      migrationUnsupportedPtyId: unsupported.ptyId
+    })
+  }
+
+  for (const [paneKey, retained] of Object.entries(args.retainedAgentsByPaneKey)) {
+    if (!parsePaneKey(paneKey)) {
+      continue
+    }
+    const worktree =
+      args.worktreeMap.get(retained.worktreeId) ??
+      (args.tabsByWorktree[retained.worktreeId]
+        ? standaloneActivityWorktree(retained.worktreeId)
+        : null)
+    if (!worktree) {
+      continue
+    }
+    appendActivityEventsForEntry({
+      events,
+      seenEventIds,
+      worktree,
+      repo: args.repoMap.get(worktree.repoId) ?? null,
+      entry: retained.entry,
+      tab: retained.tab,
+      agentType: retained.agentType,
+      agentAlive: false,
+      acknowledgedAt: args.acknowledgedAgentsByPaneKey[paneKey] ?? 0
+    })
+  }
+}
diff --git a/src/renderer/src/components/activity/activity-event-cap.ts b/src/renderer/src/components/activity/activity-event-cap.ts
new file mode 100644
index 00000000000..c6b80d53823
--- /dev/null
+++ b/src/renderer/src/components/activity/activity-event-cap.ts
@@ -0,0 +1,41 @@
+import type { ActivityEvent } from './activity-thread-types'
+
+// Why: per-pane cap guarantees each agent appears in the left list even when one pane has a long history.
+const EVENTS_PER_PANE_CAP = 5
+
+export function capActivityEvents(events: ActivityEvent[]): ActivityEvent[] {
+  const sorted = events.sort((a, b) => b.timestamp - a.timestamp)
+  const perPaneCount = new Map<string, number>()
+  const includedEventIds = new Set<string>()
+  const capped: ActivityEvent[] = []
+  // Why: reserve each pane's newest event before the global 80-event cap so the validator's >16 panes × ≥5 events can't push a pane out of the window and hide it.
+  for (const event of sorted) {
+    const paneKey = event.entry.paneKey
+    if (perPaneCount.has(paneKey)) {
+      continue
+    }
+    if (capped.length >= 80) {
+      break
+    }
+    perPaneCount.set(paneKey, 1)
+    includedEventIds.add(event.id)
+    capped.push(event)
+  }
+  for (const event of sorted) {
+    if (includedEventIds.has(event.id)) {
+      continue
+    }
+    if (capped.length >= 80) {
+      break
+    }
+    const paneKey = event.entry.paneKey
+    const count = perPaneCount.get(paneKey) ?? 0
+    if (count >= EVENTS_PER_PANE_CAP) {
+      continue
+    }
+    perPaneCount.set(paneKey, count + 1)
+    includedEventIds.add(event.id)
+    capped.push(event)
+  }
+  return capped.sort((a, b) => b.timestamp - a.timestamp)
+}
diff --git a/src/renderer/src/components/activity/activity-filter-focus-shortcut.ts b/src/renderer/src/components/activity/activity-filter-focus-shortcut.ts
new file mode 100644
index 00000000000..f5cd22171b3
--- /dev/null
+++ b/src/renderer/src/components/activity/activity-filter-focus-shortcut.ts
@@ -0,0 +1,61 @@
+export function isActivityFilterFocusShortcut(
+  event: Pick<KeyboardEvent, 'altKey' | 'ctrlKey' | 'key' | 'metaKey' | 'shiftKey'>,
+  isMac = navigator.userAgent.includes('Mac')
+): boolean {
+  if (event.key.toLowerCase() !== 'f' || event.shiftKey || event.altKey) {
+    return false
+  }
+  return isMac ? event.metaKey && !event.ctrlKey : event.ctrlKey && !event.metaKey
+}
+
+export function shouldIgnoreActivityFilterFocusShortcutTarget(
+  target: Element | null,
+  terminalPortalTargets: (HTMLElement | null)[]
+): boolean {
+  if (!target) {
+    return false
+  }
+  // Why: workspace terminal stays mounted while Activity is open; only the Activity-portaled terminal keeps Cmd/Ctrl+F for terminal search.
+  return terminalPortalTargets.some((portalTarget) => portalTarget?.contains(target) ?? false)
+}
+
+export function handleActivityFilterFocusShortcut({
+  activeElement,
+  event,
+  input,
+  isMac,
+  terminalPortalTargets
+}: {
+  activeElement: Element | null
+  event: Pick<
+    KeyboardEvent,
+    | 'altKey'
+    | 'ctrlKey'
+    | 'key'
+    | 'metaKey'
+    | 'preventDefault'
+    | 'shiftKey'
+    | 'stopImmediatePropagation'
+    | 'stopPropagation'
+  >
+  input: Pick<HTMLInputElement, 'focus' | 'select'> | null
+  isMac?: boolean
+  terminalPortalTargets: (HTMLElement | null)[]
+}): boolean {
+  if (shouldIgnoreActivityFilterFocusShortcutTarget(activeElement, terminalPortalTargets)) {
+    return false
+  }
+  if (!isActivityFilterFocusShortcut(event, isMac)) {
+    return false
+  }
+  if (!input) {
+    return false
+  }
+  event.preventDefault()
+  // Why: hidden workspace xterms can retain focus behind Activity; stop the chord before xterm forwards it to a local/SSH PTY.
+  event.stopPropagation()
+  event.stopImmediatePropagation()
+  input.focus()
+  input.select()
+  return true
+}
diff --git a/src/renderer/src/components/activity/activity-prototype-page-exports.ts b/src/renderer/src/components/activity/activity-prototype-page-exports.ts
new file mode 100644
index 00000000000..46148bdf27a
--- /dev/null
+++ b/src/renderer/src/components/activity/activity-prototype-page-exports.ts
@@ -0,0 +1,18 @@
+export { buildActivityEvents } from './activity-event-builder'
+export { buildAgentPaneThreads } from './activity-thread-builder'
+export { activityThreadResponseRenderPreview } from './activity-thread-presentation'
+export {
+  ACTIVITY_SEARCH_QUERY_MAX_BYTES,
+  activityThreadMatchesSearchQuery,
+  buildActivityThreadGroups,
+  getActivityThreadGroup,
+  groupActivityThreadsByStatus,
+  isActivitySearchQueryTooLarge
+} from './activity-thread-grouping'
+export {
+  handleActivityFilterFocusShortcut,
+  isActivityFilterFocusShortcut,
+  shouldIgnoreActivityFilterFocusShortcutTarget
+} from './activity-filter-focus-shortcut'
+export { ActivityThreadOptionsMenu, ThreadAgentStateIndicator } from './activity-thread-controls'
+export { useActivityTerminalPortalStatus } from './activity-terminal-portal-status'
diff --git a/src/renderer/src/components/activity/activity-terminal-portal-status.ts b/src/renderer/src/components/activity/activity-terminal-portal-status.ts
new file mode 100644
index 00000000000..a3cbf52bc1f
--- /dev/null
+++ b/src/renderer/src/components/activity/activity-terminal-portal-status.ts
@@ -0,0 +1,231 @@
+import { useEffect, useLayoutEffect, useRef, useState } from 'react'
+import { parsePaneKey } from '../../../../shared/stable-pane-id'
+import {
+  ACTIVITY_PORTAL_READINESS_BURST_WINDOW_MS,
+  createActivityPortalReadinessLatch,
+  type ActivityPortalReadinessLatch
+} from './activity-portal-readiness-oscillation'
+import type {
+  ActivityTerminalPortalDomStatus,
+  ActivityTerminalPortalReadiness,
+  ActivityTerminalPortalSlotId
+} from './activity-thread-types'
+
+const ACTIVITY_TERMINAL_LOADING_LABEL_DELAY_MS = 180
+
+function findActivityTerminalPane(
+  root: HTMLElement,
+  leafId: string
+): { foundAnyPane: boolean; pane: HTMLElement | null } {
+  let foundAnyPane = false
+  for (const candidate of root.querySelectorAll<HTMLElement>('[data-leaf-id]')) {
+    foundAnyPane = true
+    if (candidate.dataset.leafId === leafId) {
+      return { foundAnyPane, pane: candidate }
+    }
+  }
+  return { foundAnyPane, pane: null }
+}
+
+function hasInlineDisplayNoneBetween(element: HTMLElement, root: HTMLElement): boolean {
+  let current: HTMLElement | null = element
+  while (current) {
+    if (current.style.display === 'none') {
+      return true
+    }
+    if (current === root) {
+      return false
+    }
+    current = current.parentElement
+  }
+  return false
+}
+
+function hasUnhiddenSiblingPane(root: HTMLElement, selectedPane: HTMLElement): boolean {
+  for (const candidate of root.querySelectorAll<HTMLElement>('[data-leaf-id]')) {
+    if (candidate !== selectedPane && !hasInlineDisplayNoneBetween(candidate, root)) {
+      return true
+    }
+  }
+  return false
+}
+
+function getSelectedActivityTerminalPortalStatus(
+  target: HTMLElement,
+  paneKey: string
+): ActivityTerminalPortalDomStatus {
+  const parsed = parsePaneKey(paneKey)
+  if (!parsed) {
+    return { ready: false, unavailable: true }
+  }
+  let selectedRoot: HTMLElement | null = null
+  for (const candidate of target.querySelectorAll<HTMLElement>('[data-terminal-tab-id]')) {
+    if (candidate.dataset.terminalTabId === parsed.tabId) {
+      selectedRoot = candidate
+      break
+    }
+  }
+  if (!selectedRoot) {
+    return { ready: false, unavailable: false }
+  }
+
+  const { foundAnyPane, pane: selectedPane } = findActivityTerminalPane(selectedRoot, parsed.leafId)
+  if (!selectedPane) {
+    return { ready: false, unavailable: foundAnyPane }
+  }
+
+  const unavailable = hasInlineDisplayNoneBetween(selectedPane, selectedRoot)
+  const hasUnisolatedSibling = hasUnhiddenSiblingPane(selectedRoot, selectedPane)
+  const isVisibleRoot =
+    !unavailable && (selectedPane.offsetParent !== null || selectedPane.getClientRects().length > 0)
+  const hasPtyBinding =
+    selectedPane.hasAttribute('data-pty-id') ||
+    selectedPane.querySelector<HTMLElement>('[data-pty-id]') !== null
+  const hasXtermScreen = selectedPane.querySelector<HTMLElement>('.xterm-screen') !== null
+  return {
+    ready: isVisibleRoot && !hasUnisolatedSibling && hasPtyBinding && hasXtermScreen,
+    unavailable
+  }
+}
+
+export function useActivityTerminalPortalStatus(
+  target: HTMLElement | null,
+  paneKey: string | null,
+  forceUnavailable = false
+): ActivityTerminalPortalReadiness['status'] {
+  const [readiness, setReadiness] = useState<ActivityTerminalPortalReadiness>({
+    target: null,
+    paneKey: null,
+    status: 'loading'
+  })
+  // Why: portal churn replaces every subscription identity, so the burst budget must outlive it.
+  const readinessLatchRef = useRef<ActivityPortalReadinessLatch | null>(null)
+
+  useLayoutEffect(() => {
+    let disposed = false
+    let readinessFrame: number | null = null
+    let readinessReleaseTimer: number | null = null
+    let pendingStatus: ActivityTerminalPortalReadiness['status'] | null = null
+
+    // Why: coalesce observer bursts and cancel frames from stale portal subscriptions.
+    const scheduleReadiness = (status: ActivityTerminalPortalReadiness['status']): void => {
+      if (disposed) {
+        return
+      }
+      pendingStatus = status
+      if (readinessFrame !== null) {
+        return
+      }
+      readinessFrame = requestAnimationFrame(() => {
+        readinessFrame = null
+        const nextStatus = pendingStatus
+        pendingStatus = null
+        if (disposed || nextStatus === null) {
+          return
+        }
+        setReadiness((prev) =>
+          prev.target === target && prev.paneKey === paneKey && prev.status === nextStatus
+            ? prev
+            : { target, paneKey, status: nextStatus }
+        )
+      })
+    }
+
+    const disposeFrame = (): void => {
+      disposed = true
+      if (readinessFrame !== null) {
+        cancelAnimationFrame(readinessFrame)
+        readinessFrame = null
+      }
+      if (readinessReleaseTimer !== null) {
+        window.clearTimeout(readinessReleaseTimer)
+        readinessReleaseTimer = null
+      }
+    }
+
+    if (!target || !paneKey) {
+      scheduleReadiness('loading')
+      return disposeFrame
+    }
+    if (forceUnavailable) {
+      scheduleReadiness('unavailable')
+      return disposeFrame
+    }
+
+    const readinessLatch = (readinessLatchRef.current ??= createActivityPortalReadinessLatch())
+
+    const updateReadiness = (status: ActivityTerminalPortalReadiness['status']): void => {
+      const nextStatus = readinessLatch.next(status)
+      scheduleReadiness(nextStatus)
+      if (readinessReleaseTimer !== null) {
+        window.clearTimeout(readinessReleaseTimer)
+        readinessReleaseTimer = null
+      }
+      if (nextStatus !== status) {
+        // Why: a quiet loading pane has no mutation to release the burst latch on its own.
+        readinessReleaseTimer = window.setTimeout(
+          checkReadiness,
+          ACTIVITY_PORTAL_READINESS_BURST_WINDOW_MS
+        )
+      }
+    }
+
+    const checkReadiness = (): void => {
+      const status = getSelectedActivityTerminalPortalStatus(target, paneKey)
+      if (status.unavailable) {
+        updateReadiness('unavailable')
+        return
+      }
+      if (status.ready) {
+        updateReadiness('ready')
+        return
+      }
+      updateReadiness('loading')
+    }
+
+    checkReadiness()
+
+    const observer = new MutationObserver(checkReadiness)
+    observer.observe(target, {
+      childList: true,
+      subtree: true,
+      attributes: true,
+      attributeFilter: ['data-terminal-tab-id', 'data-leaf-id', 'data-pty-id', 'style']
+    })
+
+    return () => {
+      disposeFrame()
+      observer.disconnect()
+    }
+  }, [target, paneKey, forceUnavailable])
+
+  return readiness.target === target && readiness.paneKey === paneKey ? readiness.status : 'loading'
+}
+
+export function otherActivityTerminalSlot(
+  slotId: ActivityTerminalPortalSlotId
+): ActivityTerminalPortalSlotId {
+  return slotId === 'primary' ? 'secondary' : 'primary'
+}
+
+export function useActivityTerminalLoadingLabel(loading: boolean): boolean {
+  const [visible, setVisible] = useState(false)
+  const [visibleLoading, setVisibleLoading] = useState(loading)
+
+  if (visibleLoading !== loading) {
+    setVisibleLoading(loading)
+    if (visible) {
+      setVisible(false)
+    }
+  }
+
+  useEffect(() => {
+    if (!loading) {
+      return
+    }
+    const timer = setTimeout(() => setVisible(true), ACTIVITY_TERMINAL_LOADING_LABEL_DELAY_MS)
+    return () => clearTimeout(timer)
+  }, [loading])
+
+  return loading && visible
+}
diff --git a/src/renderer/src/components/activity/activity-thread-actions.ts b/src/renderer/src/components/activity/activity-thread-actions.ts
new file mode 100644
index 00000000000..f1e1ff6ae5b
--- /dev/null
+++ b/src/renderer/src/components/activity/activity-thread-actions.ts
@@ -0,0 +1,91 @@
+import { activateTabAndFocusPane } from '@/lib/activate-tab-and-focus-pane'
+import { activateAndRevealWorktree } from '@/lib/worktree-activation'
+import { useAppStore } from '@/store'
+import { getWorktreeMapFromState } from '@/store/selectors'
+import { parsePaneKey } from '../../../../shared/stable-pane-id'
+import type { AgentPaneThread } from './activity-thread-types'
+
+export function createActivityThreadActions({
+  allThreads,
+  acknowledgeAgents,
+  unacknowledgeAgents,
+  setSelectedPaneKey
+}: {
+  allThreads: AgentPaneThread[]
+  acknowledgeAgents: (paneKeys: string[]) => void
+  unacknowledgeAgents: (paneKeys: string[]) => void
+  setSelectedPaneKey: (paneKey: string | null) => void
+}): {
+  hasUnreadThreads: boolean
+  markThreadUnread: (thread: AgentPaneThread) => void
+  selectThread: (thread: AgentPaneThread) => void
+  jumpToWorkspace: (thread: AgentPaneThread) => void
+  markAllThreadsRead: () => void
+} {
+  const markThreadRead = (thread: AgentPaneThread): void => {
+    acknowledgeAgents([thread.paneKey])
+  }
+
+  const markThreadUnread = (thread: AgentPaneThread): void => {
+    unacknowledgeAgents([thread.paneKey])
+  }
+
+  const activateThreadTerminal = (thread: AgentPaneThread): void => {
+    const state = useAppStore.getState()
+    const worktree = getWorktreeMapFromState(state).get(thread.worktree.id)
+    if (!worktree) {
+      return
+    }
+    // Why: retained-agent threads can outlive their tab; without a live tab, reorienting the workspace and focusing a dead tab id would just confuse the user.
+    const liveTabs = state.tabsByWorktree[worktree.id] ?? []
+    const hasLiveTab = liveTabs.some((t) => t.id === thread.tab.id)
+    if (!hasLiveTab) {
+      return
+    }
+    if (state.activeRepoId !== worktree.repoId) {
+      state.setActiveRepo(worktree.repoId)
+    }
+    if (state.activeWorktreeId !== worktree.id) {
+      state.setActiveWorktree(worktree.id)
+    }
+    state.setActiveTabType('terminal')
+    const parsed = parsePaneKey(thread.paneKey)
+    activateTabAndFocusPane(
+      thread.tab.id,
+      parsed && parsed.tabId === thread.tab.id ? parsed.leafId : null,
+      { scrollToBottomIfOutputSinceLastView: true }
+    )
+  }
+
+  const selectThread = (thread: AgentPaneThread): void => {
+    setSelectedPaneKey(thread.paneKey)
+    activateThreadTerminal(thread)
+  }
+
+  const jumpToWorkspace = (thread: AgentPaneThread): void => {
+    const state = useAppStore.getState()
+    if (!getWorktreeMapFromState(state).has(thread.worktree.id)) {
+      return
+    }
+    markThreadRead(thread)
+    activateAndRevealWorktree(thread.worktree.id)
+  }
+
+  const hasUnreadThreads = allThreads.some((thread) => thread.unread)
+
+  const markAllThreadsRead = (): void => {
+    const unreadKeys = allThreads.filter((t) => t.unread).map((t) => t.paneKey)
+    if (unreadKeys.length === 0) {
+      return
+    }
+    acknowledgeAgents(unreadKeys)
+  }
+
+  return {
+    hasUnreadThreads,
+    markThreadUnread,
+    selectThread,
+    jumpToWorkspace,
+    markAllThreadsRead
+  }
+}
diff --git a/src/renderer/src/components/activity/activity-thread-builder.ts b/src/renderer/src/components/activity/activity-thread-builder.ts
new file mode 100644
index 00000000000..8ba6ab4f5fd
--- /dev/null
+++ b/src/renderer/src/components/activity/activity-thread-builder.ts
@@ -0,0 +1,101 @@
+import {
+  paneTitleForEntry,
+  paneTitleForEvent,
+  statusPreviewForEntry
+} from './activity-thread-presentation'
+import type {
+  ActivityEvent,
+  ActivityLiveAgentSnapshot,
+  AgentPaneThread
+} from './activity-thread-types'
+
+export function buildAgentPaneThreads(args: {
+  events: ActivityEvent[]
+  liveAgentByPaneKey: Record<string, ActivityLiveAgentSnapshot>
+  generatedTitlesEnabled?: boolean
+}): AgentPaneThread[] {
+  const generatedTitlesEnabled = args.generatedTitlesEnabled === true
+  const byPaneKey = new Map<string, AgentPaneThread>()
+  for (const event of args.events) {
+    const paneKey = event.entry.paneKey
+    const existing = byPaneKey.get(paneKey)
+    if (!existing) {
+      byPaneKey.set(paneKey, {
+        paneKey,
+        paneTitle: paneTitleForEvent(event, generatedTitlesEnabled),
+        worktree: event.worktree,
+        repo: event.repo,
+        tab: event.tab,
+        agentType: event.agentType,
+        currentAgentState: null,
+        currentAgentEntry: null,
+        responsePreview: statusPreviewForEntry(event.entry, event.state),
+        latestTimestamp: event.timestamp,
+        latestEvent: event,
+        events: [event],
+        migrationUnsupportedPtyId: event.migrationUnsupportedPtyId,
+        unread: event.unread
+      })
+      continue
+    }
+    existing.events.push(event)
+    existing.unread = existing.unread || event.unread
+    existing.migrationUnsupportedPtyId =
+      existing.migrationUnsupportedPtyId ?? event.migrationUnsupportedPtyId
+    if (!existing.latestEvent || event.timestamp > existing.latestEvent.timestamp) {
+      existing.latestEvent = event
+      existing.paneTitle = paneTitleForEvent(event, generatedTitlesEnabled)
+      existing.agentType = event.agentType
+      existing.tab = event.tab
+      existing.responsePreview = statusPreviewForEntry(
+        event.entry,
+        event.state,
+        existing.responsePreview
+      )
+      existing.latestTimestamp = event.timestamp
+    }
+  }
+
+  for (const [paneKey, liveAgent] of Object.entries(args.liveAgentByPaneKey)) {
+    const existing = byPaneKey.get(paneKey)
+    if (!existing) {
+      byPaneKey.set(paneKey, {
+        paneKey,
+        paneTitle: paneTitleForEntry(liveAgent.entry, liveAgent.tab, generatedTitlesEnabled),
+        worktree: liveAgent.worktree,
+        repo: liveAgent.repo,
+        tab: liveAgent.tab,
+        agentType: liveAgent.agentType,
+        currentAgentState: liveAgent.state,
+        currentAgentEntry: liveAgent.entry,
+        responsePreview: statusPreviewForEntry(liveAgent.entry, liveAgent.entry.state),
+        latestTimestamp: liveAgent.timestamp,
+        latestEvent: null,
+        events: [],
+        unread: false
+      })
+      continue
+    }
+    // Why: row title/time/target must follow the active turn (not historical events) so a running agent never shows the previous prompt as primary.
+    existing.paneTitle = paneTitleForEntry(liveAgent.entry, liveAgent.tab, generatedTitlesEnabled)
+    existing.worktree = liveAgent.worktree
+    existing.repo = liveAgent.repo
+    existing.tab = liveAgent.tab
+    existing.agentType = liveAgent.agentType
+    existing.currentAgentState = liveAgent.state
+    existing.currentAgentEntry = liveAgent.entry
+    existing.responsePreview = statusPreviewForEntry(
+      liveAgent.entry,
+      liveAgent.entry.state,
+      existing.responsePreview
+    )
+    existing.latestTimestamp = liveAgent.timestamp
+  }
+
+  return Array.from(byPaneKey.values())
+    .map((thread) => ({
+      ...thread,
+      events: [...thread.events].sort((a, b) => b.timestamp - a.timestamp)
+    }))
+    .sort((a, b) => b.latestTimestamp - a.latestTimestamp)
+}
diff --git a/src/renderer/src/components/activity/activity-thread-controls.tsx b/src/renderer/src/components/activity/activity-thread-controls.tsx
new file mode 100644
index 00000000000..f6cb249c9fc
--- /dev/null
+++ b/src/renderer/src/components/activity/activity-thread-controls.tsx
@@ -0,0 +1,172 @@
+import React from 'react'
+import { MoreVertical } from 'lucide-react'
+import { AgentStateDot } from '@/components/AgentStateDot'
+import { Button } from '@/components/ui/button'
+import {
+  DropdownMenu,
+  DropdownMenuCheckboxItem,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuSeparator,
+  DropdownMenuTrigger
+} from '@/components/ui/dropdown-menu'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
+import { translate } from '@/i18n/i18n'
+import { RepoBadgeMark } from '@/components/repo/RepoBadgeLabel'
+import type { Repo } from '../../../../shared/repo-types'
+import {
+  formatAbsoluteDate,
+  formatRelativeTime,
+  threadAgentState,
+  threadAgentStateLabel
+} from './activity-thread-presentation'
+import type { ActivityThreadGroup, AgentPaneThread } from './activity-thread-types'
+
+export function EventTime({ timestamp }: { timestamp: number }): React.JSX.Element {
+  const absolute = formatAbsoluteDate(timestamp)
+  return (
+    <Tooltip>
+      <TooltipTrigger asChild>
+        <button
+          type="button"
+          className="rounded px-1 py-0.5 text-xs text-muted-foreground hover:text-foreground focus-visible:ring-[3px] focus-visible:ring-ring/50 focus-visible:outline-none"
+          aria-label={absolute}
+          onClick={(event) => event.stopPropagation()}
+        >
+          {formatRelativeTime(timestamp)}
+        </button>
+      </TooltipTrigger>
+      <TooltipContent side="right" sideOffset={6}>
+        {absolute}
+      </TooltipContent>
+    </Tooltip>
+  )
+}
+
+export function ActivityThreadOptionsMenu({
+  compactMode,
+  hasUnreadThreads,
+  onCompactModeChange,
+  onMarkAllThreadsRead
+}: {
+  compactMode: boolean
+  hasUnreadThreads: boolean
+  onCompactModeChange: (compactMode: boolean) => void
+  onMarkAllThreadsRead: () => void
+}): React.JSX.Element {
+  return (
+    <DropdownMenu>
+      <Tooltip>
+        <TooltipTrigger asChild>
+          {/* Why: keep Tooltip and Dropdown from composing refs onto the same button (Radix setRef crash loop). */}
+          <span className="inline-flex shrink-0">
+            <DropdownMenuTrigger asChild>
+              <Button
+                type="button"
+                variant="outline"
+                size="sm"
+                className="size-8 shrink-0 border-input bg-transparent p-0 text-muted-foreground shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-transparent dark:hover:bg-accent dark:hover:text-accent-foreground"
+                aria-label={translate(
+                  'auto.components.activity.ActivityPrototypePage.db8a1878b5',
+                  'Thread list options'
+                )}
+              >
+                <MoreVertical className="size-3.5" />
+              </Button>
+            </DropdownMenuTrigger>
+          </span>
+        </TooltipTrigger>
+        <TooltipContent side="bottom">
+          {translate('auto.components.activity.ActivityPrototypePage.a472a14700', 'More options')}
+        </TooltipContent>
+      </Tooltip>
+      <DropdownMenuContent align="end" sideOffset={6}>
+        <DropdownMenuCheckboxItem
+          checked={compactMode}
+          onCheckedChange={(checked) => onCompactModeChange(checked === true)}
+          onSelect={(event) => event.preventDefault()}
+        >
+          {translate('auto.components.activity.ActivityPrototypePage.f70e4bec47', 'Compact mode')}
+        </DropdownMenuCheckboxItem>
+        <DropdownMenuSeparator />
+        <DropdownMenuItem onSelect={onMarkAllThreadsRead} disabled={!hasUnreadThreads}>
+          {translate('auto.components.activity.ActivityPrototypePage.023ff75afe', 'Mark all read')}
+        </DropdownMenuItem>
+      </DropdownMenuContent>
+    </DropdownMenu>
+  )
+}
+
+export function ActivityProjectLabel({ repo }: { repo: Repo | null }): React.JSX.Element {
+  const label =
+    repo?.displayName?.trim() ||
+    translate('auto.components.activity.ActivityPrototypePage.5651b216c6', 'Unknown project')
+  return (
+    <div className="flex min-w-0 items-center gap-1.5">
+      {repo ? <RepoBadgeMark color={repo.badgeColor} /> : null}
+      <span
+        className="min-w-0 truncate text-[11px] font-semibold uppercase tracking-[0.04em] text-muted-foreground"
+        title={label}
+      >
+        {label}
+      </span>
+    </div>
+  )
+}
+
+export function EventRepoBadge({ repo }: { repo: Repo | null }): React.JSX.Element | null {
+  if (!repo) {
+    return null
+  }
+  return (
+    <div className="flex min-w-0 shrink-0 items-center gap-1.5 rounded-[4px] border border-border bg-accent px-1.5 py-0.5 dark:border-border/60 dark:bg-accent/50">
+      <RepoBadgeMark color={repo.badgeColor} />
+      <span className="max-w-[6rem] truncate text-[10px] font-semibold leading-none text-foreground lowercase">
+        {repo.displayName}
+      </span>
+    </div>
+  )
+}
+
+export function ThreadAgentStateIndicator({
+  thread
+}: {
+  thread: AgentPaneThread
+}): React.JSX.Element {
+  const state = threadAgentState(thread)
+  const label = threadAgentStateLabel(thread)
+  return (
+    <Tooltip>
+      <TooltipTrigger asChild>
+        <span className="inline-flex size-4 shrink-0 items-center justify-center">
+          <AgentStateDot state={state} size="md" title={null} />
+        </span>
+      </TooltipTrigger>
+      <TooltipContent side="top" sideOffset={4}>
+        {label}
+      </TooltipContent>
+    </Tooltip>
+  )
+}
+
+export function ActivityStatusGroupHeader({
+  group
+}: {
+  group: ActivityThreadGroup
+}): React.JSX.Element {
+  return (
+    <div className="sticky top-0 z-10 flex items-center gap-2 border-b border-border bg-background/95 px-3 py-1.5 backdrop-blur supports-[backdrop-filter]:bg-background/80">
+      {group.state ? (
+        <span className="inline-flex size-4 shrink-0 items-center justify-center">
+          <AgentStateDot state={group.state} size="sm" />
+        </span>
+      ) : null}
+      <span className="min-w-0 flex-1 truncate text-[11px] font-semibold uppercase tracking-[0.05em] text-muted-foreground">
+        {group.label}
+      </span>
+      <span className="rounded-full border border-border bg-accent px-1.5 py-0.5 text-[10px] font-semibold leading-none text-muted-foreground">
+        {group.threads.length}
+      </span>
+    </div>
+  )
+}
diff --git a/src/renderer/src/components/activity/activity-thread-detail-pane.tsx b/src/renderer/src/components/activity/activity-thread-detail-pane.tsx
new file mode 100644
index 00000000000..62be2a953dd
--- /dev/null
+++ b/src/renderer/src/components/activity/activity-thread-detail-pane.tsx
@@ -0,0 +1,161 @@
+import React from 'react'
+import { MessageSquareText, TerminalSquare } from 'lucide-react'
+import { AgentIcon } from '@/lib/agent-catalog'
+import { agentTypeToIconAgent } from '@/lib/agent-status'
+import { cn } from '@/lib/utils'
+import { translate } from '@/i18n/i18n'
+import { EventRepoBadge, ThreadAgentStateIndicator } from './activity-thread-controls'
+import type { ActivityTerminalPortalSlotId, AgentPaneThread } from './activity-thread-types'
+
+export function ActivityThreadDetailPane({
+  selectedThread,
+  selectedHasLiveTab,
+  selectedWorktreeAvailable,
+  visibleThread,
+  stagedThread,
+  activePortalSlotId,
+  setPrimaryPortalTarget,
+  setSecondaryPortalTarget,
+  visiblePortalReady,
+  visiblePortalUnavailable,
+  showTerminalLoadingLabel,
+  visibleThreadCount
+}: {
+  selectedThread: AgentPaneThread | null
+  selectedHasLiveTab: boolean
+  selectedWorktreeAvailable: boolean
+  visibleThread: AgentPaneThread | null
+  stagedThread: AgentPaneThread | null
+  activePortalSlotId: ActivityTerminalPortalSlotId
+  setPrimaryPortalTarget: (target: HTMLElement | null) => void
+  setSecondaryPortalTarget: (target: HTMLElement | null) => void
+  visiblePortalReady: boolean
+  visiblePortalUnavailable: boolean
+  showTerminalLoadingLabel: boolean
+  visibleThreadCount: number
+}): React.JSX.Element {
+  return (
+    <section className="min-w-0 flex-1 overflow-hidden">
+      {selectedThread ? (
+        <div className="flex h-full min-h-0 flex-col">
+          {/* Why (no header action button): per-card hover actions (Mark unread, Open) are the primary controls now, so the header keeps just the thread identity. */}
+          <div className="flex shrink-0 items-start gap-4 border-b border-border px-4 pt-2 pb-3">
+            <div className="min-w-0">
+              <div className="flex min-w-0 items-start gap-2">
+                <span className="inline-flex shrink-0 items-start gap-1">
+                  <ThreadAgentStateIndicator thread={selectedThread} />
+                  <span className="inline-flex shrink-0 pt-[3px]">
+                    <AgentIcon agent={agentTypeToIconAgent(selectedThread.agentType)} size={16} />
+                  </span>
+                </span>
+                <h2 className="line-clamp-3 break-words text-sm font-semibold leading-snug">
+                  {selectedThread.paneTitle}
+                </h2>
+              </div>
+              <div className="mt-1 flex min-w-0 items-center gap-1.5 pl-11">
+                <EventRepoBadge repo={selectedThread.repo} />
+                <span className="truncate text-xs text-muted-foreground">
+                  {selectedThread.worktree.displayName}
+                </span>
+              </div>
+            </div>
+          </div>
+          {/* Why: Terminal stays mounted in the hidden workspace tree; this target moves that existing TerminalPane here instead of spawning a second PTY/xterm owner. */}
+          {(() => {
+            // Why: retained threads can outlive their tab; portal needs a live TerminalPane to render into.
+            if (!selectedHasLiveTab) {
+              return (
+                <div className="flex min-h-0 flex-1 flex-col items-center justify-center gap-2 p-4 text-sm text-muted-foreground">
+                  <TerminalSquare className="size-7" />
+                  {selectedWorktreeAvailable
+                    ? translate(
+                        'auto.components.activity.ActivityPrototypePage.afdc2139a8',
+                        'Agent terminal closed. Open a new terminal in this workspace to continue.'
+                      )
+                    : translate(
+                        'auto.components.activity.ActivityPrototypePage.22b22034bc',
+                        'Standalone terminal unavailable in Activity.'
+                      )}
+                </div>
+              )
+            }
+            return (
+              <div className="relative min-h-0 flex-1 overflow-hidden bg-editor-surface">
+                <div
+                  ref={setPrimaryPortalTarget}
+                  className={cn(
+                    'absolute inset-0 min-h-0 min-w-0',
+                    activePortalSlotId === 'primary'
+                      ? 'z-10 opacity-100'
+                      : 'pointer-events-none z-0 opacity-0'
+                  )}
+                  aria-hidden={activePortalSlotId !== 'primary'}
+                  data-activity-terminal-slot-id="primary"
+                />
+                <div
+                  ref={setSecondaryPortalTarget}
+                  className={cn(
+                    'absolute inset-0 min-h-0 min-w-0',
+                    activePortalSlotId === 'secondary'
+                      ? 'z-10 opacity-100'
+                      : 'pointer-events-none z-0 opacity-0'
+                  )}
+                  aria-hidden={activePortalSlotId !== 'secondary'}
+                  data-activity-terminal-slot-id="secondary"
+                />
+                {visibleThread && !stagedThread && !visiblePortalReady ? (
+                  <div
+                    className="pointer-events-none absolute inset-0 z-20 bg-editor-surface"
+                    aria-hidden="true"
+                  >
+                    {visiblePortalUnavailable ? (
+                      <div className="ml-3 mt-3 inline-flex items-center gap-2 rounded-md border border-border bg-background/85 px-2 py-1 text-xs text-muted-foreground shadow-xs">
+                        <span className="h-3 w-1.5 rounded-sm bg-muted-foreground/70" />
+                        <span>
+                          {translate(
+                            'auto.components.activity.ActivityPrototypePage.8de7c5beaa',
+                            'Terminal unavailable'
+                          )}
+                        </span>
+                      </div>
+                    ) : showTerminalLoadingLabel ? (
+                      <div className="ml-3 mt-3 inline-flex items-center gap-2 rounded-md border border-border bg-background/85 px-2 py-1 text-xs text-muted-foreground shadow-xs">
+                        <span className="h-3 w-1.5 animate-pulse rounded-sm bg-muted-foreground/70" />
+                        <span>
+                          {translate(
+                            'auto.components.activity.ActivityPrototypePage.1b633f5c1e',
+                            'Connecting terminal...'
+                          )}
+                        </span>
+                      </div>
+                    ) : null}
+                  </div>
+                ) : null}
+              </div>
+            )
+          })()}
+        </div>
+      ) : (
+        <div className="flex h-full min-h-[240px] flex-col items-center justify-center gap-2 text-sm text-muted-foreground">
+          {visibleThreadCount === 0 ? (
+            <>
+              <MessageSquareText className="size-7" />
+              {translate(
+                'auto.components.activity.ActivityPrototypePage.e3db9892f6',
+                'No activity yet.'
+              )}
+            </>
+          ) : (
+            <>
+              <TerminalSquare className="size-7" />
+              {translate(
+                'auto.components.activity.ActivityPrototypePage.cf780197a1',
+                'Select an agent to view its activity'
+              )}
+            </>
+          )}
+        </div>
+      )}
+    </section>
+  )
+}
diff --git a/src/renderer/src/components/activity/activity-thread-grouping.ts b/src/renderer/src/components/activity/activity-thread-grouping.ts
new file mode 100644
index 00000000000..1744c0b84f6
--- /dev/null
+++ b/src/renderer/src/components/activity/activity-thread-grouping.ts
@@ -0,0 +1,159 @@
+import { agentStateLabel, type AgentDotState } from '@/components/AgentStateDot'
+import { translate } from '@/i18n/i18n'
+import { formatAgentTypeLabel } from '@/lib/agent-status'
+import { getAgentRowPrimaryText } from '@/lib/agent-row-primary-text'
+import { getActivityThreadWorkspaceTitle } from '@/lib/activity-thread-display'
+import { isClipboardTextByteLengthOverLimit } from '../../../../shared/clipboard-text'
+import {
+  agentMeta,
+  agentSummary,
+  agentTitle,
+  threadAgentState,
+  threadAgentStateLabel
+} from './activity-thread-presentation'
+import type {
+  ActivityGroupBy,
+  ActivityStatusGroupId,
+  ActivityThreadGroup,
+  AgentPaneThread
+} from './activity-thread-types'
+
+const ACTIVITY_STATUS_GROUP_ORDER: ActivityStatusGroupId[] = [
+  'working',
+  'monitoring',
+  'blocked',
+  'waiting',
+  'done',
+  'interrupted'
+]
+
+export function getActivityThreadGroup(
+  thread: AgentPaneThread,
+  groupBy: ActivityGroupBy
+): { key: string; label: string } {
+  if (groupBy === 'status') {
+    const state = threadAgentState(thread)
+    if (!thread.currentAgentState && state === 'done' && thread.latestEvent?.entry.interrupted) {
+      return { key: 'done:interrupted', label: threadAgentStateLabel(thread) }
+    }
+    return { key: state, label: threadAgentStateLabel(thread) }
+  }
+  if (groupBy === 'project') {
+    return thread.repo
+      ? { key: `project:${thread.repo.id}`, label: thread.repo.displayName }
+      : {
+          key: 'project:unknown',
+          label: translate(
+            'auto.components.activity.ActivityPrototypePage.5651b216c6',
+            'Unknown project'
+          )
+        }
+  }
+  if (groupBy === 'worktree') {
+    return { key: `worktree:${thread.worktree.id}`, label: thread.worktree.displayName }
+  }
+  return { key: `agent:${thread.agentType}`, label: formatAgentTypeLabel(thread.agentType) }
+}
+
+export function buildActivityThreadGroups(
+  threads: AgentPaneThread[],
+  groupBy: ActivityGroupBy
+): ActivityThreadGroup[] {
+  const groups: ActivityThreadGroup[] = []
+  const groupIndexByKey = new Map<string, number>()
+  for (const thread of threads) {
+    const group = getActivityThreadGroup(thread, groupBy)
+    const existingIndex = groupIndexByKey.get(group.key)
+    if (existingIndex === undefined) {
+      groups.push({ key: group.key, label: group.label, threads: [thread] })
+      groupIndexByKey.set(group.key, groups.length - 1)
+      continue
+    }
+    groups[existingIndex].threads.push(thread)
+  }
+  return groups
+}
+
+function threadStatusGroupId(thread: AgentPaneThread): ActivityStatusGroupId {
+  const state = threadAgentState(thread)
+  if (!thread.currentAgentState && state === 'done' && thread.latestEvent?.entry.interrupted) {
+    return 'interrupted'
+  }
+  return state === 'working' || state === 'monitoring' || state === 'blocked' || state === 'waiting'
+    ? state
+    : 'done'
+}
+
+function threadStatusGroupState(id: ActivityStatusGroupId): AgentDotState {
+  return id === 'interrupted' ? 'done' : id
+}
+
+function threadStatusGroupLabel(id: ActivityStatusGroupId): string {
+  if (id === 'interrupted') {
+    return 'Interrupted'
+  }
+  return agentStateLabel(threadStatusGroupState(id))
+}
+
+export function groupActivityThreadsByStatus(threads: AgentPaneThread[]): ActivityThreadGroup[] {
+  const groups = new Map<ActivityStatusGroupId, AgentPaneThread[]>()
+  for (const thread of threads) {
+    const groupId = threadStatusGroupId(thread)
+    groups.set(groupId, [...(groups.get(groupId) ?? []), thread])
+  }
+  return ACTIVITY_STATUS_GROUP_ORDER.flatMap((id) => {
+    const groupThreads = groups.get(id) ?? []
+    if (groupThreads.length === 0) {
+      return []
+    }
+    return [
+      {
+        key: id,
+        id,
+        label: threadStatusGroupLabel(id),
+        state: threadStatusGroupState(id),
+        threads: groupThreads
+      }
+    ]
+  })
+}
+
+function threadSearchText(thread: AgentPaneThread): string {
+  const latest = thread.latestEvent
+  const stateLabel = threadAgentStateLabel(thread)
+  const currentPrompt = thread.currentAgentEntry
+    ? getAgentRowPrimaryText(thread.currentAgentEntry)
+    : ''
+  const rawCurrentPrompt = thread.currentAgentEntry?.prompt.trim() ?? ''
+  const currentSummary = thread.currentAgentEntry?.lastAssistantMessage?.trim() ?? ''
+  const latestEventText = latest
+    ? `${agentTitle(latest)} ${agentSummary(latest)} ${agentMeta(latest)}`
+    : ''
+  return `${thread.paneTitle} ${getActivityThreadWorkspaceTitle(thread.worktree)} ${thread.worktree.branch ?? ''} ${thread.repo?.displayName ?? ''} ${formatAgentTypeLabel(thread.agentType)} ${stateLabel} ${currentPrompt} ${rawCurrentPrompt} ${currentSummary} ${thread.responsePreview} ${latestEventText}`.toLowerCase()
+}
+
+export const ACTIVITY_SEARCH_QUERY_MAX_BYTES = 2 * 1024
+
+export function isActivitySearchQueryTooLarge(
+  query: string,
+  maxBytes = ACTIVITY_SEARCH_QUERY_MAX_BYTES
+): boolean {
+  return isClipboardTextByteLengthOverLimit(query, maxBytes)
+}
+
+export function activityThreadMatchesSearchQuery({
+  thread,
+  searchQuery
+}: {
+  thread: AgentPaneThread
+  searchQuery: string
+}): boolean {
+  if (isActivitySearchQueryTooLarge(searchQuery)) {
+    return false
+  }
+  const trimmedQuery = searchQuery.trim()
+  if (!trimmedQuery) {
+    return true
+  }
+  return threadSearchText(thread).includes(trimmedQuery.toLowerCase())
+}
diff --git a/src/renderer/src/components/activity/activity-thread-list-pane.tsx b/src/renderer/src/components/activity/activity-thread-list-pane.tsx
new file mode 100644
index 00000000000..4411d385e0b
--- /dev/null
+++ b/src/renderer/src/components/activity/activity-thread-list-pane.tsx
@@ -0,0 +1,217 @@
+import React from 'react'
+import { BellDot, Search } from 'lucide-react'
+import { Input } from '@/components/ui/input'
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue
+} from '@/components/ui/select'
+import { Toggle } from '@/components/ui/toggle'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
+import { cn } from '@/lib/utils'
+import { translate } from '@/i18n/i18n'
+import { ActivityStatusGroupHeader, ActivityThreadOptionsMenu } from './activity-thread-controls'
+import { ActivityThreadRow } from './activity-thread-row'
+import type {
+  ActivityGroupBy,
+  ActivityThreadGroup,
+  AgentPaneThread,
+  ThreadReadFilter
+} from './activity-thread-types'
+
+export function ActivityThreadListPane({
+  threadListRef,
+  threadListWidth,
+  activityFilterInputRef,
+  query,
+  onQueryChange,
+  groupBy,
+  onGroupByChange,
+  readFilter,
+  onReadFilterChange,
+  compactMode,
+  hasUnreadThreads,
+  onCompactModeChange,
+  onMarkAllThreadsRead,
+  visibleThreadGroups,
+  visibleThreadCount,
+  selectedPaneKey,
+  onSelectThread,
+  onJumpToWorkspace,
+  onMarkThreadUnread,
+  canJumpToWorkspace,
+  isThreadListResizing,
+  onResizeStart
+}: {
+  threadListRef: React.RefObject<HTMLDivElement | null>
+  threadListWidth: number
+  activityFilterInputRef: React.RefObject<HTMLInputElement | null>
+  query: string
+  onQueryChange: (query: string) => void
+  groupBy: ActivityGroupBy
+  onGroupByChange: (groupBy: ActivityGroupBy) => void
+  readFilter: ThreadReadFilter
+  onReadFilterChange: (readFilter: ThreadReadFilter) => void
+  compactMode: boolean
+  hasUnreadThreads: boolean
+  onCompactModeChange: (compactMode: boolean) => void
+  onMarkAllThreadsRead: () => void
+  visibleThreadGroups: ActivityThreadGroup[]
+  visibleThreadCount: number
+  selectedPaneKey: string | null
+  onSelectThread: (thread: AgentPaneThread) => void
+  onJumpToWorkspace: (thread: AgentPaneThread) => void
+  onMarkThreadUnread: (thread: AgentPaneThread) => void
+  canJumpToWorkspace: (thread: AgentPaneThread) => boolean
+  isThreadListResizing: boolean
+  onResizeStart: React.MouseEventHandler<HTMLDivElement>
+}): React.JSX.Element {
+  return (
+    <aside
+      ref={threadListRef}
+      className="relative flex min-h-0 shrink-0 flex-col border-r border-border"
+      style={{ width: threadListWidth }}
+    >
+      <div className="shrink-0 border-b border-border px-2 pt-2 pb-2">
+        <div className="flex items-center gap-2">
+          <div className="relative min-w-0 flex-1">
+            <Search className="pointer-events-none absolute left-2 top-1/2 size-3.5 -translate-y-1/2 text-muted-foreground" />
+            <Input
+              ref={activityFilterInputRef}
+              value={query}
+              onChange={(event) => onQueryChange(event.target.value)}
+              placeholder={translate(
+                'auto.components.activity.ActivityPrototypePage.795cbf26e2',
+                'Filter...'
+              )}
+              className="h-8 w-full pl-7 text-xs"
+            />
+          </div>
+          <Select
+            value={groupBy}
+            onValueChange={(value) => onGroupByChange(value as ActivityGroupBy)}
+          >
+            <SelectTrigger
+              size="sm"
+              className="h-8 w-[128px] shrink-0 px-2 text-xs"
+              aria-label={translate(
+                'auto.components.activity.ActivityPrototypePage.770d458144',
+                'Group agent activity by'
+              )}
+            >
+              <SelectValue />
+            </SelectTrigger>
+            <SelectContent align="end">
+              <SelectItem value="status">
+                {translate('auto.components.activity.ActivityPrototypePage.4a3986b200', 'Status')}
+              </SelectItem>
+              <SelectItem value="project">
+                {translate('auto.components.activity.ActivityPrototypePage.8c3b621ddf', 'Project')}
+              </SelectItem>
+              <SelectItem value="worktree">
+                {translate('auto.components.activity.ActivityPrototypePage.b29191b3e0', 'Worktree')}
+              </SelectItem>
+              <SelectItem value="agent">
+                {translate('auto.components.activity.ActivityPrototypePage.f6396e1f85', 'Agent')}
+              </SelectItem>
+            </SelectContent>
+          </Select>
+          <Tooltip>
+            <TooltipTrigger asChild>
+              <Toggle
+                pressed={readFilter === 'unread'}
+                onPressedChange={(pressed) => onReadFilterChange(pressed ? 'unread' : 'all')}
+                variant="outline"
+                size="sm"
+                className={cn(
+                  'size-8 shrink-0 p-0',
+                  readFilter === 'unread'
+                    ? '!border-primary !bg-primary !text-primary-foreground shadow-xs ring-2 ring-primary/35 hover:!bg-primary/90 hover:!text-primary-foreground'
+                    : 'text-muted-foreground hover:text-foreground'
+                )}
+                aria-label={translate(
+                  'auto.components.activity.ActivityPrototypePage.d1a88df9a8',
+                  'Show unread threads only'
+                )}
+              >
+                <BellDot className="size-3.5" />
+              </Toggle>
+            </TooltipTrigger>
+            <TooltipContent side="bottom">
+              {translate(
+                'auto.components.activity.ActivityPrototypePage.d1a88df9a8',
+                'Show unread threads only'
+              )}
+            </TooltipContent>
+          </Tooltip>
+          {/* Why (overflow menu): "Mark all read" is low-frequency and destructive-feeling; behind `…` keeps the toolbar on the frequent Filter + unread toggle. */}
+          <ActivityThreadOptionsMenu
+            compactMode={compactMode}
+            hasUnreadThreads={hasUnreadThreads}
+            onCompactModeChange={onCompactModeChange}
+            onMarkAllThreadsRead={onMarkAllThreadsRead}
+          />
+        </div>
+      </div>
+      <div className="min-h-0 flex-1 overflow-auto scrollbar-sleek">
+        {visibleThreadGroups.map((group) => (
+          <section
+            key={group.key}
+            aria-label={translate(
+              'auto.components.activity.ActivityPrototypePage.a2b4437bfb',
+              '{{value0}} activity',
+              { value0: group.label }
+            )}
+          >
+            <ActivityStatusGroupHeader group={group} />
+            {group.threads.map((thread) => (
+              <ActivityThreadRow
+                key={thread.paneKey}
+                thread={thread}
+                selected={thread.paneKey === selectedPaneKey}
+                onSelect={() => onSelectThread(thread)}
+                onJump={() => onJumpToWorkspace(thread)}
+                onMarkUnread={() => onMarkThreadUnread(thread)}
+                canJump={canJumpToWorkspace(thread)}
+                compactMode={compactMode}
+              />
+            ))}
+          </section>
+        ))}
+        {visibleThreadCount === 0 ? (
+          <div className="px-3 py-8 text-sm text-muted-foreground">
+            {translate(
+              'auto.components.activity.ActivityPrototypePage.7cd632006b',
+              'No agent activity matches these filters.'
+            )}
+          </div>
+        ) : null}
+      </div>
+      <div
+        aria-label={translate(
+          'auto.components.activity.ActivityPrototypePage.443690186e',
+          'Resize activity thread list'
+        )}
+        title={translate(
+          'auto.components.activity.ActivityPrototypePage.866083500b',
+          'Drag to resize'
+        )}
+        className={cn(
+          'group absolute -right-1.5 top-0 z-20 flex h-full w-3 cursor-col-resize items-stretch justify-center',
+          isThreadListResizing && 'bg-ring/10'
+        )}
+        onMouseDown={onResizeStart}
+        role="separator"
+      >
+        <div
+          className={cn(
+            'h-full w-px bg-border transition-colors group-hover:bg-ring/50',
+            isThreadListResizing && 'bg-ring'
+          )}
+        />
+      </div>
+    </aside>
+  )
+}
diff --git a/src/renderer/src/components/activity/activity-thread-presentation.ts b/src/renderer/src/components/activity/activity-thread-presentation.ts
new file mode 100644
index 00000000000..167d2f30954
--- /dev/null
+++ b/src/renderer/src/components/activity/activity-thread-presentation.ts
@@ -0,0 +1,113 @@
+import { agentStateLabel, type AgentDotState } from '@/components/AgentStateDot'
+import { formatAgentTypeLabel } from '@/lib/agent-status'
+import { getAgentRowPrimaryText } from '@/lib/agent-row-primary-text'
+import {
+  getActivityThreadTaskTitle,
+  resolveActivityThreadStatusPreview
+} from '@/lib/activity-thread-display'
+import { formatUiRelativeTime } from '@/i18n/relative-time-format'
+import type { AgentStatusEntry, AgentStatusState } from '../../../../shared/agent-status-types'
+import type { TerminalTab } from '../../../../shared/terminal-tab-types'
+import type { ActivityEvent, AgentPaneThread } from './activity-thread-types'
+
+const ACTIVITY_THREAD_RESPONSE_RENDER_PREVIEW_MAX_LENGTH = 320
+
+const absoluteDateFormatter = new Intl.DateTimeFormat(undefined, {
+  year: 'numeric',
+  month: 'short',
+  day: 'numeric',
+  hour: 'numeric',
+  minute: '2-digit'
+})
+
+export function formatAbsoluteDate(timestamp: number): string {
+  return absoluteDateFormatter.format(new Date(timestamp))
+}
+
+export function formatRelativeTime(timestamp: number): string {
+  return formatUiRelativeTime(timestamp - Date.now())
+}
+
+function truncatePreservingSurrogates(value: string, maxLength: number): string {
+  if (value.length <= maxLength) {
+    return value
+  }
+  const truncated = value.slice(0, maxLength)
+  const lastCode = truncated.charCodeAt(truncated.length - 1)
+  if (lastCode >= 0xd800 && lastCode <= 0xdbff) {
+    return truncated.slice(0, -1)
+  }
+  return truncated
+}
+
+export function activityThreadResponseRenderPreview({
+  responsePreview
+}: {
+  responsePreview: string
+}): string {
+  const trimmed = responsePreview.trim()
+  if (trimmed.length <= ACTIVITY_THREAD_RESPONSE_RENDER_PREVIEW_MAX_LENGTH) {
+    return trimmed
+  }
+  return `${truncatePreservingSurrogates(
+    trimmed,
+    ACTIVITY_THREAD_RESPONSE_RENDER_PREVIEW_MAX_LENGTH
+  ).trimEnd()}...`
+}
+
+export function agentTitle(event: ActivityEvent): string {
+  if (event.state === 'done') {
+    return event.entry.interrupted ? 'Agent interrupted' : 'Agent finished'
+  }
+  return event.state === 'waiting' ? 'Agent waiting for input' : 'Agent needs input'
+}
+
+export function agentSummary(event: ActivityEvent): string {
+  const prompt = getAgentRowPrimaryText(event.entry)
+  if (event.state === 'done') {
+    const message = event.entry.lastAssistantMessage?.trim()
+    return message || prompt || 'Completed the current turn.'
+  }
+  return prompt || event.entry.lastAssistantMessage?.trim() || 'The agent paused for user input.'
+}
+
+export function agentMeta(event: ActivityEvent): string {
+  const agent = formatAgentTypeLabel(event.agentType)
+  if (event.state === 'done') {
+    return event.entry.interrupted ? `${agent} interrupted` : `${agent} completed`
+  }
+  return event.state === 'waiting' ? `${agent} waiting` : `${agent} blocked`
+}
+
+// Why: rows need a stable task identity across follow-up turns; the live turn prompt ("yes", "ok proceed") must not replace the task title.
+export function paneTitleForEntry(
+  entry: AgentStatusEntry,
+  tab: TerminalTab,
+  generatedTitlesEnabled: boolean
+): string {
+  return getActivityThreadTaskTitle({ entry, tab, generatedTitlesEnabled })
+}
+
+export function paneTitleForEvent(event: ActivityEvent, generatedTitlesEnabled: boolean): string {
+  return paneTitleForEntry(event.entry, event.tab, generatedTitlesEnabled)
+}
+
+export function statusPreviewForEntry(
+  entry: AgentStatusEntry,
+  agentState?: AgentStatusState | null,
+  previousPreview?: string
+): string {
+  return resolveActivityThreadStatusPreview(entry, agentState, previousPreview)
+}
+
+export function threadAgentState(thread: AgentPaneThread): AgentDotState {
+  return thread.currentAgentState ?? thread.latestEvent?.state ?? 'done'
+}
+
+export function threadAgentStateLabel(thread: AgentPaneThread): string {
+  const state = threadAgentState(thread)
+  if (!thread.currentAgentState && state === 'done' && thread.latestEvent?.entry.interrupted) {
+    return 'Interrupted'
+  }
+  return agentStateLabel(state)
+}
diff --git a/src/renderer/src/components/activity/activity-thread-row.tsx b/src/renderer/src/components/activity/activity-thread-row.tsx
new file mode 100644
index 00000000000..77750f6c390
--- /dev/null
+++ b/src/renderer/src/components/activity/activity-thread-row.tsx
@@ -0,0 +1,224 @@
+import React from 'react'
+import { Bell, ExternalLink } from 'lucide-react'
+import { AgentIcon } from '@/lib/agent-catalog'
+import { agentTypeToIconAgent, formatAgentTypeLabel } from '@/lib/agent-status'
+import { getActivityThreadWorkspaceTitle } from '@/lib/activity-thread-display'
+import { Button } from '@/components/ui/button'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
+import { cn } from '@/lib/utils'
+import { translate } from '@/i18n/i18n'
+import { FilledBellIcon } from '../sidebar/WorktreeCardHelpers'
+import CommentMarkdown from '../sidebar/CommentMarkdown'
+import {
+  ActivityProjectLabel,
+  EventTime,
+  ThreadAgentStateIndicator
+} from './activity-thread-controls'
+import { activityThreadResponseRenderPreview } from './activity-thread-presentation'
+import type { AgentPaneThread } from './activity-thread-types'
+
+function isEventFromNestedInteractiveElement(
+  target: EventTarget | null,
+  currentTarget: HTMLElement
+): boolean {
+  if (!(target instanceof HTMLElement)) {
+    return false
+  }
+  const interactiveTarget = target.closest(
+    'a, button, input, select, textarea, [role="button"], [role="link"], [tabindex]:not([tabindex="-1"])'
+  )
+  return (
+    interactiveTarget instanceof HTMLElement &&
+    interactiveTarget !== currentTarget &&
+    currentTarget.contains(interactiveTarget)
+  )
+}
+
+export function ActivityThreadRow({
+  thread,
+  selected,
+  onSelect,
+  onJump,
+  onMarkUnread,
+  canJump,
+  compactMode
+}: {
+  thread: AgentPaneThread
+  selected: boolean
+  onSelect: () => void
+  onJump: () => void
+  onMarkUnread: () => void
+  canJump: boolean
+  compactMode: boolean
+}): React.JSX.Element {
+  const renderedResponsePreview = activityThreadResponseRenderPreview({
+    responsePreview: thread.responsePreview
+  })
+  const workspaceTitle = getActivityThreadWorkspaceTitle(thread.worktree)
+  const taskTitle = thread.paneTitle
+  const agentLabel = formatAgentTypeLabel(thread.agentType)
+  const showStatusPreview =
+    !compactMode &&
+    renderedResponsePreview.length > 0 &&
+    renderedResponsePreview !== taskTitle &&
+    renderedResponsePreview !== workspaceTitle
+  return (
+    <div
+      data-current={selected ? 'true' : undefined}
+      onClick={onSelect}
+      role="button"
+      tabIndex={0}
+      onKeyDown={(event) => {
+        // Why: markdown responses can contain links; keyboard activation on a nested link follows the link instead of selecting the row.
+        if (isEventFromNestedInteractiveElement(event.target, event.currentTarget)) {
+          return
+        }
+        if (event.key === 'Enter' || event.key === ' ') {
+          event.preventDefault()
+          onSelect()
+        }
+      }}
+      className={cn(
+        // Why (WorktreeCard cues): selected = tint+shadow, beats hover; unread = weight + left bar only; stacking all three confused selected vs unread on hover.
+        // Why (asymmetric padding): title leading-snug adds ~3px above cap-height; smaller top pad evens the row.
+        'group relative flex w-full cursor-pointer flex-col gap-1 border-b border-border px-3 pt-2.5 pb-3 text-left transition-colors',
+        selected
+          ? 'bg-black/[0.08] shadow-[0_1px_2px_rgba(0,0,0,0.04)] dark:bg-white/[0.10] dark:shadow-[0_1px_2px_rgba(0,0,0,0.03)]'
+          : 'hover:bg-accent/40'
+      )}
+    >
+      {thread.unread ? (
+        <span className="absolute left-0 top-1.5 bottom-1.5 w-0.5 rounded-r-full bg-primary" />
+      ) : null}
+      <div className="flex min-w-0 items-start gap-2">
+        <span className="inline-flex shrink-0 items-start gap-1">
+          <ThreadAgentStateIndicator thread={thread} />
+          <span className="inline-flex shrink-0 pt-px">
+            <AgentIcon agent={agentTypeToIconAgent(thread.agentType)} size={14} />
+          </span>
+        </span>
+        <div className="min-w-0 flex-1">
+          <div className="flex min-w-0 items-start gap-2">
+            <div className="min-w-0 flex-1 space-y-0.5">
+              <ActivityProjectLabel repo={thread.repo} />
+              <div
+                className={cn(
+                  'min-w-0 text-[13px] leading-snug',
+                  compactMode ? 'truncate' : 'line-clamp-2 break-words',
+                  thread.unread ? 'font-semibold text-foreground' : 'font-medium text-foreground'
+                )}
+                title={workspaceTitle}
+              >
+                {workspaceTitle}
+              </div>
+              {taskTitle !== workspaceTitle ? (
+                <div
+                  className={cn(
+                    'min-w-0 text-[12px] leading-snug text-muted-foreground',
+                    compactMode ? 'truncate' : 'line-clamp-2 break-words'
+                  )}
+                  title={taskTitle}
+                >
+                  {taskTitle}
+                </div>
+              ) : null}
+              {showStatusPreview ? (
+                <CommentMarkdown
+                  content={renderedResponsePreview}
+                  className={cn(
+                    'h-[1lh] min-w-0 overflow-hidden truncate whitespace-nowrap text-[11px] font-normal leading-snug text-muted-foreground/80',
+                    '[&_*]:inline [&_*]:!m-0 [&_*]:!p-0 [&_*]:!whitespace-nowrap [&_br]:hidden [&_ol]:list-none [&_ul]:list-none'
+                  )}
+                  title={thread.responsePreview}
+                />
+              ) : null}
+              <div className="flex min-w-0 items-center gap-1.5 pt-0.5">
+                <span className="shrink-0 text-[10px] text-muted-foreground/80">{agentLabel}</span>
+                {canJump ? (
+                  <span
+                    className={cn(
+                      'ml-auto inline-flex shrink-0 items-center transition-opacity',
+                      'can-hover:pointer-events-none can-hover:invisible can-hover:opacity-0',
+                      'group-hover:pointer-events-auto group-hover:visible group-hover:opacity-100'
+                    )}
+                  >
+                    <Tooltip>
+                      <TooltipTrigger asChild>
+                        <Button
+                          type="button"
+                          variant="outline"
+                          size="icon-xs"
+                          aria-label={translate(
+                            'auto.components.activity.ActivityPrototypePage.4616ea39fd',
+                            'Jump to workspace'
+                          )}
+                          onClick={(event) => {
+                            event.stopPropagation()
+                            onJump()
+                          }}
+                          onMouseDown={(event) => event.stopPropagation()}
+                        >
+                          <ExternalLink className="size-3" />
+                        </Button>
+                      </TooltipTrigger>
+                      <TooltipContent side="left">
+                        {translate(
+                          'auto.components.activity.ActivityPrototypePage.4616ea39fd',
+                          'Jump to workspace'
+                        )}
+                      </TooltipContent>
+                    </Tooltip>
+                  </span>
+                ) : null}
+              </div>
+            </div>
+            <span className="inline-flex shrink-0 items-center gap-1.5 pt-px">
+              <span className="inline-flex size-4 shrink-0 items-center justify-center">
+                {thread.unread ? (
+                  <FilledBellIcon
+                    className="size-[13px] shrink-0 text-amber-500 drop-shadow-sm"
+                    aria-label={translate(
+                      'auto.components.activity.ActivityPrototypePage.beb2c19173',
+                      'Unread'
+                    )}
+                  />
+                ) : (
+                  <Tooltip>
+                    <TooltipTrigger asChild>
+                      <button
+                        type="button"
+                        onClick={(event) => {
+                          event.stopPropagation()
+                          onMarkUnread()
+                        }}
+                        onMouseDown={(event) => event.stopPropagation()}
+                        className={cn(
+                          'group/unread flex size-4 shrink-0 cursor-pointer items-center justify-center rounded transition-all',
+                          'hover:bg-accent/80 active:scale-95',
+                          'focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring'
+                        )}
+                        aria-label={translate(
+                          'auto.components.activity.ActivityPrototypePage.59b131fbd9',
+                          'Mark thread unread'
+                        )}
+                      >
+                        <Bell className="size-3 text-muted-foreground/40 can-hover:opacity-0 transition-opacity group-hover:opacity-100 group-hover/unread:opacity-100" />
+                      </button>
+                    </TooltipTrigger>
+                    <TooltipContent side="left">
+                      {translate(
+                        'auto.components.activity.ActivityPrototypePage.59b131fbd9',
+                        'Mark thread unread'
+                      )}
+                    </TooltipContent>
+                  </Tooltip>
+                )}
+              </span>
+              <EventTime timestamp={thread.latestTimestamp} />
+            </span>
+          </div>
+        </div>
+      </div>
+    </div>
+  )
+}
diff --git a/src/renderer/src/components/activity/activity-thread-types.ts b/src/renderer/src/components/activity/activity-thread-types.ts
new file mode 100644
index 00000000000..7609d416581
--- /dev/null
+++ b/src/renderer/src/components/activity/activity-thread-types.ts
@@ -0,0 +1,89 @@
+import type { AgentDotState } from '@/components/AgentStateDot'
+import type {
+  AgentStatusEntry,
+  AgentStatusState,
+  AgentType
+} from '../../../../shared/agent-status-types'
+import type { Repo } from '../../../../shared/repo-types'
+import type { TerminalTab } from '../../../../shared/terminal-tab-types'
+import type { Worktree } from '../../../../shared/worktree/types'
+import type { ActivityPortalReadinessStatus } from './activity-portal-readiness-oscillation'
+
+export type ThreadReadFilter = 'all' | 'unread'
+export type ActivityGroupBy = 'status' | 'project' | 'worktree' | 'agent'
+export type ActivityEventState = Extract<AgentStatusState, 'done' | 'blocked' | 'waiting'>
+export type ActivityHookLiveAgentState = Extract<
+  AgentStatusState,
+  'working' | 'blocked' | 'waiting'
+>
+export type ActivityLiveAgentState = ActivityHookLiveAgentState | 'monitoring'
+export type ActivityStatusGroupId =
+  | 'working'
+  | 'monitoring'
+  | 'blocked'
+  | 'waiting'
+  | 'done'
+  | 'interrupted'
+
+export type ActivityEvent = {
+  id: string
+  state: ActivityEventState
+  timestamp: number
+  worktree: Worktree
+  repo: Repo | null
+  entry: AgentStatusEntry
+  tab: TerminalTab
+  agentType: AgentType
+  agentAlive: boolean
+  migrationUnsupportedPtyId?: string
+  unread: boolean
+}
+
+export type ActivityLiveAgentSnapshot = {
+  state: ActivityLiveAgentState
+  timestamp: number
+  worktree: Worktree
+  repo: Repo | null
+  entry: AgentStatusEntry
+  tab: TerminalTab
+  agentType: AgentType
+}
+
+// Why: keyed per agent pane (tab + leaf id), not per workspace, so the list shows one row per agent; paneKey is `${tabId}:${leafId}`.
+export type AgentPaneThread = {
+  paneKey: string
+  paneTitle: string
+  worktree: Worktree
+  repo: Repo | null
+  tab: TerminalTab
+  agentType: AgentType
+  currentAgentState: ActivityLiveAgentState | null
+  currentAgentEntry: AgentStatusEntry | null
+  responsePreview: string
+  latestTimestamp: number
+  latestEvent: ActivityEvent | null
+  events: ActivityEvent[]
+  migrationUnsupportedPtyId?: string
+  unread: boolean
+}
+
+export type ActivityThreadGroup = {
+  key: string
+  id?: ActivityStatusGroupId
+  label: string
+  state?: AgentDotState
+  threads: AgentPaneThread[]
+}
+
+export type ActivityTerminalPortalReadiness = {
+  target: HTMLElement | null
+  paneKey: string | null
+  status: ActivityPortalReadinessStatus
+}
+
+export type ActivityTerminalPortalDomStatus = {
+  ready: boolean
+  unavailable: boolean
+}
+
+export type ActivityTerminalPortalSlotId = 'primary' | 'secondary'
diff --git a/src/renderer/src/components/automations/AutomationRunHistory.test.tsx b/src/renderer/src/components/automations/AutomationRunHistory.test.tsx
index 7742f74b26a..41d839e615a 100644
--- a/src/renderer/src/components/automations/AutomationRunHistory.test.tsx
+++ b/src/renderer/src/components/automations/AutomationRunHistory.test.tsx
@@ -113,7 +113,8 @@ describe('AutomationRunHistory unanswered history', () => {
     expect(container.textContent).not.toContain('No runs yet.')
     // "0 runs" is a count of something nobody managed to read.
     expect(container.textContent).not.toContain('0 runs')
-    expect(container.textContent).toContain('Run history could not be loaded')
+    expect(container.textContent).toContain('Run history is unavailable from this host')
+    expect(container.textContent).toContain('does not mean the automation failed or has no runs')
     expect(container.textContent).toContain('web-01 is not connected')
   })
 
diff --git a/src/renderer/src/components/automations/AutomationRunHistory.tsx b/src/renderer/src/components/automations/AutomationRunHistory.tsx
index cd2ece0d7dc..13395dae6ad 100644
--- a/src/renderer/src/components/automations/AutomationRunHistory.tsx
+++ b/src/renderer/src/components/automations/AutomationRunHistory.tsx
@@ -167,7 +167,7 @@ export function AutomationRunHistory({
               <p className="text-center text-sm text-foreground">
                 {translate(
                   'auto.components.automations.AutomationRunHistory.historyUnavailable',
-                  'Run history could not be loaded for this automation.'
+                  'Run history is unavailable from this host. This does not mean the automation failed or has no runs.'
                 )}
               </p>
               <AutomationOwnerConflictNotice notice={notice} onRecover={onRecoverHistory} />
diff --git a/src/renderer/src/components/automations/AutomationsDetailPane.run-count.test.tsx b/src/renderer/src/components/automations/AutomationsDetailPane.run-count.test.tsx
new file mode 100644
index 00000000000..740f1130405
--- /dev/null
+++ b/src/renderer/src/components/automations/AutomationsDetailPane.run-count.test.tsx
@@ -0,0 +1,88 @@
+// @vitest-environment happy-dom
+
+import { act } from 'react'
+import { createRoot, type Root } from 'react-dom/client'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { AutomationsDetailPane } from './AutomationsDetailPane'
+import { makeAutomation } from './automations-page-fixtures'
+
+let root: Root | null = null
+
+beforeEach(() => {
+  globalThis.IS_REACT_ACT_ENVIRONMENT = true
+})
+
+afterEach(async () => {
+  await act(async () => root?.unmount())
+  root = null
+  document.body.innerHTML = ''
+})
+
+async function renderRunsTab(historyUnavailable: boolean): Promise<HTMLButtonElement> {
+  const container = document.createElement('div')
+  document.body.appendChild(container)
+  root = createRoot(container)
+  await act(async () => {
+    root?.render(
+      <AutomationsDetailPane
+        selected={makeAutomation()}
+        selectedExternal={null}
+        selectedExternalRunPage={null}
+        selectedAutomationRunPage={null}
+        selectedRuns={[]}
+        selectedRunsNotice={
+          historyUnavailable
+            ? { message: 'Server update required', recovery: 'update-server', severity: 'failure' }
+            : null
+        }
+        activePaneTab="runs"
+        relativeNow={0}
+        externalActionKey={null}
+        selectedRepoDisplayName="Orca"
+        selectedRepoDefaultBaseRef={null}
+        selectedWorkspaceName="Workspace"
+        selectedHostEntry={null}
+        hostLabelById={new Map()}
+        selectedRunNowAvailability={null}
+        selectedAutomationRunPageWorkspaceDisplay={null}
+        selectedAutomationRunPageViewState={null}
+        canRerunSelectedAutomationRunPage={false}
+        isSelectedAutomationRunPageRerunPending={false}
+        worktreeMap={new Map()}
+        fetchExternalAutomationRuns={vi.fn()}
+        onActivePaneTabChange={vi.fn()}
+        onClearExternalRunPage={vi.fn()}
+        onClearAutomationRunPage={vi.fn()}
+        requestExternalAction={vi.fn()}
+        openExternalRunPage={vi.fn()}
+        openEditExternalDialog={vi.fn()}
+        runNow={vi.fn()}
+        openEditDialog={vi.fn()}
+        toggleAutomation={vi.fn()}
+        requestDeleteAutomation={vi.fn()}
+        rerunAutomationRun={vi.fn()}
+        openRunWorkspace={vi.fn()}
+        openAutomationRunPage={vi.fn()}
+        onBackToList={vi.fn()}
+        recoverSelectedRuns={vi.fn()}
+      />
+    )
+  })
+  const runsTab = [...container.querySelectorAll<HTMLButtonElement>('[role="tab"]')].find((tab) =>
+    tab.textContent?.includes('Runs')
+  )
+  if (!runsTab) {
+    throw new Error('Runs tab was not rendered')
+  }
+  return runsTab
+}
+
+describe('AutomationsDetailPane run count', () => {
+  it('does not report zero when run history is unavailable', async () => {
+    expect((await renderRunsTab(true)).textContent?.trim()).toBe('Runs')
+  })
+
+  it('reports zero when the host answered with an empty history', async () => {
+    expect((await renderRunsTab(false)).textContent).toContain('0')
+  })
+})
diff --git a/src/renderer/src/components/automations/AutomationsDetailPane.tsx b/src/renderer/src/components/automations/AutomationsDetailPane.tsx
index 7eb2ff13c1d..0affe311f2c 100644
--- a/src/renderer/src/components/automations/AutomationsDetailPane.tsx
+++ b/src/renderer/src/components/automations/AutomationsDetailPane.tsx
@@ -213,7 +213,9 @@ export function AutomationsDetailPane({
               </TabsTrigger>
               <TabsTrigger value="runs" disabled={!selected}>
                 {translate('auto.components.automations.AutomationsPage.0e110a3469', 'Runs')}{' '}
-                <span className="text-xs text-muted-foreground">{selectedRuns.length}</span>
+                {selectedRunsNotice ? null : (
+                  <span className="text-xs text-muted-foreground">{selectedRuns.length}</span>
+                )}
               </TabsTrigger>
             </TabsList>
           </div>
diff --git a/src/renderer/src/components/automations/AutomationsPage.notice-recovery.test.tsx b/src/renderer/src/components/automations/AutomationsPage.notice-recovery.test.tsx
index 503d0877ed5..d99cfb91dac 100644
--- a/src/renderer/src/components/automations/AutomationsPage.notice-recovery.test.tsx
+++ b/src/renderer/src/components/automations/AutomationsPage.notice-recovery.test.tsx
@@ -19,6 +19,7 @@ import {
   mocks,
   renderPage,
   runtimeHost,
+  RUNTIME_ID,
   RUNTIME_REPO_ID,
   RUNTIME_SELF_FILTER,
   RUNTIME_WORKSPACE_ID,
@@ -88,7 +89,11 @@ describe('AutomationsPage notice recovery', () => {
     })
 
     expect(settings.open).toHaveBeenCalled()
-    expect(settings.target).toHaveBeenCalledWith({ pane: 'servers', repoId: null })
+    expect(settings.target).toHaveBeenCalledWith({
+      pane: 'servers',
+      repoId: null,
+      sectionId: RUNTIME_ID
+    })
   })
 
   it('sends a row Update server to the row own host, not to the unfiltered list', async () => {
@@ -116,6 +121,10 @@ describe('AutomationsPage notice recovery', () => {
 
     // All hosts selects no host, so only the row's captured owner names one.
     expect(settings.open).toHaveBeenCalled()
-    expect(settings.target).toHaveBeenCalledWith({ pane: 'servers', repoId: null })
+    expect(settings.target).toHaveBeenCalledWith({
+      pane: 'servers',
+      repoId: null,
+      sectionId: RUNTIME_ID
+    })
   })
 })
diff --git a/src/renderer/src/components/automations/automation-captured-owner.test.ts b/src/renderer/src/components/automations/automation-captured-owner.test.ts
index ffc998a5b36..ca22b0286e0 100644
--- a/src/renderer/src/components/automations/automation-captured-owner.test.ts
+++ b/src/renderer/src/components/automations/automation-captured-owner.test.ts
@@ -92,6 +92,12 @@ describe('captured owner availability', () => {
     const availability = automationActionAvailability(legacy, 'delete')
     expect(availability.kind).toBe('blocked')
     expect(availability.kind === 'blocked' && availability.block.recovery).toBe('update-server')
+    expect(availability.kind === 'blocked' && availability.block.message).toContain(
+      'needs an update'
+    )
+    expect(availability.kind === 'blocked' && availability.block.message).toContain(
+      'Scheduled runs may still continue'
+    )
   })
 
   it('reports a row with no metadata as uncaptured rather than blocked', () => {
diff --git a/src/renderer/src/components/automations/automation-captured-owner.ts b/src/renderer/src/components/automations/automation-captured-owner.ts
index 761dd787e78..7a95b517fe5 100644
--- a/src/renderer/src/components/automations/automation-captured-owner.ts
+++ b/src/renderer/src/components/automations/automation-captured-owner.ts
@@ -71,7 +71,7 @@ function unfencedBlock(): AutomationActionBlock {
     reason: 'unfenced',
     message: translate(
       'auto.components.automations.capturedOwner.unfenced',
-      'This host cannot confirm which automation it is changing, so this automation is read-only here.'
+      'Orca on this host needs an update before you can view run history or manage this automation. Scheduled runs may still continue on the host.'
     ),
     recovery: 'update-server'
   }
diff --git a/src/renderer/src/components/automations/automation-host-recovery.test.ts b/src/renderer/src/components/automations/automation-host-recovery.test.ts
index 8d6419fb128..871f9343114 100644
--- a/src/renderer/src/components/automations/automation-host-recovery.test.ts
+++ b/src/renderer/src/components/automations/automation-host-recovery.test.ts
@@ -35,9 +35,10 @@ const DESKTOP_SSH = entry({
   stableRef: { authority: { kind: 'desktop' }, selector: { kind: 'ssh', targetId: 't1' } },
   kind: 'ssh'
 })
+const RUNTIME_ENVIRONMENT_ID = 'gpu'
 const RUNTIME_SSH = entry({
   stableRef: {
-    authority: { kind: 'runtime', environmentId: 'gpu' },
+    authority: { kind: 'runtime', environmentId: RUNTIME_ENVIRONMENT_ID },
     selector: { kind: 'ssh', targetId: 't1' }
   },
   kind: 'ssh'
@@ -65,7 +66,7 @@ describe('automation host recovery', () => {
       { ...RUNTIME_SSH, authorityHealth: 'unavailable' },
       target
     )
-    expect(target.connectRuntimeEnvironment).toHaveBeenCalledWith('gpu')
+    expect(target.connectRuntimeEnvironment).toHaveBeenCalledWith(RUNTIME_ENVIRONMENT_ID)
     expect(target.connectSshTarget).not.toHaveBeenCalled()
   })
 
@@ -78,10 +79,15 @@ describe('automation host recovery', () => {
     expect(target.retry).toHaveBeenCalledWith(desktopSelf)
   })
 
-  it('sends a runtime to the servers pane, since nothing here updates a host', () => {
+  it('deep-links a runtime to its update row in Remote Orca Servers settings', () => {
     const target = deps()
     runAutomationHostRecovery('update-server', RUNTIME_SSH, target)
-    expect(target.openSettings).toHaveBeenCalledWith({ pane: 'servers', repoId: null })
+    expect(target.openSettings).toHaveBeenCalledWith({
+      pane: 'servers',
+      repoId: null,
+      // Runtime environment IDs are nested scroll anchors within the pane.
+      sectionId: RUNTIME_ENVIRONMENT_ID
+    })
   })
 
   it('sends a stale desktop SSH registration to the SSH pane instead', () => {
diff --git a/src/renderer/src/components/automations/automation-host-recovery.ts b/src/renderer/src/components/automations/automation-host-recovery.ts
index bc71f08ff18..d443d485b1d 100644
--- a/src/renderer/src/components/automations/automation-host-recovery.ts
+++ b/src/renderer/src/components/automations/automation-host-recovery.ts
@@ -20,10 +20,14 @@ export type AutomationHostRecoveryDeps = {
   openSettings: (target: SettingsNavigationTarget) => void
 }
 
-/** Where a host's version is managed; the app cannot update a host on its own. */
+/** The Remote Orca Servers pane owns each runtime's version status and update action. */
 function versionSettingsTarget(entry: AutomationHostCatalogEntry): SettingsNavigationTarget {
   if (entry.stableRef.authority.kind === 'runtime') {
-    return { pane: 'servers', repoId: null }
+    return {
+      pane: 'servers',
+      repoId: null,
+      sectionId: entry.stableRef.authority.environmentId
+    }
   }
   // A desktop SSH host with no registration generation is a stale registration,
   // repaired by re-adding the target rather than by updating anything.
diff --git a/src/renderer/src/components/automations/automation-run-output-snapshot-equivalence.test.ts b/src/renderer/src/components/automations/automation-run-output-snapshot-equivalence.test.ts
index b988ad96581..cf8f7590fa5 100644
--- a/src/renderer/src/components/automations/automation-run-output-snapshot-equivalence.test.ts
+++ b/src/renderer/src/components/automations/automation-run-output-snapshot-equivalence.test.ts
@@ -89,7 +89,7 @@ describe('automation run output snapshot queue equivalence', () => {
     const reference = createShiftReferenceBuffer()
     const candidate = createAutomationRunOutputSnapshotBuffer()
     let chunkCount = 0
-    for (let offset = 0; offset < source.length; ) {
+    for (let offset = 0; offset < source.length;) {
       const chunkLength = 1 + (random() % 73)
       const chunk = source.slice(offset, offset + chunkLength)
       reference.append(chunk)
diff --git a/src/renderer/src/components/automations/use-automation-host-catalog.ts b/src/renderer/src/components/automations/use-automation-host-catalog.ts
index bd7cd8dbb67..e40a4393e20 100644
--- a/src/renderer/src/components/automations/use-automation-host-catalog.ts
+++ b/src/renderer/src/components/automations/use-automation-host-catalog.ts
@@ -248,8 +248,8 @@ export function useAutomationHostCatalog(
         void window.api.runtimeEnvironments.connect({ selector: environmentId })
       },
       openSettings: (target) => {
-        openSettingsPage()
         openSettingsTarget(target)
+        openSettingsPage()
       }
     }),
     [controller, openSettingsPage, openSettingsTarget, pairingRevision]
diff --git a/src/renderer/src/components/browser-pane/annotate/browser-annotation-output.ts b/src/renderer/src/components/browser-pane/annotate/browser-annotation-output.ts
index fa35eb9541f..06f9bc22f38 100644
--- a/src/renderer/src/components/browser-pane/annotate/browser-annotation-output.ts
+++ b/src/renderer/src/components/browser-pane/annotate/browser-annotation-output.ts
@@ -35,7 +35,7 @@ function inlineText(
   // scanning only the bounded text we will actually retain.
   let normalized = ''
   let pendingSpace = false
-  for (let index = 0; index < content.length && normalized.length < maxLength; ) {
+  for (let index = 0; index < content.length && normalized.length < maxLength;) {
     const code = content.charCodeAt(index)
     if (isInlineWhitespaceCode(code)) {
       if (code === 13 && content.charCodeAt(index + 1) === 10) {
diff --git a/src/renderer/src/components/dashboard/useDashboardPopoutBridge.test.tsx b/src/renderer/src/components/dashboard/useDashboardPopoutBridge.test.tsx
index 7cd7bf94c93..84ea917f372 100644
--- a/src/renderer/src/components/dashboard/useDashboardPopoutBridge.test.tsx
+++ b/src/renderer/src/components/dashboard/useDashboardPopoutBridge.test.tsx
@@ -14,9 +14,10 @@ const mocks = vi.hoisted(() => ({
   onSnapshotRequested: vi.fn(),
   getPopoutOpen: vi.fn(async () => false),
   publishSnapshot: vi.fn(async (_snapshot: DashboardSnapshot) => undefined),
-  buildDashboardSnapshot: vi.fn(
-    (_state: unknown, now: number): DashboardSnapshot => ({ generatedAt: now, cards: [] })
-  ),
+  buildDashboardSnapshot: vi.fn((_state: unknown, now: number): DashboardSnapshot => ({
+    generatedAt: now,
+    cards: []
+  })),
   offRevealAgent: vi.fn(),
   offAckAgent: vi.fn(),
   offPopoutOpenChanged: vi.fn(),
diff --git a/src/renderer/src/components/diff-comments/DiffCommentCard.resize.test.tsx b/src/renderer/src/components/diff-comments/DiffCommentCard.resize.test.tsx
index f17dfbb7613..648b33357d4 100644
--- a/src/renderer/src/components/diff-comments/DiffCommentCard.resize.test.tsx
+++ b/src/renderer/src/components/diff-comments/DiffCommentCard.resize.test.tsx
@@ -1,5 +1,5 @@
 // @vitest-environment happy-dom
-import { act, cleanup, render } from '@testing-library/react'
+import { act, cleanup, fireEvent, render } from '@testing-library/react'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { DiffCommentCard } from './DiffCommentCard'
 
@@ -44,6 +44,7 @@ describe('DiffCommentCard content resize', () => {
 
   afterEach(() => {
     cleanup()
+    vi.restoreAllMocks()
     vi.unstubAllGlobals()
   })
 
@@ -101,4 +102,52 @@ describe('DiffCommentCard content resize', () => {
     expect(constructObserver).not.toHaveBeenCalled()
     expect(onContentResize).not.toHaveBeenCalled()
   })
+
+  it('requests rail reflow only when the editing textarea height changes', () => {
+    const onContentResize = vi.fn()
+    let scrollHeight = 60
+    vi.spyOn(HTMLTextAreaElement.prototype, 'scrollHeight', 'get').mockImplementation(
+      () => scrollHeight
+    )
+    const view = render(
+      <DiffCommentCard
+        lineNumber={26}
+        body="A saved note"
+        onContentResize={onContentResize}
+        onSubmitEdit={async () => true}
+      />
+    )
+
+    fireEvent.click(view.getByRole('button', { name: 'Edit note' }))
+    expect(onContentResize).toHaveBeenCalledOnce()
+
+    const textarea = view.getByRole('textbox')
+    expect(textarea.style.height).toBe('60px')
+    fireEvent.change(textarea, { target: { value: 'A saved note!' } })
+    expect(onContentResize).toHaveBeenCalledOnce()
+
+    for (let index = 0; index < 50; index++) {
+      fireEvent.change(textarea, { target: { value: `A saved note! ${index}` } })
+    }
+    expect(textarea.style.height).toBe('60px')
+    expect(onContentResize).toHaveBeenCalledOnce()
+
+    scrollHeight = 400
+    fireEvent.change(textarea, { target: { value: 'A much taller saved note' } })
+    expect(textarea.style.height).toBe('240px')
+    expect(onContentResize).toHaveBeenCalledTimes(2)
+
+    scrollHeight = 480
+    fireEvent.change(textarea, { target: { value: 'A still taller saved note' } })
+    expect(textarea.style.height).toBe('240px')
+    expect(onContentResize).toHaveBeenCalledTimes(2)
+
+    scrollHeight = 80
+    fireEvent.change(textarea, { target: { value: 'A shorter saved note' } })
+    expect(textarea.style.height).toBe('80px')
+    expect(onContentResize).toHaveBeenCalledTimes(3)
+
+    fireEvent.click(view.getByRole('button', { name: 'Cancel' }))
+    expect(onContentResize).toHaveBeenCalledTimes(4)
+  })
 })
diff --git a/src/renderer/src/components/diff-comments/DiffCommentCard.tsx b/src/renderer/src/components/diff-comments/DiffCommentCard.tsx
index 9e7ddf229ce..6becfe1fb34 100644
--- a/src/renderer/src/components/diff-comments/DiffCommentCard.tsx
+++ b/src/renderer/src/components/diff-comments/DiffCommentCard.tsx
@@ -35,6 +35,13 @@ type Props = {
   headerActions?: ReactNode
 }
 
+function resizeDiffCommentTextarea(textarea: HTMLTextAreaElement): boolean {
+  const previousHeight = textarea.style.height
+  textarea.style.height = 'auto'
+  textarea.style.height = `${Math.min(textarea.scrollHeight, 240)}px`
+  return textarea.style.height !== previousHeight
+}
+
 export function DiffCommentCard({
   lineNumber,
   startLine,
@@ -116,8 +123,7 @@ export function DiffCommentCard({
     if (!el) {
       return
     }
-    el.style.height = 'auto'
-    el.style.height = `${Math.min(el.scrollHeight, 240)}px`
+    resizeDiffCommentTextarea(el)
     el.focus()
     el.setSelectionRange(el.value.length, el.value.length)
     onContentResizeRef.current?.()
@@ -281,10 +287,10 @@ export function DiffCommentCard({
               value={draft}
               onChange={(e) => {
                 setDraft(e.target.value)
-                const el = e.currentTarget
-                el.style.height = 'auto'
-                el.style.height = `${Math.min(el.scrollHeight, 240)}px`
-                onContentResizeRef.current?.()
+                // Why: rich-review layout measures every note; skip it when this card stayed put.
+                if (resizeDiffCommentTextarea(e.currentTarget)) {
+                  onContentResizeRef.current?.()
+                }
               }}
               onKeyDown={(e) => {
                 if (e.key === 'Escape') {
diff --git a/src/renderer/src/components/editor/EditorContent.markdown-classification.test.tsx b/src/renderer/src/components/editor/EditorContent.markdown-classification.test.tsx
new file mode 100644
index 00000000000..4a5600192d3
--- /dev/null
+++ b/src/renderer/src/components/editor/EditorContent.markdown-classification.test.tsx
@@ -0,0 +1,297 @@
+// @vitest-environment happy-dom
+import { cleanup, render } from '@testing-library/react'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { OpenFile } from '@/store/slices/editor'
+import type { FileContent } from './editor-panel-content-types'
+
+const classifiers = vi.hoisted(() => ({
+  getUnsupportedMessage: vi.fn<(content: string) => string | null>(),
+  exceedsSizeLimit: vi.fn<(content: string) => boolean>()
+}))
+
+vi.mock('./markdown-rich-mode', () => ({
+  getMarkdownRichModeEligibility: ({
+    content,
+    sizeOverridden
+  }: {
+    content: string
+    sizeOverridden: boolean
+  }) => ({
+    exceedsSizeLimit: !sizeOverridden && classifiers.exceedsSizeLimit(content),
+    unsupportedMessage: classifiers.getUnsupportedMessage(content)
+  })
+}))
+
+vi.mock('./editor-lazy-views', () => {
+  const view = (name: string) => () => <div data-editor-view={name} />
+  return {
+    MonacoEditor: view('source'),
+    DiffViewer: view('diff'),
+    CombinedDiffViewer: view('combined-diff'),
+    RichMarkdownEditor: view('rich-editor'),
+    MarkdownPreview: view('preview'),
+    ImageViewer: view('image'),
+    ImageDiffViewer: view('image-diff'),
+    MermaidViewer: view('mermaid'),
+    CsvViewer: view('csv'),
+    IpynbViewer: view('notebook')
+  }
+})
+
+vi.mock('./RichMarkdownErrorBoundary', () => ({
+  RichMarkdownErrorBoundary: ({ children }: { children: React.ReactNode }) => children
+}))
+
+vi.mock('./useMarkdownDocuments', () => ({
+  useMarkdownDocuments: () => ({
+    markdownDocuments: [],
+    onOpenDocLink: () => {},
+    previewProps: { markdownDocuments: [], onOpenDocument: async () => {} },
+    mdSave: async () => true
+  })
+}))
+
+vi.mock('./useEditorConflictNavigation', () => ({
+  useEditorConflictNavigation: () => () => undefined
+}))
+
+vi.mock('@/store', () => {
+  const state = {
+    markdownRichModeSizeOverride: {},
+    setMarkdownRichModeSizeOverride: () => {},
+    reloadOpenCheckRunDetailsTab: () => {}
+  }
+  return {
+    useAppStore: Object.assign(
+      (selector: (storeState: typeof state) => unknown) => selector(state),
+      { getState: () => state }
+    )
+  }
+})
+
+import { EditorContent } from './EditorContent'
+import { getEditorPanelRenderModel } from './editor-panel-render-model'
+
+function openFile(
+  language: 'markdown' | 'typescript' = 'markdown',
+  mode: 'edit' | 'markdown-preview' = 'edit'
+): OpenFile {
+  const extension = language === 'markdown' ? 'md' : 'ts'
+  return {
+    id: `/repo/notes.${extension}`,
+    filePath: `/repo/notes.${extension}`,
+    relativePath: `notes.${extension}`,
+    worktreeId: 'wt-1',
+    language,
+    mode,
+    isDirty: false
+  }
+}
+
+function renderEditPath({
+  content,
+  language = 'markdown',
+  viewMode = 'rich',
+  mode = 'edit'
+}: {
+  content: string
+  language?: 'markdown' | 'typescript'
+  viewMode?: 'source' | 'rich' | 'preview'
+  mode?: 'edit' | 'markdown-preview'
+}) {
+  const activeFile = openFile(language, mode)
+  const fileContents = {
+    [activeFile.id]: { content: '# Saved', isBinary: false }
+  }
+  const editorDrafts = { [activeFile.id]: content }
+  const model = getEditorPanelRenderModel({
+    activeFile,
+    fileContents,
+    editorDrafts,
+    gitStatusEntries: undefined,
+    gitBranchEntries: undefined,
+    markdownViewMode: { [activeFile.id]: viewMode },
+    markdownRichModeSizeOverride: {},
+    isChangesMode: false,
+    canOpenWorkspaceFileBrowser: true
+  })
+  const view = render(
+    <EditorContent
+      activeFile={activeFile}
+      viewStateScopeId={activeFile.id}
+      fileContents={fileContents}
+      diffContents={{}}
+      editBuffers={editorDrafts}
+      openFiles={[activeFile]}
+      worktreeEntries={[]}
+      resolvedLanguage={model.resolvedLanguage}
+      isMarkdown={model.isMarkdown}
+      isMermaid={model.isMermaid}
+      isCsv={model.isCsv}
+      isNotebook={model.isNotebook}
+      mdViewMode={model.mdViewMode}
+      inlineMarkdownRenderState={model.inlineMarkdownRenderState}
+      isChangesMode={false}
+      sideBySide={false}
+      pendingEditorReveal={null}
+      handleContentChange={vi.fn()}
+      handleContentChangeForFile={vi.fn()}
+      handleDirtyStateHint={vi.fn()}
+      handleSave={vi.fn()}
+      handleSaveForFile={vi.fn()}
+      reloadContent={vi.fn()}
+    />
+  )
+
+  return { model, view }
+}
+
+function getGuardedRenderModel({
+  activeFileOverrides,
+  fileContent = { content: '# Saved', isBinary: false },
+  includeFileContent = true,
+  isChangesMode = false
+}: {
+  activeFileOverrides?: Partial<OpenFile>
+  fileContent?: FileContent
+  includeFileContent?: boolean
+  isChangesMode?: boolean
+}) {
+  const activeFile = { ...openFile(), ...activeFileOverrides }
+  return getEditorPanelRenderModel({
+    activeFile,
+    fileContents: includeFileContent ? { [activeFile.id]: fileContent } : {},
+    editorDrafts: { [activeFile.id]: '# Draft' },
+    gitStatusEntries: undefined,
+    gitBranchEntries: undefined,
+    markdownViewMode: { [activeFile.id]: 'rich' },
+    markdownRichModeSizeOverride: {},
+    isChangesMode,
+    canOpenWorkspaceFileBrowser: true
+  })
+}
+
+beforeEach(() => {
+  classifiers.getUnsupportedMessage.mockImplementation((content) =>
+    content.includes('[reference]:') ? 'Reference links require source mode.' : null
+  )
+  classifiers.exceedsSizeLimit.mockImplementation((content) => content.includes('oversized'))
+})
+
+afterEach(() => {
+  cleanup()
+  vi.clearAllMocks()
+})
+
+describe('inline Markdown render classification', () => {
+  it('classifies each rich draft once, including after content changes', () => {
+    const first = renderEditPath({ content: '# First draft' })
+
+    expect(first.view.container.innerHTML).toContain('data-editor-view="rich-editor"')
+    expect(classifiers.getUnsupportedMessage).toHaveBeenCalledTimes(1)
+    expect(classifiers.getUnsupportedMessage).toHaveBeenLastCalledWith('# First draft')
+    expect(classifiers.exceedsSizeLimit).toHaveBeenCalledTimes(1)
+    expect(classifiers.exceedsSizeLimit).toHaveBeenLastCalledWith('# First draft')
+
+    first.view.unmount()
+    const second = renderEditPath({ content: '# Changed draft' })
+
+    expect(second.view.container.innerHTML).toContain('data-editor-view="rich-editor"')
+    expect(classifiers.getUnsupportedMessage).toHaveBeenCalledTimes(2)
+    expect(classifiers.getUnsupportedMessage).toHaveBeenLastCalledWith('# Changed draft')
+    expect(classifiers.exceedsSizeLimit).toHaveBeenCalledTimes(2)
+    expect(classifiers.exceedsSizeLimit).toHaveBeenLastCalledWith('# Changed draft')
+  })
+
+  it.each([
+    {
+      name: 'source Markdown',
+      args: { content: '# Source', viewMode: 'source' as const },
+      expectedView: 'source',
+      canExport: false
+    },
+    {
+      name: 'Markdown preview',
+      args: { content: '# Preview', mode: 'markdown-preview' as const },
+      expectedView: 'preview',
+      canExport: true
+    },
+    {
+      name: 'TypeScript',
+      args: { content: 'const value = 1', language: 'typescript' as const },
+      expectedView: 'source',
+      canExport: false
+    }
+  ])('skips rich eligibility scans for $name', ({ args, expectedView, canExport }) => {
+    const result = renderEditPath(args)
+
+    expect(result.view.container.innerHTML).toContain(`data-editor-view="${expectedView}"`)
+    expect(result.model.canExportMarkdownToPdf).toBe(canExport)
+    expect(classifiers.getUnsupportedMessage).not.toHaveBeenCalled()
+    expect(classifiers.exceedsSizeLimit).not.toHaveBeenCalled()
+  })
+
+  it.each([
+    { name: 'Changes mode', args: { isChangesMode: true } },
+    { name: 'content that is still loading', args: { includeFileContent: false } },
+    {
+      name: 'binary content',
+      args: { fileContent: { content: '', isBinary: true } }
+    },
+    {
+      name: 'content with a load error',
+      args: { fileContent: { content: '', isBinary: false, loadError: 'Read failed' } }
+    },
+    {
+      name: 'read-only Markdown',
+      args: { activeFileOverrides: { readOnly: true } }
+    },
+    {
+      name: 'an unresolved conflict',
+      args: {
+        activeFileOverrides: {
+          conflict: {
+            kind: 'conflict-editable' as const,
+            conflictKind: 'both_modified' as const,
+            conflictStatus: 'unresolved' as const,
+            conflictStatusSource: 'git' as const
+          }
+        }
+      }
+    },
+    {
+      name: 'a conflict placeholder',
+      args: {
+        activeFileOverrides: {
+          conflict: {
+            kind: 'conflict-placeholder' as const,
+            conflictKind: 'both_deleted' as const,
+            conflictStatus: 'unresolved' as const,
+            conflictStatusSource: 'git' as const
+          }
+        }
+      }
+    }
+  ])('skips rich eligibility scans for $name', ({ args }) => {
+    const model = getGuardedRenderModel(args)
+
+    expect(model.inlineMarkdownRenderState).toBeNull()
+    expect(classifiers.getUnsupportedMessage).not.toHaveBeenCalled()
+    expect(classifiers.exceedsSizeLimit).not.toHaveBeenCalled()
+  })
+
+  it('preserves unsupported and oversized rich-mode fallbacks', () => {
+    const unsupported = renderEditPath({ content: '[reference]: https://example.com' })
+
+    expect(unsupported.model.canExportMarkdownToPdf).toBe(false)
+    expect(unsupported.view.getByText('Reference links require source mode.')).toBeTruthy()
+    expect(unsupported.view.queryByText('Open anyway')).toBeNull()
+    unsupported.view.unmount()
+
+    const oversized = renderEditPath({ content: '# oversized' })
+
+    expect(oversized.model.canExportMarkdownToPdf).toBe(false)
+    expect(oversized.view.getByText(/File is larger than the .* rich editing limit/)).toBeTruthy()
+    expect(oversized.view.getByText('Open anyway')).toBeTruthy()
+  })
+})
diff --git a/src/renderer/src/components/editor/EditorContent.monaco-lifecycle.test.tsx b/src/renderer/src/components/editor/EditorContent.monaco-lifecycle.test.tsx
index 53eec01d0d8..00ded9527d2 100644
--- a/src/renderer/src/components/editor/EditorContent.monaco-lifecycle.test.tsx
+++ b/src/renderer/src/components/editor/EditorContent.monaco-lifecycle.test.tsx
@@ -184,6 +184,7 @@ function props(activeFile: OpenFile, content: string) {
     isCsv: false,
     isNotebook: false,
     mdViewMode: 'rich' as const,
+    inlineMarkdownRenderState: null,
     isChangesMode: false,
     sideBySide: false,
     pendingEditorReveal: null,
@@ -326,6 +327,10 @@ describe('EditorContent Monaco lifecycle boundary', () => {
         resolvedLanguage="markdown"
         isMarkdown
         mdViewMode="rich"
+        inlineMarkdownRenderState={{
+          renderMode: 'rich-editor',
+          richModeUnsupportedMessage: null
+        }}
       />
     )
 
diff --git a/src/renderer/src/components/editor/EditorContent.test.tsx b/src/renderer/src/components/editor/EditorContent.test.tsx
index 130c92abe35..8086851a81c 100644
--- a/src/renderer/src/components/editor/EditorContent.test.tsx
+++ b/src/renderer/src/components/editor/EditorContent.test.tsx
@@ -67,6 +67,7 @@ describe('EditorContent', () => {
         isCsv={false}
         isNotebook
         mdViewMode="rich"
+        inlineMarkdownRenderState={null}
         isChangesMode={false}
         sideBySide={false}
         pendingEditorReveal={null}
@@ -108,6 +109,7 @@ describe('EditorContent', () => {
         isCsv={false}
         isNotebook={false}
         mdViewMode="rich"
+        inlineMarkdownRenderState={null}
         isChangesMode={false}
         sideBySide={false}
         pendingEditorReveal={null}
@@ -153,6 +155,7 @@ describe('EditorContent', () => {
         isCsv={false}
         isNotebook={false}
         mdViewMode="rich"
+        inlineMarkdownRenderState={null}
         isChangesMode={false}
         sideBySide={false}
         pendingEditorReveal={null}
@@ -200,6 +203,7 @@ describe('EditorContent', () => {
         isCsv={false}
         isNotebook={false}
         mdViewMode="preview"
+        inlineMarkdownRenderState={null}
         isChangesMode={false}
         sideBySide={false}
         pendingEditorReveal={null}
diff --git a/src/renderer/src/components/editor/EditorContent.tsx b/src/renderer/src/components/editor/EditorContent.tsx
index ca12823e846..9fab1cd5665 100644
--- a/src/renderer/src/components/editor/EditorContent.tsx
+++ b/src/renderer/src/components/editor/EditorContent.tsx
@@ -12,6 +12,7 @@ import type { FileContent } from './editor-panel-content-types'
 import { translate } from '@/i18n/i18n'
 import { useEditorConflictNavigation } from './useEditorConflictNavigation'
 import { useMarkdownDocuments } from './useMarkdownDocuments'
+import type { MarkdownRenderState } from './markdown-render-mode'
 
 const noopCloseMarkdownTableOfContents = (): void => {}
 
@@ -47,6 +48,7 @@ export function EditorContent({
   isCsv,
   isNotebook,
   mdViewMode,
+  inlineMarkdownRenderState,
   isChangesMode,
   sideBySide,
   showMarkdownTableOfContents = false,
@@ -74,6 +76,7 @@ export function EditorContent({
   isCsv: boolean
   isNotebook: boolean
   mdViewMode: MarkdownViewMode
+  inlineMarkdownRenderState: MarkdownRenderState | null
   isChangesMode: boolean
   sideBySide: boolean
   showMarkdownTableOfContents?: boolean
@@ -238,6 +241,7 @@ export function EditorContent({
         isCsv={isCsv}
         isNotebook={isNotebook}
         mdViewMode={mdViewMode}
+        inlineMarkdownRenderState={inlineMarkdownRenderState}
         isChangesMode={isChangesMode}
         sideBySide={sideBySide}
         showMarkdownTableOfContents={showMarkdownTableOfContents}
diff --git a/src/renderer/src/components/editor/EditorEditFileSurface.tsx b/src/renderer/src/components/editor/EditorEditFileSurface.tsx
index d0b83539ee6..06a7bb3f909 100644
--- a/src/renderer/src/components/editor/EditorEditFileSurface.tsx
+++ b/src/renderer/src/components/editor/EditorEditFileSurface.tsx
@@ -17,6 +17,7 @@ import type { FileContent } from './editor-panel-content-types'
 import { ExternalFileChangeBanner } from './ExternalFileChangeBanner'
 import type { useMarkdownDocuments } from './useMarkdownDocuments'
 import { EditorMarkdownFileSurface } from './EditorMarkdownFileSurface'
+import type { MarkdownRenderState } from './markdown-render-mode'
 
 const noopEditorContentChange = (_content: string): void => {}
 const noopEditorSave = async (_content: string): Promise<boolean> => false
@@ -39,6 +40,7 @@ export function EditorEditFileSurface({
   isCsv,
   isNotebook,
   mdViewMode,
+  inlineMarkdownRenderState,
   isChangesMode,
   sideBySide,
   showMarkdownTableOfContents,
@@ -69,6 +71,7 @@ export function EditorEditFileSurface({
   isCsv: boolean
   isNotebook: boolean
   mdViewMode: MarkdownViewMode
+  inlineMarkdownRenderState: MarkdownRenderState | null
   isChangesMode: boolean
   sideBySide: boolean
   showMarkdownTableOfContents: boolean
@@ -210,6 +213,7 @@ export function EditorEditFileSurface({
       editorViewStateKey={editorViewStateKey}
       currentContent={currentContent}
       mdViewMode={mdViewMode}
+      inlineMarkdownRenderState={inlineMarkdownRenderState}
       showMarkdownTableOfContents={showMarkdownTableOfContents}
       showMarkdownFrontmatter={showMarkdownFrontmatter}
       onCloseMarkdownTableOfContents={onCloseMarkdownTableOfContents}
diff --git a/src/renderer/src/components/editor/EditorMarkdownFileSurface.tsx b/src/renderer/src/components/editor/EditorMarkdownFileSurface.tsx
index 6d5cfea1bdf..fda81b98462 100644
--- a/src/renderer/src/components/editor/EditorMarkdownFileSurface.tsx
+++ b/src/renderer/src/components/editor/EditorMarkdownFileSurface.tsx
@@ -5,10 +5,8 @@ import { Button } from '@/components/ui/button'
 import { RICH_MARKDOWN_MAX_SIZE_BYTES } from '../../../../shared/constants'
 import { formatBytes } from '../status-bar/workspace-space-format'
 import { MarkdownPreview, RichMarkdownEditor } from './editor-lazy-views'
-import { exceedsMarkdownRichModeSizeLimit } from './markdown-rich-size-limit'
 import { extractFrontMatter, prependFrontMatter } from './markdown-frontmatter'
-import { getMarkdownRenderMode } from './markdown-render-mode'
-import { getMarkdownRichModeUnsupportedMessage } from './markdown-rich-mode'
+import type { MarkdownRenderState } from './markdown-render-mode'
 import { RichMarkdownErrorBoundary } from './RichMarkdownErrorBoundary'
 import type { useMarkdownDocuments } from './useMarkdownDocuments'
 
@@ -20,6 +18,7 @@ export function EditorMarkdownFileSurface({
   editorViewStateKey,
   currentContent,
   mdViewMode,
+  inlineMarkdownRenderState,
   showMarkdownTableOfContents,
   showMarkdownFrontmatter,
   onCloseMarkdownTableOfContents,
@@ -35,6 +34,7 @@ export function EditorMarkdownFileSurface({
   editorViewStateKey: string
   currentContent: string
   mdViewMode: MarkdownViewMode
+  inlineMarkdownRenderState: MarkdownRenderState | null
   showMarkdownTableOfContents: boolean
   showMarkdownFrontmatter: boolean
   onCloseMarkdownTableOfContents: () => void
@@ -45,18 +45,15 @@ export function EditorMarkdownFileSurface({
   handleDirtyStateHint: (dirty: boolean) => void
   monacoEditor: React.JSX.Element
 }): React.JSX.Element {
-  const sizeOverridden = useAppStore((s) => s.markdownRichModeSizeOverride[activeFile.id] === true)
   const setSizeOverride = useAppStore((s) => s.setMarkdownRichModeSizeOverride)
-  const richModeUnsupportedMessage = getMarkdownRichModeUnsupportedMessage(currentContent)
-  const renderMode = getMarkdownRenderMode({
-    exceedsRichModeSizeLimit: !sizeOverridden && exceedsMarkdownRichModeSizeLimit(currentContent),
-    hasRichModeUnsupportedContent: richModeUnsupportedMessage !== null,
-    viewMode: mdViewMode
-  })
 
   if (activeFile.conflict?.conflictStatus === 'unresolved') {
     return <div className="h-full min-h-0">{monacoEditor}</div>
   }
+  if (!inlineMarkdownRenderState) {
+    return <div className="h-full min-h-0">{monacoEditor}</div>
+  }
+  const { renderMode, richModeUnsupportedMessage } = inlineMarkdownRenderState
   if (renderMode === 'source' && mdViewMode === 'rich') {
     // Why: only a size fallback is recoverable — unsupported syntax would round-trip badly, so it gets no override.
     const isSizeFallback = richModeUnsupportedMessage === null
diff --git a/src/renderer/src/components/editor/EditorPanelShell.tsx b/src/renderer/src/components/editor/EditorPanelShell.tsx
index 62b399c3b3c..dd15231cefe 100644
--- a/src/renderer/src/components/editor/EditorPanelShell.tsx
+++ b/src/renderer/src/components/editor/EditorPanelShell.tsx
@@ -149,6 +149,7 @@ export function EditorPanelShell({
           isCsv={model.isCsv}
           isNotebook={model.isNotebook}
           mdViewMode={model.mdViewMode}
+          inlineMarkdownRenderState={model.inlineMarkdownRenderState}
           isChangesMode={model.isDiffSurface && !model.isSingleDiff}
           sideBySide={sideBySide}
           pendingEditorReveal={pendingEditorReveal}
diff --git a/src/renderer/src/components/editor/editor-panel-render-model.ts b/src/renderer/src/components/editor/editor-panel-render-model.ts
index 2dc9fe87382..db03e65efe1 100644
--- a/src/renderer/src/components/editor/editor-panel-render-model.ts
+++ b/src/renderer/src/components/editor/editor-panel-render-model.ts
@@ -12,9 +12,8 @@ import { getEditorHeaderOpenFileState } from './editor-header'
 import type { EditorToggleValue } from './EditorViewToggle'
 import type { FileContent } from './editor-panel-content-types'
 import { canUseChangesModeForFile } from './editor-panel-file-mode'
-import { getMarkdownRenderMode } from './markdown-render-mode'
-import { getMarkdownRichModeUnsupportedMessage } from './markdown-rich-mode'
-import { exceedsMarkdownRichModeSizeLimit } from './markdown-rich-size-limit'
+import { getMarkdownRenderMode, type MarkdownRenderState } from './markdown-render-mode'
+import { getMarkdownRichModeEligibility } from './markdown-rich-mode'
 
 type StoreState = ReturnType<typeof useAppStore.getState>
 
@@ -129,17 +128,36 @@ export function getEditorPanelRenderModel({
   const shouldShowMarkdownExportAction =
     viewerLanguage === 'markdown' &&
     (activeFile.mode === 'edit' || activeFile.mode === 'markdown-preview')
-  const inlineMarkdownRenderMode =
-    activeFile.mode === 'edit' && inlineMarkdownContent !== null
-      ? getMarkdownRenderMode({
-          exceedsRichModeSizeLimit:
-            markdownRichModeSizeOverride[activeFile.id] !== true &&
-            exceedsMarkdownRichModeSizeLimit(inlineMarkdownContent),
-          hasRichModeUnsupportedContent:
-            getMarkdownRichModeUnsupportedMessage(inlineMarkdownContent) !== null,
-          viewMode: mdViewMode
+  const inlineFileContent = activeFile.mode === 'edit' ? fileContents[activeFile.id] : undefined
+  const canRenderInlineMarkdown =
+    viewerLanguage === 'markdown' &&
+    activeFile.mode === 'edit' &&
+    inlineMarkdownContent !== null &&
+    !isChangesMode &&
+    inlineFileContent !== undefined &&
+    inlineFileContent.isBinary !== true &&
+    !inlineFileContent.loadError &&
+    activeFile.conflict?.kind !== 'conflict-placeholder' &&
+    activeFile.conflict?.conflictStatus !== 'unresolved'
+  let inlineMarkdownRenderState: MarkdownRenderState | null = null
+  if (canRenderInlineMarkdown) {
+    const shouldClassifyRichMode = mdViewMode === 'rich'
+    const richModeEligibility = shouldClassifyRichMode
+      ? getMarkdownRichModeEligibility({
+          content: inlineMarkdownContent,
+          sizeOverridden: markdownRichModeSizeOverride[activeFile.id] === true
         })
       : null
+    const richModeUnsupportedMessage = richModeEligibility?.unsupportedMessage ?? null
+    inlineMarkdownRenderState = {
+      renderMode: getMarkdownRenderMode({
+        exceedsRichModeSizeLimit: richModeEligibility?.exceedsSizeLimit ?? false,
+        hasRichModeUnsupportedContent: richModeUnsupportedMessage !== null,
+        viewMode: mdViewMode
+      }),
+      richModeUnsupportedMessage
+    }
+  }
   const canExportMarkdownToPdf =
     shouldShowMarkdownExportAction &&
     ((activeFile.mode === 'markdown-preview' &&
@@ -149,8 +167,8 @@ export function getEditorPanelRenderModel({
       (activeFile.mode === 'edit' &&
         fileContents[activeFile.id] !== undefined &&
         !isChangesMode &&
-        inlineMarkdownRenderMode !== null &&
-        inlineMarkdownRenderMode !== 'source' &&
+        inlineMarkdownRenderState !== null &&
+        inlineMarkdownRenderState.renderMode !== 'source' &&
         fileContents[activeFile.id]?.isBinary !== true &&
         !fileContents[activeFile.id]?.loadError &&
         activeFile.conflict?.conflictStatus !== 'unresolved'))
@@ -180,6 +198,7 @@ export function getEditorPanelRenderModel({
     isMarkdownTableOfContentsDisabled: hasViewModeToggle && mdViewMode === 'source',
     shouldShowMarkdownExportAction,
     canExportMarkdownToPdf,
+    inlineMarkdownRenderState,
     canShowMarkdownTableOfContents:
       viewerLanguage === 'markdown' &&
       (hasViewModeToggle || activeFile.mode === 'markdown-preview'),
diff --git a/src/renderer/src/components/editor/markdown-render-mode.ts b/src/renderer/src/components/editor/markdown-render-mode.ts
index b8cbc499986..f188dcbb814 100644
--- a/src/renderer/src/components/editor/markdown-render-mode.ts
+++ b/src/renderer/src/components/editor/markdown-render-mode.ts
@@ -2,6 +2,11 @@ import type { MarkdownViewMode } from '@/store/slices/editor'
 
 export type MarkdownRenderMode = 'source' | 'rich-editor' | 'preview'
 
+export type MarkdownRenderState = {
+  renderMode: MarkdownRenderMode
+  richModeUnsupportedMessage: string | null
+}
+
 export function getMarkdownRenderMode({
   exceedsRichModeSizeLimit,
   hasRichModeUnsupportedContent,
diff --git a/src/renderer/src/components/editor/markdown-rich-mode.test.ts b/src/renderer/src/components/editor/markdown-rich-mode.test.ts
index e95b6f49c81..25f2e3bd869 100644
--- a/src/renderer/src/components/editor/markdown-rich-mode.test.ts
+++ b/src/renderer/src/components/editor/markdown-rich-mode.test.ts
@@ -1,5 +1,9 @@
 import { afterEach, describe, expect, it, vi } from 'vitest'
-import { getMarkdownRichModeUnsupportedMessage } from './markdown-rich-mode'
+import { RICH_MARKDOWN_MAX_SIZE_BYTES } from '../../../../shared/constants'
+import {
+  getMarkdownRichModeEligibility,
+  getMarkdownRichModeUnsupportedMessage
+} from './markdown-rich-mode'
 
 afterEach(() => {
   vi.restoreAllMocks()
@@ -46,6 +50,31 @@ describe('getMarkdownRichModeUnsupportedMessage', () => {
     ).toBeNull()
   })
 
+  it('allows bare lowercase placeholders in prose', () => {
+    expect(
+      getMarkdownRichModeUnsupportedMessage(
+        'Use --host runtime:<id>, --output <path>, and --project <project-id>.\n'
+      )
+    ).toBeNull()
+  })
+
+  it('allows bare lowercase placeholders in large documents', () => {
+    const content = `${'a'.repeat(50_001)}\nUse --host runtime:<id> and --project <project-id>.\n`
+
+    expect(getMarkdownRichModeUnsupportedMessage(content)).toBeNull()
+  })
+
+  it('still blocks large documents with actual html or jsx', () => {
+    const prefix = 'a'.repeat(50_001)
+
+    expect(getMarkdownRichModeUnsupportedMessage(`${prefix}\n<span>text</span>\n`)).not.toBeNull()
+    expect(getMarkdownRichModeUnsupportedMessage(`${prefix}\n<id>text</id>\n`)).not.toBeNull()
+    expect(getMarkdownRichModeUnsupportedMessage(`${prefix}\n<Widget />\n`)).not.toBeNull()
+    expect(
+      getMarkdownRichModeUnsupportedMessage(`${prefix}\n<project-id value="1">\n`)
+    ).not.toBeNull()
+  })
+
   it('allows block html and mdx-like tags by preserving them as passthrough nodes', () => {
     expect(getMarkdownRichModeUnsupportedMessage('<Widget />\n')).toBeNull()
     expect(getMarkdownRichModeUnsupportedMessage('<div>block</div>\n')).toBeNull()
@@ -90,4 +119,17 @@ describe('getMarkdownRichModeUnsupportedMessage', () => {
     )
     expect(usedGlobalHtmlFragmentMatch).toBe(false)
   })
+
+  it('keeps unsupported content blocked when it also exceeds the size limit', () => {
+    const content = `${'a'.repeat(RICH_MARKDOWN_MAX_SIZE_BYTES + 1)}<Widget />`
+
+    expect(getMarkdownRichModeEligibility({ content, sizeOverridden: false })).toEqual({
+      exceedsSizeLimit: true,
+      unsupportedMessage: expect.any(String)
+    })
+    expect(getMarkdownRichModeEligibility({ content, sizeOverridden: true })).toEqual({
+      exceedsSizeLimit: false,
+      unsupportedMessage: expect.any(String)
+    })
+  })
 })
diff --git a/src/renderer/src/components/editor/markdown-rich-mode.ts b/src/renderer/src/components/editor/markdown-rich-mode.ts
index 694a8a7ee5f..4764892a4ea 100644
--- a/src/renderer/src/components/editor/markdown-rich-mode.ts
+++ b/src/renderer/src/components/editor/markdown-rich-mode.ts
@@ -1,5 +1,7 @@
+import { defaultSchema } from 'rehype-sanitize'
 import { getRichMarkdownRoundTripOutput } from './markdown-round-trip'
 import { extractFrontMatter } from './markdown-frontmatter'
+import { exceedsMarkdownRichModeSizeLimit } from './markdown-rich-size-limit'
 import { translate } from '@/i18n/i18n'
 
 export type MarkdownRichModeUnsupportedReason =
@@ -14,6 +16,13 @@ type UnsupportedMatch = {
   pattern: RegExp
 }
 
+export type MarkdownRichModeEligibility = {
+  exceedsSizeLimit: boolean
+  unsupportedMessage: string | null
+}
+
+const KNOWN_MARKDOWN_HTML_TAG_NAMES = new Set(defaultSchema.tagNames ?? [])
+
 const UNSUPPORTED_PATTERNS: UnsupportedMatch[] = [
   {
     reason: 'html-or-jsx',
@@ -66,7 +75,7 @@ export function getMarkdownRichModeUnsupportedMessage(content: string): string |
   // opinion when HTML is detected, to verify the HTML survives the round-trip
   // before blocking the user from rich mode.
   const htmlMatcher = UNSUPPORTED_PATTERNS.find((m) => m.reason === 'html-or-jsx')
-  const hasHtml = htmlMatcher && htmlMatcher.pattern.test(contentWithoutCode)
+  const hasHtml = htmlMatcher && hasHtmlOrJsx(contentWithoutCode, htmlMatcher.pattern)
 
   for (const matcher of UNSUPPORTED_PATTERNS) {
     if (matcher.reason === 'html-or-jsx') {
@@ -91,6 +100,44 @@ export function getMarkdownRichModeUnsupportedMessage(content: string): string |
   return null
 }
 
+export function getMarkdownRichModeEligibility({
+  content,
+  sizeOverridden
+}: {
+  content: string
+  sizeOverridden: boolean
+}): MarkdownRichModeEligibility {
+  const exceedsSizeLimit = !sizeOverridden && exceedsMarkdownRichModeSizeLimit(content)
+  return {
+    exceedsSizeLimit,
+    unsupportedMessage: getMarkdownRichModeUnsupportedMessage(content)
+  }
+}
+
+function hasHtmlOrJsx(content: string, pattern: RegExp): boolean {
+  for (const match of content.matchAll(new RegExp(pattern, 'g'))) {
+    if (isHtmlOrJsxFragment(match[0])) {
+      return true
+    }
+  }
+  return false
+}
+
+function isHtmlOrJsxFragment(fragment: string): boolean {
+  if (fragment.startsWith('<!--') || fragment.startsWith('</')) {
+    return true
+  }
+
+  const tagMatch = fragment.match(/^<([A-Za-z][\w.:-]*)/)
+  const tagName = tagMatch?.[1]
+  if (!tagName) {
+    return false
+  }
+
+  const suffix = fragment.slice(tagName.length + 1, -1)
+  return suffix.length > 0 || KNOWN_MARKDOWN_HTML_TAG_NAMES.has(tagName.toLowerCase())
+}
+
 function stripMarkdownCode(content: string): string {
   let sanitized = ''
   let activeFence: '`' | '~' | null = null
diff --git a/src/renderer/src/components/editor/markdown-rich-size-limit.test.ts b/src/renderer/src/components/editor/markdown-rich-size-limit.test.ts
index 616e298b175..3539ffc565f 100644
--- a/src/renderer/src/components/editor/markdown-rich-size-limit.test.ts
+++ b/src/renderer/src/components/editor/markdown-rich-size-limit.test.ts
@@ -3,6 +3,10 @@ import { RICH_MARKDOWN_MAX_SIZE_BYTES } from '../../../../shared/constants'
 import { exceedsMarkdownRichModeSizeLimit } from './markdown-rich-size-limit'
 
 describe('exceedsMarkdownRichModeSizeLimit', () => {
+  it('uses a 600 KB default rich-mode ceiling', () => {
+    expect(RICH_MARKDOWN_MAX_SIZE_BYTES).toBe(600 * 1024)
+  })
+
   it('allows markdown at the rich-mode byte limit', () => {
     expect(exceedsMarkdownRichModeSizeLimit('a'.repeat(RICH_MARKDOWN_MAX_SIZE_BYTES))).toBe(false)
   })
diff --git a/src/renderer/src/components/editor/rich-markdown-extensions.ts b/src/renderer/src/components/editor/rich-markdown-extensions.ts
index ede658b577c..9876f2871cc 100644
--- a/src/renderer/src/components/editor/rich-markdown-extensions.ts
+++ b/src/renderer/src/components/editor/rich-markdown-extensions.ts
@@ -3,7 +3,6 @@ import StarterKit from '@tiptap/starter-kit'
 import Link from '@tiptap/extension-link'
 import { Code } from '@tiptap/extension-code'
 import Image from '@tiptap/extension-image'
-import CodeBlockLowlight from '@tiptap/extension-code-block-lowlight'
 import Placeholder from '@tiptap/extension-placeholder'
 import TaskItem from '@tiptap/extension-task-item'
 import { Table } from '@tiptap/extension-table'
@@ -33,9 +32,12 @@ import { createRichMarkdownAnnotationHighlightExtension } from './rich-markdown-
 import type { RichMarkdownEditorCodec } from './rich-markdown-source-transport'
 import { createRichMarkdownHtmlSuperscriptLink } from './rich-markdown-html-superscript-link'
 import type { RichMarkdownHtmlSuperscriptLinkContext } from './rich-markdown-html-superscript-link-context'
+import { RichMarkdownOrderedList } from './rich-markdown-ordered-list'
+import { RichMarkdownCodeBlockLowlight } from './rich-markdown-lowlight'
 import { RichMarkdownTaskList } from './rich-markdown-task-list'
+import { createCachedLowlight } from './rich-markdown-lowlight-cache'
 
-const lowlight = createLowlight(common)
+const lowlight = createCachedLowlight(createLowlight(common))
 
 const RichMarkdownLink = Link.extend({
   // Why: link's priority must stay below code's default 100 so Markdown
@@ -70,10 +72,11 @@ export function createRichMarkdownExtensions({
     StarterKit.configure({
       link: false,
       code: false,
-      codeBlock: false
+      codeBlock: false,
+      orderedList: false
     }),
     RichMarkdownCode,
-    CodeBlockLowlight.extend({
+    RichMarkdownCodeBlockLowlight.extend({
       addNodeView() {
         // Why: RichMarkdownCodeBlock never reads getPos, so it must not re-render
         // just because earlier edits shifted this block's document position.
@@ -195,6 +198,7 @@ export function createRichMarkdownExtensions({
     }).configure({
       allowBase64: true
     }),
+    RichMarkdownOrderedList,
     RichMarkdownTaskList,
     TaskItem.configure({
       nested: true
diff --git a/src/renderer/src/components/editor/rich-markdown-list-tokenizers.test.ts b/src/renderer/src/components/editor/rich-markdown-list-tokenizers.test.ts
new file mode 100644
index 00000000000..1b1f645d126
--- /dev/null
+++ b/src/renderer/src/components/editor/rich-markdown-list-tokenizers.test.ts
@@ -0,0 +1,62 @@
+import type { MarkdownLexerConfiguration, MarkdownTokenizer } from '@tiptap/core'
+import { OrderedList } from '@tiptap/extension-list'
+import TaskList from '@tiptap/extension-task-list'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { RichMarkdownOrderedList } from './rich-markdown-ordered-list'
+import { RichMarkdownTaskList } from './rich-markdown-task-list'
+
+const lexer: MarkdownLexerConfiguration = {
+  inlineTokens: (src) => [{ type: 'text', raw: src, text: src }],
+  blockTokens: (src) => [{ type: 'paragraph', raw: src, text: src }]
+}
+
+function getTokenizer(extension: typeof OrderedList | typeof TaskList): MarkdownTokenizer {
+  return extension.config.markdownTokenizer as MarkdownTokenizer
+}
+
+afterEach(() => {
+  vi.restoreAllMocks()
+})
+
+describe('rich markdown list tokenizers', () => {
+  it.each([
+    ['ordered', RichMarkdownOrderedList, OrderedList],
+    ['task', RichMarkdownTaskList, TaskList]
+  ] as const)('skips the %s base tokenizer for nonmatching source', (_name, guarded, base) => {
+    const baseTokenizer = getTokenizer(base)
+    const tokenize = vi.spyOn(baseTokenizer, 'tokenize')
+    const source = `# Heading\n\n${'Paragraph content.\n'.repeat(10_000)}`
+
+    expect(getTokenizer(guarded).tokenize(source, [], lexer)).toBeUndefined()
+    expect(tokenize).not.toHaveBeenCalled()
+  })
+
+  it.each([
+    ['ordered', RichMarkdownOrderedList, OrderedList, '3. third\n4. fourth\n'],
+    ['task', RichMarkdownTaskList, TaskList, '- [x] done\n- [ ] todo\n']
+  ] as const)(
+    'calls the %s base tokenizer once for matching source',
+    (_name, guarded, base, source) => {
+      const tokenize = vi.spyOn(getTokenizer(base), 'tokenize')
+
+      expect(getTokenizer(guarded).tokenize(source, [], lexer)).toBeTruthy()
+      expect(tokenize).toHaveBeenCalledOnce()
+    }
+  )
+
+  it('preserves nested ordered-list tokens', () => {
+    const source = '3. parent\n   1. child\n   2. child two\n4. sibling\n'
+
+    expect(getTokenizer(RichMarkdownOrderedList).tokenize(source, [], lexer)).toEqual(
+      getTokenizer(OrderedList).tokenize(source, [], lexer)
+    )
+  })
+
+  it('preserves nested task-list tokens', () => {
+    const source = '- [ ] parent\n  - [x] child\n- [x] sibling\n'
+
+    expect(getTokenizer(RichMarkdownTaskList).tokenize(source, [], lexer)).toEqual(
+      getTokenizer(TaskList).tokenize(source, [], lexer)
+    )
+  })
+})
diff --git a/src/renderer/src/components/editor/rich-markdown-lowlight-cache.test.ts b/src/renderer/src/components/editor/rich-markdown-lowlight-cache.test.ts
new file mode 100644
index 00000000000..fd944cc7c69
--- /dev/null
+++ b/src/renderer/src/components/editor/rich-markdown-lowlight-cache.test.ts
@@ -0,0 +1,117 @@
+import { common, createLowlight } from 'lowlight'
+import { describe, expect, it, vi } from 'vitest'
+import { createCachedLowlight } from './rich-markdown-lowlight-cache'
+
+const CODE = 'export function handler(input: string): string { return input.trim() }'
+
+describe('createCachedLowlight', () => {
+  it('reuses one exact-language result across 533 identical code blocks', () => {
+    const lowlight = createLowlight(common)
+    const highlight = vi.spyOn(lowlight, 'highlight')
+    const cached = createCachedLowlight(lowlight)
+
+    for (let index = 0; index < 533; index += 1) {
+      cached.highlight('typescript', CODE)
+    }
+
+    expect(highlight).toHaveBeenCalledOnce()
+  })
+
+  it('matches lowlight for exact-language and automatic highlighting', () => {
+    const stock = createLowlight(common)
+    const cached = createCachedLowlight(createLowlight(common))
+
+    expect(cached.highlight('typescript', CODE, { prefix: 'syntax-' })).toEqual(
+      stock.highlight('typescript', CODE, { prefix: 'syntax-' })
+    )
+    expect(
+      cached.highlightAuto(CODE, {
+        prefix: 'syntax-',
+        subset: ['javascript', 'typescript']
+      })
+    ).toEqual(
+      stock.highlightAuto(CODE, {
+        prefix: 'syntax-',
+        subset: ['javascript', 'typescript']
+      })
+    )
+  })
+
+  it('preserves language registration', () => {
+    const cached = createCachedLowlight(createLowlight())
+
+    cached.register('typescript', common.typescript)
+
+    expect(cached.listLanguages()).toEqual(['typescript'])
+    expect(cached.registered('typescript')).toBe(true)
+    expect(cached.highlight('typescript', CODE).children).not.toHaveLength(0)
+  })
+
+  it('keys explicit language, automatic mode, and supported options independently', () => {
+    const lowlight = createLowlight(common)
+    const highlight = vi.spyOn(lowlight, 'highlight')
+    const highlightAuto = vi.spyOn(lowlight, 'highlightAuto')
+    const cached = createCachedLowlight(lowlight)
+
+    cached.highlight('typescript', CODE, { prefix: 'first-' })
+    cached.highlight('typescript', CODE, { prefix: 'second-' })
+    cached.highlight('typescript', CODE, { prefix: 'first-' })
+    cached.highlightAuto(CODE, { subset: ['typescript'] })
+    cached.highlightAuto(CODE, { subset: ['javascript'] })
+    cached.highlightAuto(CODE, { subset: ['typescript'] })
+
+    expect(highlight).toHaveBeenCalledTimes(2)
+    expect(highlightAuto).toHaveBeenCalledTimes(2)
+  })
+
+  it('preserves registration APIs and invalidates results after registry changes', () => {
+    const lowlight = createLowlight(common)
+    const reference = createLowlight(common)
+    const highlight = vi.spyOn(lowlight, 'highlight')
+    const cached = createCachedLowlight(lowlight)
+
+    cached.highlight('javascript', CODE)
+    cached.highlight('javascript', CODE)
+    cached.registerAlias('javascript', 'cached-js')
+    reference.registerAlias('javascript', 'cached-js')
+
+    expect(cached.registered('cached-js')).toBe(true)
+    expect(cached.highlight('cached-js', CODE)).toEqual(reference.highlight('cached-js', CODE))
+    cached.highlight('javascript', CODE)
+    expect(highlight).toHaveBeenCalledTimes(3)
+  })
+
+  it('evicts least-recently-used results by entry count', () => {
+    const lowlight = createLowlight(common)
+    const highlight = vi.spyOn(lowlight, 'highlight')
+    const cached = createCachedLowlight(lowlight, {
+      maxEntries: 2,
+      maxSourceCharacters: 100
+    })
+
+    cached.highlight('typescript', 'first')
+    cached.highlight('typescript', 'second')
+    cached.highlight('typescript', 'first')
+    cached.highlight('typescript', 'third')
+    cached.highlight('typescript', 'second')
+
+    expect(highlight).toHaveBeenCalledTimes(4)
+  })
+
+  it('bounds retained source text and does not retain oversized blocks', () => {
+    const lowlight = createLowlight(common)
+    const highlight = vi.spyOn(lowlight, 'highlight')
+    const cached = createCachedLowlight(lowlight, {
+      maxEntries: 10,
+      maxSourceCharacters: 5
+    })
+
+    cached.highlight('typescript', '123')
+    cached.highlight('typescript', '456')
+    cached.highlight('typescript', '123')
+    cached.highlight('typescript', '123456')
+    cached.highlight('typescript', '123456')
+
+    expect(highlight).toHaveBeenCalledTimes(5)
+  })
+})
diff --git a/src/renderer/src/components/editor/rich-markdown-lowlight-cache.ts b/src/renderer/src/components/editor/rich-markdown-lowlight-cache.ts
new file mode 100644
index 00000000000..d2c5882438f
--- /dev/null
+++ b/src/renderer/src/components/editor/rich-markdown-lowlight-cache.ts
@@ -0,0 +1,127 @@
+import type { AutoOptions, createLowlight, LanguageFn, Options } from 'lowlight'
+
+type Lowlight = ReturnType<typeof createLowlight>
+type HighlightResult = ReturnType<Lowlight['highlight']>
+
+type HighlightCacheEntry = {
+  result: HighlightResult
+  sourceCharacters: number
+}
+
+type HighlightCacheLimits = {
+  maxEntries: number
+  maxSourceCharacters: number
+}
+
+// Source text bounds retained HASTs; the entry cap also covers empty and tiny blocks.
+const DEFAULT_CACHE_LIMITS: HighlightCacheLimits = {
+  maxEntries: 256,
+  maxSourceCharacters: 128 * 1024
+}
+
+function prefixKey(options: Readonly<Options> | null | undefined): string | null {
+  return options?.prefix ?? null
+}
+
+function highlightKey(
+  language: string,
+  value: string,
+  options: Readonly<Options> | null | undefined
+): string {
+  return JSON.stringify(['language', language, prefixKey(options), value])
+}
+
+function highlightAutoKey(
+  value: string,
+  options: Readonly<AutoOptions> | null | undefined
+): string {
+  return JSON.stringify(['auto', prefixKey(options), options?.subset ?? null, value])
+}
+
+export function createCachedLowlight(
+  lowlight: Lowlight,
+  limits: HighlightCacheLimits = DEFAULT_CACHE_LIMITS
+): Lowlight {
+  const cache = new Map<string, HighlightCacheEntry>()
+  let retainedSourceCharacters = 0
+
+  const clear = (): void => {
+    cache.clear()
+    retainedSourceCharacters = 0
+  }
+
+  const getOrHighlight = (
+    createKey: () => string,
+    sourceCharacters: number,
+    highlight: () => HighlightResult
+  ): HighlightResult => {
+    if (
+      limits.maxEntries <= 0 ||
+      limits.maxSourceCharacters <= 0 ||
+      sourceCharacters > limits.maxSourceCharacters
+    ) {
+      return highlight()
+    }
+
+    const key = createKey()
+    const cached = cache.get(key)
+    if (cached) {
+      cache.delete(key)
+      cache.set(key, cached)
+      return cached.result
+    }
+    const result = highlight()
+    cache.set(key, { result, sourceCharacters })
+    retainedSourceCharacters += sourceCharacters
+    while (
+      cache.size > limits.maxEntries ||
+      retainedSourceCharacters > limits.maxSourceCharacters
+    ) {
+      const oldest = cache.entries().next()
+      if (oldest.done) {
+        break
+      }
+      retainedSourceCharacters -= oldest.value[1].sourceCharacters
+      cache.delete(oldest.value[0])
+    }
+    return result
+  }
+
+  const register = ((
+    grammarsOrName: Readonly<Record<string, LanguageFn>> | string,
+    grammar?: LanguageFn
+  ): undefined => {
+    clear()
+    return typeof grammarsOrName === 'string'
+      ? lowlight.register(grammarsOrName, grammar as LanguageFn)
+      : lowlight.register(grammarsOrName)
+  }) as Lowlight['register']
+
+  const registerAlias = ((
+    aliasesOrName: Readonly<Record<string, readonly string[] | string>> | string,
+    alias?: readonly string[] | string
+  ): undefined => {
+    clear()
+    return typeof aliasesOrName === 'string'
+      ? lowlight.registerAlias(aliasesOrName, alias as readonly string[] | string)
+      : lowlight.registerAlias(aliasesOrName)
+  }) as Lowlight['registerAlias']
+
+  return {
+    ...lowlight,
+    highlight: (language, value, options) =>
+      getOrHighlight(
+        () => highlightKey(language, value, options),
+        value.length,
+        () => lowlight.highlight(language, value, options)
+      ),
+    highlightAuto: (value, options) =>
+      getOrHighlight(
+        () => highlightAutoKey(value, options),
+        value.length,
+        () => lowlight.highlightAuto(value, options)
+      ),
+    register,
+    registerAlias
+  }
+}
diff --git a/src/renderer/src/components/editor/rich-markdown-lowlight.test.ts b/src/renderer/src/components/editor/rich-markdown-lowlight.test.ts
new file mode 100644
index 00000000000..4800a430acf
--- /dev/null
+++ b/src/renderer/src/components/editor/rich-markdown-lowlight.test.ts
@@ -0,0 +1,467 @@
+// @vitest-environment happy-dom
+
+import { Editor, type JSONContent } from '@tiptap/core'
+import CodeBlockLowlight from '@tiptap/extension-code-block-lowlight'
+import { TextSelection, type Plugin } from '@tiptap/pm/state'
+import type { Decoration, DecorationSet } from '@tiptap/pm/view'
+import StarterKit from '@tiptap/starter-kit'
+import { common, createLowlight } from 'lowlight'
+import { afterEach, describe, expect, it } from 'vitest'
+import { RichMarkdownCodeBlockLowlight } from './rich-markdown-lowlight'
+
+type Lowlight = ReturnType<typeof createLowlight>
+type Counters = { highlight: number; highlightAuto: number; listLanguages: number }
+type RuntimeKeyedPlugin = Plugin & { key?: string }
+type DecorationWithAttrs = Decoration & {
+  type: { attrs?: { class?: string } }
+}
+
+function observedLowlight(counters: Counters): Lowlight {
+  const base = createLowlight(common)
+  return {
+    ...base,
+    highlight: (...args) => {
+      counters.highlight += 1
+      return base.highlight(...args)
+    },
+    highlightAuto: (...args) => {
+      counters.highlightAuto += 1
+      return base.highlightAuto(...args)
+    },
+    listLanguages: () => {
+      counters.listLanguages += 1
+      return base.listLanguages()
+    }
+  }
+}
+
+function documentWithCodeBlocks(count = 3): JSONContent {
+  return {
+    type: 'doc',
+    content: Array.from({ length: count }, (_, index) => [
+      { type: 'paragraph', content: [{ type: 'text', text: `paragraph ${index}` }] },
+      {
+        type: 'codeBlock',
+        attrs: { language: index === 1 ? 'js' : index === 2 ? 'unknown' : 'typescript' },
+        content: [{ type: 'text', text: `const value${index}: number = ${index}` }]
+      }
+    ]).flat()
+  }
+}
+
+function createEditor({
+  incremental,
+  counters,
+  content = documentWithCodeBlocks(),
+  defaultLanguage = null
+}: {
+  incremental: boolean
+  counters: Counters
+  content?: JSONContent
+  defaultLanguage?: string | null
+}): Editor {
+  const extension = incremental ? RichMarkdownCodeBlockLowlight : CodeBlockLowlight
+  return new Editor({
+    element: document.createElement('div'),
+    extensions: [
+      StarterKit.configure({ codeBlock: false, trailingNode: false }),
+      extension.configure({ lowlight: observedLowlight(counters), defaultLanguage })
+    ],
+    content
+  })
+}
+
+function nodePositions(editor: Editor, name: string): number[] {
+  const positions: number[] = []
+  editor.state.doc.descendants((node, pos) => {
+    if (node.type.name === name) {
+      positions.push(pos)
+    }
+  })
+  return positions
+}
+
+function decorationSnapshot(editor: Editor, incremental: boolean): unknown[] {
+  const keyPrefix = incremental ? 'richMarkdownLowlight$' : 'lowlight$'
+  const plugin = editor.state.plugins.find((candidate) =>
+    (candidate as RuntimeKeyedPlugin).key?.startsWith(keyPrefix)
+  )
+  const decorations = plugin?.getState(editor.state) as DecorationSet | undefined
+  if (!decorations) {
+    const keys = editor.state.plugins.map((candidate) => (candidate as RuntimeKeyedPlugin).key)
+    throw new Error(`Missing ${keyPrefix} plugin: ${JSON.stringify(keys)}`)
+  }
+  return decorations.find().map((decoration) => {
+    const typed = decoration as DecorationWithAttrs
+    return [decoration.from, decoration.to, typed.type.attrs?.class]
+  })
+}
+
+function expectParity(stock: Editor, incremental: Editor): void {
+  expect(incremental.state.doc.toJSON()).toEqual(stock.state.doc.toJSON())
+  expect(decorationSnapshot(incremental, true)).toEqual(decorationSnapshot(stock, false))
+}
+
+function resetCounters(counters: Counters): void {
+  counters.highlight = 0
+  counters.highlightAuto = 0
+  counters.listLanguages = 0
+}
+
+describe('incremental rich markdown lowlight', () => {
+  const editors: Editor[] = []
+
+  afterEach(() => {
+    for (const editor of editors) {
+      editor.destroy()
+    }
+    editors.length = 0
+  })
+
+  function createPair(content?: JSONContent, defaultLanguage: string | null = null) {
+    const stockCounters = { highlight: 0, highlightAuto: 0, listLanguages: 0 }
+    const incrementalCounters = { highlight: 0, highlightAuto: 0, listLanguages: 0 }
+    const stock = createEditor({
+      incremental: false,
+      counters: stockCounters,
+      content,
+      defaultLanguage
+    })
+    const incremental = createEditor({
+      incremental: true,
+      counters: incrementalCounters,
+      content,
+      defaultLanguage
+    })
+    editors.push(stock, incremental)
+    return { stock, incremental, stockCounters, incrementalCounters }
+  }
+
+  it('matches stock decorations for named, aliased, and unknown languages', () => {
+    const { stock, incremental, stockCounters, incrementalCounters } = createPair()
+
+    expectParity(stock, incremental)
+    expect(stockCounters).toEqual({ highlight: 2, highlightAuto: 1, listLanguages: 3 })
+    expect(incrementalCounters).toEqual({ highlight: 2, highlightAuto: 1, listLanguages: 1 })
+  })
+
+  it('matches stock decorations when a default language is configured', () => {
+    const content = documentWithCodeBlocks(1)
+    const codeBlock = content.content?.[1]
+    if (!codeBlock?.attrs) {
+      throw new Error('Missing code block')
+    }
+    codeBlock.attrs.language = null
+    const { stock, incremental, stockCounters, incrementalCounters } = createPair(
+      content,
+      'typescript'
+    )
+
+    expectParity(stock, incremental)
+    expect(stockCounters.highlight).toBe(1)
+    expect(incrementalCounters.highlight).toBe(1)
+  })
+
+  it('maps decorations without highlighting after a prose edit', () => {
+    const { stock, incremental, stockCounters, incrementalCounters } = createPair()
+    resetCounters(stockCounters)
+    resetCounters(incrementalCounters)
+
+    for (const editor of [stock, incremental]) {
+      const pos = nodePositions(editor, 'paragraph')[0] + 1
+      editor.view.dispatch(editor.state.tr.insertText('x', pos))
+    }
+
+    expectParity(stock, incremental)
+    expect(stockCounters.highlight + stockCounters.highlightAuto).toBe(0)
+    expect(incrementalCounters.highlight + incrementalCounters.highlightAuto).toBe(0)
+  })
+
+  it('highlights only the edited code block', () => {
+    const { stock, incremental, stockCounters, incrementalCounters } = createPair()
+    resetCounters(stockCounters)
+    resetCounters(incrementalCounters)
+
+    for (const editor of [stock, incremental]) {
+      const pos = nodePositions(editor, 'codeBlock')[0] + 1
+      const tr = editor.state.tr.setSelection(TextSelection.create(editor.state.doc, pos))
+      editor.view.dispatch(tr.insertText('x'))
+    }
+
+    expectParity(stock, incremental)
+    expect(stockCounters.highlight + stockCounters.highlightAuto).toBe(3)
+    expect(incrementalCounters.highlight + incrementalCounters.highlightAuto).toBe(1)
+  })
+
+  it('highlights only the code blocks touched by a multi-step transaction', () => {
+    const { stock, incremental, stockCounters, incrementalCounters } = createPair()
+    resetCounters(stockCounters)
+    resetCounters(incrementalCounters)
+
+    for (const editor of [stock, incremental]) {
+      const [first, , third] = nodePositions(editor, 'codeBlock').map((pos) => pos + 1)
+      const tr = editor.state.tr.insertText('z', third).insertText('a', first)
+      tr.setSelection(TextSelection.create(tr.doc, first))
+      editor.view.dispatch(tr)
+    }
+
+    expectParity(stock, incremental)
+    expect(stockCounters.highlight + stockCounters.highlightAuto).toBe(3)
+    expect(incrementalCounters.highlight + incrementalCounters.highlightAuto).toBe(2)
+  })
+
+  it('falls back safely for a language attribute change', () => {
+    const { stock, incremental } = createPair()
+
+    for (const editor of [stock, incremental]) {
+      const pos = nodePositions(editor, 'codeBlock')[0]
+      const node = editor.state.doc.nodeAt(pos)
+      const tr = editor.state.tr.setNodeMarkup(pos, undefined, {
+        ...node?.attrs,
+        language: 'javascript'
+      })
+      tr.setSelection(TextSelection.create(tr.doc, pos + 1))
+      editor.view.dispatch(tr)
+    }
+
+    expectParity(stock, incremental)
+  })
+
+  it('preserves parity when code blocks are inserted and deleted', () => {
+    const { stock, incremental } = createPair()
+
+    for (const editor of [stock, incremental]) {
+      const end = editor.state.doc.content.size
+      const codeBlock = editor.schema.nodes.codeBlock.create(
+        { language: 'typescript' },
+        editor.schema.text('let inserted = true')
+      )
+      editor.view.dispatch(editor.state.tr.insert(end, codeBlock))
+    }
+    expectParity(stock, incremental)
+
+    for (const editor of [stock, incremental]) {
+      const pos = nodePositions(editor, 'codeBlock')[1]
+      const node = editor.state.doc.nodeAt(pos)
+      if (!node) {
+        throw new Error('Missing code block')
+      }
+      editor.view.dispatch(editor.state.tr.delete(pos, pos + node.nodeSize))
+    }
+    expectParity(stock, incremental)
+  })
+
+  it('preserves parity through undo and redo', () => {
+    const { stock, incremental } = createPair()
+
+    for (const editor of [stock, incremental]) {
+      const pos = nodePositions(editor, 'codeBlock')[0] + 1
+      const tr = editor.state.tr.setSelection(TextSelection.create(editor.state.doc, pos))
+      editor.view.dispatch(tr.insertText('undoable'))
+    }
+    expectParity(stock, incremental)
+
+    expect(stock.commands.undo()).toBe(true)
+    expect(incremental.commands.undo()).toBe(true)
+    expectParity(stock, incremental)
+
+    expect(stock.commands.redo()).toBe(true)
+    expect(incremental.commands.redo()).toBe(true)
+    expectParity(stock, incremental)
+  })
+
+  it('preserves parity when paragraphs and code blocks are converted', () => {
+    const { stock, incremental } = createPair()
+
+    for (const editor of [stock, incremental]) {
+      const pos = nodePositions(editor, 'paragraph')[0] + 1
+      editor.view.dispatch(
+        editor.state.tr.setSelection(TextSelection.create(editor.state.doc, pos))
+      )
+      expect(editor.commands.setCodeBlock({ language: 'typescript' })).toBe(true)
+    }
+    expectParity(stock, incremental)
+
+    for (const editor of [stock, incremental]) {
+      const pos = nodePositions(editor, 'codeBlock')[0] + 1
+      editor.view.dispatch(
+        editor.state.tr.setSelection(TextSelection.create(editor.state.doc, pos))
+      )
+      expect(editor.commands.setParagraph()).toBe(true)
+    }
+    expectParity(stock, incremental)
+  })
+
+  it('preserves parity for paste and deletion inside a code block', () => {
+    const { stock, incremental } = createPair()
+
+    for (const editor of [stock, incremental]) {
+      const pos = nodePositions(editor, 'codeBlock')[0] + 2
+      editor.view.dispatch(
+        editor.state.tr.setSelection(TextSelection.create(editor.state.doc, pos))
+      )
+      expect(editor.view.pasteText('pasted text')).toBe(true)
+    }
+    expectParity(stock, incremental)
+
+    for (const editor of [stock, incremental]) {
+      const pos = nodePositions(editor, 'codeBlock')[0] + 1
+      editor.view.dispatch(editor.state.tr.delete(pos, pos + 6))
+    }
+    expectParity(stock, incremental)
+  })
+
+  it('preserves parity when a code block is split and joined', () => {
+    const { stock, incremental } = createPair()
+
+    for (const editor of [stock, incremental]) {
+      const pos = nodePositions(editor, 'codeBlock')[0] + 8
+      editor.view.dispatch(editor.state.tr.split(pos))
+    }
+    expectParity(stock, incremental)
+
+    for (const editor of [stock, incremental]) {
+      const joinPos = nodePositions(editor, 'codeBlock')[1]
+      editor.view.dispatch(editor.state.tr.join(joinPos))
+    }
+    expectParity(stock, incremental)
+  })
+
+  it('preserves parity when a code block moves in one transaction', () => {
+    const { stock, incremental } = createPair()
+
+    for (const editor of [stock, incremental]) {
+      const pos = nodePositions(editor, 'codeBlock')[0]
+      const node = editor.state.doc.nodeAt(pos)
+      if (!node) {
+        throw new Error('Missing code block')
+      }
+      const tr = editor.state.tr.delete(pos, pos + node.nodeSize)
+      const insertedAt = tr.doc.content.size
+      tr.insert(insertedAt, node)
+      tr.setSelection(TextSelection.create(tr.doc, insertedAt + 1))
+      editor.view.dispatch(tr)
+    }
+
+    expectParity(stock, incremental)
+  })
+
+  it('preserves parity for code blocks nested in list items', () => {
+    const content: JSONContent = {
+      type: 'doc',
+      content: [
+        {
+          type: 'bulletList',
+          content: [
+            {
+              type: 'listItem',
+              content: [
+                { type: 'paragraph', content: [{ type: 'text', text: 'item' }] },
+                {
+                  type: 'codeBlock',
+                  attrs: { language: 'typescript' },
+                  content: [{ type: 'text', text: 'const nested = true' }]
+                }
+              ]
+            }
+          ]
+        },
+        { type: 'paragraph', content: [{ type: 'text', text: 'after' }] }
+      ]
+    }
+    const { stock, incremental } = createPair(content)
+
+    for (const editor of [stock, incremental]) {
+      const pos = nodePositions(editor, 'codeBlock')[0] + 1
+      const tr = editor.state.tr.setSelection(TextSelection.create(editor.state.doc, pos))
+      editor.view.dispatch(tr.insertText('x'))
+    }
+
+    expectParity(stock, incremental)
+  })
+
+  it('preserves parity after whole-document replacement', () => {
+    const { stock, incremental } = createPair()
+
+    expect(stock.commands.setContent(documentWithCodeBlocks(5))).toBe(true)
+    expect(incremental.commands.setContent(documentWithCodeBlocks(5))).toBe(true)
+
+    expectParity(stock, incremental)
+  })
+
+  it('does not highlight for selection-only transactions', () => {
+    const { stock, incremental, stockCounters, incrementalCounters } = createPair()
+    resetCounters(stockCounters)
+    resetCounters(incrementalCounters)
+
+    for (const editor of [stock, incremental]) {
+      const pos = nodePositions(editor, 'codeBlock')[0] + 1
+      editor.view.dispatch(
+        editor.state.tr.setSelection(TextSelection.create(editor.state.doc, pos))
+      )
+    }
+
+    expectParity(stock, incremental)
+    expect(stockCounters.highlight + stockCounters.highlightAuto).toBe(0)
+    expect(incrementalCounters.highlight + incrementalCounters.highlightAuto).toBe(0)
+  })
+
+  it('replaces the stock plugin without dropping the code-block paste handler', () => {
+    const counters = { highlight: 0, highlightAuto: 0, listLanguages: 0 }
+    const editor = createEditor({ incremental: true, counters })
+    editors.push(editor)
+    const keys = editor.state.plugins.map((plugin) => (plugin as RuntimeKeyedPlugin).key)
+
+    expect(RichMarkdownCodeBlockLowlight.options).toEqual(CodeBlockLowlight.options)
+    expect(keys.some((key) => key?.startsWith('richMarkdownLowlight$'))).toBe(true)
+    expect(keys.some((key) => key?.startsWith('lowlight$'))).toBe(false)
+    expect(keys.some((key) => key?.startsWith('codeBlockVSCodeHandler$'))).toBe(true)
+  })
+
+  it('preserves parity at adjacent code-block boundaries', () => {
+    const content: JSONContent = {
+      type: 'doc',
+      content: documentWithCodeBlocks(3).content?.filter((node) => node.type === 'codeBlock')
+    }
+    const { stock, incremental } = createPair(content)
+
+    for (const editor of [stock, incremental]) {
+      const firstPos = nodePositions(editor, 'codeBlock')[0]
+      const first = editor.state.doc.nodeAt(firstPos)
+      if (!first) {
+        throw new Error('Missing first code block')
+      }
+      editor.view.dispatch(editor.state.tr.insertText('tail', firstPos + first.nodeSize - 1))
+    }
+    expectParity(stock, incremental)
+
+    for (const editor of [stock, incremental]) {
+      const firstPos = nodePositions(editor, 'codeBlock')[0]
+      const first = editor.state.doc.nodeAt(firstPos)
+      if (!first) {
+        throw new Error('Missing first code block')
+      }
+      editor.view.dispatch(editor.state.tr.delete(firstPos, firstPos + first.nodeSize))
+    }
+    expectParity(stock, incremental)
+  })
+
+  it('rehighlights one of 533 code blocks after a local code edit', () => {
+    const { stock, incremental, stockCounters, incrementalCounters } = createPair(
+      documentWithCodeBlocks(533)
+    )
+    resetCounters(stockCounters)
+    resetCounters(incrementalCounters)
+
+    for (const editor of [stock, incremental]) {
+      const pos = nodePositions(editor, 'codeBlock')[0] + 1
+      const tr = editor.state.tr.setSelection(TextSelection.create(editor.state.doc, pos))
+      editor.view.dispatch(tr.insertText('x'))
+    }
+
+    expectParity(stock, incremental)
+    expect(stockCounters.highlight + stockCounters.highlightAuto).toBe(533)
+    expect(incrementalCounters.highlight + incrementalCounters.highlightAuto).toBe(1)
+    expect(incrementalCounters.listLanguages).toBe(0)
+  })
+})
diff --git a/src/renderer/src/components/editor/rich-markdown-lowlight.ts b/src/renderer/src/components/editor/rich-markdown-lowlight.ts
new file mode 100644
index 00000000000..c6411b51f2d
--- /dev/null
+++ b/src/renderer/src/components/editor/rich-markdown-lowlight.ts
@@ -0,0 +1,219 @@
+import { getChangedRanges } from '@tiptap/core'
+import { CodeBlock } from '@tiptap/extension-code-block'
+import CodeBlockLowlight, {
+  type CodeBlockLowlightOptions
+} from '@tiptap/extension-code-block-lowlight'
+import type { Node as ProseMirrorNode } from '@tiptap/pm/model'
+import { Plugin, PluginKey, type Transaction } from '@tiptap/pm/state'
+import { Decoration, DecorationSet } from '@tiptap/pm/view'
+import type { createLowlight } from 'lowlight'
+
+type Lowlight = ReturnType<typeof createLowlight>
+type HighlightNode = ReturnType<Lowlight['highlight']>['children'][number]
+type CodeBlockAt = { node: ProseMirrorNode; pos: number }
+type DocumentRange = { from: number; to: number }
+type HighlightSpan = { text: string; classes: string[] }
+
+function parseHighlightNodes(nodes: HighlightNode[], classes: string[] = []): HighlightSpan[] {
+  return nodes.flatMap((node) => {
+    if (node.type === 'text') {
+      return [{ text: node.value, classes }]
+    }
+    if (node.type !== 'element') {
+      return []
+    }
+
+    const className = node.properties.className
+    const ownClasses = Array.isArray(className)
+      ? className.map(String)
+      : typeof className === 'string'
+        ? [className]
+        : []
+    return parseHighlightNodes(node.children, [...classes, ...ownClasses])
+  })
+}
+
+function highlightBlock(
+  block: CodeBlockAt,
+  lowlight: Lowlight,
+  languages: ReadonlySet<string>,
+  defaultLanguage: string | null | undefined
+): Decoration[] {
+  const language = (block.node.attrs.language as string | null | undefined) || defaultLanguage
+  const highlighted =
+    language && (languages.has(language) || lowlight.registered(language))
+      ? lowlight.highlight(language, block.node.textContent)
+      : lowlight.highlightAuto(block.node.textContent)
+  const decorations: Decoration[] = []
+  let from = block.pos + 1
+
+  for (const span of parseHighlightNodes(highlighted.children)) {
+    const to = from + span.text.length
+    if (span.classes.length > 0) {
+      decorations.push(Decoration.inline(from, to, { class: span.classes.join(' ') }))
+    }
+    from = to
+  }
+
+  return decorations
+}
+
+function findAllCodeBlocks(doc: ProseMirrorNode, name: string): CodeBlockAt[] {
+  const blocks: CodeBlockAt[] = []
+  doc.descendants((node, pos) => {
+    if (node.type.name === name) {
+      blocks.push({ node, pos })
+      return false
+    }
+    return true
+  })
+  return blocks
+}
+
+function findCodeBlocksNearRanges(
+  doc: ProseMirrorNode,
+  name: string,
+  ranges: DocumentRange[]
+): CodeBlockAt[] {
+  const blocks = new Map<number, ProseMirrorNode>()
+  const addResolvedBlocks = (position: number): void => {
+    // Why: zero-width inserts and deletes have no nodesBetween span.
+    const $position = doc.resolve(Math.max(0, Math.min(doc.content.size, position)))
+    for (let depth = $position.depth; depth > 0; depth -= 1) {
+      const node = $position.node(depth)
+      if (node.type.name === name) {
+        blocks.set($position.before(depth), node)
+        break
+      }
+    }
+    if ($position.nodeBefore?.type.name === name) {
+      blocks.set($position.pos - $position.nodeBefore.nodeSize, $position.nodeBefore)
+    }
+    if ($position.nodeAfter?.type.name === name) {
+      blocks.set($position.pos, $position.nodeAfter)
+    }
+  }
+
+  for (const range of ranges) {
+    const from = Math.max(0, Math.min(doc.content.size, range.from))
+    const to = Math.max(from, Math.min(doc.content.size, range.to))
+    if (from < to) {
+      doc.nodesBetween(from, to, (node, pos) => {
+        if (node.type.name === name) {
+          blocks.set(pos, node)
+          return false
+        }
+        return true
+      })
+    }
+    addResolvedBlocks(from)
+    if (to !== from) {
+      addResolvedBlocks(to)
+    }
+  }
+  return [...blocks].map(([pos, node]) => ({ node, pos }))
+}
+
+function createDecorations(
+  doc: ProseMirrorNode,
+  name: string,
+  lowlight: Lowlight,
+  languages: ReadonlySet<string>,
+  defaultLanguage: string | null | undefined
+): DecorationSet {
+  return DecorationSet.create(
+    doc,
+    findAllCodeBlocks(doc, name).flatMap((block) =>
+      highlightBlock(block, lowlight, languages, defaultLanguage)
+    )
+  )
+}
+
+function updateDecorations(
+  transaction: Transaction,
+  decorationSet: DecorationSet,
+  name: string,
+  lowlight: Lowlight,
+  languages: ReadonlySet<string>,
+  defaultLanguage: string | null | undefined
+): DecorationSet {
+  if (!transaction.docChanged) {
+    return decorationSet
+  }
+
+  const changes = getChangedRanges(transaction)
+  if (changes.length === 0) {
+    // Why: attribute-only steps can change a code language without exposing a mapped range.
+    return createDecorations(transaction.doc, name, lowlight, languages, defaultLanguage)
+  }
+
+  // Why: mapped decorations stay valid outside code blocks touched by the transaction.
+  let next = decorationSet.map(transaction.mapping, transaction.doc)
+  const oldBlocks = findCodeBlocksNearRanges(
+    transaction.before,
+    name,
+    changes.map((change) => change.oldRange)
+  )
+  const staleDecorations = new Set<Decoration>()
+  for (const block of oldBlocks) {
+    const from = transaction.mapping.map(block.pos, -1)
+    const to = transaction.mapping.map(block.pos + block.node.nodeSize, 1)
+    for (const decoration of next.find(Math.min(from, to), Math.max(from, to))) {
+      staleDecorations.add(decoration)
+    }
+  }
+  if (staleDecorations.size > 0) {
+    next = next.remove([...staleDecorations])
+  }
+
+  const newBlocks = findCodeBlocksNearRanges(
+    transaction.doc,
+    name,
+    changes.map((change) => change.newRange)
+  )
+  return next.add(
+    transaction.doc,
+    newBlocks.flatMap((block) => highlightBlock(block, lowlight, languages, defaultLanguage))
+  )
+}
+
+function createRichMarkdownLowlightPlugin({
+  name,
+  lowlight,
+  defaultLanguage
+}: {
+  name: string
+  lowlight: Lowlight
+  defaultLanguage: string | null | undefined
+}): Plugin<DecorationSet> {
+  const languages = new Set(lowlight.listLanguages())
+  const key = new PluginKey<DecorationSet>('richMarkdownLowlight')
+  const plugin = new Plugin<DecorationSet>({
+    key,
+    state: {
+      init: (_, { doc }) => createDecorations(doc, name, lowlight, languages, defaultLanguage),
+      apply: (transaction, decorationSet) =>
+        updateDecorations(transaction, decorationSet, name, lowlight, languages, defaultLanguage)
+    },
+    props: {
+      decorations: (state) => key.getState(state)
+    }
+  })
+  return plugin
+}
+
+export const RichMarkdownCodeBlockLowlight = CodeBlock.extend<CodeBlockLowlightOptions>({
+  addOptions() {
+    return { ...CodeBlockLowlight.options }
+  },
+  addProseMirrorPlugins() {
+    return [
+      ...(this.parent?.() ?? []),
+      createRichMarkdownLowlightPlugin({
+        name: this.name,
+        lowlight: this.options.lowlight as Lowlight,
+        defaultLanguage: this.options.defaultLanguage
+      })
+    ]
+  }
+})
diff --git a/src/renderer/src/components/editor/rich-markdown-ordered-list.ts b/src/renderer/src/components/editor/rich-markdown-ordered-list.ts
new file mode 100644
index 00000000000..40a1ef4ee34
--- /dev/null
+++ b/src/renderer/src/components/editor/rich-markdown-ordered-list.ts
@@ -0,0 +1,17 @@
+import type { MarkdownTokenizer } from '@tiptap/core'
+import { OrderedList } from '@tiptap/extension-list'
+
+const baseTokenizer = OrderedList.config.markdownTokenizer as MarkdownTokenizer
+
+export const RichMarkdownOrderedList = OrderedList.extend({
+  markdownTokenizer: {
+    ...baseTokenizer,
+    tokenize(src, tokens, lexer) {
+      // Why: the base tokenizer scans the full remaining source before rejecting a non-list.
+      if (typeof baseTokenizer.start === 'function' && baseTokenizer.start(src) !== 0) {
+        return undefined
+      }
+      return baseTokenizer.tokenize(src, tokens, lexer)
+    }
+  }
+})
diff --git a/src/renderer/src/components/editor/rich-markdown-task-list.ts b/src/renderer/src/components/editor/rich-markdown-task-list.ts
index 9b59e4af5ea..5bb0d07fea2 100644
--- a/src/renderer/src/components/editor/rich-markdown-task-list.ts
+++ b/src/renderer/src/components/editor/rich-markdown-task-list.ts
@@ -27,6 +27,10 @@ export const RichMarkdownTaskList = TaskList.extend({
   markdownTokenizer: {
     ...baseTokenizer,
     tokenize(src, tokens, lexer) {
+      // Why: the base tokenizer scans the full remaining source before rejecting a non-list.
+      if (typeof baseTokenizer.start === 'function' && baseTokenizer.start(src) !== 0) {
+        return undefined
+      }
       const token = baseTokenizer.tokenize(src, tokens, lexer)
       if (token) {
         normalizeTaskListToken(token, lexer)
diff --git a/src/renderer/src/components/editor/useRichMarkdownSearch.test.tsx b/src/renderer/src/components/editor/useRichMarkdownSearch.test.tsx
new file mode 100644
index 00000000000..d2be40e647a
--- /dev/null
+++ b/src/renderer/src/components/editor/useRichMarkdownSearch.test.tsx
@@ -0,0 +1,72 @@
+// @vitest-environment happy-dom
+
+import { act, renderHook } from '@testing-library/react'
+import type { Editor } from '@tiptap/react'
+import { describe, expect, it, vi } from 'vitest'
+import { useRichMarkdownSearch } from './useRichMarkdownSearch'
+
+function createEditor(): { editor: Editor; emitUpdate: () => void } {
+  const updateListeners = new Set<() => void>()
+  const transaction = {
+    setMeta: vi.fn().mockReturnThis()
+  }
+  const editor = {
+    commands: { focus: vi.fn() },
+    off: vi.fn((event: string, listener: () => void) => {
+      if (event === 'update') {
+        updateListeners.delete(listener)
+      }
+    }),
+    on: vi.fn((event: string, listener: () => void) => {
+      if (event === 'update') {
+        updateListeners.add(listener)
+      }
+    }),
+    registerPlugin: vi.fn(),
+    state: { doc: {}, tr: transaction },
+    unregisterPlugin: vi.fn(),
+    view: { dispatch: vi.fn() }
+  } as unknown as Editor
+  return {
+    editor,
+    emitUpdate: () => updateListeners.forEach((listener) => listener())
+  }
+}
+
+describe('useRichMarkdownSearch', () => {
+  it('rerenders for editor updates only while search is open', () => {
+    const closedUpdateCount = 100
+    const { editor, emitUpdate } = createEditor()
+    const rootRef = { current: document.createElement('div') }
+    const scrollContainerRef = { current: document.createElement('div') }
+    let renderCount = 0
+    const hook = renderHook(() => {
+      renderCount += 1
+      return useRichMarkdownSearch({ editor, rootRef, scrollContainerRef })
+    })
+
+    const closedRenderCount = renderCount
+    for (let index = 0; index < closedUpdateCount; index += 1) {
+      act(emitUpdate)
+    }
+
+    expect(renderCount - closedRenderCount).toBe(0)
+    expect(editor.on).not.toHaveBeenCalledWith('update', expect.any(Function))
+
+    act(() => hook.result.current.openSearch())
+
+    const openRenderCount = renderCount
+    expect(editor.on).toHaveBeenCalledWith('update', expect.any(Function))
+    act(emitUpdate)
+    expect(renderCount - openRenderCount).toBe(1)
+
+    act(() => hook.result.current.searchActions.closeSearch())
+
+    const reclosedRenderCount = renderCount
+    for (let index = 0; index < closedUpdateCount; index += 1) {
+      act(emitUpdate)
+    }
+    expect(renderCount - reclosedRenderCount).toBe(0)
+    expect(editor.off).toHaveBeenCalledWith('update', expect.any(Function))
+  })
+})
diff --git a/src/renderer/src/components/editor/useRichMarkdownSearch.ts b/src/renderer/src/components/editor/useRichMarkdownSearch.ts
index 035081665ee..2508505b85b 100644
--- a/src/renderer/src/components/editor/useRichMarkdownSearch.ts
+++ b/src/renderer/src/components/editor/useRichMarkdownSearch.ts
@@ -234,7 +234,7 @@ export function useRichMarkdownSearch({
   }, [editor])
 
   useEffect(() => {
-    if (!editor) {
+    if (!editor || !isSearchOpen) {
       return
     }
 
@@ -242,7 +242,7 @@ export function useRichMarkdownSearch({
     return () => {
       editor.off('update', handleEditorUpdate)
     }
-  }, [editor, handleEditorUpdate])
+  }, [editor, handleEditorUpdate, isSearchOpen])
 
   useEffect(() => {
     if (!isSearchOpen) {
diff --git a/src/renderer/src/components/feature-interaction-writer-boundaries.test.ts b/src/renderer/src/components/feature-interaction-writer-boundaries.test.ts
index 7b5bd02163b..e0f386b41a7 100644
--- a/src/renderer/src/components/feature-interaction-writer-boundaries.test.ts
+++ b/src/renderer/src/components/feature-interaction-writer-boundaries.test.ts
@@ -147,7 +147,9 @@ describe('feature interaction writer boundaries', () => {
   })
 
   it('records GitLab provider-depth for detail opens, workspace use, and dialog mutations', () => {
-    const dialogSource = componentSource('GitLabItemDialog.tsx')
+    const detailsSource = componentSource('gitlab-item-dialog/use-gitlab-details-editing.ts')
+    const primarySource = componentSource('gitlab-item-dialog/use-gitlab-primary-actions.ts')
+    const reviewSource = componentSource('gitlab-item-dialog/use-gitlab-review-actions.ts')
     const gitlabWriter = "recordFeatureInteraction('gitlab-tasks')"
 
     expect(
@@ -166,14 +168,18 @@ describe('feature interaction writer boundaries', () => {
     ).toContain(gitlabWriter)
 
     const mutationSections = [
-      sourceBetween(dialogSource, 'const handleSaveDetails', 'const handleRetryJob'),
-      sourceBetween(dialogSource, 'const handleSetReviewers', 'const handleSubmitInlineComment'),
-      sourceBetween(dialogSource, 'const handleSubmitInlineComment', 'const handleClose'),
-      sourceBetween(dialogSource, 'const handleClose', 'const handleReopen'),
-      sourceBetween(dialogSource, 'const handleReopen', 'const handleMerge'),
-      sourceBetween(dialogSource, 'const handleMerge', 'const handleSubmitComment'),
-      sourceBetween(dialogSource, 'const handleSubmitComment', 'const handleResolveDiscussion'),
-      sourceBetween(dialogSource, 'const handleResolveDiscussion', 'const Icon =')
+      sourceBetween(detailsSource, 'const handleSaveDetails', 'return {'),
+      sourceBetween(reviewSource, 'const handleSetReviewers', 'const handleSubmitInlineComment'),
+      sourceBetween(
+        reviewSource,
+        'const handleSubmitInlineComment',
+        'const handleResolveDiscussion'
+      ),
+      sourceBetween(primarySource, 'const handleClose', 'const handleReopen'),
+      sourceBetween(primarySource, 'const handleReopen', 'const handleMerge'),
+      sourceBetween(primarySource, 'const handleMerge', 'const handleSubmitComment'),
+      sourceBetween(primarySource, 'const handleSubmitComment', 'return {'),
+      sourceBetween(reviewSource, 'const handleResolveDiscussion', 'return {')
     ]
     for (const section of mutationSections) {
       expect(section).toContain(gitlabWriter)
@@ -200,7 +206,10 @@ describe('feature interaction writer boundaries', () => {
   })
 
   it('records Linear provider-depth for inline edits, board drops, creation, and workspace use', () => {
-    const drawerSource = componentSource('LinearItemDrawer.tsx')
+    const drawerSource = [
+      componentSource('linear-item-drawer-edit-controller.tsx'),
+      componentSource('linear-item-drawer-comment-footer.tsx')
+    ].join('\n')
     const linearWriter = "recordFeatureInteraction('linear-tasks')"
 
     const taskPageSections = [
@@ -234,7 +243,7 @@ describe('feature interaction writer boundaries', () => {
       sourceBetween(drawerSource, 'const handlePriorityChange', 'const handleEstimateChange'),
       sourceBetween(drawerSource, 'const handleEstimateChange', 'const handleEstimateSubmit'),
       sourceBetween(drawerSource, 'const handleAssigneeChange', 'const handleLabelToggle'),
-      sourceBetween(drawerSource, 'const handleLabelToggle', 'return ('),
+      sourceBetween(drawerSource, 'const handleLabelToggle', 'return {'),
       sourceBetween(drawerSource, 'const handleSubmit = useCallback(async () => {', 'return (')
     ]
     for (const section of drawerMutationSections) {
diff --git a/src/renderer/src/components/github-item-dialog/discuss-item/issue-conversation-entries.ts b/src/renderer/src/components/github-item-dialog/discuss-item/issue-conversation-entries.ts
index 6af66ea62fe..75f08c821dd 100644
--- a/src/renderer/src/components/github-item-dialog/discuss-item/issue-conversation-entries.ts
+++ b/src/renderer/src/components/github-item-dialog/discuss-item/issue-conversation-entries.ts
@@ -27,24 +27,20 @@ export function getIssueConversationEntries(
   timelineItems: GitHubIssueTimelineItem[]
 ): IssueConversationEntry[] {
   return [
-    ...comments.map(
-      (comment, index): IssueConversationEntry => ({
-        kind: 'comment',
-        id: `comment:${comment.id}`,
-        createdAt: comment.createdAt,
-        comment,
-        index
-      })
-    ),
-    ...timelineItems.map(
-      (activity, index): IssueConversationEntry => ({
-        kind: 'activity',
-        id: `activity:${activity.id}`,
-        createdAt: activity.createdAt,
-        activity,
-        index: comments.length + index
-      })
-    )
+    ...comments.map((comment, index): IssueConversationEntry => ({
+      kind: 'comment',
+      id: `comment:${comment.id}`,
+      createdAt: comment.createdAt,
+      comment,
+      index
+    })),
+    ...timelineItems.map((activity, index): IssueConversationEntry => ({
+      kind: 'activity',
+      id: `activity:${activity.id}`,
+      createdAt: activity.createdAt,
+      activity,
+      index: comments.length + index
+    }))
   ].sort((a, b) => {
     const diff = getTimelineSortValue(a.createdAt) - getTimelineSortValue(b.createdAt)
     return diff === 0 ? a.index - b.index : diff
diff --git a/src/renderer/src/components/gitlab-item-dialog/gitlab-conversation-tab.tsx b/src/renderer/src/components/gitlab-item-dialog/gitlab-conversation-tab.tsx
new file mode 100644
index 00000000000..cfff2325eca
--- /dev/null
+++ b/src/renderer/src/components/gitlab-item-dialog/gitlab-conversation-tab.tsx
@@ -0,0 +1,43 @@
+import { LoaderCircle } from 'lucide-react'
+import { TabsContent } from '@/components/ui/tabs'
+import { translate } from '@/i18n/i18n'
+import type { GitLabWorkItem } from '../../../../shared/gitlab-types'
+import { CommentCard } from '../gitlab-item-dialog-parts'
+import type { GitLabItemDialogState } from './use-gitlab-item-dialog-state'
+import type { GitLabReviewActions } from './use-gitlab-review-actions'
+
+type Props = {
+  item: GitLabWorkItem
+  state: GitLabItemDialogState
+  reviewActions: GitLabReviewActions
+}
+
+export function GitLabConversationTab({ item, state, reviewActions }: Props) {
+  const { details, loading, resolvingThreadId } = state
+  const isMR = item.type === 'mr'
+  return (
+    <TabsContent value="conversation" className="mt-0 space-y-3">
+      {loading && !details ? (
+        <div className="flex items-center justify-center py-12">
+          <LoaderCircle className="size-5 animate-spin text-muted-foreground" />
+        </div>
+      ) : details?.comments?.length ? (
+        details.comments.map((comment) => (
+          <CommentCard
+            key={comment.id}
+            comment={comment}
+            canResolve={isMR}
+            resolving={resolvingThreadId === comment.threadId}
+            onResolve={(threadId, resolved) =>
+              void reviewActions.handleResolveDiscussion(threadId, resolved)
+            }
+          />
+        ))
+      ) : (
+        <p className="text-sm text-muted-foreground">
+          {translate('auto.components.GitLabItemDialog.85a8170279', 'No comments yet.')}
+        </p>
+      )}
+    </TabsContent>
+  )
+}
diff --git a/src/renderer/src/components/gitlab-item-dialog/gitlab-description-tab.tsx b/src/renderer/src/components/gitlab-item-dialog/gitlab-description-tab.tsx
new file mode 100644
index 00000000000..4258b323ca4
--- /dev/null
+++ b/src/renderer/src/components/gitlab-item-dialog/gitlab-description-tab.tsx
@@ -0,0 +1,342 @@
+import { Check, LoaderCircle, Pencil, X } from 'lucide-react'
+import CommentMarkdown from '@/components/sidebar/CommentMarkdown'
+import { Button } from '@/components/ui/button'
+import { TabsContent } from '@/components/ui/tabs'
+import { translate } from '@/i18n/i18n'
+import { cn } from '@/lib/utils'
+import type { GitLabWorkItem } from '../../../../shared/gitlab-types'
+import {
+  dedupeGitLabUsers,
+  gitLabUserKey,
+  normalizeGitLabLabels,
+  parseGitLabLabelDraft,
+  toggleGitLabLabelDraft
+} from '../gitlab-item-dialog-parts'
+import type { GitLabDetailsEditing } from './use-gitlab-details-editing'
+import type { GitLabItemDialogState } from './use-gitlab-item-dialog-state'
+import type { GitLabReviewActions } from './use-gitlab-review-actions'
+
+type Props = {
+  item: GitLabWorkItem
+  state: GitLabItemDialogState
+  detailsEditing: GitLabDetailsEditing
+  reviewActions: GitLabReviewActions
+}
+
+export function GitLabDescriptionTab({ item, state, detailsEditing, reviewActions }: Props) {
+  const {
+    bodyDraft,
+    details,
+    detailsSaving,
+    editingDetails,
+    labelDraft,
+    labelOptions,
+    labelOptionsLoading,
+    loading,
+    reviewerDraftId,
+    reviewerOptions,
+    reviewerOptionsLoading,
+    reviewerUpdating,
+    setBodyDraft,
+    setLabelDraft,
+    setReviewerDraftId,
+    setTitleDraft,
+    titleDraft
+  } = state
+  const { handleCancelDetailsEdit, handleSaveDetails, handleStartDetailsEdit } = detailsEditing
+  const { handleSetReviewers, loadGitLabReviewerOptions } = reviewActions
+  const isMR = item.type === 'mr'
+  const visibleLabels = normalizeGitLabLabels(details?.item.labels ?? item.labels ?? [])
+  const labelSuggestionOptions = normalizeGitLabLabels([
+    ...(labelOptions ?? []),
+    ...visibleLabels,
+    ...parseGitLabLabelDraft(labelDraft)
+  ])
+  const currentReviewers = dedupeGitLabUsers(details?.reviewers ?? [])
+  const currentReviewerKeys = new Set(currentReviewers.map(gitLabUserKey))
+  const reviewerOptionRows = dedupeGitLabUsers([
+    ...(reviewerOptions ?? []),
+    ...currentReviewers
+  ]).filter((user) => !currentReviewerKeys.has(gitLabUserKey(user)))
+  const approvalState = details?.approvalState
+
+  return (
+    <TabsContent value="description" className="mt-0">
+      {!loading && details && isMR ? (
+        <div className="mb-4 rounded-md border border-border/50 bg-muted/20 p-3">
+          <div className="flex items-center justify-between gap-2">
+            <div>
+              <div className="text-xs font-medium text-foreground">
+                {translate('auto.components.GitLabItemDialog.4f9313984d', 'Reviewers')}
+              </div>
+              {approvalState ? (
+                <div className="mt-0.5 text-[11px] text-muted-foreground">
+                  {approvalState.approvalsLeft === 0
+                    ? translate('auto.components.GitLabItemDialog.22511537d2', 'Approved')
+                    : translate(
+                        'auto.components.GitLabItemDialog.40c56b95e2',
+                        '{{value0}} approval{{value1}} remaining',
+                        {
+                          value0: approvalState.approvalsLeft ?? 0,
+                          value1: approvalState.approvalsLeft === 1 ? '' : 's'
+                        }
+                      )}
+                  {typeof approvalState.approvalsRequired === 'number'
+                    ? translate(
+                        'auto.components.GitLabItemDialog.00f3bab87b',
+                        ' of {{value0}} required',
+                        { value0: approvalState.approvalsRequired }
+                      )
+                    : ''}
+                </div>
+              ) : null}
+            </div>
+            <Button
+              type="button"
+              variant="outline"
+              size="xs"
+              disabled={reviewerOptionsLoading}
+              onClick={() => void loadGitLabReviewerOptions()}
+            >
+              {reviewerOptionsLoading ? <LoaderCircle className="size-3 animate-spin" /> : null}
+              {translate('auto.components.GitLabItemDialog.cb55b0390f', 'Manage')}
+            </Button>
+          </div>
+          <div className="mt-2 flex flex-wrap gap-1.5">
+            {currentReviewers.length > 0 ? (
+              currentReviewers.map((reviewer) => (
+                <span
+                  key={gitLabUserKey(reviewer)}
+                  className="inline-flex h-6 items-center gap-1 rounded-full border border-border/50 bg-background px-2 text-[11px] text-foreground"
+                >
+                  {reviewer.username}
+                  <button
+                    type="button"
+                    disabled={reviewerUpdating}
+                    onClick={() =>
+                      void handleSetReviewers(
+                        currentReviewers.filter(
+                          (row) => gitLabUserKey(row) !== gitLabUserKey(reviewer)
+                        )
+                      )
+                    }
+                    className="rounded-full p-0.5 text-muted-foreground hover:bg-muted hover:text-foreground disabled:opacity-50"
+                    aria-label={translate(
+                      'auto.components.GitLabItemDialog.1b19cdc510',
+                      'Remove reviewer {{value0}}',
+                      { value0: reviewer.username }
+                    )}
+                  >
+                    <X className="size-3" />
+                  </button>
+                </span>
+              ))
+            ) : (
+              <span className="text-[11px] text-muted-foreground">
+                {translate('auto.components.GitLabItemDialog.474b50d988', 'No reviewers.')}
+              </span>
+            )}
+          </div>
+          {reviewerOptions ? (
+            <div className="mt-2 flex items-center gap-2">
+              <select
+                value={reviewerDraftId}
+                disabled={reviewerUpdating || reviewerOptionRows.length === 0}
+                onChange={(event) => setReviewerDraftId(event.target.value)}
+                className="h-8 min-w-0 flex-1 rounded-md border border-input bg-background px-2 text-xs text-foreground"
+              >
+                <option value="">
+                  {translate('auto.components.GitLabItemDialog.05939e977d', 'Add reviewer')}
+                </option>
+                {reviewerOptionRows.map((reviewer) => (
+                  <option key={gitLabUserKey(reviewer)} value={gitLabUserKey(reviewer)}>
+                    {reviewer.username}
+                  </option>
+                ))}
+              </select>
+              <Button
+                type="button"
+                size="xs"
+                disabled={!reviewerDraftId || reviewerUpdating}
+                onClick={() => {
+                  const reviewer = reviewerOptionRows.find(
+                    (user) => gitLabUserKey(user) === reviewerDraftId
+                  )
+                  if (reviewer) {
+                    void handleSetReviewers([...currentReviewers, reviewer])
+                  }
+                }}
+              >
+                {reviewerUpdating ? <LoaderCircle className="size-3 animate-spin" /> : null}
+                {translate('auto.components.GitLabItemDialog.7a2117129a', 'Add')}
+              </Button>
+            </div>
+          ) : null}
+          {approvalState?.rules.length ? (
+            <div className="mt-2 space-y-1 border-t border-border/40 pt-2">
+              {approvalState.rules.map((rule) => (
+                <div
+                  key={rule.id}
+                  className="flex items-center justify-between gap-2 text-[11px] text-muted-foreground"
+                >
+                  <span className="min-w-0 truncate">{rule.name}</span>
+                  <span>
+                    {rule.approved
+                      ? translate('auto.components.GitLabItemDialog.22511537d2', 'Approved')
+                      : translate(
+                          'auto.components.GitLabItemDialog.6de8ce0cc6',
+                          '{{value0}} required',
+                          { value0: rule.approvalsRequired }
+                        )}
+                  </span>
+                </div>
+              ))}
+            </div>
+          ) : null}
+        </div>
+      ) : null}
+      {loading && !details ? (
+        <div className="flex items-center justify-center py-12">
+          <LoaderCircle className="size-5 animate-spin text-muted-foreground" />
+        </div>
+      ) : editingDetails ? (
+        <div className="space-y-3">
+          <div>
+            <label className="mb-1 block text-xs font-medium text-muted-foreground">
+              {translate('auto.components.GitLabItemDialog.89f3f19368', 'Title')}
+            </label>
+            <input
+              value={titleDraft}
+              onChange={(event) => setTitleDraft(event.target.value)}
+              disabled={detailsSaving}
+              className="h-9 w-full rounded-md border border-input bg-transparent px-2.5 text-sm shadow-xs focus:border-ring focus:outline-none focus:ring-[3px] focus:ring-ring/50"
+            />
+          </div>
+          <div>
+            <label className="mb-1 block text-xs font-medium text-muted-foreground">
+              {translate('auto.components.GitLabItemDialog.908d8d2a73', 'Description')}
+            </label>
+            <textarea
+              value={bodyDraft}
+              onChange={(event) => setBodyDraft(event.target.value)}
+              rows={8}
+              disabled={detailsSaving}
+              className="min-h-40 w-full resize-y rounded-md border border-input bg-transparent px-2.5 py-2 text-sm shadow-xs focus:border-ring focus:outline-none focus:ring-[3px] focus:ring-ring/50"
+            />
+          </div>
+          <div>
+            <label className="mb-1 block text-xs font-medium text-muted-foreground">
+              {translate('auto.components.GitLabItemDialog.dde24ade55', 'Labels')}
+            </label>
+            <input
+              value={labelDraft}
+              onChange={(event) => setLabelDraft(event.target.value)}
+              disabled={detailsSaving}
+              placeholder={translate('auto.components.GitLabItemDialog.3c0b6ccca7', 'bug, backend')}
+              className="h-9 w-full rounded-md border border-input bg-transparent px-2.5 text-sm shadow-xs focus:border-ring focus:outline-none focus:ring-[3px] focus:ring-ring/50"
+            />
+            {labelOptionsLoading || labelSuggestionOptions.length > 0 ? (
+              <div className="mt-2 flex flex-wrap gap-1.5">
+                {labelOptionsLoading ? (
+                  <span className="inline-flex h-6 items-center gap-1 rounded-full border border-border/50 px-2 text-[11px] text-muted-foreground">
+                    <LoaderCircle className="size-3 animate-spin" />
+                    {translate('auto.components.GitLabItemDialog.717b706849', 'Loading labels')}
+                  </span>
+                ) : null}
+                {labelSuggestionOptions.map((label) => {
+                  const selected = parseGitLabLabelDraft(labelDraft).some(
+                    (item) => item.toLowerCase() === label.toLowerCase()
+                  )
+                  return (
+                    <button
+                      key={label}
+                      type="button"
+                      disabled={detailsSaving}
+                      onClick={() => setLabelDraft(toggleGitLabLabelDraft(labelDraft, label))}
+                      className={cn(
+                        'inline-flex h-6 items-center gap-1 rounded-full border px-2 text-[11px] transition-colors',
+                        selected
+                          ? 'border-primary/40 bg-primary/10 text-primary'
+                          : 'border-border/50 bg-muted/30 text-muted-foreground hover:bg-muted/60'
+                      )}
+                    >
+                      {selected ? <Check className="size-3" /> : null}
+                      {label}
+                    </button>
+                  )
+                })}
+              </div>
+            ) : null}
+          </div>
+          <div className="flex justify-end gap-2">
+            <Button
+              type="button"
+              variant="outline"
+              size="sm"
+              disabled={detailsSaving}
+              onClick={handleCancelDetailsEdit}
+            >
+              <X className="size-3.5" />
+              {translate('auto.components.GitLabItemDialog.f72fad3b16', 'Cancel')}
+            </Button>
+            <Button
+              type="button"
+              size="sm"
+              disabled={detailsSaving || !titleDraft.trim()}
+              onClick={() => void handleSaveDetails()}
+            >
+              {detailsSaving ? (
+                <LoaderCircle className="size-3.5 animate-spin" />
+              ) : (
+                <Check className="size-3.5" />
+              )}
+              {translate('auto.components.GitLabItemDialog.93f79a3fc1', 'Save')}
+            </Button>
+          </div>
+        </div>
+      ) : details?.body ? (
+        <div>
+          {isMR && details ? (
+            <div className="mb-3 flex justify-end">
+              <Button
+                type="button"
+                variant="outline"
+                size="sm"
+                onClick={handleStartDetailsEdit}
+                className="gap-1.5"
+              >
+                <Pencil className="size-3.5" />
+                {translate('auto.components.GitLabItemDialog.da4174b00f', 'Edit')}
+              </Button>
+            </div>
+          ) : null}
+          <CommentMarkdown
+            content={details.body}
+            variant="document"
+            className="min-w-0 max-w-full overflow-hidden break-words text-[13px] leading-relaxed [&_a]:break-all [&_code]:break-words [&_pre]:max-w-full"
+          />
+        </div>
+      ) : (
+        <div>
+          {isMR && details ? (
+            <div className="mb-3 flex justify-end">
+              <Button
+                type="button"
+                variant="outline"
+                size="sm"
+                onClick={handleStartDetailsEdit}
+                className="gap-1.5"
+              >
+                <Pencil className="size-3.5" />
+                {translate('auto.components.GitLabItemDialog.da4174b00f', 'Edit')}
+              </Button>
+            </div>
+          ) : null}
+          <p className="text-sm text-muted-foreground">
+            {translate('auto.components.GitLabItemDialog.14423484db', 'No description.')}
+          </p>
+        </div>
+      )}
+    </TabsContent>
+  )
+}
diff --git a/src/renderer/src/components/gitlab-item-dialog/gitlab-files-tab.tsx b/src/renderer/src/components/gitlab-item-dialog/gitlab-files-tab.tsx
new file mode 100644
index 00000000000..b25565b59df
--- /dev/null
+++ b/src/renderer/src/components/gitlab-item-dialog/gitlab-files-tab.tsx
@@ -0,0 +1,136 @@
+import { LoaderCircle, Send } from 'lucide-react'
+import { Button } from '@/components/ui/button'
+import { TabsContent } from '@/components/ui/tabs'
+import { translate } from '@/i18n/i18n'
+import { hasBoundedCommentBodyText } from '@/lib/comment-body-submit-state'
+import type { GitLabWorkItem } from '../../../../shared/gitlab-types'
+import type { GitLabItemDialogState } from './use-gitlab-item-dialog-state'
+import type { GitLabReviewActions } from './use-gitlab-review-actions'
+
+type Props = {
+  item: GitLabWorkItem
+  state: GitLabItemDialogState
+  reviewActions: GitLabReviewActions
+}
+
+export function GitLabFilesTab({ item, state, reviewActions }: Props) {
+  if (item.type !== 'mr') {
+    return null
+  }
+  const {
+    details,
+    inlineCommentBody,
+    inlineCommentFilePath,
+    inlineCommentLine,
+    inlineCommentSubmitting,
+    loading,
+    setInlineCommentBody,
+    setInlineCommentFilePath,
+    setInlineCommentLine
+  } = state
+  const canSubmitInlineComment = hasBoundedCommentBodyText(inlineCommentBody)
+  return (
+    <TabsContent value="files" className="mt-0 space-y-3">
+      {loading && !details ? (
+        <div className="flex items-center justify-center py-12">
+          <LoaderCircle className="size-5 animate-spin text-muted-foreground" />
+        </div>
+      ) : details?.files?.length ? (
+        <>
+          <div className="rounded-md border border-border/50 bg-muted/20 p-3">
+            <div className="grid grid-cols-[minmax(0,1fr)_80px] gap-2">
+              <select
+                value={inlineCommentFilePath}
+                onChange={(event) => setInlineCommentFilePath(event.target.value)}
+                className="h-8 min-w-0 rounded-md border border-input bg-background px-2 text-xs text-foreground"
+              >
+                <option value="">
+                  {translate('auto.components.GitLabItemDialog.ceb08a733d', 'File')}
+                </option>
+                {details.files.map((file) => (
+                  <option key={file.path} value={file.path}>
+                    {file.path}
+                  </option>
+                ))}
+              </select>
+              <input
+                value={inlineCommentLine}
+                onChange={(event) => setInlineCommentLine(event.target.value)}
+                inputMode="numeric"
+                placeholder={translate('auto.components.GitLabItemDialog.7a7204417f', 'Line')}
+                className="h-8 rounded-md border border-input bg-background px-2 text-xs text-foreground"
+              />
+            </div>
+            <textarea
+              value={inlineCommentBody}
+              onChange={(event) => setInlineCommentBody(event.target.value)}
+              rows={2}
+              placeholder={translate(
+                'auto.components.GitLabItemDialog.21f8dde18a',
+                'Inline comment'
+              )}
+              className="mt-2 w-full resize-none rounded-md border border-input bg-background px-2.5 py-1.5 text-sm shadow-xs focus:border-ring focus:outline-none focus:ring-[3px] focus:ring-ring/50"
+            />
+            <div className="mt-2 flex justify-end">
+              <Button
+                type="button"
+                size="sm"
+                disabled={
+                  inlineCommentSubmitting ||
+                  !inlineCommentFilePath ||
+                  !inlineCommentLine.trim() ||
+                  !canSubmitInlineComment
+                }
+                onClick={() => void reviewActions.handleSubmitInlineComment()}
+              >
+                {inlineCommentSubmitting ? (
+                  <LoaderCircle className="size-3.5 animate-spin" />
+                ) : (
+                  <Send className="size-3.5" />
+                )}
+                {translate('auto.components.GitLabItemDialog.84012fa8fb', 'Comment')}
+              </Button>
+            </div>
+          </div>
+          <div className="space-y-2">
+            {details.files.map((file) => (
+              <div key={file.path} className="rounded-md border border-border/50 bg-muted/10">
+                <div className="flex items-center justify-between gap-2 border-b border-border/40 px-3 py-2">
+                  <div className="min-w-0">
+                    <div className="break-all font-mono text-xs text-foreground">{file.path}</div>
+                    {file.oldPath ? (
+                      <div className="break-all font-mono text-[11px] text-muted-foreground">
+                        {translate('auto.components.GitLabItemDialog.a7eb4f4916', 'from')}{' '}
+                        {file.oldPath}
+                      </div>
+                    ) : null}
+                  </div>
+                  <div className="shrink-0 text-[11px] text-muted-foreground">
+                    <span className="text-emerald-600">+{file.additions}</span>{' '}
+                    <span className="text-rose-600">-{file.deletions}</span>
+                  </div>
+                </div>
+                {file.diff ? (
+                  <pre className="max-h-80 overflow-auto whitespace-pre-wrap break-words px-3 py-2 font-mono text-[11px] leading-4 text-foreground scrollbar-sleek">
+                    {file.diff}
+                  </pre>
+                ) : (
+                  <div className="px-3 py-3 text-xs text-muted-foreground">
+                    {translate(
+                      'auto.components.GitLabItemDialog.007423f585',
+                      'Diff content unavailable.'
+                    )}
+                  </div>
+                )}
+              </div>
+            ))}
+          </div>
+        </>
+      ) : (
+        <p className="text-sm text-muted-foreground">
+          {translate('auto.components.GitLabItemDialog.808b1ca1ba', 'No changed files.')}
+        </p>
+      )}
+    </TabsContent>
+  )
+}
diff --git a/src/renderer/src/components/gitlab-item-dialog/gitlab-item-dialog-types.ts b/src/renderer/src/components/gitlab-item-dialog/gitlab-item-dialog-types.ts
new file mode 100644
index 00000000000..8ceadd04d36
--- /dev/null
+++ b/src/renderer/src/components/gitlab-item-dialog/gitlab-item-dialog-types.ts
@@ -0,0 +1,17 @@
+import type { GitLabWorkItem } from '../../../../shared/gitlab-types'
+import type { TaskSourceContext } from '../../../../shared/task-source-context'
+
+export type GitLabItemDialogProps = {
+  item: GitLabWorkItem | null
+  repoPath: string | null
+  repoId?: string | null
+  sourceContext?: TaskSourceContext | null
+  onClose: () => void
+  onCreateWorkspace?: (item: GitLabWorkItem) => void
+}
+
+export type GitLabDialogRepoSelector = {
+  repoPath: string
+  repoId?: string | null
+  sourceContext?: TaskSourceContext | null
+}
diff --git a/src/renderer/src/components/gitlab-item-dialog/gitlab-item-dialog-view.tsx b/src/renderer/src/components/gitlab-item-dialog/gitlab-item-dialog-view.tsx
new file mode 100644
index 00000000000..e29008201cf
--- /dev/null
+++ b/src/renderer/src/components/gitlab-item-dialog/gitlab-item-dialog-view.tsx
@@ -0,0 +1,302 @@
+import { CircleDot, ExternalLink, GitMerge, LoaderCircle, RefreshCw, Send, X } from 'lucide-react'
+import { VisuallyHidden } from 'radix-ui'
+import { Button } from '@/components/ui/button'
+import {
+  Sheet,
+  SheetClose,
+  SheetContent,
+  SheetDescription,
+  SheetTitle
+} from '@/components/ui/sheet'
+import { Tabs, TabsList, TabsTrigger } from '@/components/ui/tabs'
+import { translate } from '@/i18n/i18n'
+import { hasBoundedCommentBodyText } from '@/lib/comment-body-submit-state'
+import { isScreenSubmitShortcut } from '@/lib/screen-submit-shortcut'
+import type { GitLabWorkItem } from '../../../../shared/gitlab-types'
+import { normalizeGitLabLabels, StateBadge } from '../gitlab-item-dialog-parts'
+import { GitLabConversationTab } from './gitlab-conversation-tab'
+import { GitLabDescriptionTab } from './gitlab-description-tab'
+import { GitLabFilesTab } from './gitlab-files-tab'
+import { GitLabPipelineTab } from './gitlab-pipeline-tab'
+import type { GitLabDetailsEditing } from './use-gitlab-details-editing'
+import type { GitLabItemDialogState } from './use-gitlab-item-dialog-state'
+import type { GitLabPipelineActions } from './use-gitlab-pipeline-actions'
+import type { GitLabPrimaryActions } from './use-gitlab-primary-actions'
+import type { GitLabReviewActions } from './use-gitlab-review-actions'
+
+type Props = {
+  item: GitLabWorkItem | null
+  onClose: () => void
+  onCreateWorkspace?: (item: GitLabWorkItem) => void
+  state: GitLabItemDialogState
+  detailsEditing: GitLabDetailsEditing
+  pipelineActions: GitLabPipelineActions
+  primaryActions: GitLabPrimaryActions
+  reviewActions: GitLabReviewActions
+  handleRefresh: () => void
+  updateCommentDraft: (value: string) => void
+}
+
+export function GitLabItemDialogView({
+  item,
+  onClose,
+  onCreateWorkspace,
+  state,
+  detailsEditing,
+  pipelineActions,
+  primaryActions,
+  reviewActions,
+  handleRefresh,
+  updateCommentDraft
+}: Props) {
+  const { actionInFlight, commentDraft, commentSubmitting, details, error, loading } = state
+  // Why: GitMerge for MRs visually disambiguates from GitBranch (and
+  // matches gitlab.com's MR iconography); CircleDot stays on issues.
+  const Icon = item?.type === 'mr' ? GitMerge : CircleDot
+  const prefix = item?.type === 'mr' ? '!' : '#'
+  const isMR = item?.type === 'mr'
+  const canClose = isMR && item?.state === 'opened'
+  const canReopen = isMR && item?.state === 'closed'
+  const canMerge = isMR && item?.state === 'opened'
+  const visibleTitle = details?.item.title || item?.title || ''
+  const visibleLabels = normalizeGitLabLabels(details?.item.labels ?? item?.labels ?? [])
+  const canSubmitComment = hasBoundedCommentBodyText(commentDraft)
+
+  return (
+    <Sheet open={item !== null} onOpenChange={(open) => !open && onClose()}>
+      {/* Why: the sheet's absolute default close control would overlap this header's actions. */}
+      <SheetContent
+        side="right"
+        showCloseButton={false}
+        className="flex w-full flex-col gap-0 p-0 sm:max-w-2xl"
+      >
+        <VisuallyHidden.Root>
+          <SheetTitle>
+            {item
+              ? visibleTitle
+              : translate('auto.components.GitLabItemDialog.3a051b8ade', 'Work item')}
+          </SheetTitle>
+          <SheetDescription>
+            {translate('auto.components.GitLabItemDialog.30c97083c2', 'GitLab work item detail')}
+          </SheetDescription>
+        </VisuallyHidden.Root>
+
+        {item ? (
+          <>
+            <header className="flex-none border-b border-border/40 px-5 py-4">
+              <div className="flex items-start gap-3">
+                <Icon className="mt-0.5 size-5 text-muted-foreground" />
+                <div className="min-w-0 flex-1">
+                  <div className="flex items-center gap-2 text-xs text-muted-foreground">
+                    <span className="font-mono">
+                      {prefix}
+                      {item.number}
+                    </span>
+                    <StateBadge state={item.state} />
+                    {item.author ? (
+                      <span>
+                        {translate('auto.components.GitLabItemDialog.9bfb4a24d7', 'by')}{' '}
+                        {item.author}
+                      </span>
+                    ) : null}
+                  </div>
+                  <h2 className="mt-1.5 text-lg font-semibold leading-tight text-foreground">
+                    {visibleTitle}
+                  </h2>
+                  {visibleLabels.length > 0 ? (
+                    <div className="mt-2 flex flex-wrap gap-1">
+                      {visibleLabels.map((label) => (
+                        <span
+                          key={label}
+                          className="rounded-full border border-border/50 bg-muted/40 px-2 py-0.5 text-[10px] font-medium text-muted-foreground"
+                        >
+                          {label}
+                        </span>
+                      ))}
+                    </div>
+                  ) : null}
+                </div>
+                <div className="flex shrink-0 items-center gap-1">
+                  <Button
+                    variant="ghost"
+                    size="icon-sm"
+                    aria-label={translate('auto.components.GitLabItemDialog.b3c156dd51', 'Refresh')}
+                    disabled={loading}
+                    onClick={handleRefresh}
+                    className="size-7"
+                  >
+                    {loading ? (
+                      <LoaderCircle className="size-3.5 animate-spin" />
+                    ) : (
+                      <RefreshCw className="size-3.5" />
+                    )}
+                  </Button>
+                  <SheetClose asChild>
+                    <Button
+                      variant="ghost"
+                      size="icon-sm"
+                      className="size-7"
+                      aria-label={translate('auto.components.GitLabItemDialog.a199eb364b', 'Close')}
+                    >
+                      <X className="size-3.5" />
+                    </Button>
+                  </SheetClose>
+                </div>
+              </div>
+            </header>
+
+            <Tabs defaultValue="description" className="flex min-h-0 flex-1 flex-col">
+              <TabsList className="mx-5 mt-3 self-start">
+                <TabsTrigger value="description">
+                  {translate('auto.components.GitLabItemDialog.908d8d2a73', 'Description')}
+                </TabsTrigger>
+                <TabsTrigger value="conversation">
+                  {translate('auto.components.GitLabItemDialog.c996e2962c', 'Conversation')}
+                  {details?.comments?.length ? (
+                    <span className="ml-1.5 rounded-full bg-muted px-1.5 text-[10px] font-medium">
+                      {details.comments.length}
+                    </span>
+                  ) : null}
+                </TabsTrigger>
+                {isMR ? (
+                  <TabsTrigger value="files">
+                    {translate('auto.components.GitLabItemDialog.be3d291837', 'Files')}
+                    {details?.files?.length ? (
+                      <span className="ml-1.5 rounded-full bg-muted px-1.5 text-[10px] font-medium">
+                        {details.files.length}
+                      </span>
+                    ) : null}
+                  </TabsTrigger>
+                ) : null}
+                {isMR ? (
+                  <TabsTrigger value="pipeline">
+                    {translate('auto.components.GitLabItemDialog.02cbe2de44', 'Pipeline')}
+                    {details?.pipelineJobs?.length ? (
+                      <span className="ml-1.5 rounded-full bg-muted px-1.5 text-[10px] font-medium">
+                        {details.pipelineJobs.length}
+                      </span>
+                    ) : null}
+                  </TabsTrigger>
+                ) : null}
+              </TabsList>
+
+              <div className="min-h-0 flex-1 overflow-y-auto px-5 py-4 scrollbar-sleek">
+                {error ? (
+                  <div className="rounded-md bg-destructive/10 px-3 py-2 text-sm text-destructive">
+                    {error}
+                  </div>
+                ) : null}
+                <GitLabDescriptionTab
+                  item={item}
+                  state={state}
+                  detailsEditing={detailsEditing}
+                  reviewActions={reviewActions}
+                />
+                <GitLabConversationTab item={item} state={state} reviewActions={reviewActions} />
+                <GitLabFilesTab item={item} state={state} reviewActions={reviewActions} />
+                <GitLabPipelineTab item={item} state={state} pipelineActions={pipelineActions} />
+              </div>
+            </Tabs>
+
+            <footer className="flex-none space-y-3 border-t border-border/40 px-5 py-3">
+              {/* Why: comment composer at the top of the footer so the
+                  primary actions row stays visually grouped at the bottom. */}
+              <div className="flex items-end gap-2">
+                <textarea
+                  value={commentDraft}
+                  onChange={(event) => updateCommentDraft(event.target.value)}
+                  placeholder={translate(
+                    'auto.components.GitLabItemDialog.c08e1d5a57',
+                    'Comment on {{value0}}{{value1}}…',
+                    { value0: prefix, value1: item.number }
+                  )}
+                  rows={2}
+                  disabled={commentSubmitting}
+                  className="min-h-9 w-full resize-none rounded-md border border-input bg-transparent px-2.5 py-1.5 text-sm shadow-xs focus:border-ring focus:outline-none focus:ring-[3px] focus:ring-ring/50"
+                  onKeyDown={(event) => {
+                    // Why: this is local textarea submit behavior; Settings
+                    // keybindings only cover app commands.
+                    if (isScreenSubmitShortcut(event) && canSubmitComment && !commentSubmitting) {
+                      event.preventDefault()
+                      void primaryActions.handleSubmitComment()
+                    }
+                  }}
+                />
+                <Button
+                  size="sm"
+                  disabled={!canSubmitComment || commentSubmitting}
+                  onClick={() => void primaryActions.handleSubmitComment()}
+                  className="shrink-0 gap-1.5"
+                >
+                  {commentSubmitting ? (
+                    <LoaderCircle className="size-3.5 animate-spin" />
+                  ) : (
+                    <Send className="size-3.5" />
+                  )}
+                  {translate('auto.components.GitLabItemDialog.84012fa8fb', 'Comment')}
+                </Button>
+              </div>
+
+              <div className="flex items-center justify-between gap-2">
+                <Button
+                  variant="outline"
+                  size="sm"
+                  onClick={() => void window.api.shell.openUrl(item.url)}
+                  className="gap-1.5"
+                >
+                  <ExternalLink className="size-3.5" />
+                  {translate('auto.components.GitLabItemDialog.f2e64d1c20', 'Open in GitLab')}
+                </Button>
+                <div className="flex items-center gap-2">
+                  {onCreateWorkspace ? (
+                    <Button variant="outline" size="sm" onClick={() => onCreateWorkspace(item)}>
+                      {translate('auto.components.GitLabItemDialog.131865e231', 'Create workspace')}
+                    </Button>
+                  ) : null}
+                  {canMerge ? (
+                    <Button
+                      size="sm"
+                      disabled={actionInFlight !== null}
+                      onClick={() => void primaryActions.handleMerge()}
+                    >
+                      {actionInFlight === 'merge' ? (
+                        <LoaderCircle className="size-3.5 animate-spin" />
+                      ) : null}
+                      {translate('auto.components.GitLabItemDialog.16b3412570', 'Merge')}
+                    </Button>
+                  ) : null}
+                  {canClose ? (
+                    <Button
+                      variant="outline"
+                      size="sm"
+                      disabled={actionInFlight !== null}
+                      onClick={() => void primaryActions.handleClose()}
+                    >
+                      {actionInFlight === 'close' ? (
+                        <LoaderCircle className="size-3.5 animate-spin" />
+                      ) : null}
+                      {translate('auto.components.GitLabItemDialog.a199eb364b', 'Close')}
+                    </Button>
+                  ) : null}
+                  {canReopen ? (
+                    <Button
+                      variant="outline"
+                      size="sm"
+                      disabled={actionInFlight !== null}
+                      onClick={() => void primaryActions.handleReopen()}
+                    >
+                      {actionInFlight === 'reopen' ? (
+                        <LoaderCircle className="size-3.5 animate-spin" />
+                      ) : null}
+                      {translate('auto.components.GitLabItemDialog.65e784c1f1', 'Reopen')}
+                    </Button>
+                  ) : null}
+                </div>
+              </div>
+            </footer>
+          </>
+        ) : null}
+      </SheetContent>
+    </Sheet>
+  )
+}
diff --git a/src/renderer/src/components/gitlab-item-dialog/gitlab-pipeline-tab.tsx b/src/renderer/src/components/gitlab-item-dialog/gitlab-pipeline-tab.tsx
new file mode 100644
index 00000000000..5b4d375ae6f
--- /dev/null
+++ b/src/renderer/src/components/gitlab-item-dialog/gitlab-pipeline-tab.tsx
@@ -0,0 +1,50 @@
+import { LoaderCircle } from 'lucide-react'
+import { TabsContent } from '@/components/ui/tabs'
+import { translate } from '@/i18n/i18n'
+import type { GitLabWorkItem } from '../../../../shared/gitlab-types'
+import { PipelineJobRow } from '../gitlab-item-dialog-parts'
+import type { GitLabItemDialogState } from './use-gitlab-item-dialog-state'
+import type { GitLabPipelineActions } from './use-gitlab-pipeline-actions'
+
+type Props = {
+  item: GitLabWorkItem
+  state: GitLabItemDialogState
+  pipelineActions: GitLabPipelineActions
+}
+
+export function GitLabPipelineTab({ item, state, pipelineActions }: Props) {
+  if (item.type !== 'mr') {
+    return null
+  }
+  const { details, expandedJobId, jobTraceById, loading, retryingJobId } = state
+  return (
+    <TabsContent value="pipeline" className="mt-0">
+      {loading && !details ? (
+        <div className="flex items-center justify-center py-12">
+          <LoaderCircle className="size-5 animate-spin text-muted-foreground" />
+        </div>
+      ) : details?.pipelineJobs?.length ? (
+        <div className="space-y-1">
+          {details.pipelineJobs.map((job) => (
+            <PipelineJobRow
+              key={job.id}
+              job={job}
+              expanded={expandedJobId === job.id}
+              traceState={jobTraceById[job.id]}
+              retrying={retryingJobId === job.id}
+              onToggleTrace={(row) => void pipelineActions.handleToggleJobTrace(row)}
+              onRetry={(row) => void pipelineActions.handleRetryJob(row)}
+            />
+          ))}
+        </div>
+      ) : (
+        <p className="text-sm text-muted-foreground">
+          {translate(
+            'auto.components.GitLabItemDialog.f11e3e7675',
+            'No pipeline runs for this MR.'
+          )}
+        </p>
+      )}
+    </TabsContent>
+  )
+}
diff --git a/src/renderer/src/components/gitlab-item-dialog/use-gitlab-details-editing.ts b/src/renderer/src/components/gitlab-item-dialog/use-gitlab-details-editing.ts
new file mode 100644
index 00000000000..f9afaa51dfa
--- /dev/null
+++ b/src/renderer/src/components/gitlab-item-dialog/use-gitlab-details-editing.ts
@@ -0,0 +1,167 @@
+import { useCallback } from 'react'
+import { toast } from 'sonner'
+import { translate } from '@/i18n/i18n'
+import { useAppStore } from '@/store'
+import type { GitLabMRUpdate, GitLabWorkItem } from '../../../../shared/gitlab-types'
+import {
+  formatGitLabLabelDraft,
+  normalizeGitLabLabels,
+  parseGitLabLabelDraft,
+  showGitLabMutationError
+} from '../gitlab-item-dialog-parts'
+import type { GitLabDialogRepoSelector } from './gitlab-item-dialog-types'
+import type { GitLabItemDialogState } from './use-gitlab-item-dialog-state'
+
+export function useGitLabDetailsEditing(
+  item: GitLabWorkItem | null,
+  repoSelector: GitLabDialogRepoSelector | null,
+  state: GitLabItemDialogState
+) {
+  const {
+    bodyDraft,
+    details,
+    labelDraft,
+    labelOptions,
+    labelOptionsLoading,
+    mountedRef,
+    setBodyDraft,
+    setDetails,
+    setDetailsSaving,
+    setEditingDetails,
+    setLabelDraft,
+    setLabelOptions,
+    setLabelOptionsLoading,
+    setTitleDraft,
+    titleDraft
+  } = state
+  const loadGitLabLabelOptions = useCallback(async (): Promise<void> => {
+    if (!repoSelector || labelOptions !== null || labelOptionsLoading) {
+      return
+    }
+    setLabelOptionsLoading(true)
+    try {
+      const labels = await window.api.gl.listLabels(repoSelector)
+      if (mountedRef.current) {
+        setLabelOptions(normalizeGitLabLabels(labels))
+      }
+    } catch {
+      if (mountedRef.current) {
+        setLabelOptions([])
+      }
+    } finally {
+      if (mountedRef.current) {
+        setLabelOptionsLoading(false)
+      }
+    }
+  }, [labelOptions, labelOptionsLoading, mountedRef, repoSelector])
+
+  const handleStartDetailsEdit = useCallback((): void => {
+    if (!item || !details || item.type !== 'mr') {
+      return
+    }
+    setTitleDraft(details.item.title || item.title)
+    setBodyDraft(details.body)
+    setLabelDraft(formatGitLabLabelDraft(details.item.labels ?? item.labels))
+    setEditingDetails(true)
+    void loadGitLabLabelOptions()
+  }, [details, item, loadGitLabLabelOptions])
+
+  const handleCancelDetailsEdit = useCallback((): void => {
+    setEditingDetails(false)
+    setTitleDraft('')
+    setBodyDraft('')
+    setLabelDraft('')
+  }, [])
+
+  const handleSaveDetails = useCallback(async (): Promise<void> => {
+    if (!item || !details || !repoSelector || item.type !== 'mr') {
+      return
+    }
+    const currentTitle = details.item.title || item.title
+    const currentBody = details.body
+    const currentLabels = normalizeGitLabLabels(details.item.labels ?? item.labels)
+    const nextTitle = titleDraft.trim()
+    const nextBody = bodyDraft
+    const nextLabels = parseGitLabLabelDraft(labelDraft)
+    if (!nextTitle) {
+      toast.error(translate('auto.components.GitLabItemDialog.98718490e4', 'MR title is required.'))
+      return
+    }
+
+    const currentLabelKeys = new Set(currentLabels.map((label) => label.toLowerCase()))
+    const nextLabelKeys = new Set(nextLabels.map((label) => label.toLowerCase()))
+    const addLabels = nextLabels.filter((label) => !currentLabelKeys.has(label.toLowerCase()))
+    const removeLabels = currentLabels.filter((label) => !nextLabelKeys.has(label.toLowerCase()))
+    const updates: GitLabMRUpdate = {}
+    if (nextTitle !== currentTitle) {
+      updates.title = nextTitle
+    }
+    if (nextBody !== currentBody) {
+      updates.body = nextBody
+    }
+    if (addLabels.length > 0) {
+      updates.addLabels = addLabels
+    }
+    if (removeLabels.length > 0) {
+      updates.removeLabels = removeLabels
+    }
+    if (Object.keys(updates).length === 0) {
+      handleCancelDetailsEdit()
+      return
+    }
+
+    setDetailsSaving(true)
+    try {
+      const res = await window.api.gl.updateMR({ ...repoSelector, iid: item.number, updates })
+      if (res.ok) {
+        if (mountedRef.current) {
+          setDetails((current) =>
+            current
+              ? {
+                  ...current,
+                  body: nextBody,
+                  item: { ...current.item, title: nextTitle, labels: nextLabels }
+                }
+              : current
+          )
+          setLabelOptions((current) =>
+            current ? normalizeGitLabLabels([...current, ...nextLabels]) : current
+          )
+          setEditingDetails(false)
+          setTitleDraft('')
+          setBodyDraft('')
+          setLabelDraft('')
+          useAppStore.getState().recordFeatureInteraction('gitlab-tasks')
+        }
+      } else if (mountedRef.current) {
+        toast.error(res.error)
+      }
+    } catch (error) {
+      if (mountedRef.current) {
+        showGitLabMutationError(error)
+      }
+    } finally {
+      if (mountedRef.current) {
+        setDetailsSaving(false)
+      }
+    }
+  }, [
+    bodyDraft,
+    details,
+    handleCancelDetailsEdit,
+    item,
+    labelDraft,
+    mountedRef,
+    repoSelector,
+    titleDraft
+  ])
+
+  return {
+    handleCancelDetailsEdit,
+    handleSaveDetails,
+    handleStartDetailsEdit,
+    loadGitLabLabelOptions
+  }
+}
+
+export type GitLabDetailsEditing = ReturnType<typeof useGitLabDetailsEditing>
diff --git a/src/renderer/src/components/gitlab-item-dialog/use-gitlab-item-dialog-effects.ts b/src/renderer/src/components/gitlab-item-dialog/use-gitlab-item-dialog-effects.ts
new file mode 100644
index 00000000000..dd71ef3cb2c
--- /dev/null
+++ b/src/renderer/src/components/gitlab-item-dialog/use-gitlab-item-dialog-effects.ts
@@ -0,0 +1,115 @@
+/* oxlint-disable react-doctor/no-adjust-state-on-prop-change -- Why: GitLab item dialogs reset draft/provider state and hydrate details from GitLab IPC when the selected item identity changes. */
+import { useEffect } from 'react'
+import type { GitLabWorkItem, GitLabWorkItemDetails } from '../../../../shared/gitlab-types'
+import type { GitLabDialogRepoSelector } from './gitlab-item-dialog-types'
+import type { GitLabItemDialogState } from './use-gitlab-item-dialog-state'
+
+export function useGitLabItemDetailsEffect(
+  item: GitLabWorkItem | null,
+  repoSelector: GitLabDialogRepoSelector | null,
+  state: GitLabItemDialogState
+): void {
+  const { refreshNonce, setDetails, setEditingDetails, setError, setLoading } = state
+  useEffect(() => {
+    if (!item || !repoSelector) {
+      setDetails(null)
+      setLoading(false)
+      setError(null)
+      setEditingDetails(false)
+      return
+    }
+    let stale = false
+    setLoading(true)
+    setError(null)
+    void window.api.gl
+      .workItemDetails({ ...repoSelector, iid: item.number, type: item.type })
+      .then((data) => {
+        if (stale) {
+          return
+        }
+        if (!data) {
+          setError('Item not found.')
+          return
+        }
+        setDetails(data as GitLabWorkItemDetails)
+      })
+      .catch((err) => {
+        if (!stale) {
+          setError(err instanceof Error ? err.message : String(err))
+        }
+      })
+      .finally(() => {
+        if (!stale) {
+          setLoading(false)
+        }
+      })
+    return () => {
+      stale = true
+    }
+  }, [item, refreshNonce, repoSelector, setDetails, setEditingDetails, setError, setLoading])
+}
+
+export function useGitLabItemScopeResetEffect(
+  itemId: string | null,
+  state: GitLabItemDialogState
+): void {
+  const {
+    setBodyDraft,
+    setEditingDetails,
+    setExpandedJobId,
+    setInlineCommentBody,
+    setInlineCommentFilePath,
+    setInlineCommentLine,
+    setInlineCommentSubmitting,
+    setJobTraceById,
+    setLabelDraft,
+    setLabelOptions,
+    setLabelOptionsLoading,
+    setRetryingJobId,
+    setReviewerDraftId,
+    setReviewerOptions,
+    setReviewerOptionsLoading,
+    setReviewerUpdating,
+    setTitleDraft
+  } = state
+  // Why: clear item-scoped dialog state when the sheet target changes. The
+  // top-level comment draft is reconciled during render so it cannot flash stale.
+  useEffect(() => {
+    setEditingDetails(false)
+    setTitleDraft('')
+    setBodyDraft('')
+    setLabelDraft('')
+    setLabelOptions(null)
+    setLabelOptionsLoading(false)
+    setReviewerOptions(null)
+    setReviewerOptionsLoading(false)
+    setReviewerUpdating(false)
+    setReviewerDraftId('')
+    setInlineCommentFilePath('')
+    setInlineCommentLine('')
+    setInlineCommentBody('')
+    setInlineCommentSubmitting(false)
+    setExpandedJobId(null)
+    setJobTraceById({})
+    setRetryingJobId(null)
+  }, [
+    itemId,
+    setBodyDraft,
+    setEditingDetails,
+    setExpandedJobId,
+    setInlineCommentBody,
+    setInlineCommentFilePath,
+    setInlineCommentLine,
+    setInlineCommentSubmitting,
+    setJobTraceById,
+    setLabelDraft,
+    setLabelOptions,
+    setLabelOptionsLoading,
+    setRetryingJobId,
+    setReviewerDraftId,
+    setReviewerOptions,
+    setReviewerOptionsLoading,
+    setReviewerUpdating,
+    setTitleDraft
+  ])
+}
diff --git a/src/renderer/src/components/gitlab-item-dialog/use-gitlab-item-dialog-state.ts b/src/renderer/src/components/gitlab-item-dialog/use-gitlab-item-dialog-state.ts
new file mode 100644
index 00000000000..b1175afe21c
--- /dev/null
+++ b/src/renderer/src/components/gitlab-item-dialog/use-gitlab-item-dialog-state.ts
@@ -0,0 +1,109 @@
+/* oxlint-disable react-doctor/no-adjust-state-on-prop-change -- Why: GitLab item dialogs reset draft/provider state and hydrate details from GitLab IPC when the selected item identity changes. */
+import { useCallback, useState } from 'react'
+import { useMountedRef } from '@/hooks/useMountedRef'
+import type { GitLabAssignableUser, GitLabWorkItemDetails } from '../../../../shared/gitlab-types'
+import type { JobTraceState } from '../gitlab-item-dialog-parts'
+
+export function useGitLabItemDialogState(itemId: string | null) {
+  const [details, setDetails] = useState<GitLabWorkItemDetails | null>(null)
+  const [loading, setLoading] = useState(false)
+  const [error, setError] = useState<string | null>(null)
+  const [refreshNonce, setRefreshNonce] = useState(0)
+  const [commentDraftState, setCommentDraftState] = useState<{
+    itemId: string | null
+    value: string
+  }>(() => ({ itemId, value: '' }))
+  const commentDraft = commentDraftState.itemId === itemId ? commentDraftState.value : ''
+  if (commentDraftState.itemId !== itemId) {
+    // Why: comment drafts are tied to one GitLab item, so switching the sheet
+    // target must not leave a draft that could post to the wrong MR/issue.
+    setCommentDraftState({ itemId, value: '' })
+  }
+  const [commentSubmitting, setCommentSubmitting] = useState(false)
+  const [resolvingThreadId, setResolvingThreadId] = useState<string | null>(null)
+  const [editingDetails, setEditingDetails] = useState(false)
+  const [titleDraft, setTitleDraft] = useState('')
+  const [bodyDraft, setBodyDraft] = useState('')
+  const [labelDraft, setLabelDraft] = useState('')
+  const [labelOptions, setLabelOptions] = useState<string[] | null>(null)
+  const [labelOptionsLoading, setLabelOptionsLoading] = useState(false)
+  const [detailsSaving, setDetailsSaving] = useState(false)
+  const [reviewerOptions, setReviewerOptions] = useState<GitLabAssignableUser[] | null>(null)
+  const [reviewerOptionsLoading, setReviewerOptionsLoading] = useState(false)
+  const [reviewerUpdating, setReviewerUpdating] = useState(false)
+  const [reviewerDraftId, setReviewerDraftId] = useState('')
+  const [inlineCommentFilePath, setInlineCommentFilePath] = useState('')
+  const [inlineCommentLine, setInlineCommentLine] = useState('')
+  const [inlineCommentBody, setInlineCommentBody] = useState('')
+  const [inlineCommentSubmitting, setInlineCommentSubmitting] = useState(false)
+  const [expandedJobId, setExpandedJobId] = useState<number | null>(null)
+  const [jobTraceById, setJobTraceById] = useState<Record<number, JobTraceState>>({})
+  const [retryingJobId, setRetryingJobId] = useState<number | null>(null)
+  const [actionInFlight, setActionInFlight] = useState<'close' | 'reopen' | 'merge' | null>(null)
+  const mountedRef = useMountedRef()
+  const updateCommentDraft = useCallback(
+    (value: string): void => {
+      setCommentDraftState({ itemId, value })
+    },
+    [itemId]
+  )
+
+  return {
+    actionInFlight,
+    bodyDraft,
+    commentDraft,
+    commentSubmitting,
+    details,
+    detailsSaving,
+    editingDetails,
+    error,
+    expandedJobId,
+    inlineCommentBody,
+    inlineCommentFilePath,
+    inlineCommentLine,
+    inlineCommentSubmitting,
+    jobTraceById,
+    labelDraft,
+    labelOptions,
+    labelOptionsLoading,
+    loading,
+    mountedRef,
+    refreshNonce,
+    resolvingThreadId,
+    retryingJobId,
+    reviewerDraftId,
+    reviewerOptions,
+    reviewerOptionsLoading,
+    reviewerUpdating,
+    setActionInFlight,
+    setBodyDraft,
+    setCommentDraftState,
+    setCommentSubmitting,
+    setDetails,
+    setDetailsSaving,
+    setEditingDetails,
+    setError,
+    setExpandedJobId,
+    setInlineCommentBody,
+    setInlineCommentFilePath,
+    setInlineCommentLine,
+    setInlineCommentSubmitting,
+    setJobTraceById,
+    setLabelDraft,
+    setLabelOptions,
+    setLabelOptionsLoading,
+    setLoading,
+    setRefreshNonce,
+    setResolvingThreadId,
+    setRetryingJobId,
+    setReviewerDraftId,
+    setReviewerOptions,
+    setReviewerOptionsLoading,
+    setReviewerUpdating,
+    setTitleDraft,
+    titleDraft,
+    updateCommentDraft
+  }
+}
+
+export type GitLabItemDialogState = ReturnType<typeof useGitLabItemDialogState>
diff --git a/src/renderer/src/components/gitlab-item-dialog/use-gitlab-pipeline-actions.ts b/src/renderer/src/components/gitlab-item-dialog/use-gitlab-pipeline-actions.ts
new file mode 100644
index 00000000000..cb33401825d
--- /dev/null
+++ b/src/renderer/src/components/gitlab-item-dialog/use-gitlab-pipeline-actions.ts
@@ -0,0 +1,122 @@
+import { useCallback } from 'react'
+import { toast } from 'sonner'
+import { translate } from '@/i18n/i18n'
+import type { GitLabPipelineJob, GitLabWorkItem } from '../../../../shared/gitlab-types'
+import { showGitLabMutationError } from '../gitlab-item-dialog-parts'
+import type { GitLabDialogRepoSelector } from './gitlab-item-dialog-types'
+import type { GitLabItemDialogState } from './use-gitlab-item-dialog-state'
+
+export function useGitLabPipelineActions(
+  item: GitLabWorkItem | null,
+  repoSelector: GitLabDialogRepoSelector | null,
+  state: GitLabItemDialogState,
+  handleRefresh: () => void
+) {
+  const {
+    details,
+    expandedJobId,
+    jobTraceById,
+    mountedRef,
+    setDetails,
+    setExpandedJobId,
+    setJobTraceById,
+    setRetryingJobId
+  } = state
+  const handleToggleJobTrace = useCallback(
+    async (job: GitLabPipelineJob): Promise<void> => {
+      if (expandedJobId === job.id) {
+        setExpandedJobId(null)
+        return
+      }
+      setExpandedJobId(job.id)
+      if (!repoSelector || !item || jobTraceById[job.id]?.trace || jobTraceById[job.id]?.error) {
+        return
+      }
+      setJobTraceById((current) => ({
+        ...current,
+        [job.id]: { loading: true }
+      }))
+      try {
+        const result = await window.api.gl.jobTrace({
+          ...repoSelector,
+          jobId: job.id,
+          projectRef: details?.item.projectRef ?? item.projectRef ?? null
+        })
+        if (!mountedRef.current) {
+          return
+        }
+        setJobTraceById((current) => ({
+          ...current,
+          [job.id]: result.ok
+            ? { loading: false, trace: result.trace }
+            : { loading: false, error: result.error }
+        }))
+      } catch (error) {
+        if (mountedRef.current) {
+          setJobTraceById((current) => ({
+            ...current,
+            [job.id]: {
+              loading: false,
+              error: error instanceof Error ? error.message : String(error)
+            }
+          }))
+        }
+      }
+    },
+    [details?.item.projectRef, expandedJobId, item, jobTraceById, mountedRef, repoSelector]
+  )
+
+  const handleRetryJob = useCallback(
+    async (job: GitLabPipelineJob): Promise<void> => {
+      if (!repoSelector || !item) {
+        return
+      }
+      setRetryingJobId(job.id)
+      try {
+        const result = await window.api.gl.retryJob({
+          ...repoSelector,
+          jobId: job.id,
+          projectRef: details?.item.projectRef ?? item.projectRef ?? null
+        })
+        if (!mountedRef.current) {
+          return
+        }
+        if (result.ok) {
+          toast.success(
+            translate('auto.components.GitLabItemDialog.f7cb495a12', 'Retried {{value0}}', {
+              value0: job.name
+            })
+          )
+          if (result.job) {
+            setDetails((current) =>
+              current
+                ? {
+                    ...current,
+                    pipelineJobs: (current.pipelineJobs ?? []).map((existing) =>
+                      existing.id === job.id ? result.job! : existing
+                    )
+                  }
+                : current
+            )
+          }
+          handleRefresh()
+        } else {
+          toast.error(result.error)
+        }
+      } catch (error) {
+        if (mountedRef.current) {
+          showGitLabMutationError(error)
+        }
+      } finally {
+        if (mountedRef.current) {
+          setRetryingJobId(null)
+        }
+      }
+    },
+    [details?.item.projectRef, handleRefresh, item, mountedRef, repoSelector]
+  )
+
+  return { handleRetryJob, handleToggleJobTrace }
+}
+
+export type GitLabPipelineActions = ReturnType<typeof useGitLabPipelineActions>
diff --git a/src/renderer/src/components/gitlab-item-dialog/use-gitlab-primary-actions.ts b/src/renderer/src/components/gitlab-item-dialog/use-gitlab-primary-actions.ts
new file mode 100644
index 00000000000..9d9d3ed467e
--- /dev/null
+++ b/src/renderer/src/components/gitlab-item-dialog/use-gitlab-primary-actions.ts
@@ -0,0 +1,181 @@
+import { useCallback } from 'react'
+import { toast } from 'sonner'
+import { getCommentBodySubmitState } from '@/lib/comment-body-submit-state'
+import { translate } from '@/i18n/i18n'
+import { useAppStore } from '@/store'
+import type { GitLabWorkItem } from '../../../../shared/gitlab-types'
+import { showGitLabMutationError } from '../gitlab-item-dialog-parts'
+import type { GitLabDialogRepoSelector } from './gitlab-item-dialog-types'
+import type { GitLabItemDialogState } from './use-gitlab-item-dialog-state'
+
+export function useGitLabPrimaryActions(
+  item: GitLabWorkItem | null,
+  itemId: string | null,
+  repoSelector: GitLabDialogRepoSelector | null,
+  state: GitLabItemDialogState,
+  handleRefresh: () => void
+) {
+  const {
+    commentDraft,
+    mountedRef,
+    setActionInFlight,
+    setCommentDraftState,
+    setCommentSubmitting
+  } = state
+  const handleClose = useCallback(async (): Promise<void> => {
+    if (!item || !repoSelector || item.type !== 'mr') {
+      return
+    }
+    setActionInFlight('close')
+    try {
+      const res = await window.api.gl.closeMR({ ...repoSelector, iid: item.number })
+      if (res.ok) {
+        if (mountedRef.current) {
+          useAppStore.getState().recordFeatureInteraction('gitlab-tasks')
+          toast.success(
+            translate('auto.components.GitLabItemDialog.9b11cd233f', 'Closed MR !{{value0}}', {
+              value0: item.number
+            })
+          )
+          handleRefresh()
+        }
+      } else {
+        if (mountedRef.current) {
+          toast.error(res.error)
+        }
+      }
+    } catch (error) {
+      if (mountedRef.current) {
+        showGitLabMutationError(error)
+      }
+    } finally {
+      if (mountedRef.current) {
+        setActionInFlight(null)
+      }
+    }
+  }, [item, repoSelector, mountedRef, handleRefresh])
+
+  const handleReopen = useCallback(async (): Promise<void> => {
+    if (!item || !repoSelector || item.type !== 'mr') {
+      return
+    }
+    setActionInFlight('reopen')
+    try {
+      const res = await window.api.gl.reopenMR({ ...repoSelector, iid: item.number })
+      if (res.ok) {
+        if (mountedRef.current) {
+          useAppStore.getState().recordFeatureInteraction('gitlab-tasks')
+          toast.success(
+            translate('auto.components.GitLabItemDialog.865ea2703e', 'Reopened MR !{{value0}}', {
+              value0: item.number
+            })
+          )
+          handleRefresh()
+        }
+      } else {
+        if (mountedRef.current) {
+          toast.error(res.error)
+        }
+      }
+    } catch (error) {
+      if (mountedRef.current) {
+        showGitLabMutationError(error)
+      }
+    } finally {
+      if (mountedRef.current) {
+        setActionInFlight(null)
+      }
+    }
+  }, [item, repoSelector, mountedRef, handleRefresh])
+
+  const handleMerge = useCallback(async (): Promise<void> => {
+    if (!item || !repoSelector || item.type !== 'mr') {
+      return
+    }
+    setActionInFlight('merge')
+    try {
+      const res = await window.api.gl.mergeMR({ ...repoSelector, iid: item.number })
+      if (res.ok) {
+        if (mountedRef.current) {
+          useAppStore.getState().recordFeatureInteraction('gitlab-tasks')
+          toast.success(
+            translate('auto.components.GitLabItemDialog.e089f62594', 'Merged MR !{{value0}}', {
+              value0: item.number
+            })
+          )
+          handleRefresh()
+        }
+      } else {
+        if (mountedRef.current) {
+          toast.error(res.error)
+        }
+      }
+    } catch (error) {
+      if (mountedRef.current) {
+        showGitLabMutationError(error)
+      }
+    } finally {
+      if (mountedRef.current) {
+        setActionInFlight(null)
+      }
+    }
+  }, [item, repoSelector, mountedRef, handleRefresh])
+
+  const handleSubmitComment = useCallback(async (): Promise<void> => {
+    const bodyState = getCommentBodySubmitState(commentDraft)
+    if (bodyState.status === 'empty' || !item || !repoSelector) {
+      return
+    }
+    if (bodyState.status === 'too-large-leading-whitespace') {
+      toast.error(
+        translate(
+          'auto.components.GitLabItemDialog.commentTooLarge',
+          'Comment is too large to submit safely.'
+        )
+      )
+      return
+    }
+    setCommentSubmitting(true)
+    try {
+      // Why: the IPC for issue comments takes `number`, MR takes `iid`.
+      // Branch on the item type to hit the right channel.
+      const res =
+        item.type === 'mr'
+          ? await window.api.gl.addMRComment({
+              ...repoSelector,
+              iid: item.number,
+              body: bodyState.body
+            })
+          : await window.api.gl.addIssueComment({
+              ...repoSelector,
+              number: item.number,
+              body: bodyState.body
+            })
+      if (res.ok) {
+        if (mountedRef.current) {
+          setCommentDraftState((current) =>
+            current.itemId === itemId ? { itemId, value: '' } : current
+          )
+          useAppStore.getState().recordFeatureInteraction('gitlab-tasks')
+          handleRefresh()
+        }
+      } else {
+        if (mountedRef.current) {
+          toast.error(res.error)
+        }
+      }
+    } catch (error) {
+      if (mountedRef.current) {
+        showGitLabMutationError(error)
+      }
+    } finally {
+      if (mountedRef.current) {
+        setCommentSubmitting(false)
+      }
+    }
+  }, [commentDraft, item, itemId, repoSelector, mountedRef, handleRefresh])
+
+  return { handleClose, handleMerge, handleReopen, handleSubmitComment }
+}
+
+export type GitLabPrimaryActions = ReturnType<typeof useGitLabPrimaryActions>
diff --git a/src/renderer/src/components/gitlab-item-dialog/use-gitlab-review-actions.ts b/src/renderer/src/components/gitlab-item-dialog/use-gitlab-review-actions.ts
new file mode 100644
index 00000000000..9b56234ffc3
--- /dev/null
+++ b/src/renderer/src/components/gitlab-item-dialog/use-gitlab-review-actions.ts
@@ -0,0 +1,242 @@
+import { useCallback } from 'react'
+import { toast } from 'sonner'
+import { getCommentBodySubmitState } from '@/lib/comment-body-submit-state'
+import { translate } from '@/i18n/i18n'
+import { useAppStore } from '@/store'
+import type { GitLabAssignableUser, GitLabWorkItem } from '../../../../shared/gitlab-types'
+import { dedupeGitLabUsers, showGitLabMutationError } from '../gitlab-item-dialog-parts'
+import type { GitLabDialogRepoSelector } from './gitlab-item-dialog-types'
+import type { GitLabItemDialogState } from './use-gitlab-item-dialog-state'
+
+export function useGitLabReviewActions(
+  item: GitLabWorkItem | null,
+  repoSelector: GitLabDialogRepoSelector | null,
+  state: GitLabItemDialogState
+) {
+  const {
+    details,
+    inlineCommentBody,
+    inlineCommentFilePath,
+    inlineCommentLine,
+    mountedRef,
+    reviewerOptions,
+    reviewerOptionsLoading,
+    setDetails,
+    setInlineCommentBody,
+    setInlineCommentSubmitting,
+    setResolvingThreadId,
+    setReviewerDraftId,
+    setReviewerOptions,
+    setReviewerOptionsLoading,
+    setReviewerUpdating
+  } = state
+  const loadGitLabReviewerOptions = useCallback(async (): Promise<void> => {
+    if (!repoSelector || reviewerOptions !== null || reviewerOptionsLoading) {
+      return
+    }
+    setReviewerOptionsLoading(true)
+    try {
+      const users = await window.api.gl.listAssignableUsers(repoSelector)
+      if (mountedRef.current) {
+        setReviewerOptions(dedupeGitLabUsers(users))
+      }
+    } catch {
+      if (mountedRef.current) {
+        setReviewerOptions([])
+      }
+    } finally {
+      if (mountedRef.current) {
+        setReviewerOptionsLoading(false)
+      }
+    }
+  }, [mountedRef, repoSelector, reviewerOptions, reviewerOptionsLoading])
+
+  const handleSetReviewers = useCallback(
+    async (nextReviewers: GitLabAssignableUser[]): Promise<void> => {
+      if (!repoSelector || !item || !details || item.type !== 'mr') {
+        return
+      }
+      const reviewerIds = nextReviewers
+        .map((reviewer) => reviewer.id)
+        .filter((id): id is number => typeof id === 'number')
+      if (reviewerIds.length !== nextReviewers.length) {
+        toast.error(
+          translate(
+            'auto.components.GitLabItemDialog.ceaf7c30c7',
+            'Reviewer id is unavailable for this GitLab user.'
+          )
+        )
+        return
+      }
+      setReviewerUpdating(true)
+      try {
+        const result = await window.api.gl.updateMRReviewers({
+          ...repoSelector,
+          iid: item.number,
+          reviewerIds,
+          projectRef: details.item.projectRef ?? item.projectRef ?? null
+        })
+        if (!mountedRef.current) {
+          return
+        }
+        if (result.ok) {
+          setDetails((current) =>
+            current ? { ...current, reviewers: dedupeGitLabUsers(result.reviewers) } : current
+          )
+          setReviewerDraftId('')
+          setReviewerOptions((current) =>
+            current ? dedupeGitLabUsers([...current, ...result.reviewers]) : current
+          )
+          useAppStore.getState().recordFeatureInteraction('gitlab-tasks')
+        } else {
+          toast.error(result.error)
+        }
+      } catch (error) {
+        if (mountedRef.current) {
+          showGitLabMutationError(error)
+        }
+      } finally {
+        if (mountedRef.current) {
+          setReviewerUpdating(false)
+        }
+      }
+    },
+    [details, item, mountedRef, repoSelector]
+  )
+
+  const handleSubmitInlineComment = useCallback(async (): Promise<void> => {
+    if (!repoSelector || !item || !details || item.type !== 'mr') {
+      return
+    }
+    const file = (details.files ?? []).find((row) => row.path === inlineCommentFilePath)
+    const line = Number.parseInt(inlineCommentLine, 10)
+    const bodyState = getCommentBodySubmitState(inlineCommentBody)
+    if (!file || !Number.isFinite(line) || line <= 0 || bodyState.status === 'empty') {
+      toast.error(
+        translate(
+          'auto.components.GitLabItemDialog.00d0d25825',
+          'File, line, and comment are required.'
+        )
+      )
+      return
+    }
+    if (bodyState.status === 'too-large-leading-whitespace') {
+      toast.error(
+        translate(
+          'auto.components.GitLabItemDialog.commentTooLarge',
+          'Comment is too large to submit safely.'
+        )
+      )
+      return
+    }
+    if (!details.baseSha || !details.startSha || !details.headSha) {
+      toast.error(
+        translate(
+          'auto.components.GitLabItemDialog.ffdd9a78e1',
+          'MR diff refs are unavailable for inline comments.'
+        )
+      )
+      return
+    }
+    setInlineCommentSubmitting(true)
+    try {
+      const result = await window.api.gl.addMRInlineComment({
+        ...repoSelector,
+        iid: item.number,
+        projectRef: details.item.projectRef ?? item.projectRef ?? null,
+        input: {
+          body: bodyState.body,
+          path: file.path,
+          ...(file.oldPath ? { oldPath: file.oldPath } : {}),
+          line,
+          baseSha: details.baseSha,
+          startSha: details.startSha,
+          headSha: details.headSha
+        }
+      })
+      if (!mountedRef.current) {
+        return
+      }
+      if (result.ok) {
+        setDetails((current) =>
+          current ? { ...current, comments: [...current.comments, result.comment] } : current
+        )
+        setInlineCommentBody('')
+        useAppStore.getState().recordFeatureInteraction('gitlab-tasks')
+        toast.success(
+          translate('auto.components.GitLabItemDialog.60c13320c4', 'Inline comment added')
+        )
+      } else {
+        toast.error(result.error)
+      }
+    } catch (error) {
+      if (mountedRef.current) {
+        showGitLabMutationError(error)
+      }
+    } finally {
+      if (mountedRef.current) {
+        setInlineCommentSubmitting(false)
+      }
+    }
+  }, [
+    details,
+    inlineCommentBody,
+    inlineCommentFilePath,
+    inlineCommentLine,
+    item,
+    mountedRef,
+    repoSelector
+  ])
+
+  const handleResolveDiscussion = useCallback(
+    async (threadId: string, resolved: boolean): Promise<void> => {
+      if (!item || !repoSelector || item.type !== 'mr') {
+        return
+      }
+      setResolvingThreadId(threadId)
+      try {
+        const res = await window.api.gl.resolveMRDiscussion({
+          ...repoSelector,
+          iid: item.number,
+          discussionId: threadId,
+          resolved
+        })
+        if (res.ok) {
+          if (mountedRef.current) {
+            setDetails((current) =>
+              current
+                ? {
+                    ...current,
+                    comments: current.comments.map((comment) =>
+                      comment.threadId === threadId ? { ...comment, isResolved: resolved } : comment
+                    )
+                  }
+                : current
+            )
+            useAppStore.getState().recordFeatureInteraction('gitlab-tasks')
+          }
+        } else if (mountedRef.current) {
+          toast.error(res.error)
+        }
+      } catch (error) {
+        if (mountedRef.current) {
+          showGitLabMutationError(error)
+        }
+      } finally {
+        if (mountedRef.current) {
+          setResolvingThreadId(null)
+        }
+      }
+    },
+    [item, repoSelector, mountedRef]
+  )
+
+  return {
+    handleResolveDiscussion,
+    handleSetReviewers,
+    handleSubmitInlineComment,
+    loadGitLabReviewerOptions
+  }
+}
+
+export type GitLabReviewActions = ReturnType<typeof useGitLabReviewActions>
diff --git a/src/renderer/src/components/hover-reveal-touch-action-visibility.test.ts b/src/renderer/src/components/hover-reveal-touch-action-visibility.test.ts
index cd925cc1303..77aca89c326 100644
--- a/src/renderer/src/components/hover-reveal-touch-action-visibility.test.ts
+++ b/src/renderer/src/components/hover-reveal-touch-action-visibility.test.ts
@@ -19,7 +19,9 @@ const HOVER_REVEAL_FILES = [
   resolve(__dirname, 'github-project/ProjectRow.tsx'),
   resolve(__dirname, 'right-sidebar/AiVaultSessionRow.tsx'),
   resolve(__dirname, 'right-sidebar/ChecksPanel.tsx'),
-  resolve(__dirname, 'right-sidebar/PortsPanel.tsx'),
+  resolve(__dirname, 'right-sidebar/local-port-row.tsx'),
+  resolve(__dirname, 'right-sidebar/ssh-detected-port-row.tsx'),
+  resolve(__dirname, 'right-sidebar/ssh-forwarded-port-row.tsx'),
   resolve(__dirname, 'right-sidebar/SourceControl.tsx'),
   resolve(__dirname, 'right-sidebar/checks-panel/comment-row.tsx'),
   resolve(__dirname, 'settings/MobilePairingQrSection.tsx'),
@@ -34,7 +36,7 @@ const HOVER_REVEAL_FILES = [
   resolve(__dirname, 'sidebar/worktree-list/rows/HostSectionHeader.tsx'),
   resolve(__dirname, 'sidebar/worktree-list/rows/SectionHeader.tsx'),
   resolve(__dirname, 'sidebar/worktree-list/rows/item-row.tsx'),
-  resolve(__dirname, 'status-bar/ResourceUsageStatusSegment.tsx'),
+  resolve(__dirname, 'status-bar/resource-usage-session-rows.tsx'),
   resolve(__dirname, 'status-bar/ports-status-popover-rows.tsx'),
   resolve(__dirname, 'tab-bar/TabBarQuickCommandsMenu.tsx')
 ]
diff --git a/src/renderer/src/components/linear-issue-attribute-filter-dropdowns.test.tsx b/src/renderer/src/components/linear-issue-attribute-filter-dropdowns.test.tsx
index 65b08bbc168..2fc0bf5fd61 100644
--- a/src/renderer/src/components/linear-issue-attribute-filter-dropdowns.test.tsx
+++ b/src/renderer/src/components/linear-issue-attribute-filter-dropdowns.test.tsx
@@ -2,46 +2,61 @@
 
 import { act } from 'react'
 import { createRoot, type Root } from 'react-dom/client'
-import { afterEach, describe, expect, it, vi } from 'vitest'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type { LinearTeam } from '../../../shared/linear/workspace-types'
 import {
   clearLinearIssueAttributeFacet,
   countLinearIssueAttributeFilters,
   linearIssueAttributeFilterPillLabels
 } from './linear-issue-attribute-filter-sections'
-import type { LinearIssueAttributeFilter } from '../../../shared/linear/issue-attribute-filter'
+import {
+  LINEAR_ISSUE_ATTRIBUTE_FILTER_MAX_STATE_IDS,
+  type LinearIssueAttributeFilter
+} from '../../../shared/linear/issue-attribute-filter'
 import LinearIssueAttributeFilterDropdowns from './linear-issue-attribute-filter-dropdowns'
 
 const metadataMocks = vi.hoisted(() => ({
-  useTeamsStates: vi.fn((teamIds: readonly string[]) => ({
-    data: teamIds.length > 0 ? [{ id: 'state-1', name: 'Todo' }] : [],
-    loading: false,
-    error: null
-  })),
-  useTeamsLabels: vi.fn((teamIds: readonly string[]) => ({
-    data: teamIds.length > 0 ? [{ id: 'label-1', name: 'Bug' }] : [],
-    loading: false,
-    error: null
-  })),
-  useTeamsMembers: vi.fn((teamIds: readonly string[]) => ({
-    data: teamIds.length > 0 ? [{ id: 'member-1', displayName: 'Ada Lovelace' }] : [],
-    loading: false,
-    error: null
-  }))
+  useTeamsStates: vi.fn(),
+  useTeamsLabels: vi.fn(),
+  useTeamsMembers: vi.fn()
 }))
 
 vi.mock('@/hooks/useIssueMetadata', () => metadataMocks)
 
+Object.assign(globalThis, { IS_REACT_ACT_ENVIRONMENT: true })
+
+const defaultStates = (teamIds: readonly string[]): unknown => ({
+  data: teamIds.length > 0 ? [{ id: 'state-1', name: 'Todo' }] : [],
+  loading: false,
+  error: null
+})
+const defaultLabels = (teamIds: readonly string[]): unknown => ({
+  data: teamIds.length > 0 ? [{ id: 'label-1', name: 'Bug' }] : [],
+  loading: false,
+  error: null
+})
+const defaultMembers = (teamIds: readonly string[]): unknown => ({
+  data: teamIds.length > 0 ? [{ id: 'member-1', displayName: 'Ada Lovelace' }] : [],
+  loading: false,
+  error: null
+})
+
 const roots: Root[] = []
 
+beforeEach(() => {
+  metadataMocks.useTeamsStates.mockImplementation(defaultStates)
+  metadataMocks.useTeamsLabels.mockImplementation(defaultLabels)
+  metadataMocks.useTeamsMembers.mockImplementation(defaultMembers)
+})
+
 afterEach(() => {
   roots.splice(0).forEach((root) => {
     act(() => root.unmount())
   })
   document.body.replaceChildren()
-  metadataMocks.useTeamsStates.mockClear()
-  metadataMocks.useTeamsLabels.mockClear()
-  metadataMocks.useTeamsMembers.mockClear()
+  metadataMocks.useTeamsStates.mockReset()
+  metadataMocks.useTeamsLabels.mockReset()
+  metadataMocks.useTeamsMembers.mockReset()
 })
 
 const sample: LinearIssueAttributeFilter = {
@@ -60,6 +75,20 @@ describe('linear-issue-attribute-filter helpers', () => {
     expect(clearLinearIssueAttributeFacet(sample, 'labels').labelIds).toEqual([])
   })
 
+  // Why: Linear workflow states are per team, so every team owns its own "Todo" id (#16785).
+  it('collapses same-named status ids into one pill label', () => {
+    const pills = linearIssueAttributeFilterPillLabels({
+      value: { stateIds: ['be-todo', 'fe-todo'], priorities: [], assignee: null, labelIds: [] },
+      stateNamesById: new Map([
+        ['be-todo', 'Todo'],
+        ['fe-todo', 'Todo']
+      ]),
+      memberNamesById: new Map(),
+      labelNamesById: new Map()
+    })
+    expect(pills[0]?.value).toBe('Todo')
+  })
+
   it('builds pill labels from metadata maps', () => {
     const pills = linearIssueAttributeFilterPillLabels({
       value: sample,
@@ -220,3 +249,112 @@ describe('LinearIssueAttributeFilterDropdowns', () => {
     )
   })
 })
+
+const multiTeamStates = [
+  { id: 'be-backlog', name: 'Backlog', type: 'backlog' },
+  { id: 'be-todo', name: 'Todo', type: 'unstarted' },
+  { id: 'fe-backlog', name: 'Backlog', type: 'backlog' },
+  { id: 'fe-todo', name: 'Todo', type: 'unstarted' }
+]
+
+const teamBe: LinearTeam = { id: 'team-be', name: 'Backend', key: 'BE' }
+const teamFe: LinearTeam = { id: 'team-fe', name: 'Frontend', key: 'FE' }
+
+function openStatusSection(onChange: (next: LinearIssueAttributeFilter) => void): void {
+  const container = document.createElement('div')
+  document.body.appendChild(container)
+  const root = createRoot(container)
+  roots.push(root)
+
+  act(() => {
+    root.render(
+      <LinearIssueAttributeFilterDropdowns
+        value={{ stateIds: [], priorities: [], assignee: null, labelIds: [] }}
+        onChange={onChange}
+        workspaceId="workspace-1"
+        primaryTeam={teamBe}
+        selectedTeamIds={['team-be', 'team-fe']}
+        availableTeams={[teamBe, teamFe]}
+        teamsSettled
+      />
+    )
+  })
+
+  const trigger = container.querySelector('button')
+  act(() => {
+    trigger?.dispatchEvent(new MouseEvent('click', { bubbles: true }))
+  })
+
+  const statusButton = [...document.body.querySelectorAll('button')].find(
+    (button) => button.textContent?.trim() === 'Status'
+  )
+  act(() => {
+    statusButton?.dispatchEvent(new MouseEvent('click', { bubbles: true }))
+  })
+}
+
+function statusRowsNamed(name: string): HTMLElement[] {
+  return [...document.body.querySelectorAll<HTMLElement>('[role="option"]')].filter(
+    (row) => row.textContent?.trim() === name
+  )
+}
+
+// Why: two teams share Linear's default state template, so the picker used to list
+// "Todo"/"Backlog" once per team and each row filtered to a single team's issues (#16785).
+describe('LinearIssueAttributeFilterDropdowns status options across teams', () => {
+  it('lists one row per status name instead of one per team state id', () => {
+    metadataMocks.useTeamsStates.mockImplementation(() => ({
+      data: multiTeamStates,
+      loading: false,
+      error: null
+    }))
+
+    openStatusSection(() => undefined)
+
+    expect(statusRowsNamed('Todo')).toHaveLength(1)
+    expect(statusRowsNamed('Backlog')).toHaveLength(1)
+  })
+
+  it('selects every team state id behind the picked status name', () => {
+    metadataMocks.useTeamsStates.mockImplementation(() => ({
+      data: multiTeamStates,
+      loading: false,
+      error: null
+    }))
+    const onChange = vi.fn()
+
+    openStatusSection(onChange)
+    act(() => {
+      statusRowsNamed('Todo')[0]?.dispatchEvent(new MouseEvent('click', { bubbles: true }))
+    })
+
+    expect(onChange).toHaveBeenCalledWith(
+      expect.objectContaining({ stateIds: ['be-todo', 'fe-todo'] })
+    )
+  })
+
+  // Why: "All teams" in a large workspace expands one status into an id per team, and the
+  // IPC parser rejects a filter over the transport cap instead of trimming it.
+  it('keeps the expanded status selection within the transport id cap', () => {
+    const overCap = LINEAR_ISSUE_ATTRIBUTE_FILTER_MAX_STATE_IDS + 20
+    metadataMocks.useTeamsStates.mockImplementation(() => ({
+      data: Array.from({ length: overCap }, (_unused, index) => ({
+        id: `team-${index}-todo`,
+        name: 'Todo',
+        type: 'unstarted'
+      })),
+      loading: false,
+      error: null
+    }))
+    const onChange = vi.fn()
+
+    openStatusSection(onChange)
+    act(() => {
+      statusRowsNamed('Todo')[0]?.dispatchEvent(new MouseEvent('click', { bubbles: true }))
+    })
+
+    expect(onChange.mock.calls[0]?.[0].stateIds).toHaveLength(
+      LINEAR_ISSUE_ATTRIBUTE_FILTER_MAX_STATE_IDS
+    )
+  })
+})
diff --git a/src/renderer/src/components/linear-issue-attribute-filter-dropdowns.tsx b/src/renderer/src/components/linear-issue-attribute-filter-dropdowns.tsx
index a8fa09cbf12..cde4545e5c3 100644
--- a/src/renderer/src/components/linear-issue-attribute-filter-dropdowns.tsx
+++ b/src/renderer/src/components/linear-issue-attribute-filter-dropdowns.tsx
@@ -8,6 +8,7 @@ import { useTeamsLabels, useTeamsMembers, useTeamsStates } from '@/hooks/useIssu
 import type { RuntimeLinearSettings } from '@/runtime/runtime-linear-client'
 import { translate } from '@/i18n/i18n'
 import {
+  boundLinearIssueAttributeFilter,
   canonicalizeLinearIssueAttributeFilter,
   emptyLinearIssueAttributeFilter,
   type LinearIssueAttributeFilter
@@ -21,7 +22,10 @@ import {
   linearIssueAttributeFilterPillLabels,
   type LinearIssueFilterSectionKey
 } from './linear-issue-attribute-filter-sections'
-import { resolveLinearIssueAttributeFilterTeamIds } from './linear-issue-attribute-filter-team-ids'
+import {
+  groupLinearMetadataByName,
+  resolveLinearIssueAttributeFilterTeamIds
+} from './linear-issue-attribute-filter-team-ids'
 
 type Props = {
   value: LinearIssueAttributeFilter
@@ -166,12 +170,24 @@ export default function LinearIssueAttributeFilterDropdowns({
     onChange
   ])
 
+  // Why: workflow states and team labels are per team, so several ids share one name —
+  // one row per name, selecting every id behind it (#16785).
   const statusOptions = useMemo(
-    () => states.data.map((state) => ({ key: state.id, primary: state.name })),
+    () =>
+      groupLinearMetadataByName(states.data).map((group) => ({
+        key: group.key,
+        primary: group.name,
+        ids: group.ids
+      })),
     [states.data]
   )
   const labelOptions = useMemo(
-    () => labels.data.map((label) => ({ key: label.id, primary: label.name })),
+    () =>
+      groupLinearMetadataByName(labels.data).map((group) => ({
+        key: group.key,
+        primary: group.name,
+        ids: group.ids
+      })),
     [labels.data]
   )
   const assigneeOptions = useMemo(
@@ -267,7 +283,13 @@ export default function LinearIssueAttributeFilterDropdowns({
                 <LinearIssueFilterSectionDetail
                   section={openSection}
                   value={value}
-                  onChange={(next) => onChange(canonicalizeLinearIssueAttributeFilter(next))}
+                  // Why: one status now expands to an id per team, so bound here — the
+                  // IPC/RPC parser rejects a filter over the transport id cap outright.
+                  onChange={(next) =>
+                    onChange(
+                      boundLinearIssueAttributeFilter(canonicalizeLinearIssueAttributeFilter(next))
+                    )
+                  }
                   statusOptions={statusOptions}
                   assigneeOptions={assigneeOptions}
                   labelOptions={labelOptions}
@@ -281,7 +303,12 @@ export default function LinearIssueAttributeFilterDropdowns({
                   onBack={() => setOpenSection(null)}
                 />
               ) : (
-                <LinearIssueFilterSectionMenu value={value} onOpenSection={setOpenSection} />
+                <LinearIssueFilterSectionMenu
+                  value={value}
+                  stateNamesById={stateNamesById}
+                  labelNamesById={labelNamesById}
+                  onOpenSection={setOpenSection}
+                />
               )}
               {activeCount > 0 ? (
                 <div className="border-t border-border/50 p-2">
diff --git a/src/renderer/src/components/linear-issue-attribute-filter-sections.tsx b/src/renderer/src/components/linear-issue-attribute-filter-sections.tsx
index dcf12b026e9..ff616aea603 100644
--- a/src/renderer/src/components/linear-issue-attribute-filter-sections.tsx
+++ b/src/renderer/src/components/linear-issue-attribute-filter-sections.tsx
@@ -12,9 +12,21 @@ import {
   type LinearIssueAttributeFilter
 } from '../../../shared/linear/issue-attribute-filter'
 import { getLinearPriorityLabel } from './task-page-localized-options'
+import {
+  expandLinearMetadataGroupKeys,
+  selectedLinearMetadataGroupKeys
+} from './linear-issue-attribute-filter-team-ids'
 
 export type LinearIssueFilterSectionKey = 'status' | 'priority' | 'assignee' | 'labels'
 
+/** Picker row backed by every same-named id across the selected teams (#16785). */
+export type LinearIssueFilterGroupedOption = PickerOption & { ids: string[] }
+
+/** Same-named ids from different teams are one selection to the user. */
+function distinctFacetNames(ids: readonly string[], namesById: Map<string, string>): string[] {
+  return [...new Set(ids.map((id) => namesById.get(id) ?? id))]
+}
+
 export function countLinearIssueAttributeFilters(value: LinearIssueAttributeFilter): number {
   const canonical = canonicalizeLinearIssueAttributeFilter(value)
   return (
@@ -53,7 +65,7 @@ export function linearIssueAttributeFilterPillLabels(options: {
     pills.push({
       key: 'status',
       label: translate('auto.components.linear-issue-attribute-filter-sections.status', 'Status'),
-      value: canonical.stateIds.map((id) => options.stateNamesById.get(id) ?? id).join(', ')
+      value: distinctFacetNames(canonical.stateIds, options.stateNamesById).join(', ')
     })
   }
   if (canonical.priorities.length > 0) {
@@ -92,7 +104,7 @@ export function linearIssueAttributeFilterPillLabels(options: {
     pills.push({
       key: 'labels',
       label: translate('auto.components.linear-issue-attribute-filter-sections.labels', 'Labels'),
-      value: canonical.labelIds.map((id) => options.labelNamesById.get(id) ?? id).join(', ')
+      value: distinctFacetNames(canonical.labelIds, options.labelNamesById).join(', ')
     })
   }
   return pills
@@ -107,21 +119,27 @@ function priorityOptions(): PickerOption[] {
 
 export function LinearIssueFilterSectionMenu({
   value,
+  stateNamesById,
+  labelNamesById,
   onOpenSection
 }: {
   value: LinearIssueAttributeFilter
+  stateNamesById: Map<string, string>
+  labelNamesById: Map<string, string>
   onOpenSection: (section: LinearIssueFilterSectionKey) => void
 }): React.JSX.Element {
+  const selectedStatusCount = distinctFacetNames(value.stateIds, stateNamesById).length
+  const selectedLabelCount = distinctFacetNames(value.labelIds, labelNamesById).length
   const sections: { key: LinearIssueFilterSectionKey; label: string; summary: string }[] = [
     {
       key: 'status',
       label: translate('auto.components.linear-issue-attribute-filter-sections.status', 'Status'),
       summary:
-        value.stateIds.length > 0
+        selectedStatusCount > 0
           ? translate(
               'auto.components.linear-issue-attribute-filter-sections.countSelected',
               '{{count}} selected',
-              { count: value.stateIds.length }
+              { count: selectedStatusCount }
             )
           : ''
     },
@@ -159,11 +177,11 @@ export function LinearIssueFilterSectionMenu({
       key: 'labels',
       label: translate('auto.components.linear-issue-attribute-filter-sections.labels', 'Labels'),
       summary:
-        value.labelIds.length > 0
+        selectedLabelCount > 0
           ? translate(
               'auto.components.linear-issue-attribute-filter-sections.countSelected',
               '{{count}} selected',
-              { count: value.labelIds.length }
+              { count: selectedLabelCount }
             )
           : ''
     }
@@ -210,9 +228,9 @@ export function LinearIssueFilterSectionDetail({
   section: LinearIssueFilterSectionKey
   value: LinearIssueAttributeFilter
   onChange: (next: LinearIssueAttributeFilter) => void
-  statusOptions: PickerOption[]
+  statusOptions: LinearIssueFilterGroupedOption[]
   assigneeOptions: PickerOption[]
-  labelOptions: PickerOption[]
+  labelOptions: LinearIssueFilterGroupedOption[]
   statusLoading: boolean
   statusError: string | null
   assigneeLoading: boolean
@@ -288,14 +306,16 @@ export function LinearIssueFilterSectionDetail({
         <SectionBack onBack={onBack} />
         <MultiSelectList
           options={statusOptions}
-          selected={value.stateIds}
+          selected={selectedLinearMetadataGroupKeys(statusOptions, value.stateIds)}
           loading={statusLoading}
           error={statusError}
           searchPlaceholder={translate(
             'auto.components.linear-issue-attribute-filter-sections.searchStatus',
             'Filter status…'
           )}
-          onChange={(stateIds) => onChange({ ...value, stateIds })}
+          onChange={(keys) =>
+            onChange({ ...value, stateIds: expandLinearMetadataGroupKeys(statusOptions, keys) })
+          }
         />
       </div>
     )
@@ -307,14 +327,16 @@ export function LinearIssueFilterSectionDetail({
         <SectionBack onBack={onBack} />
         <MultiSelectList
           options={labelOptions}
-          selected={value.labelIds}
+          selected={selectedLinearMetadataGroupKeys(labelOptions, value.labelIds)}
           loading={labelLoading}
           error={labelError}
           searchPlaceholder={translate(
             'auto.components.linear-issue-attribute-filter-sections.searchLabels',
             'Filter labels…'
           )}
-          onChange={(labelIds) => onChange({ ...value, labelIds })}
+          onChange={(keys) =>
+            onChange({ ...value, labelIds: expandLinearMetadataGroupKeys(labelOptions, keys) })
+          }
         />
       </div>
     )
diff --git a/src/renderer/src/components/linear-issue-attribute-filter-team-ids.test.ts b/src/renderer/src/components/linear-issue-attribute-filter-team-ids.test.ts
index bd56b936d88..f8fcbbf9623 100644
--- a/src/renderer/src/components/linear-issue-attribute-filter-team-ids.test.ts
+++ b/src/renderer/src/components/linear-issue-attribute-filter-team-ids.test.ts
@@ -1,7 +1,10 @@
 import { describe, expect, it } from 'vitest'
 import type { LinearTeam } from '../../../shared/linear/workspace-types'
 import {
+  expandLinearMetadataGroupKeys,
+  groupLinearMetadataByName,
   resolveLinearIssueAttributeFilterTeamIds,
+  selectedLinearMetadataGroupKeys,
   unionLinearMetadataById
 } from './linear-issue-attribute-filter-team-ids'
 
@@ -83,3 +86,48 @@ describe('unionLinearMetadataById', () => {
     expect(unioned).toEqual([{ id: 'shared', name: 'From BE' }])
   })
 })
+
+describe('groupLinearMetadataByName', () => {
+  // Why: Linear workflow states are per team, so "Todo" exists once per selected team (#16785).
+  const states = [
+    { id: 'be-backlog', name: 'Backlog' },
+    { id: 'be-todo', name: 'Todo' },
+    { id: 'fe-backlog', name: 'Backlog' },
+    { id: 'fe-todo', name: 'Todo' },
+    { id: 'fe-review', name: 'In Review' }
+  ]
+
+  it('collapses same-named ids into one keyed group in first-seen order', () => {
+    expect(groupLinearMetadataByName(states)).toEqual([
+      { key: 'be-backlog', name: 'Backlog', ids: ['be-backlog', 'fe-backlog'] },
+      { key: 'be-todo', name: 'Todo', ids: ['be-todo', 'fe-todo'] },
+      { key: 'fe-review', name: 'In Review', ids: ['fe-review'] }
+    ])
+  })
+
+  it('marks a group selected when any of its team ids is selected', () => {
+    const groups = groupLinearMetadataByName(states)
+    expect(selectedLinearMetadataGroupKeys(groups, ['fe-todo'])).toEqual(['be-todo'])
+    expect(selectedLinearMetadataGroupKeys(groups, ['be-todo', 'fe-todo'])).toEqual(['be-todo'])
+    expect(selectedLinearMetadataGroupKeys(groups, [])).toEqual([])
+  })
+
+  it('expands picked group keys back to every team id behind them', () => {
+    const groups = groupLinearMetadataByName(states)
+    expect(expandLinearMetadataGroupKeys(groups, ['be-todo', 'fe-review'])).toEqual([
+      'be-todo',
+      'fe-todo',
+      'fe-review'
+    ])
+  })
+
+  // Why: metadata for another team may still be loading; toggling a row must not drop
+  // the ids it does not know about yet (R12).
+  it('passes ids no group covers through both directions', () => {
+    const groups = groupLinearMetadataByName(states)
+    expect(selectedLinearMetadataGroupKeys(groups, ['other-team-todo'])).toEqual([
+      'other-team-todo'
+    ])
+    expect(expandLinearMetadataGroupKeys(groups, ['other-team-todo'])).toEqual(['other-team-todo'])
+  })
+})
diff --git a/src/renderer/src/components/linear-issue-attribute-filter-team-ids.ts b/src/renderer/src/components/linear-issue-attribute-filter-team-ids.ts
index dea77e52595..08fb9309b45 100644
--- a/src/renderer/src/components/linear-issue-attribute-filter-team-ids.ts
+++ b/src/renderer/src/components/linear-issue-attribute-filter-team-ids.ts
@@ -47,3 +47,54 @@ export function unionLinearMetadataById<T extends { id: string }>(groups: readon
   }
   return out
 }
+
+/** One picker row standing for every id that shares a display name. */
+export type LinearMetadataNameGroup = { key: string; name: string; ids: string[] }
+
+/**
+ * Collapse metadata rows that share a display name. Linear workflow states (and team
+ * labels) are per team, so every selected team contributes its own "Todo" id — the app
+ * already treats status identity as the name, so the picker must too (#16785).
+ */
+export function groupLinearMetadataByName<T extends { id: string; name: string }>(
+  rows: readonly T[]
+): LinearMetadataNameGroup[] {
+  const byName = new Map<string, LinearMetadataNameGroup>()
+  for (const row of rows) {
+    const group = byName.get(row.name)
+    if (group) {
+      group.ids.push(row.id)
+      continue
+    }
+    // First id doubles as the row key: unique, and stable while metadata is unchanged.
+    byName.set(row.name, { key: row.id, name: row.name, ids: [row.id] })
+  }
+  return [...byName.values()]
+}
+
+/**
+ * Group keys for the selected ids. An id no loaded group covers — a facet from a team
+ * whose metadata is not in yet — passes through as its own key so toggling another row
+ * never drops it (R12).
+ */
+export function selectedLinearMetadataGroupKeys(
+  groups: readonly { key: string; ids: readonly string[] }[],
+  selectedIds: readonly string[]
+): string[] {
+  const keyById = new Map<string, string>()
+  for (const group of groups) {
+    for (const id of group.ids) {
+      keyById.set(id, group.key)
+    }
+  }
+  return [...new Set(selectedIds.map((id) => keyById.get(id) ?? id))]
+}
+
+/** Every id behind the picked group keys; an unknown key is itself an id. */
+export function expandLinearMetadataGroupKeys(
+  groups: readonly { key: string; ids: readonly string[] }[],
+  keys: readonly string[]
+): string[] {
+  const idsByKey = new Map(groups.map((group) => [group.key, group.ids] as const))
+  return keys.flatMap((key) => [...(idsByKey.get(key) ?? [key])])
+}
diff --git a/src/renderer/src/components/linear-item-drawer-comment-footer.tsx b/src/renderer/src/components/linear-item-drawer-comment-footer.tsx
new file mode 100644
index 00000000000..09cbe469015
--- /dev/null
+++ b/src/renderer/src/components/linear-item-drawer-comment-footer.tsx
@@ -0,0 +1,198 @@
+import React, { useCallback, useRef, useState } from 'react'
+import { LoaderCircle, Send } from 'lucide-react'
+import { toast } from 'sonner'
+
+import { Button } from '@/components/ui/button'
+import {
+  getCommentBodySubmitState,
+  hasBoundedCommentBodyText
+} from '@/lib/comment-body-submit-state'
+import { getScreenSubmitShortcutLabel, isScreenSubmitShortcut } from '@/lib/screen-submit-shortcut'
+import { createBrowserUuid } from '@/lib/browser-uuid'
+import { useAppStore } from '@/store'
+import { linearAddIssueComment } from '@/runtime/runtime-linear-issue-mutations'
+import { translate } from '@/i18n/i18n'
+import type { TaskSourceContext } from '../../../shared/task-source-context'
+import type { LinearLocalComment } from '@/components/linear-item-drawer-types'
+
+export function LinearIssueCommentFooter({
+  issueId,
+  workspaceId,
+  onCommentAdded,
+  variant = 'compact',
+  sourceContext
+}: {
+  issueId: string
+  workspaceId?: string | null
+  onCommentAdded: (comment: LinearLocalComment) => void
+  variant?: 'compact' | 'linear-page'
+  sourceContext?: TaskSourceContext | null
+}): React.JSX.Element {
+  const settings = useAppStore((s) => s.settings)
+  const providerSettings = sourceContext ?? settings
+  const submitShortcutLabel = getScreenSubmitShortcutLabel()
+  const [body, setBody] = useState('')
+  const [submitting, setSubmitting] = useState(false)
+  const textareaRef = useRef<HTMLTextAreaElement>(null)
+  const mountedRef = useRef(true)
+
+  const handleFooterRef = useCallback((node: HTMLDivElement | null): void => {
+    // Why: comment submission can resolve after the footer unmounts; the root
+    // ref keeps that completion from writing stale local state without an Effect.
+    mountedRef.current = node !== null
+  }, [])
+
+  const autoGrow = useCallback(() => {
+    const el = textareaRef.current
+    if (!el) {
+      return
+    }
+    el.style.height = 'auto'
+    el.style.height = `${Math.min(el.scrollHeight, 96)}px`
+  }, [])
+
+  const handleSubmit = useCallback(async () => {
+    const bodyState = getCommentBodySubmitState(body)
+    if (bodyState.status === 'empty') {
+      return
+    }
+    if (bodyState.status === 'too-large-leading-whitespace') {
+      toast.error(
+        translate(
+          'auto.components.LinearItemDrawer.commentTooLarge',
+          'Comment is too large to submit safely.'
+        )
+      )
+      return
+    }
+    setSubmitting(true)
+    try {
+      const result = await linearAddIssueComment(
+        providerSettings,
+        issueId,
+        bodyState.body,
+        workspaceId
+      )
+      const typed = result as { ok: boolean; id?: string; error?: string }
+      if (!mountedRef.current) {
+        return
+      }
+      if (typed.ok) {
+        setBody('')
+        useAppStore.getState().recordFeatureInteraction('linear-tasks')
+        onCommentAdded({
+          id: typed.id ?? createBrowserUuid(),
+          body: bodyState.body,
+          createdAt: new Date().toISOString()
+        })
+      } else {
+        toast.error(
+          typed.error ??
+            translate('auto.components.LinearItemDrawer.6ab35eafd5', 'Failed to add comment')
+        )
+      }
+    } catch (err) {
+      if (mountedRef.current) {
+        toast.error(
+          err instanceof Error
+            ? err.message
+            : translate('auto.components.LinearItemDrawer.6ab35eafd5', 'Failed to add comment')
+        )
+      }
+    } finally {
+      if (mountedRef.current) {
+        setSubmitting(false)
+      }
+    }
+  }, [body, issueId, onCommentAdded, providerSettings, workspaceId])
+  const canSubmitComment = hasBoundedCommentBodyText(body)
+
+  const handleKeyDown = useCallback(
+    (e: React.KeyboardEvent) => {
+      if (isScreenSubmitShortcut(e)) {
+        e.preventDefault()
+        handleSubmit()
+      }
+    },
+    [handleSubmit]
+  )
+
+  if (variant === 'linear-page') {
+    return (
+      <div
+        ref={handleFooterRef}
+        className="rounded-xl border border-border/70 bg-background shadow-xs"
+      >
+        <textarea
+          ref={textareaRef}
+          value={body}
+          onChange={(e) => {
+            setBody(e.target.value)
+            autoGrow()
+          }}
+          onKeyDown={handleKeyDown}
+          placeholder={translate(
+            'auto.components.LinearItemDrawer.2820f0f0f0',
+            'Leave a comment...'
+          )}
+          rows={3}
+          className="scrollbar-sleek min-h-24 max-h-40 w-full resize-none overflow-y-auto rounded-t-xl bg-transparent px-5 py-4 text-sm placeholder:text-muted-foreground focus-visible:outline-none"
+        />
+        <div className="flex items-center justify-between px-4 pb-3">
+          <span className="text-[11px] text-muted-foreground">
+            {submitShortcutLabel !== 'Unassigned'
+              ? translate('auto.components.LinearItemDrawer.fda549766e', '{{value0}} to comment', {
+                  value0: submitShortcutLabel
+                })
+              : ''}
+          </span>
+          <Button
+            size="icon-sm"
+            onClick={handleSubmit}
+            disabled={!canSubmitComment || submitting}
+            aria-label={translate('auto.components.LinearItemDrawer.d369841269', 'Send comment')}
+          >
+            {submitting ? (
+              <LoaderCircle className="size-3.5 animate-spin" />
+            ) : (
+              <Send className="size-3.5" />
+            )}
+          </Button>
+        </div>
+      </div>
+    )
+  }
+
+  return (
+    <div
+      ref={handleFooterRef}
+      className="flex items-end gap-2 border-t border-border/60 bg-background/40 px-4 py-3"
+    >
+      <textarea
+        ref={textareaRef}
+        value={body}
+        onChange={(e) => {
+          setBody(e.target.value)
+          autoGrow()
+        }}
+        onKeyDown={handleKeyDown}
+        placeholder={translate('auto.components.LinearItemDrawer.2fcff829a8', 'Add a comment…')}
+        rows={1}
+        className="scrollbar-sleek min-h-[32px] max-h-[96px] flex-1 resize-none overflow-y-auto rounded-md border border-input bg-transparent px-3 py-2 text-[13px] placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
+      />
+      <Button
+        size="icon"
+        onClick={handleSubmit}
+        disabled={!canSubmitComment || submitting}
+        className="size-8 shrink-0"
+        aria-label={translate('auto.components.LinearItemDrawer.d369841269', 'Send comment')}
+      >
+        {submitting ? (
+          <LoaderCircle className="size-3.5 animate-spin" />
+        ) : (
+          <Send className="size-3.5" />
+        )}
+      </Button>
+    </div>
+  )
+}
diff --git a/src/renderer/src/components/linear-item-drawer-edit-chips-layout.tsx b/src/renderer/src/components/linear-item-drawer-edit-chips-layout.tsx
new file mode 100644
index 00000000000..cfa184033de
--- /dev/null
+++ b/src/renderer/src/components/linear-item-drawer-edit-chips-layout.tsx
@@ -0,0 +1,337 @@
+import React from 'react'
+import { LoaderCircle } from 'lucide-react'
+
+import { Button } from '@/components/ui/button'
+import { Input } from '@/components/ui/input'
+import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
+import { cn } from '@/lib/utils'
+import {
+  getLinearStateMarkerStyle,
+  getLinearStatePillStyle
+} from '@/components/linear-state-pill-style'
+import { LinearPriorityIcon } from '@/components/linear-priority-icon'
+import { translate } from '@/i18n/i18n'
+import {
+  LINEAR_EDIT_CHIP_CLASS,
+  LINEAR_EDIT_MENU_ITEM_CLASS,
+  LINEAR_EDIT_MENU_ITEM_WITH_ICON_CLASS,
+  LINEAR_ESTIMATE_PRESETS,
+  LinearEditChipAdornment,
+  PRIORITY_LABELS,
+  formatLinearEstimateLabel
+} from '@/components/linear-item-drawer-edit-controls'
+import type { LinearIssueEditController } from '@/components/linear-item-drawer-edit-controller'
+
+export function renderLinearIssueChipsLayout(
+  controller: LinearIssueEditController
+): React.JSX.Element {
+  const {
+    statePending,
+    states,
+    localState,
+    currentStateId,
+    handleStateChange,
+    priorityPending,
+    localPriority,
+    handlePriorityChange,
+    estimatePopoverOpen,
+    handleEstimatePopoverOpenChange,
+    estimatePending,
+    localEstimate,
+    handleEstimateChange,
+    estimateInput,
+    setEstimateInput,
+    handleEstimateSubmit,
+    assigneePending,
+    members,
+    localAssignee,
+    handleAssigneeChange,
+    labelPopoverOpen,
+    setLabelPopoverOpen,
+    labelsPending,
+    localLabels,
+    labelSummary,
+    labels,
+    localLabelIds,
+    handleLabelToggle,
+    checkIcon
+  } = controller
+
+  return (
+    <div className="flex flex-wrap items-center gap-x-3 gap-y-2 border-b border-border/60 px-4 py-2.5">
+      {/* Status */}
+      <Popover>
+        <PopoverTrigger asChild>
+          <button
+            type="button"
+            disabled={statePending}
+            className={LINEAR_EDIT_CHIP_CLASS}
+            style={getLinearStatePillStyle(localState.color)}
+            aria-busy={statePending || states.loading}
+          >
+            <span
+              className="inline-block size-2 shrink-0 rounded-full"
+              style={getLinearStateMarkerStyle(localState.color)}
+            />
+            <span className="truncate">{localState.name}</span>
+            <LinearEditChipAdornment loading={states.loading} pending={statePending} />
+          </button>
+        </PopoverTrigger>
+        <PopoverContent className="popover-scroll-content scrollbar-sleek w-48 p-1" align="start">
+          {states.error ? (
+            <div className="px-2 py-3 text-center text-[12px] text-destructive">{states.error}</div>
+          ) : states.loading ? (
+            <div className="flex items-center gap-2 px-2 py-3 text-[12px] text-muted-foreground">
+              <LoaderCircle className="size-3 animate-spin" />
+              {translate('auto.components.LinearItemDrawer.59b6cd3706', 'Loading states')}
+            </div>
+          ) : states.data.length > 0 ? (
+            <div>
+              {states.data.map((s) => (
+                <button
+                  key={s.id}
+                  type="button"
+                  onClick={() => handleStateChange(s.id)}
+                  className={cn(
+                    LINEAR_EDIT_MENU_ITEM_WITH_ICON_CLASS,
+                    currentStateId === s.id && 'bg-accent/50'
+                  )}
+                >
+                  <span
+                    className="inline-block size-2 rounded-full"
+                    style={{ backgroundColor: s.color }}
+                  />
+                  {s.name}
+                </button>
+              ))}
+            </div>
+          ) : (
+            <div className="px-2 py-3 text-center text-[12px] text-muted-foreground">
+              {translate('auto.components.LinearItemDrawer.780ea6ed89', 'No states found')}
+            </div>
+          )}
+        </PopoverContent>
+      </Popover>
+
+      {/* Priority */}
+      <Popover>
+        <PopoverTrigger asChild>
+          <button
+            type="button"
+            disabled={priorityPending}
+            className={LINEAR_EDIT_CHIP_CLASS}
+            aria-busy={priorityPending}
+          >
+            <LinearPriorityIcon priority={localPriority} />
+            <span className="truncate">
+              {PRIORITY_LABELS[localPriority] ?? `P${localPriority}`}
+            </span>
+            <LinearEditChipAdornment pending={priorityPending} />
+          </button>
+        </PopoverTrigger>
+        <PopoverContent className="w-36 p-1" align="start">
+          {[0, 1, 2, 3, 4].map((p) => (
+            <button
+              key={p}
+              type="button"
+              onClick={() => handlePriorityChange(String(p))}
+              className={cn(
+                LINEAR_EDIT_MENU_ITEM_WITH_ICON_CLASS,
+                localPriority === p && 'bg-accent/50'
+              )}
+            >
+              <LinearPriorityIcon priority={p} />
+              {PRIORITY_LABELS[p]}
+            </button>
+          ))}
+        </PopoverContent>
+      </Popover>
+
+      {/* Estimate */}
+      <Popover open={estimatePopoverOpen} onOpenChange={handleEstimatePopoverOpenChange}>
+        <PopoverTrigger asChild>
+          <button
+            type="button"
+            disabled={estimatePending}
+            className={LINEAR_EDIT_CHIP_CLASS}
+            aria-busy={estimatePending}
+          >
+            <span className="truncate">{formatLinearEstimateLabel(localEstimate)}</span>
+            <LinearEditChipAdornment pending={estimatePending} />
+          </button>
+        </PopoverTrigger>
+        <PopoverContent className="w-64 p-3" align="start">
+          <div className="space-y-3">
+            <div className="grid grid-cols-5 gap-1.5">
+              {LINEAR_ESTIMATE_PRESETS.map((estimate) => (
+                <button
+                  key={estimate}
+                  type="button"
+                  onClick={() => handleEstimateChange(estimate)}
+                  className={cn(
+                    'flex h-8 items-center justify-center rounded-md border border-border text-sm hover:bg-accent',
+                    localEstimate === estimate && 'border-primary bg-accent text-foreground'
+                  )}
+                >
+                  {estimate}
+                </button>
+              ))}
+            </div>
+            <Input
+              value={estimateInput}
+              onChange={(event) => setEstimateInput(event.target.value)}
+              onKeyDown={(event) => {
+                if (event.key === 'Enter') {
+                  event.preventDefault()
+                  handleEstimateSubmit()
+                }
+              }}
+              inputMode="numeric"
+              placeholder={translate(
+                'auto.components.LinearItemDrawer.fbb90300e2',
+                'Custom estimate'
+              )}
+              className="h-8 text-sm"
+            />
+            <div className="flex items-center justify-between gap-2">
+              <Button
+                type="button"
+                variant="ghost"
+                size="sm"
+                onClick={() => handleEstimateChange(null)}
+              >
+                {translate('auto.components.LinearItemDrawer.ceeb8c6153', 'Clear')}
+              </Button>
+              <Button
+                type="button"
+                size="sm"
+                onClick={handleEstimateSubmit}
+                disabled={estimatePending}
+              >
+                {estimatePending ? <LoaderCircle className="size-3.5 animate-spin" /> : null}
+                {translate('auto.components.LinearItemDrawer.b5675b0694', 'Save')}
+              </Button>
+            </div>
+          </div>
+        </PopoverContent>
+      </Popover>
+
+      {/* Assignee */}
+      <Popover>
+        <PopoverTrigger asChild>
+          <button
+            type="button"
+            disabled={assigneePending}
+            className={LINEAR_EDIT_CHIP_CLASS}
+            aria-busy={assigneePending || members.loading}
+          >
+            <span className="truncate">
+              {localAssignee
+                ? localAssignee.displayName
+                : translate('auto.components.LinearItemDrawer.d71cd3003e', '+ Assignee')}
+            </span>
+            <LinearEditChipAdornment loading={members.loading} pending={assigneePending} />
+          </button>
+        </PopoverTrigger>
+        <PopoverContent className="popover-scroll-content scrollbar-sleek w-48 p-1" align="start">
+          <div>
+            <button
+              type="button"
+              onClick={() => handleAssigneeChange('__unassign__')}
+              className={cn(LINEAR_EDIT_MENU_ITEM_CLASS, !localAssignee && 'bg-accent/50')}
+            >
+              {translate('auto.components.LinearItemDrawer.866316f22c', 'Unassigned')}
+            </button>
+            {members.error ? (
+              <div className="px-2 py-3 text-center text-[12px] text-destructive">
+                {members.error}
+              </div>
+            ) : members.loading ? (
+              <div className="flex items-center gap-2 px-2 py-3 text-[12px] text-muted-foreground">
+                <LoaderCircle className="size-3 animate-spin" />
+                {translate('auto.components.LinearItemDrawer.b2376d0179', 'Loading members')}
+              </div>
+            ) : (
+              members.data.map((m) => (
+                <button
+                  key={m.id}
+                  type="button"
+                  onClick={() => handleAssigneeChange(m.id)}
+                  className={cn(
+                    LINEAR_EDIT_MENU_ITEM_CLASS,
+                    localAssignee?.id === m.id && 'bg-accent/50'
+                  )}
+                >
+                  {m.displayName}
+                </button>
+              ))
+            )}
+          </div>
+        </PopoverContent>
+      </Popover>
+
+      {/* Labels */}
+      <Popover open={labelPopoverOpen} onOpenChange={setLabelPopoverOpen}>
+        <PopoverTrigger asChild>
+          <button
+            type="button"
+            disabled={labelsPending}
+            className={LINEAR_EDIT_CHIP_CLASS}
+            aria-label={
+              localLabels.length
+                ? translate('auto.components.LinearItemDrawer.7f7b89b631', 'Labels: {{value0}}', {
+                    value0: localLabels.join(', ')
+                  })
+                : translate('auto.components.LinearItemDrawer.23886c7eec', 'Add label')
+            }
+            aria-busy={labelsPending || labels.loading}
+          >
+            <span className="truncate">{labelSummary}</span>
+            <LinearEditChipAdornment loading={labels.loading} pending={labelsPending} />
+          </button>
+        </PopoverTrigger>
+        <PopoverContent className="popover-scroll-content scrollbar-sleek w-52 p-1" align="start">
+          {labels.error ? (
+            <div className="px-2 py-3 text-center text-[12px] text-destructive">{labels.error}</div>
+          ) : labels.loading ? (
+            <div className="flex items-center gap-2 px-2 py-3 text-[12px] text-muted-foreground">
+              <LoaderCircle className="size-3 animate-spin" />
+              {translate('auto.components.LinearItemDrawer.cddd9b04a7', 'Loading labels')}
+            </div>
+          ) : labels.data.length > 0 ? (
+            <div>
+              {labels.data.map((label) => (
+                <button
+                  key={label.id}
+                  type="button"
+                  onClick={() => handleLabelToggle(label.id)}
+                  className={LINEAR_EDIT_MENU_ITEM_WITH_ICON_CLASS}
+                >
+                  <span
+                    className={cn(
+                      'flex size-3.5 items-center justify-center rounded-sm border',
+                      localLabelIds.includes(label.id)
+                        ? 'border-primary bg-primary text-primary-foreground'
+                        : 'border-input'
+                    )}
+                  >
+                    {localLabelIds.includes(label.id) && checkIcon}
+                  </span>
+                  <span
+                    className="inline-block size-2 rounded-full"
+                    style={{ backgroundColor: label.color }}
+                  />
+                  {label.name}
+                </button>
+              ))}
+            </div>
+          ) : (
+            <div className="px-2 py-3 text-center text-[12px] text-muted-foreground">
+              {translate('auto.components.LinearItemDrawer.367f828482', 'No labels found')}
+            </div>
+          )}
+        </PopoverContent>
+      </Popover>
+    </div>
+  )
+}
diff --git a/src/renderer/src/components/linear-item-drawer-edit-controller.tsx b/src/renderer/src/components/linear-item-drawer-edit-controller.tsx
new file mode 100644
index 00000000000..f36a3893cfd
--- /dev/null
+++ b/src/renderer/src/components/linear-item-drawer-edit-controller.tsx
@@ -0,0 +1,340 @@
+import { useCallback, useState } from 'react'
+import { toast } from 'sonner'
+
+import { useAppStore } from '@/store'
+import {
+  useTeamStates,
+  useTeamLabels,
+  useTeamMembers,
+  useImmediateMutation
+} from '@/hooks/useIssueMetadata'
+import { linearUpdateIssue } from '@/runtime/runtime-linear-issue-mutations'
+import { translate } from '@/i18n/i18n'
+import { formatLinearEstimateInput } from '@/components/linear-item-drawer-edit-controls'
+import type { LinearIssueEditSectionProps } from '@/components/linear-item-drawer-types'
+
+export function useLinearIssueEditController({
+  issue,
+  editState,
+  onEditStateChange,
+  layout = 'chips',
+  sourceContext
+}: LinearIssueEditSectionProps) {
+  const [labelPopoverOpen, setLabelPopoverOpen] = useState(false)
+  const [estimatePopoverOpen, setEstimatePopoverOpen] = useState(false)
+  const patchLinearIssue = useAppStore((s) => s.patchLinearIssue)
+  const settings = useAppStore((s) => s.settings)
+  const providerSettings = sourceContext ?? settings
+  const { isPending, run } = useImmediateMutation()
+
+  const {
+    state: localState,
+    priority: localPriority,
+    estimate: localEstimate,
+    assignee: localAssignee,
+    labelIds: localLabelIds,
+    labels: localLabels
+  } = editState
+  const [estimateInput, setEstimateInput] = useState(() => formatLinearEstimateInput(localEstimate))
+
+  const teamId = issue.team?.id || null
+  const states = useTeamStates(teamId, providerSettings, issue.workspaceId)
+  const labels = useTeamLabels(teamId, providerSettings, issue.workspaceId)
+  const members = useTeamMembers(teamId, providerSettings, issue.workspaceId)
+
+  const handleEstimatePopoverOpenChange = useCallback(
+    (open: boolean) => {
+      setEstimatePopoverOpen(open)
+      if (open) {
+        setEstimateInput(formatLinearEstimateInput(localEstimate))
+      }
+    },
+    [localEstimate]
+  )
+
+  const handleStateChange = useCallback(
+    (stateId: string) => {
+      const newState = states.data.find((s) => s.id === stateId)
+      if (!newState) {
+        return
+      }
+
+      const prevState = localState
+      const stateValue = { name: newState.name, type: newState.type, color: newState.color }
+
+      run('state', {
+        mutate: () => linearUpdateIssue(providerSettings, issue.id, { stateId }, issue.workspaceId),
+        onOptimistic: () => {
+          onEditStateChange({ state: stateValue })
+          patchLinearIssue(issue.id, { state: stateValue }, { sourceContext })
+        },
+        onRevert: () => {
+          onEditStateChange({ state: prevState })
+          patchLinearIssue(issue.id, { state: prevState }, { sourceContext })
+        },
+        onSuccess: () => {
+          useAppStore.getState().invalidateLinearIssueLists({ sourceContext })
+          useAppStore.getState().recordFeatureInteraction('linear-tasks')
+        },
+        onError: (err) => toast.error(err)
+      })
+    },
+    [
+      issue.id,
+      issue.workspaceId,
+      localState,
+      providerSettings,
+      states.data,
+      patchLinearIssue,
+      run,
+      onEditStateChange,
+      sourceContext
+    ]
+  )
+
+  const handlePriorityChange = useCallback(
+    (value: string) => {
+      const priority = Number.parseInt(value, 10)
+      const prevPriority = localPriority
+      run('priority', {
+        mutate: () =>
+          linearUpdateIssue(providerSettings, issue.id, { priority }, issue.workspaceId),
+        onOptimistic: () => {
+          onEditStateChange({ priority })
+          patchLinearIssue(issue.id, { priority }, { sourceContext })
+        },
+        onRevert: () => {
+          onEditStateChange({ priority: prevPriority })
+          patchLinearIssue(issue.id, { priority: prevPriority }, { sourceContext })
+        },
+        onSuccess: () => {
+          useAppStore.getState().invalidateLinearIssueLists({ sourceContext })
+          useAppStore.getState().recordFeatureInteraction('linear-tasks')
+        },
+        onError: (err) => toast.error(err)
+      })
+    },
+    [
+      issue.id,
+      issue.workspaceId,
+      localPriority,
+      providerSettings,
+      patchLinearIssue,
+      run,
+      onEditStateChange,
+      sourceContext
+    ]
+  )
+
+  const handleEstimateChange = useCallback(
+    (estimate: number | null) => {
+      const prevEstimate = localEstimate
+      run('estimate', {
+        mutate: () =>
+          linearUpdateIssue(providerSettings, issue.id, { estimate }, issue.workspaceId),
+        onOptimistic: () => {
+          onEditStateChange({ estimate })
+          patchLinearIssue(issue.id, { estimate }, { sourceContext })
+          setEstimatePopoverOpen(false)
+        },
+        onRevert: () => {
+          onEditStateChange({ estimate: prevEstimate })
+          patchLinearIssue(issue.id, { estimate: prevEstimate }, { sourceContext })
+        },
+        onSuccess: () => {
+          useAppStore.getState().recordFeatureInteraction('linear-tasks')
+        },
+        onError: (err) => toast.error(err)
+      })
+    },
+    [
+      issue.id,
+      issue.workspaceId,
+      localEstimate,
+      providerSettings,
+      patchLinearIssue,
+      run,
+      onEditStateChange,
+      sourceContext
+    ]
+  )
+
+  const handleEstimateSubmit = useCallback(() => {
+    const trimmed = estimateInput.trim()
+    if (!trimmed) {
+      handleEstimateChange(null)
+      return
+    }
+
+    const estimate = Number(trimmed)
+    if (!Number.isInteger(estimate) || estimate < 0) {
+      toast.error(
+        translate(
+          'auto.components.LinearItemDrawer.0be31fef8e',
+          'Estimate must be a non-negative integer'
+        )
+      )
+      return
+    }
+
+    handleEstimateChange(estimate)
+  }, [estimateInput, handleEstimateChange])
+
+  const handleAssigneeChange = useCallback(
+    (memberId: string) => {
+      const assigneeId = memberId === '__unassign__' ? null : memberId
+      const member = members.data.find((m) => m.id === memberId)
+      const prevAssignee = localAssignee
+      const newAssignee = member
+        ? { id: member.id, displayName: member.displayName, avatarUrl: member.avatarUrl }
+        : undefined
+      run('assignee', {
+        mutate: () =>
+          linearUpdateIssue(providerSettings, issue.id, { assigneeId }, issue.workspaceId),
+        onOptimistic: () => {
+          onEditStateChange({ assignee: newAssignee })
+          patchLinearIssue(issue.id, { assignee: newAssignee }, { sourceContext })
+        },
+        onRevert: () => {
+          onEditStateChange({ assignee: prevAssignee })
+          patchLinearIssue(issue.id, { assignee: prevAssignee }, { sourceContext })
+        },
+        onSuccess: () => {
+          useAppStore.getState().invalidateLinearIssueLists({ sourceContext })
+          useAppStore.getState().recordFeatureInteraction('linear-tasks')
+        },
+        onError: (err) => toast.error(err)
+      })
+    },
+    [
+      issue.id,
+      issue.workspaceId,
+      localAssignee,
+      providerSettings,
+      members.data,
+      patchLinearIssue,
+      run,
+      onEditStateChange,
+      sourceContext
+    ]
+  )
+
+  const handleLabelToggle = useCallback(
+    (labelId: string) => {
+      const prevLabelIds = localLabelIds
+      const prevLabels = localLabels
+      const isRemoving = prevLabelIds.includes(labelId)
+      const newLabelIds = isRemoving
+        ? prevLabelIds.filter((id) => id !== labelId)
+        : [...prevLabelIds, labelId]
+      const newLabels = newLabelIds
+        .map((id) => labels.data.find((l) => l.id === id)?.name)
+        .filter((n): n is string => !!n)
+
+      run('labels', {
+        mutate: () =>
+          linearUpdateIssue(
+            providerSettings,
+            issue.id,
+            { labelIds: newLabelIds },
+            issue.workspaceId
+          ),
+        onOptimistic: () => {
+          onEditStateChange({ labelIds: newLabelIds, labels: newLabels })
+          patchLinearIssue(
+            issue.id,
+            { labelIds: newLabelIds, labels: newLabels },
+            { sourceContext }
+          )
+        },
+        onRevert: () => {
+          onEditStateChange({ labelIds: prevLabelIds, labels: prevLabels })
+          patchLinearIssue(
+            issue.id,
+            { labelIds: prevLabelIds, labels: prevLabels },
+            { sourceContext }
+          )
+        },
+        onSuccess: () => {
+          useAppStore.getState().invalidateLinearIssueLists({ sourceContext })
+          useAppStore.getState().recordFeatureInteraction('linear-tasks')
+        },
+        onError: (err) => toast.error(err)
+      })
+    },
+    [
+      issue.id,
+      issue.workspaceId,
+      localLabelIds,
+      localLabels,
+      providerSettings,
+      labels.data,
+      patchLinearIssue,
+      run,
+      onEditStateChange,
+      sourceContext
+    ]
+  )
+
+  const currentStateId = states.data.find(
+    (s) => s.name === localState.name && s.type === localState.type
+  )?.id
+  const statePending = isPending('state')
+  const priorityPending = isPending('priority')
+  const estimatePending = isPending('estimate')
+  const assigneePending = isPending('assignee')
+  const labelsPending = isPending('labels')
+  const labelSummary =
+    localLabels.length === 0
+      ? '+ Label'
+      : localLabels.length === 1
+        ? localLabels[0]
+        : `${localLabels[0]} +${localLabels.length - 1}`
+
+  const checkIcon = (
+    <svg className="size-2.5" viewBox="0 0 12 12" fill="none">
+      <path
+        d="M2 6l3 3 5-5"
+        stroke="currentColor"
+        strokeWidth="2"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+    </svg>
+  )
+
+  return {
+    layout,
+    labelPopoverOpen,
+    setLabelPopoverOpen,
+    estimatePopoverOpen,
+    localState,
+    localPriority,
+    localEstimate,
+    localAssignee,
+    localLabelIds,
+    localLabels,
+    estimateInput,
+    setEstimateInput,
+    states,
+    labels,
+    members,
+    handleEstimatePopoverOpenChange,
+    handleStateChange,
+    handlePriorityChange,
+    handleEstimateChange,
+    handleEstimateSubmit,
+    handleAssigneeChange,
+    handleLabelToggle,
+    currentStateId,
+    statePending,
+    priorityPending,
+    estimatePending,
+    assigneePending,
+    labelsPending,
+    labelSummary,
+    checkIcon
+  }
+}
+
+export type LinearIssueEditController = ReturnType<typeof useLinearIssueEditController>
diff --git a/src/renderer/src/components/linear-item-drawer-edit-controls.tsx b/src/renderer/src/components/linear-item-drawer-edit-controls.tsx
new file mode 100644
index 00000000000..15b82701f1e
--- /dev/null
+++ b/src/renderer/src/components/linear-item-drawer-edit-controls.tsx
@@ -0,0 +1,43 @@
+import React from 'react'
+import { ChevronDown, LoaderCircle } from 'lucide-react'
+
+export const PRIORITY_LABELS: Record<number, string> = {
+  0: 'No priority',
+  1: 'Urgent',
+  2: 'High',
+  3: 'Medium',
+  4: 'Low'
+}
+
+export const LINEAR_EDIT_CHIP_CLASS =
+  'inline-flex h-6 min-w-0 max-w-[14rem] cursor-pointer items-center gap-1.5 rounded-full border border-border/70 bg-background/70 px-2.5 text-[11px] font-medium leading-none text-muted-foreground shadow-xs transition-[background-color,border-color,color,box-shadow] hover:border-border hover:bg-accent hover:text-accent-foreground hover:[--linear-state-pill-current-background:var(--linear-state-pill-hover-background)] hover:[--linear-state-pill-current-border:var(--linear-state-pill-hover-border)] hover:[--linear-state-pill-current-foreground:var(--linear-state-pill-hover-foreground)] focus-visible:outline-none focus-visible:ring-[3px] focus-visible:ring-ring/50 disabled:pointer-events-none disabled:opacity-80'
+
+export const LINEAR_EDIT_MENU_ITEM_CLASS =
+  'flex w-full cursor-pointer items-center rounded-sm px-2 py-1.5 text-[12px] hover:bg-accent'
+
+export const LINEAR_EDIT_MENU_ITEM_WITH_ICON_CLASS =
+  'flex w-full cursor-pointer items-center gap-2 rounded-sm px-2 py-1.5 text-[12px] hover:bg-accent'
+
+export const LINEAR_ESTIMATE_PRESETS = [1, 2, 3, 5, 8] as const
+
+export function formatLinearEstimateLabel(estimate: number | null | undefined): string {
+  return estimate === null || estimate === undefined ? 'Set estimate' : `Estimate ${estimate}`
+}
+
+export function formatLinearEstimateInput(estimate: number | null | undefined): string {
+  return estimate === null || estimate === undefined ? '' : String(estimate)
+}
+
+export function LinearEditChipAdornment({
+  loading,
+  pending
+}: {
+  loading?: boolean
+  pending?: boolean
+}): React.JSX.Element {
+  if (loading || pending) {
+    return <LoaderCircle className="size-3 shrink-0 animate-spin opacity-70" />
+  }
+
+  return <ChevronDown className="size-3 shrink-0 opacity-55" />
+}
diff --git a/src/renderer/src/components/linear-item-drawer-edit-properties-layout.tsx b/src/renderer/src/components/linear-item-drawer-edit-properties-layout.tsx
new file mode 100644
index 00000000000..cf845faa6d8
--- /dev/null
+++ b/src/renderer/src/components/linear-item-drawer-edit-properties-layout.tsx
@@ -0,0 +1,379 @@
+import React from 'react'
+import { ChevronDown, Gauge, LoaderCircle, Tag, UserRound } from 'lucide-react'
+
+import { Button } from '@/components/ui/button'
+import { Input } from '@/components/ui/input'
+import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
+import { cn } from '@/lib/utils'
+import { getLinearStateMarkerStyle } from '@/components/linear-state-pill-style'
+import { LinearPriorityIcon } from '@/components/linear-priority-icon'
+import { translate } from '@/i18n/i18n'
+import {
+  LINEAR_EDIT_MENU_ITEM_CLASS,
+  LINEAR_EDIT_MENU_ITEM_WITH_ICON_CLASS,
+  LINEAR_ESTIMATE_PRESETS,
+  LinearEditChipAdornment,
+  PRIORITY_LABELS,
+  formatLinearEstimateLabel
+} from '@/components/linear-item-drawer-edit-controls'
+import type { LinearIssueEditController } from '@/components/linear-item-drawer-edit-controller'
+
+export function renderLinearIssuePropertiesLayout(
+  controller: LinearIssueEditController
+): React.JSX.Element {
+  const {
+    statePending,
+    states,
+    localState,
+    currentStateId,
+    handleStateChange,
+    priorityPending,
+    localPriority,
+    handlePriorityChange,
+    assigneePending,
+    members,
+    localAssignee,
+    handleAssigneeChange,
+    estimatePopoverOpen,
+    handleEstimatePopoverOpenChange,
+    estimatePending,
+    localEstimate,
+    handleEstimateChange,
+    estimateInput,
+    setEstimateInput,
+    handleEstimateSubmit,
+    labelPopoverOpen,
+    setLabelPopoverOpen,
+    labelsPending,
+    localLabels,
+    labelSummary,
+    labels,
+    localLabelIds,
+    handleLabelToggle,
+    checkIcon
+  } = controller
+
+  const propertyRowClass =
+    'flex min-h-9 w-full cursor-pointer items-center gap-2 rounded-md px-2 py-1.5 text-left text-sm text-foreground transition hover:bg-accent hover:text-accent-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-80'
+  const propertyIconClass = 'size-4 shrink-0 text-muted-foreground'
+
+  return (
+    <div className="space-y-3">
+      <section className="rounded-xl border border-border/60 bg-card text-card-foreground shadow-xs">
+        <div className="flex h-10 items-center gap-1 border-b border-border/50 px-4 text-sm font-medium text-muted-foreground">
+          <span>{translate('auto.components.LinearItemDrawer.dd304de85a', 'Properties')}</span>
+          <ChevronDown className="size-3.5" />
+        </div>
+        <div className="space-y-1 p-3">
+          <Popover>
+            <PopoverTrigger asChild>
+              <button
+                type="button"
+                disabled={statePending}
+                className={propertyRowClass}
+                aria-busy={statePending || states.loading}
+              >
+                <span
+                  className="inline-block size-2.5 shrink-0 rounded-full"
+                  style={getLinearStateMarkerStyle(localState.color)}
+                />
+                <span className="min-w-0 flex-1 truncate">{localState.name}</span>
+                <LinearEditChipAdornment loading={states.loading} pending={statePending} />
+              </button>
+            </PopoverTrigger>
+            <PopoverContent
+              className="popover-scroll-content scrollbar-sleek w-48 p-1"
+              align="start"
+            >
+              {states.error ? (
+                <div className="px-2 py-3 text-center text-[12px] text-destructive">
+                  {states.error}
+                </div>
+              ) : states.loading ? (
+                <div className="flex items-center gap-2 px-2 py-3 text-[12px] text-muted-foreground">
+                  <LoaderCircle className="size-3 animate-spin" />
+                  {translate('auto.components.LinearItemDrawer.59b6cd3706', 'Loading states')}
+                </div>
+              ) : states.data.length > 0 ? (
+                <div>
+                  {states.data.map((s) => (
+                    <button
+                      key={s.id}
+                      type="button"
+                      onClick={() => handleStateChange(s.id)}
+                      className={cn(
+                        LINEAR_EDIT_MENU_ITEM_WITH_ICON_CLASS,
+                        currentStateId === s.id && 'bg-accent/50'
+                      )}
+                    >
+                      <span
+                        className="inline-block size-2 rounded-full"
+                        style={{ backgroundColor: s.color }}
+                      />
+                      {s.name}
+                    </button>
+                  ))}
+                </div>
+              ) : (
+                <div className="px-2 py-3 text-center text-[12px] text-muted-foreground">
+                  {translate('auto.components.LinearItemDrawer.780ea6ed89', 'No states found')}
+                </div>
+              )}
+            </PopoverContent>
+          </Popover>
+
+          <Popover>
+            <PopoverTrigger asChild>
+              <button
+                type="button"
+                disabled={priorityPending}
+                className={propertyRowClass}
+                aria-busy={priorityPending}
+              >
+                <LinearPriorityIcon priority={localPriority} />
+                <span className="min-w-0 flex-1 truncate">
+                  {PRIORITY_LABELS[localPriority] ?? `P${localPriority}`}
+                </span>
+                <LinearEditChipAdornment pending={priorityPending} />
+              </button>
+            </PopoverTrigger>
+            <PopoverContent className="w-36 p-1" align="start">
+              {[0, 1, 2, 3, 4].map((p) => (
+                <button
+                  key={p}
+                  type="button"
+                  onClick={() => handlePriorityChange(String(p))}
+                  className={cn(
+                    LINEAR_EDIT_MENU_ITEM_WITH_ICON_CLASS,
+                    localPriority === p && 'bg-accent/50'
+                  )}
+                >
+                  <LinearPriorityIcon priority={p} />
+                  {PRIORITY_LABELS[p]}
+                </button>
+              ))}
+            </PopoverContent>
+          </Popover>
+
+          <Popover>
+            <PopoverTrigger asChild>
+              <button
+                type="button"
+                disabled={assigneePending}
+                className={propertyRowClass}
+                aria-busy={assigneePending || members.loading}
+              >
+                {localAssignee?.avatarUrl ? (
+                  <img
+                    src={localAssignee.avatarUrl}
+                    alt=""
+                    className="size-4 shrink-0 rounded-full"
+                  />
+                ) : (
+                  <UserRound className={propertyIconClass} />
+                )}
+                <span className="min-w-0 flex-1 truncate">
+                  {localAssignee
+                    ? localAssignee.displayName
+                    : translate('auto.components.LinearItemDrawer.866316f22c', 'Unassigned')}
+                </span>
+                <LinearEditChipAdornment loading={members.loading} pending={assigneePending} />
+              </button>
+            </PopoverTrigger>
+            <PopoverContent
+              className="popover-scroll-content scrollbar-sleek w-48 p-1"
+              align="start"
+            >
+              <div>
+                <button
+                  type="button"
+                  onClick={() => handleAssigneeChange('__unassign__')}
+                  className={cn(LINEAR_EDIT_MENU_ITEM_CLASS, !localAssignee && 'bg-accent/50')}
+                >
+                  {translate('auto.components.LinearItemDrawer.866316f22c', 'Unassigned')}
+                </button>
+                {members.error ? (
+                  <div className="px-2 py-3 text-center text-[12px] text-destructive">
+                    {members.error}
+                  </div>
+                ) : members.loading ? (
+                  <div className="flex items-center gap-2 px-2 py-3 text-[12px] text-muted-foreground">
+                    <LoaderCircle className="size-3 animate-spin" />
+                    {translate('auto.components.LinearItemDrawer.b2376d0179', 'Loading members')}
+                  </div>
+                ) : (
+                  members.data.map((m) => (
+                    <button
+                      key={m.id}
+                      type="button"
+                      onClick={() => handleAssigneeChange(m.id)}
+                      className={cn(
+                        LINEAR_EDIT_MENU_ITEM_CLASS,
+                        localAssignee?.id === m.id && 'bg-accent/50'
+                      )}
+                    >
+                      {m.displayName}
+                    </button>
+                  ))
+                )}
+              </div>
+            </PopoverContent>
+          </Popover>
+
+          <Popover open={estimatePopoverOpen} onOpenChange={handleEstimatePopoverOpenChange}>
+            <PopoverTrigger asChild>
+              <button
+                type="button"
+                disabled={estimatePending}
+                className={propertyRowClass}
+                aria-busy={estimatePending}
+              >
+                <Gauge className={propertyIconClass} />
+                <span className="min-w-0 flex-1 truncate">
+                  {formatLinearEstimateLabel(localEstimate)}
+                </span>
+                <LinearEditChipAdornment pending={estimatePending} />
+              </button>
+            </PopoverTrigger>
+            <PopoverContent className="w-64 p-3" align="start">
+              <div className="space-y-3">
+                <div className="grid grid-cols-5 gap-1.5">
+                  {LINEAR_ESTIMATE_PRESETS.map((estimate) => (
+                    <button
+                      key={estimate}
+                      type="button"
+                      onClick={() => handleEstimateChange(estimate)}
+                      className={cn(
+                        'flex h-8 items-center justify-center rounded-md border border-border text-sm hover:bg-accent',
+                        localEstimate === estimate && 'border-primary bg-accent text-foreground'
+                      )}
+                    >
+                      {estimate}
+                    </button>
+                  ))}
+                </div>
+                <Input
+                  value={estimateInput}
+                  onChange={(event) => setEstimateInput(event.target.value)}
+                  onKeyDown={(event) => {
+                    if (event.key === 'Enter') {
+                      event.preventDefault()
+                      handleEstimateSubmit()
+                    }
+                  }}
+                  inputMode="numeric"
+                  placeholder={translate(
+                    'auto.components.LinearItemDrawer.fbb90300e2',
+                    'Custom estimate'
+                  )}
+                  className="h-8 text-sm"
+                />
+                <div className="flex items-center justify-between gap-2">
+                  <Button
+                    type="button"
+                    variant="ghost"
+                    size="sm"
+                    onClick={() => handleEstimateChange(null)}
+                  >
+                    {translate('auto.components.LinearItemDrawer.ceeb8c6153', 'Clear')}
+                  </Button>
+                  <Button
+                    type="button"
+                    size="sm"
+                    onClick={handleEstimateSubmit}
+                    disabled={estimatePending}
+                  >
+                    {estimatePending ? <LoaderCircle className="size-3.5 animate-spin" /> : null}
+                    {translate('auto.components.LinearItemDrawer.b5675b0694', 'Save')}
+                  </Button>
+                </div>
+              </div>
+            </PopoverContent>
+          </Popover>
+        </div>
+      </section>
+
+      <section className="rounded-xl border border-border/60 bg-card text-card-foreground shadow-xs">
+        <div className="flex h-10 items-center gap-1 border-b border-border/50 px-4 text-sm font-medium text-muted-foreground">
+          <span>{translate('auto.components.LinearItemDrawer.64bfffc4dd', 'Labels')}</span>
+          <ChevronDown className="size-3.5" />
+        </div>
+        <div className="p-3">
+          <Popover open={labelPopoverOpen} onOpenChange={setLabelPopoverOpen}>
+            <PopoverTrigger asChild>
+              <button
+                type="button"
+                disabled={labelsPending}
+                className={propertyRowClass}
+                aria-label={
+                  localLabels.length
+                    ? translate(
+                        'auto.components.LinearItemDrawer.7f7b89b631',
+                        'Labels: {{value0}}',
+                        { value0: localLabels.join(', ') }
+                      )
+                    : translate('auto.components.LinearItemDrawer.23886c7eec', 'Add label')
+                }
+                aria-busy={labelsPending || labels.loading}
+              >
+                <Tag className={propertyIconClass} />
+                <span className="min-w-0 flex-1 truncate">
+                  {localLabels.length
+                    ? labelSummary
+                    : translate('auto.components.LinearItemDrawer.23886c7eec', 'Add label')}
+                </span>
+                <LinearEditChipAdornment loading={labels.loading} pending={labelsPending} />
+              </button>
+            </PopoverTrigger>
+            <PopoverContent
+              className="popover-scroll-content scrollbar-sleek w-52 p-1"
+              align="start"
+            >
+              {labels.error ? (
+                <div className="px-2 py-3 text-center text-[12px] text-destructive">
+                  {labels.error}
+                </div>
+              ) : labels.loading ? (
+                <div className="flex items-center gap-2 px-2 py-3 text-[12px] text-muted-foreground">
+                  <LoaderCircle className="size-3 animate-spin" />
+                  {translate('auto.components.LinearItemDrawer.cddd9b04a7', 'Loading labels')}
+                </div>
+              ) : labels.data.length > 0 ? (
+                <div>
+                  {labels.data.map((label) => (
+                    <button
+                      key={label.id}
+                      type="button"
+                      onClick={() => handleLabelToggle(label.id)}
+                      className={LINEAR_EDIT_MENU_ITEM_WITH_ICON_CLASS}
+                    >
+                      <span
+                        className={cn(
+                          'flex size-3.5 items-center justify-center rounded-sm border',
+                          localLabelIds.includes(label.id)
+                            ? 'border-primary bg-primary text-primary-foreground'
+                            : 'border-input'
+                        )}
+                      >
+                        {localLabelIds.includes(label.id) && checkIcon}
+                      </span>
+                      <span
+                        className="inline-block size-2 rounded-full"
+                        style={{ backgroundColor: label.color }}
+                      />
+                      {label.name}
+                    </button>
+                  ))}
+                </div>
+              ) : (
+                <div className="px-2 py-3 text-center text-[12px] text-muted-foreground">
+                  {translate('auto.components.LinearItemDrawer.367f828482', 'No labels found')}
+                </div>
+              )}
+            </PopoverContent>
+          </Popover>
+        </div>
+      </section>
+    </div>
+  )
+}
diff --git a/src/renderer/src/components/linear-item-drawer-edit-section.tsx b/src/renderer/src/components/linear-item-drawer-edit-section.tsx
new file mode 100644
index 00000000000..5591c8e0033
--- /dev/null
+++ b/src/renderer/src/components/linear-item-drawer-edit-section.tsx
@@ -0,0 +1,13 @@
+import React from 'react'
+
+import { useLinearIssueEditController } from '@/components/linear-item-drawer-edit-controller'
+import { renderLinearIssueChipsLayout } from '@/components/linear-item-drawer-edit-chips-layout'
+import { renderLinearIssuePropertiesLayout } from '@/components/linear-item-drawer-edit-properties-layout'
+import type { LinearIssueEditSectionProps } from '@/components/linear-item-drawer-types'
+
+export function LinearIssueEditSection(props: LinearIssueEditSectionProps): React.JSX.Element {
+  const controller = useLinearIssueEditController(props)
+  return controller.layout === 'properties'
+    ? renderLinearIssuePropertiesLayout(controller)
+    : renderLinearIssueChipsLayout(controller)
+}
diff --git a/src/renderer/src/components/linear-item-drawer-sheet.tsx b/src/renderer/src/components/linear-item-drawer-sheet.tsx
new file mode 100644
index 00000000000..94d4263bbf7
--- /dev/null
+++ b/src/renderer/src/components/linear-item-drawer-sheet.tsx
@@ -0,0 +1,326 @@
+import React from 'react'
+import {
+  ArrowRight,
+  ChevronDown,
+  ExternalLink,
+  FolderOpen,
+  LoaderCircle,
+  Plus,
+  X
+} from 'lucide-react'
+import { VisuallyHidden } from 'radix-ui'
+
+import { Button } from '@/components/ui/button'
+import { ButtonGroup } from '@/components/ui/button-group'
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger
+} from '@/components/ui/dropdown-menu'
+import { Sheet, SheetContent, SheetDescription, SheetTitle } from '@/components/ui/sheet'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
+import { LinearIssueTextEditor } from '@/components/LinearIssueTextEditor'
+import CommentMarkdown from '@/components/sidebar/CommentMarkdown'
+import { LinearIssueEditSection } from '@/components/linear-item-drawer-edit-section'
+import { LinearIssueCommentFooter } from '@/components/linear-item-drawer-comment-footer'
+import { translate } from '@/i18n/i18n'
+import { formatUiRelativeTimeFromDate } from '@/i18n/relative-time-format'
+import type { LinearComment, LinearIssue } from '../../../shared/linear/issue-types'
+import type { TaskSourceContext } from '../../../shared/task-source-context'
+import type { Worktree } from '../../../shared/worktree/types'
+import type { LinearEditState, LinearLocalComment } from '@/components/linear-item-drawer-types'
+
+function LinearIcon({ className }: { className?: string }): React.JSX.Element {
+  return (
+    <svg viewBox="0 0 24 24" aria-hidden className={className} fill="currentColor">
+      <path d="M2.886 4.18A11.982 11.982 0 0 1 11.99 0C18.624 0 24 5.376 24 12.009c0 3.64-1.62 6.903-4.18 9.105L2.887 4.18ZM1.817 5.626l16.556 16.556c-.524.33-1.075.62-1.65.866L.951 7.277c.247-.575.537-1.126.866-1.65ZM.322 9.163l14.515 14.515c-.71.172-1.443.282-2.195.322L0 11.358a12 12 0 0 1 .322-2.195Zm-.17 4.862 9.823 9.824a12.02 12.02 0 0 1-9.824-9.824Z" />
+    </svg>
+  )
+}
+
+function formatRelativeTime(input: string): string {
+  return formatUiRelativeTimeFromDate(input)
+}
+
+type LinearItemDrawerSheetProps = {
+  issue: LinearIssue | null
+  onClose: () => void
+  displayed: LinearIssue | null
+  handleIssueTextChange: Parameters<typeof LinearIssueTextEditor>[0] extends {
+    onIssueChange: infer Handler
+  }
+    ? Handler
+    : never
+  sourceContext: TaskSourceContext | null | undefined
+  editState: LinearEditState | null
+  handleEditStateChange: (patch: Partial<LinearEditState>) => void
+  commentsLoading: boolean
+  comments: LinearComment[]
+  handleCommentAdded: (comment: LinearLocalComment) => void
+  attachedWorkspaceLabel: string | null
+  attachedWorkspace: Worktree | null
+  handleOpenOrUseIssue: () => void
+  onUse: (issue: LinearIssue) => void
+}
+
+export function renderLinearItemDrawerSheet({
+  issue,
+  onClose,
+  displayed,
+  handleIssueTextChange,
+  sourceContext,
+  editState,
+  handleEditStateChange,
+  commentsLoading,
+  comments,
+  handleCommentAdded,
+  attachedWorkspaceLabel,
+  attachedWorkspace,
+  handleOpenOrUseIssue,
+  onUse
+}: LinearItemDrawerSheetProps): React.JSX.Element {
+  return (
+    <Sheet open={issue !== null} onOpenChange={(open) => !open && onClose()}>
+      <SheetContent
+        side="right"
+        showCloseButton={false}
+        className="w-full p-0 sm:max-w-[640px]"
+        onOpenAutoFocus={(event) => {
+          event.preventDefault()
+        }}
+      >
+        <VisuallyHidden.Root asChild>
+          <SheetTitle>
+            {displayed?.title ??
+              translate('auto.components.LinearItemDrawer.39883467f4', 'Linear issue')}
+          </SheetTitle>
+        </VisuallyHidden.Root>
+        <VisuallyHidden.Root asChild>
+          <SheetDescription>
+            {translate(
+              'auto.components.LinearItemDrawer.04a442f796',
+              'Preview and edit the selected Linear issue.'
+            )}
+          </SheetDescription>
+        </VisuallyHidden.Root>
+
+        {displayed && (
+          <div className="flex h-full min-h-0 flex-col">
+            {/* Header */}
+            <div className="flex-none border-b border-border/60 px-4 py-3">
+              <div className="flex items-start gap-2">
+                <LinearIcon className="mt-1 size-4 shrink-0 text-muted-foreground" />
+                <div className="min-w-0 flex-1">
+                  <span className="font-mono text-[12px] text-muted-foreground">
+                    {displayed.identifier}
+                  </span>
+                  <div className="mt-1">
+                    <LinearIssueTextEditor
+                      issue={displayed}
+                      onIssueChange={handleIssueTextChange}
+                      density="drawer"
+                      fields="title"
+                      sourceContext={sourceContext}
+                    />
+                  </div>
+                  <div className="mt-1 flex flex-wrap items-center gap-x-2 gap-y-1 text-[11px] text-muted-foreground">
+                    {displayed.workspaceName && <span>{displayed.workspaceName}</span>}
+                    {displayed.team?.name && <span>{displayed.team.name}</span>}
+                    <span>· {formatRelativeTime(displayed.updatedAt)}</span>
+                  </div>
+                </div>
+                <div className="flex shrink-0 items-center gap-1">
+                  <Tooltip>
+                    <TooltipTrigger asChild>
+                      <Button
+                        variant="ghost"
+                        size="icon"
+                        className="size-7"
+                        onClick={() => window.api.shell.openUrl(displayed.url)}
+                        aria-label={translate(
+                          'auto.components.LinearItemDrawer.0190b760c1',
+                          'Open on Linear'
+                        )}
+                      >
+                        <ExternalLink className="size-4" />
+                      </Button>
+                    </TooltipTrigger>
+                    <TooltipContent side="bottom" sideOffset={6}>
+                      {translate('auto.components.LinearItemDrawer.0190b760c1', 'Open on Linear')}
+                    </TooltipContent>
+                  </Tooltip>
+                  <Tooltip>
+                    <TooltipTrigger asChild>
+                      <Button
+                        variant="ghost"
+                        size="icon"
+                        className="size-7"
+                        onClick={onClose}
+                        aria-label={translate(
+                          'auto.components.LinearItemDrawer.858d0630da',
+                          'Close preview'
+                        )}
+                      >
+                        <X className="size-4" />
+                      </Button>
+                    </TooltipTrigger>
+                    <TooltipContent side="bottom" sideOffset={6}>
+                      {translate('auto.components.LinearItemDrawer.9dc54172db', 'Close · Esc')}
+                    </TooltipContent>
+                  </Tooltip>
+                </div>
+              </div>
+            </div>
+
+            {/* Edit section */}
+            {editState && (
+              <LinearIssueEditSection
+                issue={displayed}
+                editState={editState}
+                onEditStateChange={handleEditStateChange}
+                sourceContext={sourceContext}
+              />
+            )}
+
+            {/* Body + comments */}
+            <div className="min-h-0 flex-1 overflow-y-auto scrollbar-sleek">
+              <div className="px-4 py-4">
+                <LinearIssueTextEditor
+                  issue={displayed}
+                  onIssueChange={handleIssueTextChange}
+                  density="drawer"
+                  fields="description"
+                  sourceContext={sourceContext}
+                />
+              </div>
+
+              <div className="border-t border-border/40 px-4 py-4">
+                <div className="flex items-center gap-2 pb-3">
+                  <span className="text-[13px] font-medium text-foreground">
+                    {translate('auto.components.LinearItemDrawer.fde849b2b6', 'Comments')}
+                  </span>
+                  {comments.length > 0 && (
+                    <span className="text-[12px] text-muted-foreground">{comments.length}</span>
+                  )}
+                </div>
+                {commentsLoading && comments.length === 0 ? (
+                  <div className="flex items-center justify-center py-6">
+                    <LoaderCircle className="size-4 animate-spin text-muted-foreground" />
+                  </div>
+                ) : comments.length === 0 ? (
+                  <p className="text-[13px] text-muted-foreground">
+                    {translate('auto.components.LinearItemDrawer.a4fcc57522', 'No comments yet.')}
+                  </p>
+                ) : (
+                  <div className="flex flex-col gap-3">
+                    {comments.map((comment) => (
+                      <div
+                        key={comment.id}
+                        className="rounded-lg border border-border/40 bg-background/30"
+                      >
+                        <div className="flex items-center gap-2 border-b border-border/40 px-3 py-2">
+                          {comment.user?.avatarUrl && (
+                            <img
+                              src={comment.user.avatarUrl}
+                              alt={comment.user.displayName}
+                              className="size-5 shrink-0 rounded-full"
+                            />
+                          )}
+                          <span className="text-[13px] font-semibold text-foreground">
+                            {comment.user?.displayName ??
+                              translate('auto.components.LinearItemDrawer.48e17e8cbd', 'Unknown')}
+                          </span>
+                          <span className="text-[12px] text-muted-foreground">
+                            · {formatRelativeTime(comment.createdAt)}
+                          </span>
+                        </div>
+                        <div className="px-3 py-2">
+                          <CommentMarkdown
+                            content={comment.body}
+                            className="text-[13px] leading-relaxed"
+                          />
+                        </div>
+                      </div>
+                    ))}
+                  </div>
+                )}
+              </div>
+            </div>
+
+            {/* Comment footer + Start/Open workspace */}
+            <LinearIssueCommentFooter
+              issueId={displayed.id}
+              workspaceId={displayed.workspaceId}
+              onCommentAdded={handleCommentAdded}
+              sourceContext={sourceContext}
+            />
+            <div className="flex-none space-y-2 border-t border-border/60 bg-background/40 px-4 py-3">
+              {attachedWorkspaceLabel ? (
+                <div className="flex min-w-0 items-center gap-1.5 text-[12px] text-muted-foreground">
+                  <FolderOpen className="size-3.5 shrink-0" />
+                  <span className="truncate">{attachedWorkspaceLabel}</span>
+                </div>
+              ) : null}
+              {attachedWorkspace ? (
+                <DropdownMenu modal={false}>
+                  <ButtonGroup className="w-full">
+                    <Button
+                      onClick={handleOpenOrUseIssue}
+                      className="flex-1 justify-center gap-2"
+                      aria-label={translate(
+                        'auto.components.LinearItemDrawer.openAttachedWorkspace',
+                        'Open workspace attached to issue'
+                      )}
+                    >
+                      <FolderOpen className="size-4" />
+                      {translate(
+                        'auto.components.LinearItemDrawer.openWorkspace',
+                        'Open workspace'
+                      )}
+                    </Button>
+                    <DropdownMenuTrigger asChild>
+                      <Button
+                        size="icon"
+                        aria-label={translate(
+                          'auto.components.LinearItemDrawer.moreWorkspaceActions',
+                          'More issue workspace actions'
+                        )}
+                      >
+                        <ChevronDown className="size-4" />
+                      </Button>
+                    </DropdownMenuTrigger>
+                  </ButtonGroup>
+                  <DropdownMenuContent align="end">
+                    <DropdownMenuItem onSelect={() => onUse(displayed)}>
+                      <Plus className="size-4" />
+                      {translate(
+                        'auto.components.LinearItemDrawer.startNewWorkspace',
+                        'Start new workspace'
+                      )}
+                    </DropdownMenuItem>
+                  </DropdownMenuContent>
+                </DropdownMenu>
+              ) : (
+                <Button
+                  onClick={handleOpenOrUseIssue}
+                  className="w-full justify-center gap-2"
+                  aria-label={translate(
+                    'auto.components.LinearItemDrawer.04008e6c46',
+                    'Start workspace from issue'
+                  )}
+                >
+                  {translate(
+                    'auto.components.LinearItemDrawer.04008e6c46',
+                    'Start workspace from issue'
+                  )}
+                  <ArrowRight className="size-4" />
+                </Button>
+              )}
+            </div>
+          </div>
+        )}
+      </SheetContent>
+    </Sheet>
+  )
+}
diff --git a/src/renderer/src/components/linear-item-drawer-types.ts b/src/renderer/src/components/linear-item-drawer-types.ts
new file mode 100644
index 00000000000..b7840d69e74
--- /dev/null
+++ b/src/renderer/src/components/linear-item-drawer-types.ts
@@ -0,0 +1,39 @@
+import type { LinearIssue } from '../../../shared/linear/issue-types'
+import type { TaskSourceContext } from '../../../shared/task-source-context'
+
+export type LinearItemDrawerProps = {
+  issue: LinearIssue | null
+  onUse: (issue: LinearIssue) => void
+  onClose: () => void
+  sourceContext?: TaskSourceContext | null
+}
+
+export type LinearEditState = {
+  state: LinearIssue['state']
+  priority: number
+  estimate: number | null | undefined
+  assignee: LinearIssue['assignee']
+  labelIds: string[]
+  labels: string[]
+}
+
+export type LinearIssueEditSectionProps = {
+  issue: LinearIssue
+  editState: LinearEditState
+  onEditStateChange: (patch: Partial<LinearEditState>) => void
+  layout?: 'chips' | 'properties'
+  sourceContext?: TaskSourceContext | null
+}
+
+export type LinearLocalComment = { id: string; body: string; createdAt: string }
+
+export function initLinearIssueEditState(issue: LinearIssue): LinearEditState {
+  return {
+    state: issue.state,
+    priority: issue.priority,
+    estimate: issue.estimate,
+    assignee: issue.assignee,
+    labelIds: issue.labelIds,
+    labels: issue.labels
+  }
+}
diff --git a/src/renderer/src/components/mobile/paired-mobile-devices.ts b/src/renderer/src/components/mobile/paired-mobile-devices.ts
index d32da602ebc..206fee0584b 100644
--- a/src/renderer/src/components/mobile/paired-mobile-devices.ts
+++ b/src/renderer/src/components/mobile/paired-mobile-devices.ts
@@ -16,6 +16,10 @@ type PairedMobileDevicesSnapshot = {
   error: boolean
 }
 
+type RefreshPairedMobileDevicesOptions = {
+  force?: boolean
+}
+
 const EMPTY_SNAPSHOT: PairedMobileDevicesSnapshot = {
   devices: [],
   loaded: false,
@@ -80,9 +84,7 @@ export function replacePairedMobileDevices(devices: readonly PairedMobileDevice[
 
 export function refreshPairedMobileDevices({
   force = false
-}: {
-  force?: boolean
-} = {}): Promise<readonly PairedMobileDevice[]> {
+}: RefreshPairedMobileDevicesOptions = {}): Promise<readonly PairedMobileDevice[]> {
   if (activeRequest && !force) {
     return activeRequest.promise
   }
@@ -173,7 +175,10 @@ export function usePairedMobileDevices({
   refresh: typeof refreshPairedMobileDevices
 } {
   const currentSnapshot = useSyncExternalStore(subscribe, getSnapshot, getSnapshot)
-  const refresh = useCallback(refreshPairedMobileDevices, [])
+  const refresh = useCallback(
+    (options?: RefreshPairedMobileDevicesOptions) => refreshPairedMobileDevices(options),
+    []
+  )
 
   useEffect(() => {
     if (!enabled || !refreshOnMount || currentSnapshot.loaded || currentSnapshot.loading) {
diff --git a/src/renderer/src/components/native-chat/NativeChatComposer.tsx b/src/renderer/src/components/native-chat/NativeChatComposer.tsx
index 256e7878f7a..8e47eb1a8f4 100644
--- a/src/renderer/src/components/native-chat/NativeChatComposer.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatComposer.tsx
@@ -72,8 +72,7 @@ export const NativeChatComposer = forwardRef<NativeChatComposerHandle, NativeCha
       onSlashCommand,
       onSwitchToTerminal,
       readTerminalScreen,
-      launchDraft,
-      launchDraftResolved = false,
+      launchSeed,
       structuredTransport
     },
     ref
@@ -88,8 +87,9 @@ export const NativeChatComposer = forwardRef<NativeChatComposerHandle, NativeCha
     useNativeChatLaunchDraftAdoption({
       terminalTabId,
       agent,
-      launchDraft,
-      launchDraftResolved,
+      launchDraft: launchSeed?.launchDraft,
+      launchDraftResolved: launchSeed?.launchDraftResolved === true,
+      ownsTabWideLaunchDraft: launchSeed?.ownsTabWideLaunchDraft === true,
       draft,
       setDraft,
       setCaret
@@ -285,8 +285,8 @@ export const NativeChatComposer = forwardRef<NativeChatComposerHandle, NativeCha
       imageAttachments,
       disabled,
       isDispatchingSessionOption,
-      launchDraft,
-      launchDraftResolved,
+      launchDraft: launchSeed?.launchDraft,
+      launchDraftResolved: launchSeed?.launchDraftResolved === true,
       readTerminalScreen,
       resolveTarget,
       classifySend,
diff --git a/src/renderer/src/components/native-chat/NativeChatView.tsx b/src/renderer/src/components/native-chat/NativeChatView.tsx
index f4172a1d7a6..dc19218f8ba 100644
--- a/src/renderer/src/components/native-chat/NativeChatView.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatView.tsx
@@ -73,6 +73,7 @@ function NativeChatBridgeView({
   targetPtyId = null,
   launchAgent,
   resolvedAgent,
+  ownsTabWideLaunchDraft,
   onSwitchToTerminal,
   readTerminalScreen,
   contextMenuActions,
@@ -99,6 +100,7 @@ function NativeChatBridgeView({
           isVisible={isVisible}
           targetPtyId={targetPtyId}
           terminalTabId={terminalTabId}
+          ownsTabWideLaunchDraft={ownsTabWideLaunchDraft}
           onSwitchToTerminal={onSwitchToTerminal}
           readTerminalScreen={readTerminalScreen}
           contextMenuActions={contextMenuActions}
@@ -117,6 +119,7 @@ function NativeChatResolvedView({
   isVisible,
   targetPtyId,
   terminalTabId,
+  ownsTabWideLaunchDraft,
   onSwitchToTerminal,
   readTerminalScreen,
   contextMenuActions,
@@ -140,7 +143,6 @@ function NativeChatResolvedView({
   const paneLaunchPrompt = launchPrompt?.agent === agent ? launchPrompt : null
   // Launch context prefilled into the TUI input as an unsent draft; the
   // composer adopts it so the GUI view shows the same context as the TUI.
-  // Shape matches NativeChatComposer's two launch-draft props, so it spreads.
   const launchDraftSignal = useNativeChatLaunchDraftSignal({
     terminalTabId,
     agent,
@@ -450,7 +452,7 @@ function NativeChatResolvedView({
           onSlashCommand={onSlashCommand}
           onSwitchToTerminal={onSwitchToTerminal}
           readTerminalScreen={readTerminalScreen}
-          {...launchDraftSignal}
+          launchSeed={{ ...launchDraftSignal, ownsTabWideLaunchDraft }}
         />
       )}
       {contextMenu.menu}
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-types.ts b/src/renderer/src/components/native-chat/native-chat-composer-types.ts
index 45ebde1b375..9c314f90264 100644
--- a/src/renderer/src/components/native-chat/native-chat-composer-types.ts
+++ b/src/renderer/src/components/native-chat/native-chat-composer-types.ts
@@ -47,14 +47,22 @@ export type NativeChatComposerProps = {
   onSwitchToTerminal?: () => void
   /** Reads the hosted TUI's current rendered screen when chat is entered. */
   readTerminalScreen?: () => string | null
-  /** Launch context prefilled into the TUI input as an unsent draft; adopted as the composer draft. */
-  launchDraft?: NativeChatLaunchDraft | null
-  /** True once the transcript shows the TUI-side draft was submitted or cleared. */
-  launchDraftResolved?: boolean
+  /** The tab's launch seed as this pane sees it. */
+  launchSeed?: NativeChatLaunchSeed
   /** Structured journal transport; absent keeps the existing PTY path unchanged. */
   structuredTransport?: NativeChatStructuredComposerTransport
 }
 
+/** Launch context prefilled into the TUI input as an unsent draft, plus the two
+ *  facts that decide its fate in this pane's composer. */
+export type NativeChatLaunchSeed = {
+  launchDraft: NativeChatLaunchDraft | null
+  /** True once the transcript shows the TUI-side draft was submitted or cleared. */
+  launchDraftResolved: boolean
+  /** False for every pane of a split tab; gates adopting the seed, not cleanup. */
+  ownsTabWideLaunchDraft: boolean
+}
+
 export type NativeChatComposerHandle = {
   focus: () => boolean
   insertTypedText: (text: string) => boolean
diff --git a/src/renderer/src/components/native-chat/native-chat-leaf-routing.test.ts b/src/renderer/src/components/native-chat/native-chat-leaf-routing.test.ts
index dc1ba79be3a..4b4696720e9 100644
--- a/src/renderer/src/components/native-chat/native-chat-leaf-routing.test.ts
+++ b/src/renderer/src/components/native-chat/native-chat-leaf-routing.test.ts
@@ -1,9 +1,45 @@
 import { describe, expect, it } from 'vitest'
 import {
   nativeChatLaunchAgentForLeaf,
+  nativeChatLeafOwnsTabWideEvidence,
   resolveNativeChatLeafRoute
 } from './native-chat-leaf-routing'
 
+describe('nativeChatLeafOwnsTabWideEvidence', () => {
+  it("owns tab-wide evidence only while the bound leaf is still the tab's sole pane", () => {
+    expect(
+      nativeChatLeafOwnsTabWideEvidence({
+        ownerLeafId: 'leaf-a',
+        leafId: 'leaf-a',
+        leafIds: ['leaf-a']
+      })
+    ).toBe(true)
+    // A split sibling must not inherit the tab's launch draft (issue #16695).
+    expect(
+      nativeChatLeafOwnsTabWideEvidence({
+        ownerLeafId: 'leaf-a',
+        leafId: 'leaf-b',
+        leafIds: ['leaf-a', 'leaf-b']
+      })
+    ).toBe(false)
+    // Not even the original pane keeps it once the tab is split.
+    expect(
+      nativeChatLeafOwnsTabWideEvidence({
+        ownerLeafId: 'leaf-a',
+        leafId: 'leaf-a',
+        leafIds: ['leaf-a', 'leaf-b']
+      })
+    ).toBe(false)
+    expect(
+      nativeChatLeafOwnsTabWideEvidence({
+        ownerLeafId: null,
+        leafId: 'leaf-a',
+        leafIds: ['leaf-a']
+      })
+    ).toBe(false)
+  })
+})
+
 describe('nativeChatLaunchAgentForLeaf', () => {
   it('uses the tab launch hint only for its sole leaf', () => {
     expect(
diff --git a/src/renderer/src/components/native-chat/native-chat-leaf-routing.ts b/src/renderer/src/components/native-chat/native-chat-leaf-routing.ts
index 59c660930c5..2e842b429dc 100644
--- a/src/renderer/src/components/native-chat/native-chat-leaf-routing.ts
+++ b/src/renderer/src/components/native-chat/native-chat-leaf-routing.ts
@@ -44,6 +44,22 @@ export function isNativeChatTabWideFallbackSafe(
   return !layout.activeLeafId || layout.activeLeafId === layout.root.leafId
 }
 
+/** Whether tab-wide launch evidence (agent hint, launch draft) describes this
+ *  leaf: it must still be the tab's sole pane and the one the evidence bound to. */
+export function nativeChatLeafOwnsTabWideEvidence(args: {
+  ownerLeafId: string | null
+  leafId: string | null
+  leafIds: readonly string[]
+}): boolean {
+  const { ownerLeafId, leafId, leafIds } = args
+  if (!ownerLeafId || !leafId) {
+    return false
+  }
+  // Why: the evidence belongs to the tab's original pane. Once a split exists,
+  // it says nothing about any particular sibling.
+  return leafIds.length === 1 && leafIds[0] === leafId && ownerLeafId === leafId
+}
+
 export function nativeChatLaunchAgentForLeaf(args: {
   launchAgent?: TuiAgent | null
   launchAgentLeafId: string | null
@@ -51,12 +67,14 @@ export function nativeChatLaunchAgentForLeaf(args: {
   leafIds: readonly string[]
 }): TuiAgent | null {
   const { launchAgent, launchAgentLeafId, leafId, leafIds } = args
-  if (!launchAgent || !launchAgentLeafId || !leafId) {
+  if (!launchAgent) {
     return null
   }
-  // Why: launchAgent belongs to the tab's original pane. Once a split exists,
-  // it is not evidence that an agent is running in any particular sibling.
-  return leafIds.length === 1 && leafIds[0] === leafId && launchAgentLeafId === leafId
+  return nativeChatLeafOwnsTabWideEvidence({
+    ownerLeafId: launchAgentLeafId,
+    leafId,
+    leafIds
+  })
     ? launchAgent
     : null
 }
diff --git a/src/renderer/src/components/native-chat/native-chat-view-types.ts b/src/renderer/src/components/native-chat/native-chat-view-types.ts
index 4dd9a7bac03..106b29b429d 100644
--- a/src/renderer/src/components/native-chat/native-chat-view-types.ts
+++ b/src/renderer/src/components/native-chat/native-chat-view-types.ts
@@ -25,6 +25,8 @@ export type NativeChatBridgeViewProps = NativeChatOrchestrationProps & {
   launchAgent?: TuiAgent | null
   /** Trusted title/foreground fallback for manually-started agents. */
   resolvedAgent?: TuiAgent | null
+  /** Whether this pane owns the tab's launch draft; false for split siblings. */
+  ownsTabWideLaunchDraft: boolean
   /** Return this pane to the hosted terminal surface. */
   onSwitchToTerminal?: () => void
   /** Current xterm screen reader used to recover agent-reported session state. */
@@ -50,6 +52,7 @@ export type NativeChatResolvedViewProps = NativeChatOrchestrationProps & {
   isVisible: boolean
   targetPtyId: string | null
   terminalTabId: string
+  ownsTabWideLaunchDraft: boolean
   onSwitchToTerminal?: () => void
   readTerminalScreen?: () => string | null
   contextMenuActions?: Omit<NativeChatContextMenuActions, 'onPaste'>
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-message-projection.ts b/src/renderer/src/components/native-chat/structured-agent-session-message-projection.ts
index 9da10c6581a..aebc51c90e0 100644
--- a/src/renderer/src/components/native-chat/structured-agent-session-message-projection.ts
+++ b/src/renderer/src/components/native-chat/structured-agent-session-message-projection.ts
@@ -25,14 +25,12 @@ export function projectStructuredAgentSessionMessages(
     ...projectStructuredItemsToNativeChat(items),
     ...optimistic
       .filter((entry) => !journalled.has(agentJournalSubmissionKey(entry.clientMessageId)))
-      .map(
-        (entry): NativeChatMessage => ({
-          id: agentJournalSubmissionKey(entry.clientMessageId),
-          role: 'user',
-          source: 'transcript',
-          timestamp: entry.queuedAt,
-          blocks: entry.body.blocks
-        })
-      )
+      .map((entry): NativeChatMessage => ({
+        id: agentJournalSubmissionKey(entry.clientMessageId),
+        role: 'user',
+        source: 'transcript',
+        timestamp: entry.queuedAt,
+        blocks: entry.body.blocks
+      }))
   ]
 }
diff --git a/src/renderer/src/components/native-chat/use-native-chat-launch-draft-adoption.test.tsx b/src/renderer/src/components/native-chat/use-native-chat-launch-draft-adoption.test.tsx
index 2c0bfaf6570..71da8b11b60 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-launch-draft-adoption.test.tsx
+++ b/src/renderer/src/components/native-chat/use-native-chat-launch-draft-adoption.test.tsx
@@ -29,11 +29,13 @@ vi.mock('../../store', () => {
   return { useAppStore }
 })
 
+const SEED_TEXT = 'https://github.com/o/r/issues/12'
+
 function launchDraft(overrides: Partial<NativeChatLaunchDraft> = {}): NativeChatLaunchDraft {
   return {
     tabId: 'tab-1',
     agent: 'claude',
-    text: 'https://github.com/o/r/issues/12',
+    text: SEED_TEXT,
     createdAt: 1000,
     ...overrides
   }
@@ -44,6 +46,7 @@ function setup(args: {
   launchDraftResolved?: boolean
   draft?: string
   agent?: string
+  ownsTabWideLaunchDraft?: boolean
 }): { setDraft: ReturnType<typeof vi.fn>; setCaret: ReturnType<typeof vi.fn> } {
   const setDraft = vi.fn()
   const setCaret = vi.fn()
@@ -55,7 +58,8 @@ function setup(args: {
       launchDraftResolved: args.launchDraftResolved ?? false,
       draft: args.draft ?? '',
       setDraft,
-      setCaret
+      setCaret,
+      ownsTabWideLaunchDraft: args.ownsTabWideLaunchDraft ?? true
     })
   )
   return { setDraft, setCaret }
@@ -67,7 +71,10 @@ function userTurn(id: string, timestamp: number | null): NativeChatMessage {
   return { id, role: 'user', blocks: [{ type: 'text', text: id }], timestamp, source: 'transcript' }
 }
 
-type SignalProps = { messages: NativeChatMessage[]; transcriptLoading?: boolean }
+type SignalProps = {
+  messages: NativeChatMessage[]
+  transcriptLoading?: boolean
+}
 
 function renderSignal(messages: NativeChatMessage[], transcriptLoading = false) {
   const initialProps: SignalProps = { messages, transcriptLoading }
@@ -186,6 +193,14 @@ describe('useNativeChatLaunchDraftSignal', () => {
     expect(result.current.launchDraft?.resolved).toBe(true)
   })
 
+  it("selects the tab's seed for every pane so the resolution machine keeps running", () => {
+    // Pane ownership gates the composer *write*, not the signal: nulling it here
+    // would also kill the resolved/cleanup branch for a split tab.
+    const { result } = renderSignal([])
+
+    expect(result.current.launchDraft?.text).toBe(SEED_TEXT)
+  })
+
   it('ignores a draft seeded for another agent', () => {
     mocks.storeState.nativeChatLaunchDraftByTabId = {
       'tab-1': launchDraft({ agent: 'codex', createdAt: SEEDED_AT })
@@ -258,6 +273,21 @@ describe('useNativeChatLaunchDraftAdoption', () => {
     expect(mocks.clearNativeChatLaunchDraft).toHaveBeenCalledWith('tab-1')
   })
 
+  it('does not mirror the seed into a pane that does not own the tab-wide evidence', () => {
+    const { setDraft } = setup({ launchDraft: launchDraft(), ownsTabWideLaunchDraft: false })
+
+    expect(setDraft).not.toHaveBeenCalled()
+    expect(mocks.markNativeChatLaunchDraftAdopted).not.toHaveBeenCalled()
+  })
+
+  it('leaves an unadopted seed alone when a non-owning pane resolves it', () => {
+    // The owner may not have mirrored it yet; a sibling's transcript is no
+    // evidence about the owner's copy.
+    setup({ launchDraft: launchDraft(), launchDraftResolved: true, ownsTabWideLaunchDraft: false })
+
+    expect(mocks.clearNativeChatLaunchDraft).not.toHaveBeenCalled()
+  })
+
   it('drops an unadopted seed once the transcript resolves it', () => {
     const { setDraft } = setup({ launchDraft: launchDraft(), launchDraftResolved: true })
 
@@ -266,3 +296,82 @@ describe('useNativeChatLaunchDraftAdoption', () => {
     expect(mocks.clearNativeChatLaunchDraft).toHaveBeenCalledWith('tab-1')
   })
 })
+
+describe('launch draft adoption across a split', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mocks.storeState.nativeChatLaunchDraftByTabId = {
+      'tab-1': launchDraft({ createdAt: SEEDED_AT })
+    }
+  })
+
+  function renderPaneComposer(args: {
+    ownsTabWideLaunchDraft: boolean
+    draft?: string
+    messages?: NativeChatMessage[]
+  }): { setDraft: ReturnType<typeof vi.fn>; setCaret: ReturnType<typeof vi.fn> } {
+    const setDraft = vi.fn()
+    const setCaret = vi.fn()
+    renderHook(() => {
+      const signal = useNativeChatLaunchDraftSignal({
+        terminalTabId: 'tab-1',
+        agent: 'claude',
+        messages: args.messages ?? [],
+        transcriptLoading: false
+      })
+      useNativeChatLaunchDraftAdoption({
+        terminalTabId: 'tab-1',
+        agent: 'claude',
+        launchDraft: signal.launchDraft,
+        launchDraftResolved: signal.launchDraftResolved,
+        draft: args.draft ?? '',
+        setDraft,
+        setCaret,
+        ownsTabWideLaunchDraft: args.ownsTabWideLaunchDraft
+      })
+    })
+    return { setDraft, setCaret }
+  }
+
+  it("never fills a non-owning pane's composer with the tab's launch draft", () => {
+    const { setDraft } = renderPaneComposer({ ownsTabWideLaunchDraft: false })
+
+    expect(setDraft).not.toHaveBeenCalled()
+    expect(mocks.markNativeChatLaunchDraftAdopted).not.toHaveBeenCalled()
+  })
+
+  it('never lets a non-owning pane destroy a seed nobody has adopted yet', () => {
+    const { setDraft } = renderPaneComposer({
+      ownsTabWideLaunchDraft: false,
+      messages: [userTurn('u1', null)]
+    })
+
+    expect(setDraft).not.toHaveBeenCalled()
+    expect(mocks.clearNativeChatLaunchDraft).not.toHaveBeenCalled()
+  })
+
+  it('still mirrors the launch draft into the owning pane composer', () => {
+    const { setDraft } = renderPaneComposer({ ownsTabWideLaunchDraft: true })
+
+    expect(setDraft).toHaveBeenCalledWith(SEED_TEXT)
+  })
+
+  it('clears the adopted copy after a split once the transcript resolves the seed', () => {
+    // Splitting drops ownership for *both* panes, so the pane that already
+    // mirrored the seed must still clean up — otherwise the submitted prompt
+    // sits in its composer forever and a later Enter re-sends it (#16695).
+    mocks.storeState.nativeChatLaunchDraftByTabId = {
+      'tab-1': launchDraft({ adopted: true, createdAt: SEEDED_AT })
+    }
+
+    const { setDraft, setCaret } = renderPaneComposer({
+      ownsTabWideLaunchDraft: false,
+      draft: SEED_TEXT,
+      messages: [userTurn('u1', null)]
+    })
+
+    expect(setDraft).toHaveBeenCalledWith('')
+    expect(setCaret).toHaveBeenCalledWith(0)
+    expect(mocks.clearNativeChatLaunchDraft).toHaveBeenCalledWith('tab-1')
+  })
+})
diff --git a/src/renderer/src/components/native-chat/use-native-chat-launch-draft-adoption.ts b/src/renderer/src/components/native-chat/use-native-chat-launch-draft-adoption.ts
index f82d5ab1278..2b2e176a30b 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-launch-draft-adoption.ts
+++ b/src/renderer/src/components/native-chat/use-native-chat-launch-draft-adoption.ts
@@ -17,6 +17,9 @@ export function useNativeChatLaunchDraftSignal(args: {
    *  session's real history. Same gate mobile's drafts hook uses. */
   transcriptLoading?: boolean
 }): { launchDraft: NativeChatLaunchDraft | null; launchDraftResolved: boolean } {
+  // Deliberately pane-agnostic: pane ownership gates the composer *write* in
+  // useNativeChatLaunchDraftAdoption. Nulling the seed here would also strand a
+  // copy an owning pane already mirrored, since the adoption effect early-returns.
   const launchDraft = useAppStore((s) => s.nativeChatLaunchDraftByTabId[args.terminalTabId] ?? null)
   const paneLaunchDraft = launchDraft?.agent === args.agent ? launchDraft : null
   const messages = args.messages
@@ -66,10 +69,11 @@ export function useNativeChatLaunchDraftSignal(args: {
  * transcript shows the TUI-side copy was resolved (submitted or cleared).
  *
  * State machine per seeded draft:
- * - unadopted + composer empty  → copy text into the composer, mark adopted
- * - unadopted + composer in use → mark adopted without copying (never stomp)
- * - resolved by transcript      → clear the seed; also clear the composer copy
- *                                 only when it is still the untouched seed text
+ * - unadopted + not the owning pane → ignore (the seed is keyed by tab; #16695)
+ * - unadopted + composer empty      → copy text into the composer, mark adopted
+ * - unadopted + composer in use     → mark adopted without copying (never stomp)
+ * - resolved by transcript          → clear the composer copy while it is still
+ *                                     the untouched seed text, and drop the seed
  */
 export function useNativeChatLaunchDraftAdoption(args: {
   terminalTabId: string
@@ -79,23 +83,47 @@ export function useNativeChatLaunchDraftAdoption(args: {
   draft: string
   setDraft: (next: string) => void
   setCaret: (next: number) => void
+  /** This pane is the tab-wide evidence's owner (`nativeChatLeafOwnsTabWideEvidence`).
+   *  Splitting drops it for every pane, so it gates pickup, never cleanup. */
+  ownsTabWideLaunchDraft: boolean
 }): void {
-  const { terminalTabId, agent, launchDraft, launchDraftResolved, draft, setDraft, setCaret } = args
+  const {
+    terminalTabId,
+    agent,
+    launchDraft,
+    launchDraftResolved,
+    draft,
+    setDraft,
+    setCaret,
+    ownsTabWideLaunchDraft
+  } = args
   useEffect(() => {
     if (!launchDraft || launchDraft.agent !== agent) {
       return
     }
     if (launchDraftResolved) {
-      if (launchDraft.adopted && draft === launchDraft.text) {
+      // Cleanup must survive a split: ownership is gone for both panes by then,
+      // so the pane still holding the untouched copy is the one that cleans up.
+      const holdsUntouchedCopy = launchDraft.adopted && draft === launchDraft.text
+      if (holdsUntouchedCopy) {
         setDraft('')
         setCaret(0)
       }
-      useAppStore.getState().clearNativeChatLaunchDraft(terminalTabId)
+      // A pane that neither owns the seed nor holds its copy has no standing to
+      // drop it — the owning pane may not have mirrored it yet.
+      if (ownsTabWideLaunchDraft || holdsUntouchedCopy) {
+        useAppStore.getState().clearNativeChatLaunchDraft(terminalTabId)
+      }
       return
     }
     if (launchDraft.adopted) {
       return
     }
+    // #16695: the seed describes the tab's original sole pane, so once a split
+    // exists no pane may mirror it into a composer.
+    if (!ownsTabWideLaunchDraft) {
+      return
+    }
     // Mark adopted before copying so a composer that already holds user text
     // declines the seed permanently instead of resurrecting it on a later clear.
     useAppStore.getState().markNativeChatLaunchDraftAdopted(terminalTabId)
@@ -103,5 +131,14 @@ export function useNativeChatLaunchDraftAdoption(args: {
       setDraft(launchDraft.text)
       setCaret(launchDraft.text.length)
     }
-  }, [agent, draft, launchDraft, launchDraftResolved, setCaret, setDraft, terminalTabId])
+  }, [
+    agent,
+    draft,
+    launchDraft,
+    launchDraftResolved,
+    ownsTabWideLaunchDraft,
+    setCaret,
+    setDraft,
+    terminalTabId
+  ])
 }
diff --git a/src/renderer/src/components/provider-check-classification-parity.test.ts b/src/renderer/src/components/provider-check-classification-parity.test.ts
index bedb0663739..5e10ad5f1c9 100644
--- a/src/renderer/src/components/provider-check-classification-parity.test.ts
+++ b/src/renderer/src/components/provider-check-classification-parity.test.ts
@@ -23,16 +23,14 @@ function completed(conclusion: string): PRCheckDetail {
 
 function gitLabJobs(...statuses: string[]): PRCheckDetail[] {
   return gitLabPipelineJobsToPRChecks(
-    statuses.map(
-      (status, index): GitLabPipelineJob => ({
-        id: index,
-        name: status,
-        stage: 'deploy',
-        status,
-        webUrl: '',
-        duration: null
-      })
-    )
+    statuses.map((status, index): GitLabPipelineJob => ({
+      id: index,
+      name: status,
+      stage: 'deploy',
+      status,
+      webUrl: '',
+      duration: null
+    }))
   )
 }
 
diff --git a/src/renderer/src/components/right-sidebar/PortsPanel.tsx b/src/renderer/src/components/right-sidebar/PortsPanel.tsx
index 2f481e8014d..571086d6596 100644
--- a/src/renderer/src/components/right-sidebar/PortsPanel.tsx
+++ b/src/renderer/src/components/right-sidebar/PortsPanel.tsx
@@ -1,152 +1,15 @@
-/* oxlint-disable max-lines -- Why: co-locates forwarded list, detected list, modal form, and
-per-entry actions in one file to keep the data flow straightforward. */
-import React, { useCallback, useMemo, useState } from 'react'
-import {
-  ExternalLink,
-  Copy,
-  Trash2,
-  Plus,
-  Unplug,
-  ChevronRight,
-  Pencil,
-  RefreshCw,
-  Server,
-  Box,
-  Info
-} from 'lucide-react'
-import { toast } from 'sonner'
-import { useAppStore } from '@/store'
+import React from 'react'
 import { useActiveWorktree, useRepoById } from '@/store/selectors'
-import { cn } from '@/lib/utils'
-import { getActiveRuntimeTarget } from '@/runtime/runtime-rpc-client'
-import { getRuntimeEnvironmentIdForWorktree } from '@/lib/worktree-runtime-owner'
-import {
-  killWorkspacePortForTarget,
-  getPortOpenBrowserTooltipLabel,
-  openWorkspacePortInBrowser,
-  refreshWorkspacePortScanAfterStop,
-  resolvePortOpenInOrcaBrowser,
-  scanWorkspacePortsForTarget,
-  workspacePortRuntimeTargetKey
-} from '@/lib/workspace-port-actions'
-import {
-  addressForPort,
-  addressForPortForwardEntry,
-  advertisedBrowserUrlForDetectedPort,
-  advertisedBrowserUrlForForwardedRow,
-  browserUrlForPortForwardEntry
-} from '@/lib/workspace-port-urls'
-import { resolveLocalhostLabelRouteForPort } from '@/lib/workspace-port-localhost-label-selector'
-import { useMountedRef } from '@/hooks/useMountedRef'
-import {
-  Dialog,
-  DialogContent,
-  DialogHeader,
-  DialogTitle,
-  DialogDescription
-} from '@/components/ui/dialog'
-import { Button } from '@/components/ui/button'
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip'
-import {
-  ContextMenu,
-  ContextMenuContent,
-  ContextMenuItem,
-  ContextMenuLabel,
-  ContextMenuSeparator,
-  ContextMenuTrigger
-} from '@/components/ui/context-menu'
-import type { PortForwardEntry, EnrichedDetectedPort } from '../../../../shared/ssh-types'
-import type { WorkspacePort } from '../../../../shared/workspace-ports'
-import { translate } from '@/i18n/i18n'
-import { openWorkspaceBrowserTab } from '@/lib/workspace-browser-tab-open'
+import { LocalWorkspacePortsPanel } from './local-workspace-ports-panel'
+import { SshPortsPanel } from './ssh-ports-panel'
 
+export { getLocalWorkspacePortSections } from './local-workspace-port-sections'
 export {
   killWorkspacePortForTarget,
   openWorkspacePortInBrowser,
   scanWorkspacePortsForTarget
 } from '@/lib/workspace-port-actions'
 
-export function getLocalWorkspacePortSections(
-  scan: { ports: WorkspacePort[] } | null | undefined,
-  activeRepoId: string | null | undefined,
-  activeWorktreeId: string | null | undefined
-): {
-  activePorts: WorkspacePort[]
-  otherWorkspacePorts: WorkspacePort[]
-  externalPorts: WorkspacePort[]
-} {
-  const ports = scan?.ports ?? []
-  return {
-    activePorts: ports.filter(
-      (port) =>
-        port.kind === 'workspace' &&
-        port.owner.repoId === activeRepoId &&
-        port.owner.worktreeId === activeWorktreeId
-    ),
-    otherWorkspacePorts: ports.filter(
-      (port) =>
-        port.kind === 'workspace' &&
-        port.owner.repoId === activeRepoId &&
-        port.owner.worktreeId !== activeWorktreeId
-    ),
-    // Why: the old repo-scoped scan showed listeners from other repos as
-    // External, without workspace-only actions or cross-worktree activation.
-    // Keep that behavior now that the shared scan can attribute them globally.
-    externalPorts: ports.flatMap((port) => {
-      if (port.kind !== 'workspace') {
-        return [port]
-      }
-      return port.owner.repoId === activeRepoId ? [] : [workspacePortAsExternal(port)]
-    })
-  }
-}
-
-function workspacePortAsExternal(port: WorkspacePort & { kind: 'workspace' }): WorkspacePort {
-  return {
-    id: port.id,
-    bindHost: port.bindHost,
-    connectHost: port.connectHost,
-    port: port.port,
-    pid: port.pid,
-    processName: port.processName,
-    protocol: port.protocol,
-    kind: 'external'
-  }
-}
-
-const LOCAL_PORT_MENU_CONTENT_CLASS =
-  '!rounded-md !border-border/60 !bg-popover !text-popover-foreground !shadow-[0_10px_24px_rgba(0,0,0,0.18)] !backdrop-blur-none'
-const LOCAL_PORT_MENU_ITEM_CLASS =
-  'rounded-md focus:bg-accent focus:text-accent-foreground dark:focus:bg-accent'
-const LOCAL_PORT_MENU_LABEL_CLASS = 'px-2 py-1 text-[11px] font-semibold text-muted-foreground'
-
-// Why: ports < 1024 require root to bind on the local machine. Remap them
-// to a high port so the default "Forward" action doesn't fail with EACCES.
-function safeLocalPort(remotePort: number): number {
-  if (remotePort < 1024) {
-    return remotePort + 10000
-  }
-  return remotePort
-}
-
-// Why: forwarded SSH ports and detected remote ports may report the same loopback
-// endpoint using different textual hosts. Normalize for deduping only.
-const LOOPBACK_HOSTS = new Set(['localhost', '127.0.0.1', '::1', '0.0.0.0', '::'])
-function normalizeHost(host: string | undefined): string {
-  if (!host || LOOPBACK_HOSTS.has(host)) {
-    return 'localhost'
-  }
-  return host
-}
-
-type PortForwardDialogState =
-  | { mode: 'closed' }
-  | {
-      mode: 'add'
-      defaults: { remotePort?: number; remoteHost?: string; label?: string; targetId?: string }
-    }
-  | { mode: 'edit'; entry: PortForwardEntry }
-
 export default function PortsPanel({ isVisible }: { isVisible: boolean }): React.JSX.Element {
   const activeWorktree = useActiveWorktree()
   const activeRepo = useRepoById(activeWorktree?.repoId ?? null)
@@ -157,1364 +20,3 @@ export default function PortsPanel({ isVisible }: { isVisible: boolean }): React
 
   return <LocalWorkspacePortsPanel isVisible={isVisible} />
 }
-
-function LocalWorkspacePortsPanel({ isVisible }: { isVisible: boolean }): React.JSX.Element {
-  const activeWorktree = useActiveWorktree()
-  const activeRepo = useRepoById(activeWorktree?.repoId ?? null)
-  const settings = useAppStore((s) => s.settings)
-  const createBrowserTab = useAppStore((s) => s.createBrowserTab)
-  const setRemoteBrowserPageHandle = useAppStore((s) => s.setRemoteBrowserPageHandle)
-  const scansByKey = useAppStore((s) => s.workspacePortScansByKey)
-  const refreshing = useAppStore((s) => s.workspacePortScanRefreshing)
-  const setWorkspacePortScan = useAppStore((s) => s.setWorkspacePortScan)
-  const setWorkspacePortScanForKey = useAppStore((s) => s.setWorkspacePortScanForKey)
-  const setWorkspacePortScanRefreshing = useAppStore((s) => s.setWorkspacePortScanRefreshing)
-  const [detailsPort, setDetailsPort] = useState<WorkspacePort | null>(null)
-  const [collapsedSections, setCollapsedSections] = useState<Record<string, boolean>>({
-    other: true,
-    external: true
-  })
-
-  const runtimeTarget = useMemo(() => {
-    const activeRuntimeEnvironmentId = getRuntimeEnvironmentIdForWorktree(
-      useAppStore.getState(),
-      activeWorktree?.id
-    )
-    // Why: the Ports panel acts on the active workspace; use that workspace's
-    // host owner even if the sidebar is focused elsewhere.
-    return getActiveRuntimeTarget({ ...settings, activeRuntimeEnvironmentId })
-  }, [activeWorktree?.id, settings])
-  const scanKey = `${workspacePortRuntimeTargetKey(runtimeTarget)}:all`
-
-  const refresh = useCallback(() => {
-    if (!activeRepo) {
-      return Promise.resolve()
-    }
-    setWorkspacePortScanRefreshing(true)
-    const promise = scanWorkspacePortsForTarget(runtimeTarget)
-      .then((nextScan) => {
-        setWorkspacePortScanForKey(scanKey, nextScan)
-        setWorkspacePortScan({ key: scanKey, result: nextScan })
-      })
-      .catch((error) => {
-        const message = error instanceof Error ? error.message : String(error)
-        toast.error(
-          translate(
-            'auto.components.right.sidebar.PortsPanel.a00f3a2840',
-            'Failed to refresh ports'
-          ),
-          {
-            description:
-              message ||
-              translate(
-                'auto.components.right.sidebar.PortsPanel.740aca88ab',
-                'Workspace port scan failed.'
-              )
-          }
-        )
-      })
-      .finally(() => {
-        setWorkspacePortScanRefreshing(false)
-      })
-    return promise
-  }, [
-    activeRepo,
-    runtimeTarget,
-    scanKey,
-    setWorkspacePortScan,
-    setWorkspacePortScanForKey,
-    setWorkspacePortScanRefreshing
-  ])
-
-  // Why: WorkspacePortScanner already owns the 30s all-worktree poll. The
-  // panel scopes that shared result instead of starting a second scan loop.
-  const displayScan = isVisible ? (scansByKey[scanKey] ?? null) : null
-
-  const toggleSection = useCallback((sectionId: string) => {
-    setCollapsedSections((current) => ({ ...current, [sectionId]: !current[sectionId] }))
-  }, [])
-
-  const handleStopPort = useCallback(
-    async (port: WorkspacePort) => {
-      if (!activeRepo || !port.pid) {
-        return
-      }
-      const result = await killWorkspacePortForTarget(runtimeTarget, {
-        repoId: activeRepo.id,
-        pid: port.pid,
-        port: port.port
-      })
-      if (!result.ok) {
-        toast.error(result.reason)
-        return
-      }
-      toast.success(
-        translate(
-          'auto.components.right.sidebar.PortsPanel.97b562d21d',
-          'Stopped process on :{{value0}}',
-          { value0: port.port }
-        )
-      )
-      const refreshResult = await refreshWorkspacePortScanAfterStop({
-        runtimeTarget,
-        setWorkspacePortScan,
-        setWorkspacePortScanForKey,
-        getWorkspacePortScansByKey: () => useAppStore.getState().workspacePortScansByKey,
-        setWorkspacePortScanRefreshing
-      })
-      if (!refreshResult.ok) {
-        toast.error(
-          translate(
-            'auto.components.right.sidebar.PortsPanel.a00f3a2840',
-            'Failed to refresh ports'
-          ),
-          {
-            description: refreshResult.reason
-          }
-        )
-      }
-    },
-    [
-      activeRepo,
-      runtimeTarget,
-      setWorkspacePortScan,
-      setWorkspacePortScanForKey,
-      setWorkspacePortScanRefreshing
-    ]
-  )
-
-  const handleOpenPortInBrowser = useCallback(
-    async (port: WorkspacePort, event?: React.MouseEvent<HTMLButtonElement>) => {
-      const result = await openWorkspacePortInBrowser({
-        port,
-        activeWorktreeId: activeWorktree?.id,
-        runtimeTarget,
-        createBrowserTab,
-        setRemoteBrowserPageHandle,
-        openInOrcaBrowser: resolvePortOpenInOrcaBrowser({
-          settings,
-          event,
-          isMac: navigator.userAgent.includes('Mac')
-        }),
-        localhostLabelRoute: resolveLocalhostLabelRouteForPort(useAppStore.getState(), port)
-      })
-      if (!result.ok) {
-        toast.error(
-          translate(
-            'auto.components.right.sidebar.PortsPanel.98e9a414f8',
-            'Failed to open browser'
-          ),
-          { description: result.reason }
-        )
-      }
-    },
-    [activeWorktree?.id, createBrowserTab, runtimeTarget, setRemoteBrowserPageHandle, settings]
-  )
-
-  const { activePorts, otherWorkspacePorts, externalPorts } = useMemo(
-    () => getLocalWorkspacePortSections(displayScan, activeRepo?.id, activeWorktree?.id),
-    [activeRepo?.id, activeWorktree?.id, displayScan]
-  )
-
-  if (!activeRepo) {
-    return (
-      <div className="flex flex-col items-center justify-center h-full px-4 text-center text-muted-foreground">
-        <Server size={32} className="mb-3 opacity-50" />
-        <p className="text-sm">
-          {translate(
-            'auto.components.right.sidebar.PortsPanel.c1b115c375',
-            'No workspace selected'
-          )}
-        </p>
-      </div>
-    )
-  }
-
-  return (
-    <div className="flex flex-col h-full overflow-y-auto scrollbar-sleek">
-      <div className="flex items-center justify-between px-3 py-2 border-b border-border">
-        <span className="text-[11px] font-semibold uppercase tracking-wider text-muted-foreground">
-          {translate('auto.components.right.sidebar.PortsPanel.6bc058dbe1', 'Ports')}
-        </span>
-        <Tooltip>
-          <TooltipTrigger asChild>
-            <Button
-              type="button"
-              variant="ghost"
-              size="icon-xs"
-              className="text-muted-foreground hover:text-foreground"
-              onClick={() => void refresh()}
-              disabled={refreshing}
-              aria-label={translate(
-                'auto.components.right.sidebar.PortsPanel.7822e3edc6',
-                'Refresh Ports'
-              )}
-            >
-              <RefreshCw size={14} className={cn(refreshing && 'animate-spin')} />
-            </Button>
-          </TooltipTrigger>
-          <TooltipContent side="top" sideOffset={4}>
-            {translate('auto.components.right.sidebar.PortsPanel.7822e3edc6', 'Refresh Ports')}
-          </TooltipContent>
-        </Tooltip>
-      </div>
-
-      {displayScan?.unavailableReason && (
-        <div className="px-3 py-2 text-xs text-muted-foreground border-b border-border">
-          {translate(
-            'auto.components.right.sidebar.PortsPanel.f59c783b7a',
-            'Port scan unavailable on {{value0}}: {{value1}}',
-            {
-              value0: displayScan.platform,
-              value1: displayScan.unavailableReason
-            }
-          )}
-        </div>
-      )}
-
-      {!displayScan?.unavailableReason && (
-        <>
-          <LocalPortSection
-            id="active"
-            title={translate(
-              'auto.components.right.sidebar.PortsPanel.935dda7718',
-              'Active Workspace'
-            )}
-            ports={activePorts}
-            emptyText={
-              refreshing && !displayScan
-                ? translate('auto.components.right.sidebar.PortsPanel.0d63d94db3', 'Scanning...')
-                : translate(
-                    'auto.components.right.sidebar.PortsPanel.38b16cfbef',
-                    'No ports detected'
-                  )
-            }
-            collapsed={collapsedSections.active ?? false}
-            onToggle={() => toggleSection('active')}
-            onStopPort={(port) => void handleStopPort(port)}
-            onShowDetails={setDetailsPort}
-            onOpenInBrowser={handleOpenPortInBrowser}
-          />
-          <LocalPortSection
-            id="other"
-            title={translate(
-              'auto.components.right.sidebar.PortsPanel.4db4b5e435',
-              'Other Workspaces'
-            )}
-            ports={otherWorkspacePorts}
-            collapsed={collapsedSections.other ?? false}
-            onToggle={() => toggleSection('other')}
-            onStopPort={(port) => void handleStopPort(port)}
-            onShowDetails={setDetailsPort}
-            onOpenInBrowser={handleOpenPortInBrowser}
-          />
-          <LocalPortSection
-            id="external"
-            title={translate('auto.components.right.sidebar.PortsPanel.d32820d3e2', 'External')}
-            ports={externalPorts}
-            collapsed={collapsedSections.external ?? false}
-            onToggle={() => toggleSection('external')}
-            onStopPort={(port) => void handleStopPort(port)}
-            onShowDetails={setDetailsPort}
-            onOpenInBrowser={handleOpenPortInBrowser}
-          />
-        </>
-      )}
-
-      {!displayScan?.unavailableReason &&
-        displayScan &&
-        activePorts.length === 0 &&
-        otherWorkspacePorts.length === 0 &&
-        externalPorts.length === 0 && (
-          <div className="flex flex-col items-center justify-center flex-1 px-4 text-center text-muted-foreground">
-            <Server size={32} className="mb-3 opacity-50" />
-            <p className="text-sm">
-              {translate(
-                'auto.components.right.sidebar.PortsPanel.a2a9fc6899',
-                'No local ports detected'
-              )}
-            </p>
-          </div>
-        )}
-
-      <LocalPortDetailsDialog port={detailsPort} onClose={() => setDetailsPort(null)} />
-    </div>
-  )
-}
-
-function LocalPortSection({
-  id,
-  title,
-  ports,
-  emptyText,
-  collapsed,
-  onToggle,
-  onStopPort,
-  onShowDetails,
-  onOpenInBrowser
-}: {
-  id: string
-  title: string
-  ports: WorkspacePort[]
-  emptyText?: string
-  collapsed: boolean
-  onToggle: () => void
-  onStopPort: (port: WorkspacePort) => void
-  onShowDetails: (port: WorkspacePort) => void
-  onOpenInBrowser: (port: WorkspacePort, event?: React.MouseEvent<HTMLButtonElement>) => void
-}): React.JSX.Element | null {
-  if (ports.length === 0 && !emptyText) {
-    return null
-  }
-
-  return (
-    <div className="px-3 pt-2">
-      <button
-        type="button"
-        className="sticky top-0 z-10 mb-1 flex w-full items-center gap-1 border-b border-border/40 bg-background py-1 text-left text-muted-foreground transition-colors hover:text-foreground"
-        onClick={onToggle}
-        aria-expanded={!collapsed}
-        aria-controls={`local-port-section-${id}`}
-      >
-        <ChevronRight
-          size={12}
-          className={cn('shrink-0 transition-transform', !collapsed && 'rotate-90')}
-        />
-        <span className="text-[10px] font-semibold uppercase tracking-wider text-muted-foreground">
-          {title}
-        </span>
-        {ports.length > 0 && (
-          <span className="text-[10px] text-muted-foreground/60 ml-1">{ports.length}</span>
-        )}
-      </button>
-      {!collapsed && (
-        <div id={`local-port-section-${id}`}>
-          {ports.length > 0
-            ? ports.map((port) => (
-                <LocalPortRow
-                  key={port.id}
-                  port={port}
-                  onStop={onStopPort}
-                  onShowDetails={onShowDetails}
-                  onOpenInBrowser={onOpenInBrowser}
-                />
-              ))
-            : emptyText && <div className="py-1 text-xs text-muted-foreground">{emptyText}</div>}
-        </div>
-      )}
-    </div>
-  )
-}
-
-function LocalPortRow({
-  port,
-  onStop,
-  onShowDetails,
-  onOpenInBrowser
-}: {
-  port: WorkspacePort
-  onStop: (port: WorkspacePort) => void
-  onShowDetails: (port: WorkspacePort) => void
-  onOpenInBrowser: (port: WorkspacePort, event?: React.MouseEvent<HTMLButtonElement>) => void
-}): React.JSX.Element {
-  const handleCopy = useCallback(() => {
-    void window.api.ui.writeClipboardText(addressForPort(port))
-  }, [port])
-
-  const handleOpenBrowser = useCallback(
-    (event?: React.MouseEvent<HTMLButtonElement>) => {
-      void onOpenInBrowser(port, event)
-    },
-    [onOpenInBrowser, port]
-  )
-
-  const handleCopyButtonClick = useCallback(
-    (event: React.MouseEvent<HTMLButtonElement>) => {
-      handleCopy()
-      if (event.detail > 0) {
-        event.currentTarget.blur()
-      }
-    },
-    [handleCopy]
-  )
-
-  const handleOpenBrowserButtonClick = useCallback(
-    (event: React.MouseEvent<HTMLButtonElement>) => {
-      // Why: keyboard activations have detail=0; only pointer clicks carry
-      // the modifier intent for the system-browser escape hatch.
-      handleOpenBrowser(event.detail > 0 ? event : undefined)
-      if (event.detail > 0) {
-        event.currentTarget.blur()
-      }
-    },
-    [handleOpenBrowser]
-  )
-
-  const handleStopButtonClick = useCallback(
-    (event: React.MouseEvent<HTMLButtonElement>) => {
-      onStop(port)
-      if (event.detail > 0) {
-        event.currentTarget.blur()
-      }
-    },
-    [onStop, port]
-  )
-
-  const processLabel = port.processName ?? (port.pid ? `PID ${port.pid}` : 'Unknown process')
-  const address = addressForPort(port)
-  const ownerLabel =
-    port.kind === 'workspace'
-      ? port.owner.displayName
-      : port.kind === 'container'
-        ? 'Container or forwarded service'
-        : 'Unassigned'
-  const openBrowserLabel = translate(
-    'auto.components.right.sidebar.PortsPanel.b22b128b2a',
-    'Open in Browser'
-  )
-  const confidenceLabel =
-    port.kind === 'workspace' ? (port.owner.confidence === 'cwd' ? 'cwd' : 'command') : null
-  const canStopProcess =
-    port.kind === 'workspace' && Boolean(port.pid) && port.processName !== 'Electron'
-
-  return (
-    <ContextMenu>
-      <div className="group flex items-center gap-2 py-1 px-1 -mx-1 rounded hover:bg-accent/50 transition-colors">
-        <ContextMenuTrigger asChild>
-          <div
-            className="flex min-w-0 flex-1 items-center gap-2 rounded focus:outline-none focus-visible:ring-1 focus-visible:ring-ring"
-            tabIndex={0}
-            aria-label={translate(
-              'auto.components.right.sidebar.PortsPanel.5be4f7f727',
-              'Port {{value0}} menu',
-              { value0: port.port }
-            )}
-          >
-            <div className="flex size-5 shrink-0 items-center justify-center text-muted-foreground">
-              {port.kind === 'container' ? <Box size={13} /> : <Server size={13} />}
-            </div>
-            <div className="min-w-0 flex-1">
-              <div className="flex min-w-0 items-center gap-1.5">
-                <span className="text-xs font-medium text-foreground">:{port.port}</span>
-                <span className="truncate text-xs text-muted-foreground">{processLabel}</span>
-              </div>
-              <div className="flex min-w-0 items-center gap-1.5 text-[11px] text-muted-foreground">
-                <span className="truncate">{address}</span>
-              </div>
-              <div className="flex min-w-0 items-center gap-1.5 text-[10px] text-muted-foreground/70">
-                <span className="truncate">{ownerLabel}</span>
-                {confidenceLabel && (
-                  <span className="shrink-0 text-muted-foreground/70">{confidenceLabel}</span>
-                )}
-              </div>
-            </div>
-          </div>
-        </ContextMenuTrigger>
-        <TooltipProvider delayDuration={400}>
-          <div className="flex items-center gap-0.5 can-hover:opacity-0 group-hover:opacity-100 group-focus-within:opacity-100 transition-opacity">
-            <Tooltip>
-              <TooltipTrigger asChild>
-                <Button
-                  type="button"
-                  variant="ghost"
-                  size="icon-xs"
-                  className="text-muted-foreground hover:text-foreground"
-                  onClick={handleOpenBrowserButtonClick}
-                  aria-label={openBrowserLabel}
-                >
-                  <ExternalLink size={13} />
-                </Button>
-              </TooltipTrigger>
-              <TooltipContent side="top" sideOffset={4}>
-                {getPortOpenBrowserTooltipLabel(openBrowserLabel)}
-              </TooltipContent>
-            </Tooltip>
-            <Tooltip>
-              <TooltipTrigger asChild>
-                <Button
-                  type="button"
-                  variant="ghost"
-                  size="icon-xs"
-                  className="text-muted-foreground hover:text-foreground"
-                  onClick={handleCopyButtonClick}
-                  aria-label={translate(
-                    'auto.components.right.sidebar.PortsPanel.fe2730d050',
-                    'Copy {{value0}}',
-                    { value0: address }
-                  )}
-                >
-                  <Copy size={13} />
-                </Button>
-              </TooltipTrigger>
-              <TooltipContent side="top" sideOffset={4}>
-                {translate(
-                  'auto.components.right.sidebar.PortsPanel.1004af16ab',
-                  'Copy {{value0}}',
-                  { value0: address }
-                )}
-              </TooltipContent>
-            </Tooltip>
-            {canStopProcess && (
-              <Tooltip>
-                <TooltipTrigger asChild>
-                  <Button
-                    type="button"
-                    variant="ghost"
-                    size="icon-xs"
-                    className="text-muted-foreground hover:text-destructive"
-                    onClick={handleStopButtonClick}
-                    aria-label={translate(
-                      'auto.components.right.sidebar.PortsPanel.f9528da632',
-                      'Stop Process'
-                    )}
-                  >
-                    <Trash2 size={13} />
-                  </Button>
-                </TooltipTrigger>
-                <TooltipContent side="top" sideOffset={4}>
-                  {translate('auto.components.right.sidebar.PortsPanel.f9528da632', 'Stop Process')}
-                </TooltipContent>
-              </Tooltip>
-            )}
-          </div>
-        </TooltipProvider>
-      </div>
-      <ContextMenuContent className={LOCAL_PORT_MENU_CONTENT_CLASS}>
-        <ContextMenuLabel
-          className={LOCAL_PORT_MENU_LABEL_CLASS}
-        >{`:${port.port}`}</ContextMenuLabel>
-        <ContextMenuItem
-          className={LOCAL_PORT_MENU_ITEM_CLASS}
-          onSelect={() => handleOpenBrowser()}
-        >
-          <ExternalLink size={13} />
-          {openBrowserLabel}
-        </ContextMenuItem>
-        <ContextMenuItem className={LOCAL_PORT_MENU_ITEM_CLASS} onSelect={handleCopy}>
-          <Copy size={13} />
-          {translate('auto.components.right.sidebar.PortsPanel.792baeb7ed', 'Copy Address')}
-        </ContextMenuItem>
-        <ContextMenuItem
-          className={LOCAL_PORT_MENU_ITEM_CLASS}
-          onSelect={() => {
-            void window.api.ui.writeClipboardText(JSON.stringify(port, null, 2))
-          }}
-        >
-          <Copy size={13} />
-          {translate('auto.components.right.sidebar.PortsPanel.bdac206faf', 'Copy Details')}
-        </ContextMenuItem>
-        <ContextMenuItem
-          className={LOCAL_PORT_MENU_ITEM_CLASS}
-          onSelect={() => onShowDetails(port)}
-        >
-          <Info size={13} />
-          {translate('auto.components.right.sidebar.PortsPanel.a223459512', 'Show Details')}
-        </ContextMenuItem>
-        <ContextMenuSeparator />
-        <ContextMenuItem
-          className={LOCAL_PORT_MENU_ITEM_CLASS}
-          variant="destructive"
-          disabled={!canStopProcess}
-          onSelect={() => onStop(port)}
-        >
-          <Trash2 size={13} />
-          {translate('auto.components.right.sidebar.PortsPanel.f9528da632', 'Stop Process')}
-        </ContextMenuItem>
-      </ContextMenuContent>
-    </ContextMenu>
-  )
-}
-
-function LocalPortDetailsDialog({
-  port,
-  onClose
-}: {
-  port: WorkspacePort | null
-  onClose: () => void
-}): React.JSX.Element {
-  return (
-    <Dialog open={Boolean(port)} onOpenChange={(open) => !open && onClose()}>
-      <DialogContent>
-        <DialogHeader>
-          <DialogTitle>
-            {port
-              ? translate(
-                  'auto.components.right.sidebar.PortsPanel.472054d94c',
-                  'Port :{{value0}}',
-                  { value0: port.port }
-                )
-              : translate('auto.components.right.sidebar.PortsPanel.d41a8241ec', 'Port')}
-          </DialogTitle>
-          <DialogDescription>
-            {port ? `${port.processName ?? 'Unknown process'} · ${addressForPort(port)}` : ''}
-          </DialogDescription>
-        </DialogHeader>
-        {port && (
-          <dl className="grid grid-cols-[88px_1fr] gap-x-3 gap-y-2 text-xs">
-            <dt className="text-muted-foreground">
-              {translate('auto.components.right.sidebar.PortsPanel.1c1c18cefc', 'Address')}
-            </dt>
-            <dd className="min-w-0 break-all text-foreground">{addressForPort(port)}</dd>
-            <dt className="text-muted-foreground">
-              {translate('auto.components.right.sidebar.PortsPanel.0f1d8cd324', 'Bind')}
-            </dt>
-            <dd className="min-w-0 break-all text-foreground">{`${port.bindHost}:${port.port}`}</dd>
-            <dt className="text-muted-foreground">
-              {translate('auto.components.right.sidebar.PortsPanel.729be0b4e5', 'Kind')}
-            </dt>
-            <dd className="text-foreground">{port.kind}</dd>
-            <dt className="text-muted-foreground">
-              {translate('auto.components.right.sidebar.PortsPanel.b1ff94fa27', 'Protocol')}
-            </dt>
-            <dd className="text-foreground">{port.protocol}</dd>
-            <dt className="text-muted-foreground">
-              {translate('auto.components.right.sidebar.PortsPanel.5dd86dcf2f', 'Process')}
-            </dt>
-            <dd className="min-w-0 break-all text-foreground">
-              {port.processName ??
-                translate('auto.components.right.sidebar.PortsPanel.3e13cb63ee', 'Unknown')}
-            </dd>
-            <dt className="text-muted-foreground">
-              {translate('auto.components.right.sidebar.PortsPanel.57d930fa45', 'PID')}
-            </dt>
-            <dd className="text-foreground">
-              {port.pid ??
-                translate('auto.components.right.sidebar.PortsPanel.3e13cb63ee', 'Unknown')}
-            </dd>
-            {port.kind === 'workspace' && (
-              <>
-                <dt className="text-muted-foreground">
-                  {translate('auto.components.right.sidebar.PortsPanel.c7b4702b7b', 'Workspace')}
-                </dt>
-                <dd className="min-w-0 break-all text-foreground">{port.owner.displayName}</dd>
-                <dt className="text-muted-foreground">
-                  {translate('auto.components.right.sidebar.PortsPanel.153145e675', 'Evidence')}
-                </dt>
-                <dd className="text-foreground">{port.owner.confidence}</dd>
-              </>
-            )}
-          </dl>
-        )}
-      </DialogContent>
-    </Dialog>
-  )
-}
-
-function SshPortsPanel(): React.JSX.Element {
-  const settings = useAppStore((s) => s.settings)
-  const portForwardsByConnection = useAppStore((s) => s.portForwardsByConnection)
-  const detectedPortsByConnection = useAppStore((s) => s.detectedPortsByConnection)
-  const sshConnectionStates = useAppStore((s) => s.sshConnectionStates)
-  // Why: scope the panel to the active worktree's SSH connection so
-  // actions target the correct machine and the disconnected state
-  // reflects the active worktree, not some other SSH session.
-  const activeWorktree = useActiveWorktree()
-  const activeRepo = useRepoById(activeWorktree?.repoId ?? null)
-  const activeConnectionId = activeRepo?.connectionId ?? null
-
-  const isDisconnected = activeConnectionId
-    ? sshConnectionStates.get(activeConnectionId)?.status !== 'connected'
-    : true
-
-  const allForwards = useMemo(() => {
-    if (!activeConnectionId) {
-      return []
-    }
-    return portForwardsByConnection[activeConnectionId] ?? []
-  }, [portForwardsByConnection, activeConnectionId])
-
-  const forwardedKeys = useMemo(() => {
-    const set = new Set<string>()
-    for (const f of allForwards) {
-      set.add(`${normalizeHost(f.remoteHost)}:${f.remotePort}`)
-    }
-    return set
-  }, [allForwards])
-
-  const allDetected = useMemo(() => {
-    if (!activeConnectionId) {
-      return []
-    }
-    const ports = detectedPortsByConnection[activeConnectionId] ?? []
-    return ports
-      .filter((p) => !forwardedKeys.has(`${normalizeHost(p.host)}:${p.port}`))
-      .map((p) => ({ ...p, targetId: activeConnectionId }))
-      .sort((a, b) => a.port - b.port)
-  }, [detectedPortsByConnection, activeConnectionId, forwardedKeys])
-
-  const [forwardedCollapsed, setForwardedCollapsed] = useState(false)
-  const [detectedCollapsed, setDetectedCollapsed] = useState(false)
-  const [dialogState, setDialogState] = useState<PortForwardDialogState>({ mode: 'closed' })
-
-  const handleForwardDetected = useCallback((port: EnrichedDetectedPort & { targetId: string }) => {
-    setDialogState({
-      mode: 'add',
-      defaults: {
-        remotePort: port.port,
-        remoteHost: normalizeHost(port.host),
-        label: port.processName,
-        targetId: port.targetId
-      }
-    })
-  }, [])
-
-  const handleEdit = useCallback((entry: PortForwardEntry) => {
-    setDialogState({ mode: 'edit', entry })
-  }, [])
-
-  const handleOpenForwardInBrowser = useCallback(
-    (entry: PortForwardEntry, event?: React.MouseEvent<HTMLButtonElement>) => {
-      const url = browserUrlForPortForwardEntry(entry)
-      if (
-        !resolvePortOpenInOrcaBrowser({
-          settings,
-          event,
-          isMac: navigator.userAgent.includes('Mac')
-        })
-      ) {
-        void window.api.shell.openUrl(url)
-        return
-      }
-      if (!activeWorktree?.id) {
-        toast.error(
-          translate(
-            'auto.components.right.sidebar.PortsPanel.409afcc145',
-            'No workspace selected for the browser.'
-          )
-        )
-        return
-      }
-      void openWorkspaceBrowserTab({
-        workspaceId: activeWorktree.id,
-        url,
-        intent: { kind: 'url' }
-      }).catch((error) => {
-        toast.error(error instanceof Error ? error.message : String(error))
-      })
-    },
-    [activeWorktree?.id, settings]
-  )
-
-  const handleDialogClose = useCallback(() => {
-    setDialogState({ mode: 'closed' })
-  }, [])
-
-  if (isDisconnected) {
-    return (
-      <div className="flex flex-col items-center justify-center h-full px-4 text-center text-muted-foreground">
-        <Unplug size={32} className="mb-3 opacity-50" />
-        <p className="text-sm font-medium">
-          {translate('auto.components.right.sidebar.PortsPanel.a2f1a47f42', 'SSH connection lost')}
-        </p>
-        <p className="text-xs mt-1">
-          {translate('auto.components.right.sidebar.PortsPanel.d4c3cd679c', 'Reconnecting...')}
-        </p>
-      </div>
-    )
-  }
-
-  return (
-    <div className="flex flex-col h-full overflow-y-auto scrollbar-sleek">
-      {/* Header */}
-      <div className="flex items-center justify-between px-3 py-2 border-b border-border">
-        <span className="text-[11px] font-semibold uppercase tracking-wider text-muted-foreground">
-          {translate('auto.components.right.sidebar.PortsPanel.6bc058dbe1', 'Ports')}
-        </span>
-        <button
-          type="button"
-          className="flex items-center gap-1 text-xs text-muted-foreground hover:text-foreground transition-colors"
-          onClick={() =>
-            setDialogState({ mode: 'add', defaults: { targetId: activeConnectionId ?? undefined } })
-          }
-        >
-          <Plus size={14} />
-          {translate('auto.components.right.sidebar.PortsPanel.a103dae837', 'Add')}
-        </button>
-      </div>
-
-      {/* Forwarded ports */}
-      {allForwards.length > 0 && (
-        <div className="px-3 pt-2">
-          <button
-            type="button"
-            className="flex items-center gap-1 w-full text-left mb-1"
-            onClick={() => setForwardedCollapsed((v) => !v)}
-          >
-            <ChevronRight
-              size={12}
-              className={cn(
-                'text-muted-foreground transition-transform',
-                !forwardedCollapsed && 'rotate-90'
-              )}
-            />
-            <span className="text-[10px] font-semibold uppercase tracking-wider text-muted-foreground">
-              {translate('auto.components.right.sidebar.PortsPanel.ddbe58d74e', 'Forwarded')}
-            </span>
-            <span className="text-[10px] text-muted-foreground/60 ml-1">{allForwards.length}</span>
-          </button>
-          {!forwardedCollapsed &&
-            allForwards.map((entry) => (
-              <ForwardedPortRow
-                key={entry.id}
-                entry={entry}
-                onEdit={() => handleEdit(entry)}
-                onOpenInBrowser={(event) => handleOpenForwardInBrowser(entry, event)}
-              />
-            ))}
-        </div>
-      )}
-
-      {/* Detected ports */}
-      {allDetected.length > 0 && (
-        <div className="px-3 pt-2">
-          <button
-            type="button"
-            className="flex items-center gap-1 w-full text-left mb-1"
-            onClick={() => setDetectedCollapsed((v) => !v)}
-          >
-            <ChevronRight
-              size={12}
-              className={cn(
-                'text-muted-foreground transition-transform',
-                !detectedCollapsed && 'rotate-90'
-              )}
-            />
-            <span className="text-[10px] font-semibold uppercase tracking-wider text-muted-foreground">
-              {translate('auto.components.right.sidebar.PortsPanel.36b1b2984a', 'Detected')}
-            </span>
-            <span className="text-[10px] text-muted-foreground/60 ml-1">{allDetected.length}</span>
-          </button>
-          {!detectedCollapsed &&
-            allDetected.map((port) => (
-              <DetectedPortRow
-                key={`${port.targetId}-${port.host}-${port.port}`}
-                port={port}
-                onForward={() => handleForwardDetected(port)}
-              />
-            ))}
-        </div>
-      )}
-
-      {/* Empty state */}
-      {allForwards.length === 0 && allDetected.length === 0 && (
-        <div className="flex flex-col items-center justify-center flex-1 px-4 text-center text-muted-foreground">
-          <p className="text-sm">
-            {translate('auto.components.right.sidebar.PortsPanel.1f0d2a24f9', 'No forwarded ports')}
-          </p>
-          <p className="text-xs mt-1 mb-3">
-            {translate(
-              'auto.components.right.sidebar.PortsPanel.04efd3dad4',
-              'Forward a port to access remote services on your local machine.'
-            )}
-          </p>
-          <button
-            type="button"
-            className="text-xs px-3 py-1.5 rounded bg-primary text-primary-foreground hover:bg-primary/90 transition-colors"
-            onClick={() =>
-              setDialogState({
-                mode: 'add',
-                defaults: { targetId: activeConnectionId ?? undefined }
-              })
-            }
-          >
-            {translate('auto.components.right.sidebar.PortsPanel.907eb53ed2', 'Forward a Port')}
-          </button>
-        </div>
-      )}
-
-      <PortForwardDialog
-        state={dialogState}
-        activeConnectionId={activeConnectionId}
-        onClose={handleDialogClose}
-      />
-    </div>
-  )
-}
-
-function ForwardedPortRow({
-  entry,
-  onEdit,
-  onOpenInBrowser
-}: {
-  entry: PortForwardEntry
-  onEdit: () => void
-  onOpenInBrowser: (event?: React.MouseEvent<HTMLButtonElement>) => void
-}): React.JSX.Element {
-  const [removing, setRemoving] = useState(false)
-  const mountedRef = useMountedRef()
-  const forwardedAddress = addressForPortForwardEntry(entry)
-
-  const handleRemove = useCallback(async () => {
-    setRemoving(true)
-    try {
-      await window.api.ssh.removePortForward({ id: entry.id })
-    } catch {
-      // broadcast will update state
-    }
-    if (mountedRef.current) {
-      setRemoving(false)
-    }
-  }, [entry.id, mountedRef])
-
-  const handleCopy = useCallback(() => {
-    void window.api.ui.writeClipboardText(forwardedAddress)
-  }, [forwardedAddress])
-
-  const handleOpenBrowser = useCallback(
-    (event?: React.MouseEvent<HTMLButtonElement>) => {
-      onOpenInBrowser(event)
-    },
-    [onOpenInBrowser]
-  )
-
-  const handleCopyButtonClick = useCallback(
-    (event: React.MouseEvent<HTMLButtonElement>) => {
-      handleCopy()
-      if (event.detail > 0) {
-        event.currentTarget.blur()
-      }
-    },
-    [handleCopy]
-  )
-
-  const handleOpenBrowserButtonClick = useCallback(
-    (event: React.MouseEvent<HTMLButtonElement>) => {
-      // Why: keyboard activations have detail=0; only pointer clicks carry
-      // the modifier intent for the system-browser escape hatch.
-      handleOpenBrowser(event.detail > 0 ? event : undefined)
-      if (event.detail > 0) {
-        event.currentTarget.blur()
-      }
-    },
-    [handleOpenBrowser]
-  )
-
-  const handleEditButtonClick = useCallback(
-    (event: React.MouseEvent<HTMLButtonElement>) => {
-      onEdit()
-      if (event.detail > 0) {
-        event.currentTarget.blur()
-      }
-    },
-    [onEdit]
-  )
-
-  const handleRemoveButtonClick = useCallback(
-    (event: React.MouseEvent<HTMLButtonElement>) => {
-      void handleRemove()
-      if (event.detail > 0) {
-        event.currentTarget.blur()
-      }
-    },
-    [handleRemove]
-  )
-
-  const advertisedBrowserUrl = advertisedBrowserUrlForForwardedRow(entry)
-  const openBrowserLabel = translate(
-    'auto.components.right.sidebar.PortsPanel.b22b128b2a',
-    'Open in Browser'
-  )
-  const openBrowserTitle = getPortOpenBrowserTooltipLabel(
-    advertisedBrowserUrl
-      ? translate(
-          'auto.components.right.sidebar.PortsPanel.75aeea592f',
-          'Open {{value0}} in Browser',
-          {
-            value0: advertisedBrowserUrl
-          }
-        )
-      : openBrowserLabel
-  )
-
-  return (
-    <div className="group flex items-center gap-2 py-1 px-1 -mx-1 rounded hover:bg-accent/50 transition-colors">
-      <div className="flex-1 min-w-0">
-        <div className="flex items-center gap-1.5">
-          {entry.label && (
-            <span className="text-xs font-medium text-foreground truncate">{entry.label}</span>
-          )}
-          <span
-            className={cn(
-              'text-xs text-muted-foreground truncate',
-              !entry.label && 'text-foreground'
-            )}
-          >
-            :{entry.localPort} → :{entry.remotePort}
-          </span>
-        </div>
-        {advertisedBrowserUrl && (
-          <div className="text-[11px] text-muted-foreground/70 truncate">
-            {translate('auto.components.right.sidebar.PortsPanel.de349d4560', 'opens {{value0}}', {
-              value0: advertisedBrowserUrl
-            })}
-          </div>
-        )}
-      </div>
-      <div className="flex items-center gap-0.5 can-hover:opacity-0 group-hover:opacity-100 group-focus-within:opacity-100 transition-opacity">
-        <button
-          type="button"
-          className="p-1 rounded hover:bg-accent transition-colors text-muted-foreground hover:text-foreground"
-          onClick={handleOpenBrowserButtonClick}
-          title={openBrowserTitle}
-        >
-          <ExternalLink size={13} />
-        </button>
-        <button
-          type="button"
-          className="p-1 rounded hover:bg-accent transition-colors text-muted-foreground hover:text-foreground"
-          onClick={handleCopyButtonClick}
-          title={translate(
-            'auto.components.right.sidebar.PortsPanel.1004af16ab',
-            'Copy {{value0}}',
-            { value0: forwardedAddress }
-          )}
-        >
-          <Copy size={13} />
-        </button>
-        <button
-          type="button"
-          className="p-1 rounded hover:bg-accent transition-colors text-muted-foreground hover:text-foreground"
-          onClick={handleEditButtonClick}
-          title={translate('auto.components.right.sidebar.PortsPanel.b3548e59f4', 'Edit')}
-        >
-          <Pencil size={13} />
-        </button>
-        <button
-          type="button"
-          className={cn(
-            'p-1 rounded hover:bg-accent transition-colors text-muted-foreground hover:text-foreground',
-            removing && 'opacity-50'
-          )}
-          onClick={handleRemoveButtonClick}
-          disabled={removing}
-          title={translate('auto.components.right.sidebar.PortsPanel.e740075063', 'Remove')}
-        >
-          <Trash2 size={13} />
-        </button>
-      </div>
-    </div>
-  )
-}
-
-function DetectedPortRow({
-  port,
-  onForward
-}: {
-  port: EnrichedDetectedPort & { targetId: string }
-  onForward: () => void
-}): React.JSX.Element {
-  const advertisedBrowserUrl = advertisedBrowserUrlForDetectedPort(port)
-  return (
-    <div className="group flex items-center gap-2 py-1 px-1 -mx-1 rounded hover:bg-accent/50 transition-colors">
-      <div className="flex-1 min-w-0">
-        <div className="flex items-center gap-1.5">
-          <span className="text-xs text-foreground">:{port.port}</span>
-          {port.processName && (
-            <span className="text-xs text-muted-foreground truncate">{port.processName}</span>
-          )}
-        </div>
-        {advertisedBrowserUrl && (
-          <div className="text-[11px] text-muted-foreground/70 truncate">
-            {translate(
-              'auto.components.right.sidebar.PortsPanel.c7e920aa7c',
-              'advertised as {{value0}}',
-              { value0: advertisedBrowserUrl }
-            )}
-          </div>
-        )}
-      </div>
-      <button
-        type="button"
-        className="text-[11px] px-2 py-0.5 rounded can-hover:opacity-0 group-hover:opacity-100 transition-opacity bg-accent hover:bg-accent/80 text-foreground"
-        onClick={onForward}
-      >
-        {translate('auto.components.right.sidebar.PortsPanel.c9d106547a', 'Forward')}
-      </button>
-    </div>
-  )
-}
-
-function digitsOnly(value: string): string {
-  return value.replace(/\D/g, '')
-}
-
-const INPUT_CLASS =
-  'block w-full mt-0.5 px-2 py-1.5 text-xs rounded border border-border bg-background text-foreground focus:outline-none focus:ring-1 focus:ring-ring'
-
-function PortForwardDialog({
-  state,
-  activeConnectionId,
-  onClose
-}: {
-  state: PortForwardDialogState
-  activeConnectionId: string | null
-  onClose: () => void
-}): React.JSX.Element {
-  const isOpen = state.mode !== 'closed'
-  const isEdit = state.mode === 'edit'
-
-  const initialRemotePort =
-    state.mode === 'edit'
-      ? state.entry.remotePort.toString()
-      : state.mode === 'add'
-        ? (state.defaults.remotePort?.toString() ?? '')
-        : ''
-
-  const initialLocalPort =
-    state.mode === 'edit'
-      ? state.entry.localPort.toString()
-      : state.mode === 'add' && state.defaults.remotePort != null
-        ? safeLocalPort(state.defaults.remotePort).toString()
-        : ''
-
-  const initialRemoteHost =
-    state.mode === 'edit'
-      ? state.entry.remoteHost
-      : state.mode === 'add'
-        ? (state.defaults.remoteHost ?? 'localhost')
-        : 'localhost'
-
-  const initialLabel =
-    state.mode === 'edit'
-      ? (state.entry.label ?? '')
-      : state.mode === 'add'
-        ? (state.defaults.label ?? '')
-        : ''
-
-  // Why: capture the target at dialog-open time via defaults.targetId so
-  // switching worktrees while the dialog is open doesn't redirect the
-  // forward to the wrong SSH connection.
-  const targetId =
-    state.mode === 'edit'
-      ? state.entry.connectionId
-      : state.mode === 'add'
-        ? (state.defaults.targetId ?? activeConnectionId ?? '')
-        : (activeConnectionId ?? '')
-
-  return (
-    <Dialog
-      open={isOpen}
-      onOpenChange={(open) => {
-        if (!open) {
-          onClose()
-        }
-      }}
-    >
-      <DialogContent showCloseButton={false} className="max-w-[340px]">
-        <DialogHeader>
-          <DialogTitle className="text-sm">
-            {isEdit
-              ? translate(
-                  'auto.components.right.sidebar.PortsPanel.80206251c8',
-                  'Edit Port Forward'
-                )
-              : translate('auto.components.right.sidebar.PortsPanel.907eb53ed2', 'Forward a Port')}
-          </DialogTitle>
-          <DialogDescription className="text-xs">
-            {isEdit
-              ? translate(
-                  'auto.components.right.sidebar.PortsPanel.10360598a4',
-                  'Update the port forwarding configuration.'
-                )
-              : translate(
-                  'auto.components.right.sidebar.PortsPanel.31e80cff2d',
-                  'Forward a remote port to your local machine.'
-                )}
-          </DialogDescription>
-        </DialogHeader>
-        {isOpen && (
-          <PortForwardForm
-            key={
-              state.mode === 'edit'
-                ? `edit-${state.entry.id}`
-                : `add-${targetId}-${initialRemotePort}-${initialRemoteHost}`
-            }
-            mode={state.mode}
-            editId={state.mode === 'edit' ? state.entry.id : undefined}
-            initialRemotePort={initialRemotePort}
-            initialLocalPort={initialLocalPort}
-            initialRemoteHost={initialRemoteHost}
-            initialLabel={initialLabel}
-            targetId={targetId}
-            onClose={onClose}
-          />
-        )}
-      </DialogContent>
-    </Dialog>
-  )
-}
-
-function PortForwardForm({
-  mode,
-  editId,
-  initialRemotePort,
-  initialLocalPort,
-  initialRemoteHost,
-  initialLabel,
-  targetId,
-  onClose
-}: {
-  mode: 'add' | 'edit'
-  editId?: string
-  initialRemotePort: string
-  initialLocalPort: string
-  initialRemoteHost: string
-  initialLabel: string
-  targetId: string
-  onClose: () => void
-}): React.JSX.Element {
-  const [remotePort, setRemotePort] = useState(initialRemotePort)
-  const [localPort, setLocalPort] = useState(initialLocalPort)
-  const [remoteHost, setRemoteHost] = useState(initialRemoteHost)
-  const [label, setLabel] = useState(initialLabel)
-  const [error, setError] = useState<string | null>(null)
-  const [submitting, setSubmitting] = useState(false)
-
-  const handleSubmit = useCallback(
-    async (e: React.FormEvent) => {
-      e.preventDefault()
-      setError(null)
-
-      const rPort = Number.parseInt(remotePort, 10)
-      const lPort = Number.parseInt(localPort || remotePort, 10)
-
-      if (Number.isNaN(rPort) || rPort < 1 || rPort > 65535) {
-        setError('Remote port must be 1\u201365535')
-        return
-      }
-      if (Number.isNaN(lPort) || lPort < 1 || lPort > 65535) {
-        setError('Local port must be 1\u201365535')
-        return
-      }
-
-      setSubmitting(true)
-      try {
-        await (mode === 'edit' && editId
-          ? window.api.ssh.updatePortForward({
-              id: editId,
-              targetId,
-              localPort: lPort,
-              remoteHost: remoteHost || 'localhost',
-              remotePort: rPort,
-              label: label || undefined
-            })
-          : window.api.ssh.addPortForward({
-              targetId,
-              localPort: lPort,
-              remoteHost: remoteHost || 'localhost',
-              remotePort: rPort,
-              label: label || undefined
-            }))
-        onClose()
-      } catch (err) {
-        const msg = err instanceof Error ? err.message : String(err)
-        if (msg.includes('EADDRINUSE') || msg.includes('already in use')) {
-          setError(`Port ${lPort} is already in use. Choose a different local port.`)
-        } else if (msg.includes('EACCES') || msg.includes('permission denied')) {
-          setError(`Port ${lPort} requires elevated privileges. Use a local port \u2265 1024.`)
-        } else {
-          setError(msg)
-        }
-      }
-      setSubmitting(false)
-    },
-    [mode, editId, remotePort, localPort, remoteHost, label, targetId, onClose]
-  )
-
-  return (
-    <form onSubmit={handleSubmit} className="space-y-3">
-      <div className="space-y-2">
-        <label className="block">
-          <span className="text-[11px] text-muted-foreground">
-            {translate('auto.components.right.sidebar.PortsPanel.9e5a4118b0', 'Remote Port')}
-          </span>
-          <input
-            type="text"
-            inputMode="numeric"
-            value={remotePort}
-            onChange={(e) => {
-              const val = digitsOnly(e.target.value)
-              setRemotePort(val)
-              const prev = Number.parseInt(remotePort, 10)
-              const cur = Number.parseInt(localPort, 10)
-              if (!localPort || cur === prev || cur === safeLocalPort(prev)) {
-                const parsed = Number.parseInt(val, 10)
-                setLocalPort(Number.isNaN(parsed) ? '' : safeLocalPort(parsed).toString())
-              }
-            }}
-            className={INPUT_CLASS}
-            placeholder="3000"
-            autoFocus
-            required
-          />
-        </label>
-
-        <label className="block">
-          <span className="text-[11px] text-muted-foreground">
-            {translate('auto.components.right.sidebar.PortsPanel.b950b1948b', 'Local Port')}
-          </span>
-          <input
-            type="text"
-            inputMode="numeric"
-            value={localPort}
-            onChange={(e) => setLocalPort(digitsOnly(e.target.value))}
-            className={INPUT_CLASS}
-            placeholder={translate(
-              'auto.components.right.sidebar.PortsPanel.d57545ff92',
-              'Same as remote'
-            )}
-          />
-        </label>
-
-        <label className="block">
-          <span className="text-[11px] text-muted-foreground">
-            {translate('auto.components.right.sidebar.PortsPanel.a3721a50b0', 'Remote Host')}
-          </span>
-          <input
-            type="text"
-            value={remoteHost}
-            onChange={(e) => setRemoteHost(e.target.value)}
-            className={INPUT_CLASS}
-            placeholder={translate(
-              'auto.components.right.sidebar.PortsPanel.17bea6e391',
-              'localhost'
-            )}
-          />
-        </label>
-
-        <label className="block">
-          <span className="text-[11px] text-muted-foreground">
-            {translate('auto.components.right.sidebar.PortsPanel.8dfed0a15c', 'Label (optional)')}
-          </span>
-          <input
-            type="text"
-            value={label}
-            onChange={(e) => setLabel(e.target.value)}
-            className={INPUT_CLASS}
-            placeholder={translate(
-              'auto.components.right.sidebar.PortsPanel.4eb801ce93',
-              'dev-server'
-            )}
-          />
-        </label>
-      </div>
-
-      {error && <div className="text-[11px] text-destructive">{error}</div>}
-
-      <div className="flex justify-end gap-2">
-        <Button type="button" variant="outline" size="sm" onClick={onClose}>
-          {translate('auto.components.right.sidebar.PortsPanel.3ea4a02a8f', 'Cancel')}
-        </Button>
-        <Button type="submit" size="sm" disabled={submitting || !remotePort}>
-          {submitting
-            ? mode === 'edit'
-              ? translate('auto.components.right.sidebar.PortsPanel.d7c83cfd24', 'Saving...')
-              : translate('auto.components.right.sidebar.PortsPanel.9f475dc994', 'Forwarding...')
-            : mode === 'edit'
-              ? translate('auto.components.right.sidebar.PortsPanel.9079776663', 'Save')
-              : translate('auto.components.right.sidebar.PortsPanel.c9d106547a', 'Forward')}
-        </Button>
-      </div>
-    </form>
-  )
-}
diff --git a/src/renderer/src/components/right-sidebar/file-explorer-watch-reconcile.test.ts b/src/renderer/src/components/right-sidebar/file-explorer-watch-reconcile.test.ts
index c6d221b4fad..343e33b64a0 100644
--- a/src/renderer/src/components/right-sidebar/file-explorer-watch-reconcile.test.ts
+++ b/src/renderer/src/components/right-sidebar/file-explorer-watch-reconcile.test.ts
@@ -6,16 +6,14 @@ import { useAppStore } from '@/store'
 
 function cacheWithChildren(paths: string[]): DirCache {
   return {
-    children: paths.map(
-      (path): TreeNode => ({
-        name: path.split(/[\\/]/).at(-1) ?? path,
-        path,
-        relativePath: path,
-        isDirectory: false,
-        depth: 0,
-        operationOwner: { kind: 'local' }
-      })
-    ),
+    children: paths.map((path): TreeNode => ({
+      name: path.split(/[\\/]/).at(-1) ?? path,
+      path,
+      relativePath: path,
+      isDirectory: false,
+      depth: 0,
+      operationOwner: { kind: 'local' }
+    })),
     loading: false,
     operationOwner: { kind: 'local' }
   }
diff --git a/src/renderer/src/components/right-sidebar/local-port-details-dialog.tsx b/src/renderer/src/components/right-sidebar/local-port-details-dialog.tsx
new file mode 100644
index 00000000000..141f15d4d96
--- /dev/null
+++ b/src/renderer/src/components/right-sidebar/local-port-details-dialog.tsx
@@ -0,0 +1,86 @@
+import React from 'react'
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogHeader,
+  DialogTitle
+} from '@/components/ui/dialog'
+import { addressForPort } from '@/lib/workspace-port-urls'
+import type { WorkspacePort } from '../../../../shared/workspace-ports'
+import { translate } from '@/i18n/i18n'
+
+export function LocalPortDetailsDialog({
+  port,
+  onClose
+}: {
+  port: WorkspacePort | null
+  onClose: () => void
+}): React.JSX.Element {
+  return (
+    <Dialog open={Boolean(port)} onOpenChange={(open) => !open && onClose()}>
+      <DialogContent>
+        <DialogHeader>
+          <DialogTitle>
+            {port
+              ? translate(
+                  'auto.components.right.sidebar.PortsPanel.472054d94c',
+                  'Port :{{value0}}',
+                  { value0: port.port }
+                )
+              : translate('auto.components.right.sidebar.PortsPanel.d41a8241ec', 'Port')}
+          </DialogTitle>
+          <DialogDescription>
+            {port ? `${port.processName ?? 'Unknown process'} · ${addressForPort(port)}` : ''}
+          </DialogDescription>
+        </DialogHeader>
+        {port && (
+          <dl className="grid grid-cols-[88px_1fr] gap-x-3 gap-y-2 text-xs">
+            <dt className="text-muted-foreground">
+              {translate('auto.components.right.sidebar.PortsPanel.1c1c18cefc', 'Address')}
+            </dt>
+            <dd className="min-w-0 break-all text-foreground">{addressForPort(port)}</dd>
+            <dt className="text-muted-foreground">
+              {translate('auto.components.right.sidebar.PortsPanel.0f1d8cd324', 'Bind')}
+            </dt>
+            <dd className="min-w-0 break-all text-foreground">{`${port.bindHost}:${port.port}`}</dd>
+            <dt className="text-muted-foreground">
+              {translate('auto.components.right.sidebar.PortsPanel.729be0b4e5', 'Kind')}
+            </dt>
+            <dd className="text-foreground">{port.kind}</dd>
+            <dt className="text-muted-foreground">
+              {translate('auto.components.right.sidebar.PortsPanel.b1ff94fa27', 'Protocol')}
+            </dt>
+            <dd className="text-foreground">{port.protocol}</dd>
+            <dt className="text-muted-foreground">
+              {translate('auto.components.right.sidebar.PortsPanel.5dd86dcf2f', 'Process')}
+            </dt>
+            <dd className="min-w-0 break-all text-foreground">
+              {port.processName ??
+                translate('auto.components.right.sidebar.PortsPanel.3e13cb63ee', 'Unknown')}
+            </dd>
+            <dt className="text-muted-foreground">
+              {translate('auto.components.right.sidebar.PortsPanel.57d930fa45', 'PID')}
+            </dt>
+            <dd className="text-foreground">
+              {port.pid ??
+                translate('auto.components.right.sidebar.PortsPanel.3e13cb63ee', 'Unknown')}
+            </dd>
+            {port.kind === 'workspace' && (
+              <>
+                <dt className="text-muted-foreground">
+                  {translate('auto.components.right.sidebar.PortsPanel.c7b4702b7b', 'Workspace')}
+                </dt>
+                <dd className="min-w-0 break-all text-foreground">{port.owner.displayName}</dd>
+                <dt className="text-muted-foreground">
+                  {translate('auto.components.right.sidebar.PortsPanel.153145e675', 'Evidence')}
+                </dt>
+                <dd className="text-foreground">{port.owner.confidence}</dd>
+              </>
+            )}
+          </dl>
+        )}
+      </DialogContent>
+    </Dialog>
+  )
+}
diff --git a/src/renderer/src/components/right-sidebar/local-port-row.tsx b/src/renderer/src/components/right-sidebar/local-port-row.tsx
new file mode 100644
index 00000000000..644ed000297
--- /dev/null
+++ b/src/renderer/src/components/right-sidebar/local-port-row.tsx
@@ -0,0 +1,241 @@
+import React, { useCallback } from 'react'
+import { Box, Copy, ExternalLink, Info, Server, Trash2 } from 'lucide-react'
+import { getPortOpenBrowserTooltipLabel } from '@/lib/workspace-port-actions'
+import { addressForPort } from '@/lib/workspace-port-urls'
+import { Button } from '@/components/ui/button'
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip'
+import {
+  ContextMenu,
+  ContextMenuContent,
+  ContextMenuItem,
+  ContextMenuLabel,
+  ContextMenuSeparator,
+  ContextMenuTrigger
+} from '@/components/ui/context-menu'
+import type { WorkspacePort } from '../../../../shared/workspace-ports'
+import { translate } from '@/i18n/i18n'
+
+const LOCAL_PORT_MENU_CONTENT_CLASS =
+  '!rounded-md !border-border/60 !bg-popover !text-popover-foreground !shadow-[0_10px_24px_rgba(0,0,0,0.18)] !backdrop-blur-none'
+const LOCAL_PORT_MENU_ITEM_CLASS =
+  'rounded-md focus:bg-accent focus:text-accent-foreground dark:focus:bg-accent'
+const LOCAL_PORT_MENU_LABEL_CLASS = 'px-2 py-1 text-[11px] font-semibold text-muted-foreground'
+
+export function LocalPortRow({
+  port,
+  onStop,
+  onShowDetails,
+  onOpenInBrowser
+}: {
+  port: WorkspacePort
+  onStop: (port: WorkspacePort) => void
+  onShowDetails: (port: WorkspacePort) => void
+  onOpenInBrowser: (port: WorkspacePort, event?: React.MouseEvent<HTMLButtonElement>) => void
+}): React.JSX.Element {
+  const handleCopy = useCallback(() => {
+    void window.api.ui.writeClipboardText(addressForPort(port))
+  }, [port])
+
+  const handleOpenBrowser = useCallback(
+    (event?: React.MouseEvent<HTMLButtonElement>) => {
+      void onOpenInBrowser(port, event)
+    },
+    [onOpenInBrowser, port]
+  )
+
+  const handleCopyButtonClick = useCallback(
+    (event: React.MouseEvent<HTMLButtonElement>) => {
+      handleCopy()
+      if (event.detail > 0) {
+        event.currentTarget.blur()
+      }
+    },
+    [handleCopy]
+  )
+
+  const handleOpenBrowserButtonClick = useCallback(
+    (event: React.MouseEvent<HTMLButtonElement>) => {
+      // Why: keyboard activations have detail=0; only pointer clicks carry
+      // the modifier intent for the system-browser escape hatch.
+      handleOpenBrowser(event.detail > 0 ? event : undefined)
+      if (event.detail > 0) {
+        event.currentTarget.blur()
+      }
+    },
+    [handleOpenBrowser]
+  )
+
+  const handleStopButtonClick = useCallback(
+    (event: React.MouseEvent<HTMLButtonElement>) => {
+      onStop(port)
+      if (event.detail > 0) {
+        event.currentTarget.blur()
+      }
+    },
+    [onStop, port]
+  )
+
+  const processLabel = port.processName ?? (port.pid ? `PID ${port.pid}` : 'Unknown process')
+  const address = addressForPort(port)
+  const ownerLabel =
+    port.kind === 'workspace'
+      ? port.owner.displayName
+      : port.kind === 'container'
+        ? 'Container or forwarded service'
+        : 'Unassigned'
+  const openBrowserLabel = translate(
+    'auto.components.right.sidebar.PortsPanel.b22b128b2a',
+    'Open in Browser'
+  )
+  const confidenceLabel =
+    port.kind === 'workspace' ? (port.owner.confidence === 'cwd' ? 'cwd' : 'command') : null
+  const canStopProcess =
+    port.kind === 'workspace' && Boolean(port.pid) && port.processName !== 'Electron'
+
+  return (
+    <ContextMenu>
+      <div className="group flex items-center gap-2 py-1 px-1 -mx-1 rounded hover:bg-accent/50 transition-colors">
+        <ContextMenuTrigger asChild>
+          <div
+            className="flex min-w-0 flex-1 items-center gap-2 rounded focus:outline-none focus-visible:ring-1 focus-visible:ring-ring"
+            tabIndex={0}
+            aria-label={translate(
+              'auto.components.right.sidebar.PortsPanel.5be4f7f727',
+              'Port {{value0}} menu',
+              { value0: port.port }
+            )}
+          >
+            <div className="flex size-5 shrink-0 items-center justify-center text-muted-foreground">
+              {port.kind === 'container' ? <Box size={13} /> : <Server size={13} />}
+            </div>
+            <div className="min-w-0 flex-1">
+              <div className="flex min-w-0 items-center gap-1.5">
+                <span className="text-xs font-medium text-foreground">:{port.port}</span>
+                <span className="truncate text-xs text-muted-foreground">{processLabel}</span>
+              </div>
+              <div className="flex min-w-0 items-center gap-1.5 text-[11px] text-muted-foreground">
+                <span className="truncate">{address}</span>
+              </div>
+              <div className="flex min-w-0 items-center gap-1.5 text-[10px] text-muted-foreground/70">
+                <span className="truncate">{ownerLabel}</span>
+                {confidenceLabel && (
+                  <span className="shrink-0 text-muted-foreground/70">{confidenceLabel}</span>
+                )}
+              </div>
+            </div>
+          </div>
+        </ContextMenuTrigger>
+        <TooltipProvider delayDuration={400}>
+          <div className="flex items-center gap-0.5 can-hover:opacity-0 group-hover:opacity-100 group-focus-within:opacity-100 transition-opacity">
+            <Tooltip>
+              <TooltipTrigger asChild>
+                <Button
+                  type="button"
+                  variant="ghost"
+                  size="icon-xs"
+                  className="text-muted-foreground hover:text-foreground"
+                  onClick={handleOpenBrowserButtonClick}
+                  aria-label={openBrowserLabel}
+                >
+                  <ExternalLink size={13} />
+                </Button>
+              </TooltipTrigger>
+              <TooltipContent side="top" sideOffset={4}>
+                {getPortOpenBrowserTooltipLabel(openBrowserLabel)}
+              </TooltipContent>
+            </Tooltip>
+            <Tooltip>
+              <TooltipTrigger asChild>
+                <Button
+                  type="button"
+                  variant="ghost"
+                  size="icon-xs"
+                  className="text-muted-foreground hover:text-foreground"
+                  onClick={handleCopyButtonClick}
+                  aria-label={translate(
+                    'auto.components.right.sidebar.PortsPanel.fe2730d050',
+                    'Copy {{value0}}',
+                    { value0: address }
+                  )}
+                >
+                  <Copy size={13} />
+                </Button>
+              </TooltipTrigger>
+              <TooltipContent side="top" sideOffset={4}>
+                {translate(
+                  'auto.components.right.sidebar.PortsPanel.1004af16ab',
+                  'Copy {{value0}}',
+                  { value0: address }
+                )}
+              </TooltipContent>
+            </Tooltip>
+            {canStopProcess && (
+              <Tooltip>
+                <TooltipTrigger asChild>
+                  <Button
+                    type="button"
+                    variant="ghost"
+                    size="icon-xs"
+                    className="text-muted-foreground hover:text-destructive"
+                    onClick={handleStopButtonClick}
+                    aria-label={translate(
+                      'auto.components.right.sidebar.PortsPanel.f9528da632',
+                      'Stop Process'
+                    )}
+                  >
+                    <Trash2 size={13} />
+                  </Button>
+                </TooltipTrigger>
+                <TooltipContent side="top" sideOffset={4}>
+                  {translate('auto.components.right.sidebar.PortsPanel.f9528da632', 'Stop Process')}
+                </TooltipContent>
+              </Tooltip>
+            )}
+          </div>
+        </TooltipProvider>
+      </div>
+      <ContextMenuContent className={LOCAL_PORT_MENU_CONTENT_CLASS}>
+        <ContextMenuLabel
+          className={LOCAL_PORT_MENU_LABEL_CLASS}
+        >{`:${port.port}`}</ContextMenuLabel>
+        <ContextMenuItem
+          className={LOCAL_PORT_MENU_ITEM_CLASS}
+          onSelect={() => handleOpenBrowser()}
+        >
+          <ExternalLink size={13} />
+          {openBrowserLabel}
+        </ContextMenuItem>
+        <ContextMenuItem className={LOCAL_PORT_MENU_ITEM_CLASS} onSelect={handleCopy}>
+          <Copy size={13} />
+          {translate('auto.components.right.sidebar.PortsPanel.792baeb7ed', 'Copy Address')}
+        </ContextMenuItem>
+        <ContextMenuItem
+          className={LOCAL_PORT_MENU_ITEM_CLASS}
+          onSelect={() => {
+            void window.api.ui.writeClipboardText(JSON.stringify(port, null, 2))
+          }}
+        >
+          <Copy size={13} />
+          {translate('auto.components.right.sidebar.PortsPanel.bdac206faf', 'Copy Details')}
+        </ContextMenuItem>
+        <ContextMenuItem
+          className={LOCAL_PORT_MENU_ITEM_CLASS}
+          onSelect={() => onShowDetails(port)}
+        >
+          <Info size={13} />
+          {translate('auto.components.right.sidebar.PortsPanel.a223459512', 'Show Details')}
+        </ContextMenuItem>
+        <ContextMenuSeparator />
+        <ContextMenuItem
+          className={LOCAL_PORT_MENU_ITEM_CLASS}
+          variant="destructive"
+          disabled={!canStopProcess}
+          onSelect={() => onStop(port)}
+        >
+          <Trash2 size={13} />
+          {translate('auto.components.right.sidebar.PortsPanel.f9528da632', 'Stop Process')}
+        </ContextMenuItem>
+      </ContextMenuContent>
+    </ContextMenu>
+  )
+}
diff --git a/src/renderer/src/components/right-sidebar/local-port-section.tsx b/src/renderer/src/components/right-sidebar/local-port-section.tsx
new file mode 100644
index 00000000000..22287ae4909
--- /dev/null
+++ b/src/renderer/src/components/right-sidebar/local-port-section.tsx
@@ -0,0 +1,69 @@
+import React from 'react'
+import { ChevronRight } from 'lucide-react'
+import { cn } from '@/lib/utils'
+import type { WorkspacePort } from '../../../../shared/workspace-ports'
+import { LocalPortRow } from './local-port-row'
+
+export function LocalPortSection({
+  id,
+  title,
+  ports,
+  emptyText,
+  collapsed,
+  onToggle,
+  onStopPort,
+  onShowDetails,
+  onOpenInBrowser
+}: {
+  id: string
+  title: string
+  ports: WorkspacePort[]
+  emptyText?: string
+  collapsed: boolean
+  onToggle: () => void
+  onStopPort: (port: WorkspacePort) => void
+  onShowDetails: (port: WorkspacePort) => void
+  onOpenInBrowser: (port: WorkspacePort, event?: React.MouseEvent<HTMLButtonElement>) => void
+}): React.JSX.Element | null {
+  if (ports.length === 0 && !emptyText) {
+    return null
+  }
+
+  return (
+    <div className="px-3 pt-2">
+      <button
+        type="button"
+        className="sticky top-0 z-10 mb-1 flex w-full items-center gap-1 border-b border-border/40 bg-background py-1 text-left text-muted-foreground transition-colors hover:text-foreground"
+        onClick={onToggle}
+        aria-expanded={!collapsed}
+        aria-controls={`local-port-section-${id}`}
+      >
+        <ChevronRight
+          size={12}
+          className={cn('shrink-0 transition-transform', !collapsed && 'rotate-90')}
+        />
+        <span className="text-[10px] font-semibold uppercase tracking-wider text-muted-foreground">
+          {title}
+        </span>
+        {ports.length > 0 && (
+          <span className="text-[10px] text-muted-foreground/60 ml-1">{ports.length}</span>
+        )}
+      </button>
+      {!collapsed && (
+        <div id={`local-port-section-${id}`}>
+          {ports.length > 0
+            ? ports.map((port) => (
+                <LocalPortRow
+                  key={port.id}
+                  port={port}
+                  onStop={onStopPort}
+                  onShowDetails={onShowDetails}
+                  onOpenInBrowser={onOpenInBrowser}
+                />
+              ))
+            : emptyText && <div className="py-1 text-xs text-muted-foreground">{emptyText}</div>}
+        </div>
+      )}
+    </div>
+  )
+}
diff --git a/src/renderer/src/components/right-sidebar/local-workspace-port-sections.ts b/src/renderer/src/components/right-sidebar/local-workspace-port-sections.ts
new file mode 100644
index 00000000000..d968bb85144
--- /dev/null
+++ b/src/renderer/src/components/right-sidebar/local-workspace-port-sections.ts
@@ -0,0 +1,49 @@
+import type { WorkspacePort } from '../../../../shared/workspace-ports'
+
+export function getLocalWorkspacePortSections(
+  scan: { ports: WorkspacePort[] } | null | undefined,
+  activeRepoId: string | null | undefined,
+  activeWorktreeId: string | null | undefined
+): {
+  activePorts: WorkspacePort[]
+  otherWorkspacePorts: WorkspacePort[]
+  externalPorts: WorkspacePort[]
+} {
+  const ports = scan?.ports ?? []
+  return {
+    activePorts: ports.filter(
+      (port) =>
+        port.kind === 'workspace' &&
+        port.owner.repoId === activeRepoId &&
+        port.owner.worktreeId === activeWorktreeId
+    ),
+    otherWorkspacePorts: ports.filter(
+      (port) =>
+        port.kind === 'workspace' &&
+        port.owner.repoId === activeRepoId &&
+        port.owner.worktreeId !== activeWorktreeId
+    ),
+    // Why: the old repo-scoped scan showed listeners from other repos as
+    // External, without workspace-only actions or cross-worktree activation.
+    // Keep that behavior now that the shared scan can attribute them globally.
+    externalPorts: ports.flatMap((port) => {
+      if (port.kind !== 'workspace') {
+        return [port]
+      }
+      return port.owner.repoId === activeRepoId ? [] : [workspacePortAsExternal(port)]
+    })
+  }
+}
+
+function workspacePortAsExternal(port: WorkspacePort & { kind: 'workspace' }): WorkspacePort {
+  return {
+    id: port.id,
+    bindHost: port.bindHost,
+    connectHost: port.connectHost,
+    port: port.port,
+    pid: port.pid,
+    processName: port.processName,
+    protocol: port.protocol,
+    kind: 'external'
+  }
+}
diff --git a/src/renderer/src/components/right-sidebar/local-workspace-ports-panel.tsx b/src/renderer/src/components/right-sidebar/local-workspace-ports-panel.tsx
new file mode 100644
index 00000000000..0955e89031b
--- /dev/null
+++ b/src/renderer/src/components/right-sidebar/local-workspace-ports-panel.tsx
@@ -0,0 +1,308 @@
+import React, { useCallback, useMemo, useState } from 'react'
+import { RefreshCw, Server } from 'lucide-react'
+import { toast } from 'sonner'
+import { useAppStore } from '@/store'
+import { useActiveWorktree, useRepoById } from '@/store/selectors'
+import { cn } from '@/lib/utils'
+import { getActiveRuntimeTarget } from '@/runtime/runtime-rpc-client'
+import { getRuntimeEnvironmentIdForWorktree } from '@/lib/worktree-runtime-owner'
+import {
+  killWorkspacePortForTarget,
+  openWorkspacePortInBrowser,
+  refreshWorkspacePortScanAfterStop,
+  resolvePortOpenInOrcaBrowser,
+  scanWorkspacePortsForTarget,
+  workspacePortRuntimeTargetKey
+} from '@/lib/workspace-port-actions'
+import { resolveLocalhostLabelRouteForPort } from '@/lib/workspace-port-localhost-label-selector'
+import { Button } from '@/components/ui/button'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
+import type { WorkspacePort } from '../../../../shared/workspace-ports'
+import { translate } from '@/i18n/i18n'
+import { getLocalWorkspacePortSections } from './local-workspace-port-sections'
+import { LocalPortSection } from './local-port-section'
+import { LocalPortDetailsDialog } from './local-port-details-dialog'
+
+export function LocalWorkspacePortsPanel({ isVisible }: { isVisible: boolean }): React.JSX.Element {
+  const activeWorktree = useActiveWorktree()
+  const activeRepo = useRepoById(activeWorktree?.repoId ?? null)
+  const settings = useAppStore((s) => s.settings)
+  const createBrowserTab = useAppStore((s) => s.createBrowserTab)
+  const setRemoteBrowserPageHandle = useAppStore((s) => s.setRemoteBrowserPageHandle)
+  const scansByKey = useAppStore((s) => s.workspacePortScansByKey)
+  const refreshing = useAppStore((s) => s.workspacePortScanRefreshing)
+  const setWorkspacePortScan = useAppStore((s) => s.setWorkspacePortScan)
+  const setWorkspacePortScanForKey = useAppStore((s) => s.setWorkspacePortScanForKey)
+  const setWorkspacePortScanRefreshing = useAppStore((s) => s.setWorkspacePortScanRefreshing)
+  const [detailsPort, setDetailsPort] = useState<WorkspacePort | null>(null)
+  const [collapsedSections, setCollapsedSections] = useState<Record<string, boolean>>({
+    other: true,
+    external: true
+  })
+
+  const runtimeTarget = useMemo(() => {
+    const activeRuntimeEnvironmentId = getRuntimeEnvironmentIdForWorktree(
+      useAppStore.getState(),
+      activeWorktree?.id
+    )
+    // Why: the Ports panel acts on the active workspace; use that workspace's
+    // host owner even if the sidebar is focused elsewhere.
+    return getActiveRuntimeTarget({ ...settings, activeRuntimeEnvironmentId })
+  }, [activeWorktree?.id, settings])
+  const scanKey = `${workspacePortRuntimeTargetKey(runtimeTarget)}:all`
+
+  const refresh = useCallback(() => {
+    if (!activeRepo) {
+      return Promise.resolve()
+    }
+    setWorkspacePortScanRefreshing(true)
+    const promise = scanWorkspacePortsForTarget(runtimeTarget)
+      .then((nextScan) => {
+        setWorkspacePortScanForKey(scanKey, nextScan)
+        setWorkspacePortScan({ key: scanKey, result: nextScan })
+      })
+      .catch((error) => {
+        const message = error instanceof Error ? error.message : String(error)
+        toast.error(
+          translate(
+            'auto.components.right.sidebar.PortsPanel.a00f3a2840',
+            'Failed to refresh ports'
+          ),
+          {
+            description:
+              message ||
+              translate(
+                'auto.components.right.sidebar.PortsPanel.740aca88ab',
+                'Workspace port scan failed.'
+              )
+          }
+        )
+      })
+      .finally(() => {
+        setWorkspacePortScanRefreshing(false)
+      })
+    return promise
+  }, [
+    activeRepo,
+    runtimeTarget,
+    scanKey,
+    setWorkspacePortScan,
+    setWorkspacePortScanForKey,
+    setWorkspacePortScanRefreshing
+  ])
+
+  // Why: WorkspacePortScanner already owns the 30s all-worktree poll. The
+  // panel scopes that shared result instead of starting a second scan loop.
+  const displayScan = isVisible ? (scansByKey[scanKey] ?? null) : null
+
+  const toggleSection = useCallback((sectionId: string) => {
+    setCollapsedSections((current) => ({ ...current, [sectionId]: !current[sectionId] }))
+  }, [])
+
+  const handleStopPort = useCallback(
+    async (port: WorkspacePort) => {
+      if (!activeRepo || !port.pid) {
+        return
+      }
+      const result = await killWorkspacePortForTarget(runtimeTarget, {
+        repoId: activeRepo.id,
+        pid: port.pid,
+        port: port.port
+      })
+      if (!result.ok) {
+        toast.error(result.reason)
+        return
+      }
+      toast.success(
+        translate(
+          'auto.components.right.sidebar.PortsPanel.97b562d21d',
+          'Stopped process on :{{value0}}',
+          { value0: port.port }
+        )
+      )
+      const refreshResult = await refreshWorkspacePortScanAfterStop({
+        runtimeTarget,
+        setWorkspacePortScan,
+        setWorkspacePortScanForKey,
+        getWorkspacePortScansByKey: () => useAppStore.getState().workspacePortScansByKey,
+        setWorkspacePortScanRefreshing
+      })
+      if (!refreshResult.ok) {
+        toast.error(
+          translate(
+            'auto.components.right.sidebar.PortsPanel.a00f3a2840',
+            'Failed to refresh ports'
+          ),
+          {
+            description: refreshResult.reason
+          }
+        )
+      }
+    },
+    [
+      activeRepo,
+      runtimeTarget,
+      setWorkspacePortScan,
+      setWorkspacePortScanForKey,
+      setWorkspacePortScanRefreshing
+    ]
+  )
+
+  const handleOpenPortInBrowser = useCallback(
+    async (port: WorkspacePort, event?: React.MouseEvent<HTMLButtonElement>) => {
+      const result = await openWorkspacePortInBrowser({
+        port,
+        activeWorktreeId: activeWorktree?.id,
+        runtimeTarget,
+        createBrowserTab,
+        setRemoteBrowserPageHandle,
+        openInOrcaBrowser: resolvePortOpenInOrcaBrowser({
+          settings,
+          event,
+          isMac: navigator.userAgent.includes('Mac')
+        }),
+        localhostLabelRoute: resolveLocalhostLabelRouteForPort(useAppStore.getState(), port)
+      })
+      if (!result.ok) {
+        toast.error(
+          translate(
+            'auto.components.right.sidebar.PortsPanel.98e9a414f8',
+            'Failed to open browser'
+          ),
+          { description: result.reason }
+        )
+      }
+    },
+    [activeWorktree?.id, createBrowserTab, runtimeTarget, setRemoteBrowserPageHandle, settings]
+  )
+
+  const { activePorts, otherWorkspacePorts, externalPorts } = useMemo(
+    () => getLocalWorkspacePortSections(displayScan, activeRepo?.id, activeWorktree?.id),
+    [activeRepo?.id, activeWorktree?.id, displayScan]
+  )
+
+  if (!activeRepo) {
+    return (
+      <div className="flex flex-col items-center justify-center h-full px-4 text-center text-muted-foreground">
+        <Server size={32} className="mb-3 opacity-50" />
+        <p className="text-sm">
+          {translate(
+            'auto.components.right.sidebar.PortsPanel.c1b115c375',
+            'No workspace selected'
+          )}
+        </p>
+      </div>
+    )
+  }
+
+  return (
+    <div className="flex flex-col h-full overflow-y-auto scrollbar-sleek">
+      <div className="flex items-center justify-between px-3 py-2 border-b border-border">
+        <span className="text-[11px] font-semibold uppercase tracking-wider text-muted-foreground">
+          {translate('auto.components.right.sidebar.PortsPanel.6bc058dbe1', 'Ports')}
+        </span>
+        <Tooltip>
+          <TooltipTrigger asChild>
+            <Button
+              type="button"
+              variant="ghost"
+              size="icon-xs"
+              className="text-muted-foreground hover:text-foreground"
+              onClick={() => void refresh()}
+              disabled={refreshing}
+              aria-label={translate(
+                'auto.components.right.sidebar.PortsPanel.7822e3edc6',
+                'Refresh Ports'
+              )}
+            >
+              <RefreshCw size={14} className={cn(refreshing && 'animate-spin')} />
+            </Button>
+          </TooltipTrigger>
+          <TooltipContent side="top" sideOffset={4}>
+            {translate('auto.components.right.sidebar.PortsPanel.7822e3edc6', 'Refresh Ports')}
+          </TooltipContent>
+        </Tooltip>
+      </div>
+
+      {displayScan?.unavailableReason && (
+        <div className="px-3 py-2 text-xs text-muted-foreground border-b border-border">
+          {translate(
+            'auto.components.right.sidebar.PortsPanel.f59c783b7a',
+            'Port scan unavailable on {{value0}}: {{value1}}',
+            {
+              value0: displayScan.platform,
+              value1: displayScan.unavailableReason
+            }
+          )}
+        </div>
+      )}
+
+      {!displayScan?.unavailableReason && (
+        <>
+          <LocalPortSection
+            id="active"
+            title={translate(
+              'auto.components.right.sidebar.PortsPanel.935dda7718',
+              'Active Workspace'
+            )}
+            ports={activePorts}
+            emptyText={
+              refreshing && !displayScan
+                ? translate('auto.components.right.sidebar.PortsPanel.0d63d94db3', 'Scanning...')
+                : translate(
+                    'auto.components.right.sidebar.PortsPanel.38b16cfbef',
+                    'No ports detected'
+                  )
+            }
+            collapsed={collapsedSections.active ?? false}
+            onToggle={() => toggleSection('active')}
+            onStopPort={(port) => void handleStopPort(port)}
+            onShowDetails={setDetailsPort}
+            onOpenInBrowser={handleOpenPortInBrowser}
+          />
+          <LocalPortSection
+            id="other"
+            title={translate(
+              'auto.components.right.sidebar.PortsPanel.4db4b5e435',
+              'Other Workspaces'
+            )}
+            ports={otherWorkspacePorts}
+            collapsed={collapsedSections.other ?? false}
+            onToggle={() => toggleSection('other')}
+            onStopPort={(port) => void handleStopPort(port)}
+            onShowDetails={setDetailsPort}
+            onOpenInBrowser={handleOpenPortInBrowser}
+          />
+          <LocalPortSection
+            id="external"
+            title={translate('auto.components.right.sidebar.PortsPanel.d32820d3e2', 'External')}
+            ports={externalPorts}
+            collapsed={collapsedSections.external ?? false}
+            onToggle={() => toggleSection('external')}
+            onStopPort={(port) => void handleStopPort(port)}
+            onShowDetails={setDetailsPort}
+            onOpenInBrowser={handleOpenPortInBrowser}
+          />
+        </>
+      )}
+
+      {!displayScan?.unavailableReason &&
+        displayScan &&
+        activePorts.length === 0 &&
+        otherWorkspacePorts.length === 0 &&
+        externalPorts.length === 0 && (
+          <div className="flex flex-col items-center justify-center flex-1 px-4 text-center text-muted-foreground">
+            <Server size={32} className="mb-3 opacity-50" />
+            <p className="text-sm">
+              {translate(
+                'auto.components.right.sidebar.PortsPanel.a2a9fc6899',
+                'No local ports detected'
+              )}
+            </p>
+          </div>
+        )}
+
+      <LocalPortDetailsDialog port={detailsPort} onClose={() => setDetailsPort(null)} />
+    </div>
+  )
+}
diff --git a/src/renderer/src/components/right-sidebar/ssh-detected-port-row.tsx b/src/renderer/src/components/right-sidebar/ssh-detected-port-row.tsx
new file mode 100644
index 00000000000..3991ce9c4dc
--- /dev/null
+++ b/src/renderer/src/components/right-sidebar/ssh-detected-port-row.tsx
@@ -0,0 +1,42 @@
+import React from 'react'
+import { advertisedBrowserUrlForDetectedPort } from '@/lib/workspace-port-urls'
+import type { EnrichedDetectedPort } from '../../../../shared/ssh-types'
+import { translate } from '@/i18n/i18n'
+
+export function SshDetectedPortRow({
+  port,
+  onForward
+}: {
+  port: EnrichedDetectedPort & { targetId: string }
+  onForward: () => void
+}): React.JSX.Element {
+  const advertisedBrowserUrl = advertisedBrowserUrlForDetectedPort(port)
+  return (
+    <div className="group flex items-center gap-2 py-1 px-1 -mx-1 rounded hover:bg-accent/50 transition-colors">
+      <div className="flex-1 min-w-0">
+        <div className="flex items-center gap-1.5">
+          <span className="text-xs text-foreground">:{port.port}</span>
+          {port.processName && (
+            <span className="text-xs text-muted-foreground truncate">{port.processName}</span>
+          )}
+        </div>
+        {advertisedBrowserUrl && (
+          <div className="text-[11px] text-muted-foreground/70 truncate">
+            {translate(
+              'auto.components.right.sidebar.PortsPanel.c7e920aa7c',
+              'advertised as {{value0}}',
+              { value0: advertisedBrowserUrl }
+            )}
+          </div>
+        )}
+      </div>
+      <button
+        type="button"
+        className="text-[11px] px-2 py-0.5 rounded can-hover:opacity-0 group-hover:opacity-100 transition-opacity bg-accent hover:bg-accent/80 text-foreground"
+        onClick={onForward}
+      >
+        {translate('auto.components.right.sidebar.PortsPanel.c9d106547a', 'Forward')}
+      </button>
+    </div>
+  )
+}
diff --git a/src/renderer/src/components/right-sidebar/ssh-forwarded-port-row.tsx b/src/renderer/src/components/right-sidebar/ssh-forwarded-port-row.tsx
new file mode 100644
index 00000000000..7513672bd58
--- /dev/null
+++ b/src/renderer/src/components/right-sidebar/ssh-forwarded-port-row.tsx
@@ -0,0 +1,176 @@
+import React, { useCallback, useState } from 'react'
+import { Copy, ExternalLink, Pencil, Trash2 } from 'lucide-react'
+import { cn } from '@/lib/utils'
+import { useMountedRef } from '@/hooks/useMountedRef'
+import { getPortOpenBrowserTooltipLabel } from '@/lib/workspace-port-actions'
+import {
+  addressForPortForwardEntry,
+  advertisedBrowserUrlForForwardedRow
+} from '@/lib/workspace-port-urls'
+import type { PortForwardEntry } from '../../../../shared/ssh-types'
+import { translate } from '@/i18n/i18n'
+
+export function SshForwardedPortRow({
+  entry,
+  onEdit,
+  onOpenInBrowser
+}: {
+  entry: PortForwardEntry
+  onEdit: () => void
+  onOpenInBrowser: (event?: React.MouseEvent<HTMLButtonElement>) => void
+}): React.JSX.Element {
+  const [removing, setRemoving] = useState(false)
+  const mountedRef = useMountedRef()
+  const forwardedAddress = addressForPortForwardEntry(entry)
+
+  const handleRemove = useCallback(async () => {
+    setRemoving(true)
+    try {
+      await window.api.ssh.removePortForward({ id: entry.id })
+    } catch {
+      // broadcast will update state
+    }
+    if (mountedRef.current) {
+      setRemoving(false)
+    }
+  }, [entry.id, mountedRef])
+
+  const handleCopy = useCallback(() => {
+    void window.api.ui.writeClipboardText(forwardedAddress)
+  }, [forwardedAddress])
+
+  const handleOpenBrowser = useCallback(
+    (event?: React.MouseEvent<HTMLButtonElement>) => {
+      onOpenInBrowser(event)
+    },
+    [onOpenInBrowser]
+  )
+
+  const handleCopyButtonClick = useCallback(
+    (event: React.MouseEvent<HTMLButtonElement>) => {
+      handleCopy()
+      if (event.detail > 0) {
+        event.currentTarget.blur()
+      }
+    },
+    [handleCopy]
+  )
+
+  const handleOpenBrowserButtonClick = useCallback(
+    (event: React.MouseEvent<HTMLButtonElement>) => {
+      // Why: keyboard activations have detail=0; only pointer clicks carry
+      // the modifier intent for the system-browser escape hatch.
+      handleOpenBrowser(event.detail > 0 ? event : undefined)
+      if (event.detail > 0) {
+        event.currentTarget.blur()
+      }
+    },
+    [handleOpenBrowser]
+  )
+
+  const handleEditButtonClick = useCallback(
+    (event: React.MouseEvent<HTMLButtonElement>) => {
+      onEdit()
+      if (event.detail > 0) {
+        event.currentTarget.blur()
+      }
+    },
+    [onEdit]
+  )
+
+  const handleRemoveButtonClick = useCallback(
+    (event: React.MouseEvent<HTMLButtonElement>) => {
+      void handleRemove()
+      if (event.detail > 0) {
+        event.currentTarget.blur()
+      }
+    },
+    [handleRemove]
+  )
+
+  const advertisedBrowserUrl = advertisedBrowserUrlForForwardedRow(entry)
+  const openBrowserLabel = translate(
+    'auto.components.right.sidebar.PortsPanel.b22b128b2a',
+    'Open in Browser'
+  )
+  const openBrowserTitle = getPortOpenBrowserTooltipLabel(
+    advertisedBrowserUrl
+      ? translate(
+          'auto.components.right.sidebar.PortsPanel.75aeea592f',
+          'Open {{value0}} in Browser',
+          {
+            value0: advertisedBrowserUrl
+          }
+        )
+      : openBrowserLabel
+  )
+
+  return (
+    <div className="group flex items-center gap-2 py-1 px-1 -mx-1 rounded hover:bg-accent/50 transition-colors">
+      <div className="flex-1 min-w-0">
+        <div className="flex items-center gap-1.5">
+          {entry.label && (
+            <span className="text-xs font-medium text-foreground truncate">{entry.label}</span>
+          )}
+          <span
+            className={cn(
+              'text-xs text-muted-foreground truncate',
+              !entry.label && 'text-foreground'
+            )}
+          >
+            :{entry.localPort} → :{entry.remotePort}
+          </span>
+        </div>
+        {advertisedBrowserUrl && (
+          <div className="text-[11px] text-muted-foreground/70 truncate">
+            {translate('auto.components.right.sidebar.PortsPanel.de349d4560', 'opens {{value0}}', {
+              value0: advertisedBrowserUrl
+            })}
+          </div>
+        )}
+      </div>
+      <div className="flex items-center gap-0.5 can-hover:opacity-0 group-hover:opacity-100 group-focus-within:opacity-100 transition-opacity">
+        <button
+          type="button"
+          className="p-1 rounded hover:bg-accent transition-colors text-muted-foreground hover:text-foreground"
+          onClick={handleOpenBrowserButtonClick}
+          title={openBrowserTitle}
+        >
+          <ExternalLink size={13} />
+        </button>
+        <button
+          type="button"
+          className="p-1 rounded hover:bg-accent transition-colors text-muted-foreground hover:text-foreground"
+          onClick={handleCopyButtonClick}
+          title={translate(
+            'auto.components.right.sidebar.PortsPanel.1004af16ab',
+            'Copy {{value0}}',
+            { value0: forwardedAddress }
+          )}
+        >
+          <Copy size={13} />
+        </button>
+        <button
+          type="button"
+          className="p-1 rounded hover:bg-accent transition-colors text-muted-foreground hover:text-foreground"
+          onClick={handleEditButtonClick}
+          title={translate('auto.components.right.sidebar.PortsPanel.b3548e59f4', 'Edit')}
+        >
+          <Pencil size={13} />
+        </button>
+        <button
+          type="button"
+          className={cn(
+            'p-1 rounded hover:bg-accent transition-colors text-muted-foreground hover:text-foreground',
+            removing && 'opacity-50'
+          )}
+          onClick={handleRemoveButtonClick}
+          disabled={removing}
+          title={translate('auto.components.right.sidebar.PortsPanel.e740075063', 'Remove')}
+        >
+          <Trash2 size={13} />
+        </button>
+      </div>
+    </div>
+  )
+}
diff --git a/src/renderer/src/components/right-sidebar/ssh-port-forward-dialog.tsx b/src/renderer/src/components/right-sidebar/ssh-port-forward-dialog.tsx
new file mode 100644
index 00000000000..e1cf0188e62
--- /dev/null
+++ b/src/renderer/src/components/right-sidebar/ssh-port-forward-dialog.tsx
@@ -0,0 +1,313 @@
+import React, { useCallback, useState } from 'react'
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogHeader,
+  DialogTitle
+} from '@/components/ui/dialog'
+import { Button } from '@/components/ui/button'
+import type { PortForwardEntry } from '../../../../shared/ssh-types'
+import { translate } from '@/i18n/i18n'
+
+// Why: ports < 1024 require root to bind on the local machine. Remap them
+// to a high port so the default "Forward" action doesn't fail with EACCES.
+function safeLocalPort(remotePort: number): number {
+  if (remotePort < 1024) {
+    return remotePort + 10000
+  }
+  return remotePort
+}
+
+export type PortForwardDialogState =
+  | { mode: 'closed' }
+  | {
+      mode: 'add'
+      defaults: { remotePort?: number; remoteHost?: string; label?: string; targetId?: string }
+    }
+  | { mode: 'edit'; entry: PortForwardEntry }
+
+function digitsOnly(value: string): string {
+  return value.replace(/\D/g, '')
+}
+
+const INPUT_CLASS =
+  'block w-full mt-0.5 px-2 py-1.5 text-xs rounded border border-border bg-background text-foreground focus:outline-none focus:ring-1 focus:ring-ring'
+
+export function SshPortForwardDialog({
+  state,
+  activeConnectionId,
+  onClose
+}: {
+  state: PortForwardDialogState
+  activeConnectionId: string | null
+  onClose: () => void
+}): React.JSX.Element {
+  const isOpen = state.mode !== 'closed'
+  const isEdit = state.mode === 'edit'
+
+  const initialRemotePort =
+    state.mode === 'edit'
+      ? state.entry.remotePort.toString()
+      : state.mode === 'add'
+        ? (state.defaults.remotePort?.toString() ?? '')
+        : ''
+
+  const initialLocalPort =
+    state.mode === 'edit'
+      ? state.entry.localPort.toString()
+      : state.mode === 'add' && state.defaults.remotePort != null
+        ? safeLocalPort(state.defaults.remotePort).toString()
+        : ''
+
+  const initialRemoteHost =
+    state.mode === 'edit'
+      ? state.entry.remoteHost
+      : state.mode === 'add'
+        ? (state.defaults.remoteHost ?? 'localhost')
+        : 'localhost'
+
+  const initialLabel =
+    state.mode === 'edit'
+      ? (state.entry.label ?? '')
+      : state.mode === 'add'
+        ? (state.defaults.label ?? '')
+        : ''
+
+  // Why: capture the target at dialog-open time via defaults.targetId so
+  // switching worktrees while the dialog is open doesn't redirect the
+  // forward to the wrong SSH connection.
+  const targetId =
+    state.mode === 'edit'
+      ? state.entry.connectionId
+      : state.mode === 'add'
+        ? (state.defaults.targetId ?? activeConnectionId ?? '')
+        : (activeConnectionId ?? '')
+
+  return (
+    <Dialog
+      open={isOpen}
+      onOpenChange={(open) => {
+        if (!open) {
+          onClose()
+        }
+      }}
+    >
+      <DialogContent showCloseButton={false} className="max-w-[340px]">
+        <DialogHeader>
+          <DialogTitle className="text-sm">
+            {isEdit
+              ? translate(
+                  'auto.components.right.sidebar.PortsPanel.80206251c8',
+                  'Edit Port Forward'
+                )
+              : translate('auto.components.right.sidebar.PortsPanel.907eb53ed2', 'Forward a Port')}
+          </DialogTitle>
+          <DialogDescription className="text-xs">
+            {isEdit
+              ? translate(
+                  'auto.components.right.sidebar.PortsPanel.10360598a4',
+                  'Update the port forwarding configuration.'
+                )
+              : translate(
+                  'auto.components.right.sidebar.PortsPanel.31e80cff2d',
+                  'Forward a remote port to your local machine.'
+                )}
+          </DialogDescription>
+        </DialogHeader>
+        {isOpen && (
+          <PortForwardForm
+            key={
+              state.mode === 'edit'
+                ? `edit-${state.entry.id}`
+                : `add-${targetId}-${initialRemotePort}-${initialRemoteHost}`
+            }
+            mode={state.mode}
+            editId={state.mode === 'edit' ? state.entry.id : undefined}
+            initialRemotePort={initialRemotePort}
+            initialLocalPort={initialLocalPort}
+            initialRemoteHost={initialRemoteHost}
+            initialLabel={initialLabel}
+            targetId={targetId}
+            onClose={onClose}
+          />
+        )}
+      </DialogContent>
+    </Dialog>
+  )
+}
+
+function PortForwardForm({
+  mode,
+  editId,
+  initialRemotePort,
+  initialLocalPort,
+  initialRemoteHost,
+  initialLabel,
+  targetId,
+  onClose
+}: {
+  mode: 'add' | 'edit'
+  editId?: string
+  initialRemotePort: string
+  initialLocalPort: string
+  initialRemoteHost: string
+  initialLabel: string
+  targetId: string
+  onClose: () => void
+}): React.JSX.Element {
+  const [remotePort, setRemotePort] = useState(initialRemotePort)
+  const [localPort, setLocalPort] = useState(initialLocalPort)
+  const [remoteHost, setRemoteHost] = useState(initialRemoteHost)
+  const [label, setLabel] = useState(initialLabel)
+  const [error, setError] = useState<string | null>(null)
+  const [submitting, setSubmitting] = useState(false)
+
+  const handleSubmit = useCallback(
+    async (e: React.FormEvent) => {
+      e.preventDefault()
+      setError(null)
+
+      const rPort = Number.parseInt(remotePort, 10)
+      const lPort = Number.parseInt(localPort || remotePort, 10)
+
+      if (Number.isNaN(rPort) || rPort < 1 || rPort > 65535) {
+        setError('Remote port must be 1\u201365535')
+        return
+      }
+      if (Number.isNaN(lPort) || lPort < 1 || lPort > 65535) {
+        setError('Local port must be 1\u201365535')
+        return
+      }
+
+      setSubmitting(true)
+      try {
+        await (mode === 'edit' && editId
+          ? window.api.ssh.updatePortForward({
+              id: editId,
+              targetId,
+              localPort: lPort,
+              remoteHost: remoteHost || 'localhost',
+              remotePort: rPort,
+              label: label || undefined
+            })
+          : window.api.ssh.addPortForward({
+              targetId,
+              localPort: lPort,
+              remoteHost: remoteHost || 'localhost',
+              remotePort: rPort,
+              label: label || undefined
+            }))
+        onClose()
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : String(err)
+        if (msg.includes('EADDRINUSE') || msg.includes('already in use')) {
+          setError(`Port ${lPort} is already in use. Choose a different local port.`)
+        } else if (msg.includes('EACCES') || msg.includes('permission denied')) {
+          setError(`Port ${lPort} requires elevated privileges. Use a local port \u2265 1024.`)
+        } else {
+          setError(msg)
+        }
+      }
+      setSubmitting(false)
+    },
+    [mode, editId, remotePort, localPort, remoteHost, label, targetId, onClose]
+  )
+
+  return (
+    <form onSubmit={handleSubmit} className="space-y-3">
+      <div className="space-y-2">
+        <label className="block">
+          <span className="text-[11px] text-muted-foreground">
+            {translate('auto.components.right.sidebar.PortsPanel.9e5a4118b0', 'Remote Port')}
+          </span>
+          <input
+            type="text"
+            inputMode="numeric"
+            value={remotePort}
+            onChange={(e) => {
+              const val = digitsOnly(e.target.value)
+              setRemotePort(val)
+              const prev = Number.parseInt(remotePort, 10)
+              const cur = Number.parseInt(localPort, 10)
+              if (!localPort || cur === prev || cur === safeLocalPort(prev)) {
+                const parsed = Number.parseInt(val, 10)
+                setLocalPort(Number.isNaN(parsed) ? '' : safeLocalPort(parsed).toString())
+              }
+            }}
+            className={INPUT_CLASS}
+            placeholder="3000"
+            autoFocus
+            required
+          />
+        </label>
+
+        <label className="block">
+          <span className="text-[11px] text-muted-foreground">
+            {translate('auto.components.right.sidebar.PortsPanel.b950b1948b', 'Local Port')}
+          </span>
+          <input
+            type="text"
+            inputMode="numeric"
+            value={localPort}
+            onChange={(e) => setLocalPort(digitsOnly(e.target.value))}
+            className={INPUT_CLASS}
+            placeholder={translate(
+              'auto.components.right.sidebar.PortsPanel.d57545ff92',
+              'Same as remote'
+            )}
+          />
+        </label>
+
+        <label className="block">
+          <span className="text-[11px] text-muted-foreground">
+            {translate('auto.components.right.sidebar.PortsPanel.a3721a50b0', 'Remote Host')}
+          </span>
+          <input
+            type="text"
+            value={remoteHost}
+            onChange={(e) => setRemoteHost(e.target.value)}
+            className={INPUT_CLASS}
+            placeholder={translate(
+              'auto.components.right.sidebar.PortsPanel.17bea6e391',
+              'localhost'
+            )}
+          />
+        </label>
+
+        <label className="block">
+          <span className="text-[11px] text-muted-foreground">
+            {translate('auto.components.right.sidebar.PortsPanel.8dfed0a15c', 'Label (optional)')}
+          </span>
+          <input
+            type="text"
+            value={label}
+            onChange={(e) => setLabel(e.target.value)}
+            className={INPUT_CLASS}
+            placeholder={translate(
+              'auto.components.right.sidebar.PortsPanel.4eb801ce93',
+              'dev-server'
+            )}
+          />
+        </label>
+      </div>
+
+      {error && <div className="text-[11px] text-destructive">{error}</div>}
+
+      <div className="flex justify-end gap-2">
+        <Button type="button" variant="outline" size="sm" onClick={onClose}>
+          {translate('auto.components.right.sidebar.PortsPanel.3ea4a02a8f', 'Cancel')}
+        </Button>
+        <Button type="submit" size="sm" disabled={submitting || !remotePort}>
+          {submitting
+            ? mode === 'edit'
+              ? translate('auto.components.right.sidebar.PortsPanel.d7c83cfd24', 'Saving...')
+              : translate('auto.components.right.sidebar.PortsPanel.9f475dc994', 'Forwarding...')
+            : mode === 'edit'
+              ? translate('auto.components.right.sidebar.PortsPanel.9079776663', 'Save')
+              : translate('auto.components.right.sidebar.PortsPanel.c9d106547a', 'Forward')}
+        </Button>
+      </div>
+    </form>
+  )
+}
diff --git a/src/renderer/src/components/right-sidebar/ssh-ports-panel.tsx b/src/renderer/src/components/right-sidebar/ssh-ports-panel.tsx
new file mode 100644
index 00000000000..48dfac0f8ae
--- /dev/null
+++ b/src/renderer/src/components/right-sidebar/ssh-ports-panel.tsx
@@ -0,0 +1,255 @@
+import React, { useCallback, useMemo, useState } from 'react'
+import { ChevronRight, Plus, Unplug } from 'lucide-react'
+import { toast } from 'sonner'
+import { useAppStore } from '@/store'
+import { useActiveWorktree, useRepoById } from '@/store/selectors'
+import { cn } from '@/lib/utils'
+import { resolvePortOpenInOrcaBrowser } from '@/lib/workspace-port-actions'
+import { browserUrlForPortForwardEntry } from '@/lib/workspace-port-urls'
+import type { EnrichedDetectedPort, PortForwardEntry } from '../../../../shared/ssh-types'
+import { translate } from '@/i18n/i18n'
+import { openWorkspaceBrowserTab } from '@/lib/workspace-browser-tab-open'
+import { SshForwardedPortRow } from './ssh-forwarded-port-row'
+import { SshDetectedPortRow } from './ssh-detected-port-row'
+import { SshPortForwardDialog, type PortForwardDialogState } from './ssh-port-forward-dialog'
+
+// Why: forwarded SSH ports and detected remote ports may report the same loopback
+// endpoint using different textual hosts. Normalize for deduping only.
+const LOOPBACK_HOSTS = new Set(['localhost', '127.0.0.1', '::1', '0.0.0.0', '::'])
+function normalizeHost(host: string | undefined): string {
+  if (!host || LOOPBACK_HOSTS.has(host)) {
+    return 'localhost'
+  }
+  return host
+}
+
+export function SshPortsPanel(): React.JSX.Element {
+  const settings = useAppStore((s) => s.settings)
+  const portForwardsByConnection = useAppStore((s) => s.portForwardsByConnection)
+  const detectedPortsByConnection = useAppStore((s) => s.detectedPortsByConnection)
+  const sshConnectionStates = useAppStore((s) => s.sshConnectionStates)
+  // Why: scope the panel to the active worktree's SSH connection so
+  // actions target the correct machine and the disconnected state
+  // reflects the active worktree, not some other SSH session.
+  const activeWorktree = useActiveWorktree()
+  const activeRepo = useRepoById(activeWorktree?.repoId ?? null)
+  const activeConnectionId = activeRepo?.connectionId ?? null
+
+  const isDisconnected = activeConnectionId
+    ? sshConnectionStates.get(activeConnectionId)?.status !== 'connected'
+    : true
+
+  const allForwards = useMemo(() => {
+    if (!activeConnectionId) {
+      return []
+    }
+    return portForwardsByConnection[activeConnectionId] ?? []
+  }, [portForwardsByConnection, activeConnectionId])
+
+  const forwardedKeys = useMemo(() => {
+    const set = new Set<string>()
+    for (const f of allForwards) {
+      set.add(`${normalizeHost(f.remoteHost)}:${f.remotePort}`)
+    }
+    return set
+  }, [allForwards])
+
+  const allDetected = useMemo(() => {
+    if (!activeConnectionId) {
+      return []
+    }
+    const ports = detectedPortsByConnection[activeConnectionId] ?? []
+    return ports
+      .filter((p) => !forwardedKeys.has(`${normalizeHost(p.host)}:${p.port}`))
+      .map((p) => ({ ...p, targetId: activeConnectionId }))
+      .sort((a, b) => a.port - b.port)
+  }, [detectedPortsByConnection, activeConnectionId, forwardedKeys])
+
+  const [forwardedCollapsed, setForwardedCollapsed] = useState(false)
+  const [detectedCollapsed, setDetectedCollapsed] = useState(false)
+  const [dialogState, setDialogState] = useState<PortForwardDialogState>({ mode: 'closed' })
+
+  const handleForwardDetected = useCallback((port: EnrichedDetectedPort & { targetId: string }) => {
+    setDialogState({
+      mode: 'add',
+      defaults: {
+        remotePort: port.port,
+        remoteHost: normalizeHost(port.host),
+        label: port.processName,
+        targetId: port.targetId
+      }
+    })
+  }, [])
+
+  const handleEdit = useCallback((entry: PortForwardEntry) => {
+    setDialogState({ mode: 'edit', entry })
+  }, [])
+
+  const handleOpenForwardInBrowser = useCallback(
+    (entry: PortForwardEntry, event?: React.MouseEvent<HTMLButtonElement>) => {
+      const url = browserUrlForPortForwardEntry(entry)
+      if (
+        !resolvePortOpenInOrcaBrowser({
+          settings,
+          event,
+          isMac: navigator.userAgent.includes('Mac')
+        })
+      ) {
+        void window.api.shell.openUrl(url)
+        return
+      }
+      if (!activeWorktree?.id) {
+        toast.error(
+          translate(
+            'auto.components.right.sidebar.PortsPanel.409afcc145',
+            'No workspace selected for the browser.'
+          )
+        )
+        return
+      }
+      void openWorkspaceBrowserTab({
+        workspaceId: activeWorktree.id,
+        url,
+        intent: { kind: 'url' }
+      }).catch((error) => {
+        toast.error(error instanceof Error ? error.message : String(error))
+      })
+    },
+    [activeWorktree?.id, settings]
+  )
+
+  const handleDialogClose = useCallback(() => {
+    setDialogState({ mode: 'closed' })
+  }, [])
+
+  if (isDisconnected) {
+    return (
+      <div className="flex flex-col items-center justify-center h-full px-4 text-center text-muted-foreground">
+        <Unplug size={32} className="mb-3 opacity-50" />
+        <p className="text-sm font-medium">
+          {translate('auto.components.right.sidebar.PortsPanel.a2f1a47f42', 'SSH connection lost')}
+        </p>
+        <p className="text-xs mt-1">
+          {translate('auto.components.right.sidebar.PortsPanel.d4c3cd679c', 'Reconnecting...')}
+        </p>
+      </div>
+    )
+  }
+
+  return (
+    <div className="flex flex-col h-full overflow-y-auto scrollbar-sleek">
+      {/* Header */}
+      <div className="flex items-center justify-between px-3 py-2 border-b border-border">
+        <span className="text-[11px] font-semibold uppercase tracking-wider text-muted-foreground">
+          {translate('auto.components.right.sidebar.PortsPanel.6bc058dbe1', 'Ports')}
+        </span>
+        <button
+          type="button"
+          className="flex items-center gap-1 text-xs text-muted-foreground hover:text-foreground transition-colors"
+          onClick={() =>
+            setDialogState({ mode: 'add', defaults: { targetId: activeConnectionId ?? undefined } })
+          }
+        >
+          <Plus size={14} />
+          {translate('auto.components.right.sidebar.PortsPanel.a103dae837', 'Add')}
+        </button>
+      </div>
+
+      {/* Forwarded ports */}
+      {allForwards.length > 0 && (
+        <div className="px-3 pt-2">
+          <button
+            type="button"
+            className="flex items-center gap-1 w-full text-left mb-1"
+            onClick={() => setForwardedCollapsed((v) => !v)}
+          >
+            <ChevronRight
+              size={12}
+              className={cn(
+                'text-muted-foreground transition-transform',
+                !forwardedCollapsed && 'rotate-90'
+              )}
+            />
+            <span className="text-[10px] font-semibold uppercase tracking-wider text-muted-foreground">
+              {translate('auto.components.right.sidebar.PortsPanel.ddbe58d74e', 'Forwarded')}
+            </span>
+            <span className="text-[10px] text-muted-foreground/60 ml-1">{allForwards.length}</span>
+          </button>
+          {!forwardedCollapsed &&
+            allForwards.map((entry) => (
+              <SshForwardedPortRow
+                key={entry.id}
+                entry={entry}
+                onEdit={() => handleEdit(entry)}
+                onOpenInBrowser={(event) => handleOpenForwardInBrowser(entry, event)}
+              />
+            ))}
+        </div>
+      )}
+
+      {/* Detected ports */}
+      {allDetected.length > 0 && (
+        <div className="px-3 pt-2">
+          <button
+            type="button"
+            className="flex items-center gap-1 w-full text-left mb-1"
+            onClick={() => setDetectedCollapsed((v) => !v)}
+          >
+            <ChevronRight
+              size={12}
+              className={cn(
+                'text-muted-foreground transition-transform',
+                !detectedCollapsed && 'rotate-90'
+              )}
+            />
+            <span className="text-[10px] font-semibold uppercase tracking-wider text-muted-foreground">
+              {translate('auto.components.right.sidebar.PortsPanel.36b1b2984a', 'Detected')}
+            </span>
+            <span className="text-[10px] text-muted-foreground/60 ml-1">{allDetected.length}</span>
+          </button>
+          {!detectedCollapsed &&
+            allDetected.map((port) => (
+              <SshDetectedPortRow
+                key={`${port.targetId}-${port.host}-${port.port}`}
+                port={port}
+                onForward={() => handleForwardDetected(port)}
+              />
+            ))}
+        </div>
+      )}
+
+      {/* Empty state */}
+      {allForwards.length === 0 && allDetected.length === 0 && (
+        <div className="flex flex-col items-center justify-center flex-1 px-4 text-center text-muted-foreground">
+          <p className="text-sm">
+            {translate('auto.components.right.sidebar.PortsPanel.1f0d2a24f9', 'No forwarded ports')}
+          </p>
+          <p className="text-xs mt-1 mb-3">
+            {translate(
+              'auto.components.right.sidebar.PortsPanel.04efd3dad4',
+              'Forward a port to access remote services on your local machine.'
+            )}
+          </p>
+          <button
+            type="button"
+            className="text-xs px-3 py-1.5 rounded bg-primary text-primary-foreground hover:bg-primary/90 transition-colors"
+            onClick={() =>
+              setDialogState({
+                mode: 'add',
+                defaults: { targetId: activeConnectionId ?? undefined }
+              })
+            }
+          >
+            {translate('auto.components.right.sidebar.PortsPanel.907eb53ed2', 'Forward a Port')}
+          </button>
+        </div>
+      )}
+
+      <SshPortForwardDialog
+        state={dialogState}
+        activeConnectionId={activeConnectionId}
+        onClose={handleDialogClose}
+      />
+    </div>
+  )
+}
diff --git a/src/renderer/src/components/settings/AccountsPane.tsx b/src/renderer/src/components/settings/AccountsPane.tsx
index c778a982aa0..82e2b1c3683 100644
--- a/src/renderer/src/components/settings/AccountsPane.tsx
+++ b/src/renderer/src/components/settings/AccountsPane.tsx
@@ -1,356 +1,67 @@
-/* eslint-disable max-lines -- Why: AccountsPane owns all per-provider account UI
-   (Claude, Codex, Gemini, OpenCode Go, and future providers). Each provider's
-   add/select/reauth/remove flow is tightly coupled to the provider-specific
-   error handling and restart prompts below; splitting them into separate files
-   would scatter those flows without a meaningful abstraction boundary. */
 import { useEffect, useRef, useState } from 'react'
-import type { GlobalSettings } from '../../../../shared/global-settings-types'
 import type {
   ClaudeRateLimitAccountsState,
-  CodexRateLimitAccountsState,
-  CodexSystemDefaultIdentity
+  CodexRateLimitAccountsState
 } from '../../../../shared/managed-account-types'
-import { resolveLocalAccountRuntimeTarget } from '../../../../shared/local-account-runtime'
-import { getRendererAppPlatform } from '../../lib/renderer-app-platform'
-import { Badge } from '../ui/badge'
-import { Button } from '../ui/button'
-import { Input } from '../ui/input'
-import { Label } from '../ui/label'
-import { Popover, PopoverContent, PopoverTrigger } from '../ui/popover'
-import { Separator } from '../ui/separator'
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '../ui/select'
-import { Switch } from '../ui/switch'
-import {
-  AlertTriangle,
-  ExternalLink,
-  HelpCircle,
-  Loader2,
-  Lock,
-  LockOpen,
-  Plus,
-  RefreshCw,
-  ShieldCheck,
-  Trash2,
-  X
-} from 'lucide-react'
-import { useAppStore } from '../../store'
-import {
-  ClaudeIcon,
-  GeminiIcon,
-  MiniMaxIcon,
-  OpenAIIcon,
-  OpenCodeGoIcon
-} from '../status-bar/icons'
-import { toast } from 'sonner'
-import {
-  getAccountsClaudeSearchEntries,
-  getAccountsCodexSearchEntries,
-  getAccountsGeminiSearchEntries,
-  getAccountsLocationSearchEntries,
-  getAccountsGrokSearchEntries,
-  getAccountsMiniMaxSearchEntries,
-  getAccountsOpencodeSearchEntries,
-  getAccountsPaneSearchEntries
-} from './accounts-search'
-import { GrokAccountsSection } from './GrokAccountsSection'
-import { getRemoteAccountsPaneScope } from './provider-account-scope'
-import { ProviderHostScopeControl } from './ProviderHostScopeControl'
-import { SearchableSetting } from './SearchableSetting'
-import { SettingsRow, SettingsSegmentedControl } from './SettingsFormControls'
-import { matchesSettingsSearch } from './settings-search'
-import {
-  markLiveCodexSessionsForRestart,
-  resolveCodexRestartPromptAccountLabel
-} from '@/lib/codex-session-restart'
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle
-} from '../ui/dialog'
-import { getCodexAccountAuthWarning } from './codex-account-auth-warning'
-import { getCodexConfigSyncWarning } from './codex-config-sync-warning'
 import type { CodexConfigSyncStatus } from '../../../../shared/codex-config-sync-types'
-import {
-  getProviderAccountActiveIdForView,
-  getProviderAccountRuntime,
-  providerAccountIsActiveInView,
-  providerAccountMatchesView,
-  WSL_DEFAULT_DISTRO_KEY,
-  type ProviderAccountRuntimeView
-} from './provider-account-visibility'
+import { toast } from 'sonner'
+import { useAppStore } from '../../store'
 import { translate } from '@/i18n/i18n'
-import { formatUiRelativeTime } from '@/i18n/relative-time-format'
-import { cn } from '@/lib/utils'
 import { isWebClientLocation } from '@/lib/web-client-location'
 import {
   emptyClaudeAccountsState,
   emptyCodexAccountsState,
   hasRemoteProviderAccountOwner,
-  removeClaudeProviderAccount,
-  removeCodexProviderAccount,
-  selectClaudeProviderAccount,
-  selectCodexProviderAccount,
   watchProviderAccounts
 } from '@/runtime/runtime-provider-accounts-client'
-
-// Why: bounded so a permanently unreadable home cannot poll forever; ~5 minutes
-// total is long enough to outlast an antivirus scan or backup pass.
-const CODEX_CONFIG_SYNC_RETRY_MS = 30_000
-const CODEX_CONFIG_SYNC_RETRY_LIMIT = 10
-
-function watchCodexConfigSyncStatus(
-  onStatus: (status: CodexConfigSyncStatus | null) => void
-): () => void {
-  let cancelled = false
-  let attempts = 0
-  let retryTimer: ReturnType<typeof setTimeout> | null = null
-  const poll = (): void => {
-    void window.api.codexConfigSync
-      .status()
-      .then((status) => {
-        if (cancelled) {
-          return
-        }
-        onStatus(status)
-        if (
-          status.state === 'stalled' &&
-          status.reason === 'managed-home-unavailable' &&
-          attempts < CODEX_CONFIG_SYNC_RETRY_LIMIT
-        ) {
-          attempts += 1
-          retryTimer = setTimeout(poll, CODEX_CONFIG_SYNC_RETRY_MS)
-        }
-      })
-      .catch(() => {
-        if (!cancelled) {
-          onStatus(null)
-        }
-      })
-  }
-  poll()
-  return () => {
-    cancelled = true
-    if (retryTimer !== null) {
-      clearTimeout(retryTimer)
-    }
-  }
-}
+import {
+  getAccountsClaudeSearchEntries,
+  getAccountsCodexSearchEntries,
+  getAccountsGeminiSearchEntries,
+  getAccountsGrokSearchEntries,
+  getAccountsLocationSearchEntries,
+  getAccountsMiniMaxSearchEntries,
+  getAccountsOpencodeSearchEntries,
+  getAccountsPaneSearchEntries
+} from './accounts-search'
+import { getRemoteAccountsPaneScope } from './provider-account-scope'
+import { ProviderHostScopeControl } from './ProviderHostScopeControl'
+import { matchesSettingsSearch } from './settings-search'
+import { getCodexAccountAuthWarning } from './codex-account-auth-warning'
+import { getCodexConfigSyncWarning } from './codex-config-sync-warning'
+import {
+  getProviderAccountActiveIdForView,
+  providerAccountIsActiveInView,
+  providerAccountMatchesView
+} from './provider-account-visibility'
+import { Separator } from '../ui/separator'
+import { GrokAccountsSection } from './GrokAccountsSection'
+import type {
+  AccountsPaneProps,
+  AccountsPaneSectionModel,
+  ClaudeAccountAction,
+  CodexAccountAction,
+  RemoveAccountTarget
+} from './accounts-pane-types'
+import { EMPTY_WSL_DISTROS, getSelectedAccountRuntime } from './accounts-pane-runtime'
+import { watchCodexConfigSyncStatus } from './accounts-pane-config-sync'
+import {
+  createClaudeAccountActionRunner,
+  createCodexAccountActionRunner
+} from './accounts-pane-account-actions'
+import { createMiniMaxCredentialActions } from './accounts-pane-minimax-actions'
+import { renderAccountsLocationSection } from './accounts-pane-location-section'
+import { renderClaudeAccountsSection } from './accounts-pane-claude-section'
+import { renderCodexAccountsSection } from './accounts-pane-codex-section'
+import {
+  renderGeminiAccountsSection,
+  renderOpenCodeAccountsSection
+} from './accounts-pane-provider-setting-sections'
+import { renderMiniMaxAccountsSection } from './accounts-pane-minimax-section'
+import { renderAccountsRemovalDialogs } from './accounts-pane-removal-dialogs'
 
 export { getAccountsPaneSearchEntries }
 
-const EMPTY_WSL_DISTROS: string[] = []
-const MINIMAX_CONSOLE_URL = 'https://platform.minimax.io/console/usage'
-
-function formatMiniMaxRelativeRefresh(updatedAt: number, now: number): string {
-  const diffMs = Math.max(0, now - updatedAt)
-  if (diffMs < 60_000) {
-    return translate('auto.components.settings.AccountsPane.3a30aaf526', 'just now')
-  }
-  return formatUiRelativeTime(-diffMs)
-}
-
-function MiniMaxCookieHelpPopover(): React.JSX.Element {
-  const steps = [
-    translate(
-      'auto.components.settings.AccountsPane.f5d8d2a6a1',
-      'Open platform.minimax.io/console/usage in your browser and sign in.'
-    ),
-    translate('auto.components.settings.AccountsPane.24560fe830', 'Open DevTools.'),
-    translate(
-      'auto.components.settings.AccountsPane.4cab0fa42d',
-      'Go to the Network tab and enable Preserve log.'
-    ),
-    translate('auto.components.settings.AccountsPane.bee4e63e1c', 'Reload the page.'),
-    translate(
-      'auto.components.settings.AccountsPane.87f814af6f',
-      'Filter for remains and select the coding_plan/remains request.'
-    ),
-    translate(
-      'auto.components.settings.AccountsPane.435df0ee51',
-      'Under Request Headers, copy the Cookie value.'
-    ),
-    translate('auto.components.settings.AccountsPane.7492fb3bba', 'Paste it here and click Save.')
-  ]
-  return (
-    <div className="space-y-3 p-3 text-xs">
-      <div className="space-y-1">
-        <p className="font-medium">
-          {translate('auto.components.settings.AccountsPane.9fec52de4b', 'How to copy the cookie')}
-        </p>
-        <p className="text-muted-foreground">
-          {translate(
-            'auto.components.settings.AccountsPane.4e32e030b2',
-            'Stored locally. Orca sends it only to platform.minimax.io for usage refreshes.'
-          )}
-        </p>
-      </div>
-      <ol className="list-decimal space-y-1 pl-4 text-muted-foreground">
-        {steps.map((step) => (
-          <li key={step}>{step}</li>
-        ))}
-      </ol>
-    </div>
-  )
-}
-
-type AccountsPaneProps = {
-  settings: GlobalSettings
-  updateSettings: (updates: Partial<GlobalSettings>) => void
-  wslSupportedPlatform?: boolean
-  wslAvailable?: boolean
-  wslDistros?: string[]
-  wslCapabilitiesLoading?: boolean
-  accountOwnerPlatform?: NodeJS.Platform | null
-}
-
-function getHostRuntimeLabel(): string {
-  return navigator.userAgent.includes('Windows')
-    ? 'Windows'
-    : translate('auto.components.settings.AccountsPane.9baf45d071', 'This device')
-}
-
-// Why: the system-default row has no stored identity, so surface the real
-// ~/.codex login live — the OAuth email when signed in, a clear custom-provider
-// note for env-key logins, and the generic fallback when signed out.
-function getCodexSystemDefaultSubtitle(
-  identity: CodexSystemDefaultIdentity | undefined,
-  runtimeSentenceLabel: string
-): string {
-  if (identity?.authKind === 'oauth' && identity.email) {
-    return identity.email
-  }
-  if (identity?.authKind === 'api-key') {
-    return translate(
-      'auto.components.settings.AccountsPane.codexSystemDefaultCustomProvider',
-      'Custom provider — no usage tracked.'
-    )
-  }
-  return translate(
-    'auto.components.settings.AccountsPane.fcc4093fc1',
-    'Use your current {{value0}} Codex login.',
-    { value0: runtimeSentenceLabel }
-  )
-}
-
-function getClaudeAccountLabel(
-  state: ClaudeRateLimitAccountsState,
-  accountId: string | null | undefined
-): string {
-  if (accountId == null) {
-    return 'System default'
-  }
-  return state.accounts.find((account) => account.id === accountId)?.email ?? 'Claude account'
-}
-
-function getCodexAccountRuntimeLabel(
-  account: CodexRateLimitAccountsState['accounts'][number],
-  hostLabel = getHostRuntimeLabel()
-): string {
-  if (account.managedHomeRuntime === 'wsl') {
-    return account.wslDistro ? `WSL ${account.wslDistro}` : 'WSL'
-  }
-  return hostLabel
-}
-
-function getClaudeAccountRuntimeLabel(
-  account: ClaudeRateLimitAccountsState['accounts'][number],
-  hostLabel = getHostRuntimeLabel()
-): string {
-  if (account.managedAuthRuntime === 'wsl') {
-    return account.wslDistro ? `WSL ${account.wslDistro}` : 'WSL'
-  }
-  return hostLabel
-}
-
-function getCodexAccountErrorDescription(error: unknown): string {
-  const message = String((error as Error)?.message ?? error)
-    .replace(/^Error occurred in handler for 'codexAccounts:[^']+':\s*/i, '')
-    .replace(/^Error invoking remote method 'codexAccounts:[^']+':\s*/i, '')
-    .replace(/^Error:\s*/i, '')
-    .trim()
-  const normalizedMessage = message.toLowerCase()
-
-  // Why: Codex account actions cross the Electron IPC boundary, and invoke()
-  // failures often include transport-level wrapper text that is useful in
-  // devtools but noisy in product UI. Normalize the handful of expected auth
-  // failures here so users see actionable sign-in guidance instead of IPC
-  // internals or raw upstream wording.
-  if (normalizedMessage.includes('timed out waiting for codex login to finish')) {
-    return 'Codex sign-in took too long to finish. Please try again.'
-  }
-  if (normalizedMessage.includes('codex sign-in took too long to finish')) {
-    return 'Codex sign-in took too long to finish. Please try again.'
-  }
-  if (
-    normalizedMessage.includes('auth error 502') ||
-    normalizedMessage.includes('gateway') ||
-    normalizedMessage.includes('bad gateway')
-  ) {
-    return 'Codex sign-in is temporarily unavailable. Please try again in a minute.'
-  }
-  if (normalizedMessage.startsWith('codex login failed:')) {
-    const loginMessage = message.slice('Codex login failed:'.length).trim()
-    return loginMessage || 'Codex sign-in failed. Please try again.'
-  }
-
-  return message || 'Codex sign-in failed. Please try again.'
-}
-
-function getClaudeAccountErrorDescription(error: unknown): string {
-  return (
-    String((error as Error)?.message ?? error)
-      .replace(/^Error occurred in handler for 'claudeAccounts:[^']+':\s*/i, '')
-      .replace(/^Error invoking remote method 'claudeAccounts:[^']+':\s*/i, '')
-      .replace(/^Error:\s*/i, '')
-      .trim() || 'Claude sign-in failed. Please try again.'
-  )
-}
-
-function isClaudeAccountCancellation(error: unknown): boolean {
-  return getClaudeAccountErrorDescription(error).toLowerCase() === 'claude sign-in was cancelled.'
-}
-
-type LocalAccountRuntime = {
-  runtime: 'host' | 'wsl'
-  wslDistro?: string | null
-  label: string
-}
-
-function getSelectedAccountRuntime(
-  settings: GlobalSettings,
-  wslSupportedPlatform: boolean,
-  wslAvailable: boolean,
-  wslDistros: string[],
-  wslCapabilitiesLoading: boolean
-): LocalAccountRuntime {
-  // Why: the two-option control displays the concrete target behind the persisted auto policy.
-  const resolvedRuntime = resolveLocalAccountRuntimeTarget(settings, getRendererAppPlatform())
-  if (wslSupportedPlatform && resolvedRuntime.runtime === 'wsl') {
-    if (!wslAvailable && !wslCapabilitiesLoading) {
-      return {
-        runtime: 'wsl',
-        label: translate('auto.components.settings.AccountsPane.8619f9afa9', 'WSL')
-      }
-    }
-    const configuredDistro = resolvedRuntime.wslDistro?.trim() || null
-    const selectedDistro =
-      configuredDistro && (wslCapabilitiesLoading || wslDistros.includes(configuredDistro))
-        ? configuredDistro
-        : null
-    return {
-      runtime: 'wsl',
-      wslDistro: selectedDistro,
-      label: selectedDistro
-        ? `WSL ${selectedDistro}`
-        : translate('auto.components.settings.AccountsPane.2358ac71d2', 'WSL default')
-    }
-  }
-  return { runtime: 'host', label: getHostRuntimeLabel() }
-}
-
 export function AccountsPane({
   settings,
   updateSettings,
@@ -392,8 +103,8 @@ export function AccountsPane({
     ? (remoteServerName ??
       translate('auto.components.settings.AccountsPane.remoteServerFallback', 'the remote server'))
     : null
-  const accountRuntime: LocalAccountRuntime = isRemoteAccountScope
-    ? { runtime: 'host', label: remoteServerLabel ?? '' }
+  const accountRuntime = isRemoteAccountScope
+    ? { runtime: 'host' as const, label: remoteServerLabel ?? '' }
     : localAccountRuntime
   // Why: host runtime labels are standalone UI labels; interpolated prose needs sentence casing.
   const accountRuntimeSentenceLabel =
@@ -425,24 +136,14 @@ export function AccountsPane({
   const [codexAccounts, setCodexAccounts] =
     useState<CodexRateLimitAccountsState>(emptyCodexAccountsState)
   const [codexAccountsLoaded, setCodexAccountsLoaded] = useState(false)
-  const [codexAction, setCodexAction] = useState<
-    'idle' | 'adding' | `reauth:${string}` | `remove:${string}` | `select:${string}`
-  >('idle')
+  const [codexAction, setCodexAction] = useState<CodexAccountAction>('idle')
   const [claudeAccounts, setClaudeAccounts] =
     useState<ClaudeRateLimitAccountsState>(emptyClaudeAccountsState)
-  const [claudeAction, setClaudeAction] = useState<
-    'idle' | 'adding' | `reauth:${string}` | `remove:${string}` | `select:${string}`
-  >('idle')
+  const [claudeAction, setClaudeAction] = useState<ClaudeAccountAction>('idle')
   // Why: capture the account's runtime slot when the dialog opens; the roster
   // can change underneath an open dialog and lose the slot to diff for restarts.
-  const [removeCodexTarget, setRemoveCodexTarget] = useState<{
-    id: string
-    runtime: ProviderAccountRuntimeView
-  } | null>(null)
-  const [removeClaudeTarget, setRemoveClaudeTarget] = useState<{
-    id: string
-    runtime: ProviderAccountRuntimeView
-  } | null>(null)
+  const [removeCodexTarget, setRemoveCodexTarget] = useState<RemoveAccountTarget | null>(null)
+  const [removeClaudeTarget, setRemoveClaudeTarget] = useState<RemoveAccountTarget | null>(null)
   const accountVisibilityOptions = {
     remoteOwner: isRemoteAccountScope,
     ownerPlatform: accountOwnerPlatform
@@ -518,7 +219,6 @@ export function AccountsPane({
     recordedOpenCodeSettingEditsRef.current.add(field)
     recordFeatureInteraction('usage-tracking')
   }
-
   const refreshMiniMaxCredentialStatus = async (): Promise<void> => {
     try {
       const status = await window.api.minimaxCredentials.getStatus()
@@ -527,63 +227,13 @@ export function AccountsPane({
       console.error('Failed to load MiniMax credential status:', error)
     }
   }
-
-  const saveMiniMaxCookie = async (): Promise<void> => {
-    if (!miniMaxCookieDraft.trim()) {
-      toast.error(
-        translate('auto.components.settings.AccountsPane.2f24f244a4', 'MiniMax cookie is required.')
-      )
-      return
-    }
-    setMiniMaxCredentialBusy(true)
-    try {
-      const status = await window.api.minimaxCredentials.saveCookie(miniMaxCookieDraft.trim())
-      if (!status.configured) {
-        throw new Error(
-          translate(
-            'auto.components.settings.AccountsPane.8e6f0cb1d8',
-            'MiniMax cookie was not saved.'
-          )
-        )
-      }
-      setMiniMaxConfigured(status.configured)
-      setMiniMaxCookieDraft('')
-      recordFeatureInteraction('usage-tracking')
-      toast.success(
-        translate('auto.components.settings.AccountsPane.8d61637a77', 'MiniMax cookie saved.')
-      )
-    } catch (error) {
-      toast.error(
-        translate(
-          'auto.components.settings.AccountsPane.b43e761fe5',
-          'MiniMax cookie update failed.'
-        ),
-        { description: String((error as Error)?.message ?? error) }
-      )
-    } finally {
-      setMiniMaxCredentialBusy(false)
-    }
-  }
-
-  const clearMiniMaxCookie = async (): Promise<void> => {
-    setMiniMaxCredentialBusy(true)
-    try {
-      const status = await window.api.minimaxCredentials.clearCookie()
-      setMiniMaxConfigured(status.configured)
-      setMiniMaxCookieDraft('')
-      recordFeatureInteraction('usage-tracking')
-    } catch (error) {
-      toast.error(
-        translate(
-          'auto.components.settings.AccountsPane.b43e761fe5',
-          'MiniMax cookie update failed.'
-        ),
-        { description: String((error as Error)?.message ?? error) }
-      )
-    } finally {
-      setMiniMaxCredentialBusy(false)
-    }
-  }
+  const { saveMiniMaxCookie, clearMiniMaxCookie } = createMiniMaxCredentialActions({
+    miniMaxCookieDraft,
+    setMiniMaxCookieDraft,
+    setMiniMaxConfigured,
+    setMiniMaxCredentialBusy,
+    recordFeatureInteraction
+  })
 
   useEffect(() => {
     void refreshMiniMaxCredentialStatus()
@@ -613,1376 +263,106 @@ export function AccountsPane({
               'auto.components.settings.AccountsPane.loadAccountsFailed',
               'Could not load provider accounts.'
             ),
-            {
-              description: String((error as Error)?.message ?? error)
-            }
+            { description: String((error as Error)?.message ?? error) }
           )
         }
       }
     )
-
     return () => {
       watcher.close()
     }
   }, [activeRuntimeEnvironmentId])
 
-  const syncCodexAccounts = async (next: CodexRateLimitAccountsState): Promise<void> => {
-    setCodexAccounts(next)
-    setCodexAccountsLoaded(true)
-    // Why: remote mutations never change local GlobalSettings account fields.
-    if (!isRemoteAccountScope) {
-      await fetchSettings()
-    }
+  const runCodexAccountAction = createCodexAccountActionRunner({
+    settings,
+    accountRuntime,
+    isRemoteAccountScope,
+    codexAccounts,
+    setCodexAccounts,
+    setCodexAccountsLoaded,
+    setCodexAction,
+    fetchSettings,
+    recordFeatureInteraction
+  })
+  const runClaudeAccountAction = createClaudeAccountActionRunner({
+    settings,
+    accountRuntime,
+    isRemoteAccountScope,
+    claudeAccounts,
+    setClaudeAccounts,
+    setClaudeAction,
+    fetchSettings,
+    recordFeatureInteraction
+  })
+  const model: AccountsPaneSectionModel = {
+    settings,
+    updateSettings,
+    searchQuery,
+    recordFeatureInteraction,
+    wslSupportedPlatform,
+    wslAvailable,
+    wslDistros,
+    wslCapabilitiesLoading,
+    localAccountRuntime,
+    localAccountRuntimeSentenceLabel,
+    isRemoteAccountScope,
+    remoteServerName,
+    remoteAccountScopeNotice,
+    accountRuntime,
+    accountRuntimeSentenceLabel,
+    accountRuntimeUnavailable,
+    accountVisibilityOptions,
+    claudeAccounts,
+    claudeAction,
+    visibleClaudeAccounts,
+    systemClaudeActive,
+    setRemoveClaudeTarget,
+    runClaudeAccountAction,
+    codexAccounts,
+    codexAction,
+    visibleCodexAccounts,
+    systemCodexActive,
+    systemCodexNeedsSignIn,
+    systemCodexMissingSignIn,
+    systemCodexIdentity,
+    activeCodexAuthWarning,
+    activeCodexAccountId,
+    codexConfigSync,
+    codexConfigSyncWarning,
+    codexRateLimits,
+    codexRateLimitTarget,
+    setRemoveCodexTarget,
+    runCodexAccountAction,
+    recordOpenCodeSettingEdit,
+    miniMaxRateLimits,
+    miniMaxCookieDraft,
+    setMiniMaxCookieDraft,
+    miniMaxConfigured,
+    miniMaxCredentialBusy,
+    saveMiniMaxCookie,
+    clearMiniMaxCookie
   }
-
-  const syncClaudeAccounts = async (next: ClaudeRateLimitAccountsState): Promise<void> => {
-    setClaudeAccounts(next)
-    if (!isRemoteAccountScope) {
-      await fetchSettings()
-    }
-  }
-
-  const formatAccountTimestamp = (timestamp: number): string => {
-    return new Date(timestamp).toLocaleString(undefined, {
-      month: 'short',
-      day: 'numeric',
-      hour: 'numeric',
-      minute: '2-digit'
-    })
-  }
-
-  const accountRuntimeControls = wslSupportedPlatform ? (
-    <SearchableSetting
-      title={translate('auto.components.settings.AccountsPane.f54b4fbd71', 'Account Location')}
-      description={translate(
-        'auto.components.settings.AccountsPane.2cd197025c',
-        'Choose whether provider accounts are inspected and added in {{value0}} or WSL.',
-        { value0: getHostRuntimeLabel() }
-      )}
-      keywords={['account', 'location', 'windows', 'wsl', 'linux', 'provider', 'auth']}
-    >
-      <SettingsRow
-        label={translate('auto.components.settings.AccountsPane.46cf7e7495', 'Account location')}
-        alignTop
-        description={
-          accountRuntime.runtime === 'wsl' && !wslAvailable && !wslCapabilitiesLoading
-            ? translate(
-                'auto.components.settings.AccountsPane.0c67a2a1aa',
-                'WSL is not available on this machine.'
-              )
-            : translate(
-                'auto.components.settings.AccountsPane.0b4591ff93',
-                'Choose which local environment to inspect and where new managed Claude and Codex accounts are added.'
-              )
-        }
-        control={
-          <div className="flex w-44 flex-col items-stretch gap-2">
-            <SettingsSegmentedControl
-              ariaLabel={translate(
-                'auto.components.settings.AccountsPane.46cf7e7495',
-                'Account location'
-              )}
-              value={accountRuntime.runtime}
-              onChange={(value) => updateSettings({ localAccountRuntime: value })}
-              equalWidth
-              options={[
-                { value: 'host', label: getHostRuntimeLabel() },
-                ...(wslSupportedPlatform
-                  ? [
-                      {
-                        value: 'wsl',
-                        label: translate('auto.components.settings.AccountsPane.8619f9afa9', 'WSL'),
-                        disabled: wslCapabilitiesLoading || !wslAvailable
-                      } as const
-                    ]
-                  : [])
-              ]}
-            />
-            {wslSupportedPlatform && accountRuntime.runtime === 'wsl' ? (
-              <Select
-                value={accountRuntime.wslDistro ?? WSL_DEFAULT_DISTRO_KEY}
-                onValueChange={(value) =>
-                  updateSettings({
-                    localAccountRuntime: 'wsl',
-                    localAccountWslDistro: value === WSL_DEFAULT_DISTRO_KEY ? null : value
-                  })
-                }
-                disabled={wslCapabilitiesLoading || !wslAvailable}
-              >
-                <SelectTrigger size="sm" className="w-full min-w-44">
-                  <SelectValue
-                    placeholder={
-                      wslCapabilitiesLoading
-                        ? translate(
-                            'auto.components.settings.AccountsPane.ad47a33f72',
-                            'Loading WSL'
-                          )
-                        : translate(
-                            'auto.components.settings.AccountsPane.2358ac71d2',
-                            'WSL default'
-                          )
-                    }
-                  />
-                </SelectTrigger>
-                <SelectContent>
-                  <SelectItem value={WSL_DEFAULT_DISTRO_KEY}>
-                    {translate('auto.components.settings.AccountsPane.2358ac71d2', 'WSL default')}
-                  </SelectItem>
-                  {wslDistros.map((distro) => (
-                    <SelectItem key={distro} value={distro}>
-                      {distro}
-                    </SelectItem>
-                  ))}
-                </SelectContent>
-              </Select>
-            ) : null}
-          </div>
-        }
-      />
-    </SearchableSetting>
-  ) : null
-
-  // Why: remote Windows flattens host and WSL rows, so mutation follow-up must
-  // compare the selected row's runtime slot instead of the forced host view.
-  const runCodexAccountAction = async (
-    action: typeof codexAction,
-    operation: () => Promise<CodexRateLimitAccountsState>,
-    actionRuntime: ProviderAccountRuntimeView = accountRuntime
-  ): Promise<void> => {
-    const previousActiveAccountId = getProviderAccountActiveIdForView(codexAccounts, actionRuntime)
-    setCodexAction(action)
-    try {
-      const next = await operation()
-      await syncCodexAccounts(next)
-      recordFeatureInteraction('codex-account-switching')
-      const nextActiveAccountId = getProviderAccountActiveIdForView(next, actionRuntime)
-      const shouldPromptRestart =
-        action === 'adding' ||
-        (action.startsWith('select:') && previousActiveAccountId !== nextActiveAccountId) ||
-        (action.startsWith('reauth:') &&
-          nextActiveAccountId !== null &&
-          action === `reauth:${nextActiveAccountId}`) ||
-        (action.startsWith('remove:') && previousActiveAccountId !== nextActiveAccountId)
-      if (shouldPromptRestart) {
-        // Why: `add` creates the managed home against the machine's own distro,
-        // so the slot it wrote is the created account's — not this row's, which
-        // may still say "WSL default". Found by diffing the roster rather than
-        // by the row's active id, which resolves to null once two distro slots
-        // are filled and would send the notice to the wrong lane.
-        const newAccounts =
-          action === 'adding'
-            ? next.accounts.filter(
-                (account) => !codexAccounts.accounts.some((prior) => prior.id === account.id)
-              )
-            : []
-        // Why exactly one: an unloaded prior roster makes every account look new,
-        // and picking one of those would aim the notice at an unrelated lane.
-        // Falling back to the row is the pre-existing behaviour, not a new risk.
-        const addedAccount = newAccounts.length === 1 ? newAccounts[0] : undefined
-        void markLiveCodexSessionsForRestart({
-          previousAccountLabel: resolveCodexRestartPromptAccountLabel(
-            codexAccounts.accounts,
-            previousActiveAccountId
-          ),
-          nextAccountLabel: resolveCodexRestartPromptAccountLabel(
-            next.accounts,
-            nextActiveAccountId
-          ),
-          // Why: two accounts can share an email, so the labels alone cannot
-          // tell the store whether this switch lands back on the launch account.
-          previousAccountId: previousActiveAccountId ?? null,
-          nextAccountId: nextActiveAccountId ?? null,
-          // Why: the mutation wrote this row's slot only, so panes on any other
-          // lane still launch under the account they already had.
-          target: addedAccount ? getProviderAccountRuntime(addedAccount) : actionRuntime,
-          // Why: clearing a distro-less WSL row nulls every distro slot at once.
-          clearsEveryWslDistro: action === 'select:system'
-        })
-      }
-    } catch (error) {
-      toast.error(
-        translate(
-          'auto.components.settings.AccountsPane.5bf8764953',
-          'Codex account update failed.'
-        ),
-        {
-          description: getCodexAccountErrorDescription(error)
-        }
-      )
-    } finally {
-      setCodexAction('idle')
-    }
-  }
-
-  const runClaudeAccountAction = async (
-    action: typeof claudeAction,
-    operation: () => Promise<ClaudeRateLimitAccountsState>,
-    actionRuntime: ProviderAccountRuntimeView = accountRuntime
-  ): Promise<void> => {
-    const previousActiveAccountId = getProviderAccountActiveIdForView(claudeAccounts, actionRuntime)
-    setClaudeAction(action)
-    try {
-      const next = await operation()
-      await syncClaudeAccounts(next)
-      recordFeatureInteraction('claude-account-switching')
-      const nextActiveAccountId = getProviderAccountActiveIdForView(next, actionRuntime)
-      const shouldPromptRestart =
-        action === 'adding' ||
-        previousActiveAccountId !== nextActiveAccountId ||
-        (action.startsWith('reauth:') &&
-          nextActiveAccountId !== null &&
-          action === `reauth:${nextActiveAccountId}`)
-      if (shouldPromptRestart) {
-        toast.info(
-          translate('auto.components.settings.AccountsPane.f921d32606', 'Claude account updated.'),
-          {
-            description: translate(
-              'auto.components.settings.AccountsPane.b15ce90870',
-              '{{value0}} -> {{value1}}. Restart live Claude terminals before continuing old sessions.',
-              {
-                value0: getClaudeAccountLabel(claudeAccounts, previousActiveAccountId),
-                value1: getClaudeAccountLabel(next, nextActiveAccountId)
-              }
-            )
-          }
-        )
-      }
-    } catch (error) {
-      if (isClaudeAccountCancellation(error)) {
-        return
-      }
-      toast.error(
-        translate(
-          'auto.components.settings.AccountsPane.2743cdc0af',
-          'Claude account update failed.'
-        ),
-        {
-          description: getClaudeAccountErrorDescription(error)
-        }
-      )
-    } finally {
-      setClaudeAction('idle')
-    }
-  }
-
   const visibleSections = [
     wslSupportedPlatform &&
     !isRemoteAccountScope &&
-    matchesSettingsSearch(searchQuery, getAccountsLocationSearchEntries()) ? (
-      <section key="account-runtime" id="accounts-runtime" className="space-y-3 scroll-mt-6">
-        {accountRuntimeControls}
-      </section>
-    ) : null,
-    matchesSettingsSearch(searchQuery, getAccountsClaudeSearchEntries()) ? (
-      <section key="claude-accounts" id="accounts-claude" className="space-y-4 scroll-mt-6">
-        <div className="space-y-1">
-          <h3 className="flex items-center gap-2 text-sm font-semibold">
-            <ClaudeIcon size={16} />
-            {translate('auto.components.settings.AccountsPane.26ef4b55be', 'Claude')}
-          </h3>
-          <p className="text-xs text-muted-foreground">
-            {translate(
-              'auto.components.settings.AccountsPane.72b36ea174',
-              'Optional. Orca can use your normal Claude login; add accounts only if you want quick switching without moving chat sessions.'
-            )}
-          </p>
-        </div>
-
-        <SearchableSetting
-          title={translate('auto.components.settings.AccountsPane.8bbfd74556', 'Claude Accounts')}
-          description={translate(
-            'auto.components.settings.AccountsPane.79e484c3b2',
-            'Optional account switcher for the shared Claude auth files.'
-          )}
-          keywords={['claude', 'account', 'rate limit', 'status bar', 'quota']}
-          className="space-y-3 py-2"
-        >
-          <div className="flex items-center justify-between gap-3">
-            <div className="space-y-0.5">
-              <Label>
-                {translate('auto.components.settings.AccountsPane.94d351af4a', 'Accounts')}
-              </Label>
-              <p className="text-xs text-muted-foreground">
-                {isRemoteAccountScope
-                  ? translate(
-                      'auto.components.settings.AccountsPane.remoteScopeAccounts',
-                      'Showing accounts managed by {{value0}}. Add or re-authenticate accounts on that server.',
-                      { value0: accountRuntimeSentenceLabel }
-                    )
-                  : translate(
-                      'auto.components.settings.AccountsPane.c0a52abfc5',
-                      'Showing accounts for {{value0}}. New accounts are added there.',
-                      { value0: accountRuntimeSentenceLabel }
-                    )}
-              </p>
-            </div>
-            <div className="flex shrink-0 items-center gap-1.5">
-              <Button
-                variant="outline"
-                size="xs"
-                onClick={() =>
-                  void runClaudeAccountAction('adding', () =>
-                    window.api.claudeAccounts.add({
-                      runtime: accountRuntime.runtime,
-                      wslDistro: accountRuntime.wslDistro
-                    })
-                  )
-                }
-                disabled={
-                  // Why: interactive `claude login` needs a desktop browser and
-                  // would authenticate against this device, not the server.
-                  isRemoteAccountScope ||
-                  claudeAction !== 'idle' ||
-                  wslCapabilitiesLoading ||
-                  accountRuntimeUnavailable
-                }
-                className="gap-1.5"
-              >
-                {claudeAction === 'adding' ? (
-                  <Loader2 className="size-3 animate-spin" />
-                ) : (
-                  <Plus className="size-3" />
-                )}
-                {translate('auto.components.settings.AccountsPane.b0e948a4f9', 'Add Account')}
-              </Button>
-              {claudeAction === 'adding' ? (
-                <Button
-                  variant="ghost"
-                  size="xs"
-                  onClick={() => void window.api.claudeAccounts.cancelPendingLogin()}
-                  className="gap-1.5 text-muted-foreground hover:text-foreground"
-                >
-                  <X className="size-3" />
-                  {translate('auto.components.settings.AccountsPane.dbb9626ed1', 'Cancel')}
-                </Button>
-              ) : null}
-            </div>
-          </div>
-          {remoteAccountScopeNotice}
-
-          <div className="space-y-2">
-            <button
-              type="button"
-              onClick={() =>
-                void runClaudeAccountAction('select:system', () =>
-                  selectClaudeProviderAccount(settings, {
-                    accountId: null,
-                    runtime: accountRuntime.runtime,
-                    wslDistro: accountRuntime.wslDistro
-                  })
-                )
-              }
-              disabled={claudeAction !== 'idle' || accountRuntimeUnavailable}
-              className={`flex w-full items-center justify-between gap-3 rounded-md border px-3 py-2.5 text-left transition-colors ${
-                systemClaudeActive
-                  ? 'border-foreground/20 bg-accent/15'
-                  : 'border-border/70 hover:border-border hover:bg-accent/8'
-              } disabled:cursor-default disabled:opacity-100`}
-            >
-              <div className="flex min-w-0 flex-1 flex-col gap-0.5">
-                <div className="flex min-w-0 items-center gap-2">
-                  <span className="truncate text-sm font-medium">
-                    {translate(
-                      'auto.components.settings.AccountsPane.f2a265f8c7',
-                      'System default'
-                    )}
-                  </span>
-                  {systemClaudeActive ? (
-                    <Badge
-                      variant="outline"
-                      className="h-4 shrink-0 rounded px-1.5 text-[10px] font-medium leading-none text-foreground/80"
-                    >
-                      {translate('auto.components.settings.AccountsPane.e74831fb6b', 'Active')}
-                    </Badge>
-                  ) : null}
-                </div>
-                <span className="truncate text-[11px] text-muted-foreground">
-                  {translate(
-                    'auto.components.settings.AccountsPane.e05d0ff737',
-                    'Use your current {{value0}} Claude login.',
-                    { value0: accountRuntimeSentenceLabel }
-                  )}
-                </span>
-              </div>
-            </button>
-            {visibleClaudeAccounts.length === 0 ? (
-              <div className="rounded-md border border-dashed border-border/70 px-3 py-4 text-xs text-muted-foreground">
-                {isRemoteAccountScope
-                  ? translate(
-                      'auto.components.settings.AccountsPane.remoteEmptyClaudeAccounts',
-                      'No managed Claude accounts on {{value0}}. It uses its system default Claude login; add accounts on that server.',
-                      { value0: accountRuntimeSentenceLabel }
-                    )
-                  : translate(
-                      'auto.components.settings.AccountsPane.3fe7862418',
-                      "No managed Claude accounts for {{value0}}. Orca will use that environment's system default Claude login until you add one here.",
-                      { value0: accountRuntimeSentenceLabel }
-                    )}
-              </div>
-            ) : (
-              visibleClaudeAccounts.map((account) => {
-                const isActive = providerAccountIsActiveInView(
-                  account,
-                  claudeAccounts,
-                  accountRuntime,
-                  accountVisibilityOptions
-                )
-                const isReauthing = claudeAction === `reauth:${account.id}`
-                const isBusy = claudeAction !== 'idle' || accountRuntimeUnavailable
-
-                return (
-                  <div
-                    key={account.id}
-                    className={`flex w-full items-center justify-between gap-3 rounded-md border px-3 py-2.5 text-left transition-colors ${
-                      isActive
-                        ? 'border-foreground/20 bg-accent/15'
-                        : 'border-border/70 hover:border-border hover:bg-accent/8'
-                    }`}
-                  >
-                    <div className="flex w-full items-center justify-between gap-3 max-md:flex-col max-md:items-start">
-                      <button
-                        type="button"
-                        onClick={() => {
-                          const accountRuntimeView = getProviderAccountRuntime(account)
-                          void runClaudeAccountAction(
-                            `select:${account.id}`,
-                            () =>
-                              selectClaudeProviderAccount(settings, {
-                                accountId: account.id,
-                                ...accountRuntimeView
-                              }),
-                            accountRuntimeView
-                          )
-                        }}
-                        disabled={isBusy}
-                        className="flex min-w-0 flex-1 flex-col gap-0.5 text-left disabled:cursor-default"
-                      >
-                        <div className="flex min-w-0 items-center gap-2">
-                          <span className="truncate text-sm font-medium">{account.email}</span>
-                          <Badge
-                            variant="outline"
-                            className="h-4 shrink-0 rounded px-1.5 text-[10px] font-medium leading-none text-foreground/70"
-                          >
-                            {getClaudeAccountRuntimeLabel(account, accountRuntime.label)}
-                          </Badge>
-                          {isActive ? (
-                            <Badge
-                              variant="outline"
-                              className="h-4 shrink-0 rounded px-1.5 text-[10px] font-medium leading-none text-foreground/80"
-                            >
-                              {translate(
-                                'auto.components.settings.AccountsPane.e74831fb6b',
-                                'Active'
-                              )}
-                            </Badge>
-                          ) : null}
-                        </div>
-                        <span className="truncate text-[11px] text-muted-foreground">
-                          {account.organizationName
-                            ? `${account.organizationName} · ${formatAccountTimestamp(account.lastAuthenticatedAt)}`
-                            : formatAccountTimestamp(account.lastAuthenticatedAt)}
-                        </span>
-                      </button>
-                      <div className="flex shrink-0 items-center justify-end gap-1 max-md:w-full max-md:flex-wrap">
-                        <Button
-                          variant="ghost"
-                          size="xs"
-                          onClick={(event) => {
-                            event.stopPropagation()
-                            void runClaudeAccountAction(
-                              `reauth:${account.id}`,
-                              () =>
-                                window.api.claudeAccounts.reauthenticate({
-                                  accountId: account.id
-                                }),
-                              getProviderAccountRuntime(account)
-                            )
-                          }}
-                          disabled={isRemoteAccountScope || isBusy}
-                          className="h-6 px-2 text-muted-foreground hover:text-foreground"
-                        >
-                          {isReauthing ? (
-                            <Loader2 className="size-3 animate-spin" />
-                          ) : (
-                            <RefreshCw className="size-3" />
-                          )}
-                          {translate(
-                            'auto.components.settings.AccountsPane.8a0f870153',
-                            'Re-authenticate'
-                          )}
-                        </Button>
-                        <Button
-                          variant="ghost"
-                          size="xs"
-                          onClick={(event) => {
-                            event.stopPropagation()
-                            setRemoveClaudeTarget({
-                              id: account.id,
-                              runtime: getProviderAccountRuntime(account)
-                            })
-                          }}
-                          disabled={isBusy}
-                          className="h-6 px-2 text-muted-foreground hover:text-destructive"
-                        >
-                          <Trash2 className="size-3" />
-                          {translate('auto.components.settings.AccountsPane.db209ee572', 'Remove')}
-                        </Button>
-                      </div>
-                    </div>
-                  </div>
-                )
-              })
-            )}
-          </div>
-        </SearchableSetting>
-      </section>
-    ) : null,
-    matchesSettingsSearch(searchQuery, getAccountsCodexSearchEntries()) ? (
-      <section key="codex-accounts" id="accounts-codex" className="space-y-4 scroll-mt-6">
-        <div className="space-y-1">
-          <h3 className="flex items-center gap-2 text-sm font-semibold">
-            <OpenAIIcon size={16} />
-            {translate('auto.components.settings.AccountsPane.ef91cfa06b', 'Codex')}
-          </h3>
-          <p className="text-xs text-muted-foreground">
-            {translate(
-              'auto.components.settings.AccountsPane.cedfab35ab',
-              'Optional. Orca can use your normal Codex login; add accounts only if you want quick switching in Orca.'
-            )}
-          </p>
-          <p className="text-xs text-muted-foreground">
-            {isRemoteAccountScope
-              ? translate(
-                  'auto.components.settings.AccountsPane.remoteScopeAuthContext',
-                  'Each account keeps its own sign-in context on {{value0}}.',
-                  { value0: accountRuntimeSentenceLabel }
-                )
-              : translate(
-                  'auto.components.settings.AccountsPane.340d6f7a85',
-                  'Each account keeps its own local sign-in context in Orca. Account auth stays on this device.'
-                )}
-          </p>
-        </div>
-
-        <SearchableSetting
-          title={translate('auto.components.settings.AccountsPane.3180536c7a', 'Codex Accounts')}
-          description={translate(
-            'auto.components.settings.AccountsPane.d0d53b7eb0',
-            'Manage which Codex account Orca uses for live rate limit fetching.'
-          )}
-          // Why: this single SearchableSetting backs the whole Codex section,
-          // including the "Active Codex Account" sub-control (account picker
-          // below). Roll every Codex search entry's title/description/keywords
-          // into one haystack so a search for "Active Codex Account" doesn't
-          // render the section header with no body underneath it.
-          keywords={getAccountsCodexSearchEntries().flatMap((entry) => [
-            entry.title,
-            entry.description ?? '',
-            ...(entry.keywords ?? [])
-          ])}
-          className="space-y-3 py-2"
-        >
-          {/* Why: Settings deep-links can target this subsection directly from
-          the status-bar account switcher. Keeping a stable DOM anchor here
-          avoids dumping the user at the top of Accounts and making them hunt
-          for the actual Codex account controls. */}
-          {activeCodexAuthWarning ? (
-            <div className="flex items-start gap-2 rounded-md border border-destructive/40 bg-destructive/5 px-3 py-2 text-xs text-destructive">
-              <AlertTriangle className="mt-0.5 size-3.5 shrink-0" />
-              <span>
-                {systemCodexMissingSignIn
-                  ? translate(
-                      'auto.components.settings.AccountsPane.codexSystemDefaultNeedsSignIn',
-                      'No Codex sign-in was found for {{value0}}.',
-                      { value0: accountRuntimeSentenceLabel }
-                    )
-                  : activeCodexAccountId
-                    ? translate(
-                        'auto.components.settings.AccountsPane.75ca9b718e',
-                        'Codex reported that the active account needs a fresh sign-in. Re-authenticate it before starting new Codex sessions.'
-                      )
-                    : translate(
-                        'auto.components.settings.AccountsPane.e4a28e8894',
-                        'Codex reported that the {{value0}} login needs a fresh sign-in. Sign in again before starting new Codex sessions.',
-                        { value0: accountRuntimeSentenceLabel }
-                      )}
-              </span>
-            </div>
-          ) : null}
-          {codexConfigSyncWarning ? (
-            <div className="flex items-start gap-2 rounded-md border border-destructive/40 bg-destructive/5 px-3 py-2 text-xs text-destructive">
-              <AlertTriangle className="mt-0.5 size-3.5 shrink-0" />
-              <span>
-                {codexConfigSyncWarning === 'managed-home-unavailable'
-                  ? translate(
-                      'auto.components.settings.AccountsPane.codexConfigSyncManagedHomeUnavailable',
-                      'Orca could not read this account\u2019s Codex files just now, so settings may not be syncing. This usually clears on its own \u2014 antivirus or a backup tool briefly locks them.'
-                    )
-                  : codexConfigSyncWarning === 'missing-source'
-                    ? translate(
-                        'auto.components.settings.AccountsPane.codexConfigSyncMissingSource',
-                        'Codex is still using the settings it last synced because {{value0}} is missing. Restore that file to resume syncing.',
-                        { value0: codexConfigSync?.systemConfigPath ?? '' }
-                      )
-                    : codexConfigSyncWarning === 'blank-source'
-                      ? translate(
-                          'auto.components.settings.AccountsPane.codexConfigSyncBlankSource',
-                          'Codex is still using the settings it last synced because {{value0}} is empty. That is expected while a synced folder finishes downloading.',
-                          { value0: codexConfigSync?.systemConfigPath ?? '' }
-                        )
-                      : translate(
-                          'auto.components.settings.AccountsPane.codexConfigSyncUnreadableSource',
-                          "Codex is still using the settings it last synced because {{value0}} could not be read. Check that file's permissions.",
-                          { value0: codexConfigSync?.systemConfigPath ?? '' }
-                        )}
-              </span>
-            </div>
-          ) : null}
-          <div className="flex items-center justify-between gap-3">
-            <div className="space-y-0.5">
-              <Label>
-                {translate('auto.components.settings.AccountsPane.94d351af4a', 'Accounts')}
-              </Label>
-              <p className="text-xs text-muted-foreground">
-                {isRemoteAccountScope
-                  ? translate(
-                      'auto.components.settings.AccountsPane.remoteScopeAccounts',
-                      'Showing accounts managed by {{value0}}. Add or re-authenticate accounts on that server.',
-                      { value0: accountRuntimeSentenceLabel }
-                    )
-                  : translate(
-                      'auto.components.settings.AccountsPane.c0a52abfc5',
-                      'Showing accounts for {{value0}}. New accounts are added there.',
-                      { value0: accountRuntimeSentenceLabel }
-                    )}
-              </p>
-            </div>
-            <Button
-              variant="outline"
-              size="xs"
-              onClick={() =>
-                void runCodexAccountAction('adding', () =>
-                  window.api.codexAccounts.add({
-                    runtime: accountRuntime.runtime,
-                    wslDistro: accountRuntime.wslDistro
-                  })
-                )
-              }
-              disabled={
-                // Why: interactive `codex login` needs a desktop browser and
-                // would authenticate against this device, not the server.
-                isRemoteAccountScope ||
-                codexAction !== 'idle' ||
-                wslCapabilitiesLoading ||
-                accountRuntimeUnavailable
-              }
-              className="gap-1.5"
-            >
-              {codexAction === 'adding' ? (
-                <Loader2 className="size-3 animate-spin" />
-              ) : (
-                <Plus className="size-3" />
-              )}
-              {translate('auto.components.settings.AccountsPane.b0e948a4f9', 'Add Account')}
-            </Button>
-          </div>
-          {remoteAccountScopeNotice}
-
-          <div className="space-y-2">
-            <button
-              type="button"
-              onClick={() =>
-                void runCodexAccountAction('select:system', () =>
-                  selectCodexProviderAccount(settings, {
-                    accountId: null,
-                    runtime: accountRuntime.runtime,
-                    wslDistro: accountRuntime.wslDistro
-                  })
-                )
-              }
-              disabled={codexAction !== 'idle' || accountRuntimeUnavailable}
-              className={`flex w-full items-center justify-between gap-3 rounded-md border px-3 py-2.5 text-left transition-colors ${
-                systemCodexNeedsSignIn
-                  ? 'border-destructive/50 bg-destructive/5'
-                  : systemCodexActive
-                    ? 'border-foreground/20 bg-accent/15'
-                    : 'border-border/70 hover:border-border hover:bg-accent/8'
-              } disabled:cursor-default disabled:opacity-100`}
-            >
-              <div className="flex min-w-0 flex-1 flex-col gap-0.5">
-                <div className="flex min-w-0 items-center gap-2">
-                  <span className="truncate text-sm font-medium">
-                    {translate(
-                      'auto.components.settings.AccountsPane.f2a265f8c7',
-                      'System default'
-                    )}
-                  </span>
-                  {systemCodexActive ? (
-                    <Badge
-                      variant="outline"
-                      className="h-4 shrink-0 rounded px-1.5 text-[10px] font-medium leading-none text-foreground/80"
-                    >
-                      {translate('auto.components.settings.AccountsPane.e74831fb6b', 'Active')}
-                    </Badge>
-                  ) : null}
-                  {systemCodexNeedsSignIn ? (
-                    <Badge
-                      variant="destructive"
-                      className="h-4 shrink-0 rounded px-1.5 text-[10px] font-medium leading-none"
-                    >
-                      {translate(
-                        'auto.components.settings.AccountsPane.93c47b333a',
-                        'Needs sign-in'
-                      )}
-                    </Badge>
-                  ) : null}
-                </div>
-                <span
-                  className={`truncate text-[11px] ${
-                    systemCodexNeedsSignIn ? 'text-destructive' : 'text-muted-foreground'
-                  }`}
-                >
-                  {systemCodexNeedsSignIn
-                    ? systemCodexMissingSignIn
-                      ? translate(
-                          'auto.components.settings.AccountsPane.codexSystemDefaultNeedsSignIn',
-                          'No Codex sign-in was found for {{value0}}.',
-                          { value0: accountRuntimeSentenceLabel }
-                        )
-                      : translate(
-                          'auto.components.settings.AccountsPane.fd62f37c24',
-                          'Codex reported this {{value0}} login is out of date.',
-                          { value0: accountRuntimeSentenceLabel }
-                        )
-                    : getCodexSystemDefaultSubtitle(
-                        systemCodexIdentity,
-                        accountRuntimeSentenceLabel
-                      )}
-                </span>
-              </div>
-            </button>
-            {visibleCodexAccounts.length === 0 ? (
-              <div className="rounded-md border border-dashed border-border/70 px-3 py-4 text-xs text-muted-foreground">
-                {isRemoteAccountScope
-                  ? translate(
-                      'auto.components.settings.AccountsPane.remoteEmptyCodexAccounts',
-                      'No managed Codex accounts on {{value0}}. It uses its system default Codex login; add accounts on that server.',
-                      { value0: accountRuntimeSentenceLabel }
-                    )
-                  : translate(
-                      'auto.components.settings.AccountsPane.b4c9450319',
-                      "No managed Codex accounts for {{value0}}. Orca will use that environment's system default Codex login until you add one here.",
-                      { value0: accountRuntimeSentenceLabel }
-                    )}
-              </div>
-            ) : (
-              visibleCodexAccounts.map((account) => {
-                const isActive = providerAccountIsActiveInView(
-                  account,
-                  codexAccounts,
-                  accountRuntime,
-                  accountVisibilityOptions
-                )
-                // Why: same remote gate as the section-level warning — the
-                // desktop's rate-limit poll says nothing about server accounts.
-                const accountAuthWarning = isRemoteAccountScope
-                  ? null
-                  : getCodexAccountAuthWarning({
-                      limits: codexRateLimits,
-                      target: codexRateLimitTarget,
-                      runtime: accountRuntime,
-                      activeAccountId: activeCodexAccountId,
-                      accountId: account.id
-                    })
-                const needsReauthentication = Boolean(accountAuthWarning)
-                const isReauthing = codexAction === `reauth:${account.id}`
-                const isRemoving = codexAction === `remove:${account.id}`
-                const isBusy = codexAction !== 'idle' || accountRuntimeUnavailable
-
-                return (
-                  <div
-                    key={account.id}
-                    className={`flex w-full items-center justify-between gap-3 rounded-md border px-3 py-2.5 text-left transition-colors ${
-                      needsReauthentication
-                        ? 'border-destructive/50 bg-destructive/5'
-                        : isActive
-                          ? 'border-foreground/20 bg-accent/15'
-                          : 'border-border/70 hover:border-border hover:bg-accent/8'
-                    }`}
-                  >
-                    <div className="flex w-full items-center justify-between gap-3 max-md:flex-col max-md:items-start">
-                      <button
-                        type="button"
-                        onClick={() => {
-                          const accountRuntimeView = getProviderAccountRuntime(account)
-                          void runCodexAccountAction(
-                            `select:${account.id}`,
-                            () =>
-                              selectCodexProviderAccount(settings, {
-                                accountId: account.id,
-                                ...accountRuntimeView
-                              }),
-                            accountRuntimeView
-                          )
-                        }}
-                        disabled={isBusy}
-                        className="flex min-w-0 flex-1 flex-col gap-0.5 text-left disabled:cursor-default"
-                      >
-                        <div className="flex min-w-0 items-center gap-2">
-                          <span className="truncate text-sm font-medium">{account.email}</span>
-                          <Badge
-                            variant="outline"
-                            className="h-4 shrink-0 rounded px-1.5 text-[10px] font-medium leading-none text-foreground/70"
-                          >
-                            {getCodexAccountRuntimeLabel(account, accountRuntime.label)}
-                          </Badge>
-                          {isActive ? (
-                            <Badge
-                              variant="outline"
-                              className="h-4 shrink-0 rounded px-1.5 text-[10px] font-medium leading-none text-foreground/80"
-                            >
-                              {translate(
-                                'auto.components.settings.AccountsPane.e74831fb6b',
-                                'Active'
-                              )}
-                            </Badge>
-                          ) : null}
-                          {needsReauthentication ? (
-                            <Badge
-                              variant="destructive"
-                              className="h-4 shrink-0 rounded px-1.5 text-[10px] font-medium leading-none"
-                            >
-                              {translate(
-                                'auto.components.settings.AccountsPane.589eba1eee',
-                                'Needs re-auth'
-                              )}
-                            </Badge>
-                          ) : null}
-                        </div>
-                        <div
-                          className={`flex min-w-0 items-center gap-1.5 text-[11px] max-sm:flex-wrap ${
-                            needsReauthentication ? 'text-destructive' : 'text-muted-foreground'
-                          }`}
-                        >
-                          {needsReauthentication ? (
-                            <span className="truncate">
-                              {translate(
-                                'auto.components.settings.AccountsPane.3d245ef7d9',
-                                'Codex reported this sign-in is out of date'
-                              )}
-                            </span>
-                          ) : account.workspaceLabel ? (
-                            <span className="truncate">{account.workspaceLabel}</span>
-                          ) : null}
-                          {needsReauthentication || account.workspaceLabel ? (
-                            <span className="shrink-0 opacity-50">•</span>
-                          ) : null}
-                          <span className="shrink-0">
-                            {formatAccountTimestamp(account.lastAuthenticatedAt)}
-                          </span>
-                        </div>
-                      </button>
-
-                      <div className="flex shrink-0 items-center justify-end gap-1 max-md:w-full max-md:flex-wrap">
-                        {/* Why: selecting an account is the primary action in this row.
-                        Keeping maintenance actions visually lighter prevents re-auth/remove
-                        controls from overpowering the selection affordance in a dense list. */}
-                        <Button
-                          variant="ghost"
-                          size="xs"
-                          onClick={(event) => {
-                            event.stopPropagation()
-                            void runCodexAccountAction(
-                              `reauth:${account.id}`,
-                              () =>
-                                window.api.codexAccounts.reauthenticate({
-                                  accountId: account.id
-                                }),
-                              getProviderAccountRuntime(account)
-                            )
-                          }}
-                          disabled={isRemoteAccountScope || isBusy}
-                          className="h-6 px-2 text-muted-foreground hover:text-foreground"
-                        >
-                          {isReauthing ? (
-                            <Loader2 className="size-3 animate-spin" />
-                          ) : (
-                            <RefreshCw className="size-3" />
-                          )}
-                          {translate(
-                            'auto.components.settings.AccountsPane.8a0f870153',
-                            'Re-authenticate'
-                          )}
-                        </Button>
-                        <Button
-                          variant="ghost"
-                          size="xs"
-                          onClick={(event) => {
-                            event.stopPropagation()
-                            setRemoveCodexTarget({
-                              id: account.id,
-                              runtime: getProviderAccountRuntime(account)
-                            })
-                          }}
-                          disabled={isBusy}
-                          className="h-6 px-2 text-muted-foreground hover:text-destructive"
-                        >
-                          {isRemoving ? (
-                            <Loader2 className="size-3 animate-spin" />
-                          ) : (
-                            <Trash2 className="size-3" />
-                          )}
-                          {translate('auto.components.settings.AccountsPane.db209ee572', 'Remove')}
-                        </Button>
-                      </div>
-                    </div>
-                  </div>
-                )
-              })
-            )}
-          </div>
-        </SearchableSetting>
-      </section>
-    ) : null,
-    matchesSettingsSearch(searchQuery, getAccountsGeminiSearchEntries()) ? (
-      <section key="gemini" id="accounts-gemini" className="space-y-4 scroll-mt-6">
-        <div className="space-y-1">
-          <h3 className="flex items-center gap-2 text-sm font-semibold">
-            <GeminiIcon size={16} />
-            {translate('auto.components.settings.AccountsPane.0c64dc2a64', 'Gemini')}
-          </h3>
-          <p className="text-xs text-muted-foreground">
-            {translate(
-              'auto.components.settings.AccountsPane.973741a871',
-              'Configure Gemini provider settings.'
-            )}
-          </p>
-        </div>
-
-        <SearchableSetting
-          title={translate(
-            'auto.components.settings.AccountsPane.0c7f915b01',
-            'Use Gemini CLI credentials'
-          )}
-          description={translate(
-            'auto.components.settings.AccountsPane.d676c41fc6',
-            'Extracts OAuth credentials from your local Gemini CLI installation to authenticate with Google. This uses credentials issued to the Gemini CLI app, not Orca. May break if Google updates the CLI. Use at your own risk.'
-          )}
-          keywords={[
-            'gemini',
-            'cli',
-            'oauth',
-            'credentials',
-            'experimental',
-            'rate limit',
-            'status bar'
-          ]}
-          className="flex items-center justify-between gap-4 py-2"
-        >
-          <div className="space-y-0.5">
-            <Label>
-              {translate(
-                'auto.components.settings.AccountsPane.96f3649526',
-                'Use Gemini CLI credentials (experimental)'
-              )}
-            </Label>
-            <p className="text-xs text-muted-foreground">
-              {translate(
-                'auto.components.settings.AccountsPane.c2aee76420',
-                'Extracts OAuth credentials from your local Gemini CLI installation to authenticate with Google for {{value0}}. This uses credentials issued to the Gemini CLI app, not Orca. May break if Google updates the CLI. Use at your own risk.',
-                { value0: localAccountRuntimeSentenceLabel }
-              )}
-            </p>
-          </div>
-          <Switch
-            aria-label={translate(
-              'auto.components.settings.AccountsPane.96f3649526',
-              'Use Gemini CLI credentials (experimental)'
-            )}
-            checked={settings.geminiCliOAuthEnabled}
-            onCheckedChange={(checked) => {
-              recordFeatureInteraction('usage-tracking')
-              updateSettings({
-                geminiCliOAuthEnabled: checked
-              })
-            }}
-          />
-        </SearchableSetting>
-      </section>
-    ) : null,
-    matchesSettingsSearch(searchQuery, getAccountsOpencodeSearchEntries()) ? (
-      <section key="opencode-go" id="accounts-opencode-go" className="space-y-4 scroll-mt-6">
-        <div className="space-y-1">
-          <h3 className="flex items-center gap-2 text-sm font-semibold">
-            <OpenCodeGoIcon size={16} />
-            {translate('auto.components.settings.AccountsPane.4ac10b4d08', 'OpenCode Go')}
-          </h3>
-          <p className="text-xs text-muted-foreground">
-            {translate(
-              'auto.components.settings.AccountsPane.ea631977b5',
-              'Configure OpenCode Go provider settings.'
-            )}
-          </p>
-        </div>
-
-        <SearchableSetting
-          title={translate(
-            'auto.components.settings.AccountsPane.36223200ac',
-            'OpenCode Go Session Cookie'
-          )}
-          description={translate(
-            'auto.components.settings.AccountsPane.b2b1aa936d',
-            'Paste your opencode.ai session cookie for rate limit fetching.'
-          )}
-          keywords={['opencode', 'cookie', 'session', 'rate limit', 'status bar']}
-          className="space-y-2"
-        >
-          <Label>
-            {translate(
-              'auto.components.settings.AccountsPane.67e3c33670',
-              'OpenCode Go session cookie'
-            )}
-          </Label>
-          <div className="flex gap-2">
-            <Input
-              type="password"
-              value={settings.opencodeSessionCookie}
-              onChange={(e) => {
-                recordOpenCodeSettingEdit('cookie')
-                updateSettings({ opencodeSessionCookie: e.target.value })
-              }}
-              placeholder={translate(
-                'auto.components.settings.AccountsPane.a7e38affcd',
-                'Fe26.2**… token or auth=Fe26.2**… header'
-              )}
-              spellCheck={false}
-              className="flex-1 text-xs"
-            />
-            {settings.opencodeSessionCookie && (
-              <Button
-                variant="ghost"
-                size="xs"
-                onClick={() => {
-                  recordFeatureInteraction('usage-tracking')
-                  updateSettings({ opencodeSessionCookie: '' })
-                }}
-                className="h-7 shrink-0 text-xs text-muted-foreground hover:text-foreground"
-              >
-                {translate('auto.components.settings.AccountsPane.b398b834c9', 'Clear')}
-              </Button>
-            )}
-          </div>
-          <p className="text-xs text-muted-foreground">
-            {translate(
-              'auto.components.settings.AccountsPane.0023cc336e',
-              'Paste either the raw token value (e.g.'
-            )}{' '}
-            <code className="text-xs">
-              {translate('auto.components.settings.AccountsPane.922b51e02d', 'Fe26.2**…')}
-            </code>
-            {translate(
-              'auto.components.settings.AccountsPane.338820326a',
-              ') or the full cookie header (e.g.'
-            )}{' '}
-            <code className="text-xs">
-              {translate('auto.components.settings.AccountsPane.8951c5309f', 'auth=Fe26.2**…')}
-            </code>
-            {translate(
-              'auto.components.settings.AccountsPane.7ce0e1907c',
-              "). Find it in your browser's DevTools → Network → any opencode.ai request → Cookie header. OpenCode Go auth is web-based and shared across Windows and WSL terminals."
-            )}
-          </p>
-        </SearchableSetting>
-
-        <SearchableSetting
-          title={translate(
-            'auto.components.settings.AccountsPane.02cb127710',
-            'OpenCode Go Workspace ID'
-          )}
-          description={translate(
-            'auto.components.settings.AccountsPane.d70a5287a4',
-            'Optional workspace ID override if the automatic lookup fails.'
-          )}
-          keywords={['opencode', 'workspace', 'id', 'wrk', 'rate limit', 'status bar']}
-          className="space-y-2"
-        >
-          <Label>
-            {translate('auto.components.settings.AccountsPane.dbdb0b0bd8', 'Workspace ID override')}
-          </Label>
-          <div className="flex gap-2">
-            <Input
-              type="text"
-              value={settings.opencodeWorkspaceId}
-              onChange={(e) => {
-                recordOpenCodeSettingEdit('workspaceId')
-                updateSettings({ opencodeWorkspaceId: e.target.value })
-              }}
-              placeholder={translate(
-                'auto.components.settings.AccountsPane.a122332371',
-                'wrk_… (leave blank for automatic lookup)'
-              )}
-              spellCheck={false}
-              className="flex-1 text-xs"
-            />
-            {settings.opencodeWorkspaceId && (
-              <Button
-                variant="ghost"
-                size="xs"
-                onClick={() => {
-                  recordFeatureInteraction('usage-tracking')
-                  updateSettings({ opencodeWorkspaceId: '' })
-                }}
-                className="h-7 shrink-0 text-xs text-muted-foreground hover:text-foreground"
-              >
-                {translate('auto.components.settings.AccountsPane.b398b834c9', 'Clear')}
-              </Button>
-            )}
-          </div>
-          <p className="text-xs text-muted-foreground">
-            {translate(
-              'auto.components.settings.AccountsPane.51c9104e13',
-              'Find this in the URL after logging into opencode.ai (e.g.'
-            )}{' '}
-            <code className="text-xs">
-              {translate(
-                'auto.components.settings.AccountsPane.ae3b21eb6c',
-                'opencode.ai/workspace/wrk_…/go'
-              )}
-            </code>
-            ).
-          </p>
-        </SearchableSetting>
-      </section>
-    ) : null,
-    matchesSettingsSearch(searchQuery, getAccountsMiniMaxSearchEntries()) ? (
-      <section key="minimax" id="accounts-minimax" className="space-y-4 scroll-mt-6">
-        <div className="flex items-start justify-between gap-3">
-          <div className="space-y-1">
-            <h3 className="flex items-center gap-2 text-sm font-semibold">
-              <MiniMaxIcon size={16} />
-              {translate('auto.components.settings.AccountsPane.5d63bbfbec', 'MiniMax')}
-            </h3>
-            <p className="text-xs text-muted-foreground">
-              {translate(
-                'auto.components.settings.AccountsPane.15e831350e',
-                'Configure MiniMax usage tracking from platform.minimax.io.'
-              )}
-            </p>
-          </div>
-          <a
-            href={MINIMAX_CONSOLE_URL}
-            target="_blank"
-            rel="noopener noreferrer"
-            className="inline-flex items-center gap-1 text-xs text-muted-foreground hover:text-foreground"
-          >
-            {translate('auto.components.settings.AccountsPane.0d8e77bc40', 'Open console')}
-            <ExternalLink className="size-3" />
-          </a>
-        </div>
-
-        <div
-          className={cn(
-            'flex items-start gap-3 rounded-lg border bg-muted/20 p-3',
-            miniMaxConfigured ? 'border-border/60' : 'border-border/40'
-          )}
-        >
-          <ShieldCheck
-            className={cn(
-              'mt-0.5 size-4 shrink-0',
-              miniMaxConfigured ? 'text-foreground' : 'text-muted-foreground'
-            )}
-          />
-          <div className="space-y-0.5">
-            <p className="text-xs font-medium">
-              {miniMaxConfigured
-                ? translate('auto.components.settings.AccountsPane.0b8c1c7e02', 'Stored locally')
-                : translate('auto.components.settings.AccountsPane.1fd1b1b6b4', 'Cookie not set')}
-            </p>
-            <p className="text-xs text-muted-foreground">
-              {translate(
-                'auto.components.settings.AccountsPane.5e08b0fe57',
-                'Stored locally and sent only to platform.minimax.io for usage refreshes.'
-              )}
-            </p>
-          </div>
-        </div>
-
-        <SearchableSetting
-          title={translate(
-            'auto.components.settings.AccountsPane.21d6eb141e',
-            'MiniMax Session Cookie'
-          )}
-          description={translate(
-            'auto.components.settings.AccountsPane.33bba5ad83',
-            'Paste your MiniMax session cookie for local rate-limit fetching.'
-          )}
-          keywords={['minimax', 'cookie', 'session', 'rate limit', 'status bar']}
-          className="space-y-2"
-        >
-          <div className="flex items-center justify-between gap-2">
-            <div className="flex items-center gap-2">
-              <Label>
-                {translate(
-                  'auto.components.settings.AccountsPane.21d6eb141e',
-                  'MiniMax Session Cookie'
-                )}
-              </Label>
-              <Badge
-                variant={miniMaxConfigured ? 'secondary' : 'outline'}
-                className="h-5 gap-1 rounded-full px-2 text-[10px] font-medium text-muted-foreground"
-              >
-                {miniMaxConfigured ? <Lock className="size-3" /> : <LockOpen className="size-3" />}
-                {miniMaxConfigured
-                  ? translate('auto.components.settings.AccountsPane.73ea15f24b', 'Saved')
-                  : translate('auto.components.settings.AccountsPane.23afe8f226', 'Not saved')}
-              </Badge>
-            </div>
-            <Popover>
-              <PopoverTrigger asChild>
-                <Button
-                  variant="ghost"
-                  size="xs"
-                  className="h-6 gap-1 px-2 text-xs text-muted-foreground hover:text-foreground"
-                >
-                  <HelpCircle className="size-3" />
-                  {translate('auto.components.settings.AccountsPane.43d7a45b97', 'How to copy')}
-                </Button>
-              </PopoverTrigger>
-              <PopoverContent align="end" side="bottom" sideOffset={6} className="w-80 p-0">
-                <MiniMaxCookieHelpPopover />
-              </PopoverContent>
-            </Popover>
-          </div>
-          <div className="flex gap-2">
-            <Input
-              type="password"
-              value={miniMaxCookieDraft}
-              onChange={(e) => setMiniMaxCookieDraft(e.target.value)}
-              placeholder={translate(
-                'auto.components.settings.AccountsPane.b8a4f21c3e',
-                'Paste the Cookie header from DevTools'
-              )}
-              spellCheck={false}
-              className="flex-1 text-xs"
-            />
-            <Button
-              size="xs"
-              onClick={() => void saveMiniMaxCookie()}
-              disabled={miniMaxCredentialBusy || !miniMaxCookieDraft.trim()}
-              className="h-7 shrink-0 text-xs"
-            >
-              {miniMaxCredentialBusy ? <Loader2 className="size-3 animate-spin" /> : null}
-              {miniMaxConfigured
-                ? translate('auto.components.settings.AccountsPane.f38b9cc4bd', 'Replace')
-                : translate('auto.components.settings.AccountsPane.590a3130f9', 'Save')}
-            </Button>
-            {miniMaxConfigured ? (
-              <Button
-                variant="ghost"
-                size="xs"
-                onClick={() => void clearMiniMaxCookie()}
-                disabled={miniMaxCredentialBusy}
-                className="h-7 shrink-0 text-xs text-muted-foreground hover:text-foreground"
-              >
-                {translate('auto.components.settings.AccountsPane.316ca4e610', 'Forget cookie')}
-              </Button>
-            ) : null}
-          </div>
-          <p className="text-xs text-muted-foreground">
-            {translate(
-              'auto.components.settings.AccountsPane.79418c782a',
-              'Open platform.minimax.io/console/usage in your browser, sign in, then copy the Cookie request header from DevTools (Network → any remains request → Cookie).'
-            )}
-          </p>
-          {miniMaxConfigured &&
-          miniMaxRateLimits?.status === 'ok' &&
-          miniMaxRateLimits.error === null ? (
-            <p className="text-xs text-muted-foreground">
-              {translate(
-                'auto.components.settings.AccountsPane.53f7b8c7a2',
-                'Last refresh: {{value0}}',
-                { value0: formatMiniMaxRelativeRefresh(miniMaxRateLimits.updatedAt, Date.now()) }
-              )}
-            </p>
-          ) : null}
-          <p className="text-xs text-muted-foreground">
-            {translate(
-              'auto.components.settings.AccountsPane.31d24a4e87',
-              'Cookie expires when you sign out in the browser.'
-            )}
-          </p>
-        </SearchableSetting>
-
-        <div className="space-y-3 rounded-lg border border-border/60 bg-muted/20 p-3">
-          <div className="flex items-center justify-between gap-3">
-            <div className="space-y-1">
-              <h4 className="text-xs font-semibold text-muted-foreground">
-                {translate('auto.components.settings.AccountsPane.9dd50d3f75', 'Advanced')}
-              </h4>
-              <p className="text-xs text-muted-foreground">
-                {translate(
-                  'auto.components.settings.AccountsPane.174fb408f9',
-                  'Leave these defaults alone unless MiniMax usage refresh points at the wrong workspace or model.'
-                )}
-              </p>
-            </div>
-          </div>
-
-          <SearchableSetting
-            title={translate(
-              'auto.components.settings.AccountsPane.bf160bb6c0',
-              'Group ID override'
-            )}
-            description={translate(
-              'auto.components.settings.AccountsPane.b1e2743313',
-              'Optional. Leave blank to use minimax_group_id_v2 from the cookie.'
-            )}
-            keywords={['minimax', 'group', 'id', 'rate limit']}
-            className="space-y-2"
-          >
-            <Label>
-              {translate('auto.components.settings.AccountsPane.bf160bb6c0', 'Group ID override')}
-            </Label>
-            <Input
-              type="text"
-              value={settings.minimaxGroupId}
-              onChange={(e) => updateSettings({ minimaxGroupId: e.target.value })}
-              placeholder={translate(
-                'auto.components.settings.AccountsPane.0747d6391a',
-                'Use group ID from cookie'
-              )}
-              spellCheck={false}
-              className="text-xs"
-            />
-          </SearchableSetting>
-
-          <SearchableSetting
-            title={translate(
-              'auto.components.settings.AccountsPane.4ff2af7524',
-              'Usage model names'
-            )}
-            description={translate(
-              'auto.components.settings.AccountsPane.5cf4b0f85f',
-              'Optional comma-separated model names. Leave as general unless MiniMax returns a model-specific error.'
-            )}
-            keywords={['minimax', 'model', 'general', 'rate limit']}
-            className="space-y-2"
-          >
-            <Label>
-              {translate('auto.components.settings.AccountsPane.4ff2af7524', 'Usage model names')}
-            </Label>
-            <Input
-              type="text"
-              value={settings.minimaxUsageModels}
-              onChange={(e) => updateSettings({ minimaxUsageModels: e.target.value })}
-              placeholder={translate('auto.components.settings.AccountsPane.3c92b0d31c', 'general')}
-              spellCheck={false}
-              className="text-xs"
-            />
-          </SearchableSetting>
-        </div>
-      </section>
-    ) : null,
+    matchesSettingsSearch(searchQuery, getAccountsLocationSearchEntries())
+      ? renderAccountsLocationSection(model)
+      : null,
+    matchesSettingsSearch(searchQuery, getAccountsClaudeSearchEntries())
+      ? renderClaudeAccountsSection(model)
+      : null,
+    matchesSettingsSearch(searchQuery, getAccountsCodexSearchEntries())
+      ? renderCodexAccountsSection(model)
+      : null,
+    matchesSettingsSearch(searchQuery, getAccountsGeminiSearchEntries())
+      ? renderGeminiAccountsSection(model)
+      : null,
+    matchesSettingsSearch(searchQuery, getAccountsOpencodeSearchEntries())
+      ? renderOpenCodeAccountsSection(model)
+      : null,
+    matchesSettingsSearch(searchQuery, getAccountsMiniMaxSearchEntries())
+      ? renderMiniMaxAccountsSection(model)
+      : null,
     matchesSettingsSearch(searchQuery, getAccountsGrokSearchEntries()) ? (
       <GrokAccountsSection key="grok" />
     ) : null
@@ -1990,92 +370,7 @@ export function AccountsPane({
 
   return (
     <div className="space-y-8">
-      <Dialog
-        open={removeCodexTarget !== null}
-        onOpenChange={(open) => !open && setRemoveCodexTarget(null)}
-      >
-        <DialogContent showCloseButton={false}>
-          <DialogHeader>
-            <DialogTitle>
-              {translate(
-                'auto.components.settings.AccountsPane.0d47394635',
-                'Remove Codex Account?'
-              )}
-            </DialogTitle>
-            <DialogDescription>
-              {translate(
-                'auto.components.settings.AccountsPane.380a7736cc',
-                'Removing this account permanently deletes its managed Codex home, including all Codex session history and MCP logins stored inside. This cannot be undone. If the account is currently active, Orca falls back to the system default Codex login.'
-              )}
-            </DialogDescription>
-          </DialogHeader>
-          <DialogFooter>
-            <Button variant="outline" onClick={() => setRemoveCodexTarget(null)}>
-              {translate('auto.components.settings.AccountsPane.dbb9626ed1', 'Cancel')}
-            </Button>
-            <Button
-              variant="destructive"
-              onClick={() => {
-                const target = removeCodexTarget
-                if (!target) {
-                  return
-                }
-                setRemoveCodexTarget(null)
-                void runCodexAccountAction(
-                  `remove:${target.id}`,
-                  () => removeCodexProviderAccount(settings, target.id),
-                  target.runtime
-                )
-              }}
-            >
-              {translate('auto.components.settings.AccountsPane.c2d2751587', 'Remove Account')}
-            </Button>
-          </DialogFooter>
-        </DialogContent>
-      </Dialog>
-      <Dialog
-        open={removeClaudeTarget !== null}
-        onOpenChange={(open) => !open && setRemoveClaudeTarget(null)}
-      >
-        <DialogContent showCloseButton={false}>
-          <DialogHeader>
-            <DialogTitle>
-              {translate(
-                'auto.components.settings.AccountsPane.63843e37e2',
-                'Remove Claude Account?'
-              )}
-            </DialogTitle>
-            <DialogDescription>
-              {translate(
-                'auto.components.settings.AccountsPane.854ebbcc45',
-                'Orca will delete the managed Claude auth for this saved account. If it is currently active, Orca falls back to the system default Claude login.'
-              )}
-            </DialogDescription>
-          </DialogHeader>
-          <DialogFooter>
-            <Button variant="outline" onClick={() => setRemoveClaudeTarget(null)}>
-              {translate('auto.components.settings.AccountsPane.dbb9626ed1', 'Cancel')}
-            </Button>
-            <Button
-              variant="destructive"
-              onClick={() => {
-                const target = removeClaudeTarget
-                if (!target) {
-                  return
-                }
-                setRemoveClaudeTarget(null)
-                void runClaudeAccountAction(
-                  `remove:${target.id}`,
-                  () => removeClaudeProviderAccount(settings, target.id),
-                  target.runtime
-                )
-              }}
-            >
-              {translate('auto.components.settings.AccountsPane.c2d2751587', 'Remove Account')}
-            </Button>
-          </DialogFooter>
-        </DialogContent>
-      </Dialog>
+      {renderAccountsRemovalDialogs(model, removeCodexTarget, removeClaudeTarget)}
       {visibleSections.map((section, index) => (
         <div key={index} className="space-y-8">
           {index > 0 ? <Separator /> : null}
diff --git a/src/renderer/src/components/settings/DeveloperPermissionsPane.test.tsx b/src/renderer/src/components/settings/DeveloperPermissionsPane.test.tsx
index c58fb017ba4..6400e71795e 100644
--- a/src/renderer/src/components/settings/DeveloperPermissionsPane.test.tsx
+++ b/src/renderer/src/components/settings/DeveloperPermissionsPane.test.tsx
@@ -24,11 +24,9 @@ beforeEach(() => {
   Object.assign(window, {
     api: {
       developerPermissions: {
-        getStatus: vi.fn(
-          async (): Promise<DeveloperPermissionState[]> => [
-            { id: 'full-disk-access', status: 'denied' }
-          ]
-        ),
+        getStatus: vi.fn(async (): Promise<DeveloperPermissionState[]> => [
+          { id: 'full-disk-access', status: 'denied' }
+        ]),
         request: vi.fn(async ({ id }: { id: string }) => ({
           id,
           status: 'unknown',
diff --git a/src/renderer/src/components/settings/McpConfigSection.tsx b/src/renderer/src/components/settings/McpConfigSection.tsx
index e4ceac4c892..a4bcc97f8d1 100644
--- a/src/renderer/src/components/settings/McpConfigSection.tsx
+++ b/src/renderer/src/components/settings/McpConfigSection.tsx
@@ -90,12 +90,10 @@ export function McpConfigSection({ repo }: McpConfigSectionProps): React.JSX.Ele
   )
   const missingInspections = useMemo(
     () =>
-      MCP_CONFIG_CANDIDATES.map(
-        (candidate): LoadedMcpConfigInspection => ({
-          ...inspectMcpConfigContent(candidate, null),
-          absolutePath: joinPath(targetRootPath, candidate.relativePath)
-        })
-      ),
+      MCP_CONFIG_CANDIDATES.map((candidate): LoadedMcpConfigInspection => ({
+        ...inspectMcpConfigContent(candidate, null),
+        absolutePath: joinPath(targetRootPath, candidate.relativePath)
+      })),
     [targetRootPath]
   )
   const serverCount = useMemo(() => countServers(configs), [configs])
diff --git a/src/renderer/src/components/settings/RuntimeEnvironmentsPane.tsx b/src/renderer/src/components/settings/RuntimeEnvironmentsPane.tsx
index 3778e1165d7..0877289f33e 100644
--- a/src/renderer/src/components/settings/RuntimeEnvironmentsPane.tsx
+++ b/src/renderer/src/components/settings/RuntimeEnvironmentsPane.tsx
@@ -1,70 +1,44 @@
-/* eslint-disable max-lines -- Why: the server settings pane keeps active
-   server selection, saved server mutation, and confirmation dialogs together so
-   the state transitions stay auditable. */
-import {
-  AlertTriangle,
-  ChevronDown,
-  Loader2,
-  Plus,
-  RefreshCw,
-  Server,
-  ServerOff,
-  Share2,
-  Trash2
-} from 'lucide-react'
-import { useCallback, useEffect, useRef, useState } from 'react'
-import { toast } from 'sonner'
-import { useMountedRef } from '@/hooks/useMountedRef'
+import { useEffect, useRef, useState } from 'react'
 import type { GlobalSettings } from '../../../../shared/global-settings-types'
-import {
-  isUserManagedRuntimeEnvironment,
-  type PublicKnownRuntimeEnvironment
-} from '../../../../shared/runtime-environments'
-import type { RuntimeStatus } from '../../../../shared/runtime-types'
-import {
-  describeRuntimeCompatBlock,
-  evaluateRuntimeCompat,
-  type RuntimeCompatVerdict
-} from '../../../../shared/protocol-compat'
-import {
-  MIN_COMPATIBLE_RUNTIME_SERVER_VERSION,
-  PROJECT_HOST_SETUP_RUNTIME_CAPABILITY,
-  RUNTIME_PROTOCOL_VERSION,
-  TASK_SOURCE_CONTEXT_RUNTIME_CAPABILITY,
-  WORKSPACE_RUN_CONTEXT_RUNTIME_CAPABILITY
-} from '../../../../shared/protocol-version'
-import { Button } from '../ui/button'
-import { Label } from '../ui/label'
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '../ui/select'
+import type { PublicKnownRuntimeEnvironment } from '../../../../shared/runtime-environments'
+import { useAppStore } from '@/store'
+import { cn } from '@/lib/utils'
 import { SearchableSetting } from './SearchableSetting'
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle
-} from '../ui/dialog'
-import { RuntimePairingUrlGenerator } from './RuntimePairingUrlGenerator'
 import { EphemeralVmRuntimesSection } from './EphemeralVmRuntimesSection'
 import { CloudVmSetupGuide } from './CloudVmSetupGuide'
 import {
   getRuntimeEnvironmentsSearchEntry,
   getWebRuntimeEnvironmentsSearchEntry
 } from './runtime-environments-search'
-import { unwrapRuntimeRpcResult } from '@/runtime/runtime-rpc-client'
-import { useAppStore } from '@/store'
-import { translate } from '@/i18n/i18n'
-import { cn } from '@/lib/utils'
-import { getUpdateCheckClickOptions, getUpdateCheckHint } from '@/lib/update-check-click-options'
+import { isRuntimeEnvironmentRemovalBlocked } from './runtime-environment-host-details'
+import { RuntimeServersConnectSection } from './runtime-servers-connect-section'
+import { RuntimeActiveServerSection } from './runtime-active-server-section'
 import {
-  getRemoteServerManualUpdateHelp,
-  RemoteServerUpdateStatus
-} from './RemoteServerUpdateStatus'
-import { RuntimeHostAccessForm, type RuntimeHostAccessFailure } from './RuntimeHostAccessForm'
+  RuntimeEnvironmentRemoveDialog,
+  RuntimeEnvironmentSwitchDialog
+} from './runtime-environment-dialogs'
+import {
+  RuntimeServerShareSection,
+  RuntimeServerTroubleshooting,
+  RuntimeServerWorkflowPicker,
+  type RemoteServerWorkflow
+} from './runtime-server-workflow-sections'
+import { useRuntimeEnvironmentCatalog } from './use-runtime-environment-catalog'
+import { useRuntimeEnvironmentConnectionActions } from './use-runtime-environment-connection-actions'
+import { useRuntimeEnvironmentMutationActions } from './use-runtime-environment-mutation-actions'
+import { LOCAL_RUNTIME_VALUE, NO_RUNTIME_VALUE } from './runtime-environment-selection'
 
-const LOCAL_RUNTIME_VALUE = '__local__'
-const NO_RUNTIME_VALUE = '__none__'
+export {
+  evaluateHostDetails,
+  getActiveServerModeDescription,
+  getHostDetailsDescription,
+  getHostDetailsSummary,
+  getHostModelCapabilitySummary,
+  getRuntimeCapabilitiesSummary,
+  getRuntimeServerConnectionState,
+  isRuntimeEnvironmentRemovalBlocked
+} from './runtime-environment-host-details'
+export type { RuntimeHostDetails } from './runtime-environment-host-details'
 
 type RuntimeEnvironmentsPaneProps = {
   settings: GlobalSettings
@@ -74,190 +48,6 @@ type RuntimeEnvironmentsPaneProps = {
   addServerIntentSignal?: number
 }
 
-export type RuntimeHostDetails = {
-  status: 'loading' | 'ready' | 'error'
-  runtimeStatus: RuntimeStatus | null
-  compatibility: RuntimeCompatVerdict | null
-  error: string | null
-}
-
-export function evaluateHostDetails(status: RuntimeStatus): RuntimeCompatVerdict {
-  return evaluateRuntimeCompat({
-    clientProtocolVersion: RUNTIME_PROTOCOL_VERSION,
-    minCompatibleServerProtocolVersion: MIN_COMPATIBLE_RUNTIME_SERVER_VERSION,
-    serverProtocolVersion: status.runtimeProtocolVersion ?? status.protocolVersion,
-    serverMinCompatibleClientProtocolVersion:
-      status.minCompatibleRuntimeClientVersion ?? status.minCompatibleMobileVersion
-  })
-}
-
-export function getHostDetailsSummary(details: RuntimeHostDetails | undefined): string {
-  if (!details || details.status === 'loading') {
-    return translate('auto.components.settings.RuntimeEnvironmentsPane.5120beaac6', 'Checking…')
-  }
-  if (details.status === 'error') {
-    return translate(
-      'auto.components.settings.RuntimeEnvironmentsPane.c8791efc45',
-      'Status unavailable'
-    )
-  }
-  if (details.compatibility?.kind === 'blocked') {
-    return details.compatibility.reason === 'client-too-old'
-      ? translate('auto.components.settings.RuntimeEnvironmentsPane.62ac182a27', 'Update client')
-      : translate('auto.components.settings.RuntimeEnvironmentsPane.86ed75bec8', 'Update server')
-  }
-  return translate('auto.components.settings.RuntimeEnvironmentsPane.9a91c4a0eb', 'Compatible')
-}
-
-export function getHostDetailsDescription(details: RuntimeHostDetails | undefined): string | null {
-  if (!details || details.status === 'loading') {
-    return null
-  }
-  if (details.status === 'error') {
-    return details.error
-  }
-  if (details.compatibility?.kind === 'blocked') {
-    return describeRuntimeCompatBlock(details.compatibility)
-  }
-  return null
-}
-
-export function getRuntimeCapabilitiesSummary(status: RuntimeStatus | null | undefined): string {
-  const capabilities = status?.capabilities ?? []
-  if (capabilities.length === 0) {
-    return translate(
-      'auto.components.settings.RuntimeEnvironmentsPane.4b5c6d7e8f',
-      'No capabilities reported'
-    )
-  }
-  const visibleCapabilities = capabilities.slice(0, 3).join(', ')
-  const hiddenCount = capabilities.length - 3
-  return hiddenCount > 0 ? `${visibleCapabilities} +${hiddenCount}` : visibleCapabilities
-}
-
-export function getHostModelCapabilitySummary(
-  status: RuntimeStatus | null | undefined
-): string | null {
-  if (!status) {
-    return null
-  }
-  const capabilities = status.capabilities
-  if (!capabilities) {
-    return translate(
-      'auto.components.settings.RuntimeEnvironmentsPane.hostModelCapabilityUnknown',
-      'Host model support: checking server capabilities'
-    )
-  }
-  const missing = [
-    PROJECT_HOST_SETUP_RUNTIME_CAPABILITY,
-    TASK_SOURCE_CONTEXT_RUNTIME_CAPABILITY,
-    WORKSPACE_RUN_CONTEXT_RUNTIME_CAPABILITY
-  ].filter((capability) => !capabilities.includes(capability))
-  if (missing.length === 0) {
-    return translate(
-      'auto.components.settings.RuntimeEnvironmentsPane.hostModelCapabilitySupported',
-      'Host model support: ready'
-    )
-  }
-  const missingLabels = missing.map(getHostModelCapabilityLabel)
-  return translate(
-    'auto.components.settings.RuntimeEnvironmentsPane.hostModelCapabilityMissing',
-    'Host model support: update server for {{value0}}',
-    { value0: missingLabels.join(', ') }
-  )
-}
-
-function getHostModelCapabilityLabel(capability: string): string {
-  switch (capability) {
-    case PROJECT_HOST_SETUP_RUNTIME_CAPABILITY:
-      return translate(
-        'auto.components.settings.RuntimeEnvironmentsPane.hostModelCapabilityProjectSetup',
-        'project setup'
-      )
-    case TASK_SOURCE_CONTEXT_RUNTIME_CAPABILITY:
-      return translate(
-        'auto.components.settings.RuntimeEnvironmentsPane.hostModelCapabilityTaskSourceContext',
-        'task source context'
-      )
-    case WORKSPACE_RUN_CONTEXT_RUNTIME_CAPABILITY:
-      return translate(
-        'auto.components.settings.RuntimeEnvironmentsPane.hostModelCapabilityWorkspaceRunContext',
-        'workspace run context'
-      )
-    default:
-      return capability
-  }
-}
-
-export function getActiveServerModeDescription(allowLocalRuntime: boolean): string {
-  return allowLocalRuntime
-    ? translate(
-        'auto.components.settings.RuntimeEnvironmentsPane.3f67e8078a',
-        'Use this computer by default. Choose a saved server only when you want supported projects, files, terminals, provider checks, and browser/mobile handoff to run through that server.'
-      )
-    : translate(
-        'auto.components.settings.RuntimeEnvironmentsPane.2c85efb3e8',
-        'Selecting a saved server makes this browser use that paired Orca runtime as its default Host.'
-      )
-}
-
-export function isRuntimeEnvironmentRemovalBlocked(
-  activeRuntimeEnvironmentId: string | null | undefined,
-  environmentId: string
-): boolean {
-  return activeRuntimeEnvironmentId === environmentId
-}
-
-type RuntimeServerConnectionState = 'connected' | 'checking' | 'disconnected'
-type RemoteServerWorkflow = 'connect' | 'cloud-vm' | 'share'
-
-export function getRuntimeServerConnectionState(
-  details: RuntimeHostDetails | undefined
-): RuntimeServerConnectionState {
-  if (!details || details.status === 'loading') {
-    return 'checking'
-  }
-  if (details.status !== 'ready' || details.compatibility?.kind === 'blocked') {
-    return 'disconnected'
-  }
-  // Why: an attached, reachable, compatible host is "Connected" (and exposes
-  // Disconnect). Whether it is the default *active* server is a separate concept,
-  // surfaced by the Advanced > Active Server selector and the row's help text —
-  // it must not change this connection label, or the dot/label/button disagree.
-  return 'connected'
-}
-
-function getRuntimeServerConnectionLabel(state: RuntimeServerConnectionState): string {
-  switch (state) {
-    case 'connected':
-      return translate(
-        'auto.components.settings.RuntimeEnvironmentsPane.serverConnected',
-        'Connected'
-      )
-    case 'checking':
-      return translate(
-        'auto.components.settings.RuntimeEnvironmentsPane.serverChecking',
-        'Checking…'
-      )
-    case 'disconnected':
-      return translate(
-        'auto.components.settings.RuntimeEnvironmentsPane.serverDisconnected',
-        'Disconnected'
-      )
-  }
-}
-
-function getRuntimeServerDotClass(state: RuntimeServerConnectionState): string {
-  switch (state) {
-    case 'connected':
-      return 'bg-emerald-500'
-    case 'checking':
-      return 'bg-yellow-500'
-    case 'disconnected':
-      return 'bg-muted-foreground/40'
-  }
-}
-
 export function RuntimeEnvironmentsPane({
   settings,
   setActiveRuntimeEnvironmentPreference,
@@ -265,27 +55,12 @@ export function RuntimeEnvironmentsPane({
   allowLocalRuntime = true,
   addServerIntentSignal
 }: RuntimeEnvironmentsPaneProps): React.JSX.Element {
-  const [environments, setEnvironments] = useState<PublicKnownRuntimeEnvironment[]>([])
-  const [isLoading, setIsLoading] = useState(false)
-  const [isSaving, setIsSaving] = useState(false)
-  const [detailsByEnvironmentId, setDetailsByEnvironmentId] = useState<
-    Record<string, RuntimeHostDetails>
-  >({})
-  const [connectingId, setConnectingId] = useState<string | null>(null)
-  const [switchingValue, setSwitchingValue] = useState<string | null>(null)
-  const [removingId, setRemovingId] = useState<string | null>(null)
-  const [disconnectingId, setDisconnectingId] = useState<string | null>(null)
   const [pendingSwitchValue, setPendingSwitchValue] = useState<string | null>(null)
   const [pendingRemove, setPendingRemove] = useState<PublicKnownRuntimeEnvironment | null>(null)
   const [addServerFormOpen, setAddServerFormOpen] = useState(false)
   const [shareServerFormOpen, setShareServerFormOpen] = useState(true)
   const [advancedOpen, setAdvancedOpen] = useState(false)
   const [workflow, setWorkflow] = useState<RemoteServerWorkflow>('connect')
-  const [switchError, setSwitchError] = useState<string | null>(null)
-  const [removeError, setRemoveError] = useState<string | null>(null)
-  const [name, setName] = useState('')
-  const [pairingCode, setPairingCode] = useState('')
-  const [addServerFailure, setAddServerFailure] = useState<RuntimeHostAccessFailure | null>(null)
   const remoteServerUpdates = useAppStore((state) => state.remoteServerUpdates)
   const remoteServerUpdatesChecking = useAppStore((state) => state.remoteServerUpdatesChecking)
   const remoteServerUpdatesRunning = useAppStore((state) => state.remoteServerUpdatesRunning)
@@ -294,137 +69,63 @@ export function RuntimeEnvironmentsPane({
     (state) => state.setRemoteServerUpdateDialogOpen
   )
   const consumedAddServerIntentSignalRef = useRef(0)
-  const mountedRef = useMountedRef()
-  const updateCheckHint = getUpdateCheckHint()
-  const activeValue =
-    settings.activeRuntimeEnvironmentId ??
-    (allowLocalRuntime ? LOCAL_RUNTIME_VALUE : NO_RUNTIME_VALUE)
-  const isBusy =
-    isSaving ||
-    connectingId !== null ||
-    switchingValue !== null ||
-    removingId !== null ||
-    disconnectingId !== null
-  const removingActiveServer = pendingRemove
-    ? isRuntimeEnvironmentRemovalBlocked(settings.activeRuntimeEnvironmentId, pendingRemove.id)
-    : false
-  const searchEntry = canGeneratePairingUrl
-    ? getRuntimeEnvironmentsSearchEntry()
-    : getWebRuntimeEnvironmentsSearchEntry()
+  const {
+    environments,
+    isLoading,
+    detailsByEnvironmentId,
+    setDetailsByEnvironmentId,
+    mountedRef,
+    loadEnvironments
+  } = useRuntimeEnvironmentCatalog()
 
-  const loadEnvironments = useCallback(
-    async (verified?: { environmentId: string; runtimeStatus: RuntimeStatus }): Promise<void> => {
-      if (mountedRef.current) {
-        setIsLoading(true)
-      }
-      try {
-        const nextEnvironments = await window.api.runtimeEnvironments.list()
-        const visibleEnvironments = nextEnvironments.filter(isUserManagedRuntimeEnvironment)
-        // Why: drop store status for servers no longer saved so stale hosts don't
-        // linger in the sidebar registry.
-        useAppStore.getState().setRuntimeEnvironments(nextEnvironments)
-        if (verified) {
-          useAppStore.getState().setRuntimeEnvironmentStatus(verified.environmentId, {
-            status: verified.runtimeStatus,
-            checkedAt: Date.now()
-          })
-        }
-        if (mountedRef.current) {
-          setEnvironments(visibleEnvironments)
-          setDetailsByEnvironmentId((current) => {
-            const next: Record<string, RuntimeHostDetails> = {}
-            for (const environment of visibleEnvironments) {
-              next[environment.id] =
-                verified?.environmentId === environment.id
-                  ? {
-                      status: 'ready',
-                      runtimeStatus: verified.runtimeStatus,
-                      compatibility: evaluateHostDetails(verified.runtimeStatus),
-                      error: null
-                    }
-                  : (current[environment.id] ?? {
-                      status: 'loading',
-                      runtimeStatus: null,
-                      compatibility: null,
-                      error: null
-                    })
-            }
-            return next
-          })
-        }
-        await Promise.allSettled(
-          visibleEnvironments
-            .filter((environment) => environment.id !== verified?.environmentId)
-            .map(async (environment) => {
-              try {
-                const response = await window.api.runtimeEnvironments.getStatus({
-                  selector: environment.id,
-                  timeoutMs: 10_000
-                })
-                const runtimeStatus = unwrapRuntimeRpcResult<RuntimeStatus>(response)
-                // Why: feed the live status into the store so sidebar host pickers
-                // reflect manual refreshes, not just the settings pane.
-                useAppStore.getState().setRuntimeEnvironmentStatus(environment.id, {
-                  status: runtimeStatus,
-                  checkedAt: Date.now()
-                })
-                if (!mountedRef.current) {
-                  return
-                }
-                setDetailsByEnvironmentId((current) => ({
-                  ...current,
-                  [environment.id]: {
-                    status: 'ready',
-                    runtimeStatus,
-                    compatibility: evaluateHostDetails(runtimeStatus),
-                    error: null
-                  }
-                }))
-              } catch (error) {
-                // Why: record the failed probe (null status) so the sidebar can
-                // distinguish unreachable from never-checked.
-                useAppStore.getState().setRuntimeEnvironmentStatus(environment.id, {
-                  status: null,
-                  checkedAt: Date.now()
-                })
-                if (!mountedRef.current) {
-                  return
-                }
-                setDetailsByEnvironmentId((current) => ({
-                  ...current,
-                  [environment.id]: {
-                    status: 'error',
-                    runtimeStatus: null,
-                    compatibility: null,
-                    error: error instanceof Error ? error.message : String(error)
-                  }
-                }))
-              }
-            })
-        )
-      } catch (error) {
-        if (mountedRef.current) {
-          toast.error(
-            error instanceof Error
-              ? error.message
-              : translate(
-                  'auto.components.settings.RuntimeEnvironmentsPane.e6410d72c3',
-                  'Failed to load runtime environments.'
-                )
-          )
-        }
-      } finally {
-        if (mountedRef.current) {
-          setIsLoading(false)
-        }
-      }
-    },
-    [mountedRef]
-  )
-
-  useEffect(() => {
-    void loadEnvironments()
-  }, [loadEnvironments])
+  const getEnvironmentLabel = (value: string): string => {
+    if (value === LOCAL_RUNTIME_VALUE) {
+      return 'Local desktop'
+    }
+    if (value === NO_RUNTIME_VALUE) {
+      return 'No server connected'
+    }
+    return environments.find((environment) => environment.id === value)?.name ?? 'remote server'
+  }
+  const {
+    connectingId,
+    switchingValue,
+    disconnectingId,
+    switchError,
+    setSwitchError,
+    connectEnvironment,
+    disconnectEnvironment,
+    switchToValue
+  } = useRuntimeEnvironmentConnectionActions({
+    allowLocalRuntime,
+    mountedRef,
+    setDetailsByEnvironmentId,
+    setActiveRuntimeEnvironmentPreference,
+    getEnvironmentLabel
+  })
+  const {
+    isSaving,
+    removingId,
+    removeError,
+    setRemoveError,
+    name,
+    setName,
+    pairingCode,
+    setPairingCode,
+    addServerFailure,
+    setAddServerFailure,
+    closeAddServerForm,
+    addEnvironment,
+    removeEnvironment
+  } = useRuntimeEnvironmentMutationActions({
+    environments,
+    settings,
+    allowLocalRuntime,
+    mountedRef,
+    setAddServerFormOpen,
+    loadEnvironments,
+    connectEnvironment
+  })
 
   const environmentIdsKey = environments.map((environment) => environment.id).join('\n')
   useEffect(() => {
@@ -443,327 +144,50 @@ export function RuntimeEnvironmentsPane({
     setAddServerFormOpen(true)
   }, [addServerIntentSignal])
 
-  const closeAddServerForm = (): void => {
-    if (isSaving) {
-      return
-    }
-    setAddServerFormOpen(false)
-    setName('')
-    setPairingCode('')
-    setAddServerFailure(null)
-  }
-
-  const addEnvironment = async (allowLoopback: boolean): Promise<void> => {
-    const trimmedName = name.trim()
-    const trimmedPairingCode = pairingCode.trim()
-    if (!trimmedName || !trimmedPairingCode) {
-      toast.error(
-        translate(
-          'auto.components.settings.RuntimeEnvironmentsPane.0c55a47480',
-          'Name and pairing code are required.'
-        )
-      )
-      return
-    }
-    const duplicate = environments.find(
-      (environment) => environment.name.trim().toLowerCase() === trimmedName.toLowerCase()
-    )
-    if (duplicate) {
-      toast.error(
-        translate(
-          'auto.components.settings.RuntimeEnvironmentsPane.5ef712f407',
-          'A server named "{{value0}}" already exists.',
-          { value0: duplicate.name }
-        )
-      )
-      return
-    }
-    setAddServerFailure(null)
-    setIsSaving(true)
-    try {
-      const result = await window.api.runtimeEnvironments.verifyAndAddFromPairingCode({
-        name: trimmedName,
-        pairingCode: trimmedPairingCode,
-        allowLoopback
-      })
-      if (!result.ok) {
-        if (mountedRef.current) {
-          setAddServerFailure({ kind: result.kind, message: result.message })
-        }
-        return
-      }
-      if (mountedRef.current) {
-        setName('')
-        setPairingCode('')
-      }
-      await loadEnvironments({
-        environmentId: result.environment.id,
-        runtimeStatus: result.runtimeStatus
-      })
-      if (!allowLocalRuntime) {
-        const connected = await connectEnvironment(result.environment)
-        if (!connected) {
-          await window.api.runtimeEnvironments.remove({ selector: result.environment.id })
-          await loadEnvironments()
-          return
-        }
-      } else {
-        if (mountedRef.current) {
-          toast.success(
-            translate(
-              'auto.components.settings.RuntimeEnvironmentsPane.7b5986c8df',
-              'Connected to {{value0}}. Use Advanced > Active Server to make it the default.',
-              { value0: result.environment.name }
-            )
-          )
-        }
-      }
-      if (mountedRef.current) {
-        setAddServerFormOpen(false)
-      }
-    } catch (error) {
-      if (mountedRef.current) {
-        toast.error(
-          error instanceof Error
-            ? error.message
-            : translate(
-                'auto.components.settings.RuntimeEnvironmentsPane.6cb6eae14f',
-                'Failed to save runtime environment.'
-              )
-        )
-      }
-    } finally {
-      if (mountedRef.current) {
-        setIsSaving(false)
-      }
-    }
-  }
-
-  const removeEnvironment = async (
-    environment: PublicKnownRuntimeEnvironment
-  ): Promise<boolean> => {
-    setRemovingId(environment.id)
-    setRemoveError(null)
-    try {
-      if (isRuntimeEnvironmentRemovalBlocked(settings.activeRuntimeEnvironmentId, environment.id)) {
-        if (mountedRef.current) {
-          setRemoveError(
-            translate(
-              'auto.components.settings.RuntimeEnvironmentsPane.removeActiveServerBlocked',
-              'Choose another Active Server in Advanced before removing this server.'
-            )
-          )
-        }
-        return false
-      }
-      await window.api.runtimeEnvironments.remove({ selector: environment.id })
-      await loadEnvironments()
-      if (mountedRef.current) {
-        toast.success(
-          translate(
-            'auto.components.settings.RuntimeEnvironmentsPane.b5b5114cb0',
-            'Removed {{value0}}.',
-            { value0: environment.name }
-          )
-        )
-      }
-      return true
-    } catch (error) {
-      const message =
-        error instanceof Error ? error.message : 'Failed to remove runtime environment.'
-      if (mountedRef.current) {
-        setRemoveError(message)
-        toast.error(message)
-      }
-      return false
-    } finally {
-      if (mountedRef.current) {
-        setRemovingId(null)
-      }
-    }
-  }
-
-  const disconnectEnvironment = async (
-    environment: PublicKnownRuntimeEnvironment
-  ): Promise<boolean> => {
-    setDisconnectingId(environment.id)
-    setSwitchError(null)
-    try {
-      await window.api.runtimeEnvironments.disconnect({ selector: environment.id })
-      // Why: disconnect is non-destructive; keep the saved server but show the
-      // user that this live client is no longer attached to it.
-      useAppStore.getState().setRuntimeEnvironmentStatus(
-        environment.id,
-        {
-          status: null,
-          checkedAt: Date.now()
-        },
-        { suppressDisconnectToast: true }
-      )
-      if (mountedRef.current) {
-        setDetailsByEnvironmentId((current) => ({
-          ...current,
-          [environment.id]: {
-            status: 'error',
-            runtimeStatus: null,
-            compatibility: null,
-            error: null
-          }
-        }))
-        toast.success(
-          translate(
-            'auto.components.settings.RuntimeEnvironmentsPane.disconnectedServer',
-            'Disconnected from {{value0}}.',
-            { value0: environment.name }
-          )
-        )
-      }
-      return true
-    } catch (error) {
-      const message = error instanceof Error ? error.message : 'Failed to disconnect server.'
-      if (mountedRef.current) {
-        setSwitchError(message)
-        toast.error(message)
-      }
-      return false
-    } finally {
-      if (mountedRef.current) {
-        setDisconnectingId(null)
-      }
-    }
-  }
-
-  const connectEnvironment = async (
-    environment: PublicKnownRuntimeEnvironment
-  ): Promise<boolean> => {
-    setConnectingId(environment.id)
-    setSwitchError(null)
-    try {
-      const response = await window.api.runtimeEnvironments.connect({
-        selector: environment.id,
-        timeoutMs: 15_000
-      })
-      const runtimeStatus = unwrapRuntimeRpcResult<RuntimeStatus>(response)
-      const compatibility = evaluateHostDetails(runtimeStatus)
-      // Why: row Connect is reachability only. The Advanced selector is the
-      // explicit default-host control and should be the only active-server path.
-      useAppStore.getState().setRuntimeEnvironmentStatus(environment.id, {
-        status: runtimeStatus,
-        checkedAt: Date.now()
-      })
-      if (mountedRef.current) {
-        setDetailsByEnvironmentId((current) => ({
-          ...current,
-          [environment.id]: {
-            status: 'ready',
-            runtimeStatus,
-            compatibility,
-            error: null
-          }
-        }))
-      }
-      if (compatibility.kind === 'blocked') {
-        const message = describeRuntimeCompatBlock(compatibility)
-        if (mountedRef.current) {
-          setSwitchError(message)
-          toast.error(message)
-        }
-        return false
-      }
-      const store = useAppStore.getState()
-      // Why: Connect is not the Active Server selector anymore, but connected
-      // hosts should still contribute their projects/workspaces to the sidebar.
-      const repos = await store.fetchRuntimeEnvironmentRepos(environment.id)
-      await Promise.all(repos.map((repo) => useAppStore.getState().fetchWorktrees(repo.id)))
-      await useAppStore.getState().fetchWorktreeLineage()
-      if (mountedRef.current) {
-        toast.success(
-          translate(
-            'auto.components.settings.RuntimeEnvironmentsPane.runtimeReachable',
-            '{{value0}} is reachable.',
-            { value0: environment.name }
-          )
-        )
-      }
-      return true
-    } catch (error) {
-      const message = error instanceof Error ? error.message : 'Failed to connect server.'
-      useAppStore.getState().setRuntimeEnvironmentStatus(environment.id, {
-        status: null,
-        checkedAt: Date.now()
-      })
-      if (mountedRef.current) {
-        setDetailsByEnvironmentId((current) => ({
-          ...current,
-          [environment.id]: {
-            status: 'error',
-            runtimeStatus: null,
-            compatibility: null,
-            error: message
-          }
-        }))
-        setSwitchError(message)
-        toast.error(message)
-      }
-      return false
-    } finally {
-      if (mountedRef.current) {
-        setConnectingId(null)
-      }
-    }
-  }
-
-  const switchToValue = async (value: string): Promise<boolean> => {
-    if (value === NO_RUNTIME_VALUE) {
-      return false
-    }
-    setSwitchingValue(value)
-    setSwitchError(null)
-    try {
-      const switched = await setActiveRuntimeEnvironmentPreference(
-        allowLocalRuntime && value === LOCAL_RUNTIME_VALUE ? null : value
-      )
-      if (switched) {
-        if (mountedRef.current) {
-          toast.success(
-            translate(
-              'auto.components.settings.RuntimeEnvironmentsPane.99ac81fb43',
-              'Switched to {{value0}}.',
-              { value0: getEnvironmentLabel(value) }
-            )
-          )
-        }
-        return true
-      }
-      if (mountedRef.current) {
-        setSwitchError('Could not switch servers. Fix the issue and try again.')
-      }
-      return false
-    } catch (error) {
-      const message = error instanceof Error ? error.message : 'Failed to switch servers.'
-      if (mountedRef.current) {
-        setSwitchError(message)
-        toast.error(message)
-      }
-      return false
-    } finally {
-      if (mountedRef.current) {
-        setSwitchingValue(null)
-      }
-    }
-  }
-
-  const getEnvironmentLabel = (value: string): string => {
-    if (value === LOCAL_RUNTIME_VALUE) {
-      return 'Local desktop'
-    }
-    if (value === NO_RUNTIME_VALUE) {
-      return 'No server connected'
-    }
-    return environments.find((environment) => environment.id === value)?.name ?? 'remote server'
-  }
+  const activeValue =
+    settings.activeRuntimeEnvironmentId ??
+    (allowLocalRuntime ? LOCAL_RUNTIME_VALUE : NO_RUNTIME_VALUE)
+  const isBusy =
+    isSaving ||
+    connectingId !== null ||
+    switchingValue !== null ||
+    removingId !== null ||
+    disconnectingId !== null
+  const removingActiveServer = pendingRemove
+    ? isRuntimeEnvironmentRemovalBlocked(settings.activeRuntimeEnvironmentId, pendingRemove.id)
+    : false
+  const searchEntry = canGeneratePairingUrl
+    ? getRuntimeEnvironmentsSearchEntry()
+    : getWebRuntimeEnvironmentsSearchEntry()
   const visibleWorkflow: RemoteServerWorkflow = addServerFormOpen ? 'connect' : workflow
 
+  const openRemoveDialog = (environment: PublicKnownRuntimeEnvironment): void => {
+    setRemoveError(null)
+    setPendingRemove(environment)
+  }
+  const confirmSwitch = (): void => {
+    const value = pendingSwitchValue
+    if (!value) {
+      return
+    }
+    void switchToValue(value).then((switched) => {
+      if (switched && mountedRef.current) {
+        setPendingSwitchValue(null)
+      }
+    })
+  }
+  const confirmRemove = (): void => {
+    const environment = pendingRemove
+    if (!environment) {
+      return
+    }
+    void removeEnvironment(environment).then((removed) => {
+      if (removed && mountedRef.current) {
+        setPendingRemove(null)
+      }
+    })
+  }
+
   return (
     <SearchableSetting
       title={searchEntry.title}
@@ -771,791 +195,113 @@ export function RuntimeEnvironmentsPane({
       keywords={searchEntry.keywords}
       className="space-y-4 py-2"
     >
-      <div
-        role="group"
-        aria-label={translate(
-          'auto.components.settings.RuntimeEnvironmentsPane.workflow',
-          'Remote server workflow'
-        )}
-        className={cn('grid gap-2 sm:grid-cols-2', canGeneratePairingUrl && 'sm:grid-cols-3')}
-      >
-        {(
-          [
-            [
-              'connect',
-              translate(
-                'auto.components.settings.RuntimeEnvironmentsPane.connectWorkflow',
-                'Connect to a host'
-              ),
-              translate(
-                'auto.components.settings.RuntimeEnvironmentsPane.connectWorkflowHelp',
-                'This app joins another machine'
-              )
-            ],
-            [
-              'share',
-              translate(
-                'auto.components.settings.RuntimeEnvironmentsPane.shareWorkflow',
-                'Share this host'
-              ),
-              translate(
-                'auto.components.settings.RuntimeEnvironmentsPane.shareWorkflowHelp',
-                'Other devices join this machine'
-              )
-            ],
-            [
-              'cloud-vm',
-              translate(
-                'auto.components.settings.RuntimeEnvironmentsPane.cloudVmWorkflow',
-                'Cloud VM'
-              ),
-              translate(
-                'auto.components.settings.RuntimeEnvironmentsPane.cloudVmWorkflowHelp',
-                'Manage recipe-created cloud machines'
-              )
-            ]
-          ] as const
-        )
-          .filter(([value]) => value !== 'share' || canGeneratePairingUrl)
-          .map(([value, label, description]) => (
-            <button
-              key={value}
-              type="button"
-              aria-pressed={visibleWorkflow === value}
-              onClick={() => {
-                if (value !== 'connect') {
-                  closeAddServerForm()
-                }
-                setWorkflow(value)
-              }}
-              className={cn(
-                'rounded-lg border p-3 text-left transition-colors',
-                visibleWorkflow === value
-                  ? 'border-ring bg-accent text-accent-foreground'
-                  : 'border-border hover:bg-accent'
-              )}
-            >
-              <span className="block text-sm font-medium">{label}</span>
-              <span
-                className={cn(
-                  'mt-1 block text-xs',
-                  visibleWorkflow === value ? 'text-accent-foreground' : 'text-muted-foreground'
-                )}
-              >
-                {description}
-              </span>
-            </button>
-          ))}
-      </div>
+      <RuntimeServerWorkflowPicker
+        canGeneratePairingUrl={canGeneratePairingUrl}
+        visibleWorkflow={visibleWorkflow}
+        onCloseAddServerForm={closeAddServerForm}
+        onWorkflowChange={setWorkflow}
+      />
 
-      <div className={cn('space-y-3', visibleWorkflow !== 'connect' && 'hidden')}>
-        <div
-          data-settings-section="remote-server-updates"
-          className="flex items-center justify-between gap-3"
-        >
-          <div className="min-w-0 space-y-0.5">
-            <div className="text-sm font-medium">
-              {translate(
-                'auto.components.settings.RuntimeEnvironmentsPane.connectToRemoteServers',
-                'Connect to remote servers'
-              )}
-            </div>
-            <p className="text-xs text-muted-foreground">
-              {translate(
-                'auto.components.settings.RuntimeEnvironmentsPane.connectToRemoteServersHelp',
-                'Pair another Orca runtime, then connect or disconnect it here.'
-              )}
-            </p>
-          </div>
-          <div className="flex shrink-0 items-center gap-2">
-            {environments.length > 0 ? (
-              <Button
-                type="button"
-                variant="outline"
-                size="sm"
-                className="gap-1.5"
-                title={updateCheckHint}
-                onClick={(event) => {
-                  setRemoteServerUpdateDialogOpen(true)
-                  void refreshRemoteServerUpdates(getUpdateCheckClickOptions(event))
-                }}
-                disabled={remoteServerUpdatesChecking && remoteServerUpdates.size === 0}
-              >
-                {remoteServerUpdatesChecking || remoteServerUpdatesRunning ? (
-                  <Loader2 className="animate-spin" />
-                ) : (
-                  <RefreshCw />
-                )}
-                {remoteServerUpdatesRunning
-                  ? translate(
-                      'auto.components.settings.RuntimeEnvironmentsPane.updatingServers',
-                      'Updating servers…'
-                    )
-                  : translate(
-                      'auto.components.settings.RuntimeEnvironmentsPane.reviewServerUpdates',
-                      'Check for Server Updates'
-                    )}
-              </Button>
-            ) : null}
-            {addServerFormOpen ? null : (
-              <Button
-                type="button"
-                variant="outline"
-                size="sm"
-                className="gap-1.5"
-                onClick={() => setAddServerFormOpen(true)}
-                disabled={isBusy}
-              >
-                <Plus />
-                {translate(
-                  'auto.components.settings.RuntimeEnvironmentsPane.9bee6bbeeb',
-                  'Add Server'
-                )}
-              </Button>
-            )}
-          </div>
-        </div>
-
-        {addServerFormOpen ? (
-          <RuntimeHostAccessForm
-            name={name}
-            accessLink={pairingCode}
-            busy={isBusy}
-            failure={addServerFailure}
-            onNameChange={setName}
-            onAccessLinkChange={(value) => {
-              setPairingCode(value)
-              setAddServerFailure(null)
-            }}
-            onCancel={closeAddServerForm}
-            onSubmit={(allowLoopback) => void addEnvironment(allowLoopback)}
-          />
-        ) : null}
-
-        <div className="rounded-lg border border-border/50 bg-card/30">
-          {environments.length === 0 ? (
-            <div className="px-3 py-4 text-sm text-muted-foreground">
-              {translate(
-                'auto.components.settings.RuntimeEnvironmentsPane.9a3758d983',
-                'No saved servers.'
-              )}
-            </div>
-          ) : (
-            <div className="divide-y divide-border/50">
-              {environments.map((environment) => (
-                <div
-                  key={environment.id}
-                  data-settings-section={environment.id}
-                  className="flex items-center gap-3 px-4 py-3"
-                >
-                  {(() => {
-                    const details = detailsByEnvironmentId[environment.id]
-                    const detailsDescription = getHostDetailsDescription(details)
-                    const isActive = settings.activeRuntimeEnvironmentId === environment.id
-                    const connectionState = getRuntimeServerConnectionState(details)
-                    const remoteUpdate = remoteServerUpdates.get(environment.id)
-                    // A connected host exposes Disconnect; otherwise Connect.
-                    const isReachable = connectionState === 'connected'
-                    const actionBusy =
-                      connectingId === environment.id ||
-                      switchingValue === environment.id ||
-                      disconnectingId === environment.id ||
-                      removingId === environment.id
-                    return (
-                      <>
-                        <Server className="size-4 shrink-0 text-muted-foreground" />
-                        <div className="min-w-0 flex-1">
-                          <div className="flex min-w-0 items-center gap-2">
-                            <div className="truncate text-sm font-medium">{environment.name}</div>
-                            <span
-                              className={cn(
-                                'size-2 shrink-0 rounded-full',
-                                getRuntimeServerDotClass(connectionState)
-                              )}
-                            />
-                            <span className="text-[11px] text-muted-foreground">
-                              {getRuntimeServerConnectionLabel(connectionState)}
-                            </span>
-                            {details?.compatibility?.kind === 'blocked' ? (
-                              <AlertTriangle className="size-3.5 shrink-0 text-destructive" />
-                            ) : details?.status === 'loading' ? (
-                              <Loader2 className="size-3.5 shrink-0 animate-spin text-muted-foreground" />
-                            ) : null}
-                          </div>
-                          <p className="truncate text-xs text-muted-foreground">
-                            {environment.connectionDependency === 'ssh-tunnel'
-                              ? translate(
-                                  'auto.components.settings.RuntimeEnvironmentsPane.sshTunnelRequired',
-                                  'SSH tunnel required'
-                                )
-                              : isActive
-                                ? translate(
-                                    'auto.components.settings.RuntimeEnvironmentsPane.activeServerRowHelp',
-                                    'Active server for server-routed projects, terminals, and provider checks.'
-                                  )
-                                : getHostDetailsSummary(details)}
-                          </p>
-                          {detailsDescription ? (
-                            <p
-                              className={cn(
-                                'mt-0.5 truncate text-xs',
-                                details?.compatibility?.kind === 'blocked'
-                                  ? 'text-destructive'
-                                  : 'text-muted-foreground'
-                              )}
-                            >
-                              {detailsDescription}
-                            </p>
-                          ) : null}
-                          {remoteUpdate ? (
-                            <div className="mt-1 flex flex-wrap items-center gap-2">
-                              <span className="text-[11px] text-muted-foreground">
-                                {remoteUpdate.currentVersion
-                                  ? translate(
-                                      'auto.components.settings.RuntimeEnvironmentsPane.orcaVersion',
-                                      'Orca v{{value0}}',
-                                      { value0: remoteUpdate.currentVersion }
-                                    )
-                                  : translate(
-                                      'auto.components.settings.RuntimeEnvironmentsPane.versionUnavailable',
-                                      'Orca version unavailable'
-                                    )}
-                              </span>
-                              <RemoteServerUpdateStatus entry={remoteUpdate} compact />
-                            </div>
-                          ) : null}
-                          {remoteUpdate?.phase === 'manual' ? (
-                            <p className="mt-1 text-xs text-muted-foreground">
-                              {getRemoteServerManualUpdateHelp(remoteUpdate)}
-                            </p>
-                          ) : null}
-                          {remoteUpdate?.phase === 'failed' && remoteUpdate.error ? (
-                            <p className="mt-1 text-xs text-destructive">{remoteUpdate.error}</p>
-                          ) : null}
-                        </div>
-                        <div className="flex shrink-0 items-center gap-1">
-                          {remoteUpdate?.phase === 'available' ||
-                          remoteUpdate?.phase === 'failed' ? (
-                            <Button
-                              type="button"
-                              variant="ghost"
-                              size="xs"
-                              onClick={() => setRemoteServerUpdateDialogOpen(true)}
-                              disabled={remoteServerUpdatesRunning}
-                            >
-                              {translate(
-                                'auto.components.settings.RuntimeEnvironmentsPane.updateServer',
-                                'Update'
-                              )}
-                            </Button>
-                          ) : null}
-                          {isReachable ? (
-                            <Button
-                              type="button"
-                              variant="ghost"
-                              size="xs"
-                              className="gap-1.5"
-                              onClick={() => void disconnectEnvironment(environment)}
-                              disabled={actionBusy}
-                            >
-                              {disconnectingId === environment.id ? (
-                                <Loader2 className="size-3 animate-spin" />
-                              ) : (
-                                <ServerOff className="size-3" />
-                              )}
-                              {translate(
-                                'auto.components.settings.RuntimeEnvironmentsPane.disconnect',
-                                'Disconnect'
-                              )}
-                            </Button>
-                          ) : (
-                            <Button
-                              type="button"
-                              variant="ghost"
-                              size="xs"
-                              className="gap-1.5"
-                              onClick={() => void connectEnvironment(environment)}
-                              disabled={actionBusy || connectionState === 'checking'}
-                            >
-                              {connectingId === environment.id ? (
-                                <Loader2 className="size-3 animate-spin" />
-                              ) : (
-                                <Server className="size-3" />
-                              )}
-                              {translate(
-                                'auto.components.settings.RuntimeEnvironmentsPane.connect',
-                                'Connect'
-                              )}
-                            </Button>
-                          )}
-                          <Button
-                            type="button"
-                            variant="ghost"
-                            size="icon"
-                            onClick={() => {
-                              setRemoveError(null)
-                              setPendingRemove(environment)
-                            }}
-                            className="size-7 text-muted-foreground hover:text-red-400"
-                            disabled={isBusy}
-                            aria-label={translate(
-                              'auto.components.settings.RuntimeEnvironmentsPane.aeb26635d2',
-                              'Remove {{value0}}',
-                              { value0: environment.name }
-                            )}
-                          >
-                            {removingId === environment.id ? (
-                              <Loader2 className="size-3 animate-spin" />
-                            ) : (
-                              <Trash2 className="size-3" />
-                            )}
-                          </Button>
-                        </div>
-                      </>
-                    )
-                  })()}
-                </div>
-              ))}
-            </div>
-          )}
-        </div>
-      </div>
+      <RuntimeServersConnectSection
+        visible={visibleWorkflow === 'connect'}
+        environments={environments}
+        detailsByEnvironmentId={detailsByEnvironmentId}
+        activeRuntimeEnvironmentId={settings.activeRuntimeEnvironmentId}
+        addServerFormOpen={addServerFormOpen}
+        name={name}
+        pairingCode={pairingCode}
+        addServerFailure={addServerFailure}
+        isBusy={isBusy}
+        remoteServerUpdates={remoteServerUpdates}
+        remoteServerUpdatesChecking={remoteServerUpdatesChecking}
+        remoteServerUpdatesRunning={remoteServerUpdatesRunning}
+        connectingId={connectingId}
+        switchingValue={switchingValue}
+        disconnectingId={disconnectingId}
+        removingId={removingId}
+        onOpenAddServerForm={() => setAddServerFormOpen(true)}
+        onCloseAddServerForm={closeAddServerForm}
+        onNameChange={setName}
+        onPairingCodeChange={(value) => {
+          setPairingCode(value)
+          setAddServerFailure(null)
+        }}
+        onAddEnvironment={(allowLoopback) => void addEnvironment(allowLoopback)}
+        onOpenUpdateDialog={() => setRemoteServerUpdateDialogOpen(true)}
+        refreshRemoteServerUpdates={refreshRemoteServerUpdates}
+        onConnect={(environment) => void connectEnvironment(environment)}
+        onDisconnect={(environment) => void disconnectEnvironment(environment)}
+        onRemove={openRemoveDialog}
+      />
 
       <div className={cn('space-y-5 pt-2', visibleWorkflow !== 'cloud-vm' && 'hidden')}>
         <CloudVmSetupGuide />
         <EphemeralVmRuntimesSection active={visibleWorkflow === 'cloud-vm'} />
       </div>
 
-      <div
-        data-settings-section="default-runtime"
-        className={visibleWorkflow !== 'connect' ? 'hidden' : undefined}
-      >
-        <Button
-          type="button"
-          variant="ghost"
-          size="sm"
-          onClick={() => setAdvancedOpen((current) => !current)}
-          className="-ml-2 text-xs"
-          aria-expanded={advancedOpen}
-          aria-controls="runtime-server-advanced-content"
-        >
-          {translate('auto.components.settings.RuntimeEnvironmentsPane.advanced', 'Advanced')}
-          <ChevronDown
-            className={cn('size-4 transition-transform', advancedOpen && 'rotate-180')}
-          />
-        </Button>
-
-        <div
-          id="runtime-server-advanced-content"
-          className={cn(
-            'grid overflow-hidden transition-[grid-template-rows] duration-200 ease-out',
-            advancedOpen ? 'grid-rows-[1fr]' : 'grid-rows-[0fr]'
-          )}
-          aria-hidden={!advancedOpen}
-          inert={!advancedOpen}
-        >
-          <div className="min-h-0">
-            <div
-              className={cn(
-                'space-y-2 px-1 pt-3 pb-1 transition-[opacity,transform] duration-150 ease-out',
-                advancedOpen
-                  ? 'translate-y-0 opacity-100 delay-200'
-                  : '-translate-y-1 opacity-0 delay-0'
-              )}
-            >
-              <div className="space-y-1">
-                <Label id="runtime-active-server-label">
-                  {translate(
-                    'auto.components.settings.RuntimeEnvironmentsPane.64b6bea541',
-                    'Active Server'
-                  )}
-                </Label>
-                <p className="text-xs text-muted-foreground">
-                  {getActiveServerModeDescription(allowLocalRuntime)}
-                </p>
-              </div>
-              <div className="flex flex-wrap items-center gap-2">
-                <Select
-                  value={activeValue}
-                  onValueChange={(value) => {
-                    if (value !== activeValue) {
-                      setSwitchError(null)
-                      setPendingSwitchValue(value)
-                    }
-                  }}
-                  disabled={isBusy}
-                >
-                  <SelectTrigger
-                    size="sm"
-                    className="min-w-[260px]"
-                    aria-labelledby="runtime-active-server-label"
-                  >
-                    <SelectValue />
-                  </SelectTrigger>
-                  <SelectContent>
-                    {allowLocalRuntime ? (
-                      <SelectItem value={LOCAL_RUNTIME_VALUE}>
-                        {translate(
-                          'auto.components.settings.RuntimeEnvironmentsPane.78692becbd',
-                          'Local desktop'
-                        )}
-                      </SelectItem>
-                    ) : environments.length === 0 ? (
-                      <SelectItem value={NO_RUNTIME_VALUE} disabled>
-                        {translate(
-                          'auto.components.settings.RuntimeEnvironmentsPane.b07070ed3c',
-                          'No server connected'
-                        )}
-                      </SelectItem>
-                    ) : null}
-                    {environments.map((environment) => (
-                      <SelectItem key={environment.id} value={environment.id}>
-                        {environment.name}
-                      </SelectItem>
-                    ))}
-                  </SelectContent>
-                </Select>
-                <Button
-                  type="button"
-                  variant="outline"
-                  size="icon-sm"
-                  aria-label={translate(
-                    'auto.components.settings.RuntimeEnvironmentsPane.6ce4664003',
-                    'Refresh servers'
-                  )}
-                  title={translate(
-                    'auto.components.settings.RuntimeEnvironmentsPane.6ce4664003',
-                    'Refresh servers'
-                  )}
-                  onClick={() => void loadEnvironments()}
-                  disabled={isLoading || isBusy}
-                >
-                  {isLoading ? <Loader2 className="animate-spin" /> : <RefreshCw />}
-                </Button>
-              </div>
-              {environments.length > 0 ? (
-                <div className="space-y-2 pt-2">
-                  <div className="text-xs font-medium">
-                    {translate(
-                      'auto.components.settings.RuntimeEnvironmentsPane.serverDetails',
-                      'Server details'
-                    )}
-                  </div>
-                  <div className="space-y-1 rounded-lg border border-border/50 bg-card/30 p-2">
-                    {environments.map((environment) => {
-                      const details = detailsByEnvironmentId[environment.id]
-                      return (
-                        <div
-                          key={environment.id}
-                          className="grid gap-1 rounded-md px-2 py-1.5 text-[11px] text-muted-foreground sm:grid-cols-[minmax(0,9rem)_minmax(0,1fr)]"
-                        >
-                          <div className="truncate font-medium text-foreground">
-                            {environment.name}
-                          </div>
-                          <div className="min-w-0 space-y-0.5">
-                            <div className="truncate font-mono">
-                              {environment.endpoints[0]?.endpoint ??
-                                translate(
-                                  'auto.components.settings.RuntimeEnvironmentsPane.6ef71985da',
-                                  'No endpoint'
-                                )}
-                            </div>
-                            {details?.runtimeStatus ? (
-                              <div className="truncate">
-                                {translate(
-                                  'auto.components.settings.RuntimeEnvironmentsPane.0ef838094a',
-                                  'Protocol {{value0}}',
-                                  {
-                                    value0:
-                                      details.runtimeStatus?.runtimeProtocolVersion ??
-                                      details.runtimeStatus?.protocolVersion ??
-                                      0
-                                  }
-                                )}
-                                {details.runtimeStatus.hostPlatform
-                                  ? ` · ${details.runtimeStatus.hostPlatform}`
-                                  : ''}
-                                {' · '}
-                                {getRuntimeCapabilitiesSummary(details.runtimeStatus)}
-                              </div>
-                            ) : null}
-                            {getHostModelCapabilitySummary(details?.runtimeStatus) ? (
-                              <div className="truncate">
-                                {getHostModelCapabilitySummary(details?.runtimeStatus)}
-                              </div>
-                            ) : null}
-                          </div>
-                        </div>
-                      )
-                    })}
-                  </div>
-                </div>
-              ) : null}
-            </div>
-          </div>
-        </div>
-      </div>
+      <RuntimeActiveServerSection
+        visible={visibleWorkflow === 'connect'}
+        advancedOpen={advancedOpen}
+        allowLocalRuntime={allowLocalRuntime}
+        localRuntimeValue={LOCAL_RUNTIME_VALUE}
+        noRuntimeValue={NO_RUNTIME_VALUE}
+        activeValue={activeValue}
+        environments={environments}
+        detailsByEnvironmentId={detailsByEnvironmentId}
+        isBusy={isBusy}
+        isLoading={isLoading}
+        onToggleAdvanced={() => setAdvancedOpen((current) => !current)}
+        onValueChange={(value) => {
+          setSwitchError(null)
+          setPendingSwitchValue(value)
+        }}
+        onRefresh={() => void loadEnvironments()}
+      />
 
       {visibleWorkflow === 'share' && canGeneratePairingUrl ? (
-        <div className="space-y-3 pt-2">
-          <div className="space-y-0.5">
-            <div className="text-sm font-medium">
-              {translate(
-                'auto.components.settings.RuntimeEnvironmentsPane.advertiseThisApp',
-                'Advertise this app as a server'
-              )}
-            </div>
-            <p className="text-xs text-muted-foreground">
-              {translate(
-                'auto.components.settings.RuntimeEnvironmentsPane.advertiseThisAppHelp',
-                'Create access links for browsers, mobile clients, or another Orca client to connect back to this running app.'
-              )}
-            </p>
-          </div>
-          <div className="overflow-hidden rounded-lg border border-border/50 bg-card/30">
-            <div className="flex flex-wrap items-center justify-between gap-3 px-3 py-2.5">
-              <div className="min-w-0 space-y-0.5">
-                <div className="text-sm font-medium">
-                  {translate(
-                    'auto.components.settings.RuntimeEnvironmentsPane.6e1280ca55',
-                    'Share this Orca server'
-                  )}
-                </div>
-                <p className="text-xs text-muted-foreground">
-                  {translate(
-                    'auto.components.settings.RuntimeEnvironmentsPane.84b9b2be05',
-                    'Create a revocable access grant so a browser or another Orca client can connect.'
-                  )}
-                </p>
-              </div>
-              <Button
-                type="button"
-                variant="outline"
-                size="sm"
-                className="gap-1.5"
-                onClick={() => setShareServerFormOpen((open) => !open)}
-              >
-                <Share2 />
-                {shareServerFormOpen
-                  ? translate(
-                      'auto.components.settings.RuntimeEnvironmentsPane.54dee18f5c',
-                      'Hide Form'
-                    )
-                  : translate(
-                      'auto.components.settings.RuntimeEnvironmentsPane.3595fd1948',
-                      'New Link'
-                    )}
-              </Button>
-            </div>
-            <div className="border-t border-border/40 px-3 py-3">
-              <RuntimePairingUrlGenerator
-                framed={false}
-                showHeader={false}
-                showGeneratorForm={shareServerFormOpen}
-              />
-            </div>
-          </div>
-        </div>
+        <RuntimeServerShareSection
+          shareServerFormOpen={shareServerFormOpen}
+          onToggleShareServerForm={() => setShareServerFormOpen((open) => !open)}
+        />
       ) : null}
 
-      {visibleWorkflow === 'connect' ? (
-        <details className="group rounded-lg border border-border/60">
-          <summary className="flex cursor-pointer list-none items-center gap-2 p-4 text-sm font-medium">
-            {translate(
-              'auto.components.settings.RuntimeEnvironmentsPane.troubleshootWorkflow',
-              'Connection troubleshooting'
-            )}
-            <ChevronDown className="ml-auto size-4 transition-transform group-open:rotate-180" />
-          </summary>
-          <div className="space-y-4 border-t border-border/50 p-4">
-            <div className="space-y-1">
-              <div className="text-sm font-medium">
-                {translate(
-                  'auto.components.settings.RuntimeEnvironmentsPane.troubleshootTitle',
-                  'Create a new link on the other host'
-                )}
-              </div>
-              <p className="text-xs text-muted-foreground">
-                {translate(
-                  'auto.components.settings.RuntimeEnvironmentsPane.troubleshootDescription',
-                  'A link that uses 127.0.0.1 points back to the device opening it, not the computer that created it.'
-                )}
-              </p>
-            </div>
-            <ol className="ml-4 list-decimal space-y-1 text-xs text-muted-foreground">
-              <li>
-                {translate(
-                  'auto.components.settings.RuntimeEnvironmentsPane.troubleshootStepShare',
-                  'On the other computer, open Share this host.'
-                )}
-              </li>
-              <li>
-                {translate(
-                  'auto.components.settings.RuntimeEnvironmentsPane.troubleshootStepAddress',
-                  'Choose Another device and select its Tailscale or LAN address.'
-                )}
-              </li>
-              <li>
-                {translate(
-                  'auto.components.settings.RuntimeEnvironmentsPane.troubleshootStepRegenerate',
-                  'Generate a new access link and use only the newest link here.'
-                )}
-              </li>
-            </ol>
-            <div className="rounded-md border border-border/60 bg-muted/30 p-3 text-xs">
-              {translate(
-                'auto.components.settings.RuntimeEnvironmentsPane.troubleshootTunnel',
-                'Using an SSH local forward? Return to Connect to a host, paste the loopback link, then enable “I am using an SSH tunnel” under Advanced.'
-              )}
-            </div>
-          </div>
-        </details>
-      ) : null}
+      {visibleWorkflow === 'connect' ? <RuntimeServerTroubleshooting /> : null}
 
-      <Dialog
-        open={pendingSwitchValue !== null}
+      <RuntimeEnvironmentSwitchDialog
+        pendingSwitchValue={pendingSwitchValue}
+        switchingValue={switchingValue}
+        switchError={switchError}
+        getEnvironmentLabel={getEnvironmentLabel}
         onOpenChange={(open) => {
           if (!open && switchingValue === null) {
             setSwitchError(null)
             setPendingSwitchValue(null)
           }
         }}
-      >
-        <DialogContent className="max-w-sm sm:max-w-sm" showCloseButton={false}>
-          <DialogHeader>
-            <DialogTitle className="text-sm">
-              {translate(
-                'auto.components.settings.RuntimeEnvironmentsPane.d570c35a99',
-                'Switch Server'
-              )}
-            </DialogTitle>
-            <DialogDescription>
-              {translate(
-                'auto.components.settings.RuntimeEnvironmentsPane.b2290ed203',
-                'Orca will focus this host and load its projects. Existing terminals and browser tabs on other hosts stay alive.'
-              )}
-            </DialogDescription>
-          </DialogHeader>
-          {pendingSwitchValue ? (
-            <div className="rounded-md border border-border/70 bg-muted/35 px-3 py-2 text-xs">
-              <div className="text-muted-foreground">
-                {translate(
-                  'auto.components.settings.RuntimeEnvironmentsPane.05e0fc3ebf',
-                  'Switch to'
-                )}
-              </div>
-              <div className="mt-0.5 truncate font-medium">
-                {getEnvironmentLabel(pendingSwitchValue)}
-              </div>
-            </div>
-          ) : null}
-          {switchError ? <p className="text-sm text-destructive">{switchError}</p> : null}
-          <DialogFooter>
-            <Button
-              variant="outline"
-              onClick={() => {
-                setSwitchError(null)
-                setPendingSwitchValue(null)
-              }}
-              disabled={switchingValue !== null}
-            >
-              {translate('auto.components.settings.RuntimeEnvironmentsPane.af53761f31', 'Cancel')}
-            </Button>
-            <Button
-              onClick={() => {
-                const value = pendingSwitchValue
-                if (!value) {
-                  return
-                }
-                void switchToValue(value).then((switched) => {
-                  if (switched && mountedRef.current) {
-                    setPendingSwitchValue(null)
-                  }
-                })
-              }}
-              disabled={switchingValue !== null}
-            >
-              {switchingValue !== null ? <Loader2 className="animate-spin" /> : null}
-              {translate('auto.components.settings.RuntimeEnvironmentsPane.d2e00809e4', 'Switch')}
-            </Button>
-          </DialogFooter>
-        </DialogContent>
-      </Dialog>
+        onCancel={() => {
+          setSwitchError(null)
+          setPendingSwitchValue(null)
+        }}
+        onConfirm={confirmSwitch}
+      />
 
-      <Dialog
-        open={pendingRemove !== null}
+      <RuntimeEnvironmentRemoveDialog
+        pendingRemove={pendingRemove}
+        removingId={removingId}
+        removeError={removeError}
+        removingActiveServer={removingActiveServer}
         onOpenChange={(open) => {
           if (!open && removingId === null) {
             setRemoveError(null)
             setPendingRemove(null)
           }
         }}
-      >
-        <DialogContent className="max-w-sm sm:max-w-sm" showCloseButton={false}>
-          <DialogHeader>
-            <DialogTitle className="text-sm">
-              {translate(
-                'auto.components.settings.RuntimeEnvironmentsPane.bb90dd6487',
-                'Remove Server'
-              )}
-            </DialogTitle>
-            <DialogDescription>
-              {removingActiveServer
-                ? translate(
-                    'auto.components.settings.RuntimeEnvironmentsPane.removeActiveServerDescription',
-                    'Choose another Active Server in Advanced before removing this server. Existing host sessions are left alone.'
-                  )
-                : translate(
-                    'auto.components.settings.RuntimeEnvironmentsPane.ed3e3f069d',
-                    'This removes the saved server from Orca. It does not change the active server.'
-                  )}
-            </DialogDescription>
-          </DialogHeader>
-          {pendingRemove ? (
-            <div className="rounded-md border border-border/70 bg-muted/35 px-3 py-2 text-xs">
-              <div className="truncate font-medium">{pendingRemove.name}</div>
-              <div className="mt-0.5 truncate font-mono text-muted-foreground">
-                {pendingRemove.endpoints[0]?.endpoint ??
-                  translate(
-                    'auto.components.settings.RuntimeEnvironmentsPane.6ef71985da',
-                    'No endpoint'
-                  )}
-              </div>
-            </div>
-          ) : null}
-          {removeError ? <p className="text-sm text-destructive">{removeError}</p> : null}
-          <DialogFooter>
-            <Button
-              variant="outline"
-              onClick={() => {
-                setRemoveError(null)
-                setPendingRemove(null)
-              }}
-              disabled={removingId !== null}
-            >
-              {translate('auto.components.settings.RuntimeEnvironmentsPane.af53761f31', 'Cancel')}
-            </Button>
-            <Button
-              variant="destructive"
-              onClick={() => {
-                const environment = pendingRemove
-                if (!environment) {
-                  return
-                }
-                void removeEnvironment(environment).then((removed) => {
-                  if (removed && mountedRef.current) {
-                    setPendingRemove(null)
-                  }
-                })
-              }}
-              disabled={removingId !== null}
-            >
-              {removingId !== null ? <Loader2 className="animate-spin" /> : <Trash2 />}
-              {translate('auto.components.settings.RuntimeEnvironmentsPane.d25f0688b1', 'Remove')}
-            </Button>
-          </DialogFooter>
-        </DialogContent>
-      </Dialog>
+        onCancel={() => {
+          setRemoveError(null)
+          setPendingRemove(null)
+        }}
+        onConfirm={confirmRemove}
+      />
     </SearchableSetting>
   )
 }
diff --git a/src/renderer/src/components/settings/Settings.tsx b/src/renderer/src/components/settings/Settings.tsx
index fb928aa2ceb..766b827cb96 100644
--- a/src/renderer/src/components/settings/Settings.tsx
+++ b/src/renderer/src/components/settings/Settings.tsx
@@ -1,1930 +1,36 @@
-/* eslint-disable max-lines */
-import {
-  lazy,
-  Suspense,
-  useCallback,
-  useEffect,
-  useMemo,
-  useRef,
-  useState,
-  type MutableRefObject
-} from 'react'
-import { toast } from 'sonner'
-import type { GlobalSettings } from '../../../../shared/global-settings-types'
-import type { OrcaHooks } from '../../../../shared/orca-yaml-hook-types'
-import type { ProjectHostSetup } from '../../../../shared/project-types'
-import type { Repo } from '../../../../shared/repo-types'
-import type { SpeechModelState } from '../../../../shared/speech-types'
-import type {
-  SourceControlAiSettings,
-  SourceControlAiSettingsPatch
-} from '../../../../shared/source-control-ai-types'
-import { normalizeSourceControlAiSettings } from '../../../../shared/source-control-ai'
-import { isFolderRepo } from '../../../../shared/repo-kind'
-import { useAppStore } from '../../store'
-import { useSystemPrefersDark } from '@/components/terminal-pane/use-system-prefers-dark'
-import { isMacUserAgent, isWindowsUserAgent } from '@/components/terminal-pane/pane-helpers'
-import { applyDocumentTheme } from '@/lib/document-theme'
-import { useConfirmationDialog } from '@/components/confirmation-dialog-context'
-import {
-  SCROLLBACK_PRESETS_ROWS,
-  getFallbackTerminalFonts,
-  mergeFontSuggestions
-} from './SettingsConstants'
-import { DEFAULT_APP_FONT_FAMILY, getDefaultVoiceSettings } from '../../../../shared/constants'
-import {
-  getRepoExecutionHostId,
-  LOCAL_EXECUTION_HOST_ID,
-  parseExecutionHostId
-} from '../../../../shared/execution-host'
-import { GeneralPane } from './GeneralPane'
-import { BrowserPane } from './BrowserPane'
-import { AppearancePane } from './AppearancePane'
-import { InputPane } from './InputPane'
-import { ShortcutsPane } from './ShortcutsPane'
-import { TerminalPane } from './TerminalPane'
-import { FloatingWorkspacePane } from './FloatingWorkspacePane'
-import { useGhosttyImport } from './useGhosttyImport'
-import { useWarpThemeImport } from './useWarpThemeImport'
-import { RepositoryPane } from './RepositoryPane'
-import { GitPane } from './GitPane'
-import { CommitMessageAiPane } from './CommitMessageAiPane'
-import { GitProviderApiBudgetPane } from './GitProviderApiBudgetPane'
-import { NotificationsPane } from './NotificationsPane'
-import { VoicePane } from './VoicePane'
-import { SshPane } from './SshPane'
-import { ExperimentalPane } from './ExperimentalPane'
-import { PluginsSettingsSection } from './PluginsSettingsSection'
-import { AgentsPane } from './AgentsPane'
-import { OrchestrationPane } from './OrchestrationPane'
-import { ArtifactsSettingsPane } from './ArtifactsSettingsPane'
-import { ShareSkillsSettingsPane } from './ShareSkillsSettingsPane'
-import { AutomationsSettingsPane } from './AutomationsSettingsPane'
-import { OrcaAccountSettingsPane } from './OrcaAccountSettingsPane'
-import { LinearAgentSkillPane } from './LinearAgentSkillPane'
-import { AccountsPane } from './AccountsPane'
-import { StatsPane } from '../stats/StatsPane'
-import { IntegrationsPane } from './IntegrationsPane'
-import { TasksPane } from './TasksPane'
-import { QuickCommandsPane } from './QuickCommandsPane'
-import { DeveloperPermissionsPane } from './DeveloperPermissionsPane'
-import { ComputerUsePane } from './ComputerUsePane'
-import { MobileSettingsPane } from './MobileSettingsPane'
-import { MobileEmulatorSettingsPane } from './MobileEmulatorSettingsPane'
-import { RuntimeEnvironmentsPane } from './RuntimeEnvironmentsPane'
-import { PrivacyPane } from './PrivacyPane'
-import { AdvancedPane } from './AdvancedPane'
-import { SettingsSidebar } from './SettingsSidebar'
-import { SettingsSetupGuidePane } from './SettingsSetupGuidePane'
-import { ActiveSettingsSectionProvider, SettingsSection } from './SettingsSection'
-import { getSettingsSectionSearchEntries, rankSettingsSearchItems } from './settings-search'
-import { resolveAppearanceAccordionDeepLink } from './appearance-usage-percentage-search'
-import { cn } from '@/lib/utils'
-import { isIntentionalAppRestartInProgress } from '@/lib/updater-beforeunload'
-import { registerWindowCloseGuard } from '../window-close-request-coordinator'
-import { checkRuntimeHooks } from '@/runtime/runtime-hooks-client'
-import {
-  isWindowsTerminalCapabilityHost,
-  useLocalWindowsTerminalCapabilities,
-  useWindowsTerminalCapabilities
-} from '@/lib/windows-terminal-capabilities'
-import { useWindowsTerminalCapabilityOwnerKey } from '@/hooks/useWindowsTerminalCapabilityOwnerKey'
-import { getActiveRuntimeTarget } from '@/runtime/runtime-rpc-client'
-import { getShortcutPlatform } from '@/lib/shortcut-platform'
-import { keybindingMatchesAction } from '../../../../shared/keybindings'
-import {
-  isWebClientLocation,
-  useSettingsNavigationMetadata
-} from '@/hooks/useSettingsNavigationMetadata'
-import type {
-  SettingsNavGroup,
-  SettingsNavInstallStatus,
-  SettingsNavSection,
-  SettingsNavTarget
-} from '@/lib/settings-navigation-types'
-import {
-  COMPUTER_USE_SKILL_NAME,
-  LINEAR_AGENT_SKILL_NAMES,
-  ORCHESTRATION_SKILL_NAME
-} from '@/lib/agent-feature-install-commands'
-import {
-  GLOBAL_AGENT_SKILL_SOURCE_KINDS,
-  useInstalledAgentSkill,
-  useInstalledAgentSkillNames
-} from '@/hooks/useInstalledAgentSkills'
-import { useActiveProjectSkillRuntime } from '@/hooks/useActiveProjectSkillRuntime'
-import { useLinearProviderConnected } from '@/hooks/useLinearProviderConnected'
-import { useSkillFreshness } from '@/hooks/useSkillFreshness'
-import {
-  getAgentSkillNavInstallStatus,
-  getLinearAgentSkillNavInstallStatus
-} from '@/lib/agent-skill-nav-install-status'
-import { deriveNeededSectionIds, getInitialMountedSectionIds } from './settings-load-performance'
-import { translate } from '@/i18n/i18n'
-import { getProjectHostSetupProjectionFromState } from '../../store/selectors'
-import { getRepoHostIdentity } from '../../store/slices/repo-host-identity'
-import {
-  buildRepoIdToHostSelection,
-  buildRepoIdToRepresentative,
-  buildSettingsProjectList,
-  getSettingsProjectHostRepo,
-  getSettingsTargetHostSelection,
-  removeSettingsProjectFromAllHosts,
-  resolveSettingsTargetRepoId
-} from './settings-project-list'
-
-const DevToolsPane = import.meta.env.DEV
-  ? lazy(() => import('./DevToolsPane').then((module) => ({ default: module.DevToolsPane })))
-  : null
-
-const SETTINGS_NAV_GROUPS = [
-  {
-    id: 'capabilities',
-    titleKey: 'auto.components.settings.Settings.23c6874fdf',
-    titleDefault: 'AI Capabilities'
-  },
-  { id: 'setup', titleKey: 'auto.components.settings.Settings.9abb9be3bc', titleDefault: 'Set Up' },
-  {
-    id: 'workflows',
-    titleKey: 'auto.components.settings.Settings.e1578cd4bc',
-    titleDefault: 'Workflows'
-  },
-  {
-    id: 'interface',
-    titleKey: 'auto.components.settings.Settings.8bd117d669',
-    titleDefault: 'Interface'
-  },
-  {
-    id: 'remote',
-    titleKey: 'auto.components.settings.Settings.23931df7e8',
-    titleDefault: 'Remote Hosts'
-  },
-  {
-    id: 'security',
-    titleKey: 'auto.components.settings.Settings.084d8fac5b',
-    titleDefault: 'Privacy & Security'
-  },
-  {
-    id: 'advanced',
-    titleKey: 'auto.components.settings.Settings.1c87f8d024',
-    titleDefault: 'Advanced'
-  },
-  {
-    id: 'experimental',
-    titleKey: 'auto.components.settings.Settings.8b017f2506',
-    titleDefault: 'Experimental'
-  }
-] as const
-
-type SettingsNavGroupDefinition = (typeof SETTINGS_NAV_GROUPS)[number]
-
-const SETTINGS_NAV_GROUP_BY_ID = new Map<string, SettingsNavGroupDefinition>(
-  SETTINGS_NAV_GROUPS.map((group) => [group.id, group])
-)
-
-const SHORTCUTS_ESCAPE_CONFIRM_TOAST_ID = 'shortcuts-escape-confirm'
-const SHORTCUTS_ESCAPE_CONFIRM_WINDOW_MS = 2200
-const SETTINGS_TARGET_HIGHLIGHT_MS = 3_000
-
-function getSettingsSectionId(
-  pane: SettingsNavTarget,
-  repoId: string | null,
-  repoIdToRepresentative: Map<string, string>
-) {
-  if (pane === 'repo' && repoId) {
-    // Why: Settings renders one collapsed pane per project, so resolve a repoId target to its project's representative section.
-    return `repo-${repoIdToRepresentative.get(repoId) ?? repoId}`
-  }
-  return pane
-}
-
-function getFallbackVisibleSection(sections: SettingsNavSection[]): SettingsNavSection | undefined {
-  return sections.at(0)
-}
-
-function getSettingsNavGroupDefinitionsForSearch(
-  sections: readonly SettingsNavSection[],
-  query: string
-): readonly SettingsNavGroupDefinition[] {
-  if (query.trim() === '') {
-    return SETTINGS_NAV_GROUPS
-  }
-  const seenGroupIds = new Set<string>()
-  return sections.flatMap((section) => {
-    if (section.id.startsWith('repo-') || seenGroupIds.has(section.group)) {
-      return []
-    }
-    const group = SETTINGS_NAV_GROUP_BY_ID.get(section.group)
-    if (!group) {
-      return []
-    }
-    seenGroupIds.add(section.group)
-    return [group]
-  })
-}
-
-function hasReadyVoiceModel(
-  settings: GlobalSettings,
-  modelStates: readonly SpeechModelState[]
-): boolean {
-  const voiceSettings = settings.voice ?? getDefaultVoiceSettings()
-  if (
-    voiceSettings.sttModel !== '' &&
-    modelStates.some((state) => state.id === voiceSettings.sttModel && state.status === 'ready')
-  ) {
-    return true
-  }
-  return modelStates.some((state) => state.status === 'ready')
-}
-
-function getSettingsScrollTarget(
-  sectionId: string,
-  container?: HTMLElement | null
-): HTMLElement | null {
-  return (
-    container?.querySelector<HTMLElement>(`[data-settings-section="${CSS.escape(sectionId)}"]`) ??
-    document.getElementById(sectionId)
-  )
-}
-
-function scrollSubsectionIntoView(targetId: string, container?: HTMLElement | null): void {
-  // Why: the pane is swapped in wholesale, so a subsection deep link only nudges inner scroll when the pane exceeds the viewport.
-  const target = getSettingsScrollTarget(targetId, container)
-  if (!target) {
-    return
-  }
-  if (!container) {
-    target.scrollIntoView({ block: 'start' })
-    return
-  }
-  const containerRect = container.getBoundingClientRect()
-  const targetRect = target.getBoundingClientRect()
-  const targetTop = targetRect.top - containerRect.top + container.scrollTop
-  const maxScrollTop = Math.max(0, container.scrollHeight - container.clientHeight)
-  container.scrollTo({ top: Math.min(Math.max(0, targetTop - 16), maxScrollTop) })
-}
-
-function readSourceControlAiSettings(settings: GlobalSettings): SourceControlAiSettings {
-  return normalizeSourceControlAiSettings(settings.sourceControlAi, settings.commitMessageAi)
-}
-
-function cancelPendingSettingsSubsectionScrollFrame(
-  frameRef: MutableRefObject<number | null>
-): void {
-  if (frameRef.current !== null) {
-    cancelAnimationFrame(frameRef.current)
-    frameRef.current = null
-  }
-}
-
-function isEditableTarget(target: EventTarget | null): boolean {
-  if (!(target instanceof HTMLElement)) {
-    return false
-  }
-  if (target.isContentEditable) {
-    return true
-  }
-  const tag = target.tagName
-  return tag === 'INPUT' || tag === 'TEXTAREA' || tag === 'SELECT'
-}
+import { useSettingsStoreModel } from './use-settings-store-model'
+import { useSettingsInteractionController } from './use-settings-interaction-controller'
+import { useSettingsPageEffects } from './use-settings-page-effects'
+import { useSettingsNavigationModel } from './use-settings-navigation-model'
+import { useSettingsTerminalModel } from './use-settings-terminal-model'
+import { useSettingsRepoScrollEffects } from './use-settings-repo-scroll-effects'
+import { buildSettingsViewModel, useSettingsNavigationActions } from './settings-view-model'
+import { renderSettingsLoading, renderSettingsPage } from './settings-page-renderer'
+import type { LoadedSettingsStoreModel, SettingsRenderContext } from './settings-render-context'
 
 function Settings(): React.JSX.Element {
-  const settings = useAppStore((s) => s.settings)
-  const keybindings = useAppStore((s) => s.keybindings)
-  const updateSettings = useAppStore((s) => s.updateSettings)
-  const updateSettingsOrThrow = useAppStore((s) => s.updateSettingsOrThrow)
-  const setActiveRuntimeEnvironmentPreference = useAppStore(
-    (s) => s.setActiveRuntimeEnvironmentPreference
-  )
-  const fetchSettings = useAppStore((s) => s.fetchSettings)
-  const fetchKeybindings = useAppStore((s) => s.fetchKeybindings)
-  const closeSettingsPage = useAppStore((s) => s.closeSettingsPage)
-  const repos = useAppStore((s) => s.repos)
-  const projects = useAppStore((s) => s.projects)
-  const projectHostSetups = useAppStore((s) => s.projectHostSetups)
-  const updateProject = useAppStore((s) => s.updateProject)
-  const updateRepo = useAppStore((s) => s.updateRepo)
-  const removeProject = useAppStore((s) => s.removeProject)
-  const settingsNavigationTarget = useAppStore((s) => s.settingsNavigationTarget)
-  const clearSettingsTarget = useAppStore((s) => s.clearSettingsTarget)
-  const settingsProjectHostSelection = useAppStore((s) => s.settingsProjectHostSelection)
-  const settingsProjectSetupSelection = useAppStore((s) => s.settingsProjectSetupSelection)
-  const setSettingsProjectHostSelection = useAppStore((s) => s.setSettingsProjectHostSelection)
-  const settingsSearchQuery = useAppStore((s) => s.settingsSearchQuery)
-  const setSettingsSearchQuery = useAppStore((s) => s.setSettingsSearchQuery)
-  const modelStates = useAppStore((s) => s.modelStates)
-  const refreshModelStates = useAppStore((s) => s.refreshModelStates)
+  const model = useSettingsStoreModel()
+  const interactions = useSettingsInteractionController(model)
+  useSettingsPageEffects(model, interactions)
+  const navigation = useSettingsNavigationModel(model, interactions)
+  const terminal = useSettingsTerminalModel(model, navigation)
+  useSettingsRepoScrollEffects(model, interactions, navigation, terminal)
+  const actions = useSettingsNavigationActions(model, interactions)
 
-  // Why: one entry per project (derived from repos to match nav metadata) — the source of truth for the pane list.
-  const settingsProjectList = useMemo(() => buildSettingsProjectList(repos), [repos])
-  const repoIdToRepresentative = useMemo(
-    () => buildRepoIdToRepresentative(settingsProjectList),
-    [settingsProjectList]
-  )
-  // Why: lets a deep-link's repoId select the owning project's host so host-specific subsection anchors exist.
-  const repoIdToHostSelection = useMemo(
-    () => buildRepoIdToHostSelection(settingsProjectList),
-    [settingsProjectList]
-  )
-  // Why: pane-level "Remove Project" removes every host setup, not just the selected host (per-host remove lives in "Available Hosts").
-  const removeProjectAllHosts = useCallback(
-    (setups: readonly ProjectHostSetup[]): Promise<void> =>
-      removeSettingsProjectFromAllHosts(setups, removeProject),
-    [removeProject]
-  )
-
-  const [repoHooksMap, setRepoHooksMap] = useState<
-    Record<string, { hasHooks: boolean; hooks: OrcaHooks | null; mayNeedUpdate: boolean }>
-  >({})
-  const systemPrefersDark = useSystemPrefersDark()
-  const isWindows = isWindowsUserAgent()
-  const isMac = isMacUserAgent()
-  const isWebClient = isWebClientLocation()
-  const showDesktopOnlySettings = !isWebClient
-  // Why: mirror the nav registry's gate so the Linear sidebar entry and section appear/disappear together.
-  const linearConnected = useLinearProviderConnected()
-  const activeSkillRuntime = useActiveProjectSkillRuntime()
-  const orchestrationSkill = useInstalledAgentSkill(ORCHESTRATION_SKILL_NAME, {
-    discoveryTarget: activeSkillRuntime.discoveryTarget,
-    sourceKinds: GLOBAL_AGENT_SKILL_SOURCE_KINDS
-  })
-  const linearSkill = useInstalledAgentSkillNames(LINEAR_AGENT_SKILL_NAMES, {
-    enabled: linearConnected,
-    discoveryTarget: activeSkillRuntime.discoveryTarget,
-    sourceKinds: GLOBAL_AGENT_SKILL_SOURCE_KINDS
-  })
-  const computerUseSkill = useInstalledAgentSkill(COMPUTER_USE_SKILL_NAME, {
-    enabled: showDesktopOnlySettings,
-    discoveryTarget: activeSkillRuntime.discoveryTarget,
-    sourceKinds: GLOBAL_AGENT_SKILL_SOURCE_KINDS
-  })
-  const skillFreshnessApplies = activeSkillRuntime.canUseLocalSkillFreshness
-  const { inventory: skillFreshnessInventory } = useSkillFreshness(skillFreshnessApplies)
-  const [voiceModelStatesLoading, setVoiceModelStatesLoading] = useState(showDesktopOnlySettings)
-  // Why: trim platform-only Terminal entries from the shared search index so search never reveals hidden controls.
-  const [scrollbackMode, setScrollbackMode] = useState<'preset' | 'custom'>('preset')
-  const [prevScrollbackRows, setPrevScrollbackRows] = useState(settings?.terminalScrollbackRows)
-  // Why: keep Ghostty import state at Settings level so the modal survives section remounts.
-  const ghostty = useGhosttyImport(updateSettings, settings)
-  const warpThemes = useWarpThemeImport(updateSettings, settings)
-  const [fontSuggestions, setFontSuggestions] = useState<string[]>(
-    mergeFontSuggestions([], getFallbackTerminalFonts())
-  )
-  const terminalFontSuggestions = useMemo(
-    () => fontSuggestions.filter((font) => font !== DEFAULT_APP_FONT_FAMILY),
-    [fontSuggestions]
-  )
-  const [activeSectionId, setActiveSectionId] = useState('general')
-  const [mountedSectionIds, setMountedSectionIds] = useState<Set<string>>(
-    getInitialMountedSectionIds
-  )
-  const [pendingNavRequestTick, setPendingNavRequestTick] = useState(0)
-  const [highlightedSettingsTargetId, setHighlightedSettingsTargetId] = useState<string | null>(
-    null
-  )
-  const [quickCommandAddIntentSignal, setQuickCommandAddIntentSignal] = useState(0)
-  const [sshHostAddIntentSignal, setSshHostAddIntentSignal] = useState(0)
-  const [remoteServerAddIntentSignal, setRemoteServerAddIntentSignal] = useState(0)
-  const [hasUnsavedCommitPromptChanges, setHasUnsavedCommitPromptChanges] = useState(false)
-  const [hasUnsavedBranchPromptChanges, setHasUnsavedBranchPromptChanges] = useState(false)
-  const [sourceControlAiPromptDiscardSignal, setSourceControlAiPromptDiscardSignal] = useState(0)
-  const confirm = useConfirmationDialog()
-  // Why: session-only (deliberately not persisted) unlock — Option-click the Experimental page title reveals the hidden group.
-  const [hiddenExperimentalUnlocked, setHiddenExperimentalUnlocked] = useState(false)
-  const contentScrollRef = useRef<HTMLDivElement | null>(null)
-  const searchInputRef = useRef<HTMLInputElement | null>(null)
-  const installedFontsLoadedRef = useRef(false)
-  const installedFontsLoadPromiseRef = useRef<Promise<void> | null>(null)
-  const settingsMountedRef = useRef(true)
-  const pendingNavSectionRef = useRef<string | null>(null)
-  const pendingScrollTargetRef = useRef<string | null>(null)
-  const pendingSubsectionScrollFrameRef = useRef<number | null>(null)
-  const repoHooksRequestSeqRef = useRef(0)
-  const shortcutsEscapeConfirmUntilRef = useRef(0)
-  const sourceControlAiWriteQueueRef = useRef<Promise<void>>(Promise.resolve())
-
-  const hasUnsavedSourceControlAiPromptChanges =
-    hasUnsavedCommitPromptChanges || hasUnsavedBranchPromptChanges
-  // Why: the close guard registers once, so it reads latest dirty state from a ref instead of a lagging closure.
-  const hasUnsavedSourceControlAiPromptChangesRef = useRef(hasUnsavedSourceControlAiPromptChanges)
-  hasUnsavedSourceControlAiPromptChangesRef.current = hasUnsavedSourceControlAiPromptChanges
-
-  const writeSourceControlAiSettings = useCallback(
-    (patch: SourceControlAiSettingsPatch): Promise<void> => {
-      const next = sourceControlAiWriteQueueRef.current
-        .catch(() => undefined)
-        .then(async () => {
-          const latestSettings = useAppStore.getState().settings ?? settings
-          if (!latestSettings) {
-            return
-          }
-          const latestConfig = readSourceControlAiSettings(latestSettings)
-          const resolvedPatch = typeof patch === 'function' ? patch(latestConfig) : patch
-          await updateSettings({ sourceControlAi: { ...latestConfig, ...resolvedPatch } })
-        })
-      sourceControlAiWriteQueueRef.current = next
-      return next
-    },
-    [settings, updateSettings]
-  )
-
-  const setSettingsRootNode = useCallback(
-    (node: HTMLDivElement | null): void => {
-      if (node) {
-        return
-      }
-      // Why: clear the transient search filter on close, else the next visit opens with whole sections still hidden.
-      setSettingsSearchQuery('')
-    },
-    [setSettingsSearchQuery]
-  )
-
-  const setContentScrollNode = useCallback((node: HTMLDivElement | null): void => {
-    contentScrollRef.current = node
-    if (node !== null) {
-      return
-    }
-    // Why: cancel pending subsection jumps with the scroll container so a stale deep-link frame can't run after close.
-    cancelPendingSettingsSubsectionScrollFrame(pendingSubsectionScrollFrameRef)
-  }, [])
-
-  useEffect(() => {
-    // Why: StrictMode replays mount effects; async font requests should still commit while Settings is mounted.
-    settingsMountedRef.current = true
-    return () => {
-      settingsMountedRef.current = false
-    }
-  }, [])
-
-  useEffect(() => {
-    if (!highlightedSettingsTargetId) {
-      return
-    }
-    const timeout = window.setTimeout(
-      () => setHighlightedSettingsTargetId(null),
-      SETTINGS_TARGET_HIGHLIGHT_MS
-    )
-    return () => window.clearTimeout(timeout)
-  }, [highlightedSettingsTargetId])
-
-  const requestFontSuggestions = useCallback((): void => {
-    if (installedFontsLoadedRef.current || installedFontsLoadPromiseRef.current) {
-      return
-    }
-
-    installedFontsLoadPromiseRef.current = window.api.settings
-      .listFonts()
-      .then((fonts) => {
-        if (!settingsMountedRef.current) {
-          return
-        }
-        // Latch after the first successful attempt even when empty, so a font-less system doesn't reissue listFonts() each time.
-        installedFontsLoadedRef.current = true
-        if (fonts.length === 0) {
-          return
-        }
-        setFontSuggestions((prev) => mergeFontSuggestions(fonts, prev))
-      })
-      .catch(() => {
-        // Fall back to curated cross-platform suggestions.
-      })
-      .finally(() => {
-        installedFontsLoadPromiseRef.current = null
-      })
-  }, [])
-
-  // Pure prompt (no side effects): the close guard must ask without clearing drafts, since a later guard can still cancel the close.
-  const promptDiscardSourceControlAiPromptChanges = useCallback((): Promise<boolean> => {
-    return confirm({
-      title: translate(
-        'auto.components.settings.Settings.17bdee4ff1',
-        'Discard unsaved Git AI Author changes?'
-      ),
-      description: translate(
-        'auto.components.settings.Settings.43b68e10f0',
-        'You have unsaved Git AI Author changes. Leaving will discard them.'
-      ),
-      confirmLabel: translate('auto.components.settings.Settings.65358016ea', 'Discard'),
-      confirmVariant: 'destructive'
-    })
-  }, [confirm])
-
-  const confirmDiscardSourceControlAiPromptChanges = useCallback(async (): Promise<boolean> => {
-    if (!hasUnsavedSourceControlAiPromptChanges) {
-      return true
-    }
-    const shouldDiscard = await promptDiscardSourceControlAiPromptChanges()
-    if (shouldDiscard) {
-      setSourceControlAiPromptDiscardSignal((signal) => signal + 1)
-      setHasUnsavedCommitPromptChanges(false)
-      setHasUnsavedBranchPromptChanges(false)
-    }
-    return shouldDiscard
-  }, [promptDiscardSourceControlAiPromptChanges, hasUnsavedSourceControlAiPromptChanges])
-
-  const closeSettingsPageWithPromptGuard = useCallback(async (): Promise<void> => {
-    if (!(await confirmDiscardSourceControlAiPromptChanges())) {
-      return
-    }
-    closeSettingsPage()
-  }, [closeSettingsPage, confirmDiscardSourceControlAiPromptChanges])
-
-  useEffect(() => {
-    fetchSettings()
-    fetchKeybindings()
-  }, [fetchKeybindings, fetchSettings])
-
-  useEffect(() => {
-    if (!showDesktopOnlySettings) {
-      setVoiceModelStatesLoading(false)
-      return
-    }
-    let canceled = false
-    // Why: modelStates starts empty, so Voice shouldn't look missing before the first speech-model scan reports state.
-    setVoiceModelStatesLoading(true)
-    void refreshModelStates().finally(() => {
-      if (!canceled) {
-        setVoiceModelStatesLoading(false)
-      }
-    })
-    return () => {
-      canceled = true
-    }
-  }, [refreshModelStates, showDesktopOnlySettings])
-
-  useEffect(() => {
-    const hasVisibleOverlay = (): boolean =>
-      Array.from(
-        document.querySelectorAll('[role="dialog"], [role="listbox"], [role="menu"]')
-      ).some((element) => {
-        if (!(element instanceof HTMLElement)) {
-          return false
-        }
-        if (element.closest('[aria-hidden="true"]')) {
-          return false
-        }
-        const style = window.getComputedStyle(element)
-        return (
-          style.display !== 'none' &&
-          style.visibility !== 'hidden' &&
-          element.getClientRects().length > 0
-        )
-      })
-
-    const handleKeyDown = (event: KeyboardEvent): void => {
-      if (event.key !== 'Escape' || event.defaultPrevented) {
-        return
-      }
-      // Why: nested dialogs/menus own Escape before Settings page-level navigation.
-      if (hasVisibleOverlay()) {
-        return
-      }
-      // Why: Escape in an editable control means "cancel this edit", not "close Settings" — defer to the field's own handler.
-      if (isEditableTarget(event.target)) {
-        return
-      }
-      if (activeSectionId === 'shortcuts') {
-        event.preventDefault()
-        const now = Date.now()
-        if (now <= shortcutsEscapeConfirmUntilRef.current) {
-          shortcutsEscapeConfirmUntilRef.current = 0
-          toast.dismiss(SHORTCUTS_ESCAPE_CONFIRM_TOAST_ID)
-          void closeSettingsPageWithPromptGuard()
-          return
-        }
-        shortcutsEscapeConfirmUntilRef.current = now + SHORTCUTS_ESCAPE_CONFIRM_WINDOW_MS
-        toast.info(
-          translate(
-            'auto.components.settings.Settings.acc7bbdefd',
-            'Press ESC again to exit settings'
-          ),
-          {
-            id: SHORTCUTS_ESCAPE_CONFIRM_TOAST_ID,
-            duration: SHORTCUTS_ESCAPE_CONFIRM_WINDOW_MS,
-            className: 'whitespace-nowrap'
-          }
-        )
-        return
-      }
-      void closeSettingsPageWithPromptGuard()
-    }
-
-    document.addEventListener('keydown', handleKeyDown)
-    return () => document.removeEventListener('keydown', handleKeyDown)
-  }, [activeSectionId, closeSettingsPageWithPromptGuard])
-
-  // Why: route window close/quit through the discard dialog; a bare beforeunload veto shows no UI and reads as an unquittable window.
-  useEffect(() => {
-    return registerWindowCloseGuard(() => {
-      if (isIntentionalAppRestartInProgress()) {
-        return true
-      }
-      if (!hasUnsavedSourceControlAiPromptChangesRef.current) {
-        return true
-      }
-      return promptDiscardSourceControlAiPromptChanges()
-    })
-  }, [promptDiscardSourceControlAiPromptChanges])
-
-  useEffect(() => {
-    const handleFindShortcut = (event: KeyboardEvent): void => {
-      if (event.defaultPrevented) {
-        return
-      }
-      if (!keybindingMatchesAction('settings.search', event, getShortcutPlatform(), keybindings)) {
-        return
-      }
-      const input = searchInputRef.current
-      if (!input) {
-        return
-      }
-      event.preventDefault()
-      input.focus()
-      input.select()
-    }
-
-    document.addEventListener('keydown', handleFindShortcut)
-    return () => document.removeEventListener('keydown', handleFindShortcut)
-  }, [keybindings])
-
-  useEffect(() => {
-    if (!settings || !settingsNavigationTarget) {
-      return
-    }
-
-    const paneSectionId = getSettingsSectionId(
-      settingsNavigationTarget.pane,
-      settingsNavigationTarget.repoId,
-      repoIdToRepresentative
-    )
-    // Why: select the target repo's host before scrolling so its host-specific subsection anchor renders and the scroll lands.
-    const targetRepoId = resolveSettingsTargetRepoId(
-      settingsNavigationTarget,
-      repoIdToHostSelection.keys()
-    )
-    if (targetRepoId) {
-      const hostSelection = settingsNavigationTarget.hostId
-        ? getSettingsTargetHostSelection(
-            settingsProjectList,
-            targetRepoId,
-            settingsNavigationTarget.hostId
-          )
-        : repoIdToHostSelection.get(targetRepoId)
-      if (hostSelection) {
-        setSettingsProjectHostSelection(
-          hostSelection.projectId,
-          hostSelection.hostId,
-          'setupId' in hostSelection && typeof hostSelection.setupId === 'string'
-            ? hostSelection.setupId
-            : undefined
-        )
-      }
-    }
-    pendingNavSectionRef.current = paneSectionId
-    pendingScrollTargetRef.current = settingsNavigationTarget.sectionId ?? paneSectionId
-    setHighlightedSettingsTargetId(
-      settingsNavigationTarget.pane === 'developer-permissions'
-        ? (settingsNavigationTarget.sectionId ?? null)
-        : null
-    )
-    // Why: ensure Appearance's nested status-bar section is open before scrolling so the row is visible.
-    if (settingsNavigationTarget.pane === 'appearance') {
-      const accordion = resolveAppearanceAccordionDeepLink(settingsNavigationTarget.sectionId)
-      if (accordion) {
-        useAppStore.getState().setAppearanceAccordionDeepLink(accordion)
-      }
-    }
-    if (settingsNavigationTarget.intent === 'add-quick-command') {
-      setQuickCommandAddIntentSignal((signal) => signal + 1)
-    } else if (settingsNavigationTarget.intent === 'add-ssh-host') {
-      setSshHostAddIntentSignal((signal) => signal + 1)
-    } else if (settingsNavigationTarget.intent === 'add-remote-orca-server') {
-      setRemoteServerAddIntentSignal((signal) => signal + 1)
-    }
-    setMountedSectionIds((previous) => {
-      if (previous.has(paneSectionId)) {
-        return previous
-      }
-      return new Set(previous).add(paneSectionId)
-    })
-    // Why: bump state so the scroll effect runs even when the visible section set is unchanged (target is kept in refs).
-    setPendingNavRequestTick((tick) => tick + 1)
-    clearSettingsTarget()
-  }, [
-    clearSettingsTarget,
-    repoIdToHostSelection,
-    repoIdToRepresentative,
-    setSettingsProjectHostSelection,
-    settings,
-    settingsProjectList,
-    settingsNavigationTarget
-  ])
-
-  // Why: recompute scrollback mode only when the row value changes, not on every settings mutation.
-  if (settings?.terminalScrollbackRows !== prevScrollbackRows) {
-    setPrevScrollbackRows(settings?.terminalScrollbackRows)
-    if (settings) {
-      setScrollbackMode(
-        SCROLLBACK_PRESETS_ROWS.includes(
-          settings.terminalScrollbackRows as (typeof SCROLLBACK_PRESETS_ROWS)[number]
-        )
-          ? 'preset'
-          : 'custom'
-      )
-    }
+  if (!model.settings) {
+    return renderSettingsLoading(interactions)
   }
 
-  const applyTheme = useCallback((theme: 'system' | 'dark' | 'light') => {
-    applyDocumentTheme(theme)
-  }, [])
-
-  const displayedGitUsername = repos[0]?.gitUsername ?? ''
-  const baseNavSections = useSettingsNavigationMetadata()
-  const { installed: orchestrationSkillInstalled, loading: orchestrationSkillLoading } =
-    orchestrationSkill
-  const {
-    installed: linearSkillInstalled,
-    loading: linearSkillLoading,
-    skills: linearSkills
-  } = linearSkill
-  const { installed: computerUseSkillInstalled, loading: computerUseSkillLoading } =
-    computerUseSkill
-  const capabilityInstallStatusBySectionId = useMemo(() => {
-    const applicableFreshnessInventory = skillFreshnessApplies ? skillFreshnessInventory : null
-    const next = new Map<string, SettingsNavInstallStatus>([
-      [
-        'orchestration',
-        getAgentSkillNavInstallStatus({
-          name: ORCHESTRATION_SKILL_NAME,
-          installed: orchestrationSkillInstalled,
-          loading: orchestrationSkillLoading,
-          inventory: applicableFreshnessInventory
-        })
-      ]
-    ])
-    if (linearConnected) {
-      next.set(
-        'linear',
-        getLinearAgentSkillNavInstallStatus({
-          skills: linearSkills,
-          installed: linearSkillInstalled,
-          loading: linearSkillLoading,
-          inventory: applicableFreshnessInventory
-        })
-      )
-    }
-    if (showDesktopOnlySettings) {
-      next.set(
-        'computer-use',
-        getAgentSkillNavInstallStatus({
-          name: COMPUTER_USE_SKILL_NAME,
-          installed: computerUseSkillInstalled,
-          loading: computerUseSkillLoading,
-          inventory: applicableFreshnessInventory
-        })
-      )
-      if (settings) {
-        next.set(
-          'voice',
-          voiceModelStatesLoading
-            ? 'checking'
-            : hasReadyVoiceModel(settings, modelStates)
-              ? 'installed'
-              : 'install'
-        )
-      }
-    }
-    return next
-  }, [
-    computerUseSkillInstalled,
-    computerUseSkillLoading,
-    linearConnected,
-    linearSkillInstalled,
-    linearSkillLoading,
-    linearSkills,
-    modelStates,
-    orchestrationSkillInstalled,
-    orchestrationSkillLoading,
-    settings,
-    showDesktopOnlySettings,
-    skillFreshnessApplies,
-    skillFreshnessInventory,
-    voiceModelStatesLoading
-  ])
-  const navSections = useMemo(
-    () =>
-      baseNavSections.map((section) => {
-        const installStatus = capabilityInstallStatusBySectionId.get(section.id)
-        return installStatus ? { ...section, installStatus } : section
-      }),
-    [baseNavSections, capabilityInstallStatusBySectionId]
-  )
-  const navSectionById = useMemo(
-    () => new Map(navSections.map((section) => [section.id, section] as const)),
-    [navSections]
-  )
-  const getSectionSearchEntries = (sectionId: string) => {
-    const section = navSectionById.get(sectionId)
-    return section ? getSettingsSectionSearchEntries(section) : []
+  const view = buildSettingsViewModel(model, navigation)
+  const context: SettingsRenderContext = {
+    model: model as LoadedSettingsStoreModel,
+    interactions,
+    navigation,
+    terminal,
+    actions,
+    view
   }
-
-  const visibleNavSections = useMemo(() => {
-    const rankedSections = rankSettingsSearchItems(
-      settingsSearchQuery,
-      navSections,
-      getSettingsSectionSearchEntries
-    ).map(({ item }) => item)
-    if (
-      !hasUnsavedSourceControlAiPromptChanges ||
-      rankedSections.some((section) => section.id === 'git')
-    ) {
-      return rankedSections
-    }
-    const gitSection = navSectionById.get('git')
-    return gitSection ? [...rankedSections, gitSection] : rankedSections
-  }, [hasUnsavedSourceControlAiPromptChanges, navSectionById, navSections, settingsSearchQuery])
-  const visibleSectionIds = useMemo(
-    () => new Set(visibleNavSections.map((section) => section.id)),
-    [visibleNavSections]
-  )
-  const projectByRepoId = useMemo(() => {
-    const projection = getProjectHostSetupProjectionFromState({
-      repos,
-      projects,
-      projectHostSetups
-    })
-    const projectById = new Map(projection.projects.map((project) => [project.id, project]))
-    const nextProjectByRepoId = new Map<string, (typeof projection.projects)[number]>()
-    for (const setup of projection.setups) {
-      const project = projectById.get(setup.projectId)
-      if (project && setup.repoId.trim()) {
-        nextProjectByRepoId.set(setup.repoId, project)
-      }
-    }
-    return nextProjectByRepoId
-  }, [projectHostSetups, projects, repos])
-  const neededSectionIds = useMemo(
-    () =>
-      deriveNeededSectionIds({
-        navSectionIds: navSections.map((section) => section.id),
-        mountedSectionIds,
-        activeSectionId,
-        pendingSectionId: pendingNavSectionRef.current,
-        query: settingsSearchQuery,
-        visibleSectionIds
-      }),
-    [activeSectionId, mountedSectionIds, navSections, settingsSearchQuery, visibleSectionIds]
-  )
-  const windowsTerminalCapabilityOwnerKey = useWindowsTerminalCapabilityOwnerKey(
-    settings?.activeRuntimeEnvironmentId
-  )
-  const runtimeTarget = useMemo(() => getActiveRuntimeTarget(settings), [settings])
-  const capabilityLoadTarget = useMemo(
-    () => (isWebClient ? { kind: 'local' as const } : runtimeTarget),
-    [isWebClient, runtimeTarget]
-  )
-  const hasActiveRuntimeEnvironment = Boolean(settings?.activeRuntimeEnvironmentId?.trim())
-  const needsRepoWindowsRuntimeCapabilities = [...neededSectionIds].some((sectionId) =>
-    sectionId.startsWith('repo-')
-  )
-  const needsLocalWindowsRuntimeCapabilities =
-    (isWindows || isWebClient) &&
-    (neededSectionIds.has('agents') || neededSectionIds.has('general'))
-  const shouldLoadWindowsTerminalCapabilities =
-    hasActiveRuntimeEnvironment ||
-    ((isWindows || isWebClient) &&
-      (neededSectionIds.has('terminal') ||
-        neededSectionIds.has('accounts') ||
-        needsRepoWindowsRuntimeCapabilities ||
-        (runtimeTarget.kind === 'local' && needsLocalWindowsRuntimeCapabilities)))
-  // Why: terminal, account, and repository settings describe the active execution host.
-  const windowsTerminalCapabilities = useWindowsTerminalCapabilities(
-    shouldLoadWindowsTerminalCapabilities,
-    true,
-    windowsTerminalCapabilityOwnerKey,
-    capabilityLoadTarget
-  )
-  // Why: global agent and project defaults belong to the desktop, not its active remote.
-  const remoteViewLocalWindowsRuntimeCapabilities = useLocalWindowsTerminalCapabilities(
-    needsLocalWindowsRuntimeCapabilities && runtimeTarget.kind === 'environment' && !isWebClient,
-    true,
-    'local'
-  )
-  const localWindowsRuntimeCapabilities =
-    runtimeTarget.kind === 'local' || isWebClient
-      ? windowsTerminalCapabilities
-      : remoteViewLocalWindowsRuntimeCapabilities
-  // Why: only supported-but-unavailable WSL (Windows) should render disabled controls, not unsupported WSL (macOS/Linux).
-  const runtimeWslSupportedPlatform = isWindowsTerminalCapabilityHost({
-    isWindowsRenderer: isWindows,
-    isWebClient,
-    target: runtimeTarget,
-    hostPlatform: windowsTerminalCapabilities.hostPlatform
-  })
-  const localWslSupportedPlatform = isWindowsTerminalCapabilityHost({
-    isWindowsRenderer: isWindows,
-    isWebClient,
-    target: { kind: 'local' },
-    hostPlatform: localWindowsRuntimeCapabilities.hostPlatform
-  })
-  const isWindowsTerminalHost = runtimeWslSupportedPlatform
-
-  if ([...neededSectionIds].some((id) => !mountedSectionIds.has(id))) {
-    // Why: record newly needed sections during render so panes don't wait for a follow-up Effect.
-    setMountedSectionIds(neededSectionIds)
-  }
-
-  // Why: load hooks for the selected host's repo id, not the representative id (they differ for non-default hosts).
-  const neededRepos = useMemo(() => {
-    const reposByHostIdentity = new Map<string, Repo>()
-    for (const settingsProject of settingsProjectList) {
-      if (!neededSectionIds.has(`repo-${settingsProject.representativeRepoId}`)) {
-        continue
-      }
-      const repo = getSettingsProjectHostRepo(
-        settingsProject,
-        repos,
-        settingsProjectHostSelection[settingsProject.projectId],
-        settingsProjectSetupSelection[settingsProject.projectId]
-      )
-      if (repo) {
-        reposByHostIdentity.set(getRepoHostIdentity(repo), repo)
-      }
-    }
-    return [...reposByHostIdentity.values()]
-  }, [
-    neededSectionIds,
-    repos,
-    settingsProjectHostSelection,
-    settingsProjectList,
-    settingsProjectSetupSelection
-  ])
-
-  useEffect(() => {
-    const repoHostIdentitySet = new Set(repos.map(getRepoHostIdentity))
-    setRepoHooksMap((previous) => {
-      const next = Object.fromEntries(
-        Object.entries(previous).filter(([identity]) => repoHostIdentitySet.has(identity))
-      ) as Record<string, { hasHooks: boolean; hooks: OrcaHooks | null; mayNeedUpdate: boolean }>
-      return Object.keys(next).length === Object.keys(previous).length ? previous : next
-    })
-  }, [repos])
-
-  useEffect(() => {
-    if (neededRepos.length === 0) {
-      return
-    }
-
-    let stale = false
-    const requestSeq = ++repoHooksRequestSeqRef.current
-    const liveRepoHostIdentities = new Set(repos.map(getRepoHostIdentity))
-
-    void Promise.all(
-      neededRepos.map(async (repo) => {
-        const repoHostIdentity = getRepoHostIdentity(repo)
-        if (isFolderRepo(repo)) {
-          setRepoHooksMap((previous) => {
-            if (previous[repoHostIdentity]) {
-              return previous
-            }
-            return {
-              ...previous,
-              [repoHostIdentity]: { hasHooks: false, hooks: null, mayNeedUpdate: false }
-            }
-          })
-          return
-        }
-        try {
-          const hostId = getRepoExecutionHostId(repo)
-          const parsedHost = parseExecutionHostId(hostId)
-          const result = await checkRuntimeHooks(
-            {
-              activeRuntimeEnvironmentId:
-                parsedHost?.kind === 'runtime' ? parsedHost.environmentId : null
-            },
-            repo.id,
-            hostId
-          )
-          if (stale || requestSeq !== repoHooksRequestSeqRef.current) {
-            return
-          }
-          setRepoHooksMap((previous) => {
-            if (!liveRepoHostIdentities.has(repoHostIdentity)) {
-              return previous
-            }
-            return { ...previous, [repoHostIdentity]: result }
-          })
-        } catch {
-          // Keep last known value on transient failures.
-          if (stale || requestSeq !== repoHooksRequestSeqRef.current) {
-            return
-          }
-          setRepoHooksMap((previous) => {
-            if (!liveRepoHostIdentities.has(repoHostIdentity)) {
-              return previous
-            }
-            if (previous[repoHostIdentity]) {
-              return previous
-            }
-            return {
-              ...previous,
-              [repoHostIdentity]: { hasHooks: false, hooks: null, mayNeedUpdate: false }
-            }
-          })
-        }
-      })
-    )
-
-    return () => {
-      stale = true
-    }
-  }, [neededRepos, repos])
-
-  useEffect(() => {
-    const scrollTargetId = pendingScrollTargetRef.current
-    const pendingNavSectionId = pendingNavSectionRef.current
-
-    // Why: subsection deep links clear a stale filter that could hide the target row; pane-level links keep it to force-open the matching section.
-    if (
-      scrollTargetId &&
-      pendingNavSectionId &&
-      scrollTargetId !== pendingNavSectionId &&
-      settingsSearchQuery.trim() !== ''
-    ) {
-      setSettingsSearchQuery('')
-      return
-    }
-
-    if (scrollTargetId && pendingNavSectionId && visibleSectionIds.has(pendingNavSectionId)) {
-      // Why: inactive panes don't render; activate the pane first, then find the subsection next render.
-      if (activeSectionId !== pendingNavSectionId) {
-        setActiveSectionId(pendingNavSectionId)
-        return
-      }
-      const container = contentScrollRef.current
-      if (container) {
-        container.scrollTo({ top: 0 })
-      }
-      // Why: deep links can target a row inside the already-visible pane.
-      if (scrollTargetId !== pendingNavSectionId) {
-        // Why: target can arrive before the lazy section mounts; keep pending refs until it does.
-        if (!getSettingsScrollTarget(scrollTargetId, container)) {
-          return
-        }
-        const scrollToSubsection = (): void => {
-          scrollSubsectionIntoView(scrollTargetId, contentScrollRef.current)
-        }
-        scrollToSubsection()
-        cancelPendingSettingsSubsectionScrollFrame(pendingSubsectionScrollFrameRef)
-        let completed = false
-        let frameId: number | undefined
-        frameId = requestAnimationFrame(() => {
-          completed = true
-          if (pendingSubsectionScrollFrameRef.current === frameId) {
-            pendingSubsectionScrollFrameRef.current = null
-          }
-          scrollToSubsection()
-        })
-        if (!completed) {
-          pendingSubsectionScrollFrameRef.current = frameId
-        }
-      }
-      setActiveSectionId(pendingNavSectionId)
-      pendingNavSectionRef.current = null
-      pendingScrollTargetRef.current = null
-      return
-    }
-
-    if (!visibleSectionIds.has(activeSectionId) && visibleNavSections.length > 0) {
-      setActiveSectionId(getFallbackVisibleSection(visibleNavSections)?.id ?? activeSectionId)
-    }
-  }, [
-    activeSectionId,
-    pendingNavRequestTick,
-    setSettingsSearchQuery,
-    settingsSearchQuery,
-    visibleSectionIds,
-    visibleNavSections
-  ])
-
-  const scrollToSection = useCallback(
-    async (sectionId: string): Promise<void> => {
-      if (sectionId !== activeSectionId && !(await confirmDiscardSourceControlAiPromptChanges())) {
-        return
-      }
-      const container = contentScrollRef.current
-      if (container) {
-        container.scrollTo({ top: 0 })
-      }
-      if (settingsSearchQuery.trim() !== '') {
-        // Why: clear the search filter so selecting a result shows that pane, not the stale query's.
-        setSettingsSearchQuery('')
-      }
-      setActiveSectionId(sectionId)
-    },
-    [
-      activeSectionId,
-      confirmDiscardSourceControlAiPromptChanges,
-      setSettingsSearchQuery,
-      settingsSearchQuery
-    ]
-  )
-
-  const openComputerUseFromBrowser = useCallback(async () => {
-    if (!(await confirmDiscardSourceControlAiPromptChanges())) {
-      return
-    }
-    pendingNavSectionRef.current = 'computer-use'
-    pendingScrollTargetRef.current = 'computer-use'
-    if (settingsSearchQuery !== '') {
-      setSettingsSearchQuery('')
-      return
-    }
-    // Why: pending refs don't schedule a render; bump state to rerun the jump effect.
-    setPendingNavRequestTick((tick) => tick + 1)
-  }, [confirmDiscardSourceControlAiPromptChanges, setSettingsSearchQuery, settingsSearchQuery])
-
-  if (!settings) {
-    return (
-      <div
-        ref={setSettingsRootNode}
-        className="settings-view-shell flex min-h-0 flex-1 overflow-hidden bg-background"
-      >
-        <div className="flex flex-1 items-center justify-center text-muted-foreground">
-          {translate('auto.components.settings.Settings.c7ad095d96', 'Loading settings...')}
-        </div>
-      </div>
-    )
-  }
-
-  const generalNavSections = visibleNavSections.filter((section) => !section.id.startsWith('repo-'))
-  const generalNavGroupDefinitions = getSettingsNavGroupDefinitionsForSearch(
-    visibleNavSections,
-    settingsSearchQuery
-  )
-  const generalNavGroups: SettingsNavGroup[] = generalNavGroupDefinitions
-    .map((group) => ({
-      id: group.id,
-      title: translate(group.titleKey, group.titleDefault),
-      sections: generalNavSections.filter((section) => section.group === group.id)
-    }))
-    .filter((group) => group.sections.length > 0 || group.id === 'setup')
-  const repoNavSections = visibleNavSections
-    .filter((section) => section.id.startsWith('repo-'))
-    .map((section) => {
-      const repo = repos.find((entry) => entry.id === section.id.replace('repo-', ''))
-      return {
-        ...section,
-        badgeColor: repo?.badgeColor,
-        isRemote: !!repo?.connectionId,
-        repoIcon: repo?.repoIcon,
-        upstream: repo?.upstream
-      }
-    })
-  const isSectionMounted = (sectionId: string): boolean => neededSectionIds.has(sectionId)
-  const isFocusedShortcutsPane =
-    activeSectionId === 'shortcuts' && settingsSearchQuery.trim() === ''
-  const isFocusedSetupGuidePane =
-    activeSectionId === 'setup-guide' && settingsSearchQuery.trim() === ''
-
-  return (
-    <div
-      ref={setSettingsRootNode}
-      className="settings-view-shell flex min-h-0 flex-1 overflow-hidden bg-background"
-    >
-      <SettingsSidebar
-        settings={settings}
-        activeSectionId={activeSectionId}
-        generalGroups={generalNavGroups}
-        repoSections={repoNavSections}
-        hasRepos={repos.length > 0}
-        searchInputRef={searchInputRef}
-        // Why: deep-links open panes/modals that own focus; plain entry lands in search.
-        searchAutoFocus={settingsNavigationTarget == null}
-        onBack={closeSettingsPageWithPromptGuard}
-        onSelectSection={scrollToSection}
-      />
-
-      <div className="flex min-h-0 flex-1 flex-col">
-        <div
-          ref={setContentScrollNode}
-          className={cn(
-            'min-h-0 flex-1',
-            isFocusedShortcutsPane ? 'overflow-hidden' : 'overflow-y-auto scrollbar-sleek'
-          )}
-        >
-          <div
-            className={cn(
-              'mx-auto flex w-full flex-col gap-10 px-8 pt-10',
-              isFocusedShortcutsPane ? 'h-full pb-6' : 'pb-24',
-              isFocusedSetupGuidePane ? 'max-w-6xl' : 'max-w-4xl'
-            )}
-          >
-            {visibleNavSections.length === 0 ? (
-              <div className="flex min-h-[24rem] items-center justify-center rounded-2xl border border-dashed border-border/60 bg-card/30 text-sm text-muted-foreground">
-                {translate(
-                  'auto.components.settings.Settings.3c88ec55d6',
-                  'No settings found for "'
-                )}
-                {settingsSearchQuery.trim()}
-                {translate('auto.components.settings.Settings.add3b97ee6', '"')}
-              </div>
-            ) : (
-              <ActiveSettingsSectionProvider value={activeSectionId}>
-                <SettingsSection
-                  id="agents"
-                  title={translate('auto.components.settings.Settings.8afa676615', 'Agents')}
-                  description={translate(
-                    'auto.components.settings.Settings.ec1ba547f7',
-                    'Manage AI agents, set a default, and customize commands.'
-                  )}
-                  searchEntries={getSectionSearchEntries('agents')}
-                >
-                  {isSectionMounted('agents') ? (
-                    <AgentsPane
-                      settings={settings}
-                      updateSettings={updateSettings}
-                      wslSupportedPlatform={localWslSupportedPlatform}
-                      wslAvailable={localWindowsRuntimeCapabilities.wslAvailable}
-                      wslDistros={localWindowsRuntimeCapabilities.wslDistros}
-                      wslCapabilitiesLoading={localWindowsRuntimeCapabilities.isLoading}
-                    />
-                  ) : null}
-                </SettingsSection>
-
-                <SettingsSection
-                  id="accounts"
-                  title={translate(
-                    'auto.components.settings.Settings.ad6c529693',
-                    'AI Provider Accounts'
-                  )}
-                  description={translate(
-                    'auto.components.settings.Settings.21f09426ea',
-                    'Optional. Orca works with your existing provider logins; add accounts only if you want Orca to help switch between them.'
-                  )}
-                  badge={translate(
-                    'auto.hooks.useSettingsNavigationMetadata.7c79d3b7bf',
-                    'Optional'
-                  )}
-                  searchEntries={getSectionSearchEntries('accounts')}
-                >
-                  {isSectionMounted('accounts') ? (
-                    <AccountsPane
-                      settings={settings}
-                      updateSettings={updateSettings}
-                      wslSupportedPlatform={runtimeWslSupportedPlatform}
-                      wslAvailable={windowsTerminalCapabilities.wslAvailable}
-                      wslDistros={windowsTerminalCapabilities.wslDistros}
-                      wslCapabilitiesLoading={windowsTerminalCapabilities.isLoading}
-                      accountOwnerPlatform={windowsTerminalCapabilities.hostPlatform}
-                    />
-                  ) : null}
-                </SettingsSection>
-
-                <SettingsSection
-                  id="orchestration"
-                  title={translate('auto.components.settings.Settings.00c3a7950d', 'Orchestration')}
-                  description={translate(
-                    'auto.components.settings.Settings.475980f53d',
-                    'Coordinate multiple coding agents through Orca.'
-                  )}
-                  searchEntries={getSectionSearchEntries('orchestration')}
-                >
-                  {isSectionMounted('orchestration') ? (
-                    <OrchestrationPane settings={settings} updateSettings={updateSettings} />
-                  ) : null}
-                </SettingsSection>
-
-                {linearConnected ? (
-                  <SettingsSection
-                    id="linear"
-                    title={translate('auto.components.settings.Settings.linearTitle', 'Linear')}
-                    description={translate(
-                      'auto.components.settings.Settings.linearDescription',
-                      'How Linear works in Orca, setup checklist, agent skill, and example prompts.'
-                    )}
-                    searchEntries={getSectionSearchEntries('linear')}
-                  >
-                    {isSectionMounted('linear') ? <LinearAgentSkillPane /> : null}
-                  </SettingsSection>
-                ) : null}
-
-                {showDesktopOnlySettings ? (
-                  <>
-                    <SettingsSection
-                      id="computer-use"
-                      title={translate(
-                        'auto.components.settings.Settings.c9841721cb',
-                        'Computer Use'
-                      )}
-                      description={translate(
-                        'auto.components.settings.Settings.7118953f14',
-                        'Enable agents to control any app on your computer.'
-                      )}
-                      searchEntries={getSectionSearchEntries('computer-use')}
-                    >
-                      {isSectionMounted('computer-use') ? <ComputerUsePane /> : null}
-                    </SettingsSection>
-
-                    <SettingsSection
-                      id="voice"
-                      title={translate('auto.components.settings.Settings.5063bb47a5', 'Voice')}
-                      description={translate(
-                        'auto.components.settings.Settings.eb1176a14e',
-                        'Local speech-to-text dictation with on-device models.'
-                      )}
-                      searchEntries={getSectionSearchEntries('voice')}
-                    >
-                      {isSectionMounted('voice') ? (
-                        <VoicePane settings={settings} updateSettings={updateSettings} />
-                      ) : null}
-                    </SettingsSection>
-                  </>
-                ) : null}
-
-                {showDesktopOnlySettings ? (
-                  <SettingsSection
-                    id="orca-account"
-                    title={translate('auto.components.settings.orcaAccount.title', 'Orca Account')}
-                    description={translate(
-                      'auto.components.settings.orcaAccount.description',
-                      'Share work instantly and reach your desktop from Orca Mobile wherever you are.'
-                    )}
-                    searchEntries={getSectionSearchEntries('orca-account')}
-                  >
-                    {isSectionMounted('orca-account') ? <OrcaAccountSettingsPane /> : null}
-                  </SettingsSection>
-                ) : null}
-
-                <SettingsSection
-                  id="setup-guide"
-                  title={translate(
-                    'auto.components.settings.Settings.6d119427ef',
-                    'Onboarding checklist'
-                  )}
-                  description={translate(
-                    'auto.components.settings.Settings.6855b0f77d',
-                    'Finish the core workflows that make Orca useful for parallel agent work.'
-                  )}
-                  searchEntries={getSectionSearchEntries('setup-guide')}
-                  bodyClassName="overflow-hidden rounded-none border-0 bg-transparent p-0 shadow-none"
-                >
-                  {isSectionMounted('setup-guide') ? <SettingsSetupGuidePane /> : null}
-                </SettingsSection>
-
-                <SettingsSection
-                  id="general"
-                  title={translate('auto.components.settings.Settings.7807c11c4d', 'General')}
-                  description={translate(
-                    'auto.components.settings.Settings.f9b77539fd',
-                    'Workspace defaults, app setup, and maintenance.'
-                  )}
-                  searchEntries={getSectionSearchEntries('general')}
-                >
-                  {isSectionMounted('general') ? (
-                    <GeneralPane
-                      settings={settings}
-                      updateSettings={updateSettings}
-                      updateSettingsOrThrow={updateSettingsOrThrow}
-                      fontSuggestions={terminalFontSuggestions}
-                      onRequestFontSuggestions={requestFontSuggestions}
-                      wslSupportedPlatform={localWslSupportedPlatform}
-                      wslAvailable={localWindowsRuntimeCapabilities.wslAvailable}
-                      wslDistros={localWindowsRuntimeCapabilities.wslDistros}
-                      wslCapabilitiesLoading={localWindowsRuntimeCapabilities.isLoading}
-                    />
-                  ) : null}
-                </SettingsSection>
-
-                <SettingsSection
-                  id="integrations"
-                  title={translate('auto.components.settings.Settings.c9ca101a3b', 'Integrations')}
-                  description={translate(
-                    'auto.components.settings.Settings.b07041697f',
-                    'Connect GitHub, GitLab, Linear, and source-hosting services.'
-                  )}
-                  searchEntries={getSectionSearchEntries('integrations')}
-                  bodyClassName="rounded-none border-0 bg-transparent p-0 shadow-none"
-                >
-                  {isSectionMounted('integrations') ? <IntegrationsPane /> : null}
-                </SettingsSection>
-
-                {showDesktopOnlySettings ? (
-                  <SettingsSection
-                    id="mobile"
-                    title={translate('auto.components.settings.Settings.c40dadaac8', 'Mobile')}
-                    badge="Beta"
-                    description={translate(
-                      'auto.components.settings.Settings.c6c01ac209',
-                      'Control terminals and agents from your phone.'
-                    )}
-                    searchEntries={getSectionSearchEntries('mobile')}
-                  >
-                    {isSectionMounted('mobile') ? <MobileSettingsPane /> : null}
-                  </SettingsSection>
-                ) : null}
-
-                <SettingsSection
-                  id="automations"
-                  title={translate('auto.components.settings.automations.title', 'Automations')}
-                  description={translate(
-                    'auto.components.settings.automations.description',
-                    'Schedule agent work and choose whether Automations appears in the sidebar.'
-                  )}
-                  searchEntries={getSectionSearchEntries('automations')}
-                >
-                  {isSectionMounted('automations') ? (
-                    <AutomationsSettingsPane settings={settings} updateSettings={updateSettings} />
-                  ) : null}
-                </SettingsSection>
-
-                <SettingsSection
-                  id="artifacts"
-                  title={translate('auto.components.settings.artifacts.title', 'Artifacts')}
-                  badge="Beta"
-                  description={translate(
-                    'auto.components.settings.artifacts.description',
-                    'Share HTML and Markdown files with your team and manage their public links.'
-                  )}
-                  searchEntries={getSectionSearchEntries('artifacts')}
-                >
-                  {isSectionMounted('artifacts') ? (
-                    <ArtifactsSettingsPane settings={settings} updateSettings={updateSettings} />
-                  ) : null}
-                </SettingsSection>
-
-                <SettingsSection
-                  id="share-skills"
-                  title={translate('auto.components.settings.shareSkills.title', 'Share Skills')}
-                  badge="Beta"
-                  description={translate(
-                    'auto.components.settings.shareSkills.description',
-                    'Share your skills with an unlisted link. Anyone who has it can install them.'
-                  )}
-                  searchEntries={getSectionSearchEntries('share-skills')}
-                >
-                  {isSectionMounted('share-skills') ? <ShareSkillsSettingsPane /> : null}
-                </SettingsSection>
-
-                <SettingsSection
-                  id="git"
-                  title={translate(
-                    'auto.components.settings.Settings.70100f94c7',
-                    'Git & Source Control'
-                  )}
-                  description={translate(
-                    'auto.components.settings.Settings.cfa34f4465',
-                    'Branch naming, base refs, and Git AI Author.'
-                  )}
-                  searchEntries={getSectionSearchEntries('git')}
-                  forceVisible={hasUnsavedSourceControlAiPromptChanges}
-                >
-                  {isSectionMounted('git') ? (
-                    <>
-                      <GitPane
-                        settings={settings}
-                        updateSettings={updateSettings}
-                        writeSourceControlAiSettings={writeSourceControlAiSettings}
-                        displayedGitUsername={displayedGitUsername}
-                        hasUnsavedBranchPromptChanges={hasUnsavedBranchPromptChanges}
-                        onBranchPromptDirtyChange={setHasUnsavedBranchPromptChanges}
-                        branchPromptDiscardSignal={sourceControlAiPromptDiscardSignal}
-                        settingsSearchQuery={settingsSearchQuery}
-                      />
-                      <CommitMessageAiPane
-                        settings={settings}
-                        updateSettings={updateSettings}
-                        writeSourceControlAiSettings={writeSourceControlAiSettings}
-                        onCustomPromptDirtyChange={setHasUnsavedCommitPromptChanges}
-                        customPromptDiscardSignal={sourceControlAiPromptDiscardSignal}
-                        settingsSearchQuery={settingsSearchQuery}
-                      />
-                      <GitProviderApiBudgetPane settingsSearchQuery={settingsSearchQuery} />
-                    </>
-                  ) : null}
-                </SettingsSection>
-
-                <SettingsSection
-                  id="tasks"
-                  title={translate('auto.components.settings.Settings.11faa2f7dd', 'Task Sources')}
-                  description={translate(
-                    'auto.components.settings.Settings.tasksDescription',
-                    'Connect providers, install the Linear skill, and choose what appears in Tasks.'
-                  )}
-                  searchEntries={getSectionSearchEntries('tasks')}
-                >
-                  {isSectionMounted('tasks') ? (
-                    <TasksPane settings={settings} updateSettings={updateSettings} />
-                  ) : null}
-                </SettingsSection>
-
-                <SettingsSection
-                  id="terminal"
-                  title={translate('auto.components.settings.Settings.3de4bbb841', 'Terminal')}
-                  description={translate(
-                    'auto.components.settings.Settings.b79b5b31e9',
-                    'Shells, renderer, sessions, and terminal behavior.'
-                  )}
-                  searchEntries={getSectionSearchEntries('terminal')}
-                >
-                  {isSectionMounted('terminal') ? (
-                    <TerminalPane
-                      settings={settings}
-                      updateSettings={updateSettings}
-                      scrollbackMode={scrollbackMode}
-                      setScrollbackMode={setScrollbackMode}
-                      wslAvailable={windowsTerminalCapabilities.wslAvailable}
-                      wslDistros={windowsTerminalCapabilities.wslDistros}
-                      wslCapabilitiesLoading={windowsTerminalCapabilities.isLoading}
-                      pwshAvailable={windowsTerminalCapabilities.pwshAvailable}
-                      gitBashAvailable={windowsTerminalCapabilities.gitBashAvailable}
-                      isWindowsTerminalHost={isWindowsTerminalHost}
-                    />
-                  ) : null}
-                </SettingsSection>
-
-                <SettingsSection
-                  id="quick-commands"
-                  title={translate(
-                    'auto.components.settings.Settings.13d4fe30ad',
-                    'Quick Commands'
-                  )}
-                  description={translate(
-                    'auto.components.settings.Settings.6742c7932c',
-                    'Saved terminal commands, scoped globally or per project.'
-                  )}
-                  searchEntries={getSectionSearchEntries('quick-commands')}
-                >
-                  {isSectionMounted('quick-commands') ? (
-                    <QuickCommandsPane
-                      settings={settings}
-                      addCommandIntentSignal={quickCommandAddIntentSignal}
-                    />
-                  ) : null}
-                </SettingsSection>
-
-                {showDesktopOnlySettings ? (
-                  <SettingsSection
-                    id="browser"
-                    title={translate('auto.components.settings.Settings.c46215ea03', 'Browser')}
-                    description={translate(
-                      'auto.components.settings.Settings.ad9788036f',
-                      'Home page, link routing, and session cookies.'
-                    )}
-                    searchEntries={getSectionSearchEntries('browser')}
-                  >
-                    {isSectionMounted('browser') ? (
-                      <BrowserPane
-                        settings={settings}
-                        updateSettings={updateSettings}
-                        onOpenComputerUse={openComputerUseFromBrowser}
-                      />
-                    ) : null}
-                  </SettingsSection>
-                ) : null}
-
-                {showDesktopOnlySettings ? (
-                  <SettingsSection
-                    id="mobile-emulator"
-                    title={translate(
-                      'auto.components.settings.Settings.f75daf1002',
-                      'Mobile Emulator'
-                    )}
-                    description={translate(
-                      'auto.components.settings.Settings.01f9d36292',
-                      'Configure mobile emulator support for Orca and coding agents.'
-                    )}
-                    searchEntries={getSectionSearchEntries('mobile-emulator')}
-                  >
-                    {isSectionMounted('mobile-emulator') ? (
-                      <MobileEmulatorSettingsPane
-                        settings={settings}
-                        updateSettings={updateSettings}
-                      />
-                    ) : null}
-                  </SettingsSection>
-                ) : null}
-
-                <SettingsSection
-                  id="floating-workspace"
-                  title={translate(
-                    'auto.components.settings.Settings.3eb22a3ada',
-                    'Floating Workspace'
-                  )}
-                  description={translate(
-                    'auto.components.settings.Settings.3d9adfe6a5',
-                    'Global terminal, browser, and markdown tabs.'
-                  )}
-                  searchEntries={getSectionSearchEntries('floating-workspace')}
-                >
-                  {isSectionMounted('floating-workspace') ? (
-                    <FloatingWorkspacePane settings={settings} updateSettings={updateSettings} />
-                  ) : null}
-                </SettingsSection>
-
-                <SettingsSection
-                  id="appearance"
-                  title={translate('auto.components.settings.Settings.2b4474780a', 'Appearance')}
-                  description={translate(
-                    'auto.components.settings.Settings.6d1a27e193',
-                    'Theme, zoom, app and terminal appearance, sidebars, and status bar.'
-                  )}
-                  searchEntries={getSectionSearchEntries('appearance')}
-                >
-                  {isSectionMounted('appearance') ? (
-                    <AppearancePane
-                      settings={settings}
-                      updateSettings={updateSettings}
-                      applyTheme={applyTheme}
-                      fontSuggestions={fontSuggestions}
-                      terminalFontSuggestions={terminalFontSuggestions}
-                      onRequestFontSuggestions={requestFontSuggestions}
-                      systemPrefersDark={systemPrefersDark}
-                      ghostty={ghostty}
-                      warpThemes={warpThemes}
-                    />
-                  ) : null}
-                </SettingsSection>
-
-                <SettingsSection
-                  id="input"
-                  title={translate(
-                    'auto.components.settings.Settings.d7a3e635b6',
-                    'Input & Editing'
-                  )}
-                  description={translate(
-                    'auto.components.settings.Settings.d0b7021d64',
-                    'Selection and editing behavior.'
-                  )}
-                  searchEntries={getSectionSearchEntries('input')}
-                >
-                  <InputPane settings={settings} updateSettings={updateSettings} />
-                </SettingsSection>
-
-                {showDesktopOnlySettings ? (
-                  <SettingsSection
-                    id="notifications"
-                    title={translate(
-                      'auto.components.settings.Settings.9907545fa3',
-                      'Notifications'
-                    )}
-                    description={translate(
-                      'auto.components.settings.Settings.7210ac09c4',
-                      'Native desktop notifications for agent activity and terminal events.'
-                    )}
-                    searchEntries={getSectionSearchEntries('notifications')}
-                  >
-                    {isSectionMounted('notifications') ? (
-                      <NotificationsPane settings={settings} updateSettings={updateSettings} />
-                    ) : null}
-                  </SettingsSection>
-                ) : null}
-
-                <SettingsSection
-                  id="shortcuts"
-                  title={translate('auto.components.settings.Settings.23bf7a1ad4', 'Shortcuts')}
-                  description={translate(
-                    'auto.components.settings.Settings.a737a4bb22',
-                    'Keyboard shortcuts for common actions.'
-                  )}
-                  searchEntries={getSectionSearchEntries('shortcuts')}
-                  className={
-                    isFocusedShortcutsPane
-                      ? 'flex min-h-0 flex-1 flex-col space-y-0 gap-6'
-                      : undefined
-                  }
-                  bodyClassName={
-                    isFocusedShortcutsPane ? 'min-h-0 flex-1 overflow-hidden' : undefined
-                  }
-                >
-                  {isSectionMounted('shortcuts') ? <ShortcutsPane /> : null}
-                </SettingsSection>
-
-                <SettingsSection
-                  id="stats"
-                  title={translate('auto.components.settings.Settings.954a8f5aef', 'Stats & Usage')}
-                  description={translate(
-                    'auto.components.settings.Settings.8acf3f22e0',
-                    'Orca stats plus Claude, Codex, OpenCode token analytics and Grok subscription usage.'
-                  )}
-                  searchEntries={getSectionSearchEntries('stats')}
-                >
-                  {isSectionMounted('stats') ? <StatsPane /> : null}
-                </SettingsSection>
-
-                <SettingsSection
-                  id="servers"
-                  title={translate(
-                    'auto.components.settings.Settings.bd0181eeca',
-                    'Remote Orca Servers'
-                  )}
-                  badge="Beta"
-                  description={
-                    isWebClient
-                      ? translate(
-                          'auto.components.settings.Settings.7686cb5c36',
-                          'Connect this browser to a saved Orca server.'
-                        )
-                      : translate(
-                          'auto.components.settings.Settings.b5ee17826b',
-                          'Pair remote Orca runtimes for persistent sessions, richer remote state, and web or mobile handoff.'
-                        )
-                  }
-                  searchEntries={getSectionSearchEntries('servers')}
-                >
-                  {isSectionMounted('servers') ? (
-                    <RuntimeEnvironmentsPane
-                      settings={settings}
-                      setActiveRuntimeEnvironmentPreference={setActiveRuntimeEnvironmentPreference}
-                      canGeneratePairingUrl={!isWebClient}
-                      allowLocalRuntime={!isWebClient}
-                      addServerIntentSignal={remoteServerAddIntentSignal}
-                    />
-                  ) : null}
-                </SettingsSection>
-
-                {showDesktopOnlySettings ? (
-                  <SettingsSection
-                    id="ssh"
-                    title={translate('auto.components.settings.Settings.9b02492d1f', 'SSH Hosts')}
-                    description={translate(
-                      'auto.components.settings.Settings.c2ee313198',
-                      'Use existing machines over SSH for files, terminals, Git, and workspaces.'
-                    )}
-                    searchEntries={getSectionSearchEntries('ssh')}
-                  >
-                    {isSectionMounted('ssh') ? (
-                      <SshPane addTargetIntentSignal={sshHostAddIntentSignal} />
-                    ) : null}
-                  </SettingsSection>
-                ) : null}
-
-                {showDesktopOnlySettings && isMac ? (
-                  <SettingsSection
-                    id="developer-permissions"
-                    title={translate(
-                      'auto.components.settings.Settings.65660d4548',
-                      'macOS Permissions'
-                    )}
-                    description={translate(
-                      'auto.components.settings.Settings.9b83cc62c2',
-                      'macOS privacy access for terminal-launched developer tools.'
-                    )}
-                    searchEntries={getSectionSearchEntries('developer-permissions')}
-                  >
-                    {isSectionMounted('developer-permissions') ? (
-                      <DeveloperPermissionsPane
-                        highlightedSettingId={highlightedSettingsTargetId}
-                      />
-                    ) : null}
-                  </SettingsSection>
-                ) : null}
-
-                <SettingsSection
-                  id="privacy"
-                  title={translate(
-                    'auto.components.settings.Settings.d7e3f62d70',
-                    'Privacy & Telemetry'
-                  )}
-                  description={translate(
-                    'auto.components.settings.Settings.c1b43dc4e2',
-                    'Anonymous usage data and telemetry controls.'
-                  )}
-                  searchEntries={getSectionSearchEntries('privacy')}
-                >
-                  {isSectionMounted('privacy') ? <PrivacyPane settings={settings} /> : null}
-                </SettingsSection>
-
-                {showDesktopOnlySettings ? (
-                  <SettingsSection
-                    id="advanced"
-                    title={translate('auto.components.settings.Settings.1c87f8d024', 'Advanced')}
-                    description={translate(
-                      'auto.components.settings.Settings.499c1cd7f9',
-                      'Low-level compatibility settings for troubleshooting.'
-                    )}
-                    searchEntries={getSectionSearchEntries('advanced')}
-                  >
-                    {isSectionMounted('advanced') ? (
-                      <AdvancedPane settings={settings} updateSettings={updateSettings} />
-                    ) : null}
-                  </SettingsSection>
-                ) : null}
-
-                {showDesktopOnlySettings && import.meta.env.DEV ? (
-                  <SettingsSection
-                    id="dev"
-                    title={translate('auto.components.settings.Settings.dev', 'Dev Tools')}
-                    description={translate(
-                      'auto.components.settings.Settings.devDescription',
-                      'Dev-only tools for exercising UI states.'
-                    )}
-                    searchEntries={getSectionSearchEntries('dev')}
-                  >
-                    {DevToolsPane && isSectionMounted('dev') ? (
-                      <Suspense fallback={null}>
-                        <DevToolsPane />
-                      </Suspense>
-                    ) : null}
-                  </SettingsSection>
-                ) : null}
-
-                <SettingsSection
-                  id="experimental"
-                  title={translate('auto.components.settings.Settings.8b017f2506', 'Experimental')}
-                  description={translate(
-                    'auto.components.settings.Settings.075341c763',
-                    'New features that are still taking shape. Give them a try.'
-                  )}
-                  searchEntries={getSectionSearchEntries('experimental')}
-                  // Why: Option-click the page title unlocks the hidden staff group
-                  // (session-only) — same idiom as Option-click on the Updates header.
-                  onTitleClick={(event) => {
-                    if (event.altKey) {
-                      setHiddenExperimentalUnlocked((previous) => !previous)
-                    }
-                  }}
-                >
-                  {isSectionMounted('experimental') ? (
-                    <ExperimentalPane
-                      settings={settings}
-                      updateSettings={updateSettings}
-                      hiddenExperimentalUnlocked={hiddenExperimentalUnlocked}
-                    />
-                  ) : null}
-                </SettingsSection>
-
-                {showDesktopOnlySettings ? (
-                  <PluginsSettingsSection
-                    mounted={isSectionMounted('plugins')}
-                    settings={settings}
-                    updateSettings={updateSettingsOrThrow}
-                  />
-                ) : null}
-
-                {settingsProjectList.map((settingsProject) => {
-                  const repoSectionId = `repo-${settingsProject.representativeRepoId}`
-                  // Why: use the switcher-selected host's repo so identity/host-specific edits follow "Available Hosts".
-                  const repo = getSettingsProjectHostRepo(
-                    settingsProject,
-                    repos,
-                    settingsProjectHostSelection[settingsProject.projectId],
-                    settingsProjectSetupSelection[settingsProject.projectId]
-                  )
-                  if (!repo) {
-                    return null
-                  }
-                  const repoHostIdentity = getRepoHostIdentity(repo)
-                  const repoHooksState = repoHooksMap[repoHostIdentity]
-                  const project = projectByRepoId.get(repo.id) ?? settingsProject.project
-
-                  return (
-                    <SettingsSection
-                      key={repoSectionId}
-                      id={repoSectionId}
-                      title={translate(
-                        'auto.components.settings.Settings.3bf149e873',
-                        'Project Settings > {{value0}}',
-                        { value0: project.displayName }
-                      )}
-                      description={repo.path}
-                      searchEntries={getSectionSearchEntries(repoSectionId)}
-                    >
-                      {isSectionMounted(repoSectionId) ? (
-                        // Why: re-key per host so same-id hosts don't reuse the prior host's drafts/effects.
-                        <RepositoryPane
-                          key={repoHostIdentity}
-                          repo={repo}
-                          yamlHooks={repoHooksState?.hooks ?? null}
-                          hasHooksFile={repoHooksState?.hasHooks ?? false}
-                          hooksInspectionReady={Boolean(repoHooksState)}
-                          mayNeedUpdate={repoHooksState?.mayNeedUpdate ?? false}
-                          updateRepo={updateRepo}
-                          removeProject={() => void removeProjectAllHosts(settingsProject.setups)}
-                          project={project}
-                          selectedProjectSetupId={
-                            settingsProjectSetupSelection[settingsProject.projectId]
-                          }
-                          isLocalWindowsProject={
-                            getRepoExecutionHostId(repo) === LOCAL_EXECUTION_HOST_ID &&
-                            isWindowsTerminalHost
-                          }
-                          wslAvailable={windowsTerminalCapabilities.wslAvailable}
-                          wslDistros={windowsTerminalCapabilities.wslDistros}
-                          wslCapabilitiesLoading={windowsTerminalCapabilities.isLoading}
-                          updateProject={updateProject}
-                        />
-                      ) : null}
-                    </SettingsSection>
-                  )
-                })}
-              </ActiveSettingsSectionProvider>
-            )}
-          </div>
-        </div>
-      </div>
-    </div>
-  )
+  return renderSettingsPage(context)
 }
 
 export default Settings
diff --git a/src/renderer/src/components/settings/accounts-pane-account-actions.ts b/src/renderer/src/components/settings/accounts-pane-account-actions.ts
new file mode 100644
index 00000000000..09be1ce001b
--- /dev/null
+++ b/src/renderer/src/components/settings/accounts-pane-account-actions.ts
@@ -0,0 +1,211 @@
+import type { Dispatch, SetStateAction } from 'react'
+import type { GlobalSettings } from '../../../../shared/global-settings-types'
+import type { FeatureInteractionId } from '../../../../shared/feature-interaction-catalog'
+import type {
+  ClaudeRateLimitAccountsState,
+  CodexRateLimitAccountsState
+} from '../../../../shared/managed-account-types'
+import { toast } from 'sonner'
+import { translate } from '@/i18n/i18n'
+import {
+  markLiveCodexSessionsForRestart,
+  resolveCodexRestartPromptAccountLabel
+} from '@/lib/codex-session-restart'
+import {
+  getProviderAccountActiveIdForView,
+  getProviderAccountRuntime
+} from './provider-account-visibility'
+import type {
+  ClaudeAccountAction,
+  ClaudeAccountActionRunner,
+  CodexAccountAction,
+  CodexAccountActionRunner,
+  LocalAccountRuntime
+} from './accounts-pane-types'
+import {
+  getClaudeAccountErrorDescription,
+  getCodexAccountErrorDescription,
+  isClaudeAccountCancellation
+} from './accounts-pane-action-errors'
+import { getClaudeAccountLabel } from './accounts-pane-runtime'
+
+type CodexActionContext = {
+  settings: GlobalSettings
+  accountRuntime: LocalAccountRuntime
+  isRemoteAccountScope: boolean
+  codexAccounts: CodexRateLimitAccountsState
+  setCodexAccounts: Dispatch<SetStateAction<CodexRateLimitAccountsState>>
+  setCodexAccountsLoaded: Dispatch<SetStateAction<boolean>>
+  setCodexAction: Dispatch<SetStateAction<CodexAccountAction>>
+  fetchSettings: () => Promise<void>
+  recordFeatureInteraction: (featureId: FeatureInteractionId) => void
+}
+
+export function createCodexAccountActionRunner(
+  context: CodexActionContext
+): CodexAccountActionRunner {
+  const {
+    accountRuntime,
+    codexAccounts,
+    fetchSettings,
+    isRemoteAccountScope,
+    recordFeatureInteraction,
+    setCodexAccounts,
+    setCodexAccountsLoaded,
+    setCodexAction
+  } = context
+  const syncCodexAccounts = async (next: CodexRateLimitAccountsState): Promise<void> => {
+    setCodexAccounts(next)
+    setCodexAccountsLoaded(true)
+    // Why: remote mutations never change local GlobalSettings account fields.
+    if (!isRemoteAccountScope) {
+      await fetchSettings()
+    }
+  }
+
+  // Why: remote Windows flattens host and WSL rows, so mutation follow-up must
+  // compare the selected row's runtime slot instead of the forced host view.
+  return async (action, operation, actionRuntime = accountRuntime): Promise<void> => {
+    const previousActiveAccountId = getProviderAccountActiveIdForView(codexAccounts, actionRuntime)
+    setCodexAction(action)
+    try {
+      const next = await operation()
+      await syncCodexAccounts(next)
+      recordFeatureInteraction('codex-account-switching')
+      const nextActiveAccountId = getProviderAccountActiveIdForView(next, actionRuntime)
+      const shouldPromptRestart =
+        action === 'adding' ||
+        (action.startsWith('select:') && previousActiveAccountId !== nextActiveAccountId) ||
+        (action.startsWith('reauth:') &&
+          nextActiveAccountId !== null &&
+          action === `reauth:${nextActiveAccountId}`) ||
+        (action.startsWith('remove:') && previousActiveAccountId !== nextActiveAccountId)
+      if (shouldPromptRestart) {
+        // Why: `add` creates the managed home against the machine's own distro,
+        // so the slot it wrote is the created account's — not this row's, which
+        // may still say "WSL default". Found by diffing the roster rather than
+        // by the row's active id, which resolves to null once two distro slots
+        // are filled and would send the notice to the wrong lane.
+        const newAccounts =
+          action === 'adding'
+            ? next.accounts.filter(
+                (account) => !codexAccounts.accounts.some((prior) => prior.id === account.id)
+              )
+            : []
+        // Why exactly one: an unloaded prior roster makes every account look new,
+        // and picking one of those would aim the notice at an unrelated lane.
+        // Falling back to the row is the pre-existing behaviour, not a new risk.
+        const addedAccount = newAccounts.length === 1 ? newAccounts[0] : undefined
+        void markLiveCodexSessionsForRestart({
+          previousAccountLabel: resolveCodexRestartPromptAccountLabel(
+            codexAccounts.accounts,
+            previousActiveAccountId
+          ),
+          nextAccountLabel: resolveCodexRestartPromptAccountLabel(
+            next.accounts,
+            nextActiveAccountId
+          ),
+          // Why: two accounts can share an email, so the labels alone cannot
+          // tell the store whether this switch lands back on the launch account.
+          previousAccountId: previousActiveAccountId ?? null,
+          nextAccountId: nextActiveAccountId ?? null,
+          // Why: the mutation wrote this row's slot only, so panes on any other
+          // lane still launch under the account they already had.
+          target: addedAccount ? getProviderAccountRuntime(addedAccount) : actionRuntime,
+          // Why: clearing a distro-less WSL row nulls every distro slot at once.
+          clearsEveryWslDistro: action === 'select:system'
+        })
+      }
+    } catch (error) {
+      toast.error(
+        translate(
+          'auto.components.settings.AccountsPane.5bf8764953',
+          'Codex account update failed.'
+        ),
+        {
+          description: getCodexAccountErrorDescription(error)
+        }
+      )
+    } finally {
+      setCodexAction('idle')
+    }
+  }
+}
+
+type ClaudeActionContext = {
+  settings: GlobalSettings
+  accountRuntime: LocalAccountRuntime
+  isRemoteAccountScope: boolean
+  claudeAccounts: ClaudeRateLimitAccountsState
+  setClaudeAccounts: Dispatch<SetStateAction<ClaudeRateLimitAccountsState>>
+  setClaudeAction: Dispatch<SetStateAction<ClaudeAccountAction>>
+  fetchSettings: () => Promise<void>
+  recordFeatureInteraction: (featureId: FeatureInteractionId) => void
+}
+
+export function createClaudeAccountActionRunner(
+  context: ClaudeActionContext
+): ClaudeAccountActionRunner {
+  const {
+    accountRuntime,
+    claudeAccounts,
+    fetchSettings,
+    isRemoteAccountScope,
+    recordFeatureInteraction,
+    setClaudeAccounts,
+    setClaudeAction
+  } = context
+  const syncClaudeAccounts = async (next: ClaudeRateLimitAccountsState): Promise<void> => {
+    setClaudeAccounts(next)
+    if (!isRemoteAccountScope) {
+      await fetchSettings()
+    }
+  }
+
+  return async (action, operation, actionRuntime = accountRuntime): Promise<void> => {
+    const previousActiveAccountId = getProviderAccountActiveIdForView(claudeAccounts, actionRuntime)
+    setClaudeAction(action)
+    try {
+      const next = await operation()
+      await syncClaudeAccounts(next)
+      recordFeatureInteraction('claude-account-switching')
+      const nextActiveAccountId = getProviderAccountActiveIdForView(next, actionRuntime)
+      const shouldPromptRestart =
+        action === 'adding' ||
+        previousActiveAccountId !== nextActiveAccountId ||
+        (action.startsWith('reauth:') &&
+          nextActiveAccountId !== null &&
+          action === `reauth:${nextActiveAccountId}`)
+      if (shouldPromptRestart) {
+        toast.info(
+          translate('auto.components.settings.AccountsPane.f921d32606', 'Claude account updated.'),
+          {
+            description: translate(
+              'auto.components.settings.AccountsPane.b15ce90870',
+              '{{value0}} -> {{value1}}. Restart live Claude terminals before continuing old sessions.',
+              {
+                value0: getClaudeAccountLabel(claudeAccounts, previousActiveAccountId),
+                value1: getClaudeAccountLabel(next, nextActiveAccountId)
+              }
+            )
+          }
+        )
+      }
+    } catch (error) {
+      if (isClaudeAccountCancellation(error)) {
+        return
+      }
+      toast.error(
+        translate(
+          'auto.components.settings.AccountsPane.2743cdc0af',
+          'Claude account update failed.'
+        ),
+        {
+          description: getClaudeAccountErrorDescription(error)
+        }
+      )
+    } finally {
+      setClaudeAction('idle')
+    }
+  }
+}
diff --git a/src/renderer/src/components/settings/accounts-pane-action-errors.ts b/src/renderer/src/components/settings/accounts-pane-action-errors.ts
new file mode 100644
index 00000000000..c289e59d7df
--- /dev/null
+++ b/src/renderer/src/components/settings/accounts-pane-action-errors.ts
@@ -0,0 +1,47 @@
+export function getCodexAccountErrorDescription(error: unknown): string {
+  const message = String((error as Error)?.message ?? error)
+    .replace(/^Error occurred in handler for 'codexAccounts:[^']+':\s*/i, '')
+    .replace(/^Error invoking remote method 'codexAccounts:[^']+':\s*/i, '')
+    .replace(/^Error:\s*/i, '')
+    .trim()
+  const normalizedMessage = message.toLowerCase()
+
+  // Why: Codex account actions cross the Electron IPC boundary, and invoke()
+  // failures often include transport-level wrapper text that is useful in
+  // devtools but noisy in product UI. Normalize the handful of expected auth
+  // failures here so users see actionable sign-in guidance instead of IPC
+  // internals or raw upstream wording.
+  if (normalizedMessage.includes('timed out waiting for codex login to finish')) {
+    return 'Codex sign-in took too long to finish. Please try again.'
+  }
+  if (normalizedMessage.includes('codex sign-in took too long to finish')) {
+    return 'Codex sign-in took too long to finish. Please try again.'
+  }
+  if (
+    normalizedMessage.includes('auth error 502') ||
+    normalizedMessage.includes('gateway') ||
+    normalizedMessage.includes('bad gateway')
+  ) {
+    return 'Codex sign-in is temporarily unavailable. Please try again in a minute.'
+  }
+  if (normalizedMessage.startsWith('codex login failed:')) {
+    const loginMessage = message.slice('Codex login failed:'.length).trim()
+    return loginMessage || 'Codex sign-in failed. Please try again.'
+  }
+
+  return message || 'Codex sign-in failed. Please try again.'
+}
+
+export function getClaudeAccountErrorDescription(error: unknown): string {
+  return (
+    String((error as Error)?.message ?? error)
+      .replace(/^Error occurred in handler for 'claudeAccounts:[^']+':\s*/i, '')
+      .replace(/^Error invoking remote method 'claudeAccounts:[^']+':\s*/i, '')
+      .replace(/^Error:\s*/i, '')
+      .trim() || 'Claude sign-in failed. Please try again.'
+  )
+}
+
+export function isClaudeAccountCancellation(error: unknown): boolean {
+  return getClaudeAccountErrorDescription(error).toLowerCase() === 'claude sign-in was cancelled.'
+}
diff --git a/src/renderer/src/components/settings/accounts-pane-claude-section.tsx b/src/renderer/src/components/settings/accounts-pane-claude-section.tsx
new file mode 100644
index 00000000000..e99758f0db5
--- /dev/null
+++ b/src/renderer/src/components/settings/accounts-pane-claude-section.tsx
@@ -0,0 +1,294 @@
+import { Loader2, Plus, RefreshCw, Trash2, X } from 'lucide-react'
+import { translate } from '@/i18n/i18n'
+import { selectClaudeProviderAccount } from '@/runtime/runtime-provider-accounts-client'
+import { Badge } from '../ui/badge'
+import { Button } from '../ui/button'
+import { Label } from '../ui/label'
+import { ClaudeIcon } from '../status-bar/icons'
+import { SearchableSetting } from './SearchableSetting'
+import {
+  getProviderAccountRuntime,
+  providerAccountIsActiveInView
+} from './provider-account-visibility'
+import { formatAccountTimestamp, getClaudeAccountRuntimeLabel } from './accounts-pane-runtime'
+import type { AccountsPaneSectionModel } from './accounts-pane-types'
+
+export function renderClaudeAccountsSection(model: AccountsPaneSectionModel): React.JSX.Element {
+  const {
+    accountRuntime,
+    accountRuntimeSentenceLabel,
+    accountRuntimeUnavailable,
+    accountVisibilityOptions,
+    claudeAccounts,
+    claudeAction,
+    isRemoteAccountScope,
+    remoteAccountScopeNotice,
+    runClaudeAccountAction,
+    setRemoveClaudeTarget,
+    settings,
+    systemClaudeActive,
+    visibleClaudeAccounts,
+    wslCapabilitiesLoading
+  } = model
+  return (
+    <section key="claude-accounts" id="accounts-claude" className="space-y-4 scroll-mt-6">
+      <div className="space-y-1">
+        <h3 className="flex items-center gap-2 text-sm font-semibold">
+          <ClaudeIcon size={16} />
+          {translate('auto.components.settings.AccountsPane.26ef4b55be', 'Claude')}
+        </h3>
+        <p className="text-xs text-muted-foreground">
+          {translate(
+            'auto.components.settings.AccountsPane.72b36ea174',
+            'Optional. Orca can use your normal Claude login; add accounts only if you want quick switching without moving chat sessions.'
+          )}
+        </p>
+      </div>
+
+      <SearchableSetting
+        title={translate('auto.components.settings.AccountsPane.8bbfd74556', 'Claude Accounts')}
+        description={translate(
+          'auto.components.settings.AccountsPane.79e484c3b2',
+          'Optional account switcher for the shared Claude auth files.'
+        )}
+        keywords={['claude', 'account', 'rate limit', 'status bar', 'quota']}
+        className="space-y-3 py-2"
+      >
+        <div className="flex items-center justify-between gap-3">
+          <div className="space-y-0.5">
+            <Label>
+              {translate('auto.components.settings.AccountsPane.94d351af4a', 'Accounts')}
+            </Label>
+            <p className="text-xs text-muted-foreground">
+              {isRemoteAccountScope
+                ? translate(
+                    'auto.components.settings.AccountsPane.remoteScopeAccounts',
+                    'Showing accounts managed by {{value0}}. Add or re-authenticate accounts on that server.',
+                    { value0: accountRuntimeSentenceLabel }
+                  )
+                : translate(
+                    'auto.components.settings.AccountsPane.c0a52abfc5',
+                    'Showing accounts for {{value0}}. New accounts are added there.',
+                    { value0: accountRuntimeSentenceLabel }
+                  )}
+            </p>
+          </div>
+          <div className="flex shrink-0 items-center gap-1.5">
+            <Button
+              variant="outline"
+              size="xs"
+              onClick={() =>
+                void runClaudeAccountAction('adding', () =>
+                  window.api.claudeAccounts.add({
+                    runtime: accountRuntime.runtime,
+                    wslDistro: accountRuntime.wslDistro
+                  })
+                )
+              }
+              disabled={
+                // Why: interactive `claude login` needs a desktop browser and
+                // would authenticate against this device, not the server.
+                isRemoteAccountScope ||
+                claudeAction !== 'idle' ||
+                wslCapabilitiesLoading ||
+                accountRuntimeUnavailable
+              }
+              className="gap-1.5"
+            >
+              {claudeAction === 'adding' ? (
+                <Loader2 className="size-3 animate-spin" />
+              ) : (
+                <Plus className="size-3" />
+              )}
+              {translate('auto.components.settings.AccountsPane.b0e948a4f9', 'Add Account')}
+            </Button>
+            {claudeAction === 'adding' ? (
+              <Button
+                variant="ghost"
+                size="xs"
+                onClick={() => void window.api.claudeAccounts.cancelPendingLogin()}
+                className="gap-1.5 text-muted-foreground hover:text-foreground"
+              >
+                <X className="size-3" />
+                {translate('auto.components.settings.AccountsPane.dbb9626ed1', 'Cancel')}
+              </Button>
+            ) : null}
+          </div>
+        </div>
+        {remoteAccountScopeNotice}
+
+        <div className="space-y-2">
+          <button
+            type="button"
+            onClick={() =>
+              void runClaudeAccountAction('select:system', () =>
+                selectClaudeProviderAccount(settings, {
+                  accountId: null,
+                  runtime: accountRuntime.runtime,
+                  wslDistro: accountRuntime.wslDistro
+                })
+              )
+            }
+            disabled={claudeAction !== 'idle' || accountRuntimeUnavailable}
+            className={`flex w-full items-center justify-between gap-3 rounded-md border px-3 py-2.5 text-left transition-colors ${
+              systemClaudeActive
+                ? 'border-foreground/20 bg-accent/15'
+                : 'border-border/70 hover:border-border hover:bg-accent/8'
+            } disabled:cursor-default disabled:opacity-100`}
+          >
+            <div className="flex min-w-0 flex-1 flex-col gap-0.5">
+              <div className="flex min-w-0 items-center gap-2">
+                <span className="truncate text-sm font-medium">
+                  {translate('auto.components.settings.AccountsPane.f2a265f8c7', 'System default')}
+                </span>
+                {systemClaudeActive ? (
+                  <Badge
+                    variant="outline"
+                    className="h-4 shrink-0 rounded px-1.5 text-[10px] font-medium leading-none text-foreground/80"
+                  >
+                    {translate('auto.components.settings.AccountsPane.e74831fb6b', 'Active')}
+                  </Badge>
+                ) : null}
+              </div>
+              <span className="truncate text-[11px] text-muted-foreground">
+                {translate(
+                  'auto.components.settings.AccountsPane.e05d0ff737',
+                  'Use your current {{value0}} Claude login.',
+                  { value0: accountRuntimeSentenceLabel }
+                )}
+              </span>
+            </div>
+          </button>
+          {visibleClaudeAccounts.length === 0 ? (
+            <div className="rounded-md border border-dashed border-border/70 px-3 py-4 text-xs text-muted-foreground">
+              {isRemoteAccountScope
+                ? translate(
+                    'auto.components.settings.AccountsPane.remoteEmptyClaudeAccounts',
+                    'No managed Claude accounts on {{value0}}. It uses its system default Claude login; add accounts on that server.',
+                    { value0: accountRuntimeSentenceLabel }
+                  )
+                : translate(
+                    'auto.components.settings.AccountsPane.3fe7862418',
+                    "No managed Claude accounts for {{value0}}. Orca will use that environment's system default Claude login until you add one here.",
+                    { value0: accountRuntimeSentenceLabel }
+                  )}
+            </div>
+          ) : (
+            visibleClaudeAccounts.map((account) => {
+              const isActive = providerAccountIsActiveInView(
+                account,
+                claudeAccounts,
+                accountRuntime,
+                accountVisibilityOptions
+              )
+              const isReauthing = claudeAction === `reauth:${account.id}`
+              const isBusy = claudeAction !== 'idle' || accountRuntimeUnavailable
+
+              return (
+                <div
+                  key={account.id}
+                  className={`flex w-full items-center justify-between gap-3 rounded-md border px-3 py-2.5 text-left transition-colors ${
+                    isActive
+                      ? 'border-foreground/20 bg-accent/15'
+                      : 'border-border/70 hover:border-border hover:bg-accent/8'
+                  }`}
+                >
+                  <div className="flex w-full items-center justify-between gap-3 max-md:flex-col max-md:items-start">
+                    <button
+                      type="button"
+                      onClick={() => {
+                        const accountRuntimeView = getProviderAccountRuntime(account)
+                        void runClaudeAccountAction(
+                          `select:${account.id}`,
+                          () =>
+                            selectClaudeProviderAccount(settings, {
+                              accountId: account.id,
+                              ...accountRuntimeView
+                            }),
+                          accountRuntimeView
+                        )
+                      }}
+                      disabled={isBusy}
+                      className="flex min-w-0 flex-1 flex-col gap-0.5 text-left disabled:cursor-default"
+                    >
+                      <div className="flex min-w-0 items-center gap-2">
+                        <span className="truncate text-sm font-medium">{account.email}</span>
+                        <Badge
+                          variant="outline"
+                          className="h-4 shrink-0 rounded px-1.5 text-[10px] font-medium leading-none text-foreground/70"
+                        >
+                          {getClaudeAccountRuntimeLabel(account, accountRuntime.label)}
+                        </Badge>
+                        {isActive ? (
+                          <Badge
+                            variant="outline"
+                            className="h-4 shrink-0 rounded px-1.5 text-[10px] font-medium leading-none text-foreground/80"
+                          >
+                            {translate(
+                              'auto.components.settings.AccountsPane.e74831fb6b',
+                              'Active'
+                            )}
+                          </Badge>
+                        ) : null}
+                      </div>
+                      <span className="truncate text-[11px] text-muted-foreground">
+                        {account.organizationName
+                          ? `${account.organizationName} · ${formatAccountTimestamp(account.lastAuthenticatedAt)}`
+                          : formatAccountTimestamp(account.lastAuthenticatedAt)}
+                      </span>
+                    </button>
+                    <div className="flex shrink-0 items-center justify-end gap-1 max-md:w-full max-md:flex-wrap">
+                      <Button
+                        variant="ghost"
+                        size="xs"
+                        onClick={(event) => {
+                          event.stopPropagation()
+                          void runClaudeAccountAction(
+                            `reauth:${account.id}`,
+                            () =>
+                              window.api.claudeAccounts.reauthenticate({
+                                accountId: account.id
+                              }),
+                            getProviderAccountRuntime(account)
+                          )
+                        }}
+                        disabled={isRemoteAccountScope || isBusy}
+                        className="h-6 px-2 text-muted-foreground hover:text-foreground"
+                      >
+                        {isReauthing ? (
+                          <Loader2 className="size-3 animate-spin" />
+                        ) : (
+                          <RefreshCw className="size-3" />
+                        )}
+                        {translate(
+                          'auto.components.settings.AccountsPane.8a0f870153',
+                          'Re-authenticate'
+                        )}
+                      </Button>
+                      <Button
+                        variant="ghost"
+                        size="xs"
+                        onClick={(event) => {
+                          event.stopPropagation()
+                          setRemoveClaudeTarget({
+                            id: account.id,
+                            runtime: getProviderAccountRuntime(account)
+                          })
+                        }}
+                        disabled={isBusy}
+                        className="h-6 px-2 text-muted-foreground hover:text-destructive"
+                      >
+                        <Trash2 className="size-3" />
+                        {translate('auto.components.settings.AccountsPane.db209ee572', 'Remove')}
+                      </Button>
+                    </div>
+                  </div>
+                </div>
+              )
+            })
+          )}
+        </div>
+      </SearchableSetting>
+    </section>
+  )
+}
diff --git a/src/renderer/src/components/settings/accounts-pane-codex-account-row.tsx b/src/renderer/src/components/settings/accounts-pane-codex-account-row.tsx
new file mode 100644
index 00000000000..21bef8fb17c
--- /dev/null
+++ b/src/renderer/src/components/settings/accounts-pane-codex-account-row.tsx
@@ -0,0 +1,183 @@
+import { Loader2, RefreshCw, Trash2 } from 'lucide-react'
+import type { CodexRateLimitAccountsState } from '../../../../shared/managed-account-types'
+import { translate } from '@/i18n/i18n'
+import { selectCodexProviderAccount } from '@/runtime/runtime-provider-accounts-client'
+import { Badge } from '../ui/badge'
+import { Button } from '../ui/button'
+import { getCodexAccountAuthWarning } from './codex-account-auth-warning'
+import {
+  getProviderAccountRuntime,
+  providerAccountIsActiveInView
+} from './provider-account-visibility'
+import { formatAccountTimestamp, getCodexAccountRuntimeLabel } from './accounts-pane-runtime'
+import type { AccountsPaneSectionModel } from './accounts-pane-types'
+
+export function renderCodexAccountRow(
+  account: CodexRateLimitAccountsState['accounts'][number],
+  model: AccountsPaneSectionModel
+): React.JSX.Element {
+  const {
+    accountRuntime,
+    accountRuntimeUnavailable,
+    accountVisibilityOptions,
+    activeCodexAccountId,
+    codexAccounts,
+    codexAction,
+    codexRateLimits,
+    codexRateLimitTarget,
+    isRemoteAccountScope,
+    runCodexAccountAction,
+    setRemoveCodexTarget,
+    settings
+  } = model
+  const isActive = providerAccountIsActiveInView(
+    account,
+    codexAccounts,
+    accountRuntime,
+    accountVisibilityOptions
+  )
+  // Why: same remote gate as the section-level warning — the
+  // desktop's rate-limit poll says nothing about server accounts.
+  const accountAuthWarning = isRemoteAccountScope
+    ? null
+    : getCodexAccountAuthWarning({
+        limits: codexRateLimits,
+        target: codexRateLimitTarget,
+        runtime: accountRuntime,
+        activeAccountId: activeCodexAccountId,
+        accountId: account.id
+      })
+  const needsReauthentication = Boolean(accountAuthWarning)
+  const isReauthing = codexAction === `reauth:${account.id}`
+  const isRemoving = codexAction === `remove:${account.id}`
+  const isBusy = codexAction !== 'idle' || accountRuntimeUnavailable
+
+  return (
+    <div
+      key={account.id}
+      className={`flex w-full items-center justify-between gap-3 rounded-md border px-3 py-2.5 text-left transition-colors ${
+        needsReauthentication
+          ? 'border-destructive/50 bg-destructive/5'
+          : isActive
+            ? 'border-foreground/20 bg-accent/15'
+            : 'border-border/70 hover:border-border hover:bg-accent/8'
+      }`}
+    >
+      <div className="flex w-full items-center justify-between gap-3 max-md:flex-col max-md:items-start">
+        <button
+          type="button"
+          onClick={() => {
+            const accountRuntimeView = getProviderAccountRuntime(account)
+            void runCodexAccountAction(
+              `select:${account.id}`,
+              () =>
+                selectCodexProviderAccount(settings, {
+                  accountId: account.id,
+                  ...accountRuntimeView
+                }),
+              accountRuntimeView
+            )
+          }}
+          disabled={isBusy}
+          className="flex min-w-0 flex-1 flex-col gap-0.5 text-left disabled:cursor-default"
+        >
+          <div className="flex min-w-0 items-center gap-2">
+            <span className="truncate text-sm font-medium">{account.email}</span>
+            <Badge
+              variant="outline"
+              className="h-4 shrink-0 rounded px-1.5 text-[10px] font-medium leading-none text-foreground/70"
+            >
+              {getCodexAccountRuntimeLabel(account, accountRuntime.label)}
+            </Badge>
+            {isActive ? (
+              <Badge
+                variant="outline"
+                className="h-4 shrink-0 rounded px-1.5 text-[10px] font-medium leading-none text-foreground/80"
+              >
+                {translate('auto.components.settings.AccountsPane.e74831fb6b', 'Active')}
+              </Badge>
+            ) : null}
+            {needsReauthentication ? (
+              <Badge
+                variant="destructive"
+                className="h-4 shrink-0 rounded px-1.5 text-[10px] font-medium leading-none"
+              >
+                {translate('auto.components.settings.AccountsPane.589eba1eee', 'Needs re-auth')}
+              </Badge>
+            ) : null}
+          </div>
+          <div
+            className={`flex min-w-0 items-center gap-1.5 text-[11px] max-sm:flex-wrap ${
+              needsReauthentication ? 'text-destructive' : 'text-muted-foreground'
+            }`}
+          >
+            {needsReauthentication ? (
+              <span className="truncate">
+                {translate(
+                  'auto.components.settings.AccountsPane.3d245ef7d9',
+                  'Codex reported this sign-in is out of date'
+                )}
+              </span>
+            ) : account.workspaceLabel ? (
+              <span className="truncate">{account.workspaceLabel}</span>
+            ) : null}
+            {needsReauthentication || account.workspaceLabel ? (
+              <span className="shrink-0 opacity-50">•</span>
+            ) : null}
+            <span className="shrink-0">{formatAccountTimestamp(account.lastAuthenticatedAt)}</span>
+          </div>
+        </button>
+
+        <div className="flex shrink-0 items-center justify-end gap-1 max-md:w-full max-md:flex-wrap">
+          {/* Why: selecting an account is the primary action in this row.
+          Keeping maintenance actions visually lighter prevents re-auth/remove
+          controls from overpowering the selection affordance in a dense list. */}
+          <Button
+            variant="ghost"
+            size="xs"
+            onClick={(event) => {
+              event.stopPropagation()
+              void runCodexAccountAction(
+                `reauth:${account.id}`,
+                () =>
+                  window.api.codexAccounts.reauthenticate({
+                    accountId: account.id
+                  }),
+                getProviderAccountRuntime(account)
+              )
+            }}
+            disabled={isRemoteAccountScope || isBusy}
+            className="h-6 px-2 text-muted-foreground hover:text-foreground"
+          >
+            {isReauthing ? (
+              <Loader2 className="size-3 animate-spin" />
+            ) : (
+              <RefreshCw className="size-3" />
+            )}
+            {translate('auto.components.settings.AccountsPane.8a0f870153', 'Re-authenticate')}
+          </Button>
+          <Button
+            variant="ghost"
+            size="xs"
+            onClick={(event) => {
+              event.stopPropagation()
+              setRemoveCodexTarget({
+                id: account.id,
+                runtime: getProviderAccountRuntime(account)
+              })
+            }}
+            disabled={isBusy}
+            className="h-6 px-2 text-muted-foreground hover:text-destructive"
+          >
+            {isRemoving ? (
+              <Loader2 className="size-3 animate-spin" />
+            ) : (
+              <Trash2 className="size-3" />
+            )}
+            {translate('auto.components.settings.AccountsPane.db209ee572', 'Remove')}
+          </Button>
+        </div>
+      </div>
+    </div>
+  )
+}
diff --git a/src/renderer/src/components/settings/accounts-pane-codex-section.tsx b/src/renderer/src/components/settings/accounts-pane-codex-section.tsx
new file mode 100644
index 00000000000..61d27ce49e0
--- /dev/null
+++ b/src/renderer/src/components/settings/accounts-pane-codex-section.tsx
@@ -0,0 +1,271 @@
+import { AlertTriangle, Loader2, Plus } from 'lucide-react'
+import { translate } from '@/i18n/i18n'
+import { selectCodexProviderAccount } from '@/runtime/runtime-provider-accounts-client'
+import { Badge } from '../ui/badge'
+import { Button } from '../ui/button'
+import { Label } from '../ui/label'
+import { OpenAIIcon } from '../status-bar/icons'
+import { SearchableSetting } from './SearchableSetting'
+import { getAccountsCodexSearchEntries } from './accounts-search'
+import { getCodexSystemDefaultSubtitle } from './accounts-pane-runtime'
+import type { AccountsPaneSectionModel } from './accounts-pane-types'
+import { renderCodexAccountRow } from './accounts-pane-codex-account-row'
+
+export function renderCodexAccountsSection(model: AccountsPaneSectionModel): React.JSX.Element {
+  const {
+    accountRuntime,
+    accountRuntimeSentenceLabel,
+    accountRuntimeUnavailable,
+    activeCodexAccountId,
+    activeCodexAuthWarning,
+    codexAction,
+    codexConfigSync,
+    codexConfigSyncWarning,
+    isRemoteAccountScope,
+    remoteAccountScopeNotice,
+    runCodexAccountAction,
+    settings,
+    systemCodexActive,
+    systemCodexIdentity,
+    systemCodexMissingSignIn,
+    systemCodexNeedsSignIn,
+    visibleCodexAccounts,
+    wslCapabilitiesLoading
+  } = model
+  return (
+    <section key="codex-accounts" id="accounts-codex" className="space-y-4 scroll-mt-6">
+      <div className="space-y-1">
+        <h3 className="flex items-center gap-2 text-sm font-semibold">
+          <OpenAIIcon size={16} />
+          {translate('auto.components.settings.AccountsPane.ef91cfa06b', 'Codex')}
+        </h3>
+        <p className="text-xs text-muted-foreground">
+          {translate(
+            'auto.components.settings.AccountsPane.cedfab35ab',
+            'Optional. Orca can use your normal Codex login; add accounts only if you want quick switching in Orca.'
+          )}
+        </p>
+        <p className="text-xs text-muted-foreground">
+          {isRemoteAccountScope
+            ? translate(
+                'auto.components.settings.AccountsPane.remoteScopeAuthContext',
+                'Each account keeps its own sign-in context on {{value0}}.',
+                { value0: accountRuntimeSentenceLabel }
+              )
+            : translate(
+                'auto.components.settings.AccountsPane.340d6f7a85',
+                'Each account keeps its own local sign-in context in Orca. Account auth stays on this device.'
+              )}
+        </p>
+      </div>
+
+      <SearchableSetting
+        title={translate('auto.components.settings.AccountsPane.3180536c7a', 'Codex Accounts')}
+        description={translate(
+          'auto.components.settings.AccountsPane.d0d53b7eb0',
+          'Manage which Codex account Orca uses for live rate limit fetching.'
+        )}
+        // Why: this single SearchableSetting backs the whole Codex section,
+        // including the "Active Codex Account" sub-control (account picker
+        // below). Roll every Codex search entry's title/description/keywords
+        // into one haystack so a search for "Active Codex Account" doesn't
+        // render the section header with no body underneath it.
+        keywords={getAccountsCodexSearchEntries().flatMap((entry) => [
+          entry.title,
+          entry.description ?? '',
+          ...(entry.keywords ?? [])
+        ])}
+        className="space-y-3 py-2"
+      >
+        {/* Why: Settings deep-links can target this subsection directly from
+        the status-bar account switcher. Keeping a stable DOM anchor here
+        avoids dumping the user at the top of Accounts and making them hunt
+        for the actual Codex account controls. */}
+        {activeCodexAuthWarning ? (
+          <div className="flex items-start gap-2 rounded-md border border-destructive/40 bg-destructive/5 px-3 py-2 text-xs text-destructive">
+            <AlertTriangle className="mt-0.5 size-3.5 shrink-0" />
+            <span>
+              {systemCodexMissingSignIn
+                ? translate(
+                    'auto.components.settings.AccountsPane.codexSystemDefaultNeedsSignIn',
+                    'No Codex sign-in was found for {{value0}}.',
+                    { value0: accountRuntimeSentenceLabel }
+                  )
+                : activeCodexAccountId
+                  ? translate(
+                      'auto.components.settings.AccountsPane.75ca9b718e',
+                      'Codex reported that the active account needs a fresh sign-in. Re-authenticate it before starting new Codex sessions.'
+                    )
+                  : translate(
+                      'auto.components.settings.AccountsPane.e4a28e8894',
+                      'Codex reported that the {{value0}} login needs a fresh sign-in. Sign in again before starting new Codex sessions.',
+                      { value0: accountRuntimeSentenceLabel }
+                    )}
+            </span>
+          </div>
+        ) : null}
+        {codexConfigSyncWarning ? (
+          <div className="flex items-start gap-2 rounded-md border border-destructive/40 bg-destructive/5 px-3 py-2 text-xs text-destructive">
+            <AlertTriangle className="mt-0.5 size-3.5 shrink-0" />
+            <span>
+              {codexConfigSyncWarning === 'managed-home-unavailable'
+                ? translate(
+                    'auto.components.settings.AccountsPane.codexConfigSyncManagedHomeUnavailable',
+                    'Orca could not read this account’s Codex files just now, so settings may not be syncing. This usually clears on its own — antivirus or a backup tool briefly locks them.'
+                  )
+                : codexConfigSyncWarning === 'missing-source'
+                  ? translate(
+                      'auto.components.settings.AccountsPane.codexConfigSyncMissingSource',
+                      'Codex is still using the settings it last synced because {{value0}} is missing. Restore that file to resume syncing.',
+                      { value0: codexConfigSync?.systemConfigPath ?? '' }
+                    )
+                  : codexConfigSyncWarning === 'blank-source'
+                    ? translate(
+                        'auto.components.settings.AccountsPane.codexConfigSyncBlankSource',
+                        'Codex is still using the settings it last synced because {{value0}} is empty. That is expected while a synced folder finishes downloading.',
+                        { value0: codexConfigSync?.systemConfigPath ?? '' }
+                      )
+                    : translate(
+                        'auto.components.settings.AccountsPane.codexConfigSyncUnreadableSource',
+                        "Codex is still using the settings it last synced because {{value0}} could not be read. Check that file's permissions.",
+                        { value0: codexConfigSync?.systemConfigPath ?? '' }
+                      )}
+            </span>
+          </div>
+        ) : null}
+        <div className="flex items-center justify-between gap-3">
+          <div className="space-y-0.5">
+            <Label>
+              {translate('auto.components.settings.AccountsPane.94d351af4a', 'Accounts')}
+            </Label>
+            <p className="text-xs text-muted-foreground">
+              {isRemoteAccountScope
+                ? translate(
+                    'auto.components.settings.AccountsPane.remoteScopeAccounts',
+                    'Showing accounts managed by {{value0}}. Add or re-authenticate accounts on that server.',
+                    { value0: accountRuntimeSentenceLabel }
+                  )
+                : translate(
+                    'auto.components.settings.AccountsPane.c0a52abfc5',
+                    'Showing accounts for {{value0}}. New accounts are added there.',
+                    { value0: accountRuntimeSentenceLabel }
+                  )}
+            </p>
+          </div>
+          <Button
+            variant="outline"
+            size="xs"
+            onClick={() =>
+              void runCodexAccountAction('adding', () =>
+                window.api.codexAccounts.add({
+                  runtime: accountRuntime.runtime,
+                  wslDistro: accountRuntime.wslDistro
+                })
+              )
+            }
+            disabled={
+              // Why: interactive `codex login` needs a desktop browser and
+              // would authenticate against this device, not the server.
+              isRemoteAccountScope ||
+              codexAction !== 'idle' ||
+              wslCapabilitiesLoading ||
+              accountRuntimeUnavailable
+            }
+            className="gap-1.5"
+          >
+            {codexAction === 'adding' ? (
+              <Loader2 className="size-3 animate-spin" />
+            ) : (
+              <Plus className="size-3" />
+            )}
+            {translate('auto.components.settings.AccountsPane.b0e948a4f9', 'Add Account')}
+          </Button>
+        </div>
+        {remoteAccountScopeNotice}
+
+        <div className="space-y-2">
+          <button
+            type="button"
+            onClick={() =>
+              void runCodexAccountAction('select:system', () =>
+                selectCodexProviderAccount(settings, {
+                  accountId: null,
+                  runtime: accountRuntime.runtime,
+                  wslDistro: accountRuntime.wslDistro
+                })
+              )
+            }
+            disabled={codexAction !== 'idle' || accountRuntimeUnavailable}
+            className={`flex w-full items-center justify-between gap-3 rounded-md border px-3 py-2.5 text-left transition-colors ${
+              systemCodexNeedsSignIn
+                ? 'border-destructive/50 bg-destructive/5'
+                : systemCodexActive
+                  ? 'border-foreground/20 bg-accent/15'
+                  : 'border-border/70 hover:border-border hover:bg-accent/8'
+            } disabled:cursor-default disabled:opacity-100`}
+          >
+            <div className="flex min-w-0 flex-1 flex-col gap-0.5">
+              <div className="flex min-w-0 items-center gap-2">
+                <span className="truncate text-sm font-medium">
+                  {translate('auto.components.settings.AccountsPane.f2a265f8c7', 'System default')}
+                </span>
+                {systemCodexActive ? (
+                  <Badge
+                    variant="outline"
+                    className="h-4 shrink-0 rounded px-1.5 text-[10px] font-medium leading-none text-foreground/80"
+                  >
+                    {translate('auto.components.settings.AccountsPane.e74831fb6b', 'Active')}
+                  </Badge>
+                ) : null}
+                {systemCodexNeedsSignIn ? (
+                  <Badge
+                    variant="destructive"
+                    className="h-4 shrink-0 rounded px-1.5 text-[10px] font-medium leading-none"
+                  >
+                    {translate('auto.components.settings.AccountsPane.93c47b333a', 'Needs sign-in')}
+                  </Badge>
+                ) : null}
+              </div>
+              <span
+                className={`truncate text-[11px] ${
+                  systemCodexNeedsSignIn ? 'text-destructive' : 'text-muted-foreground'
+                }`}
+              >
+                {systemCodexNeedsSignIn
+                  ? systemCodexMissingSignIn
+                    ? translate(
+                        'auto.components.settings.AccountsPane.codexSystemDefaultNeedsSignIn',
+                        'No Codex sign-in was found for {{value0}}.',
+                        { value0: accountRuntimeSentenceLabel }
+                      )
+                    : translate(
+                        'auto.components.settings.AccountsPane.fd62f37c24',
+                        'Codex reported this {{value0}} login is out of date.',
+                        { value0: accountRuntimeSentenceLabel }
+                      )
+                  : getCodexSystemDefaultSubtitle(systemCodexIdentity, accountRuntimeSentenceLabel)}
+              </span>
+            </div>
+          </button>
+          {visibleCodexAccounts.length === 0 ? (
+            <div className="rounded-md border border-dashed border-border/70 px-3 py-4 text-xs text-muted-foreground">
+              {isRemoteAccountScope
+                ? translate(
+                    'auto.components.settings.AccountsPane.remoteEmptyCodexAccounts',
+                    'No managed Codex accounts on {{value0}}. It uses its system default Codex login; add accounts on that server.',
+                    { value0: accountRuntimeSentenceLabel }
+                  )
+                : translate(
+                    'auto.components.settings.AccountsPane.b4c9450319',
+                    "No managed Codex accounts for {{value0}}. Orca will use that environment's system default Codex login until you add one here.",
+                    { value0: accountRuntimeSentenceLabel }
+                  )}
+            </div>
+          ) : (
+            visibleCodexAccounts.map((account) => renderCodexAccountRow(account, model))
+          )}
+        </div>
+      </SearchableSetting>
+    </section>
+  )
+}
diff --git a/src/renderer/src/components/settings/accounts-pane-config-sync.ts b/src/renderer/src/components/settings/accounts-pane-config-sync.ts
new file mode 100644
index 00000000000..2978eeb15ba
--- /dev/null
+++ b/src/renderer/src/components/settings/accounts-pane-config-sync.ts
@@ -0,0 +1,44 @@
+import type { CodexConfigSyncStatus } from '../../../../shared/codex-config-sync-types'
+
+// Why: bounded so a permanently unreadable home cannot poll forever; ~5 minutes
+// total is long enough to outlast an antivirus scan or backup pass.
+const CODEX_CONFIG_SYNC_RETRY_MS = 30_000
+const CODEX_CONFIG_SYNC_RETRY_LIMIT = 10
+
+export function watchCodexConfigSyncStatus(
+  onStatus: (status: CodexConfigSyncStatus | null) => void
+): () => void {
+  let cancelled = false
+  let attempts = 0
+  let retryTimer: ReturnType<typeof setTimeout> | null = null
+  const poll = (): void => {
+    void window.api.codexConfigSync
+      .status()
+      .then((status) => {
+        if (cancelled) {
+          return
+        }
+        onStatus(status)
+        if (
+          status.state === 'stalled' &&
+          status.reason === 'managed-home-unavailable' &&
+          attempts < CODEX_CONFIG_SYNC_RETRY_LIMIT
+        ) {
+          attempts += 1
+          retryTimer = setTimeout(poll, CODEX_CONFIG_SYNC_RETRY_MS)
+        }
+      })
+      .catch(() => {
+        if (!cancelled) {
+          onStatus(null)
+        }
+      })
+  }
+  poll()
+  return () => {
+    cancelled = true
+    if (retryTimer !== null) {
+      clearTimeout(retryTimer)
+    }
+  }
+}
diff --git a/src/renderer/src/components/settings/accounts-pane-location-section.tsx b/src/renderer/src/components/settings/accounts-pane-location-section.tsx
new file mode 100644
index 00000000000..99c88859c99
--- /dev/null
+++ b/src/renderer/src/components/settings/accounts-pane-location-section.tsx
@@ -0,0 +1,116 @@
+import { translate } from '@/i18n/i18n'
+import { SearchableSetting } from './SearchableSetting'
+import { SettingsRow, SettingsSegmentedControl } from './SettingsFormControls'
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '../ui/select'
+import { getHostRuntimeLabel } from './accounts-pane-runtime'
+import { WSL_DEFAULT_DISTRO_KEY } from './provider-account-visibility'
+import type { AccountsPaneSectionModel } from './accounts-pane-types'
+
+export function renderAccountsLocationSection(
+  model: AccountsPaneSectionModel
+): React.JSX.Element | null {
+  const {
+    accountRuntime,
+    updateSettings,
+    wslAvailable,
+    wslCapabilitiesLoading,
+    wslDistros,
+    wslSupportedPlatform
+  } = model
+  const accountRuntimeControls = wslSupportedPlatform ? (
+    <SearchableSetting
+      title={translate('auto.components.settings.AccountsPane.f54b4fbd71', 'Account Location')}
+      description={translate(
+        'auto.components.settings.AccountsPane.2cd197025c',
+        'Choose whether provider accounts are inspected and added in {{value0}} or WSL.',
+        { value0: getHostRuntimeLabel() }
+      )}
+      keywords={['account', 'location', 'windows', 'wsl', 'linux', 'provider', 'auth']}
+    >
+      <SettingsRow
+        label={translate('auto.components.settings.AccountsPane.46cf7e7495', 'Account location')}
+        alignTop
+        description={
+          accountRuntime.runtime === 'wsl' && !wslAvailable && !wslCapabilitiesLoading
+            ? translate(
+                'auto.components.settings.AccountsPane.0c67a2a1aa',
+                'WSL is not available on this machine.'
+              )
+            : translate(
+                'auto.components.settings.AccountsPane.0b4591ff93',
+                'Choose which local environment to inspect and where new managed Claude and Codex accounts are added.'
+              )
+        }
+        control={
+          <div className="flex w-44 flex-col items-stretch gap-2">
+            <SettingsSegmentedControl
+              ariaLabel={translate(
+                'auto.components.settings.AccountsPane.46cf7e7495',
+                'Account location'
+              )}
+              value={accountRuntime.runtime}
+              onChange={(value) => updateSettings({ localAccountRuntime: value })}
+              equalWidth
+              options={[
+                { value: 'host', label: getHostRuntimeLabel() },
+                ...(wslSupportedPlatform
+                  ? [
+                      {
+                        value: 'wsl',
+                        label: translate('auto.components.settings.AccountsPane.8619f9afa9', 'WSL'),
+                        disabled: wslCapabilitiesLoading || !wslAvailable
+                      } as const
+                    ]
+                  : [])
+              ]}
+            />
+            {wslSupportedPlatform && accountRuntime.runtime === 'wsl' ? (
+              <Select
+                value={accountRuntime.wslDistro ?? WSL_DEFAULT_DISTRO_KEY}
+                onValueChange={(value) =>
+                  updateSettings({
+                    localAccountRuntime: 'wsl',
+                    localAccountWslDistro: value === WSL_DEFAULT_DISTRO_KEY ? null : value
+                  })
+                }
+                disabled={wslCapabilitiesLoading || !wslAvailable}
+              >
+                <SelectTrigger size="sm" className="w-full min-w-44">
+                  <SelectValue
+                    placeholder={
+                      wslCapabilitiesLoading
+                        ? translate(
+                            'auto.components.settings.AccountsPane.ad47a33f72',
+                            'Loading WSL'
+                          )
+                        : translate(
+                            'auto.components.settings.AccountsPane.2358ac71d2',
+                            'WSL default'
+                          )
+                    }
+                  />
+                </SelectTrigger>
+                <SelectContent>
+                  <SelectItem value={WSL_DEFAULT_DISTRO_KEY}>
+                    {translate('auto.components.settings.AccountsPane.2358ac71d2', 'WSL default')}
+                  </SelectItem>
+                  {wslDistros.map((distro) => (
+                    <SelectItem key={distro} value={distro}>
+                      {distro}
+                    </SelectItem>
+                  ))}
+                </SelectContent>
+              </Select>
+            ) : null}
+          </div>
+        }
+      />
+    </SearchableSetting>
+  ) : null
+
+  return (
+    <section key="account-runtime" id="accounts-runtime" className="space-y-3 scroll-mt-6">
+      {accountRuntimeControls}
+    </section>
+  )
+}
diff --git a/src/renderer/src/components/settings/accounts-pane-minimax-actions.ts b/src/renderer/src/components/settings/accounts-pane-minimax-actions.ts
new file mode 100644
index 00000000000..a670ef3ff3b
--- /dev/null
+++ b/src/renderer/src/components/settings/accounts-pane-minimax-actions.ts
@@ -0,0 +1,83 @@
+import type { Dispatch, SetStateAction } from 'react'
+import type { FeatureInteractionId } from '../../../../shared/feature-interaction-catalog'
+import { toast } from 'sonner'
+import { translate } from '@/i18n/i18n'
+
+type MiniMaxCredentialActionContext = {
+  miniMaxCookieDraft: string
+  setMiniMaxCookieDraft: Dispatch<SetStateAction<string>>
+  setMiniMaxConfigured: Dispatch<SetStateAction<boolean>>
+  setMiniMaxCredentialBusy: Dispatch<SetStateAction<boolean>>
+  recordFeatureInteraction: (featureId: FeatureInteractionId) => void
+}
+
+export function createMiniMaxCredentialActions(context: MiniMaxCredentialActionContext): {
+  saveMiniMaxCookie: () => Promise<void>
+  clearMiniMaxCookie: () => Promise<void>
+} {
+  const {
+    miniMaxCookieDraft,
+    setMiniMaxCookieDraft,
+    setMiniMaxConfigured,
+    setMiniMaxCredentialBusy,
+    recordFeatureInteraction
+  } = context
+  const saveMiniMaxCookie = async (): Promise<void> => {
+    if (!miniMaxCookieDraft.trim()) {
+      toast.error(
+        translate('auto.components.settings.AccountsPane.2f24f244a4', 'MiniMax cookie is required.')
+      )
+      return
+    }
+    setMiniMaxCredentialBusy(true)
+    try {
+      const status = await window.api.minimaxCredentials.saveCookie(miniMaxCookieDraft.trim())
+      if (!status.configured) {
+        throw new Error(
+          translate(
+            'auto.components.settings.AccountsPane.8e6f0cb1d8',
+            'MiniMax cookie was not saved.'
+          )
+        )
+      }
+      setMiniMaxConfigured(status.configured)
+      setMiniMaxCookieDraft('')
+      recordFeatureInteraction('usage-tracking')
+      toast.success(
+        translate('auto.components.settings.AccountsPane.8d61637a77', 'MiniMax cookie saved.')
+      )
+    } catch (error) {
+      toast.error(
+        translate(
+          'auto.components.settings.AccountsPane.b43e761fe5',
+          'MiniMax cookie update failed.'
+        ),
+        { description: String((error as Error)?.message ?? error) }
+      )
+    } finally {
+      setMiniMaxCredentialBusy(false)
+    }
+  }
+
+  const clearMiniMaxCookie = async (): Promise<void> => {
+    setMiniMaxCredentialBusy(true)
+    try {
+      const status = await window.api.minimaxCredentials.clearCookie()
+      setMiniMaxConfigured(status.configured)
+      setMiniMaxCookieDraft('')
+      recordFeatureInteraction('usage-tracking')
+    } catch (error) {
+      toast.error(
+        translate(
+          'auto.components.settings.AccountsPane.b43e761fe5',
+          'MiniMax cookie update failed.'
+        ),
+        { description: String((error as Error)?.message ?? error) }
+      )
+    } finally {
+      setMiniMaxCredentialBusy(false)
+    }
+  }
+
+  return { saveMiniMaxCookie, clearMiniMaxCookie }
+}
diff --git a/src/renderer/src/components/settings/accounts-pane-minimax-section.tsx b/src/renderer/src/components/settings/accounts-pane-minimax-section.tsx
new file mode 100644
index 00000000000..96321584483
--- /dev/null
+++ b/src/renderer/src/components/settings/accounts-pane-minimax-section.tsx
@@ -0,0 +1,305 @@
+import { ExternalLink, HelpCircle, Loader2, Lock, LockOpen, ShieldCheck } from 'lucide-react'
+import { translate } from '@/i18n/i18n'
+import { formatUiRelativeTime } from '@/i18n/relative-time-format'
+import { cn } from '@/lib/utils'
+import { Badge } from '../ui/badge'
+import { Button } from '../ui/button'
+import { Input } from '../ui/input'
+import { Label } from '../ui/label'
+import { Popover, PopoverContent, PopoverTrigger } from '../ui/popover'
+import { MiniMaxIcon } from '../status-bar/icons'
+import { SearchableSetting } from './SearchableSetting'
+import type { AccountsPaneSectionModel } from './accounts-pane-types'
+
+const MINIMAX_CONSOLE_URL = 'https://platform.minimax.io/console/usage'
+
+function formatMiniMaxRelativeRefresh(updatedAt: number, now: number): string {
+  const diffMs = Math.max(0, now - updatedAt)
+  if (diffMs < 60_000) {
+    return translate('auto.components.settings.AccountsPane.3a30aaf526', 'just now')
+  }
+  return formatUiRelativeTime(-diffMs)
+}
+
+function MiniMaxCookieHelpPopover(): React.JSX.Element {
+  const steps = [
+    translate(
+      'auto.components.settings.AccountsPane.f5d8d2a6a1',
+      'Open platform.minimax.io/console/usage in your browser and sign in.'
+    ),
+    translate('auto.components.settings.AccountsPane.24560fe830', 'Open DevTools.'),
+    translate(
+      'auto.components.settings.AccountsPane.4cab0fa42d',
+      'Go to the Network tab and enable Preserve log.'
+    ),
+    translate('auto.components.settings.AccountsPane.bee4e63e1c', 'Reload the page.'),
+    translate(
+      'auto.components.settings.AccountsPane.87f814af6f',
+      'Filter for remains and select the coding_plan/remains request.'
+    ),
+    translate(
+      'auto.components.settings.AccountsPane.435df0ee51',
+      'Under Request Headers, copy the Cookie value.'
+    ),
+    translate('auto.components.settings.AccountsPane.7492fb3bba', 'Paste it here and click Save.')
+  ]
+  return (
+    <div className="space-y-3 p-3 text-xs">
+      <div className="space-y-1">
+        <p className="font-medium">
+          {translate('auto.components.settings.AccountsPane.9fec52de4b', 'How to copy the cookie')}
+        </p>
+        <p className="text-muted-foreground">
+          {translate(
+            'auto.components.settings.AccountsPane.4e32e030b2',
+            'Stored locally. Orca sends it only to platform.minimax.io for usage refreshes.'
+          )}
+        </p>
+      </div>
+      <ol className="list-decimal space-y-1 pl-4 text-muted-foreground">
+        {steps.map((step) => (
+          <li key={step}>{step}</li>
+        ))}
+      </ol>
+    </div>
+  )
+}
+
+export function renderMiniMaxAccountsSection(model: AccountsPaneSectionModel): React.JSX.Element {
+  const {
+    clearMiniMaxCookie,
+    miniMaxConfigured,
+    miniMaxCookieDraft,
+    miniMaxCredentialBusy,
+    miniMaxRateLimits,
+    saveMiniMaxCookie,
+    setMiniMaxCookieDraft,
+    settings,
+    updateSettings
+  } = model
+  return (
+    <section key="minimax" id="accounts-minimax" className="space-y-4 scroll-mt-6">
+      <div className="flex items-start justify-between gap-3">
+        <div className="space-y-1">
+          <h3 className="flex items-center gap-2 text-sm font-semibold">
+            <MiniMaxIcon size={16} />
+            {translate('auto.components.settings.AccountsPane.5d63bbfbec', 'MiniMax')}
+          </h3>
+          <p className="text-xs text-muted-foreground">
+            {translate(
+              'auto.components.settings.AccountsPane.15e831350e',
+              'Configure MiniMax usage tracking from platform.minimax.io.'
+            )}
+          </p>
+        </div>
+        <a
+          href={MINIMAX_CONSOLE_URL}
+          target="_blank"
+          rel="noopener noreferrer"
+          className="inline-flex items-center gap-1 text-xs text-muted-foreground hover:text-foreground"
+        >
+          {translate('auto.components.settings.AccountsPane.0d8e77bc40', 'Open console')}
+          <ExternalLink className="size-3" />
+        </a>
+      </div>
+
+      <div
+        className={cn(
+          'flex items-start gap-3 rounded-lg border bg-muted/20 p-3',
+          miniMaxConfigured ? 'border-border/60' : 'border-border/40'
+        )}
+      >
+        <ShieldCheck
+          className={cn(
+            'mt-0.5 size-4 shrink-0',
+            miniMaxConfigured ? 'text-foreground' : 'text-muted-foreground'
+          )}
+        />
+        <div className="space-y-0.5">
+          <p className="text-xs font-medium">
+            {miniMaxConfigured
+              ? translate('auto.components.settings.AccountsPane.0b8c1c7e02', 'Stored locally')
+              : translate('auto.components.settings.AccountsPane.1fd1b1b6b4', 'Cookie not set')}
+          </p>
+          <p className="text-xs text-muted-foreground">
+            {translate(
+              'auto.components.settings.AccountsPane.5e08b0fe57',
+              'Stored locally and sent only to platform.minimax.io for usage refreshes.'
+            )}
+          </p>
+        </div>
+      </div>
+
+      <SearchableSetting
+        title={translate(
+          'auto.components.settings.AccountsPane.21d6eb141e',
+          'MiniMax Session Cookie'
+        )}
+        description={translate(
+          'auto.components.settings.AccountsPane.33bba5ad83',
+          'Paste your MiniMax session cookie for local rate-limit fetching.'
+        )}
+        keywords={['minimax', 'cookie', 'session', 'rate limit', 'status bar']}
+        className="space-y-2"
+      >
+        <div className="flex items-center justify-between gap-2">
+          <div className="flex items-center gap-2">
+            <Label>
+              {translate(
+                'auto.components.settings.AccountsPane.21d6eb141e',
+                'MiniMax Session Cookie'
+              )}
+            </Label>
+            <Badge
+              variant={miniMaxConfigured ? 'secondary' : 'outline'}
+              className="h-5 gap-1 rounded-full px-2 text-[10px] font-medium text-muted-foreground"
+            >
+              {miniMaxConfigured ? <Lock className="size-3" /> : <LockOpen className="size-3" />}
+              {miniMaxConfigured
+                ? translate('auto.components.settings.AccountsPane.73ea15f24b', 'Saved')
+                : translate('auto.components.settings.AccountsPane.23afe8f226', 'Not saved')}
+            </Badge>
+          </div>
+          <Popover>
+            <PopoverTrigger asChild>
+              <Button
+                variant="ghost"
+                size="xs"
+                className="h-6 gap-1 px-2 text-xs text-muted-foreground hover:text-foreground"
+              >
+                <HelpCircle className="size-3" />
+                {translate('auto.components.settings.AccountsPane.43d7a45b97', 'How to copy')}
+              </Button>
+            </PopoverTrigger>
+            <PopoverContent align="end" side="bottom" sideOffset={6} className="w-80 p-0">
+              <MiniMaxCookieHelpPopover />
+            </PopoverContent>
+          </Popover>
+        </div>
+        <div className="flex gap-2">
+          <Input
+            type="password"
+            value={miniMaxCookieDraft}
+            onChange={(e) => setMiniMaxCookieDraft(e.target.value)}
+            placeholder={translate(
+              'auto.components.settings.AccountsPane.b8a4f21c3e',
+              'Paste the Cookie header from DevTools'
+            )}
+            spellCheck={false}
+            className="flex-1 text-xs"
+          />
+          <Button
+            size="xs"
+            onClick={() => void saveMiniMaxCookie()}
+            disabled={miniMaxCredentialBusy || !miniMaxCookieDraft.trim()}
+            className="h-7 shrink-0 text-xs"
+          >
+            {miniMaxCredentialBusy ? <Loader2 className="size-3 animate-spin" /> : null}
+            {miniMaxConfigured
+              ? translate('auto.components.settings.AccountsPane.f38b9cc4bd', 'Replace')
+              : translate('auto.components.settings.AccountsPane.590a3130f9', 'Save')}
+          </Button>
+          {miniMaxConfigured ? (
+            <Button
+              variant="ghost"
+              size="xs"
+              onClick={() => void clearMiniMaxCookie()}
+              disabled={miniMaxCredentialBusy}
+              className="h-7 shrink-0 text-xs text-muted-foreground hover:text-foreground"
+            >
+              {translate('auto.components.settings.AccountsPane.316ca4e610', 'Forget cookie')}
+            </Button>
+          ) : null}
+        </div>
+        <p className="text-xs text-muted-foreground">
+          {translate(
+            'auto.components.settings.AccountsPane.79418c782a',
+            'Open platform.minimax.io/console/usage in your browser, sign in, then copy the Cookie request header from DevTools (Network → any remains request → Cookie).'
+          )}
+        </p>
+        {miniMaxConfigured &&
+        miniMaxRateLimits?.status === 'ok' &&
+        miniMaxRateLimits.error === null ? (
+          <p className="text-xs text-muted-foreground">
+            {translate(
+              'auto.components.settings.AccountsPane.53f7b8c7a2',
+              'Last refresh: {{value0}}',
+              {
+                value0: formatMiniMaxRelativeRefresh(miniMaxRateLimits.updatedAt, Date.now())
+              }
+            )}
+          </p>
+        ) : null}
+        <p className="text-xs text-muted-foreground">
+          {translate(
+            'auto.components.settings.AccountsPane.31d24a4e87',
+            'Cookie expires when you sign out in the browser.'
+          )}
+        </p>
+      </SearchableSetting>
+
+      <div className="space-y-3 rounded-lg border border-border/60 bg-muted/20 p-3">
+        <div className="flex items-center justify-between gap-3">
+          <div className="space-y-1">
+            <h4 className="text-xs font-semibold text-muted-foreground">
+              {translate('auto.components.settings.AccountsPane.9dd50d3f75', 'Advanced')}
+            </h4>
+            <p className="text-xs text-muted-foreground">
+              {translate(
+                'auto.components.settings.AccountsPane.174fb408f9',
+                'Leave these defaults alone unless MiniMax usage refresh points at the wrong workspace or model.'
+              )}
+            </p>
+          </div>
+        </div>
+
+        <SearchableSetting
+          title={translate('auto.components.settings.AccountsPane.bf160bb6c0', 'Group ID override')}
+          description={translate(
+            'auto.components.settings.AccountsPane.b1e2743313',
+            'Optional. Leave blank to use minimax_group_id_v2 from the cookie.'
+          )}
+          keywords={['minimax', 'group', 'id', 'rate limit']}
+          className="space-y-2"
+        >
+          <Label>
+            {translate('auto.components.settings.AccountsPane.bf160bb6c0', 'Group ID override')}
+          </Label>
+          <Input
+            type="text"
+            value={settings.minimaxGroupId}
+            onChange={(e) => updateSettings({ minimaxGroupId: e.target.value })}
+            placeholder={translate(
+              'auto.components.settings.AccountsPane.0747d6391a',
+              'Use group ID from cookie'
+            )}
+            spellCheck={false}
+            className="text-xs"
+          />
+        </SearchableSetting>
+
+        <SearchableSetting
+          title={translate('auto.components.settings.AccountsPane.4ff2af7524', 'Usage model names')}
+          description={translate(
+            'auto.components.settings.AccountsPane.5cf4b0f85f',
+            'Optional comma-separated model names. Leave as general unless MiniMax returns a model-specific error.'
+          )}
+          keywords={['minimax', 'model', 'general', 'rate limit']}
+          className="space-y-2"
+        >
+          <Label>
+            {translate('auto.components.settings.AccountsPane.4ff2af7524', 'Usage model names')}
+          </Label>
+          <Input
+            type="text"
+            value={settings.minimaxUsageModels}
+            onChange={(e) => updateSettings({ minimaxUsageModels: e.target.value })}
+            placeholder={translate('auto.components.settings.AccountsPane.3c92b0d31c', 'general')}
+            spellCheck={false}
+            className="text-xs"
+          />
+        </SearchableSetting>
+      </div>
+    </section>
+  )
+}
diff --git a/src/renderer/src/components/settings/accounts-pane-provider-setting-sections.tsx b/src/renderer/src/components/settings/accounts-pane-provider-setting-sections.tsx
new file mode 100644
index 00000000000..258dea971ae
--- /dev/null
+++ b/src/renderer/src/components/settings/accounts-pane-provider-setting-sections.tsx
@@ -0,0 +1,227 @@
+import { translate } from '@/i18n/i18n'
+import { Button } from '../ui/button'
+import { Input } from '../ui/input'
+import { Label } from '../ui/label'
+import { Switch } from '../ui/switch'
+import { GeminiIcon, OpenCodeGoIcon } from '../status-bar/icons'
+import { SearchableSetting } from './SearchableSetting'
+import type { AccountsPaneSectionModel } from './accounts-pane-types'
+
+export function renderGeminiAccountsSection(model: AccountsPaneSectionModel): React.JSX.Element {
+  const { localAccountRuntimeSentenceLabel, recordFeatureInteraction, settings, updateSettings } =
+    model
+  return (
+    <section key="gemini" id="accounts-gemini" className="space-y-4 scroll-mt-6">
+      <div className="space-y-1">
+        <h3 className="flex items-center gap-2 text-sm font-semibold">
+          <GeminiIcon size={16} />
+          {translate('auto.components.settings.AccountsPane.0c64dc2a64', 'Gemini')}
+        </h3>
+        <p className="text-xs text-muted-foreground">
+          {translate(
+            'auto.components.settings.AccountsPane.973741a871',
+            'Configure Gemini provider settings.'
+          )}
+        </p>
+      </div>
+
+      <SearchableSetting
+        title={translate(
+          'auto.components.settings.AccountsPane.0c7f915b01',
+          'Use Gemini CLI credentials'
+        )}
+        description={translate(
+          'auto.components.settings.AccountsPane.d676c41fc6',
+          'Extracts OAuth credentials from your local Gemini CLI installation to authenticate with Google. This uses credentials issued to the Gemini CLI app, not Orca. May break if Google updates the CLI. Use at your own risk.'
+        )}
+        keywords={[
+          'gemini',
+          'cli',
+          'oauth',
+          'credentials',
+          'experimental',
+          'rate limit',
+          'status bar'
+        ]}
+        className="flex items-center justify-between gap-4 py-2"
+      >
+        <div className="space-y-0.5">
+          <Label>
+            {translate(
+              'auto.components.settings.AccountsPane.96f3649526',
+              'Use Gemini CLI credentials (experimental)'
+            )}
+          </Label>
+          <p className="text-xs text-muted-foreground">
+            {translate(
+              'auto.components.settings.AccountsPane.c2aee76420',
+              'Extracts OAuth credentials from your local Gemini CLI installation to authenticate with Google for {{value0}}. This uses credentials issued to the Gemini CLI app, not Orca. May break if Google updates the CLI. Use at your own risk.',
+              { value0: localAccountRuntimeSentenceLabel }
+            )}
+          </p>
+        </div>
+        <Switch
+          aria-label={translate(
+            'auto.components.settings.AccountsPane.96f3649526',
+            'Use Gemini CLI credentials (experimental)'
+          )}
+          checked={settings.geminiCliOAuthEnabled}
+          onCheckedChange={(checked) => {
+            recordFeatureInteraction('usage-tracking')
+            updateSettings({
+              geminiCliOAuthEnabled: checked
+            })
+          }}
+        />
+      </SearchableSetting>
+    </section>
+  )
+}
+
+export function renderOpenCodeAccountsSection(model: AccountsPaneSectionModel): React.JSX.Element {
+  const { recordFeatureInteraction, recordOpenCodeSettingEdit, settings, updateSettings } = model
+  return (
+    <section key="opencode-go" id="accounts-opencode-go" className="space-y-4 scroll-mt-6">
+      <div className="space-y-1">
+        <h3 className="flex items-center gap-2 text-sm font-semibold">
+          <OpenCodeGoIcon size={16} />
+          {translate('auto.components.settings.AccountsPane.4ac10b4d08', 'OpenCode Go')}
+        </h3>
+        <p className="text-xs text-muted-foreground">
+          {translate(
+            'auto.components.settings.AccountsPane.ea631977b5',
+            'Configure OpenCode Go provider settings.'
+          )}
+        </p>
+      </div>
+
+      <SearchableSetting
+        title={translate(
+          'auto.components.settings.AccountsPane.36223200ac',
+          'OpenCode Go Session Cookie'
+        )}
+        description={translate(
+          'auto.components.settings.AccountsPane.b2b1aa936d',
+          'Paste your opencode.ai session cookie for rate limit fetching.'
+        )}
+        keywords={['opencode', 'cookie', 'session', 'rate limit', 'status bar']}
+        className="space-y-2"
+      >
+        <Label>
+          {translate(
+            'auto.components.settings.AccountsPane.67e3c33670',
+            'OpenCode Go session cookie'
+          )}
+        </Label>
+        <div className="flex gap-2">
+          <Input
+            type="password"
+            value={settings.opencodeSessionCookie}
+            onChange={(e) => {
+              recordOpenCodeSettingEdit('cookie')
+              updateSettings({ opencodeSessionCookie: e.target.value })
+            }}
+            placeholder={translate(
+              'auto.components.settings.AccountsPane.a7e38affcd',
+              'Fe26.2**… token or auth=Fe26.2**… header'
+            )}
+            spellCheck={false}
+            className="flex-1 text-xs"
+          />
+          {settings.opencodeSessionCookie && (
+            <Button
+              variant="ghost"
+              size="xs"
+              onClick={() => {
+                recordFeatureInteraction('usage-tracking')
+                updateSettings({ opencodeSessionCookie: '' })
+              }}
+              className="h-7 shrink-0 text-xs text-muted-foreground hover:text-foreground"
+            >
+              {translate('auto.components.settings.AccountsPane.b398b834c9', 'Clear')}
+            </Button>
+          )}
+        </div>
+        <p className="text-xs text-muted-foreground">
+          {translate(
+            'auto.components.settings.AccountsPane.0023cc336e',
+            'Paste either the raw token value (e.g.'
+          )}{' '}
+          <code className="text-xs">
+            {translate('auto.components.settings.AccountsPane.922b51e02d', 'Fe26.2**…')}
+          </code>
+          {translate(
+            'auto.components.settings.AccountsPane.338820326a',
+            ') or the full cookie header (e.g.'
+          )}{' '}
+          <code className="text-xs">
+            {translate('auto.components.settings.AccountsPane.8951c5309f', 'auth=Fe26.2**…')}
+          </code>
+          {translate(
+            'auto.components.settings.AccountsPane.7ce0e1907c',
+            "). Find it in your browser's DevTools → Network → any opencode.ai request → Cookie header. OpenCode Go auth is web-based and shared across Windows and WSL terminals."
+          )}
+        </p>
+      </SearchableSetting>
+
+      <SearchableSetting
+        title={translate(
+          'auto.components.settings.AccountsPane.02cb127710',
+          'OpenCode Go Workspace ID'
+        )}
+        description={translate(
+          'auto.components.settings.AccountsPane.d70a5287a4',
+          'Optional workspace ID override if the automatic lookup fails.'
+        )}
+        keywords={['opencode', 'workspace', 'id', 'wrk', 'rate limit', 'status bar']}
+        className="space-y-2"
+      >
+        <Label>
+          {translate('auto.components.settings.AccountsPane.dbdb0b0bd8', 'Workspace ID override')}
+        </Label>
+        <div className="flex gap-2">
+          <Input
+            type="text"
+            value={settings.opencodeWorkspaceId}
+            onChange={(e) => {
+              recordOpenCodeSettingEdit('workspaceId')
+              updateSettings({ opencodeWorkspaceId: e.target.value })
+            }}
+            placeholder={translate(
+              'auto.components.settings.AccountsPane.a122332371',
+              'wrk_… (leave blank for automatic lookup)'
+            )}
+            spellCheck={false}
+            className="flex-1 text-xs"
+          />
+          {settings.opencodeWorkspaceId && (
+            <Button
+              variant="ghost"
+              size="xs"
+              onClick={() => {
+                recordFeatureInteraction('usage-tracking')
+                updateSettings({ opencodeWorkspaceId: '' })
+              }}
+              className="h-7 shrink-0 text-xs text-muted-foreground hover:text-foreground"
+            >
+              {translate('auto.components.settings.AccountsPane.b398b834c9', 'Clear')}
+            </Button>
+          )}
+        </div>
+        <p className="text-xs text-muted-foreground">
+          {translate(
+            'auto.components.settings.AccountsPane.51c9104e13',
+            'Find this in the URL after logging into opencode.ai (e.g.'
+          )}{' '}
+          <code className="text-xs">
+            {translate(
+              'auto.components.settings.AccountsPane.ae3b21eb6c',
+              'opencode.ai/workspace/wrk_…/go'
+            )}
+          </code>
+          ).
+        </p>
+      </SearchableSetting>
+    </section>
+  )
+}
diff --git a/src/renderer/src/components/settings/accounts-pane-removal-dialogs.tsx b/src/renderer/src/components/settings/accounts-pane-removal-dialogs.tsx
new file mode 100644
index 00000000000..569a8df6414
--- /dev/null
+++ b/src/renderer/src/components/settings/accounts-pane-removal-dialogs.tsx
@@ -0,0 +1,119 @@
+import { translate } from '@/i18n/i18n'
+import {
+  removeClaudeProviderAccount,
+  removeCodexProviderAccount
+} from '@/runtime/runtime-provider-accounts-client'
+import { Button } from '../ui/button'
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle
+} from '../ui/dialog'
+import type { AccountsPaneSectionModel, RemoveAccountTarget } from './accounts-pane-types'
+
+export function renderAccountsRemovalDialogs(
+  model: AccountsPaneSectionModel,
+  removeCodexTarget: RemoveAccountTarget | null,
+  removeClaudeTarget: RemoveAccountTarget | null
+): React.JSX.Element {
+  const {
+    runClaudeAccountAction,
+    runCodexAccountAction,
+    setRemoveClaudeTarget,
+    setRemoveCodexTarget,
+    settings
+  } = model
+  return (
+    <>
+      <Dialog
+        open={removeCodexTarget !== null}
+        onOpenChange={(open) => !open && setRemoveCodexTarget(null)}
+      >
+        <DialogContent showCloseButton={false}>
+          <DialogHeader>
+            <DialogTitle>
+              {translate(
+                'auto.components.settings.AccountsPane.0d47394635',
+                'Remove Codex Account?'
+              )}
+            </DialogTitle>
+            <DialogDescription>
+              {translate(
+                'auto.components.settings.AccountsPane.380a7736cc',
+                'Removing this account permanently deletes its managed Codex home, including all Codex session history and MCP logins stored inside. This cannot be undone. If the account is currently active, Orca falls back to the system default Codex login.'
+              )}
+            </DialogDescription>
+          </DialogHeader>
+          <DialogFooter>
+            <Button variant="outline" onClick={() => setRemoveCodexTarget(null)}>
+              {translate('auto.components.settings.AccountsPane.dbb9626ed1', 'Cancel')}
+            </Button>
+            <Button
+              variant="destructive"
+              onClick={() => {
+                const target = removeCodexTarget
+                if (!target) {
+                  return
+                }
+                setRemoveCodexTarget(null)
+                void runCodexAccountAction(
+                  `remove:${target.id}`,
+                  () => removeCodexProviderAccount(settings, target.id),
+                  target.runtime
+                )
+              }}
+            >
+              {translate('auto.components.settings.AccountsPane.c2d2751587', 'Remove Account')}
+            </Button>
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
+      <Dialog
+        open={removeClaudeTarget !== null}
+        onOpenChange={(open) => !open && setRemoveClaudeTarget(null)}
+      >
+        <DialogContent showCloseButton={false}>
+          <DialogHeader>
+            <DialogTitle>
+              {translate(
+                'auto.components.settings.AccountsPane.63843e37e2',
+                'Remove Claude Account?'
+              )}
+            </DialogTitle>
+            <DialogDescription>
+              {translate(
+                'auto.components.settings.AccountsPane.854ebbcc45',
+                'Orca will delete the managed Claude auth for this saved account. If it is currently active, Orca falls back to the system default Claude login.'
+              )}
+            </DialogDescription>
+          </DialogHeader>
+          <DialogFooter>
+            <Button variant="outline" onClick={() => setRemoveClaudeTarget(null)}>
+              {translate('auto.components.settings.AccountsPane.dbb9626ed1', 'Cancel')}
+            </Button>
+            <Button
+              variant="destructive"
+              onClick={() => {
+                const target = removeClaudeTarget
+                if (!target) {
+                  return
+                }
+                setRemoveClaudeTarget(null)
+                void runClaudeAccountAction(
+                  `remove:${target.id}`,
+                  () => removeClaudeProviderAccount(settings, target.id),
+                  target.runtime
+                )
+              }}
+            >
+              {translate('auto.components.settings.AccountsPane.c2d2751587', 'Remove Account')}
+            </Button>
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
+    </>
+  )
+}
diff --git a/src/renderer/src/components/settings/accounts-pane-runtime.ts b/src/renderer/src/components/settings/accounts-pane-runtime.ts
new file mode 100644
index 00000000000..761ab721abf
--- /dev/null
+++ b/src/renderer/src/components/settings/accounts-pane-runtime.ts
@@ -0,0 +1,112 @@
+import type { GlobalSettings } from '../../../../shared/global-settings-types'
+import type {
+  ClaudeRateLimitAccountsState,
+  CodexRateLimitAccountsState,
+  CodexSystemDefaultIdentity
+} from '../../../../shared/managed-account-types'
+import { resolveLocalAccountRuntimeTarget } from '../../../../shared/local-account-runtime'
+import { getRendererAppPlatform } from '../../lib/renderer-app-platform'
+import { translate } from '@/i18n/i18n'
+import type { LocalAccountRuntime } from './accounts-pane-types'
+
+export const EMPTY_WSL_DISTROS: string[] = []
+
+export function getHostRuntimeLabel(): string {
+  return navigator.userAgent.includes('Windows')
+    ? 'Windows'
+    : translate('auto.components.settings.AccountsPane.9baf45d071', 'This device')
+}
+
+// Why: the system-default row has no stored identity, so surface the real
+// ~/.codex login live — the OAuth email when signed in, a clear custom-provider
+// note for env-key logins, and the generic fallback when signed out.
+export function getCodexSystemDefaultSubtitle(
+  identity: CodexSystemDefaultIdentity | undefined,
+  runtimeSentenceLabel: string
+): string {
+  if (identity?.authKind === 'oauth' && identity.email) {
+    return identity.email
+  }
+  if (identity?.authKind === 'api-key') {
+    return translate(
+      'auto.components.settings.AccountsPane.codexSystemDefaultCustomProvider',
+      'Custom provider — no usage tracked.'
+    )
+  }
+  return translate(
+    'auto.components.settings.AccountsPane.fcc4093fc1',
+    'Use your current {{value0}} Codex login.',
+    { value0: runtimeSentenceLabel }
+  )
+}
+
+export function getClaudeAccountLabel(
+  state: ClaudeRateLimitAccountsState,
+  accountId: string | null | undefined
+): string {
+  if (accountId == null) {
+    return 'System default'
+  }
+  return state.accounts.find((account) => account.id === accountId)?.email ?? 'Claude account'
+}
+
+export function getCodexAccountRuntimeLabel(
+  account: CodexRateLimitAccountsState['accounts'][number],
+  hostLabel = getHostRuntimeLabel()
+): string {
+  if (account.managedHomeRuntime === 'wsl') {
+    return account.wslDistro ? `WSL ${account.wslDistro}` : 'WSL'
+  }
+  return hostLabel
+}
+
+export function getClaudeAccountRuntimeLabel(
+  account: ClaudeRateLimitAccountsState['accounts'][number],
+  hostLabel = getHostRuntimeLabel()
+): string {
+  if (account.managedAuthRuntime === 'wsl') {
+    return account.wslDistro ? `WSL ${account.wslDistro}` : 'WSL'
+  }
+  return hostLabel
+}
+
+export function getSelectedAccountRuntime(
+  settings: GlobalSettings,
+  wslSupportedPlatform: boolean,
+  wslAvailable: boolean,
+  wslDistros: string[],
+  wslCapabilitiesLoading: boolean
+): LocalAccountRuntime {
+  // Why: the two-option control displays the concrete target behind the persisted auto policy.
+  const resolvedRuntime = resolveLocalAccountRuntimeTarget(settings, getRendererAppPlatform())
+  if (wslSupportedPlatform && resolvedRuntime.runtime === 'wsl') {
+    if (!wslAvailable && !wslCapabilitiesLoading) {
+      return {
+        runtime: 'wsl',
+        label: translate('auto.components.settings.AccountsPane.8619f9afa9', 'WSL')
+      }
+    }
+    const configuredDistro = resolvedRuntime.wslDistro?.trim() || null
+    const selectedDistro =
+      configuredDistro && (wslCapabilitiesLoading || wslDistros.includes(configuredDistro))
+        ? configuredDistro
+        : null
+    return {
+      runtime: 'wsl',
+      wslDistro: selectedDistro,
+      label: selectedDistro
+        ? `WSL ${selectedDistro}`
+        : translate('auto.components.settings.AccountsPane.2358ac71d2', 'WSL default')
+    }
+  }
+  return { runtime: 'host', label: getHostRuntimeLabel() }
+}
+
+export function formatAccountTimestamp(timestamp: number): string {
+  return new Date(timestamp).toLocaleString(undefined, {
+    month: 'short',
+    day: 'numeric',
+    hour: 'numeric',
+    minute: '2-digit'
+  })
+}
diff --git a/src/renderer/src/components/settings/accounts-pane-types.ts b/src/renderer/src/components/settings/accounts-pane-types.ts
new file mode 100644
index 00000000000..c4ea87bf4bf
--- /dev/null
+++ b/src/renderer/src/components/settings/accounts-pane-types.ts
@@ -0,0 +1,114 @@
+import type { Dispatch, ReactNode, SetStateAction } from 'react'
+import type { GlobalSettings } from '../../../../shared/global-settings-types'
+import type {
+  ClaudeRateLimitAccountsState,
+  CodexRateLimitAccountsState
+} from '../../../../shared/managed-account-types'
+import type {
+  ProviderRateLimits,
+  RateLimitRuntimeTarget
+} from '../../../../shared/rate-limit-types'
+import type { CodexConfigSyncStatus } from '../../../../shared/codex-config-sync-types'
+import type { FeatureInteractionId } from '../../../../shared/feature-interaction-catalog'
+import type { ProviderAccountRuntimeView } from './provider-account-visibility'
+
+export type AccountsPaneProps = {
+  settings: GlobalSettings
+  updateSettings: (updates: Partial<GlobalSettings>) => void
+  wslSupportedPlatform?: boolean
+  wslAvailable?: boolean
+  wslDistros?: string[]
+  wslCapabilitiesLoading?: boolean
+  accountOwnerPlatform?: NodeJS.Platform | null
+}
+
+export type LocalAccountRuntime = {
+  runtime: 'host' | 'wsl'
+  wslDistro?: string | null
+  label: string
+}
+
+export type CodexAccountAction =
+  | 'idle'
+  | 'adding'
+  | `reauth:${string}`
+  | `remove:${string}`
+  | `select:${string}`
+
+export type ClaudeAccountAction = CodexAccountAction
+
+export type RemoveAccountTarget = {
+  id: string
+  runtime: ProviderAccountRuntimeView
+}
+
+export type ProviderAccountVisibilityOptions = {
+  remoteOwner: boolean
+  ownerPlatform: NodeJS.Platform | null
+}
+
+export type CodexAccountActionRunner = (
+  action: CodexAccountAction,
+  operation: () => Promise<CodexRateLimitAccountsState>,
+  actionRuntime?: ProviderAccountRuntimeView
+) => Promise<void>
+
+export type ClaudeAccountActionRunner = (
+  action: ClaudeAccountAction,
+  operation: () => Promise<ClaudeRateLimitAccountsState>,
+  actionRuntime?: ProviderAccountRuntimeView
+) => Promise<void>
+
+export type AccountsPaneSectionModel = {
+  settings: GlobalSettings
+  updateSettings: (updates: Partial<GlobalSettings>) => void
+  searchQuery: string
+  recordFeatureInteraction: (featureId: FeatureInteractionId) => void
+  wslSupportedPlatform: boolean
+  wslAvailable: boolean
+  wslDistros: string[]
+  wslCapabilitiesLoading: boolean
+  localAccountRuntime: LocalAccountRuntime
+  localAccountRuntimeSentenceLabel: string
+  isRemoteAccountScope: boolean
+  remoteServerName: string | null
+  remoteAccountScopeNotice: ReactNode
+  accountRuntime: LocalAccountRuntime
+  accountRuntimeSentenceLabel: string
+  accountRuntimeUnavailable: boolean
+  accountVisibilityOptions: ProviderAccountVisibilityOptions
+  claudeAccounts: ClaudeRateLimitAccountsState
+  claudeAction: ClaudeAccountAction
+  visibleClaudeAccounts: ClaudeRateLimitAccountsState['accounts']
+  systemClaudeActive: boolean
+  setRemoveClaudeTarget: Dispatch<SetStateAction<RemoveAccountTarget | null>>
+  runClaudeAccountAction: ClaudeAccountActionRunner
+  codexAccounts: CodexRateLimitAccountsState
+  codexAction: CodexAccountAction
+  visibleCodexAccounts: CodexRateLimitAccountsState['accounts']
+  systemCodexActive: boolean
+  systemCodexNeedsSignIn: boolean
+  systemCodexMissingSignIn: boolean
+  systemCodexIdentity: CodexRateLimitAccountsState['systemDefault']
+  activeCodexAuthWarning: 'missing-sign-in' | 'stale-sign-in' | null
+  activeCodexAccountId: string | null
+  codexConfigSync: CodexConfigSyncStatus | null
+  codexConfigSyncWarning:
+    | 'managed-home-unavailable'
+    | 'missing-source'
+    | 'blank-source'
+    | 'unreadable-source'
+    | null
+  codexRateLimits: ProviderRateLimits | null
+  codexRateLimitTarget: RateLimitRuntimeTarget
+  setRemoveCodexTarget: Dispatch<SetStateAction<RemoveAccountTarget | null>>
+  runCodexAccountAction: CodexAccountActionRunner
+  recordOpenCodeSettingEdit: (field: 'cookie' | 'workspaceId') => void
+  miniMaxRateLimits: ProviderRateLimits | null
+  miniMaxCookieDraft: string
+  setMiniMaxCookieDraft: Dispatch<SetStateAction<string>>
+  miniMaxConfigured: boolean
+  miniMaxCredentialBusy: boolean
+  saveMiniMaxCookie: () => Promise<void>
+  clearMiniMaxCookie: () => Promise<void>
+}
diff --git a/src/renderer/src/components/settings/agent-skill-installed-command-callers.test.ts b/src/renderer/src/components/settings/agent-skill-installed-command-callers.test.ts
index 5e913c1a85b..2e1c44bc23c 100644
--- a/src/renderer/src/components/settings/agent-skill-installed-command-callers.test.ts
+++ b/src/renderer/src/components/settings/agent-skill-installed-command-callers.test.ts
@@ -195,7 +195,7 @@ describe('AgentSkillSetupPanel installed-command call sites', () => {
         'activeSkillRuntime.canUseLocalSkillFreshness ? ORCA_CLI_SKILL_NAME : undefined'
       ],
       [
-        'src/renderer/src/components/settings/Settings.tsx',
+        'src/renderer/src/components/settings/use-settings-store-model.ts',
         'useSkillFreshness(skillFreshnessApplies)'
       ],
       [
diff --git a/src/renderer/src/components/settings/appearance-sidebar-search.ts b/src/renderer/src/components/settings/appearance-sidebar-search.ts
index bb3ac17e7a3..ab77d2a0ad0 100644
--- a/src/renderer/src/components/settings/appearance-sidebar-search.ts
+++ b/src/renderer/src/components/settings/appearance-sidebar-search.ts
@@ -3,81 +3,77 @@ import { createLocalizedCatalog } from '@/i18n/localized-catalog'
 import { translate } from '@/i18n/i18n'
 import { translateSearchKeyword } from './settings-search-keywords'
 
-export const getLeftSidebarAppearanceEntry = createLocalizedCatalog(
-  (): SettingsSearchEntry => ({
-    title: translate(
-      'auto.components.settings.appearance.search.leftSidebarAppearance.title',
-      'Left Sidebar Appearance'
+export const getLeftSidebarAppearanceEntry = createLocalizedCatalog((): SettingsSearchEntry => ({
+  title: translate(
+    'auto.components.settings.appearance.search.leftSidebarAppearance.title',
+    'Left Sidebar Appearance'
+  ),
+  description: translate(
+    'auto.components.settings.appearance.search.leftSidebarAppearance.description',
+    'Make the left sidebar match your terminal, stay default, or use a tint.'
+  ),
+  keywords: [
+    ...translateSearchKeyword('auto.components.settings.appearance.search.5bff6a2ef0', 'sidebar'),
+    ...translateSearchKeyword(
+      'auto.components.settings.appearance.search.leftSidebarAppearance.project',
+      'project'
     ),
-    description: translate(
-      'auto.components.settings.appearance.search.leftSidebarAppearance.description',
-      'Make the left sidebar match your terminal, stay default, or use a tint.'
+    ...translateSearchKeyword(
+      'auto.components.settings.appearance.search.leftSidebarAppearance.terminal',
+      'terminal'
     ),
-    keywords: [
-      ...translateSearchKeyword('auto.components.settings.appearance.search.5bff6a2ef0', 'sidebar'),
-      ...translateSearchKeyword(
-        'auto.components.settings.appearance.search.leftSidebarAppearance.project',
-        'project'
-      ),
-      ...translateSearchKeyword(
-        'auto.components.settings.appearance.search.leftSidebarAppearance.terminal',
-        'terminal'
-      ),
-      ...translateSearchKeyword(
-        'auto.components.settings.appearance.search.leftSidebarAppearance.background',
-        'background'
-      ),
-      ...translateSearchKeyword(
-        'auto.components.settings.appearance.search.leftSidebarAppearance.tint',
-        'tint'
-      )
-    ]
-  })
-)
+    ...translateSearchKeyword(
+      'auto.components.settings.appearance.search.leftSidebarAppearance.background',
+      'background'
+    ),
+    ...translateSearchKeyword(
+      'auto.components.settings.appearance.search.leftSidebarAppearance.tint',
+      'tint'
+    )
+  ]
+}))
 
-export const getWorkspaceCardLayoutEntry = createLocalizedCatalog(
-  (): SettingsSearchEntry => ({
-    title: translate(
-      'auto.components.settings.appearance.search.workspaceCardLayout.title',
-      'Workspace Card Layout'
+export const getWorkspaceCardLayoutEntry = createLocalizedCatalog((): SettingsSearchEntry => ({
+  title: translate(
+    'auto.components.settings.appearance.search.workspaceCardLayout.title',
+    'Workspace Card Layout'
+  ),
+  description: translate(
+    'auto.components.settings.appearance.search.workspaceCardLayout.description',
+    'Workspace cards can use compact or detailed layouts.'
+  ),
+  keywords: [
+    ...translateSearchKeyword(
+      'auto.components.settings.appearance.search.workspaceCardLayout.compact',
+      'compact'
     ),
-    description: translate(
-      'auto.components.settings.appearance.search.workspaceCardLayout.description',
-      'Workspace cards can use compact or detailed layouts.'
+    ...translateSearchKeyword(
+      'auto.components.settings.appearance.search.workspaceCardLayout.compactDisplay',
+      'compact display'
     ),
-    keywords: [
-      ...translateSearchKeyword(
-        'auto.components.settings.appearance.search.workspaceCardLayout.compact',
-        'compact'
-      ),
-      ...translateSearchKeyword(
-        'auto.components.settings.appearance.search.workspaceCardLayout.compactDisplay',
-        'compact display'
-      ),
-      ...translateSearchKeyword(
-        'auto.components.settings.appearance.search.workspaceCardLayout.workspaceCards',
-        'workspace cards'
-      ),
-      ...translateSearchKeyword(
-        'auto.components.settings.appearance.search.workspaceCardLayout.worktreeCards',
-        'worktree cards'
-      ),
-      ...translateSearchKeyword('auto.components.settings.appearance.search.5bff6a2ef0', 'sidebar'),
-      ...translateSearchKeyword(
-        'auto.components.settings.appearance.search.workspaceCardLayout.cardLayout',
-        'card layout'
-      ),
-      ...translateSearchKeyword(
-        'auto.components.settings.appearance.search.workspaceCardLayout.workspaceOptions',
-        'workspace options'
-      ),
-      ...translateSearchKeyword(
-        'auto.components.settings.appearance.search.workspaceCardLayout.detailed',
-        'detailed'
-      )
-    ]
-  })
-)
+    ...translateSearchKeyword(
+      'auto.components.settings.appearance.search.workspaceCardLayout.workspaceCards',
+      'workspace cards'
+    ),
+    ...translateSearchKeyword(
+      'auto.components.settings.appearance.search.workspaceCardLayout.worktreeCards',
+      'worktree cards'
+    ),
+    ...translateSearchKeyword('auto.components.settings.appearance.search.5bff6a2ef0', 'sidebar'),
+    ...translateSearchKeyword(
+      'auto.components.settings.appearance.search.workspaceCardLayout.cardLayout',
+      'card layout'
+    ),
+    ...translateSearchKeyword(
+      'auto.components.settings.appearance.search.workspaceCardLayout.workspaceOptions',
+      'workspace options'
+    ),
+    ...translateSearchKeyword(
+      'auto.components.settings.appearance.search.workspaceCardLayout.detailed',
+      'detailed'
+    )
+  ]
+}))
 
 export const getShowPinnedWorktreesInGroupsEntry = createLocalizedCatalog(
   (): SettingsSearchEntry => ({
diff --git a/src/renderer/src/components/settings/ephemeral-vms-search.ts b/src/renderer/src/components/settings/ephemeral-vms-search.ts
index 654c5d52dda..8870d515858 100644
--- a/src/renderer/src/components/settings/ephemeral-vms-search.ts
+++ b/src/renderer/src/components/settings/ephemeral-vms-search.ts
@@ -3,36 +3,31 @@ import { translate } from '@/i18n/i18n'
 import { translateSearchKeyword } from './settings-search-keywords'
 import { createLocalizedCatalog } from '@/i18n/localized-catalog'
 
-export const getEphemeralVmsSearchEntry = createLocalizedCatalog(
-  (): SettingsSearchEntry => ({
-    title: translate('auto.components.settings.ephemeralVms.search.cloudVmTitle', 'Cloud VM'),
-    description: translate(
-      'auto.components.settings.ephemeralVms.search.description',
-      'Learn how repo-owned recipes give each workspace its own on-demand, disposable environment.'
+export const getEphemeralVmsSearchEntry = createLocalizedCatalog((): SettingsSearchEntry => ({
+  title: translate('auto.components.settings.ephemeralVms.search.cloudVmTitle', 'Cloud VM'),
+  description: translate(
+    'auto.components.settings.ephemeralVms.search.description',
+    'Learn how repo-owned recipes give each workspace its own on-demand, disposable environment.'
+  ),
+  keywords: [
+    ...translateSearchKeyword(
+      'auto.components.settings.experimental.search.0d24759f14',
+      'experimental'
     ),
-    keywords: [
-      ...translateSearchKeyword(
-        'auto.components.settings.experimental.search.0d24759f14',
-        'experimental'
-      ),
-      ...translateSearchKeyword('auto.components.settings.ephemeralVms.search.keywordVm', 'vm'),
-      ...translateSearchKeyword(
-        'auto.components.settings.ephemeralVms.search.keywordSandbox',
-        'sandbox'
-      ),
-      ...translateSearchKeyword(
-        'auto.components.settings.ephemeralVms.search.keywordCloud',
-        'cloud'
-      ),
-      ...translateSearchKeyword(
-        'auto.components.settings.ephemeralVms.search.keywordRecipe',
-        'recipe'
-      ),
-      ...translateSearchKeyword(
-        'auto.components.settings.ephemeralVms.search.keywordEphemeral',
-        'ephemeral'
-      )
-    ],
-    targetSectionId: 'ephemeral-vms'
-  })
-)
+    ...translateSearchKeyword('auto.components.settings.ephemeralVms.search.keywordVm', 'vm'),
+    ...translateSearchKeyword(
+      'auto.components.settings.ephemeralVms.search.keywordSandbox',
+      'sandbox'
+    ),
+    ...translateSearchKeyword('auto.components.settings.ephemeralVms.search.keywordCloud', 'cloud'),
+    ...translateSearchKeyword(
+      'auto.components.settings.ephemeralVms.search.keywordRecipe',
+      'recipe'
+    ),
+    ...translateSearchKeyword(
+      'auto.components.settings.ephemeralVms.search.keywordEphemeral',
+      'ephemeral'
+    )
+  ],
+  targetSectionId: 'ephemeral-vms'
+}))
diff --git a/src/renderer/src/components/settings/mobile-settings-search.ts b/src/renderer/src/components/settings/mobile-settings-search.ts
index 6fce884fc12..3afa610f44b 100644
--- a/src/renderer/src/components/settings/mobile-settings-search.ts
+++ b/src/renderer/src/components/settings/mobile-settings-search.ts
@@ -4,63 +4,46 @@ import { translate } from '@/i18n/i18n'
 import { translateSearchKeyword } from './settings-search-keywords'
 import { createLocalizedCatalog } from '@/i18n/localized-catalog'
 
-export const getMobileOverviewSearchEntry = createLocalizedCatalog(
-  (): SettingsSearchEntry => ({
-    title: translate('auto.components.settings.mobile.settings.search.ffd52a96e4', 'Mobile'),
-    description: translate(
-      'auto.components.settings.mobile.settings.search.671eb4173c',
-      'Control terminals and agents from your phone.'
+export const getMobileOverviewSearchEntry = createLocalizedCatalog((): SettingsSearchEntry => ({
+  title: translate('auto.components.settings.mobile.settings.search.ffd52a96e4', 'Mobile'),
+  description: translate(
+    'auto.components.settings.mobile.settings.search.671eb4173c',
+    'Control terminals and agents from your phone.'
+  ),
+  keywords: [
+    ...translateSearchKeyword(
+      'auto.components.settings.mobile.settings.search.f213400800',
+      'mobile'
     ),
-    keywords: [
-      ...translateSearchKeyword(
-        'auto.components.settings.mobile.settings.search.f213400800',
-        'mobile'
-      ),
-      ...translateSearchKeyword(
-        'auto.components.settings.mobile.settings.search.f4ed142753',
-        'phone'
-      ),
-      ...translateSearchKeyword(
-        'auto.components.settings.mobile.settings.search.5d5af8e041',
-        'iphone'
-      ),
-      ...translateSearchKeyword(
-        'auto.components.settings.mobile.settings.search.cf2c93b479',
-        'pair'
-      ),
-      ...translateSearchKeyword('auto.components.settings.mobile.settings.search.87816d1c59', 'qr'),
-      ...translateSearchKeyword(
-        'auto.components.settings.mobile.settings.search.59b1d75fd1',
-        'code'
-      ),
-      ...translateSearchKeyword(
-        'auto.components.settings.mobile.settings.search.0b7e585cb9',
-        'scan'
-      ),
-      ...translateSearchKeyword(
-        'auto.components.settings.mobile.settings.search.7e801801ac',
-        'remote'
-      ),
-      ...translateSearchKeyword(
-        'auto.components.settings.mobile.settings.search.e4f4daea0e',
-        'relay'
-      ),
-      ...translateSearchKeyword(
-        'auto.components.settings.mobile.settings.search.a7eececc1d',
-        'android'
-      ),
-      ...translateSearchKeyword(
-        'auto.components.settings.mobile.settings.search.6bfa001752',
-        'apk'
-      ),
-      ...translateSearchKeyword(
-        'auto.components.settings.mobile.settings.search.8d4ba0ef09',
-        'beta'
-      ),
-      ...translateSearchKeyword('auto.components.settings.mobile.settings.search.b730ff7049', 'app')
-    ]
-  })
-)
+    ...translateSearchKeyword(
+      'auto.components.settings.mobile.settings.search.f4ed142753',
+      'phone'
+    ),
+    ...translateSearchKeyword(
+      'auto.components.settings.mobile.settings.search.5d5af8e041',
+      'iphone'
+    ),
+    ...translateSearchKeyword('auto.components.settings.mobile.settings.search.cf2c93b479', 'pair'),
+    ...translateSearchKeyword('auto.components.settings.mobile.settings.search.87816d1c59', 'qr'),
+    ...translateSearchKeyword('auto.components.settings.mobile.settings.search.59b1d75fd1', 'code'),
+    ...translateSearchKeyword('auto.components.settings.mobile.settings.search.0b7e585cb9', 'scan'),
+    ...translateSearchKeyword(
+      'auto.components.settings.mobile.settings.search.7e801801ac',
+      'remote'
+    ),
+    ...translateSearchKeyword(
+      'auto.components.settings.mobile.settings.search.e4f4daea0e',
+      'relay'
+    ),
+    ...translateSearchKeyword(
+      'auto.components.settings.mobile.settings.search.a7eececc1d',
+      'android'
+    ),
+    ...translateSearchKeyword('auto.components.settings.mobile.settings.search.6bfa001752', 'apk'),
+    ...translateSearchKeyword('auto.components.settings.mobile.settings.search.8d4ba0ef09', 'beta'),
+    ...translateSearchKeyword('auto.components.settings.mobile.settings.search.b730ff7049', 'app')
+  ]
+}))
 
 export const getMobileSidebarShortcutSearchEntry = createLocalizedCatalog(
   (): SettingsSearchEntry => ({
diff --git a/src/renderer/src/components/settings/runtime-active-server-section.tsx b/src/renderer/src/components/settings/runtime-active-server-section.tsx
new file mode 100644
index 00000000000..0a7c4265999
--- /dev/null
+++ b/src/renderer/src/components/settings/runtime-active-server-section.tsx
@@ -0,0 +1,211 @@
+import { ChevronDown, Loader2, RefreshCw } from 'lucide-react'
+import type { PublicKnownRuntimeEnvironment } from '../../../../shared/runtime-environments'
+import { translate } from '@/i18n/i18n'
+import { cn } from '@/lib/utils'
+import { Button } from '../ui/button'
+import { Label } from '../ui/label'
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '../ui/select'
+import {
+  getActiveServerModeDescription,
+  getHostModelCapabilitySummary,
+  getRuntimeCapabilitiesSummary,
+  type RuntimeHostDetails
+} from './runtime-environment-host-details'
+
+type RuntimeActiveServerSectionProps = {
+  visible: boolean
+  advancedOpen: boolean
+  allowLocalRuntime: boolean
+  localRuntimeValue: string
+  noRuntimeValue: string
+  activeValue: string
+  environments: PublicKnownRuntimeEnvironment[]
+  detailsByEnvironmentId: Record<string, RuntimeHostDetails>
+  isBusy: boolean
+  isLoading: boolean
+  onToggleAdvanced: () => void
+  onValueChange: (value: string) => void
+  onRefresh: () => void
+}
+
+export function RuntimeActiveServerSection({
+  visible,
+  advancedOpen,
+  allowLocalRuntime,
+  localRuntimeValue,
+  noRuntimeValue,
+  activeValue,
+  environments,
+  detailsByEnvironmentId,
+  isBusy,
+  isLoading,
+  onToggleAdvanced,
+  onValueChange,
+  onRefresh
+}: RuntimeActiveServerSectionProps): React.JSX.Element {
+  return (
+    <div data-settings-section="default-runtime" className={!visible ? 'hidden' : undefined}>
+      <Button
+        type="button"
+        variant="ghost"
+        size="sm"
+        onClick={onToggleAdvanced}
+        className="-ml-2 text-xs"
+        aria-expanded={advancedOpen}
+        aria-controls="runtime-server-advanced-content"
+      >
+        {translate('auto.components.settings.RuntimeEnvironmentsPane.advanced', 'Advanced')}
+        <ChevronDown className={cn('size-4 transition-transform', advancedOpen && 'rotate-180')} />
+      </Button>
+
+      <div
+        id="runtime-server-advanced-content"
+        className={cn(
+          'grid overflow-hidden transition-[grid-template-rows] duration-200 ease-out',
+          advancedOpen ? 'grid-rows-[1fr]' : 'grid-rows-[0fr]'
+        )}
+        aria-hidden={!advancedOpen}
+        inert={!advancedOpen}
+      >
+        <div className="min-h-0">
+          <div
+            className={cn(
+              'space-y-2 px-1 pt-3 pb-1 transition-[opacity,transform] duration-150 ease-out',
+              advancedOpen
+                ? 'translate-y-0 opacity-100 delay-200'
+                : '-translate-y-1 opacity-0 delay-0'
+            )}
+          >
+            <div className="space-y-1">
+              <Label id="runtime-active-server-label">
+                {translate(
+                  'auto.components.settings.RuntimeEnvironmentsPane.64b6bea541',
+                  'Active Server'
+                )}
+              </Label>
+              <p className="text-xs text-muted-foreground">
+                {getActiveServerModeDescription(allowLocalRuntime)}
+              </p>
+            </div>
+            <div className="flex flex-wrap items-center gap-2">
+              <Select
+                value={activeValue}
+                onValueChange={(value) => {
+                  if (value !== activeValue) {
+                    onValueChange(value)
+                  }
+                }}
+                disabled={isBusy}
+              >
+                <SelectTrigger
+                  size="sm"
+                  className="min-w-[260px]"
+                  aria-labelledby="runtime-active-server-label"
+                >
+                  <SelectValue />
+                </SelectTrigger>
+                <SelectContent>
+                  {allowLocalRuntime ? (
+                    <SelectItem value={localRuntimeValue}>
+                      {translate(
+                        'auto.components.settings.RuntimeEnvironmentsPane.78692becbd',
+                        'Local desktop'
+                      )}
+                    </SelectItem>
+                  ) : environments.length === 0 ? (
+                    <SelectItem value={noRuntimeValue} disabled>
+                      {translate(
+                        'auto.components.settings.RuntimeEnvironmentsPane.b07070ed3c',
+                        'No server connected'
+                      )}
+                    </SelectItem>
+                  ) : null}
+                  {environments.map((environment) => (
+                    <SelectItem key={environment.id} value={environment.id}>
+                      {environment.name}
+                    </SelectItem>
+                  ))}
+                </SelectContent>
+              </Select>
+              <Button
+                type="button"
+                variant="outline"
+                size="icon-sm"
+                aria-label={translate(
+                  'auto.components.settings.RuntimeEnvironmentsPane.6ce4664003',
+                  'Refresh servers'
+                )}
+                title={translate(
+                  'auto.components.settings.RuntimeEnvironmentsPane.6ce4664003',
+                  'Refresh servers'
+                )}
+                onClick={onRefresh}
+                disabled={isLoading || isBusy}
+              >
+                {isLoading ? <Loader2 className="animate-spin" /> : <RefreshCw />}
+              </Button>
+            </div>
+            {environments.length > 0 ? (
+              <div className="space-y-2 pt-2">
+                <div className="text-xs font-medium">
+                  {translate(
+                    'auto.components.settings.RuntimeEnvironmentsPane.serverDetails',
+                    'Server details'
+                  )}
+                </div>
+                <div className="space-y-1 rounded-lg border border-border/50 bg-card/30 p-2">
+                  {environments.map((environment) => {
+                    const details = detailsByEnvironmentId[environment.id]
+                    return (
+                      <div
+                        key={environment.id}
+                        className="grid gap-1 rounded-md px-2 py-1.5 text-[11px] text-muted-foreground sm:grid-cols-[minmax(0,9rem)_minmax(0,1fr)]"
+                      >
+                        <div className="truncate font-medium text-foreground">
+                          {environment.name}
+                        </div>
+                        <div className="min-w-0 space-y-0.5">
+                          <div className="truncate font-mono">
+                            {environment.endpoints[0]?.endpoint ??
+                              translate(
+                                'auto.components.settings.RuntimeEnvironmentsPane.6ef71985da',
+                                'No endpoint'
+                              )}
+                          </div>
+                          {details?.runtimeStatus ? (
+                            <div className="truncate">
+                              {translate(
+                                'auto.components.settings.RuntimeEnvironmentsPane.0ef838094a',
+                                'Protocol {{value0}}',
+                                {
+                                  value0:
+                                    details.runtimeStatus?.runtimeProtocolVersion ??
+                                    details.runtimeStatus?.protocolVersion ??
+                                    0
+                                }
+                              )}
+                              {details.runtimeStatus.hostPlatform
+                                ? ` · ${details.runtimeStatus.hostPlatform}`
+                                : ''}
+                              {' · '}
+                              {getRuntimeCapabilitiesSummary(details.runtimeStatus)}
+                            </div>
+                          ) : null}
+                          {getHostModelCapabilitySummary(details?.runtimeStatus) ? (
+                            <div className="truncate">
+                              {getHostModelCapabilitySummary(details?.runtimeStatus)}
+                            </div>
+                          ) : null}
+                        </div>
+                      </div>
+                    )
+                  })}
+                </div>
+              </div>
+            ) : null}
+          </div>
+        </div>
+      </div>
+    </div>
+  )
+}
diff --git a/src/renderer/src/components/settings/runtime-environment-dialogs.tsx b/src/renderer/src/components/settings/runtime-environment-dialogs.tsx
new file mode 100644
index 00000000000..990f9d5d713
--- /dev/null
+++ b/src/renderer/src/components/settings/runtime-environment-dialogs.tsx
@@ -0,0 +1,140 @@
+import { Loader2, Trash2 } from 'lucide-react'
+import type { PublicKnownRuntimeEnvironment } from '../../../../shared/runtime-environments'
+import { translate } from '@/i18n/i18n'
+import { Button } from '../ui/button'
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle
+} from '../ui/dialog'
+
+export function RuntimeEnvironmentSwitchDialog({
+  pendingSwitchValue,
+  switchingValue,
+  switchError,
+  getEnvironmentLabel,
+  onOpenChange,
+  onCancel,
+  onConfirm
+}: {
+  pendingSwitchValue: string | null
+  switchingValue: string | null
+  switchError: string | null
+  getEnvironmentLabel: (value: string) => string
+  onOpenChange: (open: boolean) => void
+  onCancel: () => void
+  onConfirm: () => void
+}): React.JSX.Element {
+  return (
+    <Dialog open={pendingSwitchValue !== null} onOpenChange={onOpenChange}>
+      <DialogContent className="max-w-sm sm:max-w-sm" showCloseButton={false}>
+        <DialogHeader>
+          <DialogTitle className="text-sm">
+            {translate(
+              'auto.components.settings.RuntimeEnvironmentsPane.d570c35a99',
+              'Switch Server'
+            )}
+          </DialogTitle>
+          <DialogDescription>
+            {translate(
+              'auto.components.settings.RuntimeEnvironmentsPane.b2290ed203',
+              'Orca will focus this host and load its projects. Existing terminals and browser tabs on other hosts stay alive.'
+            )}
+          </DialogDescription>
+        </DialogHeader>
+        {pendingSwitchValue ? (
+          <div className="rounded-md border border-border/70 bg-muted/35 px-3 py-2 text-xs">
+            <div className="text-muted-foreground">
+              {translate(
+                'auto.components.settings.RuntimeEnvironmentsPane.05e0fc3ebf',
+                'Switch to'
+              )}
+            </div>
+            <div className="mt-0.5 truncate font-medium">
+              {getEnvironmentLabel(pendingSwitchValue)}
+            </div>
+          </div>
+        ) : null}
+        {switchError ? <p className="text-sm text-destructive">{switchError}</p> : null}
+        <DialogFooter>
+          <Button variant="outline" onClick={onCancel} disabled={switchingValue !== null}>
+            {translate('auto.components.settings.RuntimeEnvironmentsPane.af53761f31', 'Cancel')}
+          </Button>
+          <Button onClick={onConfirm} disabled={switchingValue !== null}>
+            {switchingValue !== null ? <Loader2 className="animate-spin" /> : null}
+            {translate('auto.components.settings.RuntimeEnvironmentsPane.d2e00809e4', 'Switch')}
+          </Button>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  )
+}
+
+export function RuntimeEnvironmentRemoveDialog({
+  pendingRemove,
+  removingId,
+  removeError,
+  removingActiveServer,
+  onOpenChange,
+  onCancel,
+  onConfirm
+}: {
+  pendingRemove: PublicKnownRuntimeEnvironment | null
+  removingId: string | null
+  removeError: string | null
+  removingActiveServer: boolean
+  onOpenChange: (open: boolean) => void
+  onCancel: () => void
+  onConfirm: () => void
+}): React.JSX.Element {
+  return (
+    <Dialog open={pendingRemove !== null} onOpenChange={onOpenChange}>
+      <DialogContent className="max-w-sm sm:max-w-sm" showCloseButton={false}>
+        <DialogHeader>
+          <DialogTitle className="text-sm">
+            {translate(
+              'auto.components.settings.RuntimeEnvironmentsPane.bb90dd6487',
+              'Remove Server'
+            )}
+          </DialogTitle>
+          <DialogDescription>
+            {removingActiveServer
+              ? translate(
+                  'auto.components.settings.RuntimeEnvironmentsPane.removeActiveServerDescription',
+                  'Choose another Active Server in Advanced before removing this server. Existing host sessions are left alone.'
+                )
+              : translate(
+                  'auto.components.settings.RuntimeEnvironmentsPane.ed3e3f069d',
+                  'This removes the saved server from Orca. It does not change the active server.'
+                )}
+          </DialogDescription>
+        </DialogHeader>
+        {pendingRemove ? (
+          <div className="rounded-md border border-border/70 bg-muted/35 px-3 py-2 text-xs">
+            <div className="truncate font-medium">{pendingRemove.name}</div>
+            <div className="mt-0.5 truncate font-mono text-muted-foreground">
+              {pendingRemove.endpoints[0]?.endpoint ??
+                translate(
+                  'auto.components.settings.RuntimeEnvironmentsPane.6ef71985da',
+                  'No endpoint'
+                )}
+            </div>
+          </div>
+        ) : null}
+        {removeError ? <p className="text-sm text-destructive">{removeError}</p> : null}
+        <DialogFooter>
+          <Button variant="outline" onClick={onCancel} disabled={removingId !== null}>
+            {translate('auto.components.settings.RuntimeEnvironmentsPane.af53761f31', 'Cancel')}
+          </Button>
+          <Button variant="destructive" onClick={onConfirm} disabled={removingId !== null}>
+            {removingId !== null ? <Loader2 className="animate-spin" /> : <Trash2 />}
+            {translate('auto.components.settings.RuntimeEnvironmentsPane.d25f0688b1', 'Remove')}
+          </Button>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  )
+}
diff --git a/src/renderer/src/components/settings/runtime-environment-host-details.ts b/src/renderer/src/components/settings/runtime-environment-host-details.ts
new file mode 100644
index 00000000000..03030733e97
--- /dev/null
+++ b/src/renderer/src/components/settings/runtime-environment-host-details.ts
@@ -0,0 +1,197 @@
+import { translate } from '@/i18n/i18n'
+import {
+  describeRuntimeCompatBlock,
+  evaluateRuntimeCompat,
+  type RuntimeCompatVerdict
+} from '../../../../shared/protocol-compat'
+import {
+  MIN_COMPATIBLE_RUNTIME_SERVER_VERSION,
+  PROJECT_HOST_SETUP_RUNTIME_CAPABILITY,
+  RUNTIME_PROTOCOL_VERSION,
+  TASK_SOURCE_CONTEXT_RUNTIME_CAPABILITY,
+  WORKSPACE_RUN_CONTEXT_RUNTIME_CAPABILITY
+} from '../../../../shared/protocol-version'
+import type { RuntimeStatus } from '../../../../shared/runtime-types'
+
+export type RuntimeHostDetails = {
+  status: 'loading' | 'ready' | 'error'
+  runtimeStatus: RuntimeStatus | null
+  compatibility: RuntimeCompatVerdict | null
+  error: string | null
+}
+
+export function evaluateHostDetails(status: RuntimeStatus): RuntimeCompatVerdict {
+  return evaluateRuntimeCompat({
+    clientProtocolVersion: RUNTIME_PROTOCOL_VERSION,
+    minCompatibleServerProtocolVersion: MIN_COMPATIBLE_RUNTIME_SERVER_VERSION,
+    serverProtocolVersion: status.runtimeProtocolVersion ?? status.protocolVersion,
+    serverMinCompatibleClientProtocolVersion:
+      status.minCompatibleRuntimeClientVersion ?? status.minCompatibleMobileVersion
+  })
+}
+
+export function getHostDetailsSummary(details: RuntimeHostDetails | undefined): string {
+  if (!details || details.status === 'loading') {
+    return translate('auto.components.settings.RuntimeEnvironmentsPane.5120beaac6', 'Checking…')
+  }
+  if (details.status === 'error') {
+    return translate(
+      'auto.components.settings.RuntimeEnvironmentsPane.c8791efc45',
+      'Status unavailable'
+    )
+  }
+  if (details.compatibility?.kind === 'blocked') {
+    return details.compatibility.reason === 'client-too-old'
+      ? translate('auto.components.settings.RuntimeEnvironmentsPane.62ac182a27', 'Update client')
+      : translate('auto.components.settings.RuntimeEnvironmentsPane.86ed75bec8', 'Update server')
+  }
+  return translate('auto.components.settings.RuntimeEnvironmentsPane.9a91c4a0eb', 'Compatible')
+}
+
+export function getHostDetailsDescription(details: RuntimeHostDetails | undefined): string | null {
+  if (!details || details.status === 'loading') {
+    return null
+  }
+  if (details.status === 'error') {
+    return details.error
+  }
+  if (details.compatibility?.kind === 'blocked') {
+    return describeRuntimeCompatBlock(details.compatibility)
+  }
+  return null
+}
+
+export function getRuntimeCapabilitiesSummary(status: RuntimeStatus | null | undefined): string {
+  const capabilities = status?.capabilities ?? []
+  if (capabilities.length === 0) {
+    return translate(
+      'auto.components.settings.RuntimeEnvironmentsPane.4b5c6d7e8f',
+      'No capabilities reported'
+    )
+  }
+  const visibleCapabilities = capabilities.slice(0, 3).join(', ')
+  const hiddenCount = capabilities.length - 3
+  return hiddenCount > 0 ? `${visibleCapabilities} +${hiddenCount}` : visibleCapabilities
+}
+
+export function getHostModelCapabilitySummary(
+  status: RuntimeStatus | null | undefined
+): string | null {
+  if (!status) {
+    return null
+  }
+  const capabilities = status.capabilities
+  if (!capabilities) {
+    return translate(
+      'auto.components.settings.RuntimeEnvironmentsPane.hostModelCapabilityUnknown',
+      'Host model support: checking server capabilities'
+    )
+  }
+  const missing = [
+    PROJECT_HOST_SETUP_RUNTIME_CAPABILITY,
+    TASK_SOURCE_CONTEXT_RUNTIME_CAPABILITY,
+    WORKSPACE_RUN_CONTEXT_RUNTIME_CAPABILITY
+  ].filter((capability) => !capabilities.includes(capability))
+  if (missing.length === 0) {
+    return translate(
+      'auto.components.settings.RuntimeEnvironmentsPane.hostModelCapabilitySupported',
+      'Host model support: ready'
+    )
+  }
+  const missingLabels = missing.map(getHostModelCapabilityLabel)
+  return translate(
+    'auto.components.settings.RuntimeEnvironmentsPane.hostModelCapabilityMissing',
+    'Host model support: update server for {{value0}}',
+    { value0: missingLabels.join(', ') }
+  )
+}
+
+function getHostModelCapabilityLabel(capability: string): string {
+  switch (capability) {
+    case PROJECT_HOST_SETUP_RUNTIME_CAPABILITY:
+      return translate(
+        'auto.components.settings.RuntimeEnvironmentsPane.hostModelCapabilityProjectSetup',
+        'project setup'
+      )
+    case TASK_SOURCE_CONTEXT_RUNTIME_CAPABILITY:
+      return translate(
+        'auto.components.settings.RuntimeEnvironmentsPane.hostModelCapabilityTaskSourceContext',
+        'task source context'
+      )
+    case WORKSPACE_RUN_CONTEXT_RUNTIME_CAPABILITY:
+      return translate(
+        'auto.components.settings.RuntimeEnvironmentsPane.hostModelCapabilityWorkspaceRunContext',
+        'workspace run context'
+      )
+    default:
+      return capability
+  }
+}
+
+export function getActiveServerModeDescription(allowLocalRuntime: boolean): string {
+  return allowLocalRuntime
+    ? translate(
+        'auto.components.settings.RuntimeEnvironmentsPane.3f67e8078a',
+        'Use this computer by default. Choose a saved server only when you want supported projects, files, terminals, provider checks, and browser/mobile handoff to run through that server.'
+      )
+    : translate(
+        'auto.components.settings.RuntimeEnvironmentsPane.2c85efb3e8',
+        'Selecting a saved server makes this browser use that paired Orca runtime as its default Host.'
+      )
+}
+
+export function isRuntimeEnvironmentRemovalBlocked(
+  activeRuntimeEnvironmentId: string | null | undefined,
+  environmentId: string
+): boolean {
+  return activeRuntimeEnvironmentId === environmentId
+}
+
+export type RuntimeServerConnectionState = 'connected' | 'checking' | 'disconnected'
+
+export function getRuntimeServerConnectionState(
+  details: RuntimeHostDetails | undefined
+): RuntimeServerConnectionState {
+  if (!details || details.status === 'loading') {
+    return 'checking'
+  }
+  if (details.status !== 'ready' || details.compatibility?.kind === 'blocked') {
+    return 'disconnected'
+  }
+  // Why: an attached, reachable, compatible host is "Connected" (and exposes
+  // Disconnect). Whether it is the default *active* server is a separate concept,
+  // surfaced by the Advanced > Active Server selector and the row's help text —
+  // it must not change this connection label, or the dot/label/button disagree.
+  return 'connected'
+}
+
+export function getRuntimeServerConnectionLabel(state: RuntimeServerConnectionState): string {
+  switch (state) {
+    case 'connected':
+      return translate(
+        'auto.components.settings.RuntimeEnvironmentsPane.serverConnected',
+        'Connected'
+      )
+    case 'checking':
+      return translate(
+        'auto.components.settings.RuntimeEnvironmentsPane.serverChecking',
+        'Checking…'
+      )
+    case 'disconnected':
+      return translate(
+        'auto.components.settings.RuntimeEnvironmentsPane.serverDisconnected',
+        'Disconnected'
+      )
+  }
+}
+
+export function getRuntimeServerDotClass(state: RuntimeServerConnectionState): string {
+  switch (state) {
+    case 'connected':
+      return 'bg-emerald-500'
+    case 'checking':
+      return 'bg-yellow-500'
+    case 'disconnected':
+      return 'bg-muted-foreground/40'
+  }
+}
diff --git a/src/renderer/src/components/settings/runtime-environment-selection.ts b/src/renderer/src/components/settings/runtime-environment-selection.ts
new file mode 100644
index 00000000000..19fb57c096a
--- /dev/null
+++ b/src/renderer/src/components/settings/runtime-environment-selection.ts
@@ -0,0 +1,2 @@
+export const LOCAL_RUNTIME_VALUE = '__local__'
+export const NO_RUNTIME_VALUE = '__none__'
diff --git a/src/renderer/src/components/settings/runtime-server-row.tsx b/src/renderer/src/components/settings/runtime-server-row.tsx
new file mode 100644
index 00000000000..965e99d1ffb
--- /dev/null
+++ b/src/renderer/src/components/settings/runtime-server-row.tsx
@@ -0,0 +1,194 @@
+import { AlertTriangle, Loader2, Server, ServerOff, Trash2 } from 'lucide-react'
+import type { PublicKnownRuntimeEnvironment } from '../../../../shared/runtime-environments'
+import type { RemoteServerUpdateEntry } from '@/runtime/remote-server-update-coordinator'
+import { translate } from '@/i18n/i18n'
+import { cn } from '@/lib/utils'
+import { Button } from '../ui/button'
+import {
+  getHostDetailsDescription,
+  getHostDetailsSummary,
+  getRuntimeServerConnectionLabel,
+  getRuntimeServerConnectionState,
+  getRuntimeServerDotClass,
+  type RuntimeHostDetails
+} from './runtime-environment-host-details'
+import {
+  getRemoteServerManualUpdateHelp,
+  RemoteServerUpdateStatus
+} from './RemoteServerUpdateStatus'
+
+type RuntimeServerRowProps = {
+  environment: PublicKnownRuntimeEnvironment
+  details: RuntimeHostDetails | undefined
+  isActive: boolean
+  remoteUpdate: RemoteServerUpdateEntry | undefined
+  remoteServerUpdatesRunning: boolean
+  connecting: boolean
+  switching: boolean
+  disconnecting: boolean
+  removing: boolean
+  isBusy: boolean
+  onOpenUpdate: () => void
+  onDisconnect: (environment: PublicKnownRuntimeEnvironment) => void
+  onConnect: (environment: PublicKnownRuntimeEnvironment) => void
+  onRemove: (environment: PublicKnownRuntimeEnvironment) => void
+}
+
+export function RuntimeServerRow({
+  environment,
+  details,
+  isActive,
+  remoteUpdate,
+  remoteServerUpdatesRunning,
+  connecting,
+  switching,
+  disconnecting,
+  removing,
+  isBusy,
+  onOpenUpdate,
+  onDisconnect,
+  onConnect,
+  onRemove
+}: RuntimeServerRowProps): React.JSX.Element {
+  const detailsDescription = getHostDetailsDescription(details)
+  const connectionState = getRuntimeServerConnectionState(details)
+  // A connected host exposes Disconnect; otherwise Connect.
+  const isReachable = connectionState === 'connected'
+  const actionBusy = connecting || switching || disconnecting || removing
+
+  return (
+    <div data-settings-section={environment.id} className="flex items-center gap-3 px-4 py-3">
+      <Server className="size-4 shrink-0 text-muted-foreground" />
+      <div className="min-w-0 flex-1">
+        <div className="flex min-w-0 items-center gap-2">
+          <div className="truncate text-sm font-medium">{environment.name}</div>
+          <span
+            className={cn(
+              'size-2 shrink-0 rounded-full',
+              getRuntimeServerDotClass(connectionState)
+            )}
+          />
+          <span className="text-[11px] text-muted-foreground">
+            {getRuntimeServerConnectionLabel(connectionState)}
+          </span>
+          {details?.compatibility?.kind === 'blocked' ? (
+            <AlertTriangle className="size-3.5 shrink-0 text-destructive" />
+          ) : details?.status === 'loading' ? (
+            <Loader2 className="size-3.5 shrink-0 animate-spin text-muted-foreground" />
+          ) : null}
+        </div>
+        <p className="truncate text-xs text-muted-foreground">
+          {environment.connectionDependency === 'ssh-tunnel'
+            ? translate(
+                'auto.components.settings.RuntimeEnvironmentsPane.sshTunnelRequired',
+                'SSH tunnel required'
+              )
+            : isActive
+              ? translate(
+                  'auto.components.settings.RuntimeEnvironmentsPane.activeServerRowHelp',
+                  'Active server for server-routed projects, terminals, and provider checks.'
+                )
+              : getHostDetailsSummary(details)}
+        </p>
+        {detailsDescription ? (
+          <p
+            className={cn(
+              'mt-0.5 truncate text-xs',
+              details?.compatibility?.kind === 'blocked'
+                ? 'text-destructive'
+                : 'text-muted-foreground'
+            )}
+          >
+            {detailsDescription}
+          </p>
+        ) : null}
+        {remoteUpdate ? (
+          <div className="mt-1 flex flex-wrap items-center gap-2">
+            <span className="text-[11px] text-muted-foreground">
+              {remoteUpdate.currentVersion
+                ? translate(
+                    'auto.components.settings.RuntimeEnvironmentsPane.orcaVersion',
+                    'Orca v{{value0}}',
+                    { value0: remoteUpdate.currentVersion }
+                  )
+                : translate(
+                    'auto.components.settings.RuntimeEnvironmentsPane.versionUnavailable',
+                    'Orca version unavailable'
+                  )}
+            </span>
+            <RemoteServerUpdateStatus entry={remoteUpdate} compact />
+          </div>
+        ) : null}
+        {remoteUpdate?.phase === 'manual' ? (
+          <p className="mt-1 text-xs text-muted-foreground">
+            {getRemoteServerManualUpdateHelp(remoteUpdate)}
+          </p>
+        ) : null}
+        {remoteUpdate?.phase === 'failed' && remoteUpdate.error ? (
+          <p className="mt-1 text-xs text-destructive">{remoteUpdate.error}</p>
+        ) : null}
+      </div>
+      <div className="flex shrink-0 items-center gap-1">
+        {remoteUpdate?.phase === 'available' || remoteUpdate?.phase === 'failed' ? (
+          <Button
+            type="button"
+            variant="ghost"
+            size="xs"
+            onClick={onOpenUpdate}
+            disabled={remoteServerUpdatesRunning}
+          >
+            {translate('auto.components.settings.RuntimeEnvironmentsPane.updateServer', 'Update')}
+          </Button>
+        ) : null}
+        {isReachable ? (
+          <Button
+            type="button"
+            variant="ghost"
+            size="xs"
+            className="gap-1.5"
+            onClick={() => onDisconnect(environment)}
+            disabled={actionBusy}
+          >
+            {disconnecting ? (
+              <Loader2 className="size-3 animate-spin" />
+            ) : (
+              <ServerOff className="size-3" />
+            )}
+            {translate('auto.components.settings.RuntimeEnvironmentsPane.disconnect', 'Disconnect')}
+          </Button>
+        ) : (
+          <Button
+            type="button"
+            variant="ghost"
+            size="xs"
+            className="gap-1.5"
+            onClick={() => onConnect(environment)}
+            disabled={actionBusy || connectionState === 'checking'}
+          >
+            {connecting ? (
+              <Loader2 className="size-3 animate-spin" />
+            ) : (
+              <Server className="size-3" />
+            )}
+            {translate('auto.components.settings.RuntimeEnvironmentsPane.connect', 'Connect')}
+          </Button>
+        )}
+        <Button
+          type="button"
+          variant="ghost"
+          size="icon"
+          onClick={() => onRemove(environment)}
+          className="size-7 text-muted-foreground hover:text-red-400"
+          disabled={isBusy}
+          aria-label={translate(
+            'auto.components.settings.RuntimeEnvironmentsPane.aeb26635d2',
+            'Remove {{value0}}',
+            { value0: environment.name }
+          )}
+        >
+          {removing ? <Loader2 className="size-3 animate-spin" /> : <Trash2 className="size-3" />}
+        </Button>
+      </div>
+    </div>
+  )
+}
diff --git a/src/renderer/src/components/settings/runtime-server-workflow-sections.tsx b/src/renderer/src/components/settings/runtime-server-workflow-sections.tsx
new file mode 100644
index 00000000000..43211977c6d
--- /dev/null
+++ b/src/renderer/src/components/settings/runtime-server-workflow-sections.tsx
@@ -0,0 +1,224 @@
+import { ChevronDown, Share2 } from 'lucide-react'
+import { translate } from '@/i18n/i18n'
+import { cn } from '@/lib/utils'
+import { Button } from '../ui/button'
+import { RuntimePairingUrlGenerator } from './RuntimePairingUrlGenerator'
+
+export type RemoteServerWorkflow = 'connect' | 'cloud-vm' | 'share'
+
+export function RuntimeServerWorkflowPicker({
+  canGeneratePairingUrl,
+  visibleWorkflow,
+  onCloseAddServerForm,
+  onWorkflowChange
+}: {
+  canGeneratePairingUrl: boolean
+  visibleWorkflow: RemoteServerWorkflow
+  onCloseAddServerForm: () => void
+  onWorkflowChange: (workflow: RemoteServerWorkflow) => void
+}): React.JSX.Element {
+  return (
+    <div
+      role="group"
+      aria-label={translate(
+        'auto.components.settings.RuntimeEnvironmentsPane.workflow',
+        'Remote server workflow'
+      )}
+      className={cn('grid gap-2 sm:grid-cols-2', canGeneratePairingUrl && 'sm:grid-cols-3')}
+    >
+      {(
+        [
+          [
+            'connect',
+            translate(
+              'auto.components.settings.RuntimeEnvironmentsPane.connectWorkflow',
+              'Connect to a host'
+            ),
+            translate(
+              'auto.components.settings.RuntimeEnvironmentsPane.connectWorkflowHelp',
+              'This app joins another machine'
+            )
+          ],
+          [
+            'share',
+            translate(
+              'auto.components.settings.RuntimeEnvironmentsPane.shareWorkflow',
+              'Share this host'
+            ),
+            translate(
+              'auto.components.settings.RuntimeEnvironmentsPane.shareWorkflowHelp',
+              'Other devices join this machine'
+            )
+          ],
+          [
+            'cloud-vm',
+            translate(
+              'auto.components.settings.RuntimeEnvironmentsPane.cloudVmWorkflow',
+              'Cloud VM'
+            ),
+            translate(
+              'auto.components.settings.RuntimeEnvironmentsPane.cloudVmWorkflowHelp',
+              'Manage recipe-created cloud machines'
+            )
+          ]
+        ] as const
+      )
+        .filter(([value]) => value !== 'share' || canGeneratePairingUrl)
+        .map(([value, label, description]) => (
+          <button
+            key={value}
+            type="button"
+            aria-pressed={visibleWorkflow === value}
+            onClick={() => {
+              if (value !== 'connect') {
+                onCloseAddServerForm()
+              }
+              onWorkflowChange(value)
+            }}
+            className={cn(
+              'rounded-lg border p-3 text-left transition-colors',
+              visibleWorkflow === value
+                ? 'border-ring bg-accent text-accent-foreground'
+                : 'border-border hover:bg-accent'
+            )}
+          >
+            <span className="block text-sm font-medium">{label}</span>
+            <span
+              className={cn(
+                'mt-1 block text-xs',
+                visibleWorkflow === value ? 'text-accent-foreground' : 'text-muted-foreground'
+              )}
+            >
+              {description}
+            </span>
+          </button>
+        ))}
+    </div>
+  )
+}
+
+export function RuntimeServerShareSection({
+  shareServerFormOpen,
+  onToggleShareServerForm
+}: {
+  shareServerFormOpen: boolean
+  onToggleShareServerForm: () => void
+}): React.JSX.Element {
+  return (
+    <div className="space-y-3 pt-2">
+      <div className="space-y-0.5">
+        <div className="text-sm font-medium">
+          {translate(
+            'auto.components.settings.RuntimeEnvironmentsPane.advertiseThisApp',
+            'Advertise this app as a server'
+          )}
+        </div>
+        <p className="text-xs text-muted-foreground">
+          {translate(
+            'auto.components.settings.RuntimeEnvironmentsPane.advertiseThisAppHelp',
+            'Create access links for browsers, mobile clients, or another Orca client to connect back to this running app.'
+          )}
+        </p>
+      </div>
+      <div className="overflow-hidden rounded-lg border border-border/50 bg-card/30">
+        <div className="flex flex-wrap items-center justify-between gap-3 px-3 py-2.5">
+          <div className="min-w-0 space-y-0.5">
+            <div className="text-sm font-medium">
+              {translate(
+                'auto.components.settings.RuntimeEnvironmentsPane.6e1280ca55',
+                'Share this Orca server'
+              )}
+            </div>
+            <p className="text-xs text-muted-foreground">
+              {translate(
+                'auto.components.settings.RuntimeEnvironmentsPane.84b9b2be05',
+                'Create a revocable access grant so a browser or another Orca client can connect.'
+              )}
+            </p>
+          </div>
+          <Button
+            type="button"
+            variant="outline"
+            size="sm"
+            className="gap-1.5"
+            onClick={onToggleShareServerForm}
+          >
+            <Share2 />
+            {shareServerFormOpen
+              ? translate(
+                  'auto.components.settings.RuntimeEnvironmentsPane.54dee18f5c',
+                  'Hide Form'
+                )
+              : translate(
+                  'auto.components.settings.RuntimeEnvironmentsPane.3595fd1948',
+                  'New Link'
+                )}
+          </Button>
+        </div>
+        <div className="border-t border-border/40 px-3 py-3">
+          <RuntimePairingUrlGenerator
+            framed={false}
+            showHeader={false}
+            showGeneratorForm={shareServerFormOpen}
+          />
+        </div>
+      </div>
+    </div>
+  )
+}
+
+export function RuntimeServerTroubleshooting(): React.JSX.Element {
+  return (
+    <details className="group rounded-lg border border-border/60">
+      <summary className="flex cursor-pointer list-none items-center gap-2 p-4 text-sm font-medium">
+        {translate(
+          'auto.components.settings.RuntimeEnvironmentsPane.troubleshootWorkflow',
+          'Connection troubleshooting'
+        )}
+        <ChevronDown className="ml-auto size-4 transition-transform group-open:rotate-180" />
+      </summary>
+      <div className="space-y-4 border-t border-border/50 p-4">
+        <div className="space-y-1">
+          <div className="text-sm font-medium">
+            {translate(
+              'auto.components.settings.RuntimeEnvironmentsPane.troubleshootTitle',
+              'Create a new link on the other host'
+            )}
+          </div>
+          <p className="text-xs text-muted-foreground">
+            {translate(
+              'auto.components.settings.RuntimeEnvironmentsPane.troubleshootDescription',
+              'A link that uses 127.0.0.1 points back to the device opening it, not the computer that created it.'
+            )}
+          </p>
+        </div>
+        <ol className="ml-4 list-decimal space-y-1 text-xs text-muted-foreground">
+          <li>
+            {translate(
+              'auto.components.settings.RuntimeEnvironmentsPane.troubleshootStepShare',
+              'On the other computer, open Share this host.'
+            )}
+          </li>
+          <li>
+            {translate(
+              'auto.components.settings.RuntimeEnvironmentsPane.troubleshootStepAddress',
+              'Choose Another device and select its Tailscale or LAN address.'
+            )}
+          </li>
+          <li>
+            {translate(
+              'auto.components.settings.RuntimeEnvironmentsPane.troubleshootStepRegenerate',
+              'Generate a new access link and use only the newest link here.'
+            )}
+          </li>
+        </ol>
+        <div className="rounded-md border border-border/60 bg-muted/30 p-3 text-xs">
+          {translate(
+            'auto.components.settings.RuntimeEnvironmentsPane.troubleshootTunnel',
+            'Using an SSH local forward? Return to Connect to a host, paste the loopback link, then enable “I am using an SSH tunnel” under Advanced.'
+          )}
+        </div>
+      </div>
+    </details>
+  )
+}
diff --git a/src/renderer/src/components/settings/runtime-servers-connect-section.tsx b/src/renderer/src/components/settings/runtime-servers-connect-section.tsx
new file mode 100644
index 00000000000..90084aa0962
--- /dev/null
+++ b/src/renderer/src/components/settings/runtime-servers-connect-section.tsx
@@ -0,0 +1,187 @@
+import { Loader2, Plus, RefreshCw } from 'lucide-react'
+import type { PublicKnownRuntimeEnvironment } from '../../../../shared/runtime-environments'
+import type { UpdateCheckOptions } from '../../../../shared/update-status-types'
+import type { RemoteServerUpdateEntry } from '@/runtime/remote-server-update-coordinator'
+import { translate } from '@/i18n/i18n'
+import { cn } from '@/lib/utils'
+import { getUpdateCheckClickOptions, getUpdateCheckHint } from '@/lib/update-check-click-options'
+import { Button } from '../ui/button'
+import type { RuntimeHostDetails } from './runtime-environment-host-details'
+import { RuntimeHostAccessForm, type RuntimeHostAccessFailure } from './RuntimeHostAccessForm'
+import { RuntimeServerRow } from './runtime-server-row'
+
+type RuntimeServersConnectSectionProps = {
+  visible: boolean
+  environments: PublicKnownRuntimeEnvironment[]
+  detailsByEnvironmentId: Record<string, RuntimeHostDetails>
+  activeRuntimeEnvironmentId: string | null | undefined
+  addServerFormOpen: boolean
+  name: string
+  pairingCode: string
+  addServerFailure: RuntimeHostAccessFailure | null
+  isBusy: boolean
+  remoteServerUpdates: Map<string, RemoteServerUpdateEntry>
+  remoteServerUpdatesChecking: boolean
+  remoteServerUpdatesRunning: boolean
+  connectingId: string | null
+  switchingValue: string | null
+  disconnectingId: string | null
+  removingId: string | null
+  onOpenAddServerForm: () => void
+  onCloseAddServerForm: () => void
+  onNameChange: (value: string) => void
+  onPairingCodeChange: (value: string) => void
+  onAddEnvironment: (allowLoopback: boolean) => void
+  onOpenUpdateDialog: () => void
+  refreshRemoteServerUpdates: (options?: UpdateCheckOptions) => Promise<void>
+  onConnect: (environment: PublicKnownRuntimeEnvironment) => void
+  onDisconnect: (environment: PublicKnownRuntimeEnvironment) => void
+  onRemove: (environment: PublicKnownRuntimeEnvironment) => void
+}
+
+export function RuntimeServersConnectSection({
+  visible,
+  environments,
+  detailsByEnvironmentId,
+  activeRuntimeEnvironmentId,
+  addServerFormOpen,
+  name,
+  pairingCode,
+  addServerFailure,
+  isBusy,
+  remoteServerUpdates,
+  remoteServerUpdatesChecking,
+  remoteServerUpdatesRunning,
+  connectingId,
+  switchingValue,
+  disconnectingId,
+  removingId,
+  onOpenAddServerForm,
+  onCloseAddServerForm,
+  onNameChange,
+  onPairingCodeChange,
+  onAddEnvironment,
+  onOpenUpdateDialog,
+  refreshRemoteServerUpdates,
+  onConnect,
+  onDisconnect,
+  onRemove
+}: RuntimeServersConnectSectionProps): React.JSX.Element {
+  const updateCheckHint = getUpdateCheckHint()
+  return (
+    <div className={cn('space-y-3', !visible && 'hidden')}>
+      <div
+        data-settings-section="remote-server-updates"
+        className="flex items-center justify-between gap-3"
+      >
+        <div className="min-w-0 space-y-0.5">
+          <div className="text-sm font-medium">
+            {translate(
+              'auto.components.settings.RuntimeEnvironmentsPane.connectToRemoteServers',
+              'Connect to remote servers'
+            )}
+          </div>
+          <p className="text-xs text-muted-foreground">
+            {translate(
+              'auto.components.settings.RuntimeEnvironmentsPane.connectToRemoteServersHelp',
+              'Pair another Orca runtime, then connect or disconnect it here.'
+            )}
+          </p>
+        </div>
+        <div className="flex shrink-0 items-center gap-2">
+          {environments.length > 0 ? (
+            <Button
+              type="button"
+              variant="outline"
+              size="sm"
+              className="gap-1.5"
+              title={updateCheckHint}
+              onClick={(event) => {
+                onOpenUpdateDialog()
+                void refreshRemoteServerUpdates(getUpdateCheckClickOptions(event))
+              }}
+              disabled={remoteServerUpdatesChecking && remoteServerUpdates.size === 0}
+            >
+              {remoteServerUpdatesChecking || remoteServerUpdatesRunning ? (
+                <Loader2 className="animate-spin" />
+              ) : (
+                <RefreshCw />
+              )}
+              {remoteServerUpdatesRunning
+                ? translate(
+                    'auto.components.settings.RuntimeEnvironmentsPane.updatingServers',
+                    'Updating servers…'
+                  )
+                : translate(
+                    'auto.components.settings.RuntimeEnvironmentsPane.reviewServerUpdates',
+                    'Check for Server Updates'
+                  )}
+            </Button>
+          ) : null}
+          {addServerFormOpen ? null : (
+            <Button
+              type="button"
+              variant="outline"
+              size="sm"
+              className="gap-1.5"
+              onClick={onOpenAddServerForm}
+              disabled={isBusy}
+            >
+              <Plus />
+              {translate(
+                'auto.components.settings.RuntimeEnvironmentsPane.9bee6bbeeb',
+                'Add Server'
+              )}
+            </Button>
+          )}
+        </div>
+      </div>
+
+      {addServerFormOpen ? (
+        <RuntimeHostAccessForm
+          name={name}
+          accessLink={pairingCode}
+          busy={isBusy}
+          failure={addServerFailure}
+          onNameChange={onNameChange}
+          onAccessLinkChange={onPairingCodeChange}
+          onCancel={onCloseAddServerForm}
+          onSubmit={onAddEnvironment}
+        />
+      ) : null}
+
+      <div className="rounded-lg border border-border/50 bg-card/30">
+        {environments.length === 0 ? (
+          <div className="px-3 py-4 text-sm text-muted-foreground">
+            {translate(
+              'auto.components.settings.RuntimeEnvironmentsPane.9a3758d983',
+              'No saved servers.'
+            )}
+          </div>
+        ) : (
+          <div className="divide-y divide-border/50">
+            {environments.map((environment) => (
+              <RuntimeServerRow
+                key={environment.id}
+                environment={environment}
+                details={detailsByEnvironmentId[environment.id]}
+                isActive={activeRuntimeEnvironmentId === environment.id}
+                remoteUpdate={remoteServerUpdates.get(environment.id)}
+                remoteServerUpdatesRunning={remoteServerUpdatesRunning}
+                connecting={connectingId === environment.id}
+                switching={switchingValue === environment.id}
+                disconnecting={disconnectingId === environment.id}
+                removing={removingId === environment.id}
+                isBusy={isBusy}
+                onOpenUpdate={onOpenUpdateDialog}
+                onConnect={onConnect}
+                onDisconnect={onDisconnect}
+                onRemove={onRemove}
+              />
+            ))}
+          </div>
+        )}
+      </div>
+    </div>
+  )
+}
diff --git a/src/renderer/src/components/settings/settings-advanced-section-renderers.tsx b/src/renderer/src/components/settings/settings-advanced-section-renderers.tsx
new file mode 100644
index 00000000000..e2ba6a081a1
--- /dev/null
+++ b/src/renderer/src/components/settings/settings-advanced-section-renderers.tsx
@@ -0,0 +1,98 @@
+import { lazy, Suspense } from 'react'
+import { AdvancedPane } from './AdvancedPane'
+import { ExperimentalPane } from './ExperimentalPane'
+import { PluginsSettingsSection } from './PluginsSettingsSection'
+import { SettingsSection } from './SettingsSection'
+import { translate } from '@/i18n/i18n'
+import type { SettingsRenderContext } from './settings-render-context'
+
+const DevToolsPane = import.meta.env.DEV
+  ? lazy(() => import('./DevToolsPane').then((module) => ({ default: module.DevToolsPane })))
+  : null
+
+export function renderAdvancedSettingsSection(
+  context: SettingsRenderContext
+): React.JSX.Element | null {
+  const { model, navigation, view } = context
+  return model.showDesktopOnlySettings ? (
+    <SettingsSection
+      id="advanced"
+      title={translate('auto.components.settings.Settings.1c87f8d024', 'Advanced')}
+      description={translate(
+        'auto.components.settings.Settings.499c1cd7f9',
+        'Low-level compatibility settings for troubleshooting.'
+      )}
+      searchEntries={navigation.getSectionSearchEntries('advanced')}
+    >
+      {view.isSectionMounted('advanced') ? (
+        <AdvancedPane settings={model.settings} updateSettings={model.updateSettings} />
+      ) : null}
+    </SettingsSection>
+  ) : null
+}
+
+export function renderDevSettingsSection(context: SettingsRenderContext): React.JSX.Element | null {
+  const { model, navigation, view } = context
+  return model.showDesktopOnlySettings && import.meta.env.DEV ? (
+    <SettingsSection
+      id="dev"
+      title={translate('auto.components.settings.Settings.dev', 'Dev Tools')}
+      description={translate(
+        'auto.components.settings.Settings.devDescription',
+        'Dev-only tools for exercising UI states.'
+      )}
+      searchEntries={navigation.getSectionSearchEntries('dev')}
+    >
+      {DevToolsPane && view.isSectionMounted('dev') ? (
+        <Suspense fallback={null}>
+          <DevToolsPane />
+        </Suspense>
+      ) : null}
+    </SettingsSection>
+  ) : null
+}
+
+export function renderExperimentalSettingsSection(
+  context: SettingsRenderContext
+): React.JSX.Element {
+  const { model, navigation, view } = context
+  return (
+    <SettingsSection
+      id="experimental"
+      title={translate('auto.components.settings.Settings.8b017f2506', 'Experimental')}
+      description={translate(
+        'auto.components.settings.Settings.075341c763',
+        'New features that are still taking shape. Give them a try.'
+      )}
+      searchEntries={navigation.getSectionSearchEntries('experimental')}
+      // Why: Option-click the page title unlocks the hidden staff group
+      // (session-only) — same idiom as Option-click on the Updates header.
+      onTitleClick={(event) => {
+        if (event.altKey) {
+          model.setHiddenExperimentalUnlocked((previous) => !previous)
+        }
+      }}
+    >
+      {view.isSectionMounted('experimental') ? (
+        <ExperimentalPane
+          settings={model.settings}
+          updateSettings={model.updateSettings}
+          hiddenExperimentalUnlocked={model.hiddenExperimentalUnlocked}
+        />
+      ) : null}
+    </SettingsSection>
+  )
+}
+
+export function renderPluginsSettingsSection(
+  context: SettingsRenderContext
+): React.JSX.Element | null {
+  const { model, view } = context
+  return model.showDesktopOnlySettings ? (
+    <PluginsSettingsSection
+      mounted={view.isSectionMounted('plugins')}
+      settings={model.settings}
+      updateSettings={model.updateSettingsOrThrow}
+    />
+  ) : null
+}
diff --git a/src/renderer/src/components/settings/settings-capability-section-renderers.tsx b/src/renderer/src/components/settings/settings-capability-section-renderers.tsx
new file mode 100644
index 00000000000..dedd78d61a2
--- /dev/null
+++ b/src/renderer/src/components/settings/settings-capability-section-renderers.tsx
@@ -0,0 +1,138 @@
+import { AccountsPane } from './AccountsPane'
+import { AgentsPane } from './AgentsPane'
+import { ComputerUsePane } from './ComputerUsePane'
+import { LinearAgentSkillPane } from './LinearAgentSkillPane'
+import { OrchestrationPane } from './OrchestrationPane'
+import { VoicePane } from './VoicePane'
+import { SettingsSection } from './SettingsSection'
+import { translate } from '@/i18n/i18n'
+import type { SettingsRenderContext } from './settings-render-context'
+
+export function renderAgentsSettingsSection(context: SettingsRenderContext): React.JSX.Element {
+  const { model, navigation, terminal, view } = context
+  return (
+    <SettingsSection
+      id="agents"
+      title={translate('auto.components.settings.Settings.8afa676615', 'Agents')}
+      description={translate(
+        'auto.components.settings.Settings.ec1ba547f7',
+        'Manage AI agents, set a default, and customize commands.'
+      )}
+      searchEntries={navigation.getSectionSearchEntries('agents')}
+    >
+      {view.isSectionMounted('agents') ? (
+        <AgentsPane
+          settings={model.settings}
+          updateSettings={model.updateSettings}
+          wslSupportedPlatform={terminal.localWslSupportedPlatform}
+          wslAvailable={terminal.localWindowsRuntimeCapabilities.wslAvailable}
+          wslDistros={terminal.localWindowsRuntimeCapabilities.wslDistros}
+          wslCapabilitiesLoading={terminal.localWindowsRuntimeCapabilities.isLoading}
+        />
+      ) : null}
+    </SettingsSection>
+  )
+}
+
+export function renderAccountsSettingsSection(context: SettingsRenderContext): React.JSX.Element {
+  const { model, navigation, terminal, view } = context
+  return (
+    <SettingsSection
+      id="accounts"
+      title={translate('auto.components.settings.Settings.ad6c529693', 'AI Provider Accounts')}
+      description={translate(
+        'auto.components.settings.Settings.21f09426ea',
+        'Optional. Orca works with your existing provider logins; add accounts only if you want Orca to help switch between them.'
+      )}
+      badge={translate('auto.hooks.useSettingsNavigationMetadata.7c79d3b7bf', 'Optional')}
+      searchEntries={navigation.getSectionSearchEntries('accounts')}
+    >
+      {view.isSectionMounted('accounts') ? (
+        <AccountsPane
+          settings={model.settings}
+          updateSettings={model.updateSettings}
+          wslSupportedPlatform={terminal.runtimeWslSupportedPlatform}
+          wslAvailable={terminal.windowsTerminalCapabilities.wslAvailable}
+          wslDistros={terminal.windowsTerminalCapabilities.wslDistros}
+          wslCapabilitiesLoading={terminal.windowsTerminalCapabilities.isLoading}
+          accountOwnerPlatform={terminal.windowsTerminalCapabilities.hostPlatform}
+        />
+      ) : null}
+    </SettingsSection>
+  )
+}
+
+export function renderOrchestrationSettingsSection(
+  context: SettingsRenderContext
+): React.JSX.Element {
+  const { model, navigation, view } = context
+  return (
+    <SettingsSection
+      id="orchestration"
+      title={translate('auto.components.settings.Settings.00c3a7950d', 'Orchestration')}
+      description={translate(
+        'auto.components.settings.Settings.475980f53d',
+        'Coordinate multiple coding agents through Orca.'
+      )}
+      searchEntries={navigation.getSectionSearchEntries('orchestration')}
+    >
+      {view.isSectionMounted('orchestration') ? (
+        <OrchestrationPane settings={model.settings} updateSettings={model.updateSettings} />
+      ) : null}
+    </SettingsSection>
+  )
+}
+
+export function renderLinearSettingsSection(
+  context: SettingsRenderContext
+): React.JSX.Element | null {
+  const { model, navigation, view } = context
+  return model.linearConnected ? (
+    <SettingsSection
+      id="linear"
+      title={translate('auto.components.settings.Settings.linearTitle', 'Linear')}
+      description={translate(
+        'auto.components.settings.Settings.linearDescription',
+        'How Linear works in Orca, setup checklist, agent skill, and example prompts.'
+      )}
+      searchEntries={navigation.getSectionSearchEntries('linear')}
+    >
+      {view.isSectionMounted('linear') ? <LinearAgentSkillPane /> : null}
+    </SettingsSection>
+  ) : null
+}
+
+export function renderDesktopCapabilitySettingsSections(
+  context: SettingsRenderContext
+): React.JSX.Element | null {
+  const { model, navigation, view } = context
+  return model.showDesktopOnlySettings ? (
+    <>
+      <SettingsSection
+        id="computer-use"
+        title={translate('auto.components.settings.Settings.c9841721cb', 'Computer Use')}
+        description={translate(
+          'auto.components.settings.Settings.7118953f14',
+          'Enable agents to control any app on your computer.'
+        )}
+        searchEntries={navigation.getSectionSearchEntries('computer-use')}
+      >
+        {view.isSectionMounted('computer-use') ? <ComputerUsePane /> : null}
+      </SettingsSection>
+
+      <SettingsSection
+        id="voice"
+        title={translate('auto.components.settings.Settings.5063bb47a5', 'Voice')}
+        description={translate(
+          'auto.components.settings.Settings.eb1176a14e',
+          'Local speech-to-text dictation with on-device models.'
+        )}
+        searchEntries={navigation.getSectionSearchEntries('voice')}
+      >
+        {view.isSectionMounted('voice') ? (
+          <VoicePane settings={model.settings} updateSettings={model.updateSettings} />
+        ) : null}
+      </SettingsSection>
+    </>
+  ) : null
+}
diff --git a/src/renderer/src/components/settings/settings-deep-link-target-watcher.test.ts b/src/renderer/src/components/settings/settings-deep-link-target-watcher.test.ts
new file mode 100644
index 00000000000..f3d87ee07c6
--- /dev/null
+++ b/src/renderer/src/components/settings/settings-deep-link-target-watcher.test.ts
@@ -0,0 +1,108 @@
+// @vitest-environment happy-dom
+
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { watchForSettingsDeepLinkTarget } from './settings-deep-link-target-watcher'
+
+function flushMutations(): Promise<void> {
+  return new Promise((resolve) => setTimeout(resolve, 0))
+}
+
+afterEach(() => {
+  document.body.innerHTML = ''
+})
+
+describe('watchForSettingsDeepLinkTarget', () => {
+  it('reports the target once the async rows render', async () => {
+    const container = document.createElement('div')
+    document.body.append(container)
+    const onTargetPresent = vi.fn()
+    watchForSettingsDeepLinkTarget({
+      root: container,
+      isTargetPresent: () => container.querySelector('[data-settings-section="env-1"]') !== null,
+      onTargetPresent
+    })
+
+    const row = document.createElement('div')
+    row.dataset.settingsSection = 'env-1'
+    container.append(row)
+    await flushMutations()
+
+    expect(onTargetPresent).toHaveBeenCalledTimes(1)
+  })
+
+  it('keeps waiting while unrelated rows render', async () => {
+    const container = document.createElement('div')
+    document.body.append(container)
+    const onTargetPresent = vi.fn()
+    watchForSettingsDeepLinkTarget({
+      root: container,
+      isTargetPresent: () => container.querySelector('[data-settings-section="env-1"]') !== null,
+      onTargetPresent
+    })
+
+    const other = document.createElement('div')
+    other.dataset.settingsSection = 'env-2'
+    container.append(other)
+    await flushMutations()
+    expect(onTargetPresent).not.toHaveBeenCalled()
+
+    const row = document.createElement('div')
+    row.dataset.settingsSection = 'env-1'
+    container.append(row)
+    await flushMutations()
+    expect(onTargetPresent).toHaveBeenCalledTimes(1)
+  })
+
+  it('reports at most once even as more rows arrive', async () => {
+    const container = document.createElement('div')
+    document.body.append(container)
+    const onTargetPresent = vi.fn()
+    watchForSettingsDeepLinkTarget({
+      root: container,
+      isTargetPresent: () => container.querySelector('[data-settings-section="env-1"]') !== null,
+      onTargetPresent
+    })
+
+    const row = document.createElement('div')
+    row.dataset.settingsSection = 'env-1'
+    container.append(row)
+    await flushMutations()
+    container.append(document.createElement('div'))
+    await flushMutations()
+
+    expect(onTargetPresent).toHaveBeenCalledTimes(1)
+  })
+
+  it('stops reporting after cancel', async () => {
+    const container = document.createElement('div')
+    document.body.append(container)
+    const onTargetPresent = vi.fn()
+    const watch = watchForSettingsDeepLinkTarget({
+      root: container,
+      isTargetPresent: () => true,
+      onTargetPresent
+    })
+    watch.cancel()
+
+    container.append(document.createElement('div'))
+    await flushMutations()
+
+    expect(onTargetPresent).not.toHaveBeenCalled()
+  })
+
+  it('falls back to the document body when the pane has no scroll container yet', async () => {
+    const onTargetPresent = vi.fn()
+    watchForSettingsDeepLinkTarget({
+      root: null,
+      isTargetPresent: () => document.querySelector('[data-settings-section="env-1"]') !== null,
+      onTargetPresent
+    })
+
+    const row = document.createElement('div')
+    row.dataset.settingsSection = 'env-1'
+    document.body.append(row)
+    await flushMutations()
+
+    expect(onTargetPresent).toHaveBeenCalledTimes(1)
+  })
+})
diff --git a/src/renderer/src/components/settings/settings-deep-link-target-watcher.ts b/src/renderer/src/components/settings/settings-deep-link-target-watcher.ts
new file mode 100644
index 00000000000..30d7ee1b103
--- /dev/null
+++ b/src/renderer/src/components/settings/settings-deep-link-target-watcher.ts
@@ -0,0 +1,54 @@
+/**
+ * A deep link can name a row that does not exist yet: panes such as Remote Orca
+ * Servers render their rows only after an async fetch resolves. The scroll
+ * effect parks its target in a ref, but nothing re-runs it when those rows
+ * finally mount, so this watcher reports the moment they do.
+ */
+
+/** Give up eventually; a target that never mounts must not leave an observer alive. */
+const TARGET_WAIT_TIMEOUT_MS = 5000
+
+export type SettingsDeepLinkTargetWatch = {
+  cancel: () => void
+}
+
+export function watchForSettingsDeepLinkTarget(args: {
+  /** Subtree to observe; falls back to the document body when the pane has no scroll container yet. */
+  root: HTMLElement | null
+  isTargetPresent: () => boolean
+  onTargetPresent: () => void
+}): SettingsDeepLinkTargetWatch {
+  const root = args.root ?? (typeof document === 'undefined' ? null : document.body)
+  if (!root || typeof MutationObserver === 'undefined') {
+    return { cancel: () => {} }
+  }
+
+  let settled = false
+  let observer: MutationObserver | null = null
+  let timeout: number | null = null
+
+  const finish = (): void => {
+    if (settled) {
+      return
+    }
+    settled = true
+    observer?.disconnect()
+    observer = null
+    if (timeout !== null) {
+      window.clearTimeout(timeout)
+      timeout = null
+    }
+  }
+
+  observer = new MutationObserver(() => {
+    if (settled || !args.isTargetPresent()) {
+      return
+    }
+    finish()
+    args.onTargetPresent()
+  })
+  observer.observe(root, { subtree: true, childList: true })
+  timeout = window.setTimeout(finish, TARGET_WAIT_TIMEOUT_MS)
+
+  return { cancel: finish }
+}
diff --git a/src/renderer/src/components/settings/settings-git-task-section-renderers.tsx b/src/renderer/src/components/settings/settings-git-task-section-renderers.tsx
new file mode 100644
index 00000000000..77775a398f2
--- /dev/null
+++ b/src/renderer/src/components/settings/settings-git-task-section-renderers.tsx
@@ -0,0 +1,66 @@
+import { CommitMessageAiPane } from './CommitMessageAiPane'
+import { GitPane } from './GitPane'
+import { GitProviderApiBudgetPane } from './GitProviderApiBudgetPane'
+import { TasksPane } from './TasksPane'
+import { SettingsSection } from './SettingsSection'
+import { translate } from '@/i18n/i18n'
+import type { SettingsRenderContext } from './settings-render-context'
+
+export function renderGitSettingsSection(context: SettingsRenderContext): React.JSX.Element {
+  const { model, interactions, navigation, view } = context
+  return (
+    <SettingsSection
+      id="git"
+      title={translate('auto.components.settings.Settings.70100f94c7', 'Git & Source Control')}
+      description={translate(
+        'auto.components.settings.Settings.cfa34f4465',
+        'Branch naming, base refs, and Git AI Author.'
+      )}
+      searchEntries={navigation.getSectionSearchEntries('git')}
+      forceVisible={interactions.hasUnsavedSourceControlAiPromptChanges}
+    >
+      {view.isSectionMounted('git') ? (
+        <>
+          <GitPane
+            settings={model.settings}
+            updateSettings={model.updateSettings}
+            writeSourceControlAiSettings={interactions.writeSourceControlAiSettings}
+            displayedGitUsername={navigation.displayedGitUsername}
+            hasUnsavedBranchPromptChanges={model.hasUnsavedBranchPromptChanges}
+            onBranchPromptDirtyChange={model.setHasUnsavedBranchPromptChanges}
+            branchPromptDiscardSignal={model.sourceControlAiPromptDiscardSignal}
+            settingsSearchQuery={model.settingsSearchQuery}
+          />
+          <CommitMessageAiPane
+            settings={model.settings}
+            updateSettings={model.updateSettings}
+            writeSourceControlAiSettings={interactions.writeSourceControlAiSettings}
+            onCustomPromptDirtyChange={model.setHasUnsavedCommitPromptChanges}
+            customPromptDiscardSignal={model.sourceControlAiPromptDiscardSignal}
+            settingsSearchQuery={model.settingsSearchQuery}
+          />
+          <GitProviderApiBudgetPane settingsSearchQuery={model.settingsSearchQuery} />
+        </>
+      ) : null}
+    </SettingsSection>
+  )
+}
+
+export function renderTasksSettingsSection(context: SettingsRenderContext): React.JSX.Element {
+  const { model, navigation, view } = context
+  return (
+    <SettingsSection
+      id="tasks"
+      title={translate('auto.components.settings.Settings.11faa2f7dd', 'Task Sources')}
+      description={translate(
+        'auto.components.settings.Settings.tasksDescription',
+        'Connect providers, install the Linear skill, and choose what appears in Tasks.'
+      )}
+      searchEntries={navigation.getSectionSearchEntries('tasks')}
+    >
+      {view.isSectionMounted('tasks') ? (
+        <TasksPane settings={model.settings} updateSettings={model.updateSettings} />
+      ) : null}
+    </SettingsSection>
+  )
+}
diff --git a/src/renderer/src/components/settings/settings-interface-primary-section-renderers.tsx b/src/renderer/src/components/settings/settings-interface-primary-section-renderers.tsx
new file mode 100644
index 00000000000..8526db467df
--- /dev/null
+++ b/src/renderer/src/components/settings/settings-interface-primary-section-renderers.tsx
@@ -0,0 +1,132 @@
+import { BrowserPane } from './BrowserPane'
+import { FloatingWorkspacePane } from './FloatingWorkspacePane'
+import { MobileEmulatorSettingsPane } from './MobileEmulatorSettingsPane'
+import { QuickCommandsPane } from './QuickCommandsPane'
+import { TerminalPane } from './TerminalPane'
+import { SettingsSection } from './SettingsSection'
+import { translate } from '@/i18n/i18n'
+import type { SettingsRenderContext } from './settings-render-context'
+
+export function renderTerminalSettingsSection(context: SettingsRenderContext): React.JSX.Element {
+  const { model, navigation, terminal, view } = context
+  return (
+    <SettingsSection
+      id="terminal"
+      title={translate('auto.components.settings.Settings.3de4bbb841', 'Terminal')}
+      description={translate(
+        'auto.components.settings.Settings.b79b5b31e9',
+        'Shells, renderer, sessions, and terminal behavior.'
+      )}
+      searchEntries={navigation.getSectionSearchEntries('terminal')}
+    >
+      {view.isSectionMounted('terminal') ? (
+        <TerminalPane
+          settings={model.settings}
+          updateSettings={model.updateSettings}
+          scrollbackMode={model.scrollbackMode}
+          setScrollbackMode={model.setScrollbackMode}
+          wslAvailable={terminal.windowsTerminalCapabilities.wslAvailable}
+          wslDistros={terminal.windowsTerminalCapabilities.wslDistros}
+          wslCapabilitiesLoading={terminal.windowsTerminalCapabilities.isLoading}
+          pwshAvailable={terminal.windowsTerminalCapabilities.pwshAvailable}
+          gitBashAvailable={terminal.windowsTerminalCapabilities.gitBashAvailable}
+          isWindowsTerminalHost={terminal.isWindowsTerminalHost}
+        />
+      ) : null}
+    </SettingsSection>
+  )
+}
+
+export function renderQuickCommandsSettingsSection(
+  context: SettingsRenderContext
+): React.JSX.Element {
+  const { model, navigation, view } = context
+  return (
+    <SettingsSection
+      id="quick-commands"
+      title={translate('auto.components.settings.Settings.13d4fe30ad', 'Quick Commands')}
+      description={translate(
+        'auto.components.settings.Settings.6742c7932c',
+        'Saved terminal commands, scoped globally or per project.'
+      )}
+      searchEntries={navigation.getSectionSearchEntries('quick-commands')}
+    >
+      {view.isSectionMounted('quick-commands') ? (
+        <QuickCommandsPane
+          settings={model.settings}
+          addCommandIntentSignal={model.quickCommandAddIntentSignal}
+        />
+      ) : null}
+    </SettingsSection>
+  )
+}
+
+export function renderBrowserSettingsSection(
+  context: SettingsRenderContext
+): React.JSX.Element | null {
+  const { model, actions, navigation, view } = context
+  return model.showDesktopOnlySettings ? (
+    <SettingsSection
+      id="browser"
+      title={translate('auto.components.settings.Settings.c46215ea03', 'Browser')}
+      description={translate(
+        'auto.components.settings.Settings.ad9788036f',
+        'Home page, link routing, and session cookies.'
+      )}
+      searchEntries={navigation.getSectionSearchEntries('browser')}
+    >
+      {view.isSectionMounted('browser') ? (
+        <BrowserPane
+          settings={model.settings}
+          updateSettings={model.updateSettings}
+          onOpenComputerUse={actions.openComputerUseFromBrowser}
+        />
+      ) : null}
+    </SettingsSection>
+  ) : null
+}
+
+export function renderMobileEmulatorSettingsSection(
+  context: SettingsRenderContext
+): React.JSX.Element | null {
+  const { model, navigation, view } = context
+  return model.showDesktopOnlySettings ? (
+    <SettingsSection
+      id="mobile-emulator"
+      title={translate('auto.components.settings.Settings.f75daf1002', 'Mobile Emulator')}
+      description={translate(
+        'auto.components.settings.Settings.01f9d36292',
+        'Configure mobile emulator support for Orca and coding agents.'
+      )}
+      searchEntries={navigation.getSectionSearchEntries('mobile-emulator')}
+    >
+      {view.isSectionMounted('mobile-emulator') ? (
+        <MobileEmulatorSettingsPane
+          settings={model.settings}
+          updateSettings={model.updateSettings}
+        />
+      ) : null}
+    </SettingsSection>
+  ) : null
+}
+
+export function renderFloatingWorkspaceSettingsSection(
+  context: SettingsRenderContext
+): React.JSX.Element {
+  const { model, navigation, view } = context
+  return (
+    <SettingsSection
+      id="floating-workspace"
+      title={translate('auto.components.settings.Settings.3eb22a3ada', 'Floating Workspace')}
+      description={translate(
+        'auto.components.settings.Settings.3d9adfe6a5',
+        'Global terminal, browser, and markdown tabs.'
+      )}
+      searchEntries={navigation.getSectionSearchEntries('floating-workspace')}
+    >
+      {view.isSectionMounted('floating-workspace') ? (
+        <FloatingWorkspacePane settings={model.settings} updateSettings={model.updateSettings} />
+      ) : null}
+    </SettingsSection>
+  )
+}
diff --git a/src/renderer/src/components/settings/settings-interface-secondary-section-renderers.tsx b/src/renderer/src/components/settings/settings-interface-secondary-section-renderers.tsx
new file mode 100644
index 00000000000..e1eafdbdf88
--- /dev/null
+++ b/src/renderer/src/components/settings/settings-interface-secondary-section-renderers.tsx
@@ -0,0 +1,113 @@
+import { StatsPane } from '../stats/StatsPane'
+import { AppearancePane } from './AppearancePane'
+import { InputPane } from './InputPane'
+import { NotificationsPane } from './NotificationsPane'
+import { ShortcutsPane } from './ShortcutsPane'
+import { SettingsSection } from './SettingsSection'
+import { translate } from '@/i18n/i18n'
+import type { SettingsRenderContext } from './settings-render-context'
+
+export function renderAppearanceSettingsSection(context: SettingsRenderContext): React.JSX.Element {
+  const { model, interactions, navigation, view } = context
+  return (
+    <SettingsSection
+      id="appearance"
+      title={translate('auto.components.settings.Settings.2b4474780a', 'Appearance')}
+      description={translate(
+        'auto.components.settings.Settings.6d1a27e193',
+        'Theme, zoom, app and terminal appearance, sidebars, and status bar.'
+      )}
+      searchEntries={navigation.getSectionSearchEntries('appearance')}
+    >
+      {view.isSectionMounted('appearance') ? (
+        <AppearancePane
+          settings={model.settings}
+          updateSettings={model.updateSettings}
+          applyTheme={navigation.applyTheme}
+          fontSuggestions={model.fontSuggestions}
+          terminalFontSuggestions={model.terminalFontSuggestions}
+          onRequestFontSuggestions={interactions.requestFontSuggestions}
+          systemPrefersDark={model.systemPrefersDark}
+          ghostty={model.ghostty}
+          warpThemes={model.warpThemes}
+        />
+      ) : null}
+    </SettingsSection>
+  )
+}
+
+export function renderInputSettingsSection(context: SettingsRenderContext): React.JSX.Element {
+  const { model, navigation } = context
+  return (
+    <SettingsSection
+      id="input"
+      title={translate('auto.components.settings.Settings.d7a3e635b6', 'Input & Editing')}
+      description={translate(
+        'auto.components.settings.Settings.d0b7021d64',
+        'Selection and editing behavior.'
+      )}
+      searchEntries={navigation.getSectionSearchEntries('input')}
+    >
+      <InputPane settings={model.settings} updateSettings={model.updateSettings} />
+    </SettingsSection>
+  )
+}
+
+export function renderNotificationsSettingsSection(
+  context: SettingsRenderContext
+): React.JSX.Element | null {
+  const { model, navigation, view } = context
+  return model.showDesktopOnlySettings ? (
+    <SettingsSection
+      id="notifications"
+      title={translate('auto.components.settings.Settings.9907545fa3', 'Notifications')}
+      description={translate(
+        'auto.components.settings.Settings.7210ac09c4',
+        'Native desktop notifications for agent activity and terminal events.'
+      )}
+      searchEntries={navigation.getSectionSearchEntries('notifications')}
+    >
+      {view.isSectionMounted('notifications') ? (
+        <NotificationsPane settings={model.settings} updateSettings={model.updateSettings} />
+      ) : null}
+    </SettingsSection>
+  ) : null
+}
+
+export function renderShortcutsSettingsSection(context: SettingsRenderContext): React.JSX.Element {
+  const { navigation, view } = context
+  return (
+    <SettingsSection
+      id="shortcuts"
+      title={translate('auto.components.settings.Settings.23bf7a1ad4', 'Shortcuts')}
+      description={translate(
+        'auto.components.settings.Settings.a737a4bb22',
+        'Keyboard shortcuts for common actions.'
+      )}
+      searchEntries={navigation.getSectionSearchEntries('shortcuts')}
+      className={
+        view.isFocusedShortcutsPane ? 'flex min-h-0 flex-1 flex-col space-y-0 gap-6' : undefined
+      }
+      bodyClassName={view.isFocusedShortcutsPane ? 'min-h-0 flex-1 overflow-hidden' : undefined}
+    >
+      {view.isSectionMounted('shortcuts') ? <ShortcutsPane /> : null}
+    </SettingsSection>
+  )
+}
+
+export function renderStatsSettingsSection(context: SettingsRenderContext): React.JSX.Element {
+  const { navigation, view } = context
+  return (
+    <SettingsSection
+      id="stats"
+      title={translate('auto.components.settings.Settings.954a8f5aef', 'Stats & Usage')}
+      description={translate(
+        'auto.components.settings.Settings.8acf3f22e0',
+        'Orca stats plus Claude, Codex, OpenCode token analytics and Grok subscription usage.'
+      )}
+      searchEntries={navigation.getSectionSearchEntries('stats')}
+    >
+      {view.isSectionMounted('stats') ? <StatsPane /> : null}
+    </SettingsSection>
+  )
+}
diff --git a/src/renderer/src/components/settings/settings-navigation-foundations.ts b/src/renderer/src/components/settings/settings-navigation-foundations.ts
new file mode 100644
index 00000000000..debb349cd66
--- /dev/null
+++ b/src/renderer/src/components/settings/settings-navigation-foundations.ts
@@ -0,0 +1,168 @@
+import type { MutableRefObject } from 'react'
+import type { GlobalSettings } from '../../../../shared/global-settings-types'
+import type { SpeechModelState } from '../../../../shared/speech-types'
+import type { SourceControlAiSettings } from '../../../../shared/source-control-ai-types'
+import { normalizeSourceControlAiSettings } from '../../../../shared/source-control-ai'
+import { getDefaultVoiceSettings } from '../../../../shared/constants'
+import type { SettingsNavSection, SettingsNavTarget } from '@/lib/settings-navigation-types'
+import type { SettingsDeepLinkTargetWatch } from './settings-deep-link-target-watcher'
+
+export const SETTINGS_NAV_GROUPS = [
+  {
+    id: 'capabilities',
+    titleKey: 'auto.components.settings.Settings.23c6874fdf',
+    titleDefault: 'AI Capabilities'
+  },
+  { id: 'setup', titleKey: 'auto.components.settings.Settings.9abb9be3bc', titleDefault: 'Set Up' },
+  {
+    id: 'workflows',
+    titleKey: 'auto.components.settings.Settings.e1578cd4bc',
+    titleDefault: 'Workflows'
+  },
+  {
+    id: 'interface',
+    titleKey: 'auto.components.settings.Settings.8bd117d669',
+    titleDefault: 'Interface'
+  },
+  {
+    id: 'remote',
+    titleKey: 'auto.components.settings.Settings.23931df7e8',
+    titleDefault: 'Remote Hosts'
+  },
+  {
+    id: 'security',
+    titleKey: 'auto.components.settings.Settings.084d8fac5b',
+    titleDefault: 'Privacy & Security'
+  },
+  {
+    id: 'advanced',
+    titleKey: 'auto.components.settings.Settings.1c87f8d024',
+    titleDefault: 'Advanced'
+  },
+  {
+    id: 'experimental',
+    titleKey: 'auto.components.settings.Settings.8b017f2506',
+    titleDefault: 'Experimental'
+  }
+] as const
+
+export type SettingsNavGroupDefinition = (typeof SETTINGS_NAV_GROUPS)[number]
+
+const SETTINGS_NAV_GROUP_BY_ID = new Map<string, SettingsNavGroupDefinition>(
+  SETTINGS_NAV_GROUPS.map((group) => [group.id, group])
+)
+
+export const SHORTCUTS_ESCAPE_CONFIRM_TOAST_ID = 'shortcuts-escape-confirm'
+export const SHORTCUTS_ESCAPE_CONFIRM_WINDOW_MS = 2200
+export const SETTINGS_TARGET_HIGHLIGHT_MS = 3_000
+
+export function getSettingsSectionId(
+  pane: SettingsNavTarget,
+  repoId: string | null,
+  repoIdToRepresentative: Map<string, string>
+): string {
+  if (pane === 'repo' && repoId) {
+    // Why: Settings renders one collapsed pane per project, so resolve a repoId target to its project's representative section.
+    return `repo-${repoIdToRepresentative.get(repoId) ?? repoId}`
+  }
+  return pane
+}
+
+export function getFallbackVisibleSection(
+  sections: SettingsNavSection[]
+): SettingsNavSection | undefined {
+  return sections.at(0)
+}
+
+export function getSettingsNavGroupDefinitionsForSearch(
+  sections: readonly SettingsNavSection[],
+  query: string
+): readonly SettingsNavGroupDefinition[] {
+  if (query.trim() === '') {
+    return SETTINGS_NAV_GROUPS
+  }
+  const seenGroupIds = new Set<string>()
+  return sections.flatMap((section) => {
+    if (section.id.startsWith('repo-') || seenGroupIds.has(section.group)) {
+      return []
+    }
+    const group = SETTINGS_NAV_GROUP_BY_ID.get(section.group)
+    if (!group) {
+      return []
+    }
+    seenGroupIds.add(section.group)
+    return [group]
+  })
+}
+
+export function hasReadyVoiceModel(
+  settings: GlobalSettings,
+  modelStates: readonly SpeechModelState[]
+): boolean {
+  const voiceSettings = settings.voice ?? getDefaultVoiceSettings()
+  if (
+    voiceSettings.sttModel !== '' &&
+    modelStates.some((state) => state.id === voiceSettings.sttModel && state.status === 'ready')
+  ) {
+    return true
+  }
+  return modelStates.some((state) => state.status === 'ready')
+}
+
+export function getSettingsScrollTarget(
+  sectionId: string,
+  container?: HTMLElement | null
+): HTMLElement | null {
+  return (
+    container?.querySelector<HTMLElement>(`[data-settings-section="${CSS.escape(sectionId)}"]`) ??
+    document.getElementById(sectionId)
+  )
+}
+
+export function scrollSubsectionIntoView(targetId: string, container?: HTMLElement | null): void {
+  // Why: the pane is swapped in wholesale, so a subsection deep link only nudges inner scroll when the pane exceeds the viewport.
+  const target = getSettingsScrollTarget(targetId, container)
+  if (!target) {
+    return
+  }
+  if (!container) {
+    target.scrollIntoView({ block: 'start' })
+    return
+  }
+  const containerRect = container.getBoundingClientRect()
+  const targetRect = target.getBoundingClientRect()
+  const targetTop = targetRect.top - containerRect.top + container.scrollTop
+  const maxScrollTop = Math.max(0, container.scrollHeight - container.clientHeight)
+  container.scrollTo({ top: Math.min(Math.max(0, targetTop - 16), maxScrollTop) })
+}
+
+export function readSourceControlAiSettings(settings: GlobalSettings): SourceControlAiSettings {
+  return normalizeSourceControlAiSettings(settings.sourceControlAi, settings.commitMessageAi)
+}
+
+export function cancelPendingSettingsSubsectionScrollFrame(
+  frameRef: MutableRefObject<number | null>
+): void {
+  if (frameRef.current !== null) {
+    cancelAnimationFrame(frameRef.current)
+    frameRef.current = null
+  }
+}
+
+export function cancelPendingSettingsDeepLinkTargetWatch(
+  watchRef: MutableRefObject<SettingsDeepLinkTargetWatch | null>
+): void {
+  watchRef.current?.cancel()
+  watchRef.current = null
+}
+
+export function isEditableTarget(target: EventTarget | null): boolean {
+  if (!(target instanceof HTMLElement)) {
+    return false
+  }
+  if (target.isContentEditable) {
+    return true
+  }
+  const tag = target.tagName
+  return tag === 'INPUT' || tag === 'TEXTAREA' || tag === 'SELECT'
+}
diff --git a/src/renderer/src/components/settings/settings-page-renderer.tsx b/src/renderer/src/components/settings/settings-page-renderer.tsx
new file mode 100644
index 00000000000..1c302cada17
--- /dev/null
+++ b/src/renderer/src/components/settings/settings-page-renderer.tsx
@@ -0,0 +1,158 @@
+import { ActiveSettingsSectionProvider } from './SettingsSection'
+import { SettingsSidebar } from './SettingsSidebar'
+import { cn } from '@/lib/utils'
+import { translate } from '@/i18n/i18n'
+import type { SettingsInteractionController } from './use-settings-interaction-controller'
+import type { SettingsRenderContext } from './settings-render-context'
+import {
+  renderAccountsSettingsSection,
+  renderAgentsSettingsSection,
+  renderDesktopCapabilitySettingsSections,
+  renderLinearSettingsSection,
+  renderOrchestrationSettingsSection
+} from './settings-capability-section-renderers'
+import {
+  renderArtifactsSettingsSection,
+  renderAutomationsSettingsSection,
+  renderGeneralSettingsSection,
+  renderIntegrationsSettingsSection,
+  renderMobileSettingsSection,
+  renderOrcaAccountSettingsSection,
+  renderSetupGuideSettingsSection,
+  renderShareSkillsSettingsSection
+} from './settings-setup-workflow-section-renderers'
+import {
+  renderGitSettingsSection,
+  renderTasksSettingsSection
+} from './settings-git-task-section-renderers'
+import {
+  renderBrowserSettingsSection,
+  renderFloatingWorkspaceSettingsSection,
+  renderMobileEmulatorSettingsSection,
+  renderQuickCommandsSettingsSection,
+  renderTerminalSettingsSection
+} from './settings-interface-primary-section-renderers'
+import {
+  renderAppearanceSettingsSection,
+  renderInputSettingsSection,
+  renderNotificationsSettingsSection,
+  renderShortcutsSettingsSection,
+  renderStatsSettingsSection
+} from './settings-interface-secondary-section-renderers'
+import {
+  renderDeveloperPermissionsSettingsSection,
+  renderPrivacySettingsSection,
+  renderServersSettingsSection,
+  renderSshSettingsSection
+} from './settings-remote-security-section-renderers'
+import {
+  renderAdvancedSettingsSection,
+  renderDevSettingsSection,
+  renderExperimentalSettingsSection,
+  renderPluginsSettingsSection
+} from './settings-advanced-section-renderers'
+import { renderProjectSettingsSections } from './settings-project-section-renderer'
+
+export function renderSettingsLoading(
+  interactions: SettingsInteractionController
+): React.JSX.Element {
+  return (
+    <div
+      ref={interactions.setSettingsRootNode}
+      className="settings-view-shell flex min-h-0 flex-1 overflow-hidden bg-background"
+    >
+      <div className="flex flex-1 items-center justify-center text-muted-foreground">
+        {translate('auto.components.settings.Settings.c7ad095d96', 'Loading settings...')}
+      </div>
+    </div>
+  )
+}
+
+export function renderSettingsPage(context: SettingsRenderContext): React.JSX.Element {
+  const { model, interactions, navigation, actions, view } = context
+  return (
+    <div
+      ref={interactions.setSettingsRootNode}
+      className="settings-view-shell flex min-h-0 flex-1 overflow-hidden bg-background"
+    >
+      <SettingsSidebar
+        settings={model.settings}
+        activeSectionId={model.activeSectionId}
+        generalGroups={view.generalNavGroups}
+        repoSections={view.repoNavSections}
+        hasRepos={model.repos.length > 0}
+        searchInputRef={interactions.searchInputRef}
+        // Why: deep-links open panes/modals that own focus; plain entry lands in search.
+        searchAutoFocus={model.settingsNavigationTarget == null}
+        onBack={interactions.closeSettingsPageWithPromptGuard}
+        onSelectSection={actions.scrollToSection}
+      />
+
+      <div className="flex min-h-0 flex-1 flex-col">
+        <div
+          ref={interactions.setContentScrollNode}
+          className={cn(
+            'min-h-0 flex-1',
+            view.isFocusedShortcutsPane ? 'overflow-hidden' : 'overflow-y-auto scrollbar-sleek'
+          )}
+        >
+          <div
+            className={cn(
+              'mx-auto flex w-full flex-col gap-10 px-8 pt-10',
+              view.isFocusedShortcutsPane ? 'h-full pb-6' : 'pb-24',
+              view.isFocusedSetupGuidePane ? 'max-w-6xl' : 'max-w-4xl'
+            )}
+          >
+            {navigation.visibleNavSections.length === 0 ? (
+              <div className="flex min-h-[24rem] items-center justify-center rounded-2xl border border-dashed border-border/60 bg-card/30 text-sm text-muted-foreground">
+                {translate(
+                  'auto.components.settings.Settings.3c88ec55d6',
+                  'No settings found for "'
+                )}
+                {model.settingsSearchQuery.trim()}
+                {translate('auto.components.settings.Settings.add3b97ee6', '"')}
+              </div>
+            ) : (
+              <ActiveSettingsSectionProvider value={model.activeSectionId}>
+                {renderAgentsSettingsSection(context)}
+                {renderAccountsSettingsSection(context)}
+                {renderOrchestrationSettingsSection(context)}
+                {renderLinearSettingsSection(context)}
+                {renderDesktopCapabilitySettingsSections(context)}
+                {renderOrcaAccountSettingsSection(context)}
+                {renderSetupGuideSettingsSection(context)}
+                {renderGeneralSettingsSection(context)}
+                {renderIntegrationsSettingsSection(context)}
+                {renderMobileSettingsSection(context)}
+                {renderAutomationsSettingsSection(context)}
+                {renderArtifactsSettingsSection(context)}
+                {renderShareSkillsSettingsSection(context)}
+                {renderGitSettingsSection(context)}
+                {renderTasksSettingsSection(context)}
+                {renderTerminalSettingsSection(context)}
+                {renderQuickCommandsSettingsSection(context)}
+                {renderBrowserSettingsSection(context)}
+                {renderMobileEmulatorSettingsSection(context)}
+                {renderFloatingWorkspaceSettingsSection(context)}
+                {renderAppearanceSettingsSection(context)}
+                {renderInputSettingsSection(context)}
+                {renderNotificationsSettingsSection(context)}
+                {renderShortcutsSettingsSection(context)}
+                {renderStatsSettingsSection(context)}
+                {renderServersSettingsSection(context)}
+                {renderSshSettingsSection(context)}
+                {renderDeveloperPermissionsSettingsSection(context)}
+                {renderPrivacySettingsSection(context)}
+                {renderAdvancedSettingsSection(context)}
+                {renderDevSettingsSection(context)}
+                {renderExperimentalSettingsSection(context)}
+                {renderPluginsSettingsSection(context)}
+                {renderProjectSettingsSections(context)}
+              </ActiveSettingsSectionProvider>
+            )}
+          </div>
+        </div>
+      </div>
+    </div>
+  )
+}
diff --git a/src/renderer/src/components/settings/settings-project-section-renderer.tsx b/src/renderer/src/components/settings/settings-project-section-renderer.tsx
new file mode 100644
index 00000000000..ea71e4ffbda
--- /dev/null
+++ b/src/renderer/src/components/settings/settings-project-section-renderer.tsx
@@ -0,0 +1,65 @@
+import { getRepoExecutionHostId, LOCAL_EXECUTION_HOST_ID } from '../../../../shared/execution-host'
+import { getRepoHostIdentity } from '../../store/slices/repo-host-identity'
+import { RepositoryPane } from './RepositoryPane'
+import { SettingsSection } from './SettingsSection'
+import { getSettingsProjectHostRepo } from './settings-project-list'
+import { translate } from '@/i18n/i18n'
+import type { SettingsRenderContext } from './settings-render-context'
+
+export function renderProjectSettingsSections(context: SettingsRenderContext): React.ReactNode {
+  const { model, navigation, terminal, view } = context
+  return model.settingsProjectList.map((settingsProject) => {
+    const repoSectionId = `repo-${settingsProject.representativeRepoId}`
+    // Why: use the switcher-selected host's repo so identity/host-specific edits follow "Available Hosts".
+    const repo = getSettingsProjectHostRepo(
+      settingsProject,
+      model.repos,
+      model.settingsProjectHostSelection[settingsProject.projectId],
+      model.settingsProjectSetupSelection[settingsProject.projectId]
+    )
+    if (!repo) {
+      return null
+    }
+    const repoHostIdentity = getRepoHostIdentity(repo)
+    const repoHooksState = model.repoHooksMap[repoHostIdentity]
+    const project = navigation.projectByRepoId.get(repo.id) ?? settingsProject.project
+
+    return (
+      <SettingsSection
+        key={repoSectionId}
+        id={repoSectionId}
+        title={translate(
+          'auto.components.settings.Settings.3bf149e873',
+          'Project Settings > {{value0}}',
+          { value0: project.displayName }
+        )}
+        description={repo.path}
+        searchEntries={navigation.getSectionSearchEntries(repoSectionId)}
+      >
+        {view.isSectionMounted(repoSectionId) ? (
+          // Why: re-key per host so same-id hosts don't reuse the prior host's drafts/effects.
+          <RepositoryPane
+            key={repoHostIdentity}
+            repo={repo}
+            yamlHooks={repoHooksState?.hooks ?? null}
+            hasHooksFile={repoHooksState?.hasHooks ?? false}
+            hooksInspectionReady={Boolean(repoHooksState)}
+            mayNeedUpdate={repoHooksState?.mayNeedUpdate ?? false}
+            updateRepo={model.updateRepo}
+            removeProject={() => void model.removeProjectAllHosts(settingsProject.setups)}
+            project={project}
+            selectedProjectSetupId={model.settingsProjectSetupSelection[settingsProject.projectId]}
+            isLocalWindowsProject={
+              getRepoExecutionHostId(repo) === LOCAL_EXECUTION_HOST_ID &&
+              terminal.isWindowsTerminalHost
+            }
+            wslAvailable={terminal.windowsTerminalCapabilities.wslAvailable}
+            wslDistros={terminal.windowsTerminalCapabilities.wslDistros}
+            wslCapabilitiesLoading={terminal.windowsTerminalCapabilities.isLoading}
+            updateProject={model.updateProject}
+          />
+        ) : null}
+      </SettingsSection>
+    )
+  })
+}
diff --git a/src/renderer/src/components/settings/settings-remote-security-section-renderers.tsx b/src/renderer/src/components/settings/settings-remote-security-section-renderers.tsx
new file mode 100644
index 00000000000..5ba1d9fb57f
--- /dev/null
+++ b/src/renderer/src/components/settings/settings-remote-security-section-renderers.tsx
@@ -0,0 +1,97 @@
+import { DeveloperPermissionsPane } from './DeveloperPermissionsPane'
+import { PrivacyPane } from './PrivacyPane'
+import { RuntimeEnvironmentsPane } from './RuntimeEnvironmentsPane'
+import { SshPane } from './SshPane'
+import { SettingsSection } from './SettingsSection'
+import { translate } from '@/i18n/i18n'
+import type { SettingsRenderContext } from './settings-render-context'
+
+export function renderServersSettingsSection(context: SettingsRenderContext): React.JSX.Element {
+  const { model, navigation, view } = context
+  return (
+    <SettingsSection
+      id="servers"
+      title={translate('auto.components.settings.Settings.bd0181eeca', 'Remote Orca Servers')}
+      badge="Beta"
+      description={
+        model.isWebClient
+          ? translate(
+              'auto.components.settings.Settings.7686cb5c36',
+              'Connect this browser to a saved Orca server.'
+            )
+          : translate(
+              'auto.components.settings.Settings.b5ee17826b',
+              'Pair remote Orca runtimes for persistent sessions, richer remote state, and web or mobile handoff.'
+            )
+      }
+      searchEntries={navigation.getSectionSearchEntries('servers')}
+    >
+      {view.isSectionMounted('servers') ? (
+        <RuntimeEnvironmentsPane
+          settings={model.settings}
+          setActiveRuntimeEnvironmentPreference={model.setActiveRuntimeEnvironmentPreference}
+          canGeneratePairingUrl={!model.isWebClient}
+          allowLocalRuntime={!model.isWebClient}
+          addServerIntentSignal={model.remoteServerAddIntentSignal}
+        />
+      ) : null}
+    </SettingsSection>
+  )
+}
+
+export function renderSshSettingsSection(context: SettingsRenderContext): React.JSX.Element | null {
+  const { model, navigation, view } = context
+  return model.showDesktopOnlySettings ? (
+    <SettingsSection
+      id="ssh"
+      title={translate('auto.components.settings.Settings.9b02492d1f', 'SSH Hosts')}
+      description={translate(
+        'auto.components.settings.Settings.c2ee313198',
+        'Use existing machines over SSH for files, terminals, Git, and workspaces.'
+      )}
+      searchEntries={navigation.getSectionSearchEntries('ssh')}
+    >
+      {view.isSectionMounted('ssh') ? (
+        <SshPane addTargetIntentSignal={model.sshHostAddIntentSignal} />
+      ) : null}
+    </SettingsSection>
+  ) : null
+}
+
+export function renderDeveloperPermissionsSettingsSection(
+  context: SettingsRenderContext
+): React.JSX.Element | null {
+  const { model, navigation, view } = context
+  return model.showDesktopOnlySettings && model.isMac ? (
+    <SettingsSection
+      id="developer-permissions"
+      title={translate('auto.components.settings.Settings.65660d4548', 'macOS Permissions')}
+      description={translate(
+        'auto.components.settings.Settings.9b83cc62c2',
+        'macOS privacy access for terminal-launched developer tools.'
+      )}
+      searchEntries={navigation.getSectionSearchEntries('developer-permissions')}
+    >
+      {view.isSectionMounted('developer-permissions') ? (
+        <DeveloperPermissionsPane highlightedSettingId={model.highlightedSettingsTargetId} />
+      ) : null}
+    </SettingsSection>
+  ) : null
+}
+
+export function renderPrivacySettingsSection(context: SettingsRenderContext): React.JSX.Element {
+  const { model, navigation, view } = context
+  return (
+    <SettingsSection
+      id="privacy"
+      title={translate('auto.components.settings.Settings.d7e3f62d70', 'Privacy & Telemetry')}
+      description={translate(
+        'auto.components.settings.Settings.c1b43dc4e2',
+        'Anonymous usage data and telemetry controls.'
+      )}
+      searchEntries={navigation.getSectionSearchEntries('privacy')}
+    >
+      {view.isSectionMounted('privacy') ? <PrivacyPane settings={model.settings} /> : null}
+    </SettingsSection>
+  )
+}
diff --git a/src/renderer/src/components/settings/settings-render-context.ts b/src/renderer/src/components/settings/settings-render-context.ts
new file mode 100644
index 00000000000..36ad7068d7d
--- /dev/null
+++ b/src/renderer/src/components/settings/settings-render-context.ts
@@ -0,0 +1,19 @@
+import type { GlobalSettings } from '../../../../shared/global-settings-types'
+import type { SettingsStoreModel } from './use-settings-store-model'
+import type { SettingsInteractionController } from './use-settings-interaction-controller'
+import type { SettingsNavigationModel } from './use-settings-navigation-model'
+import type { SettingsTerminalModel } from './use-settings-terminal-model'
+import type { SettingsNavigationActions, SettingsViewModel } from './settings-view-model'
+
+export type LoadedSettingsStoreModel = Omit<SettingsStoreModel, 'settings'> & {
+  settings: GlobalSettings
+}
+
+export type SettingsRenderContext = {
+  model: LoadedSettingsStoreModel
+  interactions: SettingsInteractionController
+  navigation: SettingsNavigationModel
+  terminal: SettingsTerminalModel
+  actions: SettingsNavigationActions
+  view: SettingsViewModel
+}
diff --git a/src/renderer/src/components/settings/settings-search.ts b/src/renderer/src/components/settings/settings-search.ts
index cbbd8388f65..359fe8b40ef 100644
--- a/src/renderer/src/components/settings/settings-search.ts
+++ b/src/renderer/src/components/settings/settings-search.ts
@@ -145,13 +145,11 @@ export function rankSettingsSearchItems<T>(
   }
 
   return items
-    .map(
-      (item, index): SettingsSearchRankCandidate<T> => ({
-        item,
-        index,
-        score: scoreSettingsSearch(query, getEntries(item))
-      })
-    )
+    .map((item, index): SettingsSearchRankCandidate<T> => ({
+      item,
+      index,
+      score: scoreSettingsSearch(query, getEntries(item))
+    }))
     .filter((candidate) => candidate.score > SETTINGS_SEARCH_NO_MATCH_SCORE)
     .sort((a, b) => b.score - a.score || a.index - b.index)
     .map(({ item, score }) => ({ item, score }))
diff --git a/src/renderer/src/components/settings/settings-setup-workflow-section-renderers.tsx b/src/renderer/src/components/settings/settings-setup-workflow-section-renderers.tsx
new file mode 100644
index 00000000000..409ba4aedb1
--- /dev/null
+++ b/src/renderer/src/components/settings/settings-setup-workflow-section-renderers.tsx
@@ -0,0 +1,178 @@
+import { ArtifactsSettingsPane } from './ArtifactsSettingsPane'
+import { AutomationsSettingsPane } from './AutomationsSettingsPane'
+import { GeneralPane } from './GeneralPane'
+import { IntegrationsPane } from './IntegrationsPane'
+import { MobileSettingsPane } from './MobileSettingsPane'
+import { OrcaAccountSettingsPane } from './OrcaAccountSettingsPane'
+import { SettingsSetupGuidePane } from './SettingsSetupGuidePane'
+import { ShareSkillsSettingsPane } from './ShareSkillsSettingsPane'
+import { SettingsSection } from './SettingsSection'
+import { translate } from '@/i18n/i18n'
+import type { SettingsRenderContext } from './settings-render-context'
+
+export function renderOrcaAccountSettingsSection(
+  context: SettingsRenderContext
+): React.JSX.Element | null {
+  const { model, navigation, view } = context
+  return model.showDesktopOnlySettings ? (
+    <SettingsSection
+      id="orca-account"
+      title={translate('auto.components.settings.orcaAccount.title', 'Orca Account')}
+      description={translate(
+        'auto.components.settings.orcaAccount.description',
+        'Share work instantly and reach your desktop from Orca Mobile wherever you are.'
+      )}
+      searchEntries={navigation.getSectionSearchEntries('orca-account')}
+    >
+      {view.isSectionMounted('orca-account') ? <OrcaAccountSettingsPane /> : null}
+    </SettingsSection>
+  ) : null
+}
+
+export function renderSetupGuideSettingsSection(context: SettingsRenderContext): React.JSX.Element {
+  const { navigation, view } = context
+  return (
+    <SettingsSection
+      id="setup-guide"
+      title={translate('auto.components.settings.Settings.6d119427ef', 'Onboarding checklist')}
+      description={translate(
+        'auto.components.settings.Settings.6855b0f77d',
+        'Finish the core workflows that make Orca useful for parallel agent work.'
+      )}
+      searchEntries={navigation.getSectionSearchEntries('setup-guide')}
+      bodyClassName="overflow-hidden rounded-none border-0 bg-transparent p-0 shadow-none"
+    >
+      {view.isSectionMounted('setup-guide') ? <SettingsSetupGuidePane /> : null}
+    </SettingsSection>
+  )
+}
+
+export function renderGeneralSettingsSection(context: SettingsRenderContext): React.JSX.Element {
+  const { model, interactions, navigation, terminal, view } = context
+  return (
+    <SettingsSection
+      id="general"
+      title={translate('auto.components.settings.Settings.7807c11c4d', 'General')}
+      description={translate(
+        'auto.components.settings.Settings.f9b77539fd',
+        'Workspace defaults, app setup, and maintenance.'
+      )}
+      searchEntries={navigation.getSectionSearchEntries('general')}
+    >
+      {view.isSectionMounted('general') ? (
+        <GeneralPane
+          settings={model.settings}
+          updateSettings={model.updateSettings}
+          updateSettingsOrThrow={model.updateSettingsOrThrow}
+          fontSuggestions={model.terminalFontSuggestions}
+          onRequestFontSuggestions={interactions.requestFontSuggestions}
+          wslSupportedPlatform={terminal.localWslSupportedPlatform}
+          wslAvailable={terminal.localWindowsRuntimeCapabilities.wslAvailable}
+          wslDistros={terminal.localWindowsRuntimeCapabilities.wslDistros}
+          wslCapabilitiesLoading={terminal.localWindowsRuntimeCapabilities.isLoading}
+        />
+      ) : null}
+    </SettingsSection>
+  )
+}
+
+export function renderIntegrationsSettingsSection(
+  context: SettingsRenderContext
+): React.JSX.Element {
+  const { navigation, view } = context
+  return (
+    <SettingsSection
+      id="integrations"
+      title={translate('auto.components.settings.Settings.c9ca101a3b', 'Integrations')}
+      description={translate(
+        'auto.components.settings.Settings.b07041697f',
+        'Connect GitHub, GitLab, Linear, and source-hosting services.'
+      )}
+      searchEntries={navigation.getSectionSearchEntries('integrations')}
+      bodyClassName="rounded-none border-0 bg-transparent p-0 shadow-none"
+    >
+      {view.isSectionMounted('integrations') ? <IntegrationsPane /> : null}
+    </SettingsSection>
+  )
+}
+
+export function renderMobileSettingsSection(
+  context: SettingsRenderContext
+): React.JSX.Element | null {
+  const { model, navigation, view } = context
+  return model.showDesktopOnlySettings ? (
+    <SettingsSection
+      id="mobile"
+      title={translate('auto.components.settings.Settings.c40dadaac8', 'Mobile')}
+      badge="Beta"
+      description={translate(
+        'auto.components.settings.Settings.c6c01ac209',
+        'Control terminals and agents from your phone.'
+      )}
+      searchEntries={navigation.getSectionSearchEntries('mobile')}
+    >
+      {view.isSectionMounted('mobile') ? <MobileSettingsPane /> : null}
+    </SettingsSection>
+  ) : null
+}
+
+export function renderAutomationsSettingsSection(
+  context: SettingsRenderContext
+): React.JSX.Element {
+  const { model, navigation, view } = context
+  return (
+    <SettingsSection
+      id="automations"
+      title={translate('auto.components.settings.automations.title', 'Automations')}
+      description={translate(
+        'auto.components.settings.automations.description',
+        'Schedule agent work and choose whether Automations appears in the sidebar.'
+      )}
+      searchEntries={navigation.getSectionSearchEntries('automations')}
+    >
+      {view.isSectionMounted('automations') ? (
+        <AutomationsSettingsPane settings={model.settings} updateSettings={model.updateSettings} />
+      ) : null}
+    </SettingsSection>
+  )
+}
+
+export function renderArtifactsSettingsSection(context: SettingsRenderContext): React.JSX.Element {
+  const { model, navigation, view } = context
+  return (
+    <SettingsSection
+      id="artifacts"
+      title={translate('auto.components.settings.artifacts.title', 'Artifacts')}
+      badge="Beta"
+      description={translate(
+        'auto.components.settings.artifacts.description',
+        'Share HTML and Markdown files with your team and manage their public links.'
+      )}
+      searchEntries={navigation.getSectionSearchEntries('artifacts')}
+    >
+      {view.isSectionMounted('artifacts') ? (
+        <ArtifactsSettingsPane settings={model.settings} updateSettings={model.updateSettings} />
+      ) : null}
+    </SettingsSection>
+  )
+}
+
+export function renderShareSkillsSettingsSection(
+  context: SettingsRenderContext
+): React.JSX.Element {
+  const { navigation, view } = context
+  return (
+    <SettingsSection
+      id="share-skills"
+      title={translate('auto.components.settings.shareSkills.title', 'Share Skills')}
+      badge="Beta"
+      description={translate(
+        'auto.components.settings.shareSkills.description',
+        'Share your skills with an unlisted link. Anyone who has it can install them.'
+      )}
+      searchEntries={navigation.getSectionSearchEntries('share-skills')}
+    >
+      {view.isSectionMounted('share-skills') ? <ShareSkillsSettingsPane /> : null}
+    </SettingsSection>
+  )
+}
diff --git a/src/renderer/src/components/settings/settings-view-model.ts b/src/renderer/src/components/settings/settings-view-model.ts
new file mode 100644
index 00000000000..719f5a34263
--- /dev/null
+++ b/src/renderer/src/components/settings/settings-view-model.ts
@@ -0,0 +1,123 @@
+import { useCallback } from 'react'
+import type { SettingsNavGroup } from '@/lib/settings-navigation-types'
+import { translate } from '@/i18n/i18n'
+import type { SettingsStoreModel } from './use-settings-store-model'
+import type { SettingsInteractionController } from './use-settings-interaction-controller'
+import type { SettingsNavigationModel } from './use-settings-navigation-model'
+import { getSettingsNavGroupDefinitionsForSearch } from './settings-navigation-foundations'
+
+export function useSettingsNavigationActions(
+  model: SettingsStoreModel,
+  interactions: SettingsInteractionController
+) {
+  const {
+    activeSectionId,
+    setActiveSectionId,
+    setPendingNavRequestTick,
+    setSettingsSearchQuery,
+    settingsSearchQuery
+  } = model
+  const {
+    confirmDiscardSourceControlAiPromptChanges,
+    contentScrollRef,
+    pendingNavSectionRef,
+    pendingScrollTargetRef
+  } = interactions
+  const scrollToSection = useCallback(
+    async (sectionId: string): Promise<void> => {
+      if (sectionId !== activeSectionId && !(await confirmDiscardSourceControlAiPromptChanges())) {
+        return
+      }
+      const container = contentScrollRef.current
+      if (container) {
+        container.scrollTo({ top: 0 })
+      }
+      if (settingsSearchQuery.trim() !== '') {
+        // Why: clear the search filter so selecting a result shows that pane, not the stale query's.
+        setSettingsSearchQuery('')
+      }
+      setActiveSectionId(sectionId)
+    },
+    [
+      activeSectionId,
+      confirmDiscardSourceControlAiPromptChanges,
+      contentScrollRef,
+      setActiveSectionId,
+      setSettingsSearchQuery,
+      settingsSearchQuery
+    ]
+  )
+
+  const openComputerUseFromBrowser = useCallback(async () => {
+    if (!(await confirmDiscardSourceControlAiPromptChanges())) {
+      return
+    }
+    pendingNavSectionRef.current = 'computer-use'
+    pendingScrollTargetRef.current = 'computer-use'
+    if (settingsSearchQuery !== '') {
+      setSettingsSearchQuery('')
+      return
+    }
+    // Why: pending refs don't schedule a render; bump state to rerun the jump effect.
+    setPendingNavRequestTick((tick) => tick + 1)
+  }, [
+    confirmDiscardSourceControlAiPromptChanges,
+    pendingNavSectionRef,
+    pendingScrollTargetRef,
+    setPendingNavRequestTick,
+    setSettingsSearchQuery,
+    settingsSearchQuery
+  ])
+
+  return { scrollToSection, openComputerUseFromBrowser }
+}
+
+export type SettingsNavigationActions = ReturnType<typeof useSettingsNavigationActions>
+
+export function buildSettingsViewModel(
+  model: SettingsStoreModel,
+  navigation: SettingsNavigationModel
+) {
+  const generalNavSections = navigation.visibleNavSections.filter(
+    (section) => !section.id.startsWith('repo-')
+  )
+  const generalNavGroupDefinitions = getSettingsNavGroupDefinitionsForSearch(
+    navigation.visibleNavSections,
+    model.settingsSearchQuery
+  )
+  const generalNavGroups: SettingsNavGroup[] = generalNavGroupDefinitions
+    .map((group) => ({
+      id: group.id,
+      title: translate(group.titleKey, group.titleDefault),
+      sections: generalNavSections.filter((section) => section.group === group.id)
+    }))
+    .filter((group) => group.sections.length > 0 || group.id === 'setup')
+  const repoNavSections = navigation.visibleNavSections
+    .filter((section) => section.id.startsWith('repo-'))
+    .map((section) => {
+      const repo = model.repos.find((entry) => entry.id === section.id.replace('repo-', ''))
+      return {
+        ...section,
+        badgeColor: repo?.badgeColor,
+        isRemote: !!repo?.connectionId,
+        repoIcon: repo?.repoIcon,
+        upstream: repo?.upstream
+      }
+    })
+  const isSectionMounted = (sectionId: string): boolean =>
+    navigation.neededSectionIds.has(sectionId)
+  const isFocusedShortcutsPane =
+    model.activeSectionId === 'shortcuts' && model.settingsSearchQuery.trim() === ''
+  const isFocusedSetupGuidePane =
+    model.activeSectionId === 'setup-guide' && model.settingsSearchQuery.trim() === ''
+
+  return {
+    generalNavGroups,
+    repoNavSections,
+    isSectionMounted,
+    isFocusedShortcutsPane,
+    isFocusedSetupGuidePane
+  }
+}
+
+export type SettingsViewModel = ReturnType<typeof buildSettingsViewModel>
diff --git a/src/renderer/src/components/settings/use-runtime-environment-catalog.ts b/src/renderer/src/components/settings/use-runtime-environment-catalog.ts
new file mode 100644
index 00000000000..57b6c25d892
--- /dev/null
+++ b/src/renderer/src/components/settings/use-runtime-environment-catalog.ts
@@ -0,0 +1,163 @@
+import {
+  useCallback,
+  useEffect,
+  useState,
+  type Dispatch,
+  type MutableRefObject,
+  type SetStateAction
+} from 'react'
+import { toast } from 'sonner'
+import { useMountedRef } from '@/hooks/useMountedRef'
+import { translate } from '@/i18n/i18n'
+import { unwrapRuntimeRpcResult } from '@/runtime/runtime-rpc-client'
+import { useAppStore } from '@/store'
+import {
+  isUserManagedRuntimeEnvironment,
+  type PublicKnownRuntimeEnvironment
+} from '../../../../shared/runtime-environments'
+import type { RuntimeStatus } from '../../../../shared/runtime-types'
+import { evaluateHostDetails, type RuntimeHostDetails } from './runtime-environment-host-details'
+
+type RuntimeEnvironmentCatalog = {
+  environments: PublicKnownRuntimeEnvironment[]
+  isLoading: boolean
+  detailsByEnvironmentId: Record<string, RuntimeHostDetails>
+  setDetailsByEnvironmentId: Dispatch<SetStateAction<Record<string, RuntimeHostDetails>>>
+  mountedRef: MutableRefObject<boolean>
+  loadEnvironments: (verified?: {
+    environmentId: string
+    runtimeStatus: RuntimeStatus
+  }) => Promise<void>
+}
+
+export function useRuntimeEnvironmentCatalog(): RuntimeEnvironmentCatalog {
+  const [environments, setEnvironments] = useState<PublicKnownRuntimeEnvironment[]>([])
+  const [isLoading, setIsLoading] = useState(false)
+  const [detailsByEnvironmentId, setDetailsByEnvironmentId] = useState<
+    Record<string, RuntimeHostDetails>
+  >({})
+  const mountedRef = useMountedRef()
+
+  const loadEnvironments = useCallback(
+    async (verified?: { environmentId: string; runtimeStatus: RuntimeStatus }): Promise<void> => {
+      if (mountedRef.current) {
+        setIsLoading(true)
+      }
+      try {
+        const nextEnvironments = await window.api.runtimeEnvironments.list()
+        const visibleEnvironments = nextEnvironments.filter(isUserManagedRuntimeEnvironment)
+        // Why: drop store status for servers no longer saved so stale hosts don't
+        // linger in the sidebar registry.
+        useAppStore.getState().setRuntimeEnvironments(nextEnvironments)
+        if (verified) {
+          useAppStore.getState().setRuntimeEnvironmentStatus(verified.environmentId, {
+            status: verified.runtimeStatus,
+            checkedAt: Date.now()
+          })
+        }
+        if (mountedRef.current) {
+          setEnvironments(visibleEnvironments)
+          setDetailsByEnvironmentId((current) => {
+            const next: Record<string, RuntimeHostDetails> = {}
+            for (const environment of visibleEnvironments) {
+              next[environment.id] =
+                verified?.environmentId === environment.id
+                  ? {
+                      status: 'ready',
+                      runtimeStatus: verified.runtimeStatus,
+                      compatibility: evaluateHostDetails(verified.runtimeStatus),
+                      error: null
+                    }
+                  : (current[environment.id] ?? {
+                      status: 'loading',
+                      runtimeStatus: null,
+                      compatibility: null,
+                      error: null
+                    })
+            }
+            return next
+          })
+        }
+        await Promise.allSettled(
+          visibleEnvironments
+            .filter((environment) => environment.id !== verified?.environmentId)
+            .map(async (environment) => {
+              try {
+                const response = await window.api.runtimeEnvironments.getStatus({
+                  selector: environment.id,
+                  timeoutMs: 10_000
+                })
+                const runtimeStatus = unwrapRuntimeRpcResult<RuntimeStatus>(response)
+                // Why: feed the live status into the store so sidebar host pickers
+                // reflect manual refreshes, not just the settings pane.
+                useAppStore.getState().setRuntimeEnvironmentStatus(environment.id, {
+                  status: runtimeStatus,
+                  checkedAt: Date.now()
+                })
+                if (!mountedRef.current) {
+                  return
+                }
+                setDetailsByEnvironmentId((current) => ({
+                  ...current,
+                  [environment.id]: {
+                    status: 'ready',
+                    runtimeStatus,
+                    compatibility: evaluateHostDetails(runtimeStatus),
+                    error: null
+                  }
+                }))
+              } catch (error) {
+                // Why: record the failed probe (null status) so the sidebar can
+                // distinguish unreachable from never-checked.
+                useAppStore.getState().setRuntimeEnvironmentStatus(environment.id, {
+                  status: null,
+                  checkedAt: Date.now()
+                })
+                if (!mountedRef.current) {
+                  return
+                }
+                setDetailsByEnvironmentId((current) => ({
+                  ...current,
+                  [environment.id]: {
+                    status: 'error',
+                    runtimeStatus: null,
+                    compatibility: null,
+                    error: error instanceof Error ? error.message : String(error)
+                  }
+                }))
+              }
+            })
+        )
+      } catch (error) {
+        if (mountedRef.current) {
+          toast.error(
+            error instanceof Error
+              ? error.message
+              : translate(
+                  'auto.components.settings.RuntimeEnvironmentsPane.e6410d72c3',
+                  'Failed to load runtime environments.'
+                )
+          )
+        }
+      } finally {
+        if (mountedRef.current) {
+          setIsLoading(false)
+        }
+      }
+    },
+    [mountedRef]
+  )
+
+  useEffect(() => {
+    void loadEnvironments()
+  }, [loadEnvironments])
+
+  return {
+    environments,
+    isLoading,
+    detailsByEnvironmentId,
+    setDetailsByEnvironmentId,
+    mountedRef,
+    loadEnvironments
+  }
+}
diff --git a/src/renderer/src/components/settings/use-runtime-environment-connection-actions.ts b/src/renderer/src/components/settings/use-runtime-environment-connection-actions.ts
new file mode 100644
index 00000000000..3a0e90f4b62
--- /dev/null
+++ b/src/renderer/src/components/settings/use-runtime-environment-connection-actions.ts
@@ -0,0 +1,212 @@
+import { useState, type Dispatch, type MutableRefObject, type SetStateAction } from 'react'
+import { toast } from 'sonner'
+import { translate } from '@/i18n/i18n'
+import { unwrapRuntimeRpcResult } from '@/runtime/runtime-rpc-client'
+import { useAppStore } from '@/store'
+import { describeRuntimeCompatBlock } from '../../../../shared/protocol-compat'
+import type { PublicKnownRuntimeEnvironment } from '../../../../shared/runtime-environments'
+import type { RuntimeStatus } from '../../../../shared/runtime-types'
+import { evaluateHostDetails, type RuntimeHostDetails } from './runtime-environment-host-details'
+import { LOCAL_RUNTIME_VALUE, NO_RUNTIME_VALUE } from './runtime-environment-selection'
+
+type RuntimeEnvironmentConnectionActionParams = {
+  allowLocalRuntime: boolean
+  mountedRef: MutableRefObject<boolean>
+  setDetailsByEnvironmentId: Dispatch<SetStateAction<Record<string, RuntimeHostDetails>>>
+  setActiveRuntimeEnvironmentPreference: (environmentId: string | null) => Promise<boolean>
+  getEnvironmentLabel: (value: string) => string
+}
+
+export function useRuntimeEnvironmentConnectionActions({
+  allowLocalRuntime,
+  mountedRef,
+  setDetailsByEnvironmentId,
+  setActiveRuntimeEnvironmentPreference,
+  getEnvironmentLabel
+}: RuntimeEnvironmentConnectionActionParams) {
+  const [connectingId, setConnectingId] = useState<string | null>(null)
+  const [switchingValue, setSwitchingValue] = useState<string | null>(null)
+  const [disconnectingId, setDisconnectingId] = useState<string | null>(null)
+  const [switchError, setSwitchError] = useState<string | null>(null)
+
+  const disconnectEnvironment = async (
+    environment: PublicKnownRuntimeEnvironment
+  ): Promise<boolean> => {
+    setDisconnectingId(environment.id)
+    setSwitchError(null)
+    try {
+      await window.api.runtimeEnvironments.disconnect({ selector: environment.id })
+      // Why: disconnect is non-destructive; keep the saved server but show the
+      // user that this live client is no longer attached to it.
+      useAppStore.getState().setRuntimeEnvironmentStatus(
+        environment.id,
+        {
+          status: null,
+          checkedAt: Date.now()
+        },
+        { suppressDisconnectToast: true }
+      )
+      if (mountedRef.current) {
+        setDetailsByEnvironmentId((current) => ({
+          ...current,
+          [environment.id]: {
+            status: 'error',
+            runtimeStatus: null,
+            compatibility: null,
+            error: null
+          }
+        }))
+        toast.success(
+          translate(
+            'auto.components.settings.RuntimeEnvironmentsPane.disconnectedServer',
+            'Disconnected from {{value0}}.',
+            { value0: environment.name }
+          )
+        )
+      }
+      return true
+    } catch (error) {
+      const message = error instanceof Error ? error.message : 'Failed to disconnect server.'
+      if (mountedRef.current) {
+        setSwitchError(message)
+        toast.error(message)
+      }
+      return false
+    } finally {
+      if (mountedRef.current) {
+        setDisconnectingId(null)
+      }
+    }
+  }
+
+  const connectEnvironment = async (
+    environment: PublicKnownRuntimeEnvironment
+  ): Promise<boolean> => {
+    setConnectingId(environment.id)
+    setSwitchError(null)
+    try {
+      const response = await window.api.runtimeEnvironments.connect({
+        selector: environment.id,
+        timeoutMs: 15_000
+      })
+      const runtimeStatus = unwrapRuntimeRpcResult<RuntimeStatus>(response)
+      const compatibility = evaluateHostDetails(runtimeStatus)
+      // Why: row Connect is reachability only. The Advanced selector is the
+      // explicit default-host control and should be the only active-server path.
+      useAppStore.getState().setRuntimeEnvironmentStatus(environment.id, {
+        status: runtimeStatus,
+        checkedAt: Date.now()
+      })
+      if (mountedRef.current) {
+        setDetailsByEnvironmentId((current) => ({
+          ...current,
+          [environment.id]: {
+            status: 'ready',
+            runtimeStatus,
+            compatibility,
+            error: null
+          }
+        }))
+      }
+      if (compatibility.kind === 'blocked') {
+        const message = describeRuntimeCompatBlock(compatibility)
+        if (mountedRef.current) {
+          setSwitchError(message)
+          toast.error(message)
+        }
+        return false
+      }
+      const store = useAppStore.getState()
+      // Why: Connect is not the Active Server selector anymore, but connected
+      // hosts should still contribute their projects/workspaces to the sidebar.
+      const repos = await store.fetchRuntimeEnvironmentRepos(environment.id)
+      await Promise.all(repos.map((repo) => useAppStore.getState().fetchWorktrees(repo.id)))
+      await useAppStore.getState().fetchWorktreeLineage()
+      if (mountedRef.current) {
+        toast.success(
+          translate(
+            'auto.components.settings.RuntimeEnvironmentsPane.runtimeReachable',
+            '{{value0}} is reachable.',
+            { value0: environment.name }
+          )
+        )
+      }
+      return true
+    } catch (error) {
+      const message = error instanceof Error ? error.message : 'Failed to connect server.'
+      useAppStore.getState().setRuntimeEnvironmentStatus(environment.id, {
+        status: null,
+        checkedAt: Date.now()
+      })
+      if (mountedRef.current) {
+        setDetailsByEnvironmentId((current) => ({
+          ...current,
+          [environment.id]: {
+            status: 'error',
+            runtimeStatus: null,
+            compatibility: null,
+            error: message
+          }
+        }))
+        setSwitchError(message)
+        toast.error(message)
+      }
+      return false
+    } finally {
+      if (mountedRef.current) {
+        setConnectingId(null)
+      }
+    }
+  }
+
+  const switchToValue = async (value: string): Promise<boolean> => {
+    if (value === NO_RUNTIME_VALUE) {
+      return false
+    }
+    setSwitchingValue(value)
+    setSwitchError(null)
+    try {
+      const switched = await setActiveRuntimeEnvironmentPreference(
+        allowLocalRuntime && value === LOCAL_RUNTIME_VALUE ? null : value
+      )
+      if (switched) {
+        if (mountedRef.current) {
+          toast.success(
+            translate(
+              'auto.components.settings.RuntimeEnvironmentsPane.99ac81fb43',
+              'Switched to {{value0}}.',
+              { value0: getEnvironmentLabel(value) }
+            )
+          )
+        }
+        return true
+      }
+      if (mountedRef.current) {
+        setSwitchError('Could not switch servers. Fix the issue and try again.')
+      }
+      return false
+    } catch (error) {
+      const message = error instanceof Error ? error.message : 'Failed to switch servers.'
+      if (mountedRef.current) {
+        setSwitchError(message)
+        toast.error(message)
+      }
+      return false
+    } finally {
+      if (mountedRef.current) {
+        setSwitchingValue(null)
+      }
+    }
+  }
+
+  return {
+    connectingId,
+    switchingValue,
+    disconnectingId,
+    switchError,
+    setSwitchError,
+    connectEnvironment,
+    disconnectEnvironment,
+    switchToValue
+  }
+}
diff --git a/src/renderer/src/components/settings/use-runtime-environment-mutation-actions.ts b/src/renderer/src/components/settings/use-runtime-environment-mutation-actions.ts
new file mode 100644
index 00000000000..0a9b83d14b7
--- /dev/null
+++ b/src/renderer/src/components/settings/use-runtime-environment-mutation-actions.ts
@@ -0,0 +1,194 @@
+import { useState, type Dispatch, type MutableRefObject, type SetStateAction } from 'react'
+import { toast } from 'sonner'
+import { translate } from '@/i18n/i18n'
+import type { GlobalSettings } from '../../../../shared/global-settings-types'
+import type { PublicKnownRuntimeEnvironment } from '../../../../shared/runtime-environments'
+import type { RuntimeStatus } from '../../../../shared/runtime-types'
+import { isRuntimeEnvironmentRemovalBlocked } from './runtime-environment-host-details'
+import type { RuntimeHostAccessFailure } from './RuntimeHostAccessForm'
+
+type RuntimeEnvironmentMutationActionParams = {
+  environments: PublicKnownRuntimeEnvironment[]
+  settings: GlobalSettings
+  allowLocalRuntime: boolean
+  mountedRef: MutableRefObject<boolean>
+  setAddServerFormOpen: Dispatch<SetStateAction<boolean>>
+  loadEnvironments: (verified?: {
+    environmentId: string
+    runtimeStatus: RuntimeStatus
+  }) => Promise<void>
+  connectEnvironment: (environment: PublicKnownRuntimeEnvironment) => Promise<boolean>
+}
+
+export function useRuntimeEnvironmentMutationActions({
+  environments,
+  settings,
+  allowLocalRuntime,
+  mountedRef,
+  setAddServerFormOpen,
+  loadEnvironments,
+  connectEnvironment
+}: RuntimeEnvironmentMutationActionParams) {
+  const [isSaving, setIsSaving] = useState(false)
+  const [removingId, setRemovingId] = useState<string | null>(null)
+  const [removeError, setRemoveError] = useState<string | null>(null)
+  const [name, setName] = useState('')
+  const [pairingCode, setPairingCode] = useState('')
+  const [addServerFailure, setAddServerFailure] = useState<RuntimeHostAccessFailure | null>(null)
+
+  const closeAddServerForm = (): void => {
+    if (isSaving) {
+      return
+    }
+    setAddServerFormOpen(false)
+    setName('')
+    setPairingCode('')
+    setAddServerFailure(null)
+  }
+
+  const addEnvironment = async (allowLoopback: boolean): Promise<void> => {
+    const trimmedName = name.trim()
+    const trimmedPairingCode = pairingCode.trim()
+    if (!trimmedName || !trimmedPairingCode) {
+      toast.error(
+        translate(
+          'auto.components.settings.RuntimeEnvironmentsPane.0c55a47480',
+          'Name and pairing code are required.'
+        )
+      )
+      return
+    }
+    const duplicate = environments.find(
+      (environment) => environment.name.trim().toLowerCase() === trimmedName.toLowerCase()
+    )
+    if (duplicate) {
+      toast.error(
+        translate(
+          'auto.components.settings.RuntimeEnvironmentsPane.5ef712f407',
+          'A server named "{{value0}}" already exists.',
+          { value0: duplicate.name }
+        )
+      )
+      return
+    }
+    setAddServerFailure(null)
+    setIsSaving(true)
+    try {
+      const result = await window.api.runtimeEnvironments.verifyAndAddFromPairingCode({
+        name: trimmedName,
+        pairingCode: trimmedPairingCode,
+        allowLoopback
+      })
+      if (!result.ok) {
+        if (mountedRef.current) {
+          setAddServerFailure({ kind: result.kind, message: result.message })
+        }
+        return
+      }
+      if (mountedRef.current) {
+        setName('')
+        setPairingCode('')
+      }
+      await loadEnvironments({
+        environmentId: result.environment.id,
+        runtimeStatus: result.runtimeStatus
+      })
+      if (!allowLocalRuntime) {
+        const connected = await connectEnvironment(result.environment)
+        if (!connected) {
+          await window.api.runtimeEnvironments.remove({ selector: result.environment.id })
+          await loadEnvironments()
+          return
+        }
+      } else {
+        if (mountedRef.current) {
+          toast.success(
+            translate(
+              'auto.components.settings.RuntimeEnvironmentsPane.7b5986c8df',
+              'Connected to {{value0}}. Use Advanced > Active Server to make it the default.',
+              { value0: result.environment.name }
+            )
+          )
+        }
+      }
+      if (mountedRef.current) {
+        setAddServerFormOpen(false)
+      }
+    } catch (error) {
+      if (mountedRef.current) {
+        toast.error(
+          error instanceof Error
+            ? error.message
+            : translate(
+                'auto.components.settings.RuntimeEnvironmentsPane.6cb6eae14f',
+                'Failed to save runtime environment.'
+              )
+        )
+      }
+    } finally {
+      if (mountedRef.current) {
+        setIsSaving(false)
+      }
+    }
+  }
+
+  const removeEnvironment = async (
+    environment: PublicKnownRuntimeEnvironment
+  ): Promise<boolean> => {
+    setRemovingId(environment.id)
+    setRemoveError(null)
+    try {
+      if (isRuntimeEnvironmentRemovalBlocked(settings.activeRuntimeEnvironmentId, environment.id)) {
+        if (mountedRef.current) {
+          setRemoveError(
+            translate(
+              'auto.components.settings.RuntimeEnvironmentsPane.removeActiveServerBlocked',
+              'Choose another Active Server in Advanced before removing this server.'
+            )
+          )
+        }
+        return false
+      }
+      await window.api.runtimeEnvironments.remove({ selector: environment.id })
+      await loadEnvironments()
+      if (mountedRef.current) {
+        toast.success(
+          translate(
+            'auto.components.settings.RuntimeEnvironmentsPane.b5b5114cb0',
+            'Removed {{value0}}.',
+            { value0: environment.name }
+          )
+        )
+      }
+      return true
+    } catch (error) {
+      const message =
+        error instanceof Error ? error.message : 'Failed to remove runtime environment.'
+      if (mountedRef.current) {
+        setRemoveError(message)
+        toast.error(message)
+      }
+      return false
+    } finally {
+      if (mountedRef.current) {
+        setRemovingId(null)
+      }
+    }
+  }
+
+  return {
+    isSaving,
+    removingId,
+    removeError,
+    setRemoveError,
+    name,
+    setName,
+    pairingCode,
+    setPairingCode,
+    addServerFailure,
+    setAddServerFailure,
+    closeAddServerForm,
+    addEnvironment,
+    removeEnvironment
+  }
+}
diff --git a/src/renderer/src/components/settings/use-settings-interaction-controller.ts b/src/renderer/src/components/settings/use-settings-interaction-controller.ts
new file mode 100644
index 00000000000..bfd24c7e5d8
--- /dev/null
+++ b/src/renderer/src/components/settings/use-settings-interaction-controller.ts
@@ -0,0 +1,199 @@
+import { useCallback, useEffect, useRef } from 'react'
+import type { SourceControlAiSettingsPatch } from '../../../../shared/source-control-ai-types'
+import { useAppStore } from '../../store'
+import { translate } from '@/i18n/i18n'
+import { mergeFontSuggestions } from './SettingsConstants'
+import type { SettingsStoreModel } from './use-settings-store-model'
+import type { SettingsDeepLinkTargetWatch } from './settings-deep-link-target-watcher'
+import {
+  cancelPendingSettingsDeepLinkTargetWatch,
+  cancelPendingSettingsSubsectionScrollFrame,
+  readSourceControlAiSettings,
+  SETTINGS_TARGET_HIGHLIGHT_MS
+} from './settings-navigation-foundations'
+
+export function useSettingsInteractionController(model: SettingsStoreModel) {
+  const {
+    closeSettingsPage,
+    confirm,
+    hasUnsavedBranchPromptChanges,
+    hasUnsavedCommitPromptChanges,
+    highlightedSettingsTargetId,
+    setFontSuggestions,
+    setHasUnsavedBranchPromptChanges,
+    setHasUnsavedCommitPromptChanges,
+    setHighlightedSettingsTargetId,
+    setSettingsSearchQuery,
+    setSourceControlAiPromptDiscardSignal,
+    settings,
+    updateSettings
+  } = model
+  const contentScrollRef = useRef<HTMLDivElement | null>(null)
+  const searchInputRef = useRef<HTMLInputElement | null>(null)
+  const installedFontsLoadedRef = useRef(false)
+  const installedFontsLoadPromiseRef = useRef<Promise<void> | null>(null)
+  const settingsMountedRef = useRef(true)
+  const pendingNavSectionRef = useRef<string | null>(null)
+  const pendingScrollTargetRef = useRef<string | null>(null)
+  const pendingSubsectionScrollFrameRef = useRef<number | null>(null)
+  const pendingScrollTargetWatchRef = useRef<SettingsDeepLinkTargetWatch | null>(null)
+  const repoHooksRequestSeqRef = useRef(0)
+  const shortcutsEscapeConfirmUntilRef = useRef(0)
+  const sourceControlAiWriteQueueRef = useRef<Promise<void>>(Promise.resolve())
+
+  const hasUnsavedSourceControlAiPromptChanges =
+    hasUnsavedCommitPromptChanges || hasUnsavedBranchPromptChanges
+  // Why: the close guard registers once, so it reads latest dirty state from a ref instead of a lagging closure.
+  const hasUnsavedSourceControlAiPromptChangesRef = useRef(hasUnsavedSourceControlAiPromptChanges)
+  hasUnsavedSourceControlAiPromptChangesRef.current = hasUnsavedSourceControlAiPromptChanges
+
+  const writeSourceControlAiSettings = useCallback(
+    (patch: SourceControlAiSettingsPatch): Promise<void> => {
+      const next = sourceControlAiWriteQueueRef.current
+        .catch(() => undefined)
+        .then(async () => {
+          const latestSettings = useAppStore.getState().settings ?? settings
+          if (!latestSettings) {
+            return
+          }
+
+          const latestConfig = readSourceControlAiSettings(latestSettings)
+          const resolvedPatch = typeof patch === 'function' ? patch(latestConfig) : patch
+          await updateSettings({ sourceControlAi: { ...latestConfig, ...resolvedPatch } })
+        })
+      sourceControlAiWriteQueueRef.current = next
+      return next
+    },
+    [settings, updateSettings]
+  )
+
+  const setSettingsRootNode = useCallback(
+    (node: HTMLDivElement | null): void => {
+      if (node) {
+        return
+      }
+      // Why: clear the transient search filter on close, else the next visit opens with whole sections still hidden.
+      setSettingsSearchQuery('')
+    },
+    [setSettingsSearchQuery]
+  )
+
+  const setContentScrollNode = useCallback((node: HTMLDivElement | null): void => {
+    contentScrollRef.current = node
+    if (node !== null) {
+      return
+    }
+    // Why: cancel pending subsection jumps with the scroll container so a stale deep-link frame can't run after close.
+    cancelPendingSettingsSubsectionScrollFrame(pendingSubsectionScrollFrameRef)
+    cancelPendingSettingsDeepLinkTargetWatch(pendingScrollTargetWatchRef)
+  }, [])
+
+  useEffect(() => {
+    // Why: StrictMode replays mount effects; async font requests should still commit while Settings is mounted.
+    settingsMountedRef.current = true
+    return () => {
+      settingsMountedRef.current = false
+    }
+  }, [])
+
+  useEffect(() => {
+    if (!highlightedSettingsTargetId) {
+      return
+    }
+    const timeout = window.setTimeout(
+      () => setHighlightedSettingsTargetId(null),
+      SETTINGS_TARGET_HIGHLIGHT_MS
+    )
+    return () => window.clearTimeout(timeout)
+  }, [highlightedSettingsTargetId, setHighlightedSettingsTargetId])
+
+  const requestFontSuggestions = useCallback((): void => {
+    if (installedFontsLoadedRef.current || installedFontsLoadPromiseRef.current) {
+      return
+    }
+
+    installedFontsLoadPromiseRef.current = window.api.settings
+      .listFonts()
+      .then((fonts) => {
+        if (!settingsMountedRef.current) {
+          return
+        }
+        // Latch after the first successful attempt even when empty, so a font-less system doesn't reissue listFonts() each time.
+        installedFontsLoadedRef.current = true
+        if (fonts.length === 0) {
+          return
+        }
+        setFontSuggestions((prev) => mergeFontSuggestions(fonts, prev))
+      })
+      .catch(() => {
+        // Fall back to curated cross-platform suggestions.
+      })
+      .finally(() => {
+        installedFontsLoadPromiseRef.current = null
+      })
+  }, [setFontSuggestions])
+
+  // Pure prompt (no side effects): the close guard must ask without clearing drafts, since a later guard can still cancel the close.
+  const promptDiscardSourceControlAiPromptChanges = useCallback((): Promise<boolean> => {
+    return confirm({
+      title: translate(
+        'auto.components.settings.Settings.17bdee4ff1',
+        'Discard unsaved Git AI Author changes?'
+      ),
+      description: translate(
+        'auto.components.settings.Settings.43b68e10f0',
+        'You have unsaved Git AI Author changes. Leaving will discard them.'
+      ),
+      confirmLabel: translate('auto.components.settings.Settings.65358016ea', 'Discard'),
+      confirmVariant: 'destructive'
+    })
+  }, [confirm])
+
+  const confirmDiscardSourceControlAiPromptChanges = useCallback(async (): Promise<boolean> => {
+    if (!hasUnsavedSourceControlAiPromptChanges) {
+      return true
+    }
+    const shouldDiscard = await promptDiscardSourceControlAiPromptChanges()
+    if (shouldDiscard) {
+      setSourceControlAiPromptDiscardSignal((signal) => signal + 1)
+      setHasUnsavedCommitPromptChanges(false)
+      setHasUnsavedBranchPromptChanges(false)
+    }
+    return shouldDiscard
+  }, [
+    promptDiscardSourceControlAiPromptChanges,
+    hasUnsavedSourceControlAiPromptChanges,
+    setSourceControlAiPromptDiscardSignal,
+    setHasUnsavedCommitPromptChanges,
+    setHasUnsavedBranchPromptChanges
+  ])
+
+  const closeSettingsPageWithPromptGuard = useCallback(async (): Promise<void> => {
+    if (!(await confirmDiscardSourceControlAiPromptChanges())) {
+      return
+    }
+    closeSettingsPage()
+  }, [closeSettingsPage, confirmDiscardSourceControlAiPromptChanges])
+
+  return {
+    contentScrollRef,
+    searchInputRef,
+    pendingNavSectionRef,
+    pendingScrollTargetRef,
+    pendingSubsectionScrollFrameRef,
+    pendingScrollTargetWatchRef,
+    repoHooksRequestSeqRef,
+    shortcutsEscapeConfirmUntilRef,
+    hasUnsavedSourceControlAiPromptChanges,
+    hasUnsavedSourceControlAiPromptChangesRef,
+    writeSourceControlAiSettings,
+    setSettingsRootNode,
+    setContentScrollNode,
+    requestFontSuggestions,
+    promptDiscardSourceControlAiPromptChanges,
+    confirmDiscardSourceControlAiPromptChanges,
+    closeSettingsPageWithPromptGuard
+  }
+}
+
+export type SettingsInteractionController = ReturnType<typeof useSettingsInteractionController>
diff --git a/src/renderer/src/components/settings/use-settings-navigation-model.ts b/src/renderer/src/components/settings/use-settings-navigation-model.ts
new file mode 100644
index 00000000000..6d2f1b992c4
--- /dev/null
+++ b/src/renderer/src/components/settings/use-settings-navigation-model.ts
@@ -0,0 +1,207 @@
+import { useCallback, useMemo } from 'react'
+import { applyDocumentTheme } from '@/lib/document-theme'
+import { useSettingsNavigationMetadata } from '@/hooks/useSettingsNavigationMetadata'
+import type { SettingsNavInstallStatus } from '@/lib/settings-navigation-types'
+import {
+  COMPUTER_USE_SKILL_NAME,
+  ORCHESTRATION_SKILL_NAME
+} from '@/lib/agent-feature-install-commands'
+import {
+  getAgentSkillNavInstallStatus,
+  getLinearAgentSkillNavInstallStatus
+} from '@/lib/agent-skill-nav-install-status'
+import { getProjectHostSetupProjectionFromState } from '../../store/selectors'
+import { getSettingsSectionSearchEntries, rankSettingsSearchItems } from './settings-search'
+import { deriveNeededSectionIds } from './settings-load-performance'
+import { SCROLLBACK_PRESETS_ROWS } from './SettingsConstants'
+import type { SettingsStoreModel } from './use-settings-store-model'
+import type { SettingsInteractionController } from './use-settings-interaction-controller'
+import { hasReadyVoiceModel } from './settings-navigation-foundations'
+
+export function useSettingsNavigationModel(
+  model: SettingsStoreModel,
+  interactions: SettingsInteractionController
+) {
+  // Why: recompute scrollback mode only when the row value changes, not on every settings mutation.
+  if (model.settings?.terminalScrollbackRows !== model.prevScrollbackRows) {
+    model.setPrevScrollbackRows(model.settings?.terminalScrollbackRows)
+    if (model.settings) {
+      model.setScrollbackMode(
+        SCROLLBACK_PRESETS_ROWS.includes(
+          model.settings.terminalScrollbackRows as (typeof SCROLLBACK_PRESETS_ROWS)[number]
+        )
+          ? 'preset'
+          : 'custom'
+      )
+    }
+  }
+
+  const applyTheme = useCallback((theme: 'system' | 'dark' | 'light') => {
+    applyDocumentTheme(theme)
+  }, [])
+
+  const displayedGitUsername = model.repos[0]?.gitUsername ?? ''
+  const baseNavSections = useSettingsNavigationMetadata()
+  const { installed: orchestrationSkillInstalled, loading: orchestrationSkillLoading } =
+    model.orchestrationSkill
+  const {
+    installed: linearSkillInstalled,
+    loading: linearSkillLoading,
+    skills: linearSkills
+  } = model.linearSkill
+  const { installed: computerUseSkillInstalled, loading: computerUseSkillLoading } =
+    model.computerUseSkill
+  const capabilityInstallStatusBySectionId = useMemo(() => {
+    const applicableFreshnessInventory = model.skillFreshnessApplies
+      ? model.skillFreshnessInventory
+      : null
+    const next = new Map<string, SettingsNavInstallStatus>([
+      [
+        'orchestration',
+        getAgentSkillNavInstallStatus({
+          name: ORCHESTRATION_SKILL_NAME,
+          installed: orchestrationSkillInstalled,
+          loading: orchestrationSkillLoading,
+          inventory: applicableFreshnessInventory
+        })
+      ]
+    ])
+    if (model.linearConnected) {
+      next.set(
+        'linear',
+        getLinearAgentSkillNavInstallStatus({
+          skills: linearSkills,
+          installed: linearSkillInstalled,
+          loading: linearSkillLoading,
+          inventory: applicableFreshnessInventory
+        })
+      )
+    }
+    if (model.showDesktopOnlySettings) {
+      next.set(
+        'computer-use',
+        getAgentSkillNavInstallStatus({
+          name: COMPUTER_USE_SKILL_NAME,
+          installed: computerUseSkillInstalled,
+          loading: computerUseSkillLoading,
+          inventory: applicableFreshnessInventory
+        })
+      )
+      if (model.settings) {
+        next.set(
+          'voice',
+          model.voiceModelStatesLoading
+            ? 'checking'
+            : hasReadyVoiceModel(model.settings, model.modelStates)
+              ? 'installed'
+              : 'install'
+        )
+      }
+    }
+    return next
+  }, [
+    computerUseSkillInstalled,
+    computerUseSkillLoading,
+    linearSkillInstalled,
+    linearSkillLoading,
+    linearSkills,
+    model.linearConnected,
+    model.modelStates,
+    model.settings,
+    model.showDesktopOnlySettings,
+    model.skillFreshnessApplies,
+    model.skillFreshnessInventory,
+    model.voiceModelStatesLoading,
+    orchestrationSkillInstalled,
+    orchestrationSkillLoading
+  ])
+  const navSections = useMemo(
+    () =>
+      baseNavSections.map((section) => {
+        const installStatus = capabilityInstallStatusBySectionId.get(section.id)
+        return installStatus ? { ...section, installStatus } : section
+      }),
+    [baseNavSections, capabilityInstallStatusBySectionId]
+  )
+  const navSectionById = useMemo(
+    () => new Map(navSections.map((section) => [section.id, section] as const)),
+    [navSections]
+  )
+  const getSectionSearchEntries = (sectionId: string) => {
+    const section = navSectionById.get(sectionId)
+    return section ? getSettingsSectionSearchEntries(section) : []
+  }
+
+  const visibleNavSections = useMemo(() => {
+    const rankedSections = rankSettingsSearchItems(
+      model.settingsSearchQuery,
+      navSections,
+      getSettingsSectionSearchEntries
+    ).map(({ item }) => item)
+    if (
+      !interactions.hasUnsavedSourceControlAiPromptChanges ||
+      rankedSections.some((section) => section.id === 'git')
+    ) {
+      return rankedSections
+    }
+    const gitSection = navSectionById.get('git')
+    return gitSection ? [...rankedSections, gitSection] : rankedSections
+  }, [
+    interactions.hasUnsavedSourceControlAiPromptChanges,
+    navSectionById,
+    navSections,
+    model.settingsSearchQuery
+  ])
+  const visibleSectionIds = useMemo(
+    () => new Set(visibleNavSections.map((section) => section.id)),
+    [visibleNavSections]
+  )
+  const projectByRepoId = useMemo(() => {
+    const projection = getProjectHostSetupProjectionFromState({
+      repos: model.repos,
+      projects: model.projects,
+      projectHostSetups: model.projectHostSetups
+    })
+    const projectById = new Map(projection.projects.map((project) => [project.id, project]))
+    const nextProjectByRepoId = new Map<string, (typeof projection.projects)[number]>()
+    for (const setup of projection.setups) {
+      const project = projectById.get(setup.projectId)
+      if (project && setup.repoId.trim()) {
+        nextProjectByRepoId.set(setup.repoId, project)
+      }
+    }
+    return nextProjectByRepoId
+  }, [model.projectHostSetups, model.projects, model.repos])
+  const neededSectionIds = useMemo(
+    () =>
+      deriveNeededSectionIds({
+        navSectionIds: navSections.map((section) => section.id),
+        mountedSectionIds: model.mountedSectionIds,
+        activeSectionId: model.activeSectionId,
+        pendingSectionId: interactions.pendingNavSectionRef.current,
+        query: model.settingsSearchQuery,
+        visibleSectionIds
+      }),
+    [
+      model.activeSectionId,
+      model.mountedSectionIds,
+      interactions.pendingNavSectionRef,
+      navSections,
+      model.settingsSearchQuery,
+      visibleSectionIds
+    ]
+  )
+
+  return {
+    applyTheme,
+    displayedGitUsername,
+    navSections,
+    getSectionSearchEntries,
+    visibleNavSections,
+    visibleSectionIds,
+    projectByRepoId,
+    neededSectionIds
+  }
+}
+
+export type SettingsNavigationModel = ReturnType<typeof useSettingsNavigationModel>
diff --git a/src/renderer/src/components/settings/use-settings-page-effects.ts b/src/renderer/src/components/settings/use-settings-page-effects.ts
new file mode 100644
index 00000000000..7a315c6fdc3
--- /dev/null
+++ b/src/renderer/src/components/settings/use-settings-page-effects.ts
@@ -0,0 +1,257 @@
+import { useEffect } from 'react'
+import { toast } from 'sonner'
+import { useAppStore } from '../../store'
+import { keybindingMatchesAction } from '../../../../shared/keybindings'
+import { resolveAppearanceAccordionDeepLink } from './appearance-usage-percentage-search'
+import { registerWindowCloseGuard } from '../window-close-request-coordinator'
+import { isIntentionalAppRestartInProgress } from '@/lib/updater-beforeunload'
+import { getShortcutPlatform } from '@/lib/shortcut-platform'
+import { translate } from '@/i18n/i18n'
+import {
+  getSettingsTargetHostSelection,
+  resolveSettingsTargetRepoId
+} from './settings-project-list'
+import type { SettingsStoreModel } from './use-settings-store-model'
+import type { SettingsInteractionController } from './use-settings-interaction-controller'
+import {
+  getSettingsSectionId,
+  isEditableTarget,
+  SHORTCUTS_ESCAPE_CONFIRM_TOAST_ID,
+  SHORTCUTS_ESCAPE_CONFIRM_WINDOW_MS
+} from './settings-navigation-foundations'
+
+export function useSettingsPageEffects(
+  model: SettingsStoreModel,
+  interactions: SettingsInteractionController
+): void {
+  const {
+    activeSectionId,
+    clearSettingsTarget,
+    fetchKeybindings,
+    fetchSettings,
+    keybindings,
+    refreshModelStates,
+    repoIdToHostSelection,
+    repoIdToRepresentative,
+    setHighlightedSettingsTargetId,
+    setMountedSectionIds,
+    setQuickCommandAddIntentSignal,
+    setRemoteServerAddIntentSignal,
+    setSettingsProjectHostSelection,
+    setSshHostAddIntentSignal,
+    setPendingNavRequestTick,
+    setVoiceModelStatesLoading,
+    settings,
+    settingsNavigationTarget,
+    settingsProjectList,
+    showDesktopOnlySettings
+  } = model
+  const {
+    closeSettingsPageWithPromptGuard,
+    hasUnsavedSourceControlAiPromptChangesRef,
+    pendingNavSectionRef,
+    pendingScrollTargetRef,
+    promptDiscardSourceControlAiPromptChanges,
+    searchInputRef,
+    shortcutsEscapeConfirmUntilRef
+  } = interactions
+
+  useEffect(() => {
+    fetchSettings()
+    fetchKeybindings()
+  }, [fetchKeybindings, fetchSettings])
+
+  useEffect(() => {
+    if (!showDesktopOnlySettings) {
+      setVoiceModelStatesLoading(false)
+      return
+    }
+    let canceled = false
+    // Why: modelStates starts empty, so Voice shouldn't look missing before the first speech-model scan reports state.
+    setVoiceModelStatesLoading(true)
+    void refreshModelStates().finally(() => {
+      if (!canceled) {
+        setVoiceModelStatesLoading(false)
+      }
+    })
+    return () => {
+      canceled = true
+    }
+  }, [refreshModelStates, setVoiceModelStatesLoading, showDesktopOnlySettings])
+
+  useEffect(() => {
+    const hasVisibleOverlay = (): boolean =>
+      Array.from(
+        document.querySelectorAll('[role="dialog"], [role="listbox"], [role="menu"]')
+      ).some((element) => {
+        if (!(element instanceof HTMLElement)) {
+          return false
+        }
+        if (element.closest('[aria-hidden="true"]')) {
+          return false
+        }
+        const style = window.getComputedStyle(element)
+        return (
+          style.display !== 'none' &&
+          style.visibility !== 'hidden' &&
+          element.getClientRects().length > 0
+        )
+      })
+
+    const handleKeyDown = (event: KeyboardEvent): void => {
+      if (event.key !== 'Escape' || event.defaultPrevented) {
+        return
+      }
+      // Why: nested dialogs/menus own Escape before Settings page-level navigation.
+      if (hasVisibleOverlay()) {
+        return
+      }
+      // Why: Escape in an editable control means "cancel this edit", not "close Settings" — defer to the field's own handler.
+      if (isEditableTarget(event.target)) {
+        return
+      }
+      if (activeSectionId === 'shortcuts') {
+        event.preventDefault()
+        const now = Date.now()
+        if (now <= shortcutsEscapeConfirmUntilRef.current) {
+          shortcutsEscapeConfirmUntilRef.current = 0
+          toast.dismiss(SHORTCUTS_ESCAPE_CONFIRM_TOAST_ID)
+          void closeSettingsPageWithPromptGuard()
+          return
+        }
+        shortcutsEscapeConfirmUntilRef.current = now + SHORTCUTS_ESCAPE_CONFIRM_WINDOW_MS
+        toast.info(
+          translate(
+            'auto.components.settings.Settings.acc7bbdefd',
+            'Press ESC again to exit settings'
+          ),
+          {
+            id: SHORTCUTS_ESCAPE_CONFIRM_TOAST_ID,
+            duration: SHORTCUTS_ESCAPE_CONFIRM_WINDOW_MS,
+            className: 'whitespace-nowrap'
+          }
+        )
+        return
+      }
+      void closeSettingsPageWithPromptGuard()
+    }
+
+    document.addEventListener('keydown', handleKeyDown)
+    return () => document.removeEventListener('keydown', handleKeyDown)
+  }, [activeSectionId, closeSettingsPageWithPromptGuard, shortcutsEscapeConfirmUntilRef])
+
+  // Why: route window close/quit through the discard dialog; a bare beforeunload veto shows no UI and reads as an unquittable window.
+  useEffect(() => {
+    return registerWindowCloseGuard(() => {
+      if (isIntentionalAppRestartInProgress()) {
+        return true
+      }
+      if (!hasUnsavedSourceControlAiPromptChangesRef.current) {
+        return true
+      }
+      return promptDiscardSourceControlAiPromptChanges()
+    })
+  }, [hasUnsavedSourceControlAiPromptChangesRef, promptDiscardSourceControlAiPromptChanges])
+
+  useEffect(() => {
+    const handleFindShortcut = (event: KeyboardEvent): void => {
+      if (event.defaultPrevented) {
+        return
+      }
+      if (!keybindingMatchesAction('settings.search', event, getShortcutPlatform(), keybindings)) {
+        return
+      }
+      const input = searchInputRef.current
+      if (!input) {
+        return
+      }
+      event.preventDefault()
+      input.focus()
+      input.select()
+    }
+
+    document.addEventListener('keydown', handleFindShortcut)
+    return () => document.removeEventListener('keydown', handleFindShortcut)
+  }, [keybindings, searchInputRef])
+
+  useEffect(() => {
+    if (!settings || !settingsNavigationTarget) {
+      return
+    }
+
+    const paneSectionId = getSettingsSectionId(
+      settingsNavigationTarget.pane,
+      settingsNavigationTarget.repoId,
+      repoIdToRepresentative
+    )
+    // Why: select the target repo's host before scrolling so its host-specific subsection anchor renders and the scroll lands.
+    const targetRepoId = resolveSettingsTargetRepoId(
+      settingsNavigationTarget,
+      repoIdToHostSelection.keys()
+    )
+    if (targetRepoId) {
+      const hostSelection = settingsNavigationTarget.hostId
+        ? getSettingsTargetHostSelection(
+            settingsProjectList,
+            targetRepoId,
+            settingsNavigationTarget.hostId
+          )
+        : repoIdToHostSelection.get(targetRepoId)
+      if (hostSelection) {
+        setSettingsProjectHostSelection(
+          hostSelection.projectId,
+          hostSelection.hostId,
+          'setupId' in hostSelection && typeof hostSelection.setupId === 'string'
+            ? hostSelection.setupId
+            : undefined
+        )
+      }
+    }
+    pendingNavSectionRef.current = paneSectionId
+    pendingScrollTargetRef.current = settingsNavigationTarget.sectionId ?? paneSectionId
+    setHighlightedSettingsTargetId(
+      settingsNavigationTarget.pane === 'developer-permissions'
+        ? (settingsNavigationTarget.sectionId ?? null)
+        : null
+    )
+    // Why: ensure Appearance's nested status-bar section is open before scrolling so the row is visible.
+    if (settingsNavigationTarget.pane === 'appearance') {
+      const accordion = resolveAppearanceAccordionDeepLink(settingsNavigationTarget.sectionId)
+      if (accordion) {
+        useAppStore.getState().setAppearanceAccordionDeepLink(accordion)
+      }
+    }
+    if (settingsNavigationTarget.intent === 'add-quick-command') {
+      setQuickCommandAddIntentSignal((signal) => signal + 1)
+    } else if (settingsNavigationTarget.intent === 'add-ssh-host') {
+      setSshHostAddIntentSignal((signal) => signal + 1)
+    } else if (settingsNavigationTarget.intent === 'add-remote-orca-server') {
+      setRemoteServerAddIntentSignal((signal) => signal + 1)
+    }
+    setMountedSectionIds((previous) => {
+      if (previous.has(paneSectionId)) {
+        return previous
+      }
+      return new Set(previous).add(paneSectionId)
+    })
+    // Why: bump state so the scroll effect runs even when the visible section set is unchanged (target is kept in refs).
+    setPendingNavRequestTick((tick) => tick + 1)
+    clearSettingsTarget()
+  }, [
+    clearSettingsTarget,
+    pendingNavSectionRef,
+    pendingScrollTargetRef,
+    repoIdToHostSelection,
+    repoIdToRepresentative,
+    setHighlightedSettingsTargetId,
+    setMountedSectionIds,
+    setPendingNavRequestTick,
+    setQuickCommandAddIntentSignal,
+    setRemoteServerAddIntentSignal,
+    setSettingsProjectHostSelection,
+    setSshHostAddIntentSignal,
+    settings,
+    settingsProjectList,
+    settingsNavigationTarget
+  ])
+}
diff --git a/src/renderer/src/components/settings/use-settings-repo-scroll-effects.ts b/src/renderer/src/components/settings/use-settings-repo-scroll-effects.ts
new file mode 100644
index 00000000000..93172d0e00a
--- /dev/null
+++ b/src/renderer/src/components/settings/use-settings-repo-scroll-effects.ts
@@ -0,0 +1,209 @@
+import { useEffect } from 'react'
+import type { OrcaHooks } from '../../../../shared/orca-yaml-hook-types'
+import { isFolderRepo } from '../../../../shared/repo-kind'
+import { getRepoExecutionHostId, parseExecutionHostId } from '../../../../shared/execution-host'
+import { checkRuntimeHooks } from '@/runtime/runtime-hooks-client'
+import { getRepoHostIdentity } from '../../store/slices/repo-host-identity'
+import type { SettingsStoreModel } from './use-settings-store-model'
+import type { SettingsInteractionController } from './use-settings-interaction-controller'
+import type { SettingsNavigationModel } from './use-settings-navigation-model'
+import type { SettingsTerminalModel } from './use-settings-terminal-model'
+import { watchForSettingsDeepLinkTarget } from './settings-deep-link-target-watcher'
+import {
+  cancelPendingSettingsDeepLinkTargetWatch,
+  cancelPendingSettingsSubsectionScrollFrame,
+  getFallbackVisibleSection,
+  getSettingsScrollTarget,
+  scrollSubsectionIntoView
+} from './settings-navigation-foundations'
+
+export function useSettingsRepoScrollEffects(
+  model: SettingsStoreModel,
+  interactions: SettingsInteractionController,
+  navigation: SettingsNavigationModel,
+  terminal: SettingsTerminalModel
+): void {
+  const {
+    activeSectionId,
+    pendingNavRequestTick,
+    repos,
+    setActiveSectionId,
+    setPendingNavRequestTick,
+    setRepoHooksMap,
+    setSettingsSearchQuery,
+    settingsSearchQuery
+  } = model
+  const {
+    contentScrollRef,
+    pendingNavSectionRef,
+    pendingScrollTargetRef,
+    pendingScrollTargetWatchRef,
+    pendingSubsectionScrollFrameRef,
+    repoHooksRequestSeqRef
+  } = interactions
+  const { visibleNavSections, visibleSectionIds } = navigation
+  const { neededRepos } = terminal
+
+  useEffect(() => {
+    const repoHostIdentitySet = new Set(repos.map(getRepoHostIdentity))
+    setRepoHooksMap((previous) => {
+      const next = Object.fromEntries(
+        Object.entries(previous).filter(([identity]) => repoHostIdentitySet.has(identity))
+      ) as Record<string, { hasHooks: boolean; hooks: OrcaHooks | null; mayNeedUpdate: boolean }>
+      return Object.keys(next).length === Object.keys(previous).length ? previous : next
+    })
+  }, [repos, setRepoHooksMap])
+
+  useEffect(() => {
+    if (neededRepos.length === 0) {
+      return
+    }
+
+    let stale = false
+    const requestSeq = ++repoHooksRequestSeqRef.current
+    const liveRepoHostIdentities = new Set(repos.map(getRepoHostIdentity))
+
+    void Promise.all(
+      neededRepos.map(async (repo) => {
+        const repoHostIdentity = getRepoHostIdentity(repo)
+        if (isFolderRepo(repo)) {
+          setRepoHooksMap((previous) => {
+            if (previous[repoHostIdentity]) {
+              return previous
+            }
+            return {
+              ...previous,
+              [repoHostIdentity]: { hasHooks: false, hooks: null, mayNeedUpdate: false }
+            }
+          })
+          return
+        }
+        try {
+          const hostId = getRepoExecutionHostId(repo)
+          const parsedHost = parseExecutionHostId(hostId)
+          const result = await checkRuntimeHooks(
+            {
+              activeRuntimeEnvironmentId:
+                parsedHost?.kind === 'runtime' ? parsedHost.environmentId : null
+            },
+            repo.id,
+            hostId
+          )
+          if (stale || requestSeq !== repoHooksRequestSeqRef.current) {
+            return
+          }
+          setRepoHooksMap((previous) => {
+            if (!liveRepoHostIdentities.has(repoHostIdentity)) {
+              return previous
+            }
+            return { ...previous, [repoHostIdentity]: result }
+          })
+        } catch {
+          // Keep last known value on transient failures.
+          if (stale || requestSeq !== repoHooksRequestSeqRef.current) {
+            return
+          }
+          setRepoHooksMap((previous) => {
+            if (!liveRepoHostIdentities.has(repoHostIdentity)) {
+              return previous
+            }
+            if (previous[repoHostIdentity]) {
+              return previous
+            }
+            return {
+              ...previous,
+              [repoHostIdentity]: { hasHooks: false, hooks: null, mayNeedUpdate: false }
+            }
+          })
+        }
+      })
+    )
+
+    return () => {
+      stale = true
+    }
+  }, [neededRepos, repoHooksRequestSeqRef, repos, setRepoHooksMap])
+
+  useEffect(() => {
+    const scrollTargetId = pendingScrollTargetRef.current
+    const pendingNavSectionId = pendingNavSectionRef.current
+    // Why: this pass re-decides whether to wait for the target, so drop any watch armed by the previous one.
+    cancelPendingSettingsDeepLinkTargetWatch(pendingScrollTargetWatchRef)
+
+    // Why: subsection deep links clear a stale filter that could hide the target row; pane-level links keep it to force-open the matching section.
+    if (
+      scrollTargetId &&
+      pendingNavSectionId &&
+      scrollTargetId !== pendingNavSectionId &&
+      settingsSearchQuery.trim() !== ''
+    ) {
+      setSettingsSearchQuery('')
+      return
+    }
+
+    if (scrollTargetId && pendingNavSectionId && visibleSectionIds.has(pendingNavSectionId)) {
+      // Why: inactive panes don't render; activate the pane first, then find the subsection next render.
+      if (activeSectionId !== pendingNavSectionId) {
+        setActiveSectionId(pendingNavSectionId)
+        return
+      }
+      const container = contentScrollRef.current
+      if (container) {
+        container.scrollTo({ top: 0 })
+      }
+      // Why: deep links can target a row inside the already-visible pane.
+      if (scrollTargetId !== pendingNavSectionId) {
+        // Why: target can arrive before the lazy section mounts; keep pending refs until it does.
+        if (!getSettingsScrollTarget(scrollTargetId, container)) {
+          // Why: async panes (the server list, say) mount rows after this pass, and nothing else re-runs the effect.
+          pendingScrollTargetWatchRef.current = watchForSettingsDeepLinkTarget({
+            root: container,
+            isTargetPresent: () =>
+              getSettingsScrollTarget(scrollTargetId, contentScrollRef.current) !== null,
+            onTargetPresent: () => setPendingNavRequestTick((tick) => tick + 1)
+          })
+          return
+        }
+        const scrollToSubsection = (): void => {
+          scrollSubsectionIntoView(scrollTargetId, contentScrollRef.current)
+        }
+        scrollToSubsection()
+        cancelPendingSettingsSubsectionScrollFrame(pendingSubsectionScrollFrameRef)
+        let completed = false
+        let frameId: number | undefined
+        frameId = requestAnimationFrame(() => {
+          completed = true
+          if (pendingSubsectionScrollFrameRef.current === frameId) {
+            pendingSubsectionScrollFrameRef.current = null
+          }
+          scrollToSubsection()
+        })
+        if (!completed) {
+          pendingSubsectionScrollFrameRef.current = frameId
+        }
+      }
+      setActiveSectionId(pendingNavSectionId)
+      pendingNavSectionRef.current = null
+      pendingScrollTargetRef.current = null
+      return
+    }
+
+    if (!visibleSectionIds.has(activeSectionId) && visibleNavSections.length > 0) {
+      setActiveSectionId(getFallbackVisibleSection(visibleNavSections)?.id ?? activeSectionId)
+    }
+  }, [
+    activeSectionId,
+    contentScrollRef,
+    pendingNavRequestTick,
+    pendingNavSectionRef,
+    pendingScrollTargetRef,
+    pendingScrollTargetWatchRef,
+    pendingSubsectionScrollFrameRef,
+    setActiveSectionId,
+    setPendingNavRequestTick,
+    setSettingsSearchQuery,
+    settingsSearchQuery,
+    visibleSectionIds,
+    visibleNavSections
+  ])
+}
diff --git a/src/renderer/src/components/settings/use-settings-store-model.ts b/src/renderer/src/components/settings/use-settings-store-model.ts
new file mode 100644
index 00000000000..fa48d63d2cc
--- /dev/null
+++ b/src/renderer/src/components/settings/use-settings-store-model.ts
@@ -0,0 +1,215 @@
+import { useCallback, useMemo, useState } from 'react'
+import type { OrcaHooks } from '../../../../shared/orca-yaml-hook-types'
+import type { ProjectHostSetup } from '../../../../shared/project-types'
+import { DEFAULT_APP_FONT_FAMILY } from '../../../../shared/constants'
+import { useAppStore } from '../../store'
+import { useSystemPrefersDark } from '@/components/terminal-pane/use-system-prefers-dark'
+import { isMacUserAgent, isWindowsUserAgent } from '@/components/terminal-pane/pane-helpers'
+import { useConfirmationDialog } from '@/components/confirmation-dialog-context'
+import { isWebClientLocation } from '@/hooks/useSettingsNavigationMetadata'
+import {
+  COMPUTER_USE_SKILL_NAME,
+  LINEAR_AGENT_SKILL_NAMES,
+  ORCHESTRATION_SKILL_NAME
+} from '@/lib/agent-feature-install-commands'
+import {
+  GLOBAL_AGENT_SKILL_SOURCE_KINDS,
+  useInstalledAgentSkill,
+  useInstalledAgentSkillNames
+} from '@/hooks/useInstalledAgentSkills'
+import { useActiveProjectSkillRuntime } from '@/hooks/useActiveProjectSkillRuntime'
+import { useLinearProviderConnected } from '@/hooks/useLinearProviderConnected'
+import { useSkillFreshness } from '@/hooks/useSkillFreshness'
+import { getFallbackTerminalFonts, mergeFontSuggestions } from './SettingsConstants'
+import { useGhosttyImport } from './useGhosttyImport'
+import { useWarpThemeImport } from './useWarpThemeImport'
+import { getInitialMountedSectionIds } from './settings-load-performance'
+import {
+  buildRepoIdToHostSelection,
+  buildRepoIdToRepresentative,
+  buildSettingsProjectList,
+  removeSettingsProjectFromAllHosts
+} from './settings-project-list'
+
+export function useSettingsStoreModel() {
+  const settings = useAppStore((s) => s.settings)
+  const keybindings = useAppStore((s) => s.keybindings)
+  const updateSettings = useAppStore((s) => s.updateSettings)
+  const updateSettingsOrThrow = useAppStore((s) => s.updateSettingsOrThrow)
+  const setActiveRuntimeEnvironmentPreference = useAppStore(
+    (s) => s.setActiveRuntimeEnvironmentPreference
+  )
+  const fetchSettings = useAppStore((s) => s.fetchSettings)
+  const fetchKeybindings = useAppStore((s) => s.fetchKeybindings)
+  const closeSettingsPage = useAppStore((s) => s.closeSettingsPage)
+  const repos = useAppStore((s) => s.repos)
+  const projects = useAppStore((s) => s.projects)
+  const projectHostSetups = useAppStore((s) => s.projectHostSetups)
+  const updateProject = useAppStore((s) => s.updateProject)
+  const updateRepo = useAppStore((s) => s.updateRepo)
+  const removeProject = useAppStore((s) => s.removeProject)
+  const settingsNavigationTarget = useAppStore((s) => s.settingsNavigationTarget)
+  const clearSettingsTarget = useAppStore((s) => s.clearSettingsTarget)
+  const settingsProjectHostSelection = useAppStore((s) => s.settingsProjectHostSelection)
+  const settingsProjectSetupSelection = useAppStore((s) => s.settingsProjectSetupSelection)
+  const setSettingsProjectHostSelection = useAppStore((s) => s.setSettingsProjectHostSelection)
+  const settingsSearchQuery = useAppStore((s) => s.settingsSearchQuery)
+  const setSettingsSearchQuery = useAppStore((s) => s.setSettingsSearchQuery)
+  const modelStates = useAppStore((s) => s.modelStates)
+  const refreshModelStates = useAppStore((s) => s.refreshModelStates)
+
+  // Why: one entry per project (derived from repos to match nav metadata) — the source of truth for the pane list.
+  const settingsProjectList = useMemo(() => buildSettingsProjectList(repos), [repos])
+  const repoIdToRepresentative = useMemo(
+    () => buildRepoIdToRepresentative(settingsProjectList),
+    [settingsProjectList]
+  )
+  // Why: lets a deep-link's repoId select the owning project's host so host-specific subsection anchors exist.
+  const repoIdToHostSelection = useMemo(
+    () => buildRepoIdToHostSelection(settingsProjectList),
+    [settingsProjectList]
+  )
+  // Why: pane-level "Remove Project" removes every host setup, not just the selected host (per-host remove lives in "Available Hosts").
+  const removeProjectAllHosts = useCallback(
+    (setups: readonly ProjectHostSetup[]): Promise<void> =>
+      removeSettingsProjectFromAllHosts(setups, removeProject),
+    [removeProject]
+  )
+
+  const [repoHooksMap, setRepoHooksMap] = useState<
+    Record<string, { hasHooks: boolean; hooks: OrcaHooks | null; mayNeedUpdate: boolean }>
+  >({})
+  const systemPrefersDark = useSystemPrefersDark()
+  const isWindows = isWindowsUserAgent()
+  const isMac = isMacUserAgent()
+  const isWebClient = isWebClientLocation()
+  const showDesktopOnlySettings = !isWebClient
+  // Why: mirror the nav registry's gate so the Linear sidebar entry and section appear/disappear together.
+  const linearConnected = useLinearProviderConnected()
+  const activeSkillRuntime = useActiveProjectSkillRuntime()
+  const orchestrationSkill = useInstalledAgentSkill(ORCHESTRATION_SKILL_NAME, {
+    discoveryTarget: activeSkillRuntime.discoveryTarget,
+    sourceKinds: GLOBAL_AGENT_SKILL_SOURCE_KINDS
+  })
+  const linearSkill = useInstalledAgentSkillNames(LINEAR_AGENT_SKILL_NAMES, {
+    enabled: linearConnected,
+    discoveryTarget: activeSkillRuntime.discoveryTarget,
+    sourceKinds: GLOBAL_AGENT_SKILL_SOURCE_KINDS
+  })
+  const computerUseSkill = useInstalledAgentSkill(COMPUTER_USE_SKILL_NAME, {
+    enabled: showDesktopOnlySettings,
+    discoveryTarget: activeSkillRuntime.discoveryTarget,
+    sourceKinds: GLOBAL_AGENT_SKILL_SOURCE_KINDS
+  })
+  const skillFreshnessApplies = activeSkillRuntime.canUseLocalSkillFreshness
+  const { inventory: skillFreshnessInventory } = useSkillFreshness(skillFreshnessApplies)
+  const [voiceModelStatesLoading, setVoiceModelStatesLoading] = useState(showDesktopOnlySettings)
+  // Why: trim platform-only Terminal entries from the shared search index so search never reveals hidden controls.
+  const [scrollbackMode, setScrollbackMode] = useState<'preset' | 'custom'>('preset')
+  const [prevScrollbackRows, setPrevScrollbackRows] = useState(settings?.terminalScrollbackRows)
+  // Why: keep Ghostty import state at Settings level so the modal survives section remounts.
+  const ghostty = useGhosttyImport(updateSettings, settings)
+  const warpThemes = useWarpThemeImport(updateSettings, settings)
+  const [fontSuggestions, setFontSuggestions] = useState<string[]>(
+    mergeFontSuggestions([], getFallbackTerminalFonts())
+  )
+  const terminalFontSuggestions = useMemo(
+    () => fontSuggestions.filter((font) => font !== DEFAULT_APP_FONT_FAMILY),
+    [fontSuggestions]
+  )
+  const [activeSectionId, setActiveSectionId] = useState('general')
+  const [mountedSectionIds, setMountedSectionIds] = useState<Set<string>>(
+    getInitialMountedSectionIds
+  )
+  const [pendingNavRequestTick, setPendingNavRequestTick] = useState(0)
+  const [highlightedSettingsTargetId, setHighlightedSettingsTargetId] = useState<string | null>(
+    null
+  )
+  const [quickCommandAddIntentSignal, setQuickCommandAddIntentSignal] = useState(0)
+  const [sshHostAddIntentSignal, setSshHostAddIntentSignal] = useState(0)
+  const [remoteServerAddIntentSignal, setRemoteServerAddIntentSignal] = useState(0)
+  const [hasUnsavedCommitPromptChanges, setHasUnsavedCommitPromptChanges] = useState(false)
+  const [hasUnsavedBranchPromptChanges, setHasUnsavedBranchPromptChanges] = useState(false)
+  const [sourceControlAiPromptDiscardSignal, setSourceControlAiPromptDiscardSignal] = useState(0)
+  const confirm = useConfirmationDialog()
+  // Why: session-only (deliberately not persisted) unlock — Option-click the Experimental page title reveals the hidden group.
+  const [hiddenExperimentalUnlocked, setHiddenExperimentalUnlocked] = useState(false)
+
+  return {
+    settings,
+    keybindings,
+    updateSettings,
+    updateSettingsOrThrow,
+    setActiveRuntimeEnvironmentPreference,
+    fetchSettings,
+    fetchKeybindings,
+    closeSettingsPage,
+    repos,
+    projects,
+    projectHostSetups,
+    updateProject,
+    updateRepo,
+    settingsNavigationTarget,
+    clearSettingsTarget,
+    settingsProjectHostSelection,
+    settingsProjectSetupSelection,
+    setSettingsProjectHostSelection,
+    settingsSearchQuery,
+    setSettingsSearchQuery,
+    modelStates,
+    refreshModelStates,
+    settingsProjectList,
+    repoIdToRepresentative,
+    repoIdToHostSelection,
+    removeProjectAllHosts,
+    repoHooksMap,
+    setRepoHooksMap,
+    systemPrefersDark,
+    isWindows,
+    isMac,
+    isWebClient,
+    showDesktopOnlySettings,
+    linearConnected,
+    orchestrationSkill,
+    linearSkill,
+    computerUseSkill,
+    skillFreshnessApplies,
+    skillFreshnessInventory,
+    voiceModelStatesLoading,
+    setVoiceModelStatesLoading,
+    scrollbackMode,
+    setScrollbackMode,
+    prevScrollbackRows,
+    setPrevScrollbackRows,
+    ghostty,
+    warpThemes,
+    fontSuggestions,
+    setFontSuggestions,
+    terminalFontSuggestions,
+    activeSectionId,
+    setActiveSectionId,
+    mountedSectionIds,
+    setMountedSectionIds,
+    pendingNavRequestTick,
+    setPendingNavRequestTick,
+    highlightedSettingsTargetId,
+    setHighlightedSettingsTargetId,
+    quickCommandAddIntentSignal,
+    setQuickCommandAddIntentSignal,
+    sshHostAddIntentSignal,
+    setSshHostAddIntentSignal,
+    remoteServerAddIntentSignal,
+    setRemoteServerAddIntentSignal,
+    hasUnsavedCommitPromptChanges,
+    setHasUnsavedCommitPromptChanges,
+    hasUnsavedBranchPromptChanges,
+    setHasUnsavedBranchPromptChanges,
+    sourceControlAiPromptDiscardSignal,
+    setSourceControlAiPromptDiscardSignal,
+    confirm,
+    hiddenExperimentalUnlocked,
+    setHiddenExperimentalUnlocked
+  }
+}
+
+export type SettingsStoreModel = ReturnType<typeof useSettingsStoreModel>
diff --git a/src/renderer/src/components/settings/use-settings-terminal-model.ts b/src/renderer/src/components/settings/use-settings-terminal-model.ts
new file mode 100644
index 00000000000..d45069c8398
--- /dev/null
+++ b/src/renderer/src/components/settings/use-settings-terminal-model.ts
@@ -0,0 +1,117 @@
+import { useMemo } from 'react'
+import type { Repo } from '../../../../shared/repo-types'
+import { getActiveRuntimeTarget } from '@/runtime/runtime-rpc-client'
+import {
+  isWindowsTerminalCapabilityHost,
+  useLocalWindowsTerminalCapabilities,
+  useWindowsTerminalCapabilities
+} from '@/lib/windows-terminal-capabilities'
+import { useWindowsTerminalCapabilityOwnerKey } from '@/hooks/useWindowsTerminalCapabilityOwnerKey'
+import { getRepoHostIdentity } from '../../store/slices/repo-host-identity'
+import { getSettingsProjectHostRepo } from './settings-project-list'
+import type { SettingsStoreModel } from './use-settings-store-model'
+import type { SettingsNavigationModel } from './use-settings-navigation-model'
+
+export function useSettingsTerminalModel(
+  model: SettingsStoreModel,
+  navigation: SettingsNavigationModel
+) {
+  const windowsTerminalCapabilityOwnerKey = useWindowsTerminalCapabilityOwnerKey(
+    model.settings?.activeRuntimeEnvironmentId
+  )
+  const runtimeTarget = useMemo(() => getActiveRuntimeTarget(model.settings), [model.settings])
+  const capabilityLoadTarget = useMemo(
+    () => (model.isWebClient ? { kind: 'local' as const } : runtimeTarget),
+    [model.isWebClient, runtimeTarget]
+  )
+  const hasActiveRuntimeEnvironment = Boolean(model.settings?.activeRuntimeEnvironmentId?.trim())
+  const needsRepoWindowsRuntimeCapabilities = [...navigation.neededSectionIds].some((sectionId) =>
+    sectionId.startsWith('repo-')
+  )
+  const needsLocalWindowsRuntimeCapabilities =
+    (model.isWindows || model.isWebClient) &&
+    (navigation.neededSectionIds.has('agents') || navigation.neededSectionIds.has('general'))
+  const shouldLoadWindowsTerminalCapabilities =
+    hasActiveRuntimeEnvironment ||
+    ((model.isWindows || model.isWebClient) &&
+      (navigation.neededSectionIds.has('terminal') ||
+        navigation.neededSectionIds.has('accounts') ||
+        needsRepoWindowsRuntimeCapabilities ||
+        (runtimeTarget.kind === 'local' && needsLocalWindowsRuntimeCapabilities)))
+  // Why: terminal, account, and repository settings describe the active execution host.
+  const windowsTerminalCapabilities = useWindowsTerminalCapabilities(
+    shouldLoadWindowsTerminalCapabilities,
+    true,
+    windowsTerminalCapabilityOwnerKey,
+    capabilityLoadTarget
+  )
+  // Why: global agent and project defaults belong to the desktop, not its active remote.
+  const remoteViewLocalWindowsRuntimeCapabilities = useLocalWindowsTerminalCapabilities(
+    needsLocalWindowsRuntimeCapabilities &&
+      runtimeTarget.kind === 'environment' &&
+      !model.isWebClient,
+    true,
+    'local'
+  )
+  const localWindowsRuntimeCapabilities =
+    runtimeTarget.kind === 'local' || model.isWebClient
+      ? windowsTerminalCapabilities
+      : remoteViewLocalWindowsRuntimeCapabilities
+  // Why: only supported-but-unavailable WSL (Windows) should render disabled controls, not unsupported WSL (macOS/Linux).
+  const runtimeWslSupportedPlatform = isWindowsTerminalCapabilityHost({
+    isWindowsRenderer: model.isWindows,
+    isWebClient: model.isWebClient,
+    target: runtimeTarget,
+    hostPlatform: windowsTerminalCapabilities.hostPlatform
+  })
+  const localWslSupportedPlatform = isWindowsTerminalCapabilityHost({
+    isWindowsRenderer: model.isWindows,
+    isWebClient: model.isWebClient,
+    target: { kind: 'local' },
+    hostPlatform: localWindowsRuntimeCapabilities.hostPlatform
+  })
+  const isWindowsTerminalHost = runtimeWslSupportedPlatform
+
+  if ([...navigation.neededSectionIds].some((id) => !model.mountedSectionIds.has(id))) {
+    // Why: record newly needed sections during render so panes don't wait for a follow-up Effect.
+    model.setMountedSectionIds(navigation.neededSectionIds)
+  }
+
+  // Why: load hooks for the selected host's repo id, not the representative id (they differ for non-default hosts).
+  const neededRepos = useMemo(() => {
+    const reposByHostIdentity = new Map<string, Repo>()
+    for (const settingsProject of model.settingsProjectList) {
+      if (!navigation.neededSectionIds.has(`repo-${settingsProject.representativeRepoId}`)) {
+        continue
+      }
+      const repo = getSettingsProjectHostRepo(
+        settingsProject,
+        model.repos,
+        model.settingsProjectHostSelection[settingsProject.projectId],
+        model.settingsProjectSetupSelection[settingsProject.projectId]
+      )
+      if (repo) {
+        reposByHostIdentity.set(getRepoHostIdentity(repo), repo)
+      }
+    }
+    return [...reposByHostIdentity.values()]
+  }, [
+    navigation.neededSectionIds,
+    model.repos,
+    model.settingsProjectHostSelection,
+    model.settingsProjectList,
+    model.settingsProjectSetupSelection
+  ])
+
+  return {
+    runtimeTarget,
+    windowsTerminalCapabilities,
+    localWindowsRuntimeCapabilities,
+    runtimeWslSupportedPlatform,
+    localWslSupportedPlatform,
+    isWindowsTerminalHost,
+    neededRepos
+  }
+}
+
+export type SettingsTerminalModel = ReturnType<typeof useSettingsTerminalModel>
diff --git a/src/renderer/src/components/sidebar/worktree-list-groups-project-host-setups.test.ts b/src/renderer/src/components/sidebar/worktree-list-groups-project-host-setups.test.ts
index d51f4523a89..7cd9fa0cb65 100644
--- a/src/renderer/src/components/sidebar/worktree-list-groups-project-host-setups.test.ts
+++ b/src/renderer/src/components/sidebar/worktree-list-groups-project-host-setups.test.ts
@@ -52,6 +52,61 @@ describe('buildRows with pinned worktrees', () => {
     ])
   })
 
+  it('keeps the cross-host project header label when another project section renders', () => {
+    // Why: the project header must read the project's own display name, not the
+    // anchor checkout's repo name, however many sections are visible — toggling
+    // "Hide sleeping workspaces" must not rename a project (#16127).
+    const otherRepo: Repo = {
+      ...repo,
+      id: 'repo-other',
+      path: '/tmp/design-assets',
+      displayName: 'design-assets'
+    }
+    const otherWorktree: Worktree = {
+      ...worktree,
+      id: 'wt-other',
+      repoId: otherRepo.id,
+      path: '/tmp/design-assets-feature',
+      displayName: 'palette'
+    }
+    const buildHeaders = (extraWorktrees: Worktree[], extraRepos: Repo[]) => {
+      const worktrees = [worktree, remoteWorktree, ...extraWorktrees]
+      const rows = buildRows(
+        'repo',
+        worktrees,
+        new Map([
+          [repo.id, repo],
+          [remoteRepo.id, remoteRepo],
+          ...extraRepos.map((entry): [string, Repo] => [entry.id, entry])
+        ]),
+        null,
+        new Set(),
+        undefined,
+        undefined,
+        undefined,
+        {},
+        new Map(worktrees.map((entry) => [entry.id, entry])),
+        false,
+        undefined,
+        [],
+        new Set(),
+        new Map(),
+        new Map(),
+        [],
+        { projects: [project], projectHostSetups }
+      )
+      return rows.filter((row) => row.type === 'header')
+    }
+
+    expect(buildHeaders([], [])).toMatchObject([
+      { key: 'project:github:stablyai/orca', label: 'Orca' }
+    ])
+    expect(buildHeaders([otherWorktree], [otherRepo])).toMatchObject([
+      { key: 'project:github:stablyai/orca', label: 'Orca' },
+      { key: 'repo:repo-other', label: 'design-assets' }
+    ])
+  })
+
   it('renders same-project records with git remote identity as one mixed-host project header', () => {
     const localRepo: Repo = {
       ...repo,
@@ -724,11 +779,12 @@ describe('buildRows with pinned worktrees', () => {
     ])
     // The provisioned copy nests under the plain project key with only its own
     // worktree; it never gets a path-scoped `::setup:` header like the real
-    // checkouts do. (buildRows disambiguates its visible label to the repo name.)
+    // checkouts do, and that header keeps the project's own display name.
     expect(
       headers.some((row) => row.key === 'project:github:stablyai/orca::setup:repo-runtime-b')
     ).toBe(false)
     expect(headers.find((row) => row.key === 'project:github:stablyai/orca')).toMatchObject({
+      label: 'Orca',
       count: 1
     })
   })
diff --git a/src/renderer/src/components/sidebar/worktree-list-groups-section-label-disambiguation.test.ts b/src/renderer/src/components/sidebar/worktree-list-groups-section-label-disambiguation.test.ts
new file mode 100644
index 00000000000..43152aa9b9a
--- /dev/null
+++ b/src/renderer/src/components/sidebar/worktree-list-groups-section-label-disambiguation.test.ts
@@ -0,0 +1,91 @@
+/**
+ * Sidebar section headers disambiguate identical display names by appending
+ * parent path segments. Every tracked repo is projected into a project, so
+ * `project:` headers — not just `repo:` ones — are where collisions surface;
+ * stabilising which model layer supplies the label (#16127) must not turn the
+ * disambiguation off.
+ */
+import { describe, expect, it } from 'vitest'
+import { buildRows } from './worktree-list/grouping/build-rows'
+import { project, projectHostSetups, repo, worktree } from './worktree-list-groups-test-fixtures'
+import type { Project, ProjectHostSetup } from '../../../../shared/project-types'
+import type { Repo } from '../../../../shared/repo-types'
+import type { Worktree } from '../../../../shared/worktree/types'
+
+const makeProject = (id: string, repoId: string): Project => ({
+  ...project,
+  id,
+  displayName: 'api',
+  sourceRepoIds: [repoId]
+})
+
+const makeSetup = (checkout: Repo, projectId: string): ProjectHostSetup => ({
+  ...projectHostSetups[0]!,
+  id: checkout.id,
+  projectId,
+  repoId: checkout.id,
+  path: checkout.path,
+  displayName: checkout.displayName
+})
+
+function buildHeaders(repos: Repo[], projects: Project[], setups: ProjectHostSetup[]) {
+  const worktrees = repos.map(
+    (entry): Worktree => ({ ...worktree, id: `wt-${entry.id}`, repoId: entry.id })
+  )
+  const rows = buildRows(
+    'repo',
+    worktrees,
+    new Map(repos.map((entry) => [entry.id, entry])),
+    null,
+    new Set(),
+    undefined,
+    undefined,
+    undefined,
+    {},
+    new Map(worktrees.map((entry) => [entry.id, entry])),
+    false,
+    undefined,
+    [],
+    new Set(),
+    new Map(),
+    new Map(),
+    [],
+    { projects, projectHostSetups: setups }
+  )
+  return rows.filter((row) => row.type === 'header')
+}
+
+describe('sidebar section headers with colliding display names', () => {
+  const workRepo: Repo = { ...repo, id: 'repo-work', path: '/work/api', displayName: 'api' }
+  const ossRepo: Repo = { ...repo, id: 'repo-oss', path: '/oss/api', displayName: 'api' }
+
+  it('path-disambiguates two project headers that share a display name', () => {
+    expect(
+      buildHeaders(
+        [workRepo, ossRepo],
+        [makeProject('github:acme/api', workRepo.id), makeProject('gitlab:me/api', ossRepo.id)],
+        [makeSetup(workRepo, 'github:acme/api'), makeSetup(ossRepo, 'gitlab:me/api')]
+      )
+    ).toMatchObject([
+      { key: 'project:github:acme/api', label: 'work/api' },
+      { key: 'project:gitlab:me/api', label: 'oss/api' }
+    ])
+  })
+
+  it('leaves a lone project header un-suffixed', () => {
+    expect(
+      buildHeaders(
+        [workRepo],
+        [makeProject('github:acme/api', workRepo.id)],
+        [makeSetup(workRepo, 'github:acme/api')]
+      )
+    ).toMatchObject([{ key: 'project:github:acme/api', label: 'api' }])
+  })
+
+  it('path-disambiguates untracked repo headers that share a display name', () => {
+    expect(buildHeaders([workRepo, ossRepo], [], [])).toMatchObject([
+      { key: 'repo:repo-work', label: 'work/api' },
+      { key: 'repo:repo-oss', label: 'oss/api' }
+    ])
+  })
+})
diff --git a/src/renderer/src/components/sidebar/worktree-list/grouping/section-order.ts b/src/renderer/src/components/sidebar/worktree-list/grouping/section-order.ts
index 00e7fe46f79..d266bdaa445 100644
--- a/src/renderer/src/components/sidebar/worktree-list/grouping/section-order.ts
+++ b/src/renderer/src/components/sidebar/worktree-list/grouping/section-order.ts
@@ -73,16 +73,21 @@ export function orderMainWorktreeFirst(worktrees: Worktree[]): Worktree[] {
   return [...mainWorktrees, ...worktrees.filter((worktree) => !worktree.isMainWorktree)]
 }
 
+// Why: disambiguate a section's *own* label, not its anchor checkout's repo
+// name. Substituting repo.displayName made a project header read the project
+// name while it was the only repo-backed section and the checkout name as soon
+// as a second one rendered, so filtering workspaces renamed the project
+// (#16127). Path suffixes still resolve genuinely identical labels.
 export function withRepoSectionDisplayLabels(
   entries: readonly OrderedGroupEntry[]
 ): OrderedGroupEntry[] {
-  const repos = entries
-    .map((entry) => entry[1].repo)
-    .filter((repo): repo is Repo => repo !== undefined)
-  if (repos.length < 2) {
+  const labelItems = entries.flatMap(([, group]) =>
+    group.repo ? [{ ...group.repo, displayName: group.label }] : []
+  )
+  if (labelItems.length === 0) {
     return [...entries]
   }
-  const labelsByPath = getRepoDisplayLabelsByPath(repos)
+  const labelsByPath = getRepoDisplayLabelsByPath(labelItems)
   return entries.map(([key, group]) => [
     key,
     group.repo
diff --git a/src/renderer/src/components/status-bar/ResourceUsageStatusSegment.session-polling.test.ts b/src/renderer/src/components/status-bar/ResourceUsageStatusSegment.session-polling.test.ts
index 8dc4a515a23..efbd31a191c 100644
--- a/src/renderer/src/components/status-bar/ResourceUsageStatusSegment.session-polling.test.ts
+++ b/src/renderer/src/components/status-bar/ResourceUsageStatusSegment.session-polling.test.ts
@@ -2,7 +2,7 @@ import { readFileSync } from 'node:fs'
 import { resolve } from 'node:path'
 import { describe, expect, it } from 'vitest'
 
-const SOURCE_PATH = resolve(__dirname, 'ResourceUsageStatusSegment.tsx')
+const SOURCE_PATH = resolve(__dirname, 'use-resource-usage-status-controller.ts')
 const INVENTORY_HOOK_PATH = resolve(__dirname, 'use-resource-session-inventory.ts')
 
 describe('ResourceUsageStatusSegment session inventory', () => {
diff --git a/src/renderer/src/components/status-bar/ResourceUsageStatusSegment.tsx b/src/renderer/src/components/status-bar/ResourceUsageStatusSegment.tsx
index 5a66e5214a6..e0830f9aafc 100644
--- a/src/renderer/src/components/status-bar/ResourceUsageStatusSegment.tsx
+++ b/src/renderer/src/components/status-bar/ResourceUsageStatusSegment.tsx
@@ -1,727 +1,23 @@
-/* eslint-disable max-lines -- Why: one status-bar segment co-locates sparkline, worktree tree, session list, daemon actions, and kill-confirm; see docs/resource-usage-merge-spec.md. */
-import React, { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import {
-  AlertTriangle,
-  ChevronDown,
-  ChevronRight,
-  Globe,
-  LoaderCircle,
-  MemoryStick,
-  RotateCw,
-  Terminal,
-  Trash2,
-  X
-} from 'lucide-react'
-import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
-import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
-import { Button } from '@/components/ui/button'
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle
-} from '@/components/ui/dialog'
-import { cn } from '@/lib/utils'
-import { useMountedRef } from '@/hooks/useMountedRef'
-import { activateAndRevealWorktree } from '@/lib/worktree-activation'
-import { activateTabAndFocusPane } from '@/lib/activate-tab-and-focus-pane'
-import { useAppStore } from '../../store'
-import { getAllWorktreesFromState, useWorktreeMap } from '../../store/selectors'
-import { runWorktreeDelete } from '../sidebar/delete-worktree-flow'
-import { useDaemonActions, DaemonActionDialog } from '../shared/useDaemonActions'
-import type { BrowserWorkspace } from '../../../../shared/browser-workspace-types'
-import type { AppMemory, UsageValues } from '../../../../shared/process-stats-types'
-import type { Worktree } from '../../../../shared/worktree/types'
-import { ORPHAN_WORKTREE_ID } from '../../../../shared/constants'
-import { getRepoExecutionHostId, parseExecutionHostId } from '../../../../shared/execution-host'
-import { mergeSnapshotAndSessions, UNATTRIBUTED_REPO_ID } from './mergeSnapshotAndSessions'
-import type {
-  Metric,
-  UnifiedProjectGroup,
-  UnifiedSessionRow,
-  UnifiedWorktreeRow
-} from './resource-usage-merge-types'
-import { WorkspaceSpaceCompactPanel } from './WorkspaceSpaceCompactPanel'
+import React from 'react'
+import { Popover, PopoverContent } from '@/components/ui/popover'
+import { DaemonActionDialog } from '../shared/useDaemonActions'
 import { STATUS_BAR_CONTEXT_MENU_EXEMPT_PROPS } from './status-bar-context-menu-policy'
+import { useResourceUsageStatusController } from './use-resource-usage-status-controller'
+import { renderResourceUsageStatusTrigger } from './resource-usage-status-trigger'
 import {
-  isResourceSessionActivationKey,
-  navigateResourceSessionToTab
-} from './resource-session-navigation'
+  renderDaemonUnreachableBanner,
+  renderResourceUsagePopoverHeader,
+  renderResourceUsageSummary,
+  renderSessionsOnlyErrorBanner
+} from './resource-usage-popover-summary'
 import {
-  getResourceUsageAllWorktrees,
-  getResourceUsageBrowserTabsByWorktree,
-  getResourceUsageDeferredSshSessionIdsByTabId,
-  getResourceUsagePtyIdsByTabId,
-  getResourceUsageRepos,
-  getResourceUsageRuntimePaneTitlesByTabId,
-  getResourceUsageTerminalLayoutsByTabId,
-  getResourceUsageTabsByWorktree
-} from './resource-usage-open-slices'
-import {
-  resolveResourceUsageSpaceScanReady,
-  type ResourceUsageSpaceScanSnapshot
-} from './resource-usage-space-scan-ready'
-import {
-  getResourceManagerAriaLabel,
-  getResourceManagerTooltipLines
-} from './resource-manager-terminal-copy'
-import {
-  getCommitPressureToneClass,
-  getResourceCommitMetricCopy,
-  getResourceMemoryMetricCopy
-} from './resource-memory-metric-copy'
-import { requiresKillConfirmation } from './resource-session-kill-confirmation'
-import { resolveResourceManagerWorktreeTarget } from './resource-manager-worktree-target'
-import {
-  countUnboundDaemonSessions,
-  selectUnboundDaemonSessions,
-  type ResourceSessionBindingInputs
-} from './resource-session-bindings'
-import { useResourceSessionInventory } from './use-resource-session-inventory'
-import { translate } from '@/i18n/i18n'
+  renderResourceUsagePopoverBody,
+  renderResourceUsagePopoverFooter
+} from './resource-usage-popover-body'
+import { renderResourceUsageKillDialog } from './resource-usage-kill-dialog'
+import { WorkspaceSpaceCompactPanel } from './WorkspaceSpaceCompactPanel'
 
-const POLL_MS = 2_000
-
-type SortOption = 'memory' | 'cpu' | 'name'
-
-const METRIC_COLUMNS_CLS = 'flex items-center shrink-0 tabular-nums'
-const CPU_COLUMN_CLS = 'w-12 text-right'
-const MEM_COLUMN_CLS = 'w-16 text-right'
-// Why: every row and the header reserve this trailing gutter so CPU/Memory columns align whether or not the row has a kill-X.
-const ROW_TRAILING_GUTTER_CLS = 'w-5 shrink-0 flex items-center justify-end'
-
-// ─── Formatters ─────────────────────────────────────────────────────
-
-function formatMemory(bytes: number): string {
-  if (bytes < 1024 * 1024) {
-    return `${Math.round(bytes / 1024)} KB`
-  }
-  if (bytes < 1024 * 1024 * 1024) {
-    return `${(bytes / (1024 * 1024)).toFixed(1)} MB`
-  }
-  return `${(bytes / (1024 * 1024 * 1024)).toFixed(2)} GB`
-}
-
-function formatCpu(percent: number): string {
-  return `${percent.toFixed(1)}%`
-}
-
-function formatMetricCpu(value: Metric): string {
-  return value === null ? '—' : formatCpu(value)
-}
-
-function formatMetricMemory(value: Metric): string {
-  return value === null ? '—' : formatMemory(value)
-}
-
-// ─── Sparkline ──────────────────────────────────────────────────────
-
-type SparklineProps = {
-  samples: number[]
-  width?: number
-  height?: number
-}
-
-function SparklineImpl({ samples, width = 48, height = 14 }: SparklineProps): React.JSX.Element {
-  const points = useMemo(() => {
-    const safe = Array.isArray(samples) ? samples : []
-    if (safe.length < 2) {
-      const midY = (height / 2).toFixed(1)
-      return `0,${midY} ${width},${midY}`
-    }
-
-    let min = safe[0]
-    let max = safe[0]
-    for (const v of safe) {
-      if (v < min) {
-        min = v
-      }
-      if (v > max) {
-        max = v
-      }
-    }
-    const range = max - min || 1
-    const stepX = width / (safe.length - 1)
-
-    const out: string[] = []
-    for (let i = 0; i < safe.length; i++) {
-      const x = (i * stepX).toFixed(1)
-      const y = (height - ((safe[i] - min) / range) * height).toFixed(1)
-      out.push(`${x},${y}`)
-    }
-    return out.join(' ')
-  }, [samples, width, height])
-
-  return (
-    <svg
-      width={width}
-      height={height}
-      viewBox={`0 0 ${width} ${height}`}
-      aria-hidden
-      preserveAspectRatio="none"
-    >
-      <polyline
-        points={points}
-        fill="none"
-        strokeWidth={1}
-        strokeLinecap="round"
-        strokeLinejoin="round"
-        className="stroke-muted-foreground/70"
-      />
-    </svg>
-  )
-}
-
-const Sparkline = memo(SparklineImpl, (a, b) => {
-  if (a.width !== b.width || a.height !== b.height) {
-    return false
-  }
-  const sa = Array.isArray(a.samples) ? a.samples : []
-  const sb = Array.isArray(b.samples) ? b.samples : []
-  if (sa === sb) {
-    return true
-  }
-  if (sa.length !== sb.length) {
-    return false
-  }
-  for (let i = 0; i < sa.length; i++) {
-    if (sa[i] !== sb[i]) {
-      return false
-    }
-  }
-  return true
-})
-
-// ─── Leaf UI: metric row ────────────────────────────────────────────
-
-function MetricPair({
-  cpu,
-  memory,
-  size = 'base'
-}: {
-  cpu: Metric
-  memory: Metric
-  size?: 'base' | 'small'
-}): React.JSX.Element {
-  const textCls = size === 'small' ? 'text-[11px]' : 'text-xs'
-  const muted = cpu === null && memory === null
-  return (
-    <div
-      className={cn(
-        METRIC_COLUMNS_CLS,
-        textCls,
-        muted ? 'text-muted-foreground/50' : 'text-muted-foreground'
-      )}
-    >
-      <span className={CPU_COLUMN_CLS}>{formatMetricCpu(cpu)}</span>
-      <span className={MEM_COLUMN_CLS}>{formatMetricMemory(memory)}</span>
-    </div>
-  )
-}
-
-function AppSubRow({ label, values }: { label: string; values: UsageValues }): React.JSX.Element {
-  return (
-    <div className="px-3 py-1.5 pl-6 flex items-center justify-between gap-2">
-      <span className="text-[11px] text-muted-foreground truncate">{label}</span>
-      <div className="flex items-center gap-2 shrink-0">
-        <MetricPair cpu={values.cpu} memory={values.memory} size="small" />
-        <span className={ROW_TRAILING_GUTTER_CLS} aria-hidden />
-      </div>
-    </div>
-  )
-}
-
-function AppSection({
-  app,
-  isCollapsed,
-  onToggle
-}: {
-  app: AppMemory
-  isCollapsed: boolean
-  onToggle: () => void
-}): React.JSX.Element {
-  return (
-    <div className="border-t border-border/50">
-      <div className="flex items-center">
-        <button
-          type="button"
-          onClick={onToggle}
-          className="pl-2 py-2 pr-0.5 transition-colors hover:bg-muted/50"
-          aria-label={
-            isCollapsed
-              ? translate(
-                  'auto.components.status.bar.ResourceUsageStatusSegment.e419d27083',
-                  'Expand Orca'
-                )
-              : translate(
-                  'auto.components.status.bar.ResourceUsageStatusSegment.53dd5560ae',
-                  'Collapse Orca'
-                )
-          }
-          aria-expanded={!isCollapsed}
-        >
-          {isCollapsed ? (
-            <ChevronRight className="h-3 w-3 text-muted-foreground" />
-          ) : (
-            <ChevronDown className="h-3 w-3 text-muted-foreground" />
-          )}
-        </button>
-        <div className="flex-1 min-w-0 py-2 pr-3 flex items-center justify-between">
-          <span className="text-[11px] font-semibold uppercase tracking-wide truncate text-muted-foreground">
-            {translate('auto.components.status.bar.ResourceUsageStatusSegment.288a4dd177', 'Orca')}
-          </span>
-          <div className="flex items-center gap-2 shrink-0">
-            <Sparkline samples={app.history} />
-            <MetricPair cpu={app.cpu} memory={app.memory} />
-            <span className={ROW_TRAILING_GUTTER_CLS} aria-hidden />
-          </div>
-        </div>
-      </div>
-      {!isCollapsed && (
-        <div className="border-t border-border/30">
-          <AppSubRow
-            label={translate(
-              'auto.components.status.bar.ResourceUsageStatusSegment.81cd37af99',
-              'Main'
-            )}
-            values={app.main}
-          />
-          <AppSubRow
-            label={translate(
-              'auto.components.status.bar.ResourceUsageStatusSegment.d406915b78',
-              'Renderer'
-            )}
-            values={app.renderer}
-          />
-          {(app.other.cpu > 0 || app.other.memory > 0) && (
-            <AppSubRow
-              label={translate(
-                'auto.components.status.bar.ResourceUsageStatusSegment.0f9e50eb07',
-                'Other'
-              )}
-              values={app.other}
-            />
-          )}
-        </div>
-      )}
-    </div>
-  )
-}
-
-// ─── Sorting ────────────────────────────────────────────────────────
-
-function compareMetricDesc(a: Metric, b: Metric): number {
-  // Why: null metrics (remote rows) sort last regardless of direction so they don't pollute the "biggest consumers" view.
-  if (a === null && b === null) {
-    return 0
-  }
-  if (a === null) {
-    return 1
-  }
-  if (b === null) {
-    return -1
-  }
-  return b - a
-}
-
-function sortWorktrees(list: UnifiedWorktreeRow[], sort: SortOption): UnifiedWorktreeRow[] {
-  const copy = [...list]
-  if (sort === 'memory') {
-    copy.sort((a, b) => compareMetricDesc(a.memory, b.memory))
-  } else if (sort === 'cpu') {
-    copy.sort((a, b) => compareMetricDesc(a.cpu, b.cpu))
-  } else {
-    copy.sort((a, b) => a.worktreeName.localeCompare(b.worktreeName))
-  }
-  return copy
-}
-
-function sortProjectGroups(groups: UnifiedProjectGroup[], sort: SortOption): UnifiedProjectGroup[] {
-  const copy = [...groups]
-  if (sort === 'memory') {
-    copy.sort((a, b) => compareMetricDesc(a.memory, b.memory))
-  } else if (sort === 'cpu') {
-    copy.sort((a, b) => compareMetricDesc(a.cpu, b.cpu))
-  } else {
-    copy.sort((a, b) => a.repoName.localeCompare(b.repoName))
-  }
-  return copy
-}
-
-// ─── Session row ────────────────────────────────────────────────────
-
-// Exported (with WorktreeRow) for row-level regression tests pinning the kill affordance and remote-chip presentation.
-export function SessionRow({
-  session,
-  worktreeId,
-  onNavigate,
-  onKill
-}: {
-  session: UnifiedSessionRow
-  worktreeId: string
-  onNavigate: (tabId: string, paneKey: string | null) => void
-  onKill: (session: UnifiedSessionRow) => void
-}): React.JSX.Element {
-  const clickable = session.tabId !== null && session.bound
-  const handleClick = (): void => {
-    if (clickable && session.tabId) {
-      onNavigate(session.tabId, session.paneKey)
-    }
-  }
-
-  return (
-    <div
-      className={cn(
-        'group/sessrow flex items-center gap-2 pl-10 pr-3 py-1.5',
-        clickable && 'cursor-pointer hover:bg-accent/40'
-      )}
-      onClick={clickable ? handleClick : undefined}
-      role={clickable ? 'button' : undefined}
-      tabIndex={clickable ? 0 : -1}
-      onKeyDown={
-        clickable
-          ? (e) => {
-              if (isResourceSessionActivationKey(e.key)) {
-                e.preventDefault()
-                handleClick()
-              }
-            }
-          : undefined
-      }
-      data-worktree-id={worktreeId}
-    >
-      <span
-        className={cn(
-          'size-1.5 shrink-0 rounded-full',
-          session.bound ? 'bg-emerald-500' : 'bg-muted-foreground/40'
-        )}
-      />
-      <span className="text-[11px] text-muted-foreground truncate min-w-0 flex-1">
-        {session.label}
-      </span>
-      <MetricPair cpu={session.cpu} memory={session.memory} size="small" />
-      {/* Why: kill X sits in the shared gutter for column alignment; bound rows reveal it on hover/focus, orphan rows always show it as reclaimable. */}
-      <span className={ROW_TRAILING_GUTTER_CLS}>
-        <button
-          type="button"
-          onClick={(e) => {
-            e.stopPropagation()
-            onKill(session)
-          }}
-          className={cn(
-            'rounded p-0.5 text-muted-foreground transition-opacity hover:bg-destructive/10 hover:text-destructive',
-            session.bound &&
-              'can-hover:opacity-0 group-hover/sessrow:opacity-100 group-focus-within/sessrow:opacity-100 focus-visible:opacity-100'
-          )}
-          aria-label={translate(
-            'auto.components.status.bar.ResourceUsageStatusSegment.fa6d36758d',
-            'Kill session {{value0}}',
-            { value0: session.sessionId }
-          )}
-        >
-          <X className="size-3" />
-        </button>
-      </span>
-    </div>
-  )
-}
-
-function BrowserRow({ browser }: { browser: BrowserWorkspace }): React.JSX.Element {
-  const label = browser.title?.trim() || browser.label?.trim() || browser.url
-  return (
-    <div className="flex items-center gap-2 pl-10 pr-3 py-1.5">
-      <Globe className="size-3 shrink-0 text-muted-foreground" aria-hidden />
-      <span className="min-w-0 flex-1 truncate text-[11px] text-muted-foreground">{label}</span>
-      <MetricPair cpu={null} memory={null} size="small" />
-      <span className={ROW_TRAILING_GUTTER_CLS} aria-hidden />
-    </div>
-  )
-}
-
-// ─── Worktree row ───────────────────────────────────────────────────
-
-export function WorktreeRow({
-  worktree,
-  storeRecord,
-  activeWorktreeId,
-  isCollapsed,
-  onToggle,
-  onNavigate,
-  onDelete,
-  onKillSession,
-  navigateToTab
-}: {
-  worktree: UnifiedWorktreeRow
-  storeRecord: Worktree | null
-  activeWorktreeId: string | null
-  isCollapsed: boolean
-  onToggle: () => void
-  onNavigate: () => void
-  onDelete: () => void
-  onKillSession: (session: UnifiedSessionRow) => void
-  navigateToTab: (tabId: string, paneKey: string | null) => void
-}): React.JSX.Element {
-  const hasResources = worktree.sessions.length > 0 || worktree.browsers.length > 0
-  // Why: synthetic buckets (orphan/unattributed) have no sidebar target to reveal; real and SSH-resolved worktrees stay navigable.
-  const isSynthetic =
-    worktree.worktreeId === ORPHAN_WORKTREE_ID || worktree.repoId === UNATTRIBUTED_REPO_ID
-  const isNavigable = !isSynthetic
-  // Why: Delete needs a sidebar worktree record; hidden for synthetic/SSH-only rows and the active worktree, but the row stays navigable.
-  const showWorktreeActions =
-    !isSynthetic && storeRecord !== null && worktree.worktreeId !== activeWorktreeId
-  const isMainWorktree = storeRecord?.isMainWorktree ?? false
-  const rowLabel = storeRecord?.displayName?.trim() || worktree.worktreeName
-
-  return (
-    <div className="border-b border-border/20 last:border-b-0">
-      <div className="group/wtrow flex items-center ml-2 transition-colors hover:bg-muted/60">
-        {hasResources ? (
-          <button
-            type="button"
-            onClick={onToggle}
-            className="pl-2 py-2 pr-0.5 shrink-0"
-            aria-label={
-              isCollapsed
-                ? translate(
-                    'auto.components.status.bar.ResourceUsageStatusSegment.c4a8968bdd',
-                    'Expand workspace'
-                  )
-                : translate(
-                    'auto.components.status.bar.ResourceUsageStatusSegment.bbcd9b7b85',
-                    'Collapse workspace'
-                  )
-            }
-          >
-            {isCollapsed ? (
-              <ChevronRight className="h-3 w-3 text-muted-foreground" />
-            ) : (
-              <ChevronDown className="h-3 w-3 text-muted-foreground" />
-            )}
-          </button>
-        ) : (
-          <span
-            className="pl-2 py-2 pr-0.5 shrink-0 w-[calc(0.5rem+0.75rem+0.125rem)]"
-            aria-hidden
-          />
-        )}
-        <button
-          type="button"
-          onClick={onNavigate}
-          aria-label={translate(
-            'auto.components.status.bar.ResourceUsageStatusSegment.d659d71d2d',
-            'Resume workspace {{value0}}',
-            { value0: rowLabel }
-          )}
-          className="flex-1 min-w-0 py-2 pr-2 pl-1 text-left flex items-center gap-1.5"
-          disabled={!isNavigable}
-        >
-          <span className="text-xs font-medium truncate">{rowLabel}</span>
-          {/* Why: gate the chip on SSH connectionId, not missing data — warm-reattached local PTYs land here with hasLocalSamples=false. */}
-          {worktree.isRemote && (
-            <span className="shrink-0 text-[9px] uppercase tracking-wide text-muted-foreground/70">
-              {translate(
-                'auto.components.status.bar.ResourceUsageStatusSegment.21cacb16d1',
-                '· remote'
-              )}
-            </span>
-          )}
-        </button>
-        <div className="flex items-center gap-2 shrink-0 pr-3">
-          <div className="relative">
-            {/* Why: no-hover devices show the action overlay by default, so the sparkline yields there just like on hover. */}
-            <span
-              className={cn(
-                'block transition-opacity',
-                showWorktreeActions &&
-                  'group-hover/wtrow:opacity-0 group-hover/wtrow:pointer-events-none group-focus-within/wtrow:opacity-0 group-focus-within/wtrow:pointer-events-none [@media(hover:none)]:opacity-0 [@media(hover:none)]:pointer-events-none'
-              )}
-              aria-hidden={showWorktreeActions ? undefined : true}
-            >
-              <Sparkline samples={worktree.history} />
-            </span>
-            {showWorktreeActions && (
-              <div className="absolute inset-0 flex items-center justify-end gap-0.5 can-hover:opacity-0 can-hover:pointer-events-none transition-opacity group-hover/wtrow:opacity-100 group-hover/wtrow:pointer-events-auto group-focus-within/wtrow:opacity-100 group-focus-within/wtrow:pointer-events-auto">
-                <Tooltip delayDuration={300}>
-                  <TooltipTrigger asChild>
-                    <button
-                      type="button"
-                      onClick={onDelete}
-                      disabled={isMainWorktree}
-                      aria-label={translate(
-                        'auto.components.status.bar.ResourceUsageStatusSegment.16bc3c998a',
-                        'Delete workspace {{value0}}',
-                        { value0: rowLabel }
-                      )}
-                      className={cn(
-                        'p-0.5 rounded text-muted-foreground transition-colors',
-                        isMainWorktree
-                          ? 'opacity-40 cursor-not-allowed'
-                          : 'hover:bg-destructive/10 hover:text-destructive'
-                      )}
-                    >
-                      <Trash2 className="size-3" />
-                    </button>
-                  </TooltipTrigger>
-                  <TooltipContent
-                    side="top"
-                    sideOffset={4}
-                    className="z-[70] max-w-[200px] text-pretty"
-                  >
-                    {isMainWorktree
-                      ? translate(
-                          'auto.components.status.bar.ResourceUsageStatusSegment.946724a70a',
-                          'The main workspace cannot be deleted.'
-                        )
-                      : translate(
-                          'auto.components.status.bar.ResourceUsageStatusSegment.a82253b458',
-                          'Delete workspace.'
-                        )}
-                  </TooltipContent>
-                </Tooltip>
-              </div>
-            )}
-          </div>
-          <MetricPair cpu={worktree.cpu} memory={worktree.memory} />
-          <span className={ROW_TRAILING_GUTTER_CLS} aria-hidden />
-        </div>
-      </div>
-
-      {!isCollapsed &&
-        worktree.sessions.map((session) => (
-          <SessionRow
-            key={session.sessionId}
-            session={session}
-            worktreeId={worktree.worktreeId}
-            onNavigate={navigateToTab}
-            onKill={onKillSession}
-          />
-        ))}
-      {!isCollapsed &&
-        worktree.browsers.map((browser) => <BrowserRow key={browser.id} browser={browser} />)}
-    </div>
-  )
-}
-
-// ─── Repo + worktree tree ───────────────────────────────────────────
-
-function ResourceTree({
-  repos,
-  sortOption,
-  collapsedRepos,
-  toggleRepo,
-  collapsedWorktrees,
-  activeWorktreeId,
-  toggleWorktree,
-  navigateToWorktree,
-  navigateToTab,
-  onDelete,
-  onKillSession
-}: {
-  repos: UnifiedProjectGroup[]
-  sortOption: SortOption
-  collapsedRepos: Set<string>
-  toggleRepo: (repoId: string) => void
-  collapsedWorktrees: Set<string>
-  activeWorktreeId: string | null
-  toggleWorktree: (worktreeId: string) => void
-  navigateToWorktree: (worktreeId: string) => void
-  navigateToTab: (tabId: string, paneKey: string | null) => void
-  onDelete: (worktreeId: string) => void
-  onKillSession: (session: UnifiedSessionRow) => void
-}): React.JSX.Element {
-  const worktreeById = useWorktreeMap()
-
-  const sortedRepos = useMemo(() => {
-    const grouped = sortProjectGroups(repos, sortOption)
-    return grouped.map((repo) => ({
-      ...repo,
-      worktrees: sortWorktrees(repo.worktrees, sortOption)
-    }))
-  }, [repos, sortOption])
-
-  const renderWorktree = (wt: UnifiedWorktreeRow): React.JSX.Element => {
-    const storeRecord = worktreeById.get(wt.worktreeId) ?? null
-    return (
-      <WorktreeRow
-        key={wt.worktreeId}
-        worktree={wt}
-        storeRecord={storeRecord}
-        activeWorktreeId={activeWorktreeId}
-        isCollapsed={collapsedWorktrees.has(wt.worktreeId)}
-        onToggle={() => toggleWorktree(wt.worktreeId)}
-        onNavigate={() => navigateToWorktree(wt.worktreeId)}
-        onDelete={() => onDelete(wt.worktreeId)}
-        onKillSession={onKillSession}
-        navigateToTab={navigateToTab}
-      />
-    )
-  }
-
-  if (sortedRepos.length === 1) {
-    return <>{sortedRepos[0].worktrees.map(renderWorktree)}</>
-  }
-
-  return (
-    <>
-      {sortedRepos.map((group) => {
-        const repoCollapsed = collapsedRepos.has(group.repoId)
-        return (
-          <div key={group.repoId} className="border-b border-border/50 last:border-b-0">
-            <div className="flex items-center">
-              <button
-                type="button"
-                onClick={() => toggleRepo(group.repoId)}
-                className="pl-2 py-2 pr-0.5 transition-colors hover:bg-muted/50"
-                aria-label={
-                  repoCollapsed
-                    ? translate(
-                        'auto.components.status.bar.ResourceUsageStatusSegment.b12e31dfcb',
-                        'Expand repo'
-                      )
-                    : translate(
-                        'auto.components.status.bar.ResourceUsageStatusSegment.73a3fd68a9',
-                        'Collapse repo'
-                      )
-                }
-              >
-                {repoCollapsed ? (
-                  <ChevronRight className="h-3 w-3 text-muted-foreground" />
-                ) : (
-                  <ChevronDown className="h-3 w-3 text-muted-foreground" />
-                )}
-              </button>
-              <div className="flex-1 min-w-0 py-2 pr-3 flex items-center justify-between gap-2">
-                <span className="flex items-center gap-1.5 min-w-0">
-                  <span className="text-[11px] font-semibold uppercase tracking-wide truncate text-muted-foreground">
-                    {group.repoName}
-                  </span>
-                  {group.hasRemoteChildren && (
-                    <span className="shrink-0 text-[9px] uppercase tracking-wide text-muted-foreground/70">
-                      {translate(
-                        'auto.components.status.bar.ResourceUsageStatusSegment.21cacb16d1',
-                        '· remote'
-                      )}
-                    </span>
-                  )}
-                </span>
-                <div className="flex items-center gap-2 shrink-0">
-                  <MetricPair cpu={group.cpu} memory={group.memory} />
-                  <span className={ROW_TRAILING_GUTTER_CLS} aria-hidden />
-                </div>
-              </div>
-            </div>
-
-            {!repoCollapsed && (
-              <div className="border-t border-border/30">{group.worktrees.map(renderWorktree)}</div>
-            )}
-          </div>
-        )
-      })}
-    </>
-  )
-}
+export { SessionRow, WorktreeRow } from './resource-usage-session-rows'
 
 // ─── Top-level segment ──────────────────────────────────────────────
 
@@ -731,425 +27,50 @@ export function ResourceUsageStatusSegment({
   compact?: boolean
   iconOnly: boolean
 }): React.JSX.Element {
-  const snapshot = useAppStore((s) => s.memorySnapshot)
-  const memorySnapshotError = useAppStore((s) => s.memorySnapshotError)
-  const fetchSnapshot = useAppStore((s) => s.fetchMemorySnapshot)
-  const workspaceSessionReady = useAppStore((s) => s.workspaceSessionReady)
-  const setActiveView = useAppStore((s) => s.setActiveView)
-  const openModal = useAppStore((s) => s.openModal)
-  const openSpacePage = useAppStore((s) => s.openSpacePage)
-  const recordFeatureInteraction = useAppStore((s) => s.recordFeatureInteraction)
-  const activeView = useAppStore((s) => s.activeView)
-  const activeWorktreeId = useAppStore((s) => s.activeWorktreeId)
-  const workspaceSpaceScannedAt = useAppStore((s) => s.workspaceSpaceAnalysis?.scannedAt ?? null)
-  const workspaceSpaceScanning = useAppStore((s) => s.workspaceSpaceScanning)
-
-  const [open, setOpen] = useState(false)
-  const [sortOption, setSortOption] = useState<SortOption>('memory')
-  const [collapsedRepos, setCollapsedRepos] = useState<Set<string>>(new Set())
-  const [collapsedWorktrees, setCollapsedWorktrees] = useState<Set<string>>(new Set())
-  const [appCollapsed, setAppCollapsed] = useState(true)
+  const controller = useResourceUsageStatusController()
   const {
-    sessionInventory,
-    sessionsError,
-    refreshSessions,
-    clearSessionsError,
-    removeSession,
-    removeSessions
-  } = useResourceSessionInventory(workspaceSessionReady)
-  const sessions = sessionInventory.sessions
-  const [killConfirm, setKillConfirm] = useState<UnifiedSessionRow | null>(null)
-  const [killing, setKilling] = useState(false)
-  const [spaceScanSnapshot, setSpaceScanSnapshot] = useState<ResourceUsageSpaceScanSnapshot>(
-    () => ({
-      ready: false,
-      previousScanning: workspaceSpaceScanning,
-      lastSeenScannedAt: workspaceSpaceScannedAt
-    })
-  )
-  // Why: tab titles churn on every keystroke; subscribe to those maps only while open so closed badges don't rerender.
-  const runtimePaneTitlesByTabId = useAppStore((s) =>
-    getResourceUsageRuntimePaneTitlesByTabId(s, open)
-  )
-  const repos = useAppStore((s) => getResourceUsageRepos(s, open))
-  const allWorktrees = useAppStore((s) => getResourceUsageAllWorktrees(s, open))
-  const tabsByWorktree = useAppStore((s) => getResourceUsageTabsByWorktree(s, open))
-  const browserTabsByWorktree = useAppStore((s) => getResourceUsageBrowserTabsByWorktree(s, open))
-  // Why: full binding maps stay behind open sentinels so unchanged counts don't rerender the closed segment.
-  const ptyIdsByTabId = useAppStore((s) => getResourceUsagePtyIdsByTabId(s, open))
-  const terminalLayoutsByTabId = useAppStore((s) => getResourceUsageTerminalLayoutsByTabId(s, open))
-  // Why: sessions awaiting SSH reattach are live on the remote host with no other binding.
-  const deferredSshSessionIdsByTabId = useAppStore((s) =>
-    getResourceUsageDeferredSshSessionIdsByTabId(s, open)
-  )
-  const resourceSnapshot = snapshot
-  // Why: ptyIdsByTabId tracks mounted/live panes only; Resource Manager reads restored wake hints only for classification.
-  const resourceSessionBindings = useMemo<ResourceSessionBindingInputs>(
-    () => ({
-      ptyIdsByTabId,
-      tabsByWorktree,
-      terminalLayoutsByTabId,
-      deferredSshSessionIdsByTabId,
-      workspaceSessionReady
-    }),
-    [
-      ptyIdsByTabId,
-      tabsByWorktree,
-      terminalLayoutsByTabId,
-      deferredSshSessionIdsByTabId,
-      workspaceSessionReady
-    ]
-  )
-
-  // Why: after a kill unmounts the session, focus would fall to <body>; park a ref on the popover body to restore it stably for keyboard users.
-  const popoverBodyRef = useRef<HTMLDivElement | null>(null)
-  const popoverBodyFocusFrameRef = useRef<number | null>(null)
-  const mountedRef = useMountedRef()
-
-  const cancelPopoverBodyFocusFrame = useCallback((): void => {
-    if (popoverBodyFocusFrameRef.current === null) {
-      return
-    }
-    cancelAnimationFrame(popoverBodyFocusFrameRef.current)
-    popoverBodyFocusFrameRef.current = null
-  }, [])
-
-  const setPopoverBodyNode = useCallback(
-    (node: HTMLDivElement | null): void => {
-      // Why: the queued post-kill focus is only valid while the popover body exists.
-      if (!node) {
-        cancelPopoverBodyFocusFrame()
-      }
-      popoverBodyRef.current = node
-    },
-    [cancelPopoverBodyFocusFrame]
-  )
-
-  const daemonActions = useDaemonActions({
-    onRestartSettled: () => {
-      clearSessionsError()
-      void fetchSnapshot()
-      void refreshSessions()
-    }
-  })
-
-  // Why: Space scans can finish after the user closes the full page/popover; the status-bar trigger becomes the handoff point.
-  const nextSpaceScanSnapshot = resolveResourceUsageSpaceScanReady({
-    snapshot: spaceScanSnapshot,
     open,
-    activeView,
-    scannedAt: workspaceSpaceScannedAt,
-    scanning: workspaceSpaceScanning
-  })
-  if (
-    nextSpaceScanSnapshot.ready !== spaceScanSnapshot.ready ||
-    nextSpaceScanSnapshot.previousScanning !== spaceScanSnapshot.previousScanning ||
-    nextSpaceScanSnapshot.lastSeenScannedAt !== spaceScanSnapshot.lastSeenScannedAt
-  ) {
-    // Why: guarded render-time state update (no ref mutation during render); React can safely retry it before commit.
-    setSpaceScanSnapshot(nextSpaceScanSnapshot)
-  }
-  const spaceScanReady = nextSpaceScanSnapshot.ready
-
-  // Why: seed RAM after session restore so the closed chip does not require a
-  // click; the session-inventory hook independently seeds daemon PTYs.
-  useEffect(() => {
-    if (workspaceSessionReady) {
-      void fetchSnapshot()
-    }
-  }, [workspaceSessionReady, fetchSnapshot])
-
-  // Poll memory only while the popover is open. Session inventory is still
-  // explicit-on-open/action/seed (not a closed interval) because full
-  // listSessions can pause input with large preserved-session sets.
-  useEffect(() => {
-    if (!open) {
-      return
-    }
-    void fetchSnapshot()
-    void refreshSessions()
-    // Why: only memory polls on an interval; session inventory is explicit on open/action since it's expensive with many terminals.
-    const memTimer = window.setInterval(() => {
-      void fetchSnapshot()
-    }, POLL_MS)
-    return () => {
-      window.clearInterval(memTimer)
-    }
-  }, [open, fetchSnapshot, refreshSessions])
-
-  useEffect(() => {
-    if (!open) {
-      clearSessionsError()
-    }
-  }, [open, clearSessionsError])
-
-  const repoDisplayNameById = useMemo(() => {
-    const map = new Map<string, string>()
-    for (const repo of repos) {
-      const display = repo.displayName?.trim()
-      if (display) {
-        map.set(repo.id, display)
-      }
-    }
-    return map
-  }, [repos])
-
-  // Why: non-null connectionId is the only honest "remote" signal (SSH PTYs run remote); build from the store, not a missing memory sample.
-  const repoConnectionIdById = useMemo(() => {
-    const map = new Map<string, string | null>()
-    for (const repo of repos) {
-      map.set(repo.id, repo.connectionId ?? null)
-    }
-    return map
-  }, [repos])
-
-  // Why: runtime-hosted repos have no local daemon samples or killable sessions; this map drives their per-row exclusion in the merge.
-  const repoRuntimeScopedById = useMemo(() => {
-    const map = new Map<string, boolean>()
-    for (const repo of repos) {
-      const parsed = parseExecutionHostId(getRepoExecutionHostId(repo))
-      map.set(repo.id, parsed?.kind === 'runtime')
-    }
-    return map
-  }, [repos])
-
-  const worktreeById = useMemo(
-    () => new Map(allWorktrees.map((worktree) => [worktree.id, worktree])),
-    [allWorktrees]
-  )
-
-  // Why: skip the merge when closed; the always-mounted segment recomputing on every keystroke-driven store mutation made the app laggy.
-  const unifiedRepos = useMemo(
-    () =>
-      open
-        ? mergeSnapshotAndSessions(resourceSnapshot, sessions, {
-            // Why spread: the rows and the bulk selector must classify from the identical binding
-            // inputs. Re-listing them here let the row path miss deferred SSH sessions, so their
-            // single-row kill skipped confirmation while bulk cleanup correctly spared them (#8459).
-            ...resourceSessionBindings,
-            runtimePaneTitlesByTabId,
-            repoDisplayNameById,
-            repoConnectionIdById,
-            repoRuntimeScopedById,
-            browserTabsByWorktree,
-            worktreeById
-          })
-        : [],
-    [
-      open,
-      resourceSnapshot,
-      sessions,
-      resourceSessionBindings,
-      runtimePaneTitlesByTabId,
-      repoDisplayNameById,
-      repoConnectionIdById,
-      repoRuntimeScopedById,
-      browserTabsByWorktree,
-      worktreeById
-    ]
-  )
-
-  // Why: orphan detection needs daemon inventory; keep it open-only so the closed badge never triggers a background global session scan.
-  const orphanCount = useMemo(() => {
-    if (!open || !workspaceSessionReady) {
-      return 0
-    }
-    return countUnboundDaemonSessions(sessions, resourceSessionBindings)
-  }, [open, sessions, resourceSessionBindings, workspaceSessionReady])
-
-  // Why: open and closed badges share the same daemon inventory cache. The old
-  // closed path used boundPtyIds (wake hints) and inflated the chip to 60+.
-  const triggerSessionCount = sessionInventory.count
-
-  const memoryMetricCopy = getResourceMemoryMetricCopy(
-    resourceSnapshot?.processMemoryMetric ?? 'rss'
-  )
-  // Why null-not-zero: a host that cannot read commit (every Unix host, and any
-  // host older than the field) must render nothing here, never "0 B committed".
-  const commitMetricCopy = resourceSnapshot?.processCommitMetric
-    ? getResourceCommitMetricCopy()
-    : null
-  const { totalMemory, totalCpu, memBadgeLabel, totalPrivateMemory, commitToneClass } =
-    useMemo(() => {
-      const memory = resourceSnapshot?.totalMemory ?? 0
-      const cpu = resourceSnapshot?.totalCpu ?? 0
-      const privateMemory = resourceSnapshot?.totalPrivateMemory
-      return {
-        totalMemory: memory,
-        totalCpu: cpu,
-        memBadgeLabel: resourceSnapshot ? formatMemory(memory) : '—',
-        totalPrivateMemory: privateMemory,
-        commitToneClass: getCommitPressureToneClass({
-          privateMemory,
-          hostTotalMemory: resourceSnapshot?.host.totalMemory ?? 0
-        })
-      }
-    }, [resourceSnapshot])
-  const commitBadgeLabel =
-    commitMetricCopy && totalPrivateMemory !== undefined ? formatMemory(totalPrivateMemory) : null
-
-  // Why: memorySnapshotError null means "succeeded" OR "never fetched"; a sessions failure before any snapshot still counts as daemon-unreachable.
-  const daemonUnreachable = sessionsError && (memorySnapshotError !== null || snapshot === null)
-  // Why: sessions IPC can fail while snapshot IPC works; flag it so the empty session list isn't mistaken for healthy.
-  const sessionsOnlyError = sessionsError && memorySnapshotError === null
-  const resourceManagerTooltipLines = getResourceManagerTooltipLines({
-    memoryLabel: resourceSnapshot
-      ? [
-          `${memBadgeLabel} · ${memoryMetricCopy.summaryLabel}`,
-          commitBadgeLabel && commitMetricCopy
-            ? `${commitBadgeLabel} ${commitMetricCopy.summaryLabel}`
-            : null
-        ]
-          .filter(Boolean)
-          .join(' · ')
-      : memBadgeLabel,
-    sessionCount: triggerSessionCount,
-    spaceScanReady
-  })
-  const resourceManagerAriaLabel = getResourceManagerAriaLabel({
-    sessionCount: triggerSessionCount,
-    spaceScanReady
-  })
-
-  const toggleRepo = useCallback((repoId: string): void => {
-    setCollapsedRepos((prev) => {
-      const next = new Set(prev)
-      if (next.has(repoId)) {
-        next.delete(repoId)
-      } else {
-        next.add(repoId)
-      }
-      return next
-    })
-  }, [])
-
-  const toggleWorktree = useCallback((worktreeId: string): void => {
-    setCollapsedWorktrees((prev) => {
-      const next = new Set(prev)
-      if (next.has(worktreeId)) {
-        next.delete(worktreeId)
-      } else {
-        next.add(worktreeId)
-      }
-      return next
-    })
-  }, [])
-
-  // Why: keep popover open on worktree navigation so users can browse; onFocusOutside suppresses the bound-row focus transfer.
-  const navigateToWorktree = useCallback((worktreeId: string): void => {
-    if (worktreeId === ORPHAN_WORKTREE_ID || worktreeId.startsWith(`${UNATTRIBUTED_REPO_ID}::`)) {
-      return
-    }
-    const target = resolveResourceManagerWorktreeTarget(
-      worktreeId,
-      getAllWorktreesFromState(useAppStore.getState())
-    )
-    if (!target) {
-      return
-    }
-    activateAndRevealWorktree(worktreeId, { executionHostId: target.hostId })
-  }, [])
-
-  const navigateToTab = useCallback(
-    (tabId: string, paneKey: string | null) => {
-      navigateResourceSessionToTab(tabId, paneKey, {
-        tabsByWorktree,
-        setOpen,
-        setActiveView,
-        activateAndRevealWorktree,
-        activateTabAndFocusPane
-      })
-    },
-    [tabsByWorktree, setActiveView]
-  )
-
-  const deleteWorktree = useCallback((worktreeId: string): void => {
-    const target = resolveResourceManagerWorktreeTarget(
-      worktreeId,
-      getAllWorktreesFromState(useAppStore.getState())
-    )
-    if (!target) {
-      return
-    }
-    setOpen(false)
-    runWorktreeDelete(worktreeId, { expectedHostId: target.hostId })
-  }, [])
-
-  const handleOpenWorkspaceCleanup = useCallback((): void => {
-    setOpen(false)
-    queueMicrotask(() => openModal('workspace-cleanup'))
-  }, [openModal])
-
-  const handleKillSession = useCallback(
-    (session: UnifiedSessionRow): void => {
-      if (!requiresKillConfirmation(session)) {
-        removeSession(session.sessionId)
-        // Why: await the kill before refreshing, else the refresh re-reads the daemon list before the kill lands and re-adds the row.
-        void (async () => {
-          try {
-            await window.api.pty.kill(session.sessionId)
-          } catch {
-            /* already dead */
-          }
-          await refreshSessions()
-        })()
-        return
-      }
-      setKillConfirm(session)
-    },
-    [refreshSessions, removeSession]
-  )
-
-  const handleKillOrphans = useCallback(async () => {
-    if (!workspaceSessionReady) {
-      return
-    }
-    // Why the shared selector: the button's count comes from the same function, so the set killed
-    // is exactly the set advertised. Filtering separately here is how live sessions got killed.
-    const orphans = selectUnboundDaemonSessions(sessions, resourceSessionBindings)
-    if (orphans.length === 0) {
-      return
-    }
-    // Why: optimistic removal so rows disappear immediately instead of waiting for the next daemon-side list refresh.
-    const orphanIds = new Set(orphans.map((s) => s.id))
-    removeSessions(orphanIds)
-    await Promise.allSettled(orphans.map((s) => window.api.pty.kill(s.id)))
-    void refreshSessions()
-  }, [sessions, resourceSessionBindings, workspaceSessionReady, refreshSessions, removeSessions])
-
-  const runKillConfirmed = useCallback(async () => {
-    if (!killConfirm) {
-      return
-    }
-    const target = killConfirm
-    setKilling(true)
-    // Why: optimistic removal avoids a flash where the dialog closes but the killed row lingers until the next list refresh.
-    removeSession(target.sessionId)
-    try {
-      await window.api.pty.kill(target.sessionId)
-    } catch {
-      /* already dead — fall through */
-    } finally {
-      if (mountedRef.current) {
-        setKilling(false)
-        setKillConfirm(null)
-        // Why: killed row unmounts and focus would drop to <body>; park it on the popover body so keyboard users stay in the list.
-        cancelPopoverBodyFocusFrame()
-        if (popoverBodyRef.current) {
-          popoverBodyFocusFrameRef.current = requestAnimationFrame(() => {
-            popoverBodyFocusFrameRef.current = null
-            popoverBodyRef.current?.focus()
-          })
-        }
-        void refreshSessions()
-      }
-    }
-  }, [cancelPopoverBodyFocusFrame, killConfirm, mountedRef, refreshSessions, removeSession])
-
-  const openSpaceResults = useCallback((): void => {
-    setOpen(false)
-    openSpacePage()
-  }, [openSpacePage])
+    setOpen,
+    sortOption,
+    setSortOption,
+    collapsedRepos,
+    collapsedWorktrees,
+    appCollapsed,
+    setAppCollapsed,
+    activeWorktreeId,
+    killConfirm,
+    setKillConfirm,
+    killing,
+    setPopoverBodyNode,
+    daemonActions,
+    resourceSnapshot,
+    spaceScanReady,
+    recordFeatureInteraction,
+    unifiedRepos,
+    orphanCount,
+    triggerSessionCount,
+    memoryMetricCopy,
+    commitMetricCopy,
+    totalMemory,
+    totalCpu,
+    memBadgeLabel,
+    commitToneClass,
+    commitBadgeLabel,
+    daemonUnreachable,
+    sessionsOnlyError,
+    resourceManagerTooltipLines,
+    resourceManagerAriaLabel,
+    toggleRepo,
+    toggleWorktree,
+    navigateToWorktree,
+    navigateToTab,
+    deleteWorktree,
+    handleOpenWorkspaceCleanup,
+    handleKillSession,
+    handleKillOrphans,
+    runKillConfirmed,
+    openSpaceResults
+  } = controller
 
   return (
     <Popover
@@ -1161,79 +82,17 @@ export function ResourceUsageStatusSegment({
         setOpen(nextOpen)
       }}
     >
-      <Tooltip delayDuration={150}>
-        <TooltipTrigger asChild>
-          <PopoverTrigger asChild>
-            <button
-              type="button"
-              {...STATUS_BAR_CONTEXT_MENU_EXEMPT_PROPS}
-              className="relative inline-flex items-center gap-1.5 cursor-pointer rounded px-1 py-0.5 hover:bg-accent/70"
-              aria-label={
-                daemonUnreachable
-                  ? translate(
-                      'auto.components.status.bar.ResourceUsageStatusSegment.59f178fe11',
-                      '{{value0}}, daemon unreachable',
-                      { value0: resourceManagerAriaLabel }
-                    )
-                  : resourceManagerAriaLabel
-              }
-            >
-              {spaceScanReady ? (
-                <span
-                  className="absolute -right-0.5 -top-0.5 size-1.5 rounded-full bg-primary"
-                  aria-hidden="true"
-                />
-              ) : null}
-              <MemoryStick className="size-3 text-muted-foreground" />
-              {!iconOnly && (
-                <>
-                  {/* Tint only: the number stays the resident sum it has always been,
-                      and the tooltip names the commit figure that raised the tone. */}
-                  <span
-                    className={cn(
-                      'text-[11px] font-medium tabular-nums',
-                      commitToneClass ?? 'text-muted-foreground'
-                    )}
-                  >
-                    {memBadgeLabel}
-                  </span>
-                  <span className="text-muted-foreground/50">·</span>
-                  <Terminal className="size-3 text-muted-foreground" />
-                  <span className="text-[11px] tabular-nums text-muted-foreground">
-                    {triggerSessionCount}
-                    {orphanCount > 0 && (
-                      <span className="text-yellow-500 ml-0.5">({orphanCount})</span>
-                    )}
-                  </span>
-                </>
-              )}
-              {iconOnly && triggerSessionCount > 0 && (
-                <span className="text-[11px] tabular-nums text-muted-foreground">
-                  {triggerSessionCount}
-                </span>
-              )}
-              {daemonUnreachable && (
-                <AlertTriangle
-                  className="size-3 text-yellow-500"
-                  aria-label={translate(
-                    'auto.components.status.bar.ResourceUsageStatusSegment.ca95d077db',
-                    'Daemon unreachable'
-                  )}
-                />
-              )}
-            </button>
-          </PopoverTrigger>
-        </TooltipTrigger>
-        <TooltipContent side="top" sideOffset={6}>
-          <div className="space-y-0.5">
-            {resourceManagerTooltipLines.map((line) => (
-              <div key={line.id} className={line.emphasized ? 'text-primary' : ''}>
-                {line.text}
-              </div>
-            ))}
-          </div>
-        </TooltipContent>
-      </Tooltip>
+      {renderResourceUsageStatusTrigger({
+        daemonUnreachable,
+        resourceManagerAriaLabel,
+        spaceScanReady,
+        iconOnly,
+        commitToneClass,
+        memBadgeLabel,
+        triggerSessionCount,
+        orphanCount,
+        resourceManagerTooltipLines
+      })}
 
       <PopoverContent
         side="top"
@@ -1245,413 +104,54 @@ export function ResourceUsageStatusSegment({
         // Why: activating a tab focuses xterm's DOM node; Radix would read that as focus-outside and close. Outside-click and Escape still close.
         onFocusOutside={(event) => event.preventDefault()}
       >
-        <div className="flex items-center justify-between gap-2 border-b border-border px-3 py-1.5">
-          <div className="flex min-w-0 items-center gap-1.5 text-[11px] font-medium text-foreground">
-            <MemoryStick className="size-3 shrink-0 text-muted-foreground" />
-            <span className="truncate">
-              {translate('auto.components.status.bar.StatusBar.d1e1a7a6bf', 'Resource Manager')}
-            </span>
-          </div>
-
-          <div className="flex items-center gap-0.5">
-            <Tooltip delayDuration={200}>
-              <TooltipTrigger asChild>
-                <button
-                  type="button"
-                  onClick={() => daemonActions.setPending('restart')}
-                  disabled={daemonActions.isBusy}
-                  aria-label={translate(
-                    'auto.components.status.bar.ResourceUsageStatusSegment.c9382662bb',
-                    'Restart daemon'
-                  )}
-                  className="inline-flex size-6 items-center justify-center rounded text-muted-foreground transition-colors hover:bg-accent hover:text-foreground disabled:opacity-40"
-                >
-                  <RotateCw className="size-3" />
-                </button>
-              </TooltipTrigger>
-              <TooltipContent side="top" sideOffset={6}>
-                {translate(
-                  'auto.components.status.bar.ResourceUsageStatusSegment.c9382662bb',
-                  'Restart daemon'
-                )}
-              </TooltipContent>
-            </Tooltip>
-            <Tooltip delayDuration={200}>
-              <TooltipTrigger asChild>
-                <button
-                  type="button"
-                  onClick={() => daemonActions.setPending('killAll')}
-                  disabled={daemonActions.isBusy}
-                  aria-label={translate(
-                    'auto.components.status.bar.ResourceUsageStatusSegment.bd19fd7a59',
-                    'Kill all sessions'
-                  )}
-                  className="inline-flex size-6 items-center justify-center rounded text-muted-foreground transition-colors hover:bg-destructive/10 hover:text-destructive disabled:opacity-40"
-                >
-                  <Trash2 className="size-3" />
-                </button>
-              </TooltipTrigger>
-              <TooltipContent side="top" sideOffset={6}>
-                {translate(
-                  'auto.components.status.bar.ResourceUsageStatusSegment.bd19fd7a59',
-                  'Kill all sessions'
-                )}
-              </TooltipContent>
-            </Tooltip>
-          </div>
-        </div>
-
-        {daemonUnreachable && (
-          <div className="flex items-start gap-2 border-b border-border bg-yellow-500/10 px-3 py-2 text-[11px] text-foreground">
-            <AlertTriangle className="mt-0.5 size-3 shrink-0 text-yellow-500" />
-            <div className="flex-1">
-              <div className="font-medium">
-                {translate(
-                  'auto.components.status.bar.ResourceUsageStatusSegment.f8e0d794b4',
-                  'Daemon is not responding'
-                )}
-              </div>
-              <div className="text-muted-foreground">
-                {translate(
-                  'auto.components.status.bar.ResourceUsageStatusSegment.f85af9cda6',
-                  'Resource snapshots and terminal sessions are unavailable.'
-                )}
-              </div>
-            </div>
-            <Button
-              variant="outline"
-              size="sm"
-              className="shrink-0"
-              onClick={() => daemonActions.setPending('restart')}
-              disabled={daemonActions.isBusy}
-            >
-              <RotateCw className="mr-1 size-3" />
-              {translate(
-                'auto.components.status.bar.ResourceUsageStatusSegment.93b0de3c21',
-                'Restart'
-              )}
-            </Button>
-          </div>
-        )}
-
-        {!daemonUnreachable && sessionsOnlyError && (
-          <div
-            className="flex items-center gap-2 border-b border-border bg-muted/40 px-3 py-1.5 text-[11px] text-muted-foreground"
-            role="status"
-          >
-            <AlertTriangle className="size-3 shrink-0 text-yellow-500" />
-            <span>
-              {translate(
-                'auto.components.status.bar.ResourceUsageStatusSegment.e7cf14ec78',
-                'Terminal sessions unavailable. The list may be stale.'
-              )}
-            </span>
-          </div>
-        )}
-
-        {resourceSnapshot && (
-          <div className="px-3 py-2 border-b border-border flex items-baseline justify-between gap-3 text-xs tabular-nums">
-            <div className="flex items-baseline gap-3 min-w-0">
-              <Tooltip delayDuration={200}>
-                <TooltipTrigger asChild>
-                  <span
-                    tabIndex={0}
-                    className="font-medium text-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring focus-visible:rounded"
-                  >
-                    {formatCpu(totalCpu)}
-                  </span>
-                </TooltipTrigger>
-                <TooltipContent side="top" sideOffset={6} className="z-[70] max-w-xs">
-                  {translate(
-                    'auto.components.status.bar.ResourceUsageStatusSegment.1fedf94eae',
-                    'Combined CPU load. Values above 100% mean more than one core is working at once.'
-                  )}
-                </TooltipContent>
-              </Tooltip>
-              <span className="text-muted-foreground/50">·</span>
-              <Tooltip delayDuration={200}>
-                <TooltipTrigger asChild>
-                  <span
-                    tabIndex={0}
-                    className="font-medium text-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring focus-visible:rounded"
-                  >
-                    {formatMemory(totalMemory)}{' '}
-                    <span className="font-normal text-muted-foreground">
-                      {memoryMetricCopy.summaryLabel}
-                    </span>
-                  </span>
-                </TooltipTrigger>
-                <TooltipContent side="top" sideOffset={6} className="z-[70] max-w-xs">
-                  {memoryMetricCopy.description}
-                </TooltipContent>
-              </Tooltip>
-              {commitBadgeLabel && commitMetricCopy && (
-                <>
-                  <span className="text-muted-foreground/50">·</span>
-                  <Tooltip delayDuration={200}>
-                    <TooltipTrigger asChild>
-                      <span
-                        tabIndex={0}
-                        className={cn(
-                          'font-medium focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring focus-visible:rounded',
-                          commitToneClass ?? 'text-foreground'
-                        )}
-                      >
-                        {commitBadgeLabel}{' '}
-                        <span className="font-normal text-muted-foreground">
-                          {commitMetricCopy.summaryLabel}
-                        </span>
-                      </span>
-                    </TooltipTrigger>
-                    <TooltipContent side="top" sideOffset={6} className="z-[70] max-w-xs">
-                      {commitMetricCopy.description}
-                    </TooltipContent>
-                  </Tooltip>
-                </>
-              )}
-            </div>
-            {orphanCount > 0 && (
-              <span className="shrink-0 text-yellow-500" aria-live="polite">
-                {orphanCount === 1
-                  ? translate(
-                      'auto.components.status.bar.ResourceUsageStatusSegment.30ff2c3c31',
-                      '{{value0}} orphan',
-                      { value0: orphanCount }
-                    )
-                  : translate(
-                      'auto.components.status.bar.ResourceUsageStatusSegment.b8f4a2c1d0e3',
-                      '{{value0}} orphans',
-                      { value0: orphanCount }
-                    )}
-              </span>
-            )}
-          </div>
-        )}
-
+        {renderResourceUsagePopoverHeader({ daemonActions })}
+        {daemonUnreachable && renderDaemonUnreachableBanner({ daemonActions })}
+        {!daemonUnreachable && sessionsOnlyError && renderSessionsOnlyErrorBanner()}
+        {resourceSnapshot &&
+          renderResourceUsageSummary({
+            totalCpu,
+            totalMemory,
+            memoryMetricCopy,
+            commitBadgeLabel,
+            commitMetricCopy,
+            commitToneClass,
+            orphanCount
+          })}
         {/* Why: fixed 420px height so the popover doesn't jump as worktrees expand/collapse or sessions change; inner tree owns its scroll. */}
-        <div
-          ref={setPopoverBodyNode}
-          tabIndex={-1}
-          className="flex h-[420px] flex-col outline-none"
-        >
-          {(unifiedRepos.length > 0 || resourceSnapshot) && (
-            <div className="flex items-center justify-between px-3 py-1 bg-muted/30 border-b border-border/50 text-[10px] uppercase tracking-wide shrink-0">
-              <button
-                type="button"
-                onClick={() => setSortOption('name')}
-                className={cn(
-                  'hover:text-foreground transition-colors',
-                  sortOption === 'name'
-                    ? 'font-semibold text-foreground'
-                    : 'text-muted-foreground/80'
-                )}
-                aria-pressed={sortOption === 'name'}
-              >
-                {translate(
-                  'auto.components.status.bar.ResourceUsageStatusSegment.2aa2de6cb9',
-                  'Name'
-                )}
-              </button>
-              <div className="flex items-center gap-2 shrink-0">
-                <div className={cn(METRIC_COLUMNS_CLS, 'text-[10px]')}>
-                  <button
-                    type="button"
-                    onClick={() => setSortOption('cpu')}
-                    className={cn(
-                      CPU_COLUMN_CLS,
-                      'hover:text-foreground transition-colors',
-                      sortOption === 'cpu'
-                        ? 'font-semibold text-foreground'
-                        : 'text-muted-foreground/80'
-                    )}
-                    aria-pressed={sortOption === 'cpu'}
-                  >
-                    {translate(
-                      'auto.components.status.bar.ResourceUsageStatusSegment.298f4be7f2',
-                      'CPU'
-                    )}
-                  </button>
-                  <button
-                    type="button"
-                    onClick={() => setSortOption('memory')}
-                    className={cn(
-                      MEM_COLUMN_CLS,
-                      'hover:text-foreground transition-colors',
-                      sortOption === 'memory'
-                        ? 'font-semibold text-foreground'
-                        : 'text-muted-foreground/80'
-                    )}
-                    aria-pressed={sortOption === 'memory'}
-                  >
-                    {memoryMetricCopy.columnLabel}
-                  </button>
-                </div>
-                {/* Why: empty trailing gutter keeps CPU/Memory header cells aligned with rows that reserve this width for the kill-X. */}
-                <span className={ROW_TRAILING_GUTTER_CLS} aria-hidden />
-              </div>
-            </div>
-          )}
-
-          <div className="flex-1 overflow-y-auto scrollbar-sleek">
-            {unifiedRepos.length > 0 && (
-              <ResourceTree
-                repos={unifiedRepos}
-                sortOption={sortOption}
-                collapsedRepos={collapsedRepos}
-                toggleRepo={toggleRepo}
-                collapsedWorktrees={collapsedWorktrees}
-                activeWorktreeId={activeWorktreeId}
-                toggleWorktree={toggleWorktree}
-                navigateToWorktree={navigateToWorktree}
-                navigateToTab={navigateToTab}
-                onDelete={deleteWorktree}
-                onKillSession={handleKillSession}
-              />
-            )}
-
-            {unifiedRepos.length === 0 && resourceSnapshot && (
-              <div className="px-3 py-4 text-center text-xs text-muted-foreground">
-                {translate(
-                  'auto.components.status.bar.ResourceUsageStatusSegment.27a74f91f0',
-                  'Nothing running right now'
-                )}
-              </div>
-            )}
-
-            {resourceSnapshot && (
-              <AppSection
-                app={resourceSnapshot.app}
-                isCollapsed={appCollapsed}
-                onToggle={() => setAppCollapsed((v) => !v)}
-              />
-            )}
-
-            {!resourceSnapshot && !daemonUnreachable && (
-              <div className="px-3 py-4 text-center text-xs text-muted-foreground">
-                {translate(
-                  'auto.components.status.bar.ResourceUsageStatusSegment.888dad8c55',
-                  'Loading…'
-                )}
-              </div>
-            )}
-          </div>
-        </div>
-
-        <div className="border-t border-border/50 px-3 py-2 shrink-0">
-          <button
-            type="button"
-            onClick={handleOpenWorkspaceCleanup}
-            className="relative inline-flex w-full items-center justify-center rounded-md border border-border/70 px-2.5 py-1.5 text-xs font-medium text-foreground transition-colors hover:bg-accent/60"
-          >
-            <span className="min-w-0 truncate px-4 text-center">
-              {translate(
-                'auto.components.status.bar.ResourceUsageStatusSegment.92924a14e3',
-                'Clean up workspaces'
-              )}
-            </span>
-            <ChevronRight
-              className="absolute right-2.5 size-3.5 text-muted-foreground"
-              aria-hidden
-            />
-          </button>
-          {orphanCount > 0 ? (
-            <button
-              type="button"
-              onClick={() => void handleKillOrphans()}
-              className="mt-2 inline-flex w-full items-center justify-center rounded-md border border-border/70 px-2.5 py-1.5 text-xs font-medium text-foreground transition-colors hover:bg-accent/60"
-            >
-              {orphanCount === 1
-                ? translate(
-                    'auto.components.status.bar.ResourceUsageStatusSegment.c7e3b1a0d9f2',
-                    'End {{value0}} orphan terminal',
-                    { value0: orphanCount }
-                  )
-                : translate(
-                    'auto.components.status.bar.ResourceUsageStatusSegment.d8f4c2b1e0a3',
-                    'End {{value0}} orphan terminals',
-                    { value0: orphanCount }
-                  )}
-            </button>
-          ) : null}
-        </div>
-
+        {renderResourceUsagePopoverBody({
+          setPopoverBodyNode,
+          unifiedRepos,
+          resourceSnapshot,
+          sortOption,
+          setSortOption,
+          memoryMetricCopy,
+          collapsedRepos,
+          toggleRepo,
+          collapsedWorktrees,
+          activeWorktreeId,
+          toggleWorktree,
+          navigateToWorktree,
+          navigateToTab,
+          deleteWorktree,
+          handleKillSession,
+          appCollapsed,
+          setAppCollapsed,
+          daemonUnreachable
+        })}
+        {renderResourceUsagePopoverFooter({
+          handleOpenWorkspaceCleanup,
+          orphanCount,
+          handleKillOrphans
+        })}
         <WorkspaceSpaceCompactPanel onOpenFullPage={openSpaceResults} />
       </PopoverContent>
       {/* Why: hoisted to a sibling of PopoverContent — nested, the Dialog unmounts with the popover mid-interaction and the kill-confirm flow disappears. */}
-      <Dialog
-        open={killConfirm !== null}
-        onOpenChange={(next) => {
-          if (next) {
-            return
-          }
-          if (killing) {
-            return
-          }
-          setKillConfirm(null)
-        }}
-      >
-        <DialogContent
-          className="max-w-md"
-          showCloseButton={!killing}
-          onPointerDownOutside={(e) => {
-            if (killing) {
-              e.preventDefault()
-            }
-          }}
-          onEscapeKeyDown={(e) => {
-            if (killing) {
-              e.preventDefault()
-            }
-          }}
-        >
-          <DialogHeader>
-            <DialogTitle className="text-sm">
-              {translate(
-                'auto.components.status.bar.ResourceUsageStatusSegment.e9a5d3c2b1f0',
-                'Kill {{value0}}?',
-                {
-                  value0:
-                    killConfirm?.label ??
-                    translate(
-                      'auto.components.status.bar.ResourceUsageStatusSegment.138b99bd80',
-                      'this session'
-                    )
-                }
-              )}
-            </DialogTitle>
-            <DialogDescription className="text-xs">
-              {translate(
-                'auto.components.status.bar.ResourceUsageStatusSegment.67c4ecda49',
-                "Force-quits this terminal. Any unsaved work in the pane is lost. This can't be undone."
-              )}
-            </DialogDescription>
-          </DialogHeader>
-          <DialogFooter>
-            <Button variant="outline" onClick={() => setKillConfirm(null)} disabled={killing}>
-              {translate(
-                'auto.components.status.bar.ResourceUsageStatusSegment.946d9f94d0',
-                'Cancel'
-              )}
-            </Button>
-            <Button
-              variant="destructive"
-              onClick={() => void runKillConfirmed()}
-              disabled={killing}
-            >
-              {killing ? <LoaderCircle className="size-4 animate-spin" /> : null}
-              {killing
-                ? translate(
-                    'auto.components.status.bar.ResourceUsageStatusSegment.41ae4fa725',
-                    'Killing…'
-                  )
-                : translate(
-                    'auto.components.status.bar.ResourceUsageStatusSegment.b10695d6ce',
-                    'Kill session'
-                  )}
-            </Button>
-          </DialogFooter>
-        </DialogContent>
-      </Dialog>
+      {renderResourceUsageKillDialog({
+        killConfirm,
+        setKillConfirm,
+        killing,
+        runKillConfirmed
+      })}
       <DaemonActionDialog api={daemonActions} />
     </Popover>
   )
diff --git a/src/renderer/src/components/status-bar/resource-session-classification-parity.test.ts b/src/renderer/src/components/status-bar/resource-session-classification-parity.test.ts
index 723dc4e81a8..fafe3cc155b 100644
--- a/src/renderer/src/components/status-bar/resource-session-classification-parity.test.ts
+++ b/src/renderer/src/components/status-bar/resource-session-classification-parity.test.ts
@@ -2,7 +2,8 @@ import { readFileSync } from 'node:fs'
 import { resolve } from 'node:path'
 import { describe, expect, it } from 'vitest'
 
-const SEGMENT_PATH = resolve(__dirname, 'ResourceUsageStatusSegment.tsx')
+const CONTROLLER_PATH = resolve(__dirname, 'use-resource-usage-status-controller.ts')
+const DERIVED_MODEL_PATH = resolve(__dirname, 'use-resource-usage-derived-model.ts')
 
 /**
  * Both destructive paths — bulk "kill orphans" and a single row's kill — must classify from the
@@ -12,7 +13,7 @@ const SEGMENT_PATH = resolve(__dirname, 'ResourceUsageStatusSegment.tsx')
  */
 describe('resource session classification parity', () => {
   it('feeds the row merge the same binding inputs as the bulk selector', () => {
-    const source = readFileSync(SEGMENT_PATH, 'utf8')
+    const source = readFileSync(DERIVED_MODEL_PATH, 'utf8')
     const mergeCall = source.slice(
       source.indexOf('mergeSnapshotAndSessions(resourceSnapshot'),
       source.indexOf('worktreeById\n          })')
@@ -32,7 +33,7 @@ describe('resource session classification parity', () => {
   })
 
   it('keeps every binding source in the one object both paths read', () => {
-    const source = readFileSync(SEGMENT_PATH, 'utf8')
+    const source = readFileSync(CONTROLLER_PATH, 'utf8')
     const bindings = source.slice(
       source.indexOf('const resourceSessionBindings = useMemo'),
       source.indexOf('const popoverBodyRef')
diff --git a/src/renderer/src/components/status-bar/resource-usage-kill-dialog.tsx b/src/renderer/src/components/status-bar/resource-usage-kill-dialog.tsx
new file mode 100644
index 00000000000..58ec6707aa0
--- /dev/null
+++ b/src/renderer/src/components/status-bar/resource-usage-kill-dialog.tsx
@@ -0,0 +1,98 @@
+import React, { type Dispatch, type SetStateAction } from 'react'
+import { LoaderCircle } from 'lucide-react'
+import { Button } from '@/components/ui/button'
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle
+} from '@/components/ui/dialog'
+import { translate } from '@/i18n/i18n'
+import type { UnifiedSessionRow } from './resource-usage-merge-types'
+
+export function renderResourceUsageKillDialog({
+  killConfirm,
+  setKillConfirm,
+  killing,
+  runKillConfirmed
+}: {
+  killConfirm: UnifiedSessionRow | null
+  setKillConfirm: Dispatch<SetStateAction<UnifiedSessionRow | null>>
+  killing: boolean
+  runKillConfirmed: () => Promise<void>
+}): React.JSX.Element {
+  return (
+    <Dialog
+      open={killConfirm !== null}
+      onOpenChange={(next) => {
+        if (next) {
+          return
+        }
+        if (killing) {
+          return
+        }
+        setKillConfirm(null)
+      }}
+    >
+      <DialogContent
+        className="max-w-md"
+        showCloseButton={!killing}
+        onPointerDownOutside={(e) => {
+          if (killing) {
+            e.preventDefault()
+          }
+        }}
+        onEscapeKeyDown={(e) => {
+          if (killing) {
+            e.preventDefault()
+          }
+        }}
+      >
+        <DialogHeader>
+          <DialogTitle className="text-sm">
+            {translate(
+              'auto.components.status.bar.ResourceUsageStatusSegment.e9a5d3c2b1f0',
+              'Kill {{value0}}?',
+              {
+                value0:
+                  killConfirm?.label ??
+                  translate(
+                    'auto.components.status.bar.ResourceUsageStatusSegment.138b99bd80',
+                    'this session'
+                  )
+              }
+            )}
+          </DialogTitle>
+          <DialogDescription className="text-xs">
+            {translate(
+              'auto.components.status.bar.ResourceUsageStatusSegment.67c4ecda49',
+              "Force-quits this terminal. Any unsaved work in the pane is lost. This can't be undone."
+            )}
+          </DialogDescription>
+        </DialogHeader>
+        <DialogFooter>
+          <Button variant="outline" onClick={() => setKillConfirm(null)} disabled={killing}>
+            {translate(
+              'auto.components.status.bar.ResourceUsageStatusSegment.946d9f94d0',
+              'Cancel'
+            )}
+          </Button>
+          <Button variant="destructive" onClick={() => void runKillConfirmed()} disabled={killing}>
+            {killing ? <LoaderCircle className="size-4 animate-spin" /> : null}
+            {killing
+              ? translate(
+                  'auto.components.status.bar.ResourceUsageStatusSegment.41ae4fa725',
+                  'Killing…'
+                )
+              : translate(
+                  'auto.components.status.bar.ResourceUsageStatusSegment.b10695d6ce',
+                  'Kill session'
+                )}
+          </Button>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  )
+}
diff --git a/src/renderer/src/components/status-bar/resource-usage-metrics.tsx b/src/renderer/src/components/status-bar/resource-usage-metrics.tsx
new file mode 100644
index 00000000000..b0309d5f917
--- /dev/null
+++ b/src/renderer/src/components/status-bar/resource-usage-metrics.tsx
@@ -0,0 +1,230 @@
+import React, { memo, useMemo } from 'react'
+import { ChevronDown, ChevronRight } from 'lucide-react'
+import { cn } from '@/lib/utils'
+import { translate } from '@/i18n/i18n'
+import type { AppMemory, UsageValues } from '../../../../shared/process-stats-types'
+import type { Metric } from './resource-usage-merge-types'
+
+export const METRIC_COLUMNS_CLS = 'flex items-center shrink-0 tabular-nums'
+export const CPU_COLUMN_CLS = 'w-12 text-right'
+export const MEM_COLUMN_CLS = 'w-16 text-right'
+// Why: every row and the header reserve this trailing gutter so CPU/Memory columns align whether or not the row has a kill-X.
+export const ROW_TRAILING_GUTTER_CLS = 'w-5 shrink-0 flex items-center justify-end'
+
+// ─── Formatters ─────────────────────────────────────────────────────
+
+export function formatMemory(bytes: number): string {
+  if (bytes < 1024 * 1024) {
+    return `${Math.round(bytes / 1024)} KB`
+  }
+  if (bytes < 1024 * 1024 * 1024) {
+    return `${(bytes / (1024 * 1024)).toFixed(1)} MB`
+  }
+  return `${(bytes / (1024 * 1024 * 1024)).toFixed(2)} GB`
+}
+
+export function formatCpu(percent: number): string {
+  return `${percent.toFixed(1)}%`
+}
+
+function formatMetricCpu(value: Metric): string {
+  return value === null ? '—' : formatCpu(value)
+}
+
+function formatMetricMemory(value: Metric): string {
+  return value === null ? '—' : formatMemory(value)
+}
+
+// ─── Sparkline ──────────────────────────────────────────────────────
+
+type SparklineProps = {
+  samples: number[]
+  width?: number
+  height?: number
+}
+
+function SparklineImpl({ samples, width = 48, height = 14 }: SparklineProps): React.JSX.Element {
+  const points = useMemo(() => {
+    const safe = Array.isArray(samples) ? samples : []
+    if (safe.length < 2) {
+      const midY = (height / 2).toFixed(1)
+      return `0,${midY} ${width},${midY}`
+    }
+
+    let min = safe[0]
+    let max = safe[0]
+    for (const v of safe) {
+      if (v < min) {
+        min = v
+      }
+      if (v > max) {
+        max = v
+      }
+    }
+    const range = max - min || 1
+    const stepX = width / (safe.length - 1)
+
+    const out: string[] = []
+    for (let i = 0; i < safe.length; i++) {
+      const x = (i * stepX).toFixed(1)
+      const y = (height - ((safe[i] - min) / range) * height).toFixed(1)
+      out.push(`${x},${y}`)
+    }
+    return out.join(' ')
+  }, [samples, width, height])
+
+  return (
+    <svg
+      width={width}
+      height={height}
+      viewBox={`0 0 ${width} ${height}`}
+      aria-hidden
+      preserveAspectRatio="none"
+    >
+      <polyline
+        points={points}
+        fill="none"
+        strokeWidth={1}
+        strokeLinecap="round"
+        strokeLinejoin="round"
+        className="stroke-muted-foreground/70"
+      />
+    </svg>
+  )
+}
+
+export const Sparkline = memo(SparklineImpl, (a, b) => {
+  if (a.width !== b.width || a.height !== b.height) {
+    return false
+  }
+  const sa = Array.isArray(a.samples) ? a.samples : []
+  const sb = Array.isArray(b.samples) ? b.samples : []
+  if (sa === sb) {
+    return true
+  }
+  if (sa.length !== sb.length) {
+    return false
+  }
+  for (let i = 0; i < sa.length; i++) {
+    if (sa[i] !== sb[i]) {
+      return false
+    }
+  }
+  return true
+})
+
+// ─── Leaf UI: metric row ────────────────────────────────────────────
+
+export function MetricPair({
+  cpu,
+  memory,
+  size = 'base'
+}: {
+  cpu: Metric
+  memory: Metric
+  size?: 'base' | 'small'
+}): React.JSX.Element {
+  const textCls = size === 'small' ? 'text-[11px]' : 'text-xs'
+  const muted = cpu === null && memory === null
+  return (
+    <div
+      className={cn(
+        METRIC_COLUMNS_CLS,
+        textCls,
+        muted ? 'text-muted-foreground/50' : 'text-muted-foreground'
+      )}
+    >
+      <span className={CPU_COLUMN_CLS}>{formatMetricCpu(cpu)}</span>
+      <span className={MEM_COLUMN_CLS}>{formatMetricMemory(memory)}</span>
+    </div>
+  )
+}
+
+function AppSubRow({ label, values }: { label: string; values: UsageValues }): React.JSX.Element {
+  return (
+    <div className="px-3 py-1.5 pl-6 flex items-center justify-between gap-2">
+      <span className="text-[11px] text-muted-foreground truncate">{label}</span>
+      <div className="flex items-center gap-2 shrink-0">
+        <MetricPair cpu={values.cpu} memory={values.memory} size="small" />
+        <span className={ROW_TRAILING_GUTTER_CLS} aria-hidden />
+      </div>
+    </div>
+  )
+}
+
+export function AppSection({
+  app,
+  isCollapsed,
+  onToggle
+}: {
+  app: AppMemory
+  isCollapsed: boolean
+  onToggle: () => void
+}): React.JSX.Element {
+  return (
+    <div className="border-t border-border/50">
+      <div className="flex items-center">
+        <button
+          type="button"
+          onClick={onToggle}
+          className="pl-2 py-2 pr-0.5 transition-colors hover:bg-muted/50"
+          aria-label={
+            isCollapsed
+              ? translate(
+                  'auto.components.status.bar.ResourceUsageStatusSegment.e419d27083',
+                  'Expand Orca'
+                )
+              : translate(
+                  'auto.components.status.bar.ResourceUsageStatusSegment.53dd5560ae',
+                  'Collapse Orca'
+                )
+          }
+          aria-expanded={!isCollapsed}
+        >
+          {isCollapsed ? (
+            <ChevronRight className="h-3 w-3 text-muted-foreground" />
+          ) : (
+            <ChevronDown className="h-3 w-3 text-muted-foreground" />
+          )}
+        </button>
+        <div className="flex-1 min-w-0 py-2 pr-3 flex items-center justify-between">
+          <span className="text-[11px] font-semibold uppercase tracking-wide truncate text-muted-foreground">
+            {translate('auto.components.status.bar.ResourceUsageStatusSegment.288a4dd177', 'Orca')}
+          </span>
+          <div className="flex items-center gap-2 shrink-0">
+            <Sparkline samples={app.history} />
+            <MetricPair cpu={app.cpu} memory={app.memory} />
+            <span className={ROW_TRAILING_GUTTER_CLS} aria-hidden />
+          </div>
+        </div>
+      </div>
+      {!isCollapsed && (
+        <div className="border-t border-border/30">
+          <AppSubRow
+            label={translate(
+              'auto.components.status.bar.ResourceUsageStatusSegment.81cd37af99',
+              'Main'
+            )}
+            values={app.main}
+          />
+          <AppSubRow
+            label={translate(
+              'auto.components.status.bar.ResourceUsageStatusSegment.d406915b78',
+              'Renderer'
+            )}
+            values={app.renderer}
+          />
+          {(app.other.cpu > 0 || app.other.memory > 0) && (
+            <AppSubRow
+              label={translate(
+                'auto.components.status.bar.ResourceUsageStatusSegment.0f9e50eb07',
+                'Other'
+              )}
+              values={app.other}
+            />
+          )}
+        </div>
+      )}
+    </div>
+  )
+}
diff --git a/src/renderer/src/components/status-bar/resource-usage-popover-body.tsx b/src/renderer/src/components/status-bar/resource-usage-popover-body.tsx
new file mode 100644
index 00000000000..9bc3b81611d
--- /dev/null
+++ b/src/renderer/src/components/status-bar/resource-usage-popover-body.tsx
@@ -0,0 +1,204 @@
+import React, { type Dispatch, type SetStateAction } from 'react'
+import { ChevronRight } from 'lucide-react'
+import { cn } from '@/lib/utils'
+import { translate } from '@/i18n/i18n'
+import type { MemorySnapshot } from '../../../../shared/process-stats-types'
+import type { UnifiedProjectGroup, UnifiedSessionRow } from './resource-usage-merge-types'
+import type { SortOption } from './resource-usage-resource-tree'
+import { ResourceTree } from './resource-usage-resource-tree'
+import {
+  AppSection,
+  CPU_COLUMN_CLS,
+  MEM_COLUMN_CLS,
+  METRIC_COLUMNS_CLS,
+  ROW_TRAILING_GUTTER_CLS
+} from './resource-usage-metrics'
+import type { getResourceMemoryMetricCopy } from './resource-memory-metric-copy'
+
+export function renderResourceUsagePopoverBody({
+  setPopoverBodyNode,
+  unifiedRepos,
+  resourceSnapshot,
+  sortOption,
+  setSortOption,
+  memoryMetricCopy,
+  collapsedRepos,
+  toggleRepo,
+  collapsedWorktrees,
+  activeWorktreeId,
+  toggleWorktree,
+  navigateToWorktree,
+  navigateToTab,
+  deleteWorktree,
+  handleKillSession,
+  appCollapsed,
+  setAppCollapsed,
+  daemonUnreachable
+}: {
+  setPopoverBodyNode: (node: HTMLDivElement | null) => void
+  unifiedRepos: UnifiedProjectGroup[]
+  resourceSnapshot: MemorySnapshot | null
+  sortOption: SortOption
+  setSortOption: Dispatch<SetStateAction<SortOption>>
+  memoryMetricCopy: ReturnType<typeof getResourceMemoryMetricCopy>
+  collapsedRepos: Set<string>
+  toggleRepo: (repoId: string) => void
+  collapsedWorktrees: Set<string>
+  activeWorktreeId: string | null
+  toggleWorktree: (worktreeId: string) => void
+  navigateToWorktree: (worktreeId: string) => void
+  navigateToTab: (tabId: string, paneKey: string | null) => void
+  deleteWorktree: (worktreeId: string) => void
+  handleKillSession: (session: UnifiedSessionRow) => void
+  appCollapsed: boolean
+  setAppCollapsed: Dispatch<SetStateAction<boolean>>
+  daemonUnreachable: boolean
+}): React.JSX.Element {
+  return (
+    <div ref={setPopoverBodyNode} tabIndex={-1} className="flex h-[420px] flex-col outline-none">
+      {(unifiedRepos.length > 0 || resourceSnapshot) && (
+        <div className="flex items-center justify-between px-3 py-1 bg-muted/30 border-b border-border/50 text-[10px] uppercase tracking-wide shrink-0">
+          <button
+            type="button"
+            onClick={() => setSortOption('name')}
+            className={cn(
+              'hover:text-foreground transition-colors',
+              sortOption === 'name' ? 'font-semibold text-foreground' : 'text-muted-foreground/80'
+            )}
+            aria-pressed={sortOption === 'name'}
+          >
+            {translate('auto.components.status.bar.ResourceUsageStatusSegment.2aa2de6cb9', 'Name')}
+          </button>
+          <div className="flex items-center gap-2 shrink-0">
+            <div className={cn(METRIC_COLUMNS_CLS, 'text-[10px]')}>
+              <button
+                type="button"
+                onClick={() => setSortOption('cpu')}
+                className={cn(
+                  CPU_COLUMN_CLS,
+                  'hover:text-foreground transition-colors',
+                  sortOption === 'cpu'
+                    ? 'font-semibold text-foreground'
+                    : 'text-muted-foreground/80'
+                )}
+                aria-pressed={sortOption === 'cpu'}
+              >
+                {translate(
+                  'auto.components.status.bar.ResourceUsageStatusSegment.298f4be7f2',
+                  'CPU'
+                )}
+              </button>
+              <button
+                type="button"
+                onClick={() => setSortOption('memory')}
+                className={cn(
+                  MEM_COLUMN_CLS,
+                  'hover:text-foreground transition-colors',
+                  sortOption === 'memory'
+                    ? 'font-semibold text-foreground'
+                    : 'text-muted-foreground/80'
+                )}
+                aria-pressed={sortOption === 'memory'}
+              >
+                {memoryMetricCopy.columnLabel}
+              </button>
+            </div>
+            {/* Why: empty trailing gutter keeps CPU/Memory header cells aligned with rows that reserve this width for the kill-X. */}
+            <span className={ROW_TRAILING_GUTTER_CLS} aria-hidden />
+          </div>
+        </div>
+      )}
+
+      <div className="flex-1 overflow-y-auto scrollbar-sleek">
+        {unifiedRepos.length > 0 && (
+          <ResourceTree
+            repos={unifiedRepos}
+            sortOption={sortOption}
+            collapsedRepos={collapsedRepos}
+            toggleRepo={toggleRepo}
+            collapsedWorktrees={collapsedWorktrees}
+            activeWorktreeId={activeWorktreeId}
+            toggleWorktree={toggleWorktree}
+            navigateToWorktree={navigateToWorktree}
+            navigateToTab={navigateToTab}
+            onDelete={deleteWorktree}
+            onKillSession={handleKillSession}
+          />
+        )}
+
+        {unifiedRepos.length === 0 && resourceSnapshot && (
+          <div className="px-3 py-4 text-center text-xs text-muted-foreground">
+            {translate(
+              'auto.components.status.bar.ResourceUsageStatusSegment.27a74f91f0',
+              'Nothing running right now'
+            )}
+          </div>
+        )}
+
+        {resourceSnapshot && (
+          <AppSection
+            app={resourceSnapshot.app}
+            isCollapsed={appCollapsed}
+            onToggle={() => setAppCollapsed((v) => !v)}
+          />
+        )}
+
+        {!resourceSnapshot && !daemonUnreachable && (
+          <div className="px-3 py-4 text-center text-xs text-muted-foreground">
+            {translate(
+              'auto.components.status.bar.ResourceUsageStatusSegment.888dad8c55',
+              'Loading…'
+            )}
+          </div>
+        )}
+      </div>
+    </div>
+  )
+}
+
+export function renderResourceUsagePopoverFooter({
+  handleOpenWorkspaceCleanup,
+  orphanCount,
+  handleKillOrphans
+}: {
+  handleOpenWorkspaceCleanup: () => void
+  orphanCount: number
+  handleKillOrphans: () => Promise<void>
+}): React.JSX.Element {
+  return (
+    <div className="border-t border-border/50 px-3 py-2 shrink-0">
+      <button
+        type="button"
+        onClick={handleOpenWorkspaceCleanup}
+        className="relative inline-flex w-full items-center justify-center rounded-md border border-border/70 px-2.5 py-1.5 text-xs font-medium text-foreground transition-colors hover:bg-accent/60"
+      >
+        <span className="min-w-0 truncate px-4 text-center">
+          {translate(
+            'auto.components.status.bar.ResourceUsageStatusSegment.92924a14e3',
+            'Clean up workspaces'
+          )}
+        </span>
+        <ChevronRight className="absolute right-2.5 size-3.5 text-muted-foreground" aria-hidden />
+      </button>
+      {orphanCount > 0 ? (
+        <button
+          type="button"
+          onClick={() => void handleKillOrphans()}
+          className="mt-2 inline-flex w-full items-center justify-center rounded-md border border-border/70 px-2.5 py-1.5 text-xs font-medium text-foreground transition-colors hover:bg-accent/60"
+        >
+          {orphanCount === 1
+            ? translate(
+                'auto.components.status.bar.ResourceUsageStatusSegment.c7e3b1a0d9f2',
+                'End {{value0}} orphan terminal',
+                { value0: orphanCount }
+              )
+            : translate(
+                'auto.components.status.bar.ResourceUsageStatusSegment.d8f4c2b1e0a3',
+                'End {{value0}} orphan terminals',
+                { value0: orphanCount }
+              )}
+        </button>
+      ) : null}
+    </div>
+  )
+}
diff --git a/src/renderer/src/components/status-bar/resource-usage-popover-summary.tsx b/src/renderer/src/components/status-bar/resource-usage-popover-summary.tsx
new file mode 100644
index 00000000000..6901ae19a0f
--- /dev/null
+++ b/src/renderer/src/components/status-bar/resource-usage-popover-summary.tsx
@@ -0,0 +1,226 @@
+import React from 'react'
+import { AlertTriangle, MemoryStick, RotateCw, Trash2 } from 'lucide-react'
+import { Button } from '@/components/ui/button'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
+import { cn } from '@/lib/utils'
+import { translate } from '@/i18n/i18n'
+import type { DaemonActionsApi } from '../shared/useDaemonActions'
+import type {
+  getResourceCommitMetricCopy,
+  getResourceMemoryMetricCopy
+} from './resource-memory-metric-copy'
+import { formatCpu, formatMemory } from './resource-usage-metrics'
+
+export function renderResourceUsagePopoverHeader({
+  daemonActions
+}: {
+  daemonActions: DaemonActionsApi
+}): React.JSX.Element {
+  return (
+    <div className="flex items-center justify-between gap-2 border-b border-border px-3 py-1.5">
+      <div className="flex min-w-0 items-center gap-1.5 text-[11px] font-medium text-foreground">
+        <MemoryStick className="size-3 shrink-0 text-muted-foreground" />
+        <span className="truncate">
+          {translate('auto.components.status.bar.StatusBar.d1e1a7a6bf', 'Resource Manager')}
+        </span>
+      </div>
+
+      <div className="flex items-center gap-0.5">
+        <Tooltip delayDuration={200}>
+          <TooltipTrigger asChild>
+            <button
+              type="button"
+              onClick={() => daemonActions.setPending('restart')}
+              disabled={daemonActions.isBusy}
+              aria-label={translate(
+                'auto.components.status.bar.ResourceUsageStatusSegment.c9382662bb',
+                'Restart daemon'
+              )}
+              className="inline-flex size-6 items-center justify-center rounded text-muted-foreground transition-colors hover:bg-accent hover:text-foreground disabled:opacity-40"
+            >
+              <RotateCw className="size-3" />
+            </button>
+          </TooltipTrigger>
+          <TooltipContent side="top" sideOffset={6}>
+            {translate(
+              'auto.components.status.bar.ResourceUsageStatusSegment.c9382662bb',
+              'Restart daemon'
+            )}
+          </TooltipContent>
+        </Tooltip>
+        <Tooltip delayDuration={200}>
+          <TooltipTrigger asChild>
+            <button
+              type="button"
+              onClick={() => daemonActions.setPending('killAll')}
+              disabled={daemonActions.isBusy}
+              aria-label={translate(
+                'auto.components.status.bar.ResourceUsageStatusSegment.bd19fd7a59',
+                'Kill all sessions'
+              )}
+              className="inline-flex size-6 items-center justify-center rounded text-muted-foreground transition-colors hover:bg-destructive/10 hover:text-destructive disabled:opacity-40"
+            >
+              <Trash2 className="size-3" />
+            </button>
+          </TooltipTrigger>
+          <TooltipContent side="top" sideOffset={6}>
+            {translate(
+              'auto.components.status.bar.ResourceUsageStatusSegment.bd19fd7a59',
+              'Kill all sessions'
+            )}
+          </TooltipContent>
+        </Tooltip>
+      </div>
+    </div>
+  )
+}
+
+export function renderDaemonUnreachableBanner({
+  daemonActions
+}: {
+  daemonActions: DaemonActionsApi
+}): React.JSX.Element {
+  return (
+    <div className="flex items-start gap-2 border-b border-border bg-yellow-500/10 px-3 py-2 text-[11px] text-foreground">
+      <AlertTriangle className="mt-0.5 size-3 shrink-0 text-yellow-500" />
+      <div className="flex-1">
+        <div className="font-medium">
+          {translate(
+            'auto.components.status.bar.ResourceUsageStatusSegment.f8e0d794b4',
+            'Daemon is not responding'
+          )}
+        </div>
+        <div className="text-muted-foreground">
+          {translate(
+            'auto.components.status.bar.ResourceUsageStatusSegment.f85af9cda6',
+            'Resource snapshots and terminal sessions are unavailable.'
+          )}
+        </div>
+      </div>
+      <Button
+        variant="outline"
+        size="sm"
+        className="shrink-0"
+        onClick={() => daemonActions.setPending('restart')}
+        disabled={daemonActions.isBusy}
+      >
+        <RotateCw className="mr-1 size-3" />
+        {translate('auto.components.status.bar.ResourceUsageStatusSegment.93b0de3c21', 'Restart')}
+      </Button>
+    </div>
+  )
+}
+
+export function renderSessionsOnlyErrorBanner(): React.JSX.Element {
+  return (
+    <div
+      className="flex items-center gap-2 border-b border-border bg-muted/40 px-3 py-1.5 text-[11px] text-muted-foreground"
+      role="status"
+    >
+      <AlertTriangle className="size-3 shrink-0 text-yellow-500" />
+      <span>
+        {translate(
+          'auto.components.status.bar.ResourceUsageStatusSegment.e7cf14ec78',
+          'Terminal sessions unavailable. The list may be stale.'
+        )}
+      </span>
+    </div>
+  )
+}
+
+export function renderResourceUsageSummary({
+  totalCpu,
+  totalMemory,
+  memoryMetricCopy,
+  commitBadgeLabel,
+  commitMetricCopy,
+  commitToneClass,
+  orphanCount
+}: {
+  totalCpu: number
+  totalMemory: number
+  memoryMetricCopy: ReturnType<typeof getResourceMemoryMetricCopy>
+  commitBadgeLabel: string | null
+  commitMetricCopy: ReturnType<typeof getResourceCommitMetricCopy> | null
+  commitToneClass: string | null
+  orphanCount: number
+}): React.JSX.Element {
+  return (
+    <div className="px-3 py-2 border-b border-border flex items-baseline justify-between gap-3 text-xs tabular-nums">
+      <div className="flex items-baseline gap-3 min-w-0">
+        <Tooltip delayDuration={200}>
+          <TooltipTrigger asChild>
+            <span
+              tabIndex={0}
+              className="font-medium text-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring focus-visible:rounded"
+            >
+              {formatCpu(totalCpu)}
+            </span>
+          </TooltipTrigger>
+          <TooltipContent side="top" sideOffset={6} className="z-[70] max-w-xs">
+            {translate(
+              'auto.components.status.bar.ResourceUsageStatusSegment.1fedf94eae',
+              'Combined CPU load. Values above 100% mean more than one core is working at once.'
+            )}
+          </TooltipContent>
+        </Tooltip>
+        <span className="text-muted-foreground/50">·</span>
+        <Tooltip delayDuration={200}>
+          <TooltipTrigger asChild>
+            <span
+              tabIndex={0}
+              className="font-medium text-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring focus-visible:rounded"
+            >
+              {formatMemory(totalMemory)}{' '}
+              <span className="font-normal text-muted-foreground">
+                {memoryMetricCopy.summaryLabel}
+              </span>
+            </span>
+          </TooltipTrigger>
+          <TooltipContent side="top" sideOffset={6} className="z-[70] max-w-xs">
+            {memoryMetricCopy.description}
+          </TooltipContent>
+        </Tooltip>
+        {commitBadgeLabel && commitMetricCopy && (
+          <>
+            <span className="text-muted-foreground/50">·</span>
+            <Tooltip delayDuration={200}>
+              <TooltipTrigger asChild>
+                <span
+                  tabIndex={0}
+                  className={cn(
+                    'font-medium focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring focus-visible:rounded',
+                    commitToneClass ?? 'text-foreground'
+                  )}
+                >
+                  {commitBadgeLabel}{' '}
+                  <span className="font-normal text-muted-foreground">
+                    {commitMetricCopy.summaryLabel}
+                  </span>
+                </span>
+              </TooltipTrigger>
+              <TooltipContent side="top" sideOffset={6} className="z-[70] max-w-xs">
+                {commitMetricCopy.description}
+              </TooltipContent>
+            </Tooltip>
+          </>
+        )}
+      </div>
+      {orphanCount > 0 && (
+        <span className="shrink-0 text-yellow-500" aria-live="polite">
+          {orphanCount === 1
+            ? translate(
+                'auto.components.status.bar.ResourceUsageStatusSegment.30ff2c3c31',
+                '{{value0}} orphan',
+                { value0: orphanCount }
+              )
+            : translate(
+                'auto.components.status.bar.ResourceUsageStatusSegment.b8f4a2c1d0e3',
+                '{{value0}} orphans',
+                { value0: orphanCount }
+              )}
+        </span>
+      )}
+    </div>
+  )
+}
diff --git a/src/renderer/src/components/status-bar/resource-usage-resource-tree.tsx b/src/renderer/src/components/status-bar/resource-usage-resource-tree.tsx
new file mode 100644
index 00000000000..4f4c57cd07b
--- /dev/null
+++ b/src/renderer/src/components/status-bar/resource-usage-resource-tree.tsx
@@ -0,0 +1,173 @@
+import React, { useMemo } from 'react'
+import { ChevronDown, ChevronRight } from 'lucide-react'
+import { translate } from '@/i18n/i18n'
+import { useWorktreeMap } from '../../store/selectors'
+import type {
+  Metric,
+  UnifiedProjectGroup,
+  UnifiedSessionRow,
+  UnifiedWorktreeRow
+} from './resource-usage-merge-types'
+import { MetricPair, ROW_TRAILING_GUTTER_CLS } from './resource-usage-metrics'
+import { WorktreeRow } from './resource-usage-session-rows'
+
+export type SortOption = 'memory' | 'cpu' | 'name'
+
+// ─── Sorting ────────────────────────────────────────────────────────
+
+function compareMetricDesc(a: Metric, b: Metric): number {
+  // Why: null metrics (remote rows) sort last regardless of direction so they don't pollute the "biggest consumers" view.
+  if (a === null && b === null) {
+    return 0
+  }
+  if (a === null) {
+    return 1
+  }
+  if (b === null) {
+    return -1
+  }
+  return b - a
+}
+
+function sortWorktrees(list: UnifiedWorktreeRow[], sort: SortOption): UnifiedWorktreeRow[] {
+  const copy = [...list]
+  if (sort === 'memory') {
+    copy.sort((a, b) => compareMetricDesc(a.memory, b.memory))
+  } else if (sort === 'cpu') {
+    copy.sort((a, b) => compareMetricDesc(a.cpu, b.cpu))
+  } else {
+    copy.sort((a, b) => a.worktreeName.localeCompare(b.worktreeName))
+  }
+  return copy
+}
+
+function sortProjectGroups(groups: UnifiedProjectGroup[], sort: SortOption): UnifiedProjectGroup[] {
+  const copy = [...groups]
+  if (sort === 'memory') {
+    copy.sort((a, b) => compareMetricDesc(a.memory, b.memory))
+  } else if (sort === 'cpu') {
+    copy.sort((a, b) => compareMetricDesc(a.cpu, b.cpu))
+  } else {
+    copy.sort((a, b) => a.repoName.localeCompare(b.repoName))
+  }
+  return copy
+}
+
+// ─── Repo + worktree tree ───────────────────────────────────────────
+
+export function ResourceTree({
+  repos,
+  sortOption,
+  collapsedRepos,
+  toggleRepo,
+  collapsedWorktrees,
+  activeWorktreeId,
+  toggleWorktree,
+  navigateToWorktree,
+  navigateToTab,
+  onDelete,
+  onKillSession
+}: {
+  repos: UnifiedProjectGroup[]
+  sortOption: SortOption
+  collapsedRepos: Set<string>
+  toggleRepo: (repoId: string) => void
+  collapsedWorktrees: Set<string>
+  activeWorktreeId: string | null
+  toggleWorktree: (worktreeId: string) => void
+  navigateToWorktree: (worktreeId: string) => void
+  navigateToTab: (tabId: string, paneKey: string | null) => void
+  onDelete: (worktreeId: string) => void
+  onKillSession: (session: UnifiedSessionRow) => void
+}): React.JSX.Element {
+  const worktreeById = useWorktreeMap()
+
+  const sortedRepos = useMemo(() => {
+    const grouped = sortProjectGroups(repos, sortOption)
+    return grouped.map((repo) => ({
+      ...repo,
+      worktrees: sortWorktrees(repo.worktrees, sortOption)
+    }))
+  }, [repos, sortOption])
+
+  const renderWorktree = (wt: UnifiedWorktreeRow): React.JSX.Element => {
+    const storeRecord = worktreeById.get(wt.worktreeId) ?? null
+    return (
+      <WorktreeRow
+        key={wt.worktreeId}
+        worktree={wt}
+        storeRecord={storeRecord}
+        activeWorktreeId={activeWorktreeId}
+        isCollapsed={collapsedWorktrees.has(wt.worktreeId)}
+        onToggle={() => toggleWorktree(wt.worktreeId)}
+        onNavigate={() => navigateToWorktree(wt.worktreeId)}
+        onDelete={() => onDelete(wt.worktreeId)}
+        onKillSession={onKillSession}
+        navigateToTab={navigateToTab}
+      />
+    )
+  }
+
+  if (sortedRepos.length === 1) {
+    return <>{sortedRepos[0].worktrees.map(renderWorktree)}</>
+  }
+
+  return (
+    <>
+      {sortedRepos.map((group) => {
+        const repoCollapsed = collapsedRepos.has(group.repoId)
+        return (
+          <div key={group.repoId} className="border-b border-border/50 last:border-b-0">
+            <div className="flex items-center">
+              <button
+                type="button"
+                onClick={() => toggleRepo(group.repoId)}
+                className="pl-2 py-2 pr-0.5 transition-colors hover:bg-muted/50"
+                aria-label={
+                  repoCollapsed
+                    ? translate(
+                        'auto.components.status.bar.ResourceUsageStatusSegment.b12e31dfcb',
+                        'Expand repo'
+                      )
+                    : translate(
+                        'auto.components.status.bar.ResourceUsageStatusSegment.73a3fd68a9',
+                        'Collapse repo'
+                      )
+                }
+              >
+                {repoCollapsed ? (
+                  <ChevronRight className="h-3 w-3 text-muted-foreground" />
+                ) : (
+                  <ChevronDown className="h-3 w-3 text-muted-foreground" />
+                )}
+              </button>
+              <div className="flex-1 min-w-0 py-2 pr-3 flex items-center justify-between gap-2">
+                <span className="flex items-center gap-1.5 min-w-0">
+                  <span className="text-[11px] font-semibold uppercase tracking-wide truncate text-muted-foreground">
+                    {group.repoName}
+                  </span>
+                  {group.hasRemoteChildren && (
+                    <span className="shrink-0 text-[9px] uppercase tracking-wide text-muted-foreground/70">
+                      {translate(
+                        'auto.components.status.bar.ResourceUsageStatusSegment.21cacb16d1',
+                        '· remote'
+                      )}
+                    </span>
+                  )}
+                </span>
+                <div className="flex items-center gap-2 shrink-0">
+                  <MetricPair cpu={group.cpu} memory={group.memory} />
+                  <span className={ROW_TRAILING_GUTTER_CLS} aria-hidden />
+                </div>
+              </div>
+            </div>
+
+            {!repoCollapsed && (
+              <div className="border-t border-border/30">{group.worktrees.map(renderWorktree)}</div>
+            )}
+          </div>
+        )
+      })}
+    </>
+  )
+}
diff --git a/src/renderer/src/components/status-bar/resource-usage-session-rows.tsx b/src/renderer/src/components/status-bar/resource-usage-session-rows.tsx
new file mode 100644
index 00000000000..3efa332c294
--- /dev/null
+++ b/src/renderer/src/components/status-bar/resource-usage-session-rows.tsx
@@ -0,0 +1,266 @@
+import React from 'react'
+import { ChevronDown, ChevronRight, Globe, Trash2, X } from 'lucide-react'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
+import { cn } from '@/lib/utils'
+import { translate } from '@/i18n/i18n'
+import type { BrowserWorkspace } from '../../../../shared/browser-workspace-types'
+import { ORPHAN_WORKTREE_ID } from '../../../../shared/constants'
+import type { Worktree } from '../../../../shared/worktree/types'
+import { UNATTRIBUTED_REPO_ID } from './mergeSnapshotAndSessions'
+import type { UnifiedSessionRow, UnifiedWorktreeRow } from './resource-usage-merge-types'
+import { MetricPair, ROW_TRAILING_GUTTER_CLS, Sparkline } from './resource-usage-metrics'
+import { isResourceSessionActivationKey } from './resource-session-navigation'
+
+// ─── Session row ────────────────────────────────────────────────────
+
+// Exported (with WorktreeRow) for row-level regression tests pinning the kill affordance and remote-chip presentation.
+export function SessionRow({
+  session,
+  worktreeId,
+  onNavigate,
+  onKill
+}: {
+  session: UnifiedSessionRow
+  worktreeId: string
+  onNavigate: (tabId: string, paneKey: string | null) => void
+  onKill: (session: UnifiedSessionRow) => void
+}): React.JSX.Element {
+  const clickable = session.tabId !== null && session.bound
+  const handleClick = (): void => {
+    if (clickable && session.tabId) {
+      onNavigate(session.tabId, session.paneKey)
+    }
+  }
+
+  return (
+    <div
+      className={cn(
+        'group/sessrow flex items-center gap-2 pl-10 pr-3 py-1.5',
+        clickable && 'cursor-pointer hover:bg-accent/40'
+      )}
+      onClick={clickable ? handleClick : undefined}
+      role={clickable ? 'button' : undefined}
+      tabIndex={clickable ? 0 : -1}
+      onKeyDown={
+        clickable
+          ? (e) => {
+              if (isResourceSessionActivationKey(e.key)) {
+                e.preventDefault()
+                handleClick()
+              }
+            }
+          : undefined
+      }
+      data-worktree-id={worktreeId}
+    >
+      <span
+        className={cn(
+          'size-1.5 shrink-0 rounded-full',
+          session.bound ? 'bg-emerald-500' : 'bg-muted-foreground/40'
+        )}
+      />
+      <span className="text-[11px] text-muted-foreground truncate min-w-0 flex-1">
+        {session.label}
+      </span>
+      <MetricPair cpu={session.cpu} memory={session.memory} size="small" />
+      {/* Why: kill X sits in the shared gutter for column alignment; bound rows reveal it on hover/focus, orphan rows always show it as reclaimable. */}
+      <span className={ROW_TRAILING_GUTTER_CLS}>
+        <button
+          type="button"
+          onClick={(e) => {
+            e.stopPropagation()
+            onKill(session)
+          }}
+          className={cn(
+            'rounded p-0.5 text-muted-foreground transition-opacity hover:bg-destructive/10 hover:text-destructive',
+            session.bound &&
+              'can-hover:opacity-0 group-hover/sessrow:opacity-100 group-focus-within/sessrow:opacity-100 focus-visible:opacity-100'
+          )}
+          aria-label={translate(
+            'auto.components.status.bar.ResourceUsageStatusSegment.fa6d36758d',
+            'Kill session {{value0}}',
+            { value0: session.sessionId }
+          )}
+        >
+          <X className="size-3" />
+        </button>
+      </span>
+    </div>
+  )
+}
+
+function BrowserRow({ browser }: { browser: BrowserWorkspace }): React.JSX.Element {
+  const label = browser.title?.trim() || browser.label?.trim() || browser.url
+  return (
+    <div className="flex items-center gap-2 pl-10 pr-3 py-1.5">
+      <Globe className="size-3 shrink-0 text-muted-foreground" aria-hidden />
+      <span className="min-w-0 flex-1 truncate text-[11px] text-muted-foreground">{label}</span>
+      <MetricPair cpu={null} memory={null} size="small" />
+      <span className={ROW_TRAILING_GUTTER_CLS} aria-hidden />
+    </div>
+  )
+}
+
+// ─── Worktree row ───────────────────────────────────────────────────
+
+export function WorktreeRow({
+  worktree,
+  storeRecord,
+  activeWorktreeId,
+  isCollapsed,
+  onToggle,
+  onNavigate,
+  onDelete,
+  onKillSession,
+  navigateToTab
+}: {
+  worktree: UnifiedWorktreeRow
+  storeRecord: Worktree | null
+  activeWorktreeId: string | null
+  isCollapsed: boolean
+  onToggle: () => void
+  onNavigate: () => void
+  onDelete: () => void
+  onKillSession: (session: UnifiedSessionRow) => void
+  navigateToTab: (tabId: string, paneKey: string | null) => void
+}): React.JSX.Element {
+  const hasResources = worktree.sessions.length > 0 || worktree.browsers.length > 0
+  // Why: synthetic buckets (orphan/unattributed) have no sidebar target to reveal; real and SSH-resolved worktrees stay navigable.
+  const isSynthetic =
+    worktree.worktreeId === ORPHAN_WORKTREE_ID || worktree.repoId === UNATTRIBUTED_REPO_ID
+  const isNavigable = !isSynthetic
+  // Why: Delete needs a sidebar worktree record; hidden for synthetic/SSH-only rows and the active worktree, but the row stays navigable.
+  const showWorktreeActions =
+    !isSynthetic && storeRecord !== null && worktree.worktreeId !== activeWorktreeId
+  const isMainWorktree = storeRecord?.isMainWorktree ?? false
+  const rowLabel = storeRecord?.displayName?.trim() || worktree.worktreeName
+
+  return (
+    <div className="border-b border-border/20 last:border-b-0">
+      <div className="group/wtrow flex items-center ml-2 transition-colors hover:bg-muted/60">
+        {hasResources ? (
+          <button
+            type="button"
+            onClick={onToggle}
+            className="pl-2 py-2 pr-0.5 shrink-0"
+            aria-label={
+              isCollapsed
+                ? translate(
+                    'auto.components.status.bar.ResourceUsageStatusSegment.c4a8968bdd',
+                    'Expand workspace'
+                  )
+                : translate(
+                    'auto.components.status.bar.ResourceUsageStatusSegment.bbcd9b7b85',
+                    'Collapse workspace'
+                  )
+            }
+          >
+            {isCollapsed ? (
+              <ChevronRight className="h-3 w-3 text-muted-foreground" />
+            ) : (
+              <ChevronDown className="h-3 w-3 text-muted-foreground" />
+            )}
+          </button>
+        ) : (
+          <span
+            className="pl-2 py-2 pr-0.5 shrink-0 w-[calc(0.5rem+0.75rem+0.125rem)]"
+            aria-hidden
+          />
+        )}
+        <button
+          type="button"
+          onClick={onNavigate}
+          aria-label={translate(
+            'auto.components.status.bar.ResourceUsageStatusSegment.d659d71d2d',
+            'Resume workspace {{value0}}',
+            { value0: rowLabel }
+          )}
+          className="flex-1 min-w-0 py-2 pr-2 pl-1 text-left flex items-center gap-1.5"
+          disabled={!isNavigable}
+        >
+          <span className="text-xs font-medium truncate">{rowLabel}</span>
+          {/* Why: gate the chip on SSH connectionId, not missing data — warm-reattached local PTYs land here with hasLocalSamples=false. */}
+          {worktree.isRemote && (
+            <span className="shrink-0 text-[9px] uppercase tracking-wide text-muted-foreground/70">
+              {translate(
+                'auto.components.status.bar.ResourceUsageStatusSegment.21cacb16d1',
+                '· remote'
+              )}
+            </span>
+          )}
+        </button>
+        <div className="flex items-center gap-2 shrink-0 pr-3">
+          <div className="relative">
+            {/* Why: no-hover devices show the action overlay by default, so the sparkline yields there just like on hover. */}
+            <span
+              className={cn(
+                'block transition-opacity',
+                showWorktreeActions &&
+                  'group-hover/wtrow:opacity-0 group-hover/wtrow:pointer-events-none group-focus-within/wtrow:opacity-0 group-focus-within/wtrow:pointer-events-none [@media(hover:none)]:opacity-0 [@media(hover:none)]:pointer-events-none'
+              )}
+              aria-hidden={showWorktreeActions ? undefined : true}
+            >
+              <Sparkline samples={worktree.history} />
+            </span>
+            {showWorktreeActions && (
+              <div className="absolute inset-0 flex items-center justify-end gap-0.5 can-hover:opacity-0 can-hover:pointer-events-none transition-opacity group-hover/wtrow:opacity-100 group-hover/wtrow:pointer-events-auto group-focus-within/wtrow:opacity-100 group-focus-within/wtrow:pointer-events-auto">
+                <Tooltip delayDuration={300}>
+                  <TooltipTrigger asChild>
+                    <button
+                      type="button"
+                      onClick={onDelete}
+                      disabled={isMainWorktree}
+                      aria-label={translate(
+                        'auto.components.status.bar.ResourceUsageStatusSegment.16bc3c998a',
+                        'Delete workspace {{value0}}',
+                        { value0: rowLabel }
+                      )}
+                      className={cn(
+                        'p-0.5 rounded text-muted-foreground transition-colors',
+                        isMainWorktree
+                          ? 'opacity-40 cursor-not-allowed'
+                          : 'hover:bg-destructive/10 hover:text-destructive'
+                      )}
+                    >
+                      <Trash2 className="size-3" />
+                    </button>
+                  </TooltipTrigger>
+                  <TooltipContent
+                    side="top"
+                    sideOffset={4}
+                    className="z-[70] max-w-[200px] text-pretty"
+                  >
+                    {isMainWorktree
+                      ? translate(
+                          'auto.components.status.bar.ResourceUsageStatusSegment.946724a70a',
+                          'The main workspace cannot be deleted.'
+                        )
+                      : translate(
+                          'auto.components.status.bar.ResourceUsageStatusSegment.a82253b458',
+                          'Delete workspace.'
+                        )}
+                  </TooltipContent>
+                </Tooltip>
+              </div>
+            )}
+          </div>
+          <MetricPair cpu={worktree.cpu} memory={worktree.memory} />
+          <span className={ROW_TRAILING_GUTTER_CLS} aria-hidden />
+        </div>
+      </div>
+
+      {!isCollapsed &&
+        worktree.sessions.map((session) => (
+          <SessionRow
+            key={session.sessionId}
+            session={session}
+            worktreeId={worktree.worktreeId}
+            onNavigate={navigateToTab}
+            onKill={onKillSession}
+          />
+        ))}
+      {!isCollapsed &&
+        worktree.browsers.map((browser) => <BrowserRow key={browser.id} browser={browser} />)}
+    </div>
+  )
+}
diff --git a/src/renderer/src/components/status-bar/resource-usage-status-trigger.tsx b/src/renderer/src/components/status-bar/resource-usage-status-trigger.tsx
new file mode 100644
index 00000000000..c5cb328b2ef
--- /dev/null
+++ b/src/renderer/src/components/status-bar/resource-usage-status-trigger.tsx
@@ -0,0 +1,105 @@
+import React from 'react'
+import { AlertTriangle, MemoryStick, Terminal } from 'lucide-react'
+import { PopoverTrigger } from '@/components/ui/popover'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
+import { cn } from '@/lib/utils'
+import { translate } from '@/i18n/i18n'
+import { STATUS_BAR_CONTEXT_MENU_EXEMPT_PROPS } from './status-bar-context-menu-policy'
+
+export function renderResourceUsageStatusTrigger({
+  daemonUnreachable,
+  resourceManagerAriaLabel,
+  spaceScanReady,
+  iconOnly,
+  commitToneClass,
+  memBadgeLabel,
+  triggerSessionCount,
+  orphanCount,
+  resourceManagerTooltipLines
+}: {
+  daemonUnreachable: boolean
+  resourceManagerAriaLabel: string
+  spaceScanReady: boolean
+  iconOnly: boolean
+  commitToneClass: string | null
+  memBadgeLabel: string
+  triggerSessionCount: number
+  orphanCount: number
+  resourceManagerTooltipLines: { id: string; text: string; emphasized: boolean }[]
+}): React.JSX.Element {
+  return (
+    <Tooltip delayDuration={150}>
+      <TooltipTrigger asChild>
+        <PopoverTrigger asChild>
+          <button
+            type="button"
+            {...STATUS_BAR_CONTEXT_MENU_EXEMPT_PROPS}
+            className="relative inline-flex items-center gap-1.5 cursor-pointer rounded px-1 py-0.5 hover:bg-accent/70"
+            aria-label={
+              daemonUnreachable
+                ? translate(
+                    'auto.components.status.bar.ResourceUsageStatusSegment.59f178fe11',
+                    '{{value0}}, daemon unreachable',
+                    { value0: resourceManagerAriaLabel }
+                  )
+                : resourceManagerAriaLabel
+            }
+          >
+            {spaceScanReady ? (
+              <span
+                className="absolute -right-0.5 -top-0.5 size-1.5 rounded-full bg-primary"
+                aria-hidden="true"
+              />
+            ) : null}
+            <MemoryStick className="size-3 text-muted-foreground" />
+            {!iconOnly && (
+              <>
+                {/* Tint only: the number stays the resident sum it has always been,
+                    and the tooltip names the commit figure that raised the tone. */}
+                <span
+                  className={cn(
+                    'text-[11px] font-medium tabular-nums',
+                    commitToneClass ?? 'text-muted-foreground'
+                  )}
+                >
+                  {memBadgeLabel}
+                </span>
+                <span className="text-muted-foreground/50">·</span>
+                <Terminal className="size-3 text-muted-foreground" />
+                <span className="text-[11px] tabular-nums text-muted-foreground">
+                  {triggerSessionCount}
+                  {orphanCount > 0 && (
+                    <span className="text-yellow-500 ml-0.5">({orphanCount})</span>
+                  )}
+                </span>
+              </>
+            )}
+            {iconOnly && triggerSessionCount > 0 && (
+              <span className="text-[11px] tabular-nums text-muted-foreground">
+                {triggerSessionCount}
+              </span>
+            )}
+            {daemonUnreachable && (
+              <AlertTriangle
+                className="size-3 text-yellow-500"
+                aria-label={translate(
+                  'auto.components.status.bar.ResourceUsageStatusSegment.ca95d077db',
+                  'Daemon unreachable'
+                )}
+              />
+            )}
+          </button>
+        </PopoverTrigger>
+      </TooltipTrigger>
+      <TooltipContent side="top" sideOffset={6}>
+        <div className="space-y-0.5">
+          {resourceManagerTooltipLines.map((line) => (
+            <div key={line.id} className={line.emphasized ? 'text-primary' : ''}>
+              {line.text}
+            </div>
+          ))}
+        </div>
+      </TooltipContent>
+    </Tooltip>
+  )
+}
diff --git a/src/renderer/src/components/status-bar/use-resource-usage-actions.ts b/src/renderer/src/components/status-bar/use-resource-usage-actions.ts
new file mode 100644
index 00000000000..bbd9223611f
--- /dev/null
+++ b/src/renderer/src/components/status-bar/use-resource-usage-actions.ts
@@ -0,0 +1,231 @@
+import { useCallback, type Dispatch, type MutableRefObject, type SetStateAction } from 'react'
+import { activateAndRevealWorktree } from '@/lib/worktree-activation'
+import { activateTabAndFocusPane } from '@/lib/activate-tab-and-focus-pane'
+import { useAppStore } from '../../store'
+import type { AppState } from '../../store/types'
+import { getAllWorktreesFromState } from '../../store/selectors'
+import { runWorktreeDelete } from '../sidebar/delete-worktree-flow'
+import { ORPHAN_WORKTREE_ID } from '../../../../shared/constants'
+import { UNATTRIBUTED_REPO_ID } from './mergeSnapshotAndSessions'
+import type { DaemonSession, UnifiedSessionRow } from './resource-usage-merge-types'
+import type { ResourceSessionBindingInputs } from './resource-session-bindings'
+import { selectUnboundDaemonSessions } from './resource-session-bindings'
+import { navigateResourceSessionToTab } from './resource-session-navigation'
+import { requiresKillConfirmation } from './resource-session-kill-confirmation'
+import { resolveResourceManagerWorktreeTarget } from './resource-manager-worktree-target'
+
+export function useResourceUsageActions({
+  setCollapsedRepos,
+  setCollapsedWorktrees,
+  tabsByWorktree,
+  setOpen,
+  setActiveView,
+  openModal,
+  openSpacePage,
+  refreshSessions,
+  removeSession,
+  removeSessions,
+  sessions,
+  resourceSessionBindings,
+  workspaceSessionReady,
+  killConfirm,
+  setKillConfirm,
+  setKilling,
+  mountedRef,
+  cancelPopoverBodyFocusFrame,
+  popoverBodyRef,
+  popoverBodyFocusFrameRef
+}: {
+  setCollapsedRepos: Dispatch<SetStateAction<Set<string>>>
+  setCollapsedWorktrees: Dispatch<SetStateAction<Set<string>>>
+  tabsByWorktree: AppState['tabsByWorktree']
+  setOpen: Dispatch<SetStateAction<boolean>>
+  setActiveView: AppState['setActiveView']
+  openModal: AppState['openModal']
+  openSpacePage: AppState['openSpacePage']
+  refreshSessions: () => Promise<void>
+  removeSession: (sessionId: string) => void
+  removeSessions: (sessionIds: ReadonlySet<string>) => void
+  sessions: readonly DaemonSession[]
+  resourceSessionBindings: ResourceSessionBindingInputs
+  workspaceSessionReady: boolean
+  killConfirm: UnifiedSessionRow | null
+  setKillConfirm: Dispatch<SetStateAction<UnifiedSessionRow | null>>
+  setKilling: Dispatch<SetStateAction<boolean>>
+  mountedRef: MutableRefObject<boolean>
+  cancelPopoverBodyFocusFrame: () => void
+  popoverBodyRef: MutableRefObject<HTMLDivElement | null>
+  popoverBodyFocusFrameRef: MutableRefObject<number | null>
+}) {
+  const toggleRepo = useCallback(
+    (repoId: string): void => {
+      setCollapsedRepos((prev) => {
+        const next = new Set(prev)
+        if (next.has(repoId)) {
+          next.delete(repoId)
+        } else {
+          next.add(repoId)
+        }
+        return next
+      })
+    },
+    [setCollapsedRepos]
+  )
+
+  const toggleWorktree = useCallback(
+    (worktreeId: string): void => {
+      setCollapsedWorktrees((prev) => {
+        const next = new Set(prev)
+        if (next.has(worktreeId)) {
+          next.delete(worktreeId)
+        } else {
+          next.add(worktreeId)
+        }
+        return next
+      })
+    },
+    [setCollapsedWorktrees]
+  )
+
+  // Why: keep popover open on worktree navigation so users can browse; onFocusOutside suppresses the bound-row focus transfer.
+  const navigateToWorktree = useCallback((worktreeId: string): void => {
+    if (worktreeId === ORPHAN_WORKTREE_ID || worktreeId.startsWith(`${UNATTRIBUTED_REPO_ID}::`)) {
+      return
+    }
+    const target = resolveResourceManagerWorktreeTarget(
+      worktreeId,
+      getAllWorktreesFromState(useAppStore.getState())
+    )
+    if (!target) {
+      return
+    }
+    activateAndRevealWorktree(worktreeId, { executionHostId: target.hostId })
+  }, [])
+
+  const navigateToTab = useCallback(
+    (tabId: string, paneKey: string | null) => {
+      navigateResourceSessionToTab(tabId, paneKey, {
+        tabsByWorktree,
+        setOpen,
+        setActiveView,
+        activateAndRevealWorktree,
+        activateTabAndFocusPane
+      })
+    },
+    [tabsByWorktree, setOpen, setActiveView]
+  )
+
+  const deleteWorktree = useCallback(
+    (worktreeId: string): void => {
+      const target = resolveResourceManagerWorktreeTarget(
+        worktreeId,
+        getAllWorktreesFromState(useAppStore.getState())
+      )
+      if (!target) {
+        return
+      }
+      setOpen(false)
+      runWorktreeDelete(worktreeId, { expectedHostId: target.hostId })
+    },
+    [setOpen]
+  )
+
+  const handleOpenWorkspaceCleanup = useCallback((): void => {
+    setOpen(false)
+    queueMicrotask(() => openModal('workspace-cleanup'))
+  }, [openModal, setOpen])
+
+  const handleKillSession = useCallback(
+    (session: UnifiedSessionRow): void => {
+      if (!requiresKillConfirmation(session)) {
+        removeSession(session.sessionId)
+        // Why: await the kill before refreshing, else the refresh re-reads the daemon list before the kill lands and re-adds the row.
+        void (async () => {
+          try {
+            await window.api.pty.kill(session.sessionId)
+          } catch {
+            /* already dead */
+          }
+          await refreshSessions()
+        })()
+        return
+      }
+      setKillConfirm(session)
+    },
+    [refreshSessions, removeSession, setKillConfirm]
+  )
+
+  const handleKillOrphans = useCallback(async () => {
+    if (!workspaceSessionReady) {
+      return
+    }
+    // Why the shared selector: the button's count comes from the same function, so the set killed
+    // is exactly the set advertised. Filtering separately here is how live sessions got killed.
+    const orphans = selectUnboundDaemonSessions(sessions, resourceSessionBindings)
+    if (orphans.length === 0) {
+      return
+    }
+    // Why: optimistic removal so rows disappear immediately instead of waiting for the next daemon-side list refresh.
+    const orphanIds = new Set(orphans.map((s) => s.id))
+    removeSessions(orphanIds)
+    await Promise.allSettled(orphans.map((s) => window.api.pty.kill(s.id)))
+    void refreshSessions()
+  }, [sessions, resourceSessionBindings, workspaceSessionReady, refreshSessions, removeSessions])
+
+  const runKillConfirmed = useCallback(async () => {
+    if (!killConfirm) {
+      return
+    }
+    const target = killConfirm
+    setKilling(true)
+    // Why: optimistic removal avoids a flash where the dialog closes but the killed row lingers until the next list refresh.
+    removeSession(target.sessionId)
+    try {
+      await window.api.pty.kill(target.sessionId)
+    } catch {
+      /* already dead — fall through */
+    } finally {
+      if (mountedRef.current) {
+        setKilling(false)
+        setKillConfirm(null)
+        // Why: killed row unmounts and focus would drop to <body>; park it on the popover body so keyboard users stay in the list.
+        cancelPopoverBodyFocusFrame()
+        if (popoverBodyRef.current) {
+          popoverBodyFocusFrameRef.current = requestAnimationFrame(() => {
+            popoverBodyFocusFrameRef.current = null
+            popoverBodyRef.current?.focus()
+          })
+        }
+        void refreshSessions()
+      }
+    }
+  }, [
+    cancelPopoverBodyFocusFrame,
+    killConfirm,
+    mountedRef,
+    popoverBodyFocusFrameRef,
+    popoverBodyRef,
+    refreshSessions,
+    removeSession,
+    setKillConfirm,
+    setKilling
+  ])
+
+  const openSpaceResults = useCallback((): void => {
+    setOpen(false)
+    openSpacePage()
+  }, [openSpacePage, setOpen])
+
+  return {
+    toggleRepo,
+    toggleWorktree,
+    navigateToWorktree,
+    navigateToTab,
+    deleteWorktree,
+    handleOpenWorkspaceCleanup,
+    handleKillSession,
+    handleKillOrphans,
+    runKillConfirmed,
+    openSpaceResults
+  }
+}
diff --git a/src/renderer/src/components/status-bar/use-resource-usage-derived-model.ts b/src/renderer/src/components/status-bar/use-resource-usage-derived-model.ts
new file mode 100644
index 00000000000..6cf5c780351
--- /dev/null
+++ b/src/renderer/src/components/status-bar/use-resource-usage-derived-model.ts
@@ -0,0 +1,196 @@
+import { useMemo } from 'react'
+import type { AppState } from '../../store/types'
+import type { MemorySnapshot } from '../../../../shared/process-stats-types'
+import type { Worktree } from '../../../../shared/worktree/types'
+import { getRepoExecutionHostId, parseExecutionHostId } from '../../../../shared/execution-host'
+import { mergeSnapshotAndSessions } from './mergeSnapshotAndSessions'
+import type { DaemonSession } from './resource-usage-merge-types'
+import type { ResourceSessionBindingInputs } from './resource-session-bindings'
+import { countUnboundDaemonSessions } from './resource-session-bindings'
+import {
+  getResourceManagerAriaLabel,
+  getResourceManagerTooltipLines
+} from './resource-manager-terminal-copy'
+import {
+  getCommitPressureToneClass,
+  getResourceCommitMetricCopy,
+  getResourceMemoryMetricCopy
+} from './resource-memory-metric-copy'
+import { formatMemory } from './resource-usage-metrics'
+
+export function useResourceUsageDerivedModel({
+  open,
+  resourceSnapshot,
+  sessions,
+  resourceSessionBindings,
+  runtimePaneTitlesByTabId,
+  repos,
+  allWorktrees,
+  browserTabsByWorktree,
+  workspaceSessionReady,
+  sessionCount,
+  sessionsError,
+  memorySnapshotError,
+  snapshot,
+  spaceScanReady
+}: {
+  open: boolean
+  resourceSnapshot: MemorySnapshot | null
+  sessions: readonly DaemonSession[]
+  resourceSessionBindings: ResourceSessionBindingInputs
+  runtimePaneTitlesByTabId: AppState['runtimePaneTitlesByTabId']
+  repos: AppState['repos']
+  allWorktrees: Worktree[]
+  browserTabsByWorktree: AppState['browserTabsByWorktree']
+  workspaceSessionReady: boolean
+  sessionCount: number
+  sessionsError: boolean
+  memorySnapshotError: string | null
+  snapshot: MemorySnapshot | null
+  spaceScanReady: boolean
+}) {
+  const repoDisplayNameById = useMemo(() => {
+    const map = new Map<string, string>()
+    for (const repo of repos) {
+      const display = repo.displayName?.trim()
+      if (display) {
+        map.set(repo.id, display)
+      }
+    }
+    return map
+  }, [repos])
+
+  // Why: non-null connectionId is the only honest "remote" signal (SSH PTYs run remote); build from the store, not a missing memory sample.
+  const repoConnectionIdById = useMemo(() => {
+    const map = new Map<string, string | null>()
+    for (const repo of repos) {
+      map.set(repo.id, repo.connectionId ?? null)
+    }
+    return map
+  }, [repos])
+
+  // Why: runtime-hosted repos have no local daemon samples or killable sessions; this map drives their per-row exclusion in the merge.
+  const repoRuntimeScopedById = useMemo(() => {
+    const map = new Map<string, boolean>()
+    for (const repo of repos) {
+      const parsed = parseExecutionHostId(getRepoExecutionHostId(repo))
+      map.set(repo.id, parsed?.kind === 'runtime')
+    }
+    return map
+  }, [repos])
+
+  const worktreeById = useMemo(
+    () => new Map(allWorktrees.map((worktree) => [worktree.id, worktree])),
+    [allWorktrees]
+  )
+
+  // Why: skip the merge when closed; the always-mounted segment recomputing on every keystroke-driven store mutation made the app laggy.
+  const unifiedRepos = useMemo(
+    () =>
+      open
+        ? mergeSnapshotAndSessions(resourceSnapshot, sessions, {
+            // Why spread: the rows and the bulk selector must classify from the identical binding
+            // inputs. Re-listing them here let the row path miss deferred SSH sessions, so their
+            // single-row kill skipped confirmation while bulk cleanup correctly spared them (#8459).
+            ...resourceSessionBindings,
+            runtimePaneTitlesByTabId,
+            repoDisplayNameById,
+            repoConnectionIdById,
+            repoRuntimeScopedById,
+            browserTabsByWorktree,
+            worktreeById
+          })
+        : [],
+    [
+      open,
+      resourceSnapshot,
+      sessions,
+      resourceSessionBindings,
+      runtimePaneTitlesByTabId,
+      repoDisplayNameById,
+      repoConnectionIdById,
+      repoRuntimeScopedById,
+      browserTabsByWorktree,
+      worktreeById
+    ]
+  )
+
+  // Why: orphan detection needs daemon inventory; keep it open-only so the closed badge never triggers a background global session scan.
+  const orphanCount = useMemo(() => {
+    if (!open || !workspaceSessionReady) {
+      return 0
+    }
+    return countUnboundDaemonSessions(sessions, resourceSessionBindings)
+  }, [open, sessions, resourceSessionBindings, workspaceSessionReady])
+
+  // Why: open and closed badges share the same daemon inventory cache. The old
+  // closed path used boundPtyIds (wake hints) and inflated the chip to 60+.
+  const triggerSessionCount = sessionCount
+
+  const memoryMetricCopy = getResourceMemoryMetricCopy(
+    resourceSnapshot?.processMemoryMetric ?? 'rss'
+  )
+  // Why null-not-zero: a host that cannot read commit (every Unix host, and any
+  // host older than the field) must render nothing here, never "0 B committed".
+  const commitMetricCopy = resourceSnapshot?.processCommitMetric
+    ? getResourceCommitMetricCopy()
+    : null
+  const { totalMemory, totalCpu, memBadgeLabel, totalPrivateMemory, commitToneClass } =
+    useMemo(() => {
+      const memory = resourceSnapshot?.totalMemory ?? 0
+      const cpu = resourceSnapshot?.totalCpu ?? 0
+      const privateMemory = resourceSnapshot?.totalPrivateMemory
+      return {
+        totalMemory: memory,
+        totalCpu: cpu,
+        memBadgeLabel: resourceSnapshot ? formatMemory(memory) : '—',
+        totalPrivateMemory: privateMemory,
+        commitToneClass: getCommitPressureToneClass({
+          privateMemory,
+          hostTotalMemory: resourceSnapshot?.host.totalMemory ?? 0
+        })
+      }
+    }, [resourceSnapshot])
+  const commitBadgeLabel =
+    commitMetricCopy && totalPrivateMemory !== undefined ? formatMemory(totalPrivateMemory) : null
+
+  // Why: memorySnapshotError null means "succeeded" OR "never fetched"; a sessions failure before any snapshot still counts as daemon-unreachable.
+  const daemonUnreachable = sessionsError && (memorySnapshotError !== null || snapshot === null)
+  // Why: sessions IPC can fail while snapshot IPC works; flag it so the empty session list isn't mistaken for healthy.
+  const sessionsOnlyError = sessionsError && memorySnapshotError === null
+  const resourceManagerTooltipLines = getResourceManagerTooltipLines({
+    memoryLabel: resourceSnapshot
+      ? [
+          `${memBadgeLabel} · ${memoryMetricCopy.summaryLabel}`,
+          commitBadgeLabel && commitMetricCopy
+            ? `${commitBadgeLabel} ${commitMetricCopy.summaryLabel}`
+            : null
+        ]
+          .filter(Boolean)
+          .join(' · ')
+      : memBadgeLabel,
+    sessionCount: triggerSessionCount,
+    spaceScanReady
+  })
+  const resourceManagerAriaLabel = getResourceManagerAriaLabel({
+    sessionCount: triggerSessionCount,
+    spaceScanReady
+  })
+
+  return {
+    unifiedRepos,
+    orphanCount,
+    triggerSessionCount,
+    memoryMetricCopy,
+    commitMetricCopy,
+    totalMemory,
+    totalCpu,
+    memBadgeLabel,
+    commitToneClass,
+    commitBadgeLabel,
+    daemonUnreachable,
+    sessionsOnlyError,
+    resourceManagerTooltipLines,
+    resourceManagerAriaLabel
+  }
+}
diff --git a/src/renderer/src/components/status-bar/use-resource-usage-status-controller.ts b/src/renderer/src/components/status-bar/use-resource-usage-status-controller.ts
new file mode 100644
index 00000000000..9dd9c22666d
--- /dev/null
+++ b/src/renderer/src/components/status-bar/use-resource-usage-status-controller.ts
@@ -0,0 +1,241 @@
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { useMountedRef } from '@/hooks/useMountedRef'
+import { useAppStore } from '../../store'
+import { useDaemonActions } from '../shared/useDaemonActions'
+import type { UnifiedSessionRow } from './resource-usage-merge-types'
+import type { ResourceSessionBindingInputs } from './resource-session-bindings'
+import type { SortOption } from './resource-usage-resource-tree'
+import {
+  getResourceUsageAllWorktrees,
+  getResourceUsageBrowserTabsByWorktree,
+  getResourceUsageDeferredSshSessionIdsByTabId,
+  getResourceUsagePtyIdsByTabId,
+  getResourceUsageRepos,
+  getResourceUsageRuntimePaneTitlesByTabId,
+  getResourceUsageTerminalLayoutsByTabId,
+  getResourceUsageTabsByWorktree
+} from './resource-usage-open-slices'
+import {
+  resolveResourceUsageSpaceScanReady,
+  type ResourceUsageSpaceScanSnapshot
+} from './resource-usage-space-scan-ready'
+import { useResourceSessionInventory } from './use-resource-session-inventory'
+import { useResourceUsageActions } from './use-resource-usage-actions'
+import { useResourceUsageDerivedModel } from './use-resource-usage-derived-model'
+
+const POLL_MS = 2_000
+
+export function useResourceUsageStatusController() {
+  const snapshot = useAppStore((s) => s.memorySnapshot)
+  const memorySnapshotError = useAppStore((s) => s.memorySnapshotError)
+  const fetchSnapshot = useAppStore((s) => s.fetchMemorySnapshot)
+  const workspaceSessionReady = useAppStore((s) => s.workspaceSessionReady)
+  const setActiveView = useAppStore((s) => s.setActiveView)
+  const openModal = useAppStore((s) => s.openModal)
+  const openSpacePage = useAppStore((s) => s.openSpacePage)
+  const recordFeatureInteraction = useAppStore((s) => s.recordFeatureInteraction)
+  const activeView = useAppStore((s) => s.activeView)
+  const activeWorktreeId = useAppStore((s) => s.activeWorktreeId)
+  const workspaceSpaceScannedAt = useAppStore((s) => s.workspaceSpaceAnalysis?.scannedAt ?? null)
+  const workspaceSpaceScanning = useAppStore((s) => s.workspaceSpaceScanning)
+
+  const [open, setOpen] = useState(false)
+  const [sortOption, setSortOption] = useState<SortOption>('memory')
+  const [collapsedRepos, setCollapsedRepos] = useState<Set<string>>(new Set())
+  const [collapsedWorktrees, setCollapsedWorktrees] = useState<Set<string>>(new Set())
+  const [appCollapsed, setAppCollapsed] = useState(true)
+  const {
+    sessionInventory,
+    sessionsError,
+    refreshSessions,
+    clearSessionsError,
+    removeSession,
+    removeSessions
+  } = useResourceSessionInventory(workspaceSessionReady)
+  const sessions = sessionInventory.sessions
+  const [killConfirm, setKillConfirm] = useState<UnifiedSessionRow | null>(null)
+  const [killing, setKilling] = useState(false)
+  const [spaceScanSnapshot, setSpaceScanSnapshot] = useState<ResourceUsageSpaceScanSnapshot>(
+    () => ({
+      ready: false,
+      previousScanning: workspaceSpaceScanning,
+      lastSeenScannedAt: workspaceSpaceScannedAt
+    })
+  )
+  // Why: tab titles churn on every keystroke; subscribe to those maps only while open so closed badges don't rerender.
+  const runtimePaneTitlesByTabId = useAppStore((s) =>
+    getResourceUsageRuntimePaneTitlesByTabId(s, open)
+  )
+  const repos = useAppStore((s) => getResourceUsageRepos(s, open))
+  const allWorktrees = useAppStore((s) => getResourceUsageAllWorktrees(s, open))
+  const tabsByWorktree = useAppStore((s) => getResourceUsageTabsByWorktree(s, open))
+  const browserTabsByWorktree = useAppStore((s) => getResourceUsageBrowserTabsByWorktree(s, open))
+  // Why: full binding maps stay behind open sentinels so unchanged counts don't rerender the closed segment.
+  const ptyIdsByTabId = useAppStore((s) => getResourceUsagePtyIdsByTabId(s, open))
+  const terminalLayoutsByTabId = useAppStore((s) => getResourceUsageTerminalLayoutsByTabId(s, open))
+  // Why: sessions awaiting SSH reattach are live on the remote host with no other binding.
+  const deferredSshSessionIdsByTabId = useAppStore((s) =>
+    getResourceUsageDeferredSshSessionIdsByTabId(s, open)
+  )
+  const resourceSnapshot = snapshot
+  // Why: ptyIdsByTabId tracks mounted/live panes only; Resource Manager reads restored wake hints only for classification.
+  const resourceSessionBindings = useMemo<ResourceSessionBindingInputs>(
+    () => ({
+      ptyIdsByTabId,
+      tabsByWorktree,
+      terminalLayoutsByTabId,
+      deferredSshSessionIdsByTabId,
+      workspaceSessionReady
+    }),
+    [
+      ptyIdsByTabId,
+      tabsByWorktree,
+      terminalLayoutsByTabId,
+      deferredSshSessionIdsByTabId,
+      workspaceSessionReady
+    ]
+  )
+
+  // Why: after a kill unmounts the session, focus would fall to <body>; park a ref on the popover body to restore it stably for keyboard users.
+  const popoverBodyRef = useRef<HTMLDivElement | null>(null)
+  const popoverBodyFocusFrameRef = useRef<number | null>(null)
+  const mountedRef = useMountedRef()
+
+  const cancelPopoverBodyFocusFrame = useCallback((): void => {
+    if (popoverBodyFocusFrameRef.current === null) {
+      return
+    }
+    cancelAnimationFrame(popoverBodyFocusFrameRef.current)
+    popoverBodyFocusFrameRef.current = null
+  }, [])
+
+  const setPopoverBodyNode = useCallback(
+    (node: HTMLDivElement | null): void => {
+      // Why: the queued post-kill focus is only valid while the popover body exists.
+      if (!node) {
+        cancelPopoverBodyFocusFrame()
+      }
+      popoverBodyRef.current = node
+    },
+    [cancelPopoverBodyFocusFrame]
+  )
+
+  const daemonActions = useDaemonActions({
+    onRestartSettled: () => {
+      clearSessionsError()
+      void fetchSnapshot()
+      void refreshSessions()
+    }
+  })
+
+  // Why: Space scans can finish after the user closes the full page/popover; the status-bar trigger becomes the handoff point.
+  const nextSpaceScanSnapshot = resolveResourceUsageSpaceScanReady({
+    snapshot: spaceScanSnapshot,
+    open,
+    activeView,
+    scannedAt: workspaceSpaceScannedAt,
+    scanning: workspaceSpaceScanning
+  })
+  if (
+    nextSpaceScanSnapshot.ready !== spaceScanSnapshot.ready ||
+    nextSpaceScanSnapshot.previousScanning !== spaceScanSnapshot.previousScanning ||
+    nextSpaceScanSnapshot.lastSeenScannedAt !== spaceScanSnapshot.lastSeenScannedAt
+  ) {
+    // Why: guarded render-time state update (no ref mutation during render); React can safely retry it before commit.
+    setSpaceScanSnapshot(nextSpaceScanSnapshot)
+  }
+  const spaceScanReady = nextSpaceScanSnapshot.ready
+
+  // Why: seed RAM after session restore so the closed chip does not require a
+  // click; the session-inventory hook independently seeds daemon PTYs.
+  useEffect(() => {
+    if (workspaceSessionReady) {
+      void fetchSnapshot()
+    }
+  }, [workspaceSessionReady, fetchSnapshot])
+
+  // Poll memory only while the popover is open. Session inventory is still
+  // explicit-on-open/action/seed (not a closed interval) because full
+  // listSessions can pause input with large preserved-session sets.
+  useEffect(() => {
+    if (!open) {
+      return
+    }
+    void fetchSnapshot()
+    void refreshSessions()
+    // Why: only memory polls on an interval; session inventory is explicit on open/action since it's expensive with many terminals.
+    const memTimer = window.setInterval(() => {
+      void fetchSnapshot()
+    }, POLL_MS)
+    return () => {
+      window.clearInterval(memTimer)
+    }
+  }, [open, fetchSnapshot, refreshSessions])
+
+  useEffect(() => {
+    if (!open) {
+      clearSessionsError()
+    }
+  }, [open, clearSessionsError])
+
+  const derived = useResourceUsageDerivedModel({
+    open,
+    resourceSnapshot,
+    sessions,
+    resourceSessionBindings,
+    runtimePaneTitlesByTabId,
+    repos,
+    allWorktrees,
+    browserTabsByWorktree,
+    workspaceSessionReady,
+    sessionCount: sessionInventory.count,
+    sessionsError,
+    memorySnapshotError,
+    snapshot,
+    spaceScanReady
+  })
+  const actions = useResourceUsageActions({
+    setCollapsedRepos,
+    setCollapsedWorktrees,
+    tabsByWorktree,
+    setOpen,
+    setActiveView,
+    openModal,
+    openSpacePage,
+    refreshSessions,
+    removeSession,
+    removeSessions,
+    sessions,
+    resourceSessionBindings,
+    workspaceSessionReady,
+    killConfirm,
+    setKillConfirm,
+    setKilling,
+    mountedRef,
+    cancelPopoverBodyFocusFrame,
+    popoverBodyRef,
+    popoverBodyFocusFrameRef
+  })
+
+  return {
+    open,
+    setOpen,
+    sortOption,
+    setSortOption,
+    collapsedRepos,
+    collapsedWorktrees,
+    appCollapsed,
+    setAppCollapsed,
+    activeWorktreeId,
+    killConfirm,
+    setKillConfirm,
+    killing,
+    setPopoverBodyNode,
+    daemonActions,
+    resourceSnapshot,
+    spaceScanReady,
+    recordFeatureInteraction,
+    ...derived,
+    ...actions
+  }
+}
diff --git a/src/renderer/src/components/tab-bar/terminal-tab-activity-status.test.ts b/src/renderer/src/components/tab-bar/terminal-tab-activity-status.test.ts
index d2bed923686..bf367f93667 100644
--- a/src/renderer/src/components/tab-bar/terminal-tab-activity-status.test.ts
+++ b/src/renderer/src/components/tab-bar/terminal-tab-activity-status.test.ts
@@ -3,6 +3,7 @@ import type { AgentStatusEntry } from '../../../../shared/agent-status-types'
 import type { TerminalTab } from '../../../../shared/terminal-tab-types'
 import {
   hasUnreadAgentCompletionForTerminalTab,
+  resetUnreadAgentCompletionTabIdsCacheForTest,
   resetTerminalTabActivityFlagsCacheForTest,
   resolveTerminalTabActivityStatus,
   resolveTerminalTabAttentionBadge,
@@ -41,6 +42,7 @@ const LIVE_PTY = { [TAB_ID]: ['pty-1'] }
 
 beforeEach(() => {
   resetTerminalTabActivityFlagsCacheForTest()
+  resetUnreadAgentCompletionTabIdsCacheForTest()
   vi.useFakeTimers()
   vi.setSystemTime(NOW)
 })
@@ -48,6 +50,7 @@ beforeEach(() => {
 afterEach(() => {
   vi.useRealTimers()
   resetTerminalTabActivityFlagsCacheForTest()
+  resetUnreadAgentCompletionTabIdsCacheForTest()
 })
 
 describe('resolveTerminalTabActivityStatus', () => {
@@ -267,6 +270,7 @@ describe('hasUnreadAgentCompletionForTerminalTab', () => {
     expect(
       hasUnreadAgentCompletionForTerminalTab({ [`tab-2:${SECOND_LEAF_ID}`]: true }, TAB_ID)
     ).toBe(false)
+    expect(hasUnreadAgentCompletionForTerminalTab(undefined, TAB_ID)).toBe(false)
   })
 
   // Why: the param accepts boolean maps, so a cleared-to-`false` marker must not read as unread.
@@ -275,6 +279,57 @@ describe('hasUnreadAgentCompletionForTerminalTab', () => {
       hasUnreadAgentCompletionForTerminalTab({ [`${TAB_ID}:${FIRST_LEAF_ID}`]: false }, TAB_ID)
     ).toBe(false)
   })
+
+  it('preserves first-colon ownership for legacy and malformed pane keys', () => {
+    expect(hasUnreadAgentCompletionForTerminalTab({ [TAB_ID]: true }, TAB_ID)).toBe(true)
+    expect(hasUnreadAgentCompletionForTerminalTab({ [`${TAB_ID}:3`]: true }, TAB_ID)).toBe(true)
+    expect(
+      hasUnreadAgentCompletionForTerminalTab(
+        { [`${TAB_ID}:${FIRST_LEAF_ID}:suffix`]: true },
+        TAB_ID
+      )
+    ).toBe(true)
+    expect(
+      hasUnreadAgentCompletionForTerminalTab({ [`${TAB_ID}0:${SECOND_LEAF_ID}`]: true }, TAB_ID)
+    ).toBe(false)
+  })
+
+  it('changes only the owning tab when immutable marker snapshots add and clear unread', () => {
+    const before = { [`tab-2:${SECOND_LEAF_ID}`]: true }
+    const added = { ...before, [`${TAB_ID}:${FIRST_LEAF_ID}`]: true }
+    const cleared = { ...added, [`${TAB_ID}:${FIRST_LEAF_ID}`]: false }
+
+    expect(hasUnreadAgentCompletionForTerminalTab(before, TAB_ID)).toBe(false)
+    expect(hasUnreadAgentCompletionForTerminalTab(added, TAB_ID)).toBe(true)
+    expect(hasUnreadAgentCompletionForTerminalTab(cleared, TAB_ID)).toBe(false)
+    expect(hasUnreadAgentCompletionForTerminalTab(before, 'tab-2')).toBe(true)
+    expect(hasUnreadAgentCompletionForTerminalTab(added, 'tab-2')).toBe(true)
+    expect(hasUnreadAgentCompletionForTerminalTab(cleared, 'tab-2')).toBe(true)
+  })
+
+  it('indexes one immutable marker snapshot once across all mounted tab lookups', () => {
+    const ownKeys = vi.fn(Reflect.ownKeys)
+    let valueReads = 0
+    const markers: Record<string, true> = Object.fromEntries(
+      Array.from({ length: 1_000 }, (_, index) => [`owner-${index}:leaf`, true] as const)
+    )
+    const unread = new Proxy<Record<string, true>>(markers, {
+      ownKeys,
+      get: (target, property, receiver) => {
+        valueReads += 1
+        return Reflect.get(target, property, receiver)
+      }
+    })
+
+    for (let publication = 0; publication < 5; publication += 1) {
+      for (let tab = 0; tab < 500; tab += 1) {
+        expect(hasUnreadAgentCompletionForTerminalTab(unread, `absent-${tab}`)).toBe(false)
+      }
+    }
+
+    expect(ownKeys).toHaveBeenCalledTimes(1)
+    expect(valueReads).toBe(1_000)
+  })
 })
 
 describe('resolveTerminalTabAttentionBadge', () => {
diff --git a/src/renderer/src/components/tab-bar/terminal-tab-activity-status.ts b/src/renderer/src/components/tab-bar/terminal-tab-activity-status.ts
index 97f511a1d41..a801855a588 100644
--- a/src/renderer/src/components/tab-bar/terminal-tab-activity-status.ts
+++ b/src/renderer/src/components/tab-bar/terminal-tab-activity-status.ts
@@ -256,29 +256,49 @@ export function terminalTabHasUnreadActivity({
   )
 }
 
+// Why: production writes replace this map; WeakMap supports retained snapshots without pinning them.
+let unreadAgentCompletionTabIdsBySnapshot = new WeakMap<
+  Record<string, boolean | undefined>,
+  ReadonlySet<string>
+>()
+
+function getUnreadAgentCompletionTabIds(
+  unreadAgentCompletionPanes: Record<string, boolean | undefined>
+): ReadonlySet<string> {
+  const cached = unreadAgentCompletionTabIdsBySnapshot.get(unreadAgentCompletionPanes)
+  if (cached) {
+    return cached
+  }
+
+  // Why: every mounted tab runs this selector per store write; index each immutable marker snapshot once.
+  const tabIds = new Set<string>()
+  for (const paneKey of Object.keys(unreadAgentCompletionPanes)) {
+    if (!unreadAgentCompletionPanes[paneKey]) {
+      continue
+    }
+    const separatorIndex = paneKey.indexOf(':')
+    tabIds.add(separatorIndex === -1 ? paneKey : paneKey.slice(0, separatorIndex))
+  }
+  unreadAgentCompletionTabIdsBySnapshot.set(unreadAgentCompletionPanes, tabIds)
+  return tabIds
+}
+
 /** Match pane-level unread completion markers to their owning terminal tab. */
 export function hasUnreadAgentCompletionForTerminalTab(
   unreadAgentCompletionPanes: Record<string, boolean | undefined> | undefined,
   tabId: string
 ): boolean {
-  for (const [paneKey, unread] of Object.entries(unreadAgentCompletionPanes ?? {})) {
-    // Why entries, not keys: the widened value type lets a cleared marker linger as `false`.
-    if (!unread) {
-      continue
-    }
-    // paneKey is `${tabId}:${leafId}` and tab ids never contain ":", so the
-    // prefix up to the first ":" is the owning tab id (see
-    // selectFloatingWorkspaceHasUnread). Prefix-match to keep legacy keys.
-    const separatorIndex = paneKey.indexOf(':')
-    const owningTabId = separatorIndex === -1 ? paneKey : paneKey.slice(0, separatorIndex)
-    if (owningTabId === tabId) {
-      return true
-    }
-  }
-  return false
+  return unreadAgentCompletionPanes
+    ? getUnreadAgentCompletionTabIds(unreadAgentCompletionPanes).has(tabId)
+    : false
 }
 
 /** Test-only: clear the memoized per-tab flag cache between cases. */
 export function resetTerminalTabActivityFlagsCacheForTest(): void {
   flagsCache = null
 }
+
+/** Test-only: clear the unread marker snapshot index between cases. */
+export function resetUnreadAgentCompletionTabIdsCacheForTest(): void {
+  unreadAgentCompletionTabIdsBySnapshot = new WeakMap()
+}
diff --git a/src/renderer/src/components/task-drawer-source-boundary.test.ts b/src/renderer/src/components/task-drawer-source-boundary.test.ts
index c320d852c54..1a2f64504e7 100644
--- a/src/renderer/src/components/task-drawer-source-boundary.test.ts
+++ b/src/renderer/src/components/task-drawer-source-boundary.test.ts
@@ -46,9 +46,16 @@ describe('task drawer source boundaries', () => {
   })
 
   it('threads GitLab task source context through the shared drawer selector', () => {
-    const source = componentSource('GitLabItemDialog.tsx')
+    const controllerSource = componentSource('GitLabItemDialog.tsx')
+    const source = [
+      controllerSource,
+      componentSource('gitlab-item-dialog/use-gitlab-item-dialog-effects.ts'),
+      componentSource('gitlab-item-dialog/use-gitlab-details-editing.ts'),
+      componentSource('gitlab-item-dialog/use-gitlab-primary-actions.ts'),
+      componentSource('gitlab-item-dialog/use-gitlab-review-actions.ts')
+    ].join('\n')
     const selector = sourceBetween(
-      source,
+      controllerSource,
       'const repoSelector = useMemo',
       'const updateCommentDraft'
     )
@@ -64,13 +71,13 @@ describe('task drawer source boundaries', () => {
   })
 
   it('uses Linear task source context for drawer reads, mutations, and optimistic patches', () => {
-    const source = componentSource('LinearItemDrawer.tsx')
-    const editSection = sourceBetween(
-      source,
-      'export function LinearIssueEditSection',
-      'export function LinearIssueCommentFooter'
+    const drawerSource = componentSource('LinearItemDrawer.tsx')
+    const editSection = componentSource('linear-item-drawer-edit-controller.tsx')
+    const drawer = sourceBetween(
+      drawerSource,
+      'export default function LinearItemDrawer',
+      'return renderLinearItemDrawerSheet'
     )
-    const drawer = sourceBetween(source, 'export default function LinearItemDrawer', 'return (')
 
     expect(editSection).toContain('const providerSettings = sourceContext ?? settings')
     expect(editSection).toContain('linearUpdateIssue(providerSettings')
diff --git a/src/renderer/src/components/task-page-localized-options.tsx b/src/renderer/src/components/task-page-localized-options.tsx
index cd14317489d..4bbf2b4de55 100644
--- a/src/renderer/src/components/task-page-localized-options.tsx
+++ b/src/renderer/src/components/task-page-localized-options.tsx
@@ -211,15 +211,13 @@ export const getLinearDisplayProperties = createLocalizedCatalog(
   }
 )
 
-export const getLinearPriorityLabels = createLocalizedCatalog(
-  (): Record<number, string> => ({
-    0: translate('auto.components.TaskPage.713179dfdc', 'No priority'),
-    1: translate('auto.components.TaskPage.f373ab1a4f', 'Urgent'),
-    2: translate('auto.components.TaskPage.345b169f1f', 'High'),
-    3: translate('auto.components.TaskPage.7fd59c18d8', 'Medium'),
-    4: translate('auto.components.TaskPage.69591944e7', 'Low')
-  })
-)
+export const getLinearPriorityLabels = createLocalizedCatalog((): Record<number, string> => ({
+  0: translate('auto.components.TaskPage.713179dfdc', 'No priority'),
+  1: translate('auto.components.TaskPage.f373ab1a4f', 'Urgent'),
+  2: translate('auto.components.TaskPage.345b169f1f', 'High'),
+  3: translate('auto.components.TaskPage.7fd59c18d8', 'Medium'),
+  4: translate('auto.components.TaskPage.69591944e7', 'Low')
+}))
 
 export function getLinearPriorityLabel(priority: number): string {
   return getLinearPriorityLabels()[priority] ?? `P${priority}`
diff --git a/src/renderer/src/components/task-page/hooks/use-task-page-github-source-banners.ts b/src/renderer/src/components/task-page/hooks/use-task-page-github-source-banners.ts
index 311179c2d83..6502b86dc91 100644
--- a/src/renderer/src/components/task-page/hooks/use-task-page-github-source-banners.ts
+++ b/src/renderer/src/components/task-page/hooks/use-task-page-github-source-banners.ts
@@ -82,8 +82,8 @@ export function useTaskPageGitHubSourceBanners({
     // Hard guarantee (K4): always overlay pending after reconcile so list
     // fetch clobbers never paint unprotected coordinator fields.
     setPages((current) =>
-      reconcileTaskPagePagesWithWorkItemsCache(current, selectedWorkItemsCacheEntries).map((page) =>
-        page ? (overlayPendingOnTaskPagePages([page])[0] ?? []) : null
+      reconcileTaskPagePagesWithWorkItemsCache(current, selectedWorkItemsCacheEntries).map(
+        (page) => (page ? (overlayPendingOnTaskPagePages([page])[0] ?? []) : null)
       )
     )
   }, [githubMode, selectedWorkItemsCacheEntries, taskSource, setPages])
diff --git a/src/renderer/src/components/terminal-pane/TerminalPane.tsx b/src/renderer/src/components/terminal-pane/TerminalPane.tsx
index 6157af7d36d..4b8d43cac31 100644
--- a/src/renderer/src/components/terminal-pane/TerminalPane.tsx
+++ b/src/renderer/src/components/terminal-pane/TerminalPane.tsx
@@ -116,6 +116,7 @@ import { shouldChatTakeOverMobileSurface } from '../native-chat/native-chat-send
 import { canToggleNativeChat } from '../native-chat/native-chat-availability'
 import {
   nativeChatLaunchAgentForLeaf,
+  nativeChatLeafOwnsTabWideEvidence,
   resolveNativeChatLeafRoute,
   type NativeChatLeafRoute
 } from '../native-chat/native-chat-leaf-routing'
@@ -2983,6 +2984,13 @@ function TerminalPane(
   })
   const structuredChatAgent = structuredSessionAgent ?? chatPaneResolvedAgent ?? chatPaneLaunchAgent
   const structuredChatTarget = useMemo(() => ({ kind: 'local' as const }), [])
+  // The launch draft is keyed by tab, so gate it on the same pane ownership the
+  // launch agent uses: a split sibling must not inherit the seeded text.
+  const chatPaneOwnsTabWideLaunchDraft = nativeChatLeafOwnsTabWideEvidence({
+    ownerLeafId: getTabWideAgentHintLeafId(),
+    leafId: chatPane?.leafId ?? null,
+    leafIds: getNativeChatLeafIds()
+  })
   // A split can host different agents, so continuation resolves the specific leaf before using tab-wide hints.
   const resolveAgentForLeaf = (leafId: string | null): string | null => {
     const detectedAgent = leafId ? (tabAgentTypeByLeaf[leafId] ?? null) : null
@@ -3155,6 +3163,7 @@ function TerminalPane(
                   targetPtyId={chatPanePtyId}
                   launchAgent={chatPaneLaunchAgent}
                   resolvedAgent={chatPaneResolvedAgent}
+                  ownsTabWideLaunchDraft={chatPaneOwnsTabWideLaunchDraft}
                   onSwitchToTerminal={switchNativeChatToTerminal}
                   readTerminalScreen={readNativeChatTerminalScreen}
                   contextMenuActions={{
diff --git a/src/renderer/src/components/terminal-pane/agent-completion-coordinator-queued-inspection-disposal.test.ts b/src/renderer/src/components/terminal-pane/agent-completion-coordinator-queued-inspection-disposal.test.ts
new file mode 100644
index 00000000000..9d83b1d6a93
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/agent-completion-coordinator-queued-inspection-disposal.test.ts
@@ -0,0 +1,81 @@
+import { describe, expect, it, vi } from 'vitest'
+import { createAgentCompletionCoordinator } from './agent-completion-coordinator'
+import {
+  createDeferred,
+  flushAsyncTicks,
+  processResult,
+  useAgentCompletionCoordinatorLifecycle
+} from './agent-completion-coordinator-test-harness'
+import type { RuntimeTerminalProcessInspection } from '@/runtime/runtime-terminal-inspection'
+
+describe('agent completion coordinator queued inspections', () => {
+  useAgentCompletionCoordinatorLifecycle()
+
+  it('drops inspections queued by a disposed coordinator before starting live work', async () => {
+    const blockers = Array.from({ length: 4 }, () =>
+      createDeferred<RuntimeTerminalProcessInspection>()
+    )
+    const blockerInspectors = blockers.map((inspection) => vi.fn(() => inspection.promise))
+    const blockerCoordinators = blockerInspectors.map((inspectProcess, index) =>
+      createAgentCompletionCoordinator({
+        paneKey: `tab-1:blocked-${index}`,
+        getPtyId: () => `pty-blocked-${index}`,
+        getSettings: () => null,
+        inspectProcess,
+        dispatchCompletion: vi.fn(),
+        isLive: () => true
+      })
+    )
+
+    blockerCoordinators.forEach((coordinator) => coordinator.startProcessTracking())
+    await vi.advanceTimersByTimeAsync(2_000)
+    expect(
+      blockerInspectors.every((inspectProcess) => inspectProcess.mock.calls.length === 1)
+    ).toBe(true)
+
+    const staleInspectProcesses = Array.from({ length: 8 }, () =>
+      vi.fn(async () => processResult(null, false))
+    )
+    const staleCoordinators = staleInspectProcesses.map((inspectProcess, index) =>
+      createAgentCompletionCoordinator({
+        paneKey: `tab-1:stale-${index}`,
+        getPtyId: () => `pty-stale-${index}`,
+        getSettings: () => null,
+        inspectProcess,
+        dispatchCompletion: vi.fn(),
+        isLive: () => true
+      })
+    )
+    const liveInspectProcess = vi.fn(async () => processResult(null, false))
+    const liveCoordinator = createAgentCompletionCoordinator({
+      paneKey: 'tab-1:live',
+      getPtyId: () => 'pty-live',
+      getSettings: () => null,
+      inspectProcess: liveInspectProcess,
+      dispatchCompletion: vi.fn(),
+      isLive: () => true
+    })
+
+    for (const [index, coordinator] of staleCoordinators.entries()) {
+      coordinator.observeTitle(`Codex working ${index}`)
+      coordinator.observeTitle(`~/stale-${index}`)
+    }
+    liveCoordinator.observeTitle('Codex working')
+    liveCoordinator.observeTitle('~/live')
+    staleCoordinators.forEach((coordinator) => coordinator.dispose())
+
+    blockers.forEach((inspection) => inspection.resolve(processResult(null, false)))
+    await flushAsyncTicks()
+    // Existing 100ms pump admits live work after blockers release.
+    await vi.advanceTimersByTimeAsync(100)
+    await flushAsyncTicks()
+
+    expect(
+      staleInspectProcesses.every((inspectProcess) => inspectProcess.mock.calls.length === 0)
+    ).toBe(true)
+    expect(liveInspectProcess).toHaveBeenCalledTimes(1)
+
+    blockerCoordinators.forEach((coordinator) => coordinator.dispose())
+    liveCoordinator.dispose()
+  })
+})
diff --git a/src/renderer/src/components/terminal-pane/agent-completion-process-monitor.ts b/src/renderer/src/components/terminal-pane/agent-completion-process-monitor.ts
index 3b9df9fa292..44ef010f63d 100644
--- a/src/renderer/src/components/terminal-pane/agent-completion-process-monitor.ts
+++ b/src/renderer/src/components/terminal-pane/agent-completion-process-monitor.ts
@@ -187,6 +187,7 @@ export function createAgentCompletionProcessMonitor({
     const pendingTitleIdAtRequest = priority === 'pending-title' ? pendingTitle.get()?.id : null
     enqueueAgentProcessInspection({
       priority,
+      canRun: () => !state.disposed,
       run: async () => {
         let inspectedRecognizedAgent = false
         let inspectionSucceeded = false
diff --git a/src/renderer/src/components/terminal-pane/agent-process-inspection-queue.ts b/src/renderer/src/components/terminal-pane/agent-process-inspection-queue.ts
index 5c581ddc652..f7512ad8c60 100644
--- a/src/renderer/src/components/terminal-pane/agent-process-inspection-queue.ts
+++ b/src/renderer/src/components/terminal-pane/agent-process-inspection-queue.ts
@@ -2,6 +2,7 @@ export type InspectionPriority = 'cadence' | 'pending-title'
 
 type InspectionTask = {
   priority: InspectionPriority
+  canRun: () => boolean
   run: () => Promise<void>
 }
 
@@ -37,6 +38,16 @@ function scheduleInspectionPump(delayMs = 0): void {
 }
 
 function pumpInspectionQueue(): void {
+  // Drop disposed tasks before slot/rate accounting.
+  for (let index = inspectionQueue.length - 1; index >= 0; index -= 1) {
+    const task = inspectionQueue[index]
+    if (task && !task.canRun()) {
+      inspectionQueue.splice(index, 1)
+    }
+  }
+  if (inspectionQueue.length === 0) {
+    return
+  }
   const now = Date.now()
   if (!canStartInspection(now)) {
     scheduleInspectionPump(100)
diff --git a/src/renderer/src/components/terminal-pane/terminal-startup-grid-settle.test.ts b/src/renderer/src/components/terminal-pane/terminal-startup-grid-settle.test.ts
index ebe5064be3c..dd7e56ab328 100644
--- a/src/renderer/src/components/terminal-pane/terminal-startup-grid-settle.test.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-startup-grid-settle.test.ts
@@ -115,6 +115,30 @@ describe('waitForStableStartupGrid', () => {
     expect(onSettled).toHaveBeenCalledWith({ cols: 88, rows: 50 })
   })
 
+  it('stops polling at the default cap when the external split gate never opens', () => {
+    const scheduler = createFrameScheduler()
+    const onSettled = vi.fn()
+    const measure = vi.fn(() => ({ cols: 88, rows: 50 }))
+
+    waitForStableStartupGrid({
+      isAlive: () => true,
+      isReadyToSettle: () => false,
+      measure,
+      onSettled,
+      requestFrame: scheduler.requestFrame,
+      cancelFrame: scheduler.cancelFrame
+    })
+
+    expect(scheduler.run(119)).toBe(119)
+    expect(scheduler.pending()).toBe(1)
+    expect(onSettled).not.toHaveBeenCalled()
+
+    expect(scheduler.run(10)).toBe(1)
+    expect(scheduler.pending()).toBe(0)
+    expect(measure).toHaveBeenCalledTimes(120)
+    expect(onSettled).toHaveBeenCalledWith({ cols: 88, rows: 50 })
+  })
+
   it('uses the latest usable grid at the frame cap when dimensions keep changing', () => {
     const scheduler = createFrameScheduler()
     const onSettled = vi.fn()
diff --git a/src/renderer/src/components/terminal-pane/terminal-startup-grid-settle.ts b/src/renderer/src/components/terminal-pane/terminal-startup-grid-settle.ts
index 5ed9d704670..8df3d42d6c6 100644
--- a/src/renderer/src/components/terminal-pane/terminal-startup-grid-settle.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-startup-grid-settle.ts
@@ -13,6 +13,7 @@ export type TerminalStartupGridSettleOptions = {
   minFrames?: number
   stableFrames?: number
   maxFrames?: number
+  maxReadinessWaitFrames?: number
 }
 
 export type TerminalStartupGridSettleHandle = {
@@ -22,6 +23,8 @@ export type TerminalStartupGridSettleHandle = {
 const DEFAULT_MIN_FRAMES = 6
 const DEFAULT_STABLE_FRAMES = 2
 const DEFAULT_MAX_FRAMES = 12
+// Why: ten settle windows tolerate slow split layout without permitting permanent polling.
+const DEFAULT_MAX_READINESS_WAIT_FRAMES = DEFAULT_MAX_FRAMES * 10
 
 function usableDimensions(
   dimensions: TerminalStartupGridDimensions | null
@@ -42,6 +45,10 @@ export function waitForStableStartupGrid(
   const minFrames = Math.max(1, options.minFrames ?? DEFAULT_MIN_FRAMES)
   const stableFrames = Math.max(1, options.stableFrames ?? DEFAULT_STABLE_FRAMES)
   const maxFrames = Math.max(minFrames, options.maxFrames ?? DEFAULT_MAX_FRAMES)
+  const maxReadinessWaitFrames = Math.max(
+    1,
+    options.maxReadinessWaitFrames ?? DEFAULT_MAX_READINESS_WAIT_FRAMES
+  )
   let frame = 0
   let stableFrameCount = 0
   let previous: TerminalStartupGridDimensions | null = null
@@ -50,6 +57,7 @@ export function waitForStableStartupGrid(
   let pendingFrame: number | null = null
   let cancelled = false
   let readyFrame = 0
+  let latestReadinessWaitUsable: TerminalStartupGridDimensions | null = null
   const usesReadinessGate = options.isReadyToSettle !== undefined
 
   const settle = (dimensions: TerminalStartupGridDimensions | null): void => {
@@ -73,6 +81,13 @@ export function waitForStableStartupGrid(
     const measured = options.measure()
     const readyToSettle = options.isReadyToSettle?.() ?? true
     if (!readyToSettle) {
+      if (usableDimensions(measured)) {
+        latestReadinessWaitUsable = measured
+      }
+      if (frame >= maxReadinessWaitFrames) {
+        settle(latestReadinessWaitUsable)
+        return
+      }
       previous = null
       stableFrameCount = 0
       observedGridChange = false
diff --git a/src/renderer/src/components/terminal-pane/use-terminal-tab-cold-parking.ts b/src/renderer/src/components/terminal-pane/use-terminal-tab-cold-parking.ts
index f836bdf8b7a..05a59f2a07d 100644
--- a/src/renderer/src/components/terminal-pane/use-terminal-tab-cold-parking.ts
+++ b/src/renderer/src/components/terminal-pane/use-terminal-tab-cold-parking.ts
@@ -21,10 +21,7 @@ import {
   selectColdParkedTerminalTabs
 } from './terminal-hidden-view-parking'
 import type { ParkVerdictFlipRecord } from './terminal-park-verdict-flip-telemetry'
-import {
-  haveSameTerminalTabIds,
-  useTerminalParkVerdictPin
-} from './use-terminal-park-verdict-pin'
+import { haveSameTerminalTabIds, useTerminalParkVerdictPin } from './use-terminal-park-verdict-pin'
 import { withholdUnparkableTerminalTabs } from './terminal-cold-park-withheld-tabs'
 import { getTerminalParkingPolicyOverrides } from './terminal-parking-e2e-overrides'
 import {
diff --git a/src/renderer/src/components/worktree-jump-palette-interleaved-sections.test.tsx b/src/renderer/src/components/worktree-jump-palette-interleaved-sections.test.tsx
index 62055b5027b..f52bf725a5a 100644
--- a/src/renderer/src/components/worktree-jump-palette-interleaved-sections.test.tsx
+++ b/src/renderer/src/components/worktree-jump-palette-interleaved-sections.test.tsx
@@ -57,18 +57,33 @@ vi.mock('@/components/ui/command', async () => {
   return {
     Command: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
     CommandGroup: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
-    CommandDialog: ({ children, open }: { children: React.ReactNode; open?: boolean }) =>
-      open ? <div data-command-dialog="true">{children}</div> : null,
-    CommandInput: ({
-      value,
-      onValueChange
+    CommandDialog: ({
+      children,
+      open,
+      commandProps
     }: {
-      value?: string
-      onValueChange?: (next: string) => void
-    }) => {
+      children: React.ReactNode
+      open?: boolean
+      commandProps?: { value?: string }
+    }) =>
+      open ? (
+        <div data-command-dialog="true" data-command-value={commandProps?.value ?? ''}>
+          {children}
+        </div>
+      ) : null,
+    CommandInput: React.forwardRef(function CommandInput(
+      {
+        value,
+        onValueChange
+      }: {
+        value?: string
+        onValueChange?: (next: string) => void
+      },
+      ref: React.ForwardedRef<HTMLInputElement>
+    ) {
       setCommandQuery = onValueChange ?? null
-      return <input data-command-input="true" value={value} onChange={() => {}} />
-    },
+      return <input ref={ref} data-command-input="true" value={value} onChange={() => {}} />
+    }),
     CommandList: React.forwardRef(function CommandList(
       { children }: { children: React.ReactNode },
       ref: React.ForwardedRef<HTMLDivElement>
@@ -82,8 +97,22 @@ vi.mock('@/components/ui/command', async () => {
     CommandEmpty: ({ children }: { children: React.ReactNode }) => (
       <div data-command-empty="true">{children}</div>
     ),
-    CommandItem: ({ children, value }: { children: React.ReactNode; value?: string }) => (
-      <button data-command-item={value ?? ''} type="button">
+    CommandItem: ({
+      children,
+      value,
+      onSelect
+    }: {
+      children: React.ReactNode
+      value?: string
+      onSelect?: () => void
+    }) => (
+      <button
+        cmdk-item=""
+        data-value={value ?? ''}
+        data-command-item={value ?? ''}
+        type="button"
+        onClick={onSelect}
+      >
         {children}
       </button>
     )
@@ -401,6 +430,7 @@ describe('WorktreeJumpPalette interleaved primary sections', () => {
     const title = row?.querySelector('[data-slot="palette-open-tab-title"]')
     const worktree = row?.querySelector('[data-slot="palette-open-tab-worktree"]')
     expect(title?.textContent).toBe(longTitle)
+    expect(title?.classList.contains('flex-1')).toBe(true)
     expect(worktree?.textContent).toBe('user-support')
     expect(worktree?.compareDocumentPosition(title ?? document.createElement('span'))).toBe(
       Node.DOCUMENT_POSITION_PRECEDING
@@ -533,6 +563,13 @@ describe('WorktreeJumpPalette interleaved primary sections', () => {
       btn.textContent?.includes('See more')
     )
     expect(seeMoreBtn).toBeDefined()
+    const initialItemIds = Array.from(testContainer.querySelectorAll('[cmdk-item]')).map((item) =>
+      item.getAttribute('data-value')
+    )
+    const seeMoreIndex = initialItemIds.indexOf('__hint_worktree_overflow__')
+    expect(seeMoreIndex).toBeGreaterThan(0)
+    const input = testContainer.querySelector<HTMLInputElement>('[data-command-input="true"]')
+    input?.focus()
 
     await act(async () => {
       seeMoreBtn?.click()
@@ -540,9 +577,20 @@ describe('WorktreeJumpPalette interleaved primary sections', () => {
     await flushEffects()
 
     // After expanding by 20: 30 worktrees are rendered, 5 more
-    const renderedItems = testContainer.querySelectorAll('[data-command-item]')
+    const renderedItems = testContainer.querySelectorAll('[data-command-item^="worktree:"]')
     expect(renderedItems).toHaveLength(30)
     expect(testContainer.textContent).toContain('5 more')
+    const firstRevealedItemId = Array.from(testContainer.querySelectorAll('[cmdk-item]'))[
+      seeMoreIndex
+    ]?.getAttribute('data-value')
+    expect(firstRevealedItemId).toMatch(/^worktree:/)
+    expect(firstRevealedItemId).not.toBe(initialItemIds[0])
+    expect(
+      testContainer
+        .querySelector('[data-command-dialog="true"]')
+        ?.getAttribute('data-command-value')
+    ).toBe(firstRevealedItemId)
+    expect(document.activeElement).toBe(input)
 
     // Click again: 30 + 20 = 50 (all 35 fit), hint disappears
     const seeMoreBtn2 = Array.from(testContainer.querySelectorAll('button')).find((btn) =>
@@ -553,7 +601,7 @@ describe('WorktreeJumpPalette interleaved primary sections', () => {
     })
     await flushEffects()
 
-    const renderedItemsAll = testContainer.querySelectorAll('[data-command-item]')
+    const renderedItemsAll = testContainer.querySelectorAll('[data-command-item^="worktree:"]')
     expect(renderedItemsAll).toHaveLength(35)
     expect(testContainer.textContent).not.toContain('more')
   })
diff --git a/src/renderer/src/hooks/automation-agent-status-entry-change.test.ts b/src/renderer/src/hooks/automation-agent-status-entry-change.test.ts
new file mode 100644
index 00000000000..7079f81af8d
--- /dev/null
+++ b/src/renderer/src/hooks/automation-agent-status-entry-change.test.ts
@@ -0,0 +1,66 @@
+import { describe, expect, it } from 'vitest'
+import type { AgentStatusEntry } from '../../../shared/agent-status-types'
+import {
+  selectAutomationAgentStatusEntryChange,
+  UNCHANGED_AUTOMATION_AGENT_STATUS_ENTRY
+} from './automation-agent-status-entry-change'
+
+function makeEntry(paneKey: string): AgentStatusEntry {
+  return {
+    paneKey,
+    state: 'working',
+    prompt: 'turn',
+    updatedAt: 1,
+    stateStartedAt: 1,
+    stateHistory: []
+  }
+}
+
+describe('selectAutomationAgentStatusEntryChange', () => {
+  it('reads only the target and skips an unchanged entry', () => {
+    const targetPaneKey = 'target-tab:leaf'
+    const targetEntry = makeEntry(targetPaneKey)
+    const entries = Object.fromEntries(
+      Array.from({ length: 499 }, (_, index) => {
+        const paneKey = `other-tab:${index}`
+        return [paneKey, makeEntry(paneKey)]
+      })
+    )
+    entries[targetPaneKey] = targetEntry
+    let enumerations = 0
+    const measuredEntries = new Proxy(entries, {
+      ownKeys: (target) => {
+        enumerations += 1
+        return Reflect.ownKeys(target)
+      }
+    })
+
+    expect(selectAutomationAgentStatusEntryChange(measuredEntries, targetPaneKey, undefined)).toBe(
+      targetEntry
+    )
+    expect(
+      selectAutomationAgentStatusEntryChange(measuredEntries, targetPaneKey, targetEntry)
+    ).toBe(UNCHANGED_AUTOMATION_AGENT_STATUS_ENTRY)
+    expect(enumerations).toBe(0)
+  })
+
+  it('reports removal and ignores inherited or non-enumerable entries', () => {
+    const targetPaneKey = 'target-tab:leaf'
+    const previousEntry = makeEntry(targetPaneKey)
+    const inheritedEntries = Object.create({ [targetPaneKey]: previousEntry }) as Record<
+      string,
+      AgentStatusEntry
+    >
+    const nonEnumerableEntries = Object.defineProperty({}, targetPaneKey, {
+      value: previousEntry
+    }) as Record<string, AgentStatusEntry>
+
+    expect(selectAutomationAgentStatusEntryChange({}, targetPaneKey, previousEntry)).toBeUndefined()
+    expect(selectAutomationAgentStatusEntryChange(inheritedEntries, targetPaneKey, undefined)).toBe(
+      UNCHANGED_AUTOMATION_AGENT_STATUS_ENTRY
+    )
+    expect(
+      selectAutomationAgentStatusEntryChange(nonEnumerableEntries, targetPaneKey, undefined)
+    ).toBe(UNCHANGED_AUTOMATION_AGENT_STATUS_ENTRY)
+  })
+})
diff --git a/src/renderer/src/hooks/automation-agent-status-entry-change.ts b/src/renderer/src/hooks/automation-agent-status-entry-change.ts
new file mode 100644
index 00000000000..1c919e6b417
--- /dev/null
+++ b/src/renderer/src/hooks/automation-agent-status-entry-change.ts
@@ -0,0 +1,15 @@
+import type { AgentStatusEntry } from '../../../shared/agent-status-types'
+
+export const UNCHANGED_AUTOMATION_AGENT_STATUS_ENTRY = Symbol('unchanged-agent-status-entry')
+
+export function selectAutomationAgentStatusEntryChange(
+  entries: Readonly<Record<string, AgentStatusEntry>>,
+  targetPaneKey: string,
+  previousEntry: AgentStatusEntry | undefined
+): AgentStatusEntry | undefined | typeof UNCHANGED_AUTOMATION_AGENT_STATUS_ENTRY {
+  const entry = Object.prototype.propertyIsEnumerable.call(entries, targetPaneKey)
+    ? entries[targetPaneKey]
+    : undefined
+  // Why: status writes replace entries; unchanged identity proves an unrelated publication.
+  return entry === previousEntry ? UNCHANGED_AUTOMATION_AGENT_STATUS_ENTRY : entry
+}
diff --git a/src/renderer/src/hooks/automation-dispatch-completion.ts b/src/renderer/src/hooks/automation-dispatch-completion.ts
new file mode 100644
index 00000000000..098d1167a38
--- /dev/null
+++ b/src/renderer/src/hooks/automation-dispatch-completion.ts
@@ -0,0 +1,266 @@
+import {
+  createAutomationRunOutputSnapshotBuffer,
+  selectAutomationRunOutputSnapshot
+} from '@/components/automations/automation-run-output-snapshot'
+import { useAppStore } from '@/store'
+import type {
+  AutomationDispatchResult,
+  AutomationPrecheckResult,
+  AutomationRun
+} from '../../../shared/automations-types'
+import type { AgentStateHistoryEntry, AgentStatusEntry } from '../../../shared/agent-status-types'
+import {
+  selectAutomationAgentStatusEntryChange,
+  UNCHANGED_AUTOMATION_AGENT_STATUS_ENTRY
+} from './automation-agent-status-entry-change'
+import type { Worktree } from '../../../shared/worktree/types'
+
+type MarkDispatchResult = (result: AutomationDispatchResult) => Promise<void>
+
+export function createAutomationDispatchCompletion(args: {
+  run: AutomationRun
+  worktree: Worktree
+  precheckResult: AutomationPrecheckResult | null
+  markDispatchResult: MarkDispatchResult
+  releaseTerminalOwnership: () => void
+  finalizeTerminalOwnership: () => boolean
+}) {
+  const outputSnapshotBuffer = createAutomationRunOutputSnapshotBuffer()
+  let latestAssistantMessage: string | null = null
+  const getOutputSnapshot = () =>
+    selectAutomationRunOutputSnapshot(latestAssistantMessage, outputSnapshotBuffer.snapshot())
+  let dispatchMarked = false
+  let pendingExitCode: number | null = null
+  let pendingDone = false
+  let completionMarked = false
+  let unsubscribeAgentStatus = (): void => {}
+  let unsubscribeSessionObserver = (): void => {}
+  let releaseReuseDispatchTab = (): void => {}
+  const cleanupRunObservers = (): void => {
+    unsubscribeAgentStatus()
+    unsubscribeSessionObserver()
+    releaseReuseDispatchTab()
+    unsubscribeAgentStatus = (): void => {}
+    unsubscribeSessionObserver = (): void => {}
+    releaseReuseDispatchTab = (): void => {}
+  }
+  const markCompletionResult = async (): Promise<void> => {
+    if (completionMarked) {
+      return
+    }
+    completionMarked = true
+    cleanupRunObservers()
+    try {
+      await args.markDispatchResult({
+        runId: args.run.id,
+        status: 'completed',
+        workspaceId: args.worktree.id,
+        workspaceDisplayName: args.worktree.displayName,
+        outputSnapshot: getOutputSnapshot(),
+        precheckResult: args.precheckResult,
+        error: null
+      })
+    } catch (error) {
+      args.releaseTerminalOwnership()
+      throw error
+    }
+    if (args.finalizeTerminalOwnership()) {
+      await clearRetiredRunTerminalIdentity()
+    }
+  }
+  const clearRetiredRunTerminalIdentity = async (): Promise<void> => {
+    // Why: the owned terminal was just retired, so the run's pane/pty
+    // pointers now reference a closed tab. Drop them (best-effort) so
+    // "View run" resolves to the workspace/snapshot instead of dead-ending
+    // on an unavailable terminal.
+    try {
+      await args.markDispatchResult({
+        runId: args.run.id,
+        status: 'completed',
+        terminalSessionId: null,
+        terminalPaneKey: null,
+        terminalPtyId: null
+      })
+    } catch (error) {
+      console.error('[automations] Failed to clear retired terminal identity:', error)
+    }
+  }
+  const markExitResult = async (code: number): Promise<void> => {
+    if (completionMarked) {
+      return
+    }
+    completionMarked = true
+    cleanupRunObservers()
+    try {
+      await args.markDispatchResult({
+        runId: args.run.id,
+        status: code === 0 ? 'completed' : 'dispatch_failed',
+        workspaceId: args.worktree.id,
+        workspaceDisplayName: args.worktree.displayName,
+        outputSnapshot: getOutputSnapshot(),
+        precheckResult: args.precheckResult,
+        error: code === 0 ? null : `Automation process exited with code ${code}.`
+      })
+    } catch (error) {
+      args.releaseTerminalOwnership()
+      throw error
+    }
+    if (code === 0) {
+      if (args.finalizeTerminalOwnership()) {
+        await clearRetiredRunTerminalIdentity()
+      }
+    } else {
+      args.releaseTerminalOwnership()
+    }
+  }
+  const settleLateResult = (result: Promise<void>): void => {
+    // Why: status/exit callbacks have no awaitable caller; the result
+    // path already releases ownership before propagating persistence errors.
+    void result.catch((error) => {
+      console.error('[automations] Failed to persist late automation result:', error)
+    })
+  }
+  const handleAgentDone = (): void => {
+    if (completionMarked) {
+      return
+    }
+    if (!dispatchMarked) {
+      pendingDone = true
+      return
+    }
+    settleLateResult(markCompletionResult())
+  }
+  const handleExit = (code: number): void => {
+    if (completionMarked) {
+      return
+    }
+    if (!dispatchMarked) {
+      pendingExitCode = code
+      return
+    }
+    settleLateResult(markExitResult(code))
+  }
+  const observeAgentStatus = (
+    targetPaneKey: string,
+    startedAfter: number,
+    options?: { requireWorkingAfterStart?: boolean }
+  ): void => {
+    let sawWorkingAfterStart = false
+    let observedStateHistory: AgentStateHistoryEntry[] = []
+    let observedEntry: AgentStatusEntry | undefined
+    const checkCurrentStatus = (): void => {
+      const entryChange = selectAutomationAgentStatusEntryChange(
+        useAppStore.getState().agentStatusByPaneKey,
+        targetPaneKey,
+        observedEntry
+      )
+      if (entryChange === UNCHANGED_AUTOMATION_AGENT_STATUS_ENTRY) {
+        return
+      }
+      const entry = entryChange
+      observedEntry = entry
+      if (!entry || entry.updatedAt < startedAfter) {
+        return
+      }
+      const historyOverlap = getAgentStateHistoryOverlap(observedStateHistory, entry.stateHistory)
+      // Why: sawWorkingAfterStart stays monotonic — a recreated entry
+      // (transport loss, PTY exit, cap eviction) arrives with an empty
+      // stateHistory, so clearing it here would strand reuseSession runs
+      // with nothing left to re-derive the working edge from.
+      for (const historicalState of entry.stateHistory.slice(historyOverlap)) {
+        if (historicalState.startedAt < startedAfter) {
+          continue
+        }
+        if (historicalState.state === 'working') {
+          sawWorkingAfterStart = true
+        }
+        if (
+          historicalState.state === 'done' &&
+          (!options?.requireWorkingAfterStart || sawWorkingAfterStart)
+        ) {
+          // Why: this `done` already rolled out of the live entry, so its output
+          // survives only in the entry-level completed slot.
+          latestAssistantMessage =
+            entry.lastCompletedAssistantMessage?.trim() || latestAssistantMessage
+          handleAgentDone()
+          return
+        }
+      }
+      observedStateHistory = [...entry.stateHistory]
+      if (entry.state === 'working') {
+        sawWorkingAfterStart = true
+      }
+      if (
+        entry.state === 'done' &&
+        // Why: a session-boundary done is the agent CONNECTING (Claude SessionStart
+        // fires at launch, before the argv prompt submits) — completing here would
+        // close the tab and record an empty run result.
+        entry.sessionBoundary !== true &&
+        (!options?.requireWorkingAfterStart || sawWorkingAfterStart)
+      ) {
+        latestAssistantMessage = entry.lastAssistantMessage?.trim() || latestAssistantMessage
+        handleAgentDone()
+      }
+    }
+    // Why: Codex/Claude completion normally arrives through the global
+    // hook IPC listener, not the hidden PTY OSC fallback.
+    unsubscribeAgentStatus = useAppStore.subscribe(checkCurrentStatus)
+    checkCurrentStatus()
+  }
+
+  return {
+    appendOutput: (chunk: string) => outputSnapshotBuffer.append(chunk),
+    captureAssistantMessage: (message: string | null | undefined) => {
+      latestAssistantMessage = message?.trim() || latestAssistantMessage
+    },
+    cleanupRunObservers,
+    handleAgentDone,
+    handleExit,
+    observeAgentStatus,
+    setReuseDispatchTabRelease: (release: () => void) => {
+      releaseReuseDispatchTab = release
+    },
+    setSessionObserver: (unsubscribe: () => void) => {
+      unsubscribeSessionObserver = unsubscribe
+    },
+    settlePendingAfterDispatch: async () => {
+      dispatchMarked = true
+      if (pendingDone) {
+        await markCompletionResult()
+      } else if (pendingExitCode !== null) {
+        await markExitResult(pendingExitCode)
+      }
+    }
+  }
+}
+
+function agentStateHistoryEntriesEqual(
+  left: AgentStateHistoryEntry,
+  right: AgentStateHistoryEntry
+): boolean {
+  return (
+    left.state === right.state &&
+    left.prompt === right.prompt &&
+    left.startedAt === right.startedAt &&
+    left.interrupted === right.interrupted
+  )
+}
+
+function getAgentStateHistoryOverlap(
+  previous: AgentStateHistoryEntry[],
+  current: AgentStateHistoryEntry[]
+): number {
+  for (let overlap = Math.min(previous.length, current.length); overlap > 0; overlap -= 1) {
+    const previousOffset = previous.length - overlap
+    if (
+      current
+        .slice(0, overlap)
+        .every((entry, index) =>
+          agentStateHistoryEntriesEqual(entry, previous[previousOffset + index])
+        )
+    ) {
+      return overlap
+    }
+  }
+  return 0
+}
diff --git a/src/renderer/src/hooks/automation-dispatch-handler.ts b/src/renderer/src/hooks/automation-dispatch-handler.ts
new file mode 100644
index 00000000000..6df1a64fb58
--- /dev/null
+++ b/src/renderer/src/hooks/automation-dispatch-handler.ts
@@ -0,0 +1,239 @@
+import { listAutomationRunsForTarget } from '@/components/automations/automation-host-client'
+import { translate } from '@/i18n/i18n'
+import { submitPromptToAgentPty } from '@/lib/agent-paste-draft'
+import { launchAgentBackgroundSession } from '@/lib/launch-agent-background-session'
+import { observeExistingAutomationSession } from '@/lib/automation-session-observer'
+import { findReusableAutomationSession } from '@/lib/automation-session-reuse'
+import type { AutomationTerminalOwnership } from '@/lib/automation-terminal-ownership'
+import { useAppStore } from '@/store'
+import type {
+  AutomationDispatchRequest,
+  AutomationDispatchResult
+} from '../../../shared/automations-types'
+import { createAutomationDispatchCompletion } from './automation-dispatch-completion'
+import {
+  prepareAutomationDispatchWorkspace,
+  resolveAutomationDispatchWorkspace
+} from './automation-dispatch-workspace'
+
+const activeReuseDispatchTabIds = new Set<string>()
+
+function acquireReuseDispatchTab(tabId: string): (() => void) | null {
+  if (activeReuseDispatchTabIds.has(tabId)) {
+    return null
+  }
+  activeReuseDispatchTabIds.add(tabId)
+  return () => activeReuseDispatchTabIds.delete(tabId)
+}
+
+export async function handleAutomationDispatchRequest({
+  automation,
+  run,
+  dispatchToken
+}: AutomationDispatchRequest): Promise<void> {
+  const markDispatchResult = async (result: AutomationDispatchResult): Promise<void> => {
+    // Deliberately no local emit: the write publishes its own host-scoped event
+    // (automation-run-writer.ts) before this reply returns, and an unscoped one
+    // here would arrive second and invalidate every host in the catalog.
+    await window.api.automations.markDispatchResult(result)
+  }
+  const state = useAppStore.getState()
+  const focusBeforeDispatch = {
+    activeView: state.activeView,
+    activeWorktreeId: state.activeWorktreeId,
+    activeTabId: state.activeTabId,
+    activeTabType: state.activeTabType
+  }
+  const resolved = resolveAutomationDispatchWorkspace(state, automation, run)
+  let terminalOwnership: AutomationTerminalOwnership | null = null
+  const releaseTerminalOwnership = (): void => {
+    const ownership = terminalOwnership
+    terminalOwnership = null
+    ownership?.release()
+  }
+  const finalizeTerminalOwnership = (): boolean => {
+    const ownership = terminalOwnership
+    terminalOwnership = null
+    return ownership?.finalize() ?? false
+  }
+
+  if (!resolved.repo) {
+    await markDispatchResult({
+      runId: run.id,
+      status: 'skipped_unavailable',
+      workspaceId: run.workspaceId,
+      workspaceDisplayName: run.workspaceDisplayName ?? null,
+      error: translate(
+        'auto.hooks.useAutomationDispatchEvents.386db94f3e',
+        'The target project is no longer available.'
+      )
+    })
+    return
+  }
+
+  try {
+    const worktree = await prepareAutomationDispatchWorkspace({
+      state,
+      automation,
+      run,
+      dispatchToken,
+      resolved: { ...resolved, repo: resolved.repo },
+      markDispatchResult
+    })
+    if (!worktree) {
+      return
+    }
+    const completion = createAutomationDispatchCompletion({
+      run,
+      worktree,
+      precheckResult: resolved.context.precheckResult,
+      markDispatchResult,
+      releaseTerminalOwnership,
+      finalizeTerminalOwnership
+    })
+    const dispatchStartedAt = Date.now()
+    if (automation.reuseSession) {
+      const reusableSession = findReusableAutomationSession({
+        automationId: automation.id,
+        agentId: automation.agentId,
+        worktreeId: worktree.id,
+        currentRunId: run.id,
+        // Why: the dispatch loop only ever executes for the desktop authority,
+        // so its history read addresses the local runtime explicitly.
+        runs: await listAutomationRunsForTarget({ kind: 'local' }, automation.id),
+        state: useAppStore.getState()
+      })
+      if (reusableSession) {
+        const releaseTab = acquireReuseDispatchTab(reusableSession.tabId)
+        if (releaseTab) {
+          completion.setReuseDispatchTabRelease(releaseTab)
+          try {
+            const submitted = await submitPromptToAgentPty({
+              tabId: reusableSession.tabId,
+              ptyId: reusableSession.ptyId,
+              content: automation.prompt
+            })
+            if (!submitted) {
+              completion.cleanupRunObservers()
+            } else {
+              let reuseSawWorking = false
+              const handleReusableAgentStatus = (payload: { state: string }): void => {
+                if (payload.state === 'working') {
+                  reuseSawWorking = true
+                  return
+                }
+                if (payload.state === 'done' && reuseSawWorking) {
+                  completion.handleAgentDone()
+                }
+              }
+              const reuseCompletionStartedAt = Date.now()
+              completion.setSessionObserver(
+                await observeExistingAutomationSession({
+                  ptyId: reusableSession.ptyId,
+                  paneKey: reusableSession.paneKey,
+                  runId: run.id,
+                  onData: completion.appendOutput,
+                  onAgentStatus: (payload) => {
+                    completion.captureAssistantMessage(payload.lastAssistantMessage)
+                    handleReusableAgentStatus(payload)
+                  },
+                  onExit: completion.handleExit
+                })
+              )
+              completion.observeAgentStatus(reusableSession.paneKey, reuseCompletionStartedAt, {
+                requireWorkingAfterStart: true
+              })
+              await markDispatchResult({
+                runId: run.id,
+                status: 'dispatched',
+                workspaceId: worktree.id,
+                workspaceDisplayName: worktree.displayName,
+                terminalSessionId: reusableSession.tabId,
+                terminalPaneKey: reusableSession.paneKey,
+                terminalPtyId: reusableSession.ptyId,
+                precheckResult: resolved.context.precheckResult,
+                error: null
+              })
+              await completion.settlePendingAfterDispatch()
+              return
+            }
+          } catch (error) {
+            completion.cleanupRunObservers()
+            throw error
+          }
+        }
+      }
+    }
+    const result = await launchAgentBackgroundSession({
+      agent: automation.agentId,
+      worktreeId: worktree.id,
+      prompt: automation.prompt,
+      launchSource: 'unknown',
+      title: run.title,
+      onData: completion.appendOutput,
+      onAgentStatus: (payload) => {
+        completion.captureAssistantMessage(payload.lastAssistantMessage)
+        // Why: session-boundary done = launch connect, not run completion (see observeAgentStatus).
+        if (payload.state !== 'done' || payload.sessionBoundary === true) {
+          return
+        }
+        completion.handleAgentDone()
+      },
+      onExit: (_ptyId, code) => {
+        completion.handleExit(code)
+      }
+    })
+    if (!result) {
+      throw new Error('Unable to build an agent launch plan.')
+    }
+    terminalOwnership = result.terminalOwnership
+    if (automation.reuseSession) {
+      // Why: the first fresh launch is the seed for later reuse and must
+      // survive completion under the same policy as an already-reused tab.
+      releaseTerminalOwnership()
+    }
+    const launchedTabId = result.tabId
+    completion.observeAgentStatus(result.paneKey, dispatchStartedAt)
+    try {
+      await markDispatchResult({
+        runId: run.id,
+        status: 'dispatched',
+        workspaceId: worktree.id,
+        workspaceDisplayName: worktree.displayName,
+        terminalSessionId: launchedTabId,
+        terminalPaneKey: result.paneKey,
+        terminalPtyId: result.ptyId,
+        precheckResult: resolved.context.precheckResult,
+        error: null
+      })
+      await completion.settlePendingAfterDispatch()
+    } catch (error) {
+      completion.cleanupRunObservers()
+      throw error
+    }
+    const currentState = useAppStore.getState()
+    // Why: Run Now and scheduled dispatches should create workspaces/tabs in
+    // the background; only an explicit row click should navigate there.
+    if (
+      focusBeforeDispatch.activeWorktreeId !== worktree.id &&
+      currentState.activeWorktreeId === worktree.id
+    ) {
+      currentState.setActiveView(focusBeforeDispatch.activeView)
+      currentState.setActiveWorktree(focusBeforeDispatch.activeWorktreeId)
+      if (focusBeforeDispatch.activeTabId) {
+        currentState.setActiveTab(focusBeforeDispatch.activeTabId)
+      }
+      currentState.setActiveTabType(focusBeforeDispatch.activeTabType)
+    }
+  } catch (error) {
+    releaseTerminalOwnership()
+    await markDispatchResult({
+      runId: run.id,
+      status: 'dispatch_failed',
+      workspaceId: resolved.context.workspaceId,
+      workspaceDisplayName: resolved.context.workspaceDisplayName,
+      precheckResult: resolved.context.precheckResult,
+      error: error instanceof Error ? error.message : String(error)
+    })
+  }
+}
diff --git a/src/renderer/src/hooks/automation-dispatch-observer-test-probe.ts b/src/renderer/src/hooks/automation-dispatch-observer-test-probe.ts
new file mode 100644
index 00000000000..302c052782c
--- /dev/null
+++ b/src/renderer/src/hooks/automation-dispatch-observer-test-probe.ts
@@ -0,0 +1,30 @@
+import type { AgentStatusEntry } from '../../../shared/agent-status-types'
+
+const TARGET_PANE_KEY = 'agent-tab:7c6fb4e5-3bf1-4ff4-8259-03f7ae81c40d'
+
+export function countUnchangedObserverHistoryReads(
+  state: { agentStatusByPaneKey: Record<string, AgentStatusEntry> },
+  subscriber: (() => void) | null
+): number {
+  if (!subscriber) {
+    throw new Error('agent status observer was not registered')
+  }
+  let historyReads = 0
+  state.agentStatusByPaneKey = {
+    [TARGET_PANE_KEY]: {
+      paneKey: TARGET_PANE_KEY,
+      state: 'working',
+      prompt: 'turn',
+      updatedAt: Date.now() + 1,
+      stateStartedAt: Date.now() + 1,
+      get stateHistory() {
+        historyReads += 1
+        return []
+      }
+    }
+  }
+  subscriber()
+  historyReads = 0
+  subscriber()
+  return historyReads
+}
diff --git a/src/renderer/src/hooks/automation-dispatch-workspace.ts b/src/renderer/src/hooks/automation-dispatch-workspace.ts
new file mode 100644
index 00000000000..f8980a56108
--- /dev/null
+++ b/src/renderer/src/hooks/automation-dispatch-workspace.ts
@@ -0,0 +1,269 @@
+import { launchWorktreeBackgroundTerminals } from '@/lib/launch-worktree-background-terminals'
+import { useAppStore } from '@/store'
+import { translate } from '@/i18n/i18n'
+import { createBrowserUuid } from '@/lib/browser-uuid'
+import { getResolvedExecutionHostIdForWorktree } from '@/lib/resolved-worktree-execution-host'
+import type {
+  Automation,
+  AutomationDispatchResult,
+  AutomationPrecheckResult,
+  AutomationRun
+} from '../../../shared/automations-types'
+import { getAutomationRunRepoId } from '../../../shared/automation-run-identity'
+import {
+  didAutomationPrecheckPass,
+  formatAutomationPrecheckFailure
+} from '../../../shared/automation-precheck'
+import {
+  getRepoExecutionHostId,
+  parseExecutionHostId,
+  toSshExecutionHostId
+} from '../../../shared/execution-host'
+import { resolveFolderWorkspaceHost } from '../../../shared/folder-workspace-execution-host'
+import type { Worktree } from '../../../shared/worktree/types'
+import { parseWorkspaceKey } from '../../../shared/workspace-scope'
+
+type AutomationDispatchStoreState = ReturnType<typeof useAppStore.getState>
+type MarkDispatchResult = (result: AutomationDispatchResult) => Promise<void>
+
+export type AutomationDispatchWorkspaceContext = {
+  workspaceId: string | null
+  workspaceDisplayName: string | null
+  precheckResult: AutomationPrecheckResult | null
+}
+
+export function resolveAutomationDispatchWorkspace(
+  state: AutomationDispatchStoreState,
+  automation: Automation,
+  run: AutomationRun
+) {
+  const runRepoId = getAutomationRunRepoId(automation)
+  const repo = state.repos.find((entry) => entry.id === runRepoId)
+  const automationWorkspaceScope = parseWorkspaceKey(automation.workspaceId ?? '')
+  const automationWorktree = automation.workspaceId
+    ? automationWorkspaceScope?.type === 'folder'
+      ? state.getKnownWorktreeById(automation.workspaceId)
+      : state.allWorktrees().find((entry) => entry.id === automation.workspaceId)
+    : null
+  const context: AutomationDispatchWorkspaceContext = {
+    workspaceId: automation.workspaceId,
+    workspaceDisplayName: automationWorktree?.displayName ?? run.workspaceDisplayName ?? null,
+    precheckResult: null
+  }
+  return { runRepoId, repo, automationWorkspaceScope, automationWorktree, context }
+}
+
+type ResolvedAutomationDispatchWorkspace = ReturnType<typeof resolveAutomationDispatchWorkspace>
+
+export async function prepareAutomationDispatchWorkspace(args: {
+  state: AutomationDispatchStoreState
+  automation: Automation
+  run: AutomationRun
+  dispatchToken: string
+  resolved: ResolvedAutomationDispatchWorkspace & {
+    repo: NonNullable<ResolvedAutomationDispatchWorkspace['repo']>
+  }
+  markDispatchResult: MarkDispatchResult
+}): Promise<Worktree | null> {
+  const { state, automation, run, dispatchToken, resolved, markDispatchResult } = args
+  const { repo, runRepoId, automationWorkspaceScope, automationWorktree, context } = resolved
+  const folderWorkspaceHost =
+    automationWorkspaceScope?.type === 'folder'
+      ? resolveFolderWorkspaceHost(state, automationWorkspaceScope.folderWorkspaceId)
+      : null
+  const folderWorkspaceConnectionId =
+    folderWorkspaceHost?.kind === 'ssh' ? folderWorkspaceHost.targetId : null
+  // A workspace whose host does not resolve to one place is refused, not guessed at.
+  const folderWorkspaceHostUnresolved =
+    folderWorkspaceHost !== null && folderWorkspaceHost.kind === 'ambiguous'
+  const folderWorkspaceHostId =
+    folderWorkspaceHost && automationWorktree
+      ? folderWorkspaceConnectionId
+        ? toSshExecutionHostId(folderWorkspaceConnectionId)
+        : folderWorkspaceHost.kind === 'local'
+          ? getResolvedExecutionHostIdForWorktree(state, automationWorktree.id)
+          : null
+      : null
+  const runHostId =
+    parseExecutionHostId(automation.runContext?.hostId)?.id ?? getRepoExecutionHostId(repo)
+  const workspaceMatchesRunTarget =
+    automationWorkspaceScope?.type === 'folder'
+      ? folderWorkspaceHostId !== null && folderWorkspaceHostId === runHostId
+      : !automation.runContext?.repoId ||
+        automationWorktree?.repoId === automation.runContext.repoId
+  if (automation.workspaceMode === 'existing' && automationWorktree && !workspaceMatchesRunTarget) {
+    await markDispatchResult({
+      runId: run.id,
+      status: 'skipped_unavailable',
+      workspaceId: automation.workspaceId,
+      workspaceDisplayName: context.workspaceDisplayName,
+      error: folderWorkspaceHostUnresolved
+        ? translate(
+            'auto.hooks.useAutomationDispatchEvents.workspaceHostUnresolved',
+            'The target workspace spans more than one host, so this run has no single host to use.'
+          )
+        : translate(
+            'auto.hooks.useAutomationDispatchEvents.3ad7d77f57',
+            'The target workspace is on a different host than this automation run target.'
+          )
+    })
+    return null
+  }
+  const sshTargetId =
+    automationWorkspaceScope?.type === 'folder'
+      ? (folderWorkspaceConnectionId ?? null)
+      : (repo.connectionId ?? null)
+  if (sshTargetId) {
+    const needsPrompt = await window.api.ssh.needsPassphrasePrompt({
+      targetId: sshTargetId
+    })
+    if (needsPrompt) {
+      await markDispatchResult({
+        runId: run.id,
+        status: 'skipped_needs_interactive_auth',
+        workspaceId: context.workspaceId,
+        workspaceDisplayName: context.workspaceDisplayName,
+        error: translate(
+          'auto.hooks.useAutomationDispatchEvents.16a21d6413',
+          'SSH reconnect requires interactive credentials.'
+        )
+      })
+      return null
+    }
+    const sshState = await window.api.ssh.getState({ targetId: sshTargetId })
+    if (sshState?.status !== 'connected') {
+      try {
+        const connected = await window.api.ssh.connect({ targetId: sshTargetId })
+        if (connected?.status !== 'connected') {
+          throw new Error('SSH target is unavailable.')
+        }
+      } catch (error) {
+        await markDispatchResult({
+          runId: run.id,
+          status: 'skipped_unavailable',
+          workspaceId: context.workspaceId,
+          workspaceDisplayName: context.workspaceDisplayName,
+          error: error instanceof Error ? error.message : String(error)
+        })
+        return null
+      }
+    }
+  }
+
+  if (automation.workspaceMode === 'existing' && !automationWorktree) {
+    await markDispatchResult({
+      runId: run.id,
+      status: 'skipped_unavailable',
+      workspaceId: automation.workspaceId,
+      workspaceDisplayName: context.workspaceDisplayName,
+      error: translate(
+        'auto.hooks.useAutomationDispatchEvents.59718b120b',
+        'The target workspace is no longer available.'
+      )
+    })
+    return null
+  }
+
+  if (run.trigger === 'scheduled' && automation.precheck) {
+    context.precheckResult = await window.api.automations.runPrecheck({
+      automationId: automation.id,
+      runId: run.id
+    })
+    if (context.precheckResult && !didAutomationPrecheckPass(context.precheckResult)) {
+      await markDispatchResult({
+        runId: run.id,
+        status: 'skipped_precheck',
+        workspaceId: context.workspaceId,
+        workspaceDisplayName: context.workspaceDisplayName,
+        precheckResult: context.precheckResult,
+        error: formatAutomationPrecheckFailure(context.precheckResult)
+      })
+      return null
+    }
+  }
+
+  const automationWorkspaceCreateRequestId = createBrowserUuid()
+  const createResult =
+    automation.workspaceMode === 'new_per_run'
+      ? await useAppStore.getState().createWorktree(
+          runRepoId,
+          buildAutomationWorkspaceName(run.title, run.scheduledFor),
+          automation.baseBranch ?? undefined,
+          automation.setupDecision ?? 'skip',
+          undefined,
+          'unknown',
+          run.title,
+          undefined,
+          undefined,
+          undefined,
+          // Why: the automation session below owns the prompt-bearing
+          // agent tab; createdWithAgent would reopen an empty fallback.
+          undefined,
+          undefined,
+          undefined,
+          undefined,
+          undefined,
+          undefined,
+          undefined,
+          undefined,
+          undefined,
+          undefined,
+          undefined,
+          undefined,
+          undefined,
+          undefined,
+          undefined,
+          {
+            automationProvenanceRequest: {
+              automationId: automation.id,
+              automationRunId: run.id,
+              dispatchToken,
+              createRequestId: automationWorkspaceCreateRequestId
+            }
+          }
+        )
+      : null
+  const worktree = createResult
+    ? createResult.worktree
+    : automation.workspaceId
+      ? automationWorktree
+      : null
+
+  if (!worktree) {
+    await markDispatchResult({
+      runId: run.id,
+      status: 'skipped_unavailable',
+      workspaceId: automation.workspaceId,
+      workspaceDisplayName: context.workspaceDisplayName,
+      error: translate(
+        'auto.hooks.useAutomationDispatchEvents.59718b120b',
+        'The target workspace is no longer available.'
+      )
+    })
+    return null
+  }
+  context.workspaceId = worktree.id
+  context.workspaceDisplayName = worktree.displayName
+  if (createResult?.setup || createResult?.defaultTabs) {
+    void launchWorktreeBackgroundTerminals({
+      worktreeId: worktree.id,
+      setup: createResult.setup,
+      defaultTabs: createResult.defaultTabs
+    }).catch((error) => {
+      // Why: setup/defaultTabs match normal worktree creation: they are
+      // best-effort terminal work and must not block the automation agent.
+      console.warn('[automations] Failed to launch workspace setup/default tabs:', error)
+    })
+  }
+  return worktree
+}
+
+function buildAutomationWorkspaceName(runTitle: string, scheduledFor: number): string {
+  const slug = runTitle
+    .toLowerCase()
+    .replace(/[^a-z0-9]+/g, '-')
+    .replace(/^-|-$/g, '')
+    .slice(0, 40)
+  const stamp = new Date(scheduledFor).toISOString().replace(/[-:]/g, '').slice(0, 13)
+  return `auto-${slug || 'run'}-${stamp}`
+}
diff --git a/src/renderer/src/hooks/ipc-events-close-routing-test-harness.ts b/src/renderer/src/hooks/ipc-events-close-routing-test-harness.ts
index eede0d6fa8e..d3424f8fc32 100644
--- a/src/renderer/src/hooks/ipc-events-close-routing-test-harness.ts
+++ b/src/renderer/src/hooks/ipc-events-close-routing-test-harness.ts
@@ -6,7 +6,7 @@ export type RequestTabCloseListener = (data: {
   tabId: string | null
   worktreeId?: string
 }) => void
-export type CloseActiveTabListener = () => void
+export type CloseActiveTabListener = (payload?: { sourceId: string }) => void
 export type CloseFloatingItemListener = (payload: { sourceId: string }) => void
 export type SelectFloatingIndexListener = (payload: { index: number }) => void
 export type CloseTerminalListener = (data: { tabId: string; paneRuntimeId?: number | null }) => void
diff --git a/src/renderer/src/hooks/ipc-events/agent-status-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/agent-status-ipc-bridge.ts
index 3a99527b1d3..26058a3e9e0 100644
--- a/src/renderer/src/hooks/ipc-events/agent-status-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/agent-status-ipc-bridge.ts
@@ -13,6 +13,7 @@ import type {
   AgentStatusBatchEvent,
   PendingAgentStatusEvent
 } from './agent-status-bridge-types'
+import { shouldRetryPendingAgentStatusesAfterStoreUpdate } from './agent-status-pending-retry-gate'
 
 const PENDING_AGENT_STATUS_RETRY_MS = 100
 const PENDING_AGENT_STATUS_TTL_MS = 15_000
@@ -94,8 +95,8 @@ export function registerAgentStatusIpcBridge(unsubs: (() => void)[]): AgentStatu
       }
     } finally {
       isFlushingAgentStatuses = false
+      schedulePendingAgentStatusFlush()
     }
-    schedulePendingAgentStatusFlush()
   }
 
   const applyAgentStatus = createAgentStatusEventApplicator({
@@ -261,7 +262,13 @@ export function registerAgentStatusIpcBridge(unsubs: (() => void)[]): AgentStatu
   requestAgentStatusSnapshotIfReady()
   const unsubscribeAgentStatusStore = useAppStore.subscribe((state, previousState) => {
     requestAgentStatusSnapshotIfReady()
-    flushPendingAgentStatuses()
+    // Why: the timer covers module-owned rekeys; unrelated store writes cannot change attribution and must not rebuild its routing index.
+    if (
+      pendingAgentStatusEvents.length > 0 &&
+      shouldRetryPendingAgentStatusesAfterStoreUpdate(state, previousState)
+    ) {
+      flushPendingAgentStatuses()
+    }
     syncAgentHookCompletionNotificationsForStoreUpdate(state, previousState)
   })
 
diff --git a/src/renderer/src/hooks/ipc-events/agent-status-pending-retry-gate.test.ts b/src/renderer/src/hooks/ipc-events/agent-status-pending-retry-gate.test.ts
new file mode 100644
index 00000000000..51e8161a8fc
--- /dev/null
+++ b/src/renderer/src/hooks/ipc-events/agent-status-pending-retry-gate.test.ts
@@ -0,0 +1,191 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { AgentStatusBatchUpdate } from '../../store/slices/agent-status'
+import {
+  buildStoreState,
+  FUTURE_LEAF_ID,
+  FUTURE_PANE_KEY,
+  type AgentStatusSetData,
+  type StoreLike,
+  type StoreSubscribeListener
+} from '../ipc-events-agent-status-store-test-fixtures'
+import { shouldRetryPendingAgentStatusesAfterStoreUpdate } from './agent-status-pending-retry-gate'
+
+type RetryState = Parameters<typeof shouldRetryPendingAgentStatusesAfterStoreUpdate>[0]
+
+function createRetryState(): RetryState {
+  return {
+    workspaceSessionReady: true,
+    tabsByWorktree: {},
+    unifiedTabsByWorktree: {},
+    terminalLayoutsByTabId: {},
+    worktreesByRepo: {},
+    repos: [],
+    recentlyClosedAgentStatusTabIds: {},
+    recentlyRetiredAgentStatusPaneKeys: {}
+  }
+}
+
+type PendingRetryHarness = {
+  bridge: { disposeAsyncState: () => void; unsubscribeStore: () => void }
+  emitPendingStatus: () => void
+  publish: (mutate: (state: StoreLike) => void) => void
+  setAgentStatuses: ReturnType<typeof vi.fn>
+  transactAgentStatuses: ReturnType<typeof vi.fn>
+}
+
+async function createPendingRetryHarness(): Promise<PendingRetryHarness> {
+  const subscribeListenerRef: { current: StoreSubscribeListener | null } = { current: null }
+  const onSetListenerRef: { current: ((data: AgentStatusSetData) => void) | null } = {
+    current: null
+  }
+  const setAgentStatuses = vi.fn((updates: readonly AgentStatusBatchUpdate[]) =>
+    updates.map(() => true)
+  )
+  const storeState = buildStoreState({
+    setAgentStatuses,
+    workspaceSessionReady: true,
+    tabsByWorktree: {},
+    terminalLayoutsByTabId: {},
+    settings: { terminalFontSize: 13, notifications: { enabled: false } }
+  })
+  const transactImplementation = storeState.transactAgentStatuses as (...args: unknown[]) => unknown
+  const transactAgentStatuses = vi.fn(transactImplementation)
+  storeState.transactAgentStatuses = transactAgentStatuses
+
+  vi.doMock('../../store', () => ({
+    useAppStore: {
+      subscribe: vi.fn((listener: StoreSubscribeListener) => {
+        subscribeListenerRef.current = listener
+        return () => {
+          subscribeListenerRef.current = null
+        }
+      }),
+      getState: () => storeState
+    }
+  }))
+  vi.doMock('../agent-hook-completion-notifications', () => ({
+    observeAgentHookCompletionForNotification: vi.fn(),
+    syncAgentHookCompletionNotificationsForStoreUpdate: vi.fn()
+  }))
+  vi.stubGlobal('window', {
+    api: {
+      agentStatus: {
+        onSet: (listener: (data: AgentStatusSetData) => void) => {
+          onSetListenerRef.current = listener
+          return () => {
+            onSetListenerRef.current = null
+          }
+        }
+      }
+    }
+  })
+
+  const { registerAgentStatusIpcBridge } = await import('./agent-status-ipc-bridge')
+  const bridge = registerAgentStatusIpcBridge([])
+  if (!subscribeListenerRef.current || !onSetListenerRef.current) {
+    throw new Error('Expected agent-status bridge listeners')
+  }
+
+  return {
+    bridge,
+    emitPendingStatus: () => {
+      onSetListenerRef.current?.({
+        paneKey: FUTURE_PANE_KEY,
+        state: 'working',
+        prompt: 'pending attribution',
+        agentType: 'claude',
+        receivedAt: 1_700_000_000_000,
+        stateStartedAt: 1_700_000_000_000
+      })
+    },
+    publish: (mutate) => {
+      const previousState = { ...storeState }
+      mutate(storeState)
+      subscribeListenerRef.current?.(storeState, previousState)
+    },
+    setAgentStatuses,
+    transactAgentStatuses
+  }
+}
+
+describe('agent status pending retry gate', () => {
+  beforeEach(() => {
+    vi.resetModules()
+    vi.useFakeTimers()
+    vi.setSystemTime(1_700_000_100_000)
+  })
+
+  afterEach(() => {
+    vi.useRealTimers()
+    vi.unstubAllGlobals()
+  })
+
+  it('tracks every store-owned input that can resolve or retire pending attribution', () => {
+    const previous = createRetryState()
+    const changes: RetryState[] = [
+      { ...previous, workspaceSessionReady: false },
+      { ...previous, tabsByWorktree: {} },
+      { ...previous, unifiedTabsByWorktree: {} },
+      { ...previous, terminalLayoutsByTabId: {} },
+      { ...previous, worktreesByRepo: {} },
+      { ...previous, repos: [] },
+      { ...previous, recentlyClosedAgentStatusTabIds: {} },
+      { ...previous, recentlyRetiredAgentStatusPaneKeys: {} }
+    ]
+
+    expect(shouldRetryPendingAgentStatusesAfterStoreUpdate({ ...previous }, previous)).toBe(false)
+    for (const current of changes) {
+      expect(shouldRetryPendingAgentStatusesAfterStoreUpdate(current, previous)).toBe(true)
+    }
+  })
+
+  it('skips retry transactions for unrelated publications and retries on hydration', async () => {
+    const harness = await createPendingRetryHarness()
+    harness.emitPendingStatus()
+
+    for (let updateIndex = 0; updateIndex < 2_400; updateIndex += 1) {
+      harness.publish((state) => {
+        state.cosmeticUpdateIndex = updateIndex
+      })
+    }
+
+    expect(harness.transactAgentStatuses).not.toHaveBeenCalled()
+
+    harness.publish((state) => {
+      state.tabsByWorktree = {
+        'wt-1': [{ id: 'tab-future', ptyId: 'pty-1', worktreeId: 'wt-1', title: 'Future' }]
+      }
+      state.terminalLayoutsByTabId = {
+        'tab-future': {
+          root: { type: 'leaf', leafId: FUTURE_LEAF_ID },
+          activeLeafId: FUTURE_LEAF_ID,
+          expandedLeafId: null
+        }
+      }
+    })
+
+    expect(harness.transactAgentStatuses).toHaveBeenCalledTimes(1)
+    expect(harness.setAgentStatuses).toHaveBeenCalledWith([
+      expect.objectContaining({ paneKey: FUTURE_PANE_KEY })
+    ])
+    vi.advanceTimersByTime(100)
+    expect(harness.transactAgentStatuses).toHaveBeenCalledTimes(1)
+    harness.bridge.unsubscribeStore()
+    harness.bridge.disposeAsyncState()
+  })
+
+  it('keeps the timer fallback when routing references stay unchanged', async () => {
+    const harness = await createPendingRetryHarness()
+    harness.emitPendingStatus()
+    harness.publish((state) => {
+      state.cosmeticUpdateIndex = 1
+    })
+
+    expect(harness.transactAgentStatuses).not.toHaveBeenCalled()
+    vi.advanceTimersByTime(100)
+    expect(harness.transactAgentStatuses).toHaveBeenCalledTimes(1)
+    expect(harness.setAgentStatuses).toHaveBeenCalledWith([])
+    harness.bridge.unsubscribeStore()
+    harness.bridge.disposeAsyncState()
+  })
+})
diff --git a/src/renderer/src/hooks/ipc-events/agent-status-pending-retry-gate.ts b/src/renderer/src/hooks/ipc-events/agent-status-pending-retry-gate.ts
new file mode 100644
index 00000000000..4b8dcc36a9e
--- /dev/null
+++ b/src/renderer/src/hooks/ipc-events/agent-status-pending-retry-gate.ts
@@ -0,0 +1,29 @@
+import type { AppState } from '../../store/types'
+
+type AgentStatusPendingRetryState = Pick<
+  AppState,
+  | 'workspaceSessionReady'
+  | 'tabsByWorktree'
+  | 'unifiedTabsByWorktree'
+  | 'terminalLayoutsByTabId'
+  | 'worktreesByRepo'
+  | 'repos'
+  | 'recentlyClosedAgentStatusTabIds'
+  | 'recentlyRetiredAgentStatusPaneKeys'
+>
+
+export function shouldRetryPendingAgentStatusesAfterStoreUpdate(
+  current: AgentStatusPendingRetryState,
+  previous: AgentStatusPendingRetryState
+): boolean {
+  return (
+    current.workspaceSessionReady !== previous.workspaceSessionReady ||
+    current.tabsByWorktree !== previous.tabsByWorktree ||
+    current.unifiedTabsByWorktree !== previous.unifiedTabsByWorktree ||
+    current.terminalLayoutsByTabId !== previous.terminalLayoutsByTabId ||
+    current.worktreesByRepo !== previous.worktreesByRepo ||
+    current.repos !== previous.repos ||
+    current.recentlyClosedAgentStatusTabIds !== previous.recentlyClosedAgentStatusTabIds ||
+    current.recentlyRetiredAgentStatusPaneKeys !== previous.recentlyRetiredAgentStatusPaneKeys
+  )
+}
diff --git a/src/renderer/src/hooks/ipc-events/tab-lifecycle-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/tab-lifecycle-ipc-bridge.ts
index b079dc9ad29..bf60e9dc0a1 100644
--- a/src/renderer/src/hooks/ipc-events/tab-lifecycle-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/tab-lifecycle-ipc-bridge.ts
@@ -25,6 +25,7 @@ import {
 } from '@/lib/floating-workspace-guest-bridge'
 
 import { useAppStore } from '../../store'
+import { resolveBrowserWorkspaceOwner } from '../../lib/browser-workspace-source-resolution'
 import {
   handleSwitchRecentTab,
   handleSwitchTab,
@@ -86,15 +87,29 @@ export function registerTabLifecycleIpcBridge(unsubs: (() => void)[]): void {
   )
 
   unsubs.push(
-    window.api.ui.onCloseActiveTab(() => {
-      if (isEmptyFloatingWorkspacePanelVisible()) {
+    window.api.ui.onCloseActiveTab((payload) => {
+      // Why: the empty-panel toggle is the ambient fallback only. A guest-originated close names a
+      // main-workspace target, so an open-but-empty floating panel must not swallow it.
+      if (!payload?.sourceId && isEmptyFloatingWorkspacePanelVisible()) {
         window.dispatchEvent(new Event(TOGGLE_FLOATING_TERMINAL_EVENT))
         return
       }
       const store = useAppStore.getState()
-      if (store.activeTabType === 'browser' && store.activeBrowserTabId) {
-        const tabId = store.activeBrowserTabId
-        const worktreeId = store.activeWorktreeId
+      // Why: a guest-originated close names its own page; the activeTabType mirror goes stale in
+      // split layouts (guest focus never reaches the group's focus-capture), so trust the source id.
+      const explicitTarget = payload?.sourceId
+        ? resolveBrowserWorkspaceOwner(store, payload.sourceId)
+        : null
+      if (payload?.sourceId && !explicitTarget) {
+        // Stale id (guest closed between keydown and IPC) = no-op, never the ambient fallback.
+        return
+      }
+      if (explicitTarget || (store.activeTabType === 'browser' && store.activeBrowserTabId)) {
+        const tabId = explicitTarget?.workspaceId ?? store.activeBrowserTabId
+        const worktreeId = explicitTarget?.worktreeId ?? store.activeWorktreeId
+        if (!tabId) {
+          return
+        }
         const closeActiveBrowserTab = (): void => {
           const currentStore = useAppStore.getState()
           if (!worktreeId) {
diff --git a/src/renderer/src/hooks/runtime-client-events-sync.test.ts b/src/renderer/src/hooks/runtime-client-events-sync.test.ts
index 9f237ce1c23..bd046856ad9 100644
--- a/src/renderer/src/hooks/runtime-client-events-sync.test.ts
+++ b/src/renderer/src/hooks/runtime-client-events-sync.test.ts
@@ -225,9 +225,8 @@ describe('createRuntimeClientEventsSync', () => {
   it('backs off exponentially with a cap while an environment keeps failing', async () => {
     vi.useFakeTimers()
     try {
-      const subscribe = vi.fn(
-        (): Promise<RuntimeClientEventSubscriptionHandle> =>
-          Promise.reject(new Error('unreachable'))
+      const subscribe = vi.fn((): Promise<RuntimeClientEventSubscriptionHandle> =>
+        Promise.reject(new Error('unreachable'))
       )
       const sync = createRuntimeClientEventsSync({
         getDesiredEnvironmentIds: () => ['A'],
@@ -266,9 +265,8 @@ describe('createRuntimeClientEventsSync', () => {
   it('applies jitter below the full backoff delay', async () => {
     vi.useFakeTimers()
     try {
-      const subscribe = vi.fn(
-        (): Promise<RuntimeClientEventSubscriptionHandle> =>
-          Promise.reject(new Error('unreachable'))
+      const subscribe = vi.fn((): Promise<RuntimeClientEventSubscriptionHandle> =>
+        Promise.reject(new Error('unreachable'))
       )
       const sync = createRuntimeClientEventsSync({
         getDesiredEnvironmentIds: () => ['A'],
@@ -344,9 +342,8 @@ describe('createRuntimeClientEventsSync', () => {
     vi.useFakeTimers()
     try {
       let subscriptionKey = 'A:1'
-      const subscribe = vi.fn(
-        (): Promise<RuntimeClientEventSubscriptionHandle> =>
-          Promise.reject(new Error('unreachable'))
+      const subscribe = vi.fn((): Promise<RuntimeClientEventSubscriptionHandle> =>
+        Promise.reject(new Error('unreachable'))
       )
       const sync = createRuntimeClientEventsSync({
         getDesiredEnvironmentIds: () => ['A'],
@@ -379,9 +376,8 @@ describe('createRuntimeClientEventsSync', () => {
   it('an external sync retries a waiting environment immediately (recovery path)', async () => {
     vi.useFakeTimers()
     try {
-      const subscribe = vi.fn(
-        (): Promise<RuntimeClientEventSubscriptionHandle> =>
-          Promise.reject(new Error('unreachable'))
+      const subscribe = vi.fn((): Promise<RuntimeClientEventSubscriptionHandle> =>
+        Promise.reject(new Error('unreachable'))
       )
       const sync = createRuntimeClientEventsSync({
         getDesiredEnvironmentIds: () => ['A'],
diff --git a/src/renderer/src/hooks/settings-navigation-build-options.ts b/src/renderer/src/hooks/settings-navigation-build-options.ts
new file mode 100644
index 00000000000..db2a4cedead
--- /dev/null
+++ b/src/renderer/src/hooks/settings-navigation-build-options.ts
@@ -0,0 +1,14 @@
+import type { Repo } from '../../../shared/repo-types'
+
+export type SettingsNavigationBuildOptions = {
+  isMac: boolean
+  isWindows: boolean
+  isLocalWindowsHost: boolean
+  isWindowsTerminalHost: boolean
+  isWebClient: boolean
+  managedBrowserCreationEnabled: boolean
+  mobileEmulatorCreationEnabled: boolean
+  isDev: boolean
+  isLinearConnected: boolean
+  repos: readonly Repo[]
+}
diff --git a/src/renderer/src/hooks/settings-navigation-capability-sections.ts b/src/renderer/src/hooks/settings-navigation-capability-sections.ts
new file mode 100644
index 00000000000..b207682844f
--- /dev/null
+++ b/src/renderer/src/hooks/settings-navigation-capability-sections.ts
@@ -0,0 +1,215 @@
+import { LinearIcon } from '@/components/icons/LinearIcon'
+import { getAccountsPaneSearchEntries } from '@/components/settings/accounts-search'
+import { getAgentsPaneSearchEntries } from '@/components/settings/agents-search'
+import { getComputerUsePaneSearchEntries } from '@/components/settings/computer-use-search'
+import { getGeneralPaneSearchEntries } from '@/components/settings/general-search'
+import { getIntegrationsPaneSearchEntries } from '@/components/settings/integrations-search'
+import { getLinearAgentSkillPaneSearchEntries } from '@/components/settings/linear-agent-skill-search'
+import { getMobileSettingsPaneSearchEntries } from '@/components/settings/mobile-settings-search'
+import { getOrcaAccountSettingsSearchEntries } from '@/components/settings/orca-account-settings-search'
+import { OrcaLogoSettingsIcon } from '@/components/settings/orca-logo-settings-icon'
+import { getOrchestrationPaneSearchEntries } from '@/components/settings/orchestration-search'
+import { getVoicePaneSearchEntries } from '@/components/settings/voice-pane-search'
+import { translate } from '@/i18n/i18n'
+import type { SettingsNavSection } from '@/lib/settings-navigation-types'
+import {
+  Blocks,
+  Bot,
+  CircleUserRound,
+  Mic,
+  MousePointerClick,
+  Network,
+  SlidersHorizontal,
+  Smartphone,
+  UserCog
+} from 'lucide-react'
+import type { SettingsNavigationBuildOptions } from './settings-navigation-build-options'
+
+export function buildCapabilitySettingsSections({
+  isLocalWindowsHost,
+  isWebClient,
+  isLinearConnected
+}: SettingsNavigationBuildOptions): SettingsNavSection[] {
+  const showDesktopOnlySettings = !isWebClient
+  return [
+    {
+      id: 'agents',
+      title: translate('auto.hooks.useSettingsNavigationMetadata.b49abbd2f7', 'Agents'),
+      description: translate(
+        'auto.hooks.useSettingsNavigationMetadata.4121f7a0a2',
+        'Manage AI agents, set a default, and customize commands.'
+      ),
+      icon: Bot,
+      searchEntries: getAgentsPaneSearchEntries({
+        includeAgentAwake: !isWebClient,
+        includeAgentRuntime: isLocalWindowsHost
+      }),
+      group: 'capabilities'
+    },
+    {
+      id: 'accounts',
+      title: translate(
+        'auto.hooks.useSettingsNavigationMetadata.f70ac54d38',
+        'AI Provider Accounts'
+      ),
+      description: translate(
+        'auto.hooks.useSettingsNavigationMetadata.b1c2f8b0ac',
+        'Optional account switching and usage setup for Claude, Codex, Gemini, OpenCode Go, MiniMax, and Grok.'
+      ),
+      icon: UserCog,
+      searchEntries: getAccountsPaneSearchEntries(),
+      group: 'capabilities',
+      badge: translate('auto.hooks.useSettingsNavigationMetadata.7c79d3b7bf', 'Optional')
+    },
+    {
+      id: 'orchestration',
+      title: translate('auto.hooks.useSettingsNavigationMetadata.58a868e8e4', 'Orchestration'),
+      description: translate(
+        'auto.hooks.useSettingsNavigationMetadata.cd50cec5d7',
+        'Coordinate multiple coding agents through Orca.'
+      ),
+      icon: Network,
+      searchEntries: getOrchestrationPaneSearchEntries({
+        includeNestedWorkerDepth: !isWebClient
+      }),
+      group: 'capabilities'
+    },
+    // Why: only surfaced once Linear is connected — a capability that needs a
+    // linked provider before the agent skill has anything to act on.
+    ...(isLinearConnected
+      ? [
+          {
+            id: 'linear',
+            title: translate('auto.hooks.useSettingsNavigationMetadata.linearTitle', 'Linear'),
+            description: translate(
+              'auto.hooks.useSettingsNavigationMetadata.linearDescription',
+              'How Linear works in Orca, setup checklist, agent skill, and example prompts.'
+            ),
+            icon: LinearIcon,
+            searchEntries: getLinearAgentSkillPaneSearchEntries(),
+            group: 'capabilities'
+          }
+        ]
+      : []),
+    ...(showDesktopOnlySettings
+      ? [
+          {
+            id: 'computer-use',
+            title: translate('auto.hooks.useSettingsNavigationMetadata.b35e92364b', 'Computer Use'),
+            description: translate(
+              'auto.hooks.useSettingsNavigationMetadata.0059bd17f3',
+              'Enable agents to control any app on your computer.'
+            ),
+            icon: MousePointerClick,
+            searchEntries: getComputerUsePaneSearchEntries(),
+            group: 'capabilities'
+          },
+          {
+            id: 'voice',
+            title: translate('auto.hooks.useSettingsNavigationMetadata.6a50cdcd7c', 'Voice'),
+            description: translate(
+              'auto.hooks.useSettingsNavigationMetadata.8ac3de82f5',
+              'Local speech-to-text dictation with on-device models.'
+            ),
+            icon: Mic,
+            searchEntries: getVoicePaneSearchEntries(),
+            group: 'capabilities'
+          }
+        ]
+      : [])
+  ]
+}
+
+export function buildSetupSettingsSections({
+  isLocalWindowsHost,
+  isWebClient
+}: SettingsNavigationBuildOptions): SettingsNavSection[] {
+  const showDesktopOnlySettings = !isWebClient
+  return [
+    ...(showDesktopOnlySettings
+      ? [
+          {
+            id: 'orca-account',
+            title: translate('auto.components.settings.orcaAccount.title', 'Orca Account'),
+            description: translate(
+              'auto.components.settings.orcaAccount.description',
+              'Share work instantly and reach your desktop from Orca Mobile wherever you are.'
+            ),
+            icon: CircleUserRound,
+            searchEntries: getOrcaAccountSettingsSearchEntries(),
+            group: 'setup'
+          }
+        ]
+      : []),
+    {
+      id: 'setup-guide',
+      title: translate(
+        'auto.hooks.useSettingsNavigationMetadata.ded9e9032f',
+        'Onboarding checklist'
+      ),
+      description: translate(
+        'auto.hooks.useSettingsNavigationMetadata.5f32ac08f3',
+        'Finish the onboarding checklist for core Orca workflows.'
+      ),
+      icon: OrcaLogoSettingsIcon,
+      searchEntries: [
+        {
+          title: translate(
+            'auto.hooks.useSettingsNavigationMetadata.ded9e9032f',
+            'Onboarding checklist'
+          ),
+          description: translate(
+            'auto.hooks.useSettingsNavigationMetadata.17005c73d4',
+            'Open the onboarding checklist for setup and milestone steps.'
+          ),
+          keywords: [
+            translate('auto.hooks.useSettingsNavigationMetadata.ea0b1bc7b8', 'setup guide'),
+            translate(
+              'auto.hooks.useSettingsNavigationMetadata.0505d0df29',
+              'get started with Orca'
+            ),
+            translate('auto.hooks.useSettingsNavigationMetadata.724c440e72', 'getting started')
+          ]
+        }
+      ],
+      group: 'setup'
+    },
+    {
+      id: 'general',
+      title: translate('auto.hooks.useSettingsNavigationMetadata.13241992bd', 'General'),
+      description: translate(
+        'auto.hooks.useSettingsNavigationMetadata.2cd4ea75da',
+        'Workspace defaults, app setup, and maintenance.'
+      ),
+      icon: SlidersHorizontal,
+      searchEntries: getGeneralPaneSearchEntries({ includeProjectRuntime: isLocalWindowsHost }),
+      group: 'setup'
+    },
+    {
+      id: 'integrations',
+      title: translate('auto.hooks.useSettingsNavigationMetadata.2b043783ef', 'Integrations'),
+      description: translate(
+        'auto.hooks.useSettingsNavigationMetadata.33a5e1d597',
+        'Connect GitHub, GitLab, Linear, and source-hosting services.'
+      ),
+      icon: Blocks,
+      searchEntries: getIntegrationsPaneSearchEntries(),
+      group: 'setup'
+    },
+    ...(showDesktopOnlySettings
+      ? [
+          {
+            id: 'mobile',
+            title: translate('auto.hooks.useSettingsNavigationMetadata.1cd25673df', 'Mobile'),
+            description: translate(
+              'auto.hooks.useSettingsNavigationMetadata.95a1886d94',
+              'Control terminals and agents from your phone.'
+            ),
+            icon: Smartphone,
+            searchEntries: getMobileSettingsPaneSearchEntries(),
+            group: 'setup'
+          }
+        ]
+      : [])
+  ]
+}
diff --git a/src/renderer/src/hooks/settings-navigation-interface-sections.ts b/src/renderer/src/hooks/settings-navigation-interface-sections.ts
new file mode 100644
index 00000000000..0208dd1f526
--- /dev/null
+++ b/src/renderer/src/hooks/settings-navigation-interface-sections.ts
@@ -0,0 +1,90 @@
+import { getAppearancePaneSearchEntries } from '@/components/settings/appearance-search'
+import { getInputPaneSearchEntries } from '@/components/settings/input-search'
+import { getNotificationsPaneSearchEntries } from '@/components/settings/notifications-search'
+import { getShortcutsPaneSearchEntries } from '@/components/settings/shortcuts-search'
+import { getStatsPaneSearchEntries } from '@/components/stats/stats-search'
+import { translate } from '@/i18n/i18n'
+import type { SettingsNavSection } from '@/lib/settings-navigation-types'
+import { BarChart3, Bell, Keyboard, Palette, TextCursorInput } from 'lucide-react'
+import type { SettingsNavigationBuildOptions } from './settings-navigation-build-options'
+
+export function buildInterfaceSettingsSections({
+  isMac,
+  isWindows,
+  isWebClient,
+  managedBrowserCreationEnabled,
+  mobileEmulatorCreationEnabled
+}: SettingsNavigationBuildOptions): SettingsNavSection[] {
+  const showDesktopOnlySettings = !isWebClient
+  return [
+    {
+      id: 'appearance',
+      title: translate('auto.hooks.useSettingsNavigationMetadata.93d88d20bf', 'Appearance'),
+      description: translate(
+        'auto.hooks.useSettingsNavigationMetadata.b11a5a48a2',
+        'Theme, zoom, app and terminal appearance, sidebars, and status bar.'
+      ),
+      icon: Palette,
+      searchEntries: getAppearancePaneSearchEntries({
+        showWarpImport: showDesktopOnlySettings,
+        showSystemTray: showDesktopOnlySettings && isWindows,
+        showMenuBarIcon: showDesktopOnlySettings && isMac
+      }),
+      group: 'interface'
+    },
+    {
+      id: 'input',
+      title: translate('auto.hooks.useSettingsNavigationMetadata.0c6ee88a5f', 'Input & Editing'),
+      description: translate(
+        'auto.hooks.useSettingsNavigationMetadata.1f452cbd4c',
+        'Selection and editing behavior.'
+      ),
+      icon: TextCursorInput,
+      searchEntries: getInputPaneSearchEntries(),
+      group: 'interface'
+    },
+    ...(showDesktopOnlySettings
+      ? [
+          {
+            id: 'notifications',
+            title: translate(
+              'auto.hooks.useSettingsNavigationMetadata.2eece16ad1',
+              'Notifications'
+            ),
+            description: translate(
+              'auto.hooks.useSettingsNavigationMetadata.7682607591',
+              'Native desktop notifications for agent and terminal events.'
+            ),
+            icon: Bell,
+            searchEntries: getNotificationsPaneSearchEntries(),
+            group: 'interface'
+          }
+        ]
+      : []),
+    {
+      id: 'shortcuts',
+      title: translate('auto.hooks.useSettingsNavigationMetadata.94295ebfb3', 'Shortcuts'),
+      description: translate(
+        'auto.hooks.useSettingsNavigationMetadata.dcd0d9b74f',
+        'Keyboard shortcuts for common actions.'
+      ),
+      icon: Keyboard,
+      searchEntries: getShortcutsPaneSearchEntries({
+        includeManagedBrowser: managedBrowserCreationEnabled,
+        includeMobileEmulator: mobileEmulatorCreationEnabled
+      }),
+      group: 'interface'
+    },
+    {
+      id: 'stats',
+      title: translate('auto.hooks.useSettingsNavigationMetadata.d72a58b5b9', 'Stats & Usage'),
+      description: translate(
+        'auto.hooks.useSettingsNavigationMetadata.b351014180',
+        'Orca stats plus Claude, Codex, OpenCode token analytics and Grok subscription usage.'
+      ),
+      icon: BarChart3,
+      searchEntries: getStatsPaneSearchEntries(),
+      group: 'interface'
+    }
+  ]
+}
diff --git a/src/renderer/src/hooks/settings-navigation-remote-sections.ts b/src/renderer/src/hooks/settings-navigation-remote-sections.ts
new file mode 100644
index 00000000000..5c53c3e0df9
--- /dev/null
+++ b/src/renderer/src/hooks/settings-navigation-remote-sections.ts
@@ -0,0 +1,205 @@
+import { getAdvancedPaneSearchEntries } from '@/components/settings/advanced-search'
+import { getDeveloperPermissionsPaneSearchEntries } from '@/components/settings/developer-permissions-search'
+import { getExperimentalPaneSearchEntries } from '@/components/settings/experimental-search'
+import { getPluginsPaneSearchEntries } from '@/components/settings/plugins-search'
+import { getPrivacyPaneSearchEntries } from '@/components/settings/privacy-search'
+import { getRepositoryPaneSearchEntries } from '@/components/settings/repository-search'
+import { buildSettingsProjectList } from '@/components/settings/settings-project-list'
+import { getSshPaneSearchEntries } from '@/components/settings/ssh-search'
+import { translate } from '@/i18n/i18n'
+import type { SettingsNavSection } from '@/lib/settings-navigation-types'
+import { getRepoKindLabel } from '../../../shared/repo-kind'
+import type { Repo } from '../../../shared/repo-types'
+import {
+  Blocks,
+  Bug,
+  Cable,
+  FlaskConical,
+  Lock,
+  Server,
+  ShieldCheck,
+  SlidersHorizontal,
+  Wrench
+} from 'lucide-react'
+import type { SettingsNavigationBuildOptions } from './settings-navigation-build-options'
+
+export function buildRemoteSettingsSections(
+  { isMac, isWindowsTerminalHost, isWebClient, isDev, repos }: SettingsNavigationBuildOptions,
+  runtimeEnvironmentsSearchEntry: SettingsNavSection['searchEntries'][number],
+  reposById: ReadonlyMap<string, Repo>
+): SettingsNavSection[] {
+  const showDesktopOnlySettings = !isWebClient
+  return [
+    ...(showDesktopOnlySettings
+      ? [
+          {
+            id: 'ssh',
+            title: translate('auto.hooks.useSettingsNavigationMetadata.94a5afe910', 'SSH Hosts'),
+            description: translate(
+              'auto.hooks.useSettingsNavigationMetadata.31e57d1c70',
+              'Use existing machines over SSH for files, terminals, Git, and workspaces.'
+            ),
+            icon: Cable,
+            searchEntries: getSshPaneSearchEntries(),
+            group: 'remote'
+          }
+        ]
+      : []),
+    {
+      id: 'servers',
+      title: translate(
+        'auto.hooks.useSettingsNavigationMetadata.de0c2907a1',
+        'Remote Orca Servers'
+      ),
+      description: isWebClient
+        ? 'Connect this browser to a saved Orca server.'
+        : 'Pair remote Orca runtimes for persistent sessions, richer remote state, and web or mobile handoff.',
+      icon: Server,
+      searchEntries: [runtimeEnvironmentsSearchEntry],
+      group: 'remote',
+      badge: translate('auto.hooks.useSettingsNavigationMetadata.40d80bad8a', 'Beta')
+    },
+    ...(showDesktopOnlySettings && isMac
+      ? [
+          {
+            id: 'developer-permissions',
+            title: translate(
+              'auto.hooks.useSettingsNavigationMetadata.d91ae31fbd',
+              'macOS Permissions'
+            ),
+            description: translate(
+              'auto.hooks.useSettingsNavigationMetadata.65ec7d1968',
+              'macOS privacy access for terminal-launched developer tools.'
+            ),
+            icon: ShieldCheck,
+            searchEntries: getDeveloperPermissionsPaneSearchEntries(),
+            group: 'security'
+          }
+        ]
+      : []),
+    {
+      id: 'privacy',
+      title: translate(
+        'auto.hooks.useSettingsNavigationMetadata.3618579df6',
+        'Privacy & Telemetry'
+      ),
+      description: translate(
+        'auto.hooks.useSettingsNavigationMetadata.8400cfe1c1',
+        'Anonymous usage data and telemetry controls.'
+      ),
+      icon: Lock,
+      searchEntries: getPrivacyPaneSearchEntries(),
+      group: 'security'
+    },
+    ...(showDesktopOnlySettings
+      ? [
+          {
+            id: 'advanced',
+            title: translate('auto.hooks.useSettingsNavigationMetadata.580a04cd81', 'Advanced'),
+            description: translate(
+              'auto.hooks.useSettingsNavigationMetadata.e338c507c1',
+              'Low-level compatibility settings for troubleshooting.'
+            ),
+            icon: Wrench,
+            searchEntries: getAdvancedPaneSearchEntries(),
+            group: 'advanced'
+          }
+        ]
+      : []),
+    // Why: dev tooling must not be reachable from packaged/web builds even if
+    // this pure metadata builder is called manually with isDev=true.
+    ...(showDesktopOnlySettings && import.meta.env.DEV && isDev
+      ? [
+          {
+            id: 'dev',
+            title: translate('auto.hooks.useSettingsNavigationMetadata.dev', 'Dev Tools'),
+            description: translate(
+              'auto.hooks.useSettingsNavigationMetadata.devDescription',
+              'Dev-only tools for exercising UI states.'
+            ),
+            // Why: distinct from the sibling Advanced section's Wrench so the two
+            // entries in the same 'advanced' group stay visually distinguishable.
+            icon: Bug,
+            searchEntries: getDevToolsPaneSearchEntries(),
+            group: 'advanced',
+            badge: translate('auto.hooks.useSettingsNavigationMetadata.devBadge', 'Dev')
+          }
+        ]
+      : []),
+    {
+      id: 'experimental',
+      title: translate('auto.hooks.useSettingsNavigationMetadata.225071c560', 'Experimental'),
+      description: translate(
+        'auto.hooks.useSettingsNavigationMetadata.4a728cd56b',
+        'New features that are still taking shape. Give them a try.'
+      ),
+      icon: FlaskConical,
+      searchEntries: getExperimentalPaneSearchEntries(),
+      group: 'experimental'
+    },
+    ...(showDesktopOnlySettings
+      ? [
+          {
+            id: 'plugins',
+            title: translate('auto.hooks.useSettingsNavigationMetadata.pluginsTitle', 'Plugins'),
+            description: translate(
+              'auto.hooks.useSettingsNavigationMetadata.pluginsDescription',
+              'Install and manage experimental Orca plugins.'
+            ),
+            icon: Blocks,
+            searchEntries: getPluginsPaneSearchEntries(),
+            group: 'experimental'
+          }
+        ]
+      : []),
+    // Why: one nav row per project, not per repo row — a project set up on
+    // multiple hosts (local + a Remote Orca Server, or two clones) collapses to
+    // a single entry. Derived from repos alone so this list matches the panes.
+    ...buildSettingsProjectList(repos).map(({ project, representativeRepoId, setups }) => {
+      const representativeRepo = reposById.get(representativeRepoId) ?? repos[0]
+      const hostSummary =
+        setups.length > 1
+          ? translate(
+              'auto.hooks.useSettingsNavigationMetadata.projectHostsSummary',
+              '{{value0}} hosts',
+              { value0: setups.length }
+            )
+          : (setups[0]?.path ?? representativeRepo.path)
+      return {
+        id: `repo-${representativeRepoId}`,
+        title: project.displayName,
+        description: `${getRepoKindLabel(project)} • ${hostSummary}`,
+        icon: SlidersHorizontal,
+        searchEntries: getRepositoryPaneSearchEntries(representativeRepo, {
+          windowsRuntimeSupported: isWindowsTerminalHost
+        }),
+        group: 'repositories'
+      }
+    })
+  ]
+}
+
+function getDevToolsPaneSearchEntries(): SettingsNavSection['searchEntries'] {
+  return [
+    {
+      title: translate(
+        'auto.hooks.useSettingsNavigationMetadata.devSearchNotificationPlayground',
+        'Notification playground'
+      ),
+      description: translate(
+        'auto.hooks.useSettingsNavigationMetadata.devSearchNotificationPlaygroundDescription',
+        'Trigger representative toast and notification UI states.'
+      ),
+      keywords: [
+        translate('auto.hooks.useSettingsNavigationMetadata.devSearchKeywordDev', 'dev'),
+        translate('auto.hooks.useSettingsNavigationMetadata.devSearchKeywordToast', 'toast'),
+        translate('auto.hooks.useSettingsNavigationMetadata.devSearchKeywordSonner', 'sonner'),
+        translate('auto.hooks.useSettingsNavigationMetadata.devSearchKeywordError', 'error'),
+        translate(
+          'auto.hooks.useSettingsNavigationMetadata.devSearchKeywordNotification',
+          'notification'
+        )
+      ]
+    }
+  ]
+}
diff --git a/src/renderer/src/hooks/settings-navigation-workflow-sections.ts b/src/renderer/src/hooks/settings-navigation-workflow-sections.ts
new file mode 100644
index 00000000000..9d3fbf9ad28
--- /dev/null
+++ b/src/renderer/src/hooks/settings-navigation-workflow-sections.ts
@@ -0,0 +1,176 @@
+import { getArtifactsSettingsSearchEntries } from '@/components/settings/artifacts-settings-search'
+import { getAutomationsSettingsSearchEntries } from '@/components/settings/automations-settings-search'
+import { getBrowserPaneCombinedSearchEntries } from '@/components/settings/browser-pane-search'
+import { getCommitMessageAiPaneSearchEntries } from '@/components/settings/commit-message-ai-search'
+import { getFloatingWorkspaceSearchEntries } from '@/components/settings/floating-workspace-search'
+import { getGitProviderApiBudgetSearchEntries } from '@/components/settings/git-provider-api-budget-search'
+import { getGitPaneSearchEntries } from '@/components/settings/git-search'
+import { getMobileEmulatorSearchEntries } from '@/components/settings/mobile-emulator-search'
+import { getQuickCommandsPaneSearchEntries } from '@/components/settings/quick-commands-search'
+import { getShareSkillsSettingsSearchEntries } from '@/components/settings/share-skills-settings-search'
+import { getTasksPaneSearchEntries } from '@/components/settings/tasks-search'
+import { translate } from '@/i18n/i18n'
+import type { SettingsNavSection } from '@/lib/settings-navigation-types'
+import {
+  BookOpen,
+  CalendarClock,
+  Files,
+  GitBranch,
+  Globe,
+  ListChecks,
+  PanelsTopLeft,
+  Play,
+  SquareTerminal,
+  TabletSmartphone
+} from 'lucide-react'
+import type { SettingsNavigationBuildOptions } from './settings-navigation-build-options'
+
+export function buildWorkflowSettingsSections(
+  { isWebClient }: SettingsNavigationBuildOptions,
+  terminalPaneSearchEntries: SettingsNavSection['searchEntries']
+): SettingsNavSection[] {
+  const showDesktopOnlySettings = !isWebClient
+  return [
+    {
+      id: 'automations',
+      title: translate('auto.hooks.useSettingsNavigationMetadata.automationsTitle', 'Automations'),
+      description: translate(
+        'auto.hooks.useSettingsNavigationMetadata.automationsDescription',
+        'Schedule agent work and choose whether Automations appears in the sidebar.'
+      ),
+      icon: CalendarClock,
+      searchEntries: getAutomationsSettingsSearchEntries(),
+      group: 'workflows'
+    },
+    {
+      id: 'artifacts',
+      title: translate('auto.hooks.useSettingsNavigationMetadata.artifactsTitle', 'Artifacts'),
+      description: translate(
+        'auto.hooks.useSettingsNavigationMetadata.artifactsDescription',
+        'Share HTML and Markdown files with your team and manage their public links.'
+      ),
+      icon: Files,
+      searchEntries: getArtifactsSettingsSearchEntries(),
+      group: 'workflows',
+      badge: translate('auto.hooks.useSettingsNavigationMetadata.40d80bad8a', 'Beta')
+    },
+    {
+      id: 'share-skills',
+      title: translate('auto.hooks.useSettingsNavigationMetadata.shareSkillsTitle', 'Share Skills'),
+      description: translate(
+        'auto.hooks.useSettingsNavigationMetadata.shareSkillsDescription',
+        'Share your skills with an unlisted link. Anyone who has it can install them.'
+      ),
+      // Why: the sidebar entry and the page header both use BookOpen for
+      // skills, so the settings row that opens them matches.
+      icon: BookOpen,
+      searchEntries: getShareSkillsSettingsSearchEntries(),
+      group: 'workflows',
+      badge: translate('auto.hooks.useSettingsNavigationMetadata.40d80bad8a', 'Beta')
+    },
+    {
+      id: 'git',
+      title: translate(
+        'auto.hooks.useSettingsNavigationMetadata.09607cb0fe',
+        'Git & Source Control'
+      ),
+      description: translate(
+        'auto.hooks.useSettingsNavigationMetadata.ab4b21b58e',
+        'Branch naming, base refs, and Git AI Author.'
+      ),
+      icon: GitBranch,
+      // Why: Git AI Author is rendered inside Git, so shared
+      // metadata must search both surfaces wherever Git appears.
+      searchEntries: [
+        ...getGitPaneSearchEntries(),
+        ...getCommitMessageAiPaneSearchEntries(),
+        ...getGitProviderApiBudgetSearchEntries()
+      ],
+      group: 'workflows'
+    },
+    {
+      id: 'tasks',
+      title: translate('auto.hooks.useSettingsNavigationMetadata.85f4fd7710', 'Task Sources'),
+      description: translate(
+        'auto.hooks.useSettingsNavigationMetadata.tasksDescription',
+        'Connect providers, install the Linear skill, and choose what appears in Tasks.'
+      ),
+      icon: ListChecks,
+      searchEntries: getTasksPaneSearchEntries(),
+      group: 'workflows'
+    },
+    {
+      id: 'terminal',
+      title: translate('auto.hooks.useSettingsNavigationMetadata.a9fb10afca', 'Terminal'),
+      description: translate(
+        'auto.hooks.useSettingsNavigationMetadata.c33bfd664c',
+        'Shells, renderer, sessions, and terminal behavior.'
+      ),
+      icon: SquareTerminal,
+      searchEntries: terminalPaneSearchEntries,
+      group: 'workflows'
+    },
+    {
+      id: 'quick-commands',
+      title: translate('auto.hooks.useSettingsNavigationMetadata.3fc3db144f', 'Quick Commands'),
+      description: translate(
+        'auto.hooks.useSettingsNavigationMetadata.42ae40842f',
+        'Saved terminal commands, scoped globally or per project.'
+      ),
+      icon: Play,
+      searchEntries: getQuickCommandsPaneSearchEntries(),
+      group: 'workflows'
+    },
+    ...(showDesktopOnlySettings
+      ? [
+          {
+            id: 'browser',
+            title: translate('auto.hooks.useSettingsNavigationMetadata.8c197f74a1', 'Browser'),
+            description: translate(
+              'auto.hooks.useSettingsNavigationMetadata.e815fd01bd',
+              'Home page, link routing, and session cookies.'
+            ),
+            icon: Globe,
+            searchEntries: getBrowserPaneCombinedSearchEntries(),
+            group: 'workflows'
+          }
+        ]
+      : []),
+    ...(showDesktopOnlySettings
+      ? [
+          {
+            id: 'mobile-emulator',
+            title: translate(
+              'auto.hooks.useSettingsNavigationMetadata.1e761cff2b',
+              'Mobile Emulator'
+            ),
+            description: translate(
+              'auto.hooks.useSettingsNavigationMetadata.3d65d3f1b9',
+              'Configure mobile emulator support for Orca and coding agents.'
+            ),
+            icon: TabletSmartphone,
+            searchEntries: getMobileEmulatorSearchEntries(),
+            group: 'workflows'
+          }
+        ]
+      : []),
+    {
+      id: 'floating-workspace',
+      title: translate('auto.hooks.useSettingsNavigationMetadata.65b19f5bde', 'Floating Workspace'),
+      description: showDesktopOnlySettings
+        ? translate(
+            'auto.hooks.useSettingsNavigationMetadata.2d0659f6f0',
+            'Global terminal, browser, and markdown tabs.'
+          )
+        : translate(
+            'auto.hooks.useSettingsNavigationMetadata.floatingWorkspaceWebDescription',
+            'Global terminal and markdown tabs.'
+          ),
+      icon: PanelsTopLeft,
+      searchEntries: getFloatingWorkspaceSearchEntries({
+        includeBrowser: showDesktopOnlySettings
+      }),
+      group: 'workflows'
+    }
+  ]
+}
diff --git a/src/renderer/src/hooks/useAutomationDispatchEvents.test.ts b/src/renderer/src/hooks/useAutomationDispatchEvents.test.ts
index 81fc23a5728..b8c1cb49c17 100644
--- a/src/renderer/src/hooks/useAutomationDispatchEvents.test.ts
+++ b/src/renderer/src/hooks/useAutomationDispatchEvents.test.ts
@@ -1,6 +1,7 @@
 import type * as ReactModule from 'react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { AUTOMATIONS_CHANGED_EVENT } from '@/lib/automations-changed-window-event'
+import { countUnchangedObserverHistoryReads } from './automation-dispatch-observer-test-probe'
 
 const mockDispatchEvent = vi.fn()
 
@@ -620,10 +621,11 @@ describe('useAutomationDispatchEvents setup launch', () => {
     await vi.waitFor(() => expect(mockFinalizeTerminalOwnership).toHaveBeenCalledOnce())
   })
 
-  it('persists assistant output from a batched working→done→working transition', async () => {
+  it('skips unchanged status and persists batched working→done→working output', async () => {
     const paneKey = 'agent-tab:7c6fb4e5-3bf1-4ff4-8259-03f7ae81c40d'
 
     await registerAndDispatch()
+    expect(countUnchangedObserverHistoryReads(state, latestStoreSubscriber)).toBe(0)
     const transitionStartedAt = Date.now() + 1
     state.agentStatusByPaneKey = {
       [paneKey]: {
diff --git a/src/renderer/src/hooks/useAutomationDispatchEvents.ts b/src/renderer/src/hooks/useAutomationDispatchEvents.ts
index 1e46b315f28..f4963a6dea7 100644
--- a/src/renderer/src/hooks/useAutomationDispatchEvents.ts
+++ b/src/renderer/src/hooks/useAutomationDispatchEvents.ts
@@ -1,689 +1,9 @@
-/* eslint-disable max-lines -- Why: automation dispatch is a single renderer lifecycle
- * coordinator spanning workspace creation, SSH readiness, terminal launch/reuse,
- * completion bookkeeping, and focus restoration. */
 import { useEffect } from 'react'
-import { launchAgentBackgroundSession } from '@/lib/launch-agent-background-session'
-import { submitPromptToAgentPty } from '@/lib/agent-paste-draft'
-import { findReusableAutomationSession } from '@/lib/automation-session-reuse'
-import { observeExistingAutomationSession } from '@/lib/automation-session-observer'
-import { launchWorktreeBackgroundTerminals } from '@/lib/launch-worktree-background-terminals'
-import { useAppStore } from '@/store'
-import type {
-  AutomationDispatchResult,
-  AutomationPrecheckResult
-} from '../../../shared/automations-types'
-import { getAutomationRunRepoId } from '../../../shared/automation-run-identity'
-import {
-  didAutomationPrecheckPass,
-  formatAutomationPrecheckFailure
-} from '../../../shared/automation-precheck'
-import {
-  createAutomationRunOutputSnapshotBuffer,
-  selectAutomationRunOutputSnapshot
-} from '@/components/automations/automation-run-output-snapshot'
-import { translate } from '@/i18n/i18n'
-import { createBrowserUuid } from '@/lib/browser-uuid'
-import type { AutomationTerminalOwnership } from '@/lib/automation-terminal-ownership'
-import { getResolvedExecutionHostIdForWorktree } from '@/lib/resolved-worktree-execution-host'
-import { listAutomationRunsForTarget } from '@/components/automations/automation-host-client'
-import {
-  getRepoExecutionHostId,
-  parseExecutionHostId,
-  toSshExecutionHostId
-} from '../../../shared/execution-host'
-import { parseWorkspaceKey } from '../../../shared/workspace-scope'
-import type { AgentStateHistoryEntry } from '../../../shared/agent-status-types'
-import { resolveFolderWorkspaceHost } from '../../../shared/folder-workspace-execution-host'
-
-const activeReuseDispatchTabIds = new Set<string>()
-
-function acquireReuseDispatchTab(tabId: string): (() => void) | null {
-  if (activeReuseDispatchTabIds.has(tabId)) {
-    return null
-  }
-  activeReuseDispatchTabIds.add(tabId)
-  return () => activeReuseDispatchTabIds.delete(tabId)
-}
-
-function buildAutomationWorkspaceName(runTitle: string, scheduledFor: number): string {
-  const slug = runTitle
-    .toLowerCase()
-    .replace(/[^a-z0-9]+/g, '-')
-    .replace(/^-|-$/g, '')
-    .slice(0, 40)
-  const stamp = new Date(scheduledFor).toISOString().replace(/[-:]/g, '').slice(0, 13)
-  return `auto-${slug || 'run'}-${stamp}`
-}
-
-function agentStateHistoryEntriesEqual(
-  left: AgentStateHistoryEntry,
-  right: AgentStateHistoryEntry
-): boolean {
-  return (
-    left.state === right.state &&
-    left.prompt === right.prompt &&
-    left.startedAt === right.startedAt &&
-    left.interrupted === right.interrupted
-  )
-}
-
-function getAgentStateHistoryOverlap(
-  previous: AgentStateHistoryEntry[],
-  current: AgentStateHistoryEntry[]
-): number {
-  for (let overlap = Math.min(previous.length, current.length); overlap > 0; overlap -= 1) {
-    const previousOffset = previous.length - overlap
-    if (
-      current
-        .slice(0, overlap)
-        .every((entry, index) =>
-          agentStateHistoryEntriesEqual(entry, previous[previousOffset + index])
-        )
-    ) {
-      return overlap
-    }
-  }
-  return 0
-}
+import { handleAutomationDispatchRequest } from './automation-dispatch-handler'
 
 export function useAutomationDispatchEvents(): void {
   useEffect(() => {
-    const unsubscribe = window.api.automations.onDispatchRequested(
-      async ({ automation, run, dispatchToken }) => {
-        const markDispatchResult = async (result: AutomationDispatchResult): Promise<void> => {
-          // Deliberately no local emit: the write publishes its own host-scoped event
-          // (automation-run-writer.ts) before this reply returns, and an unscoped one
-          // here would arrive second and invalidate every host in the catalog.
-          await window.api.automations.markDispatchResult(result)
-        }
-        const state = useAppStore.getState()
-        const focusBeforeDispatch = {
-          activeView: state.activeView,
-          activeWorktreeId: state.activeWorktreeId,
-          activeTabId: state.activeTabId,
-          activeTabType: state.activeTabType
-        }
-        const runRepoId = getAutomationRunRepoId(automation)
-        const repo = state.repos.find((entry) => entry.id === runRepoId)
-        const automationWorkspaceScope = parseWorkspaceKey(automation.workspaceId ?? '')
-        const automationWorktree = automation.workspaceId
-          ? automationWorkspaceScope?.type === 'folder'
-            ? state.getKnownWorktreeById(automation.workspaceId)
-            : state.allWorktrees().find((entry) => entry.id === automation.workspaceId)
-          : null
-        let dispatchWorkspaceId = automation.workspaceId
-        let dispatchWorkspaceDisplayName =
-          automationWorktree?.displayName ?? run.workspaceDisplayName ?? null
-        let precheckResult: AutomationPrecheckResult | null = null
-        let terminalOwnership: AutomationTerminalOwnership | null = null
-        const releaseTerminalOwnership = (): void => {
-          const ownership = terminalOwnership
-          terminalOwnership = null
-          ownership?.release()
-        }
-        const finalizeTerminalOwnership = (): boolean => {
-          const ownership = terminalOwnership
-          terminalOwnership = null
-          return ownership?.finalize() ?? false
-        }
-
-        if (!repo) {
-          await markDispatchResult({
-            runId: run.id,
-            status: 'skipped_unavailable',
-            workspaceId: run.workspaceId,
-            workspaceDisplayName: run.workspaceDisplayName ?? null,
-            error: translate(
-              'auto.hooks.useAutomationDispatchEvents.386db94f3e',
-              'The target project is no longer available.'
-            )
-          })
-          return
-        }
-
-        try {
-          const folderWorkspaceHost =
-            automationWorkspaceScope?.type === 'folder'
-              ? resolveFolderWorkspaceHost(state, automationWorkspaceScope.folderWorkspaceId)
-              : null
-          const folderWorkspaceConnectionId =
-            folderWorkspaceHost?.kind === 'ssh' ? folderWorkspaceHost.targetId : null
-          // A workspace whose host does not resolve to one place is refused, not guessed at.
-          const folderWorkspaceHostUnresolved =
-            folderWorkspaceHost !== null && folderWorkspaceHost.kind === 'ambiguous'
-          const folderWorkspaceHostId =
-            folderWorkspaceHost && automationWorktree
-              ? folderWorkspaceConnectionId
-                ? toSshExecutionHostId(folderWorkspaceConnectionId)
-                : folderWorkspaceHost.kind === 'local'
-                  ? getResolvedExecutionHostIdForWorktree(state, automationWorktree.id)
-                  : null
-              : null
-          const runHostId =
-            parseExecutionHostId(automation.runContext?.hostId)?.id ?? getRepoExecutionHostId(repo)
-          const workspaceMatchesRunTarget =
-            automationWorkspaceScope?.type === 'folder'
-              ? folderWorkspaceHostId !== null && folderWorkspaceHostId === runHostId
-              : !automation.runContext?.repoId ||
-                automationWorktree?.repoId === automation.runContext.repoId
-          if (
-            automation.workspaceMode === 'existing' &&
-            automationWorktree &&
-            !workspaceMatchesRunTarget
-          ) {
-            await markDispatchResult({
-              runId: run.id,
-              status: 'skipped_unavailable',
-              workspaceId: automation.workspaceId,
-              workspaceDisplayName: dispatchWorkspaceDisplayName,
-              error: folderWorkspaceHostUnresolved
-                ? translate(
-                    'auto.hooks.useAutomationDispatchEvents.workspaceHostUnresolved',
-                    'The target workspace spans more than one host, so this run has no single host to use.'
-                  )
-                : translate(
-                    'auto.hooks.useAutomationDispatchEvents.3ad7d77f57',
-                    'The target workspace is on a different host than this automation run target.'
-                  )
-            })
-            return
-          }
-          const sshTargetId =
-            automationWorkspaceScope?.type === 'folder'
-              ? (folderWorkspaceConnectionId ?? null)
-              : (repo.connectionId ?? null)
-          if (sshTargetId) {
-            const needsPrompt = await window.api.ssh.needsPassphrasePrompt({
-              targetId: sshTargetId
-            })
-            if (needsPrompt) {
-              await markDispatchResult({
-                runId: run.id,
-                status: 'skipped_needs_interactive_auth',
-                workspaceId: dispatchWorkspaceId,
-                workspaceDisplayName: dispatchWorkspaceDisplayName,
-                error: translate(
-                  'auto.hooks.useAutomationDispatchEvents.16a21d6413',
-                  'SSH reconnect requires interactive credentials.'
-                )
-              })
-              return
-            }
-            const sshState = await window.api.ssh.getState({ targetId: sshTargetId })
-            if (sshState?.status !== 'connected') {
-              try {
-                const connected = await window.api.ssh.connect({ targetId: sshTargetId })
-                if (connected?.status !== 'connected') {
-                  throw new Error('SSH target is unavailable.')
-                }
-              } catch (error) {
-                await markDispatchResult({
-                  runId: run.id,
-                  status: 'skipped_unavailable',
-                  workspaceId: dispatchWorkspaceId,
-                  workspaceDisplayName: dispatchWorkspaceDisplayName,
-                  error: error instanceof Error ? error.message : String(error)
-                })
-                return
-              }
-            }
-          }
-
-          if (automation.workspaceMode === 'existing' && !automationWorktree) {
-            await markDispatchResult({
-              runId: run.id,
-              status: 'skipped_unavailable',
-              workspaceId: automation.workspaceId,
-              workspaceDisplayName: dispatchWorkspaceDisplayName,
-              error: translate(
-                'auto.hooks.useAutomationDispatchEvents.59718b120b',
-                'The target workspace is no longer available.'
-              )
-            })
-            return
-          }
-
-          if (run.trigger === 'scheduled' && automation.precheck) {
-            precheckResult = await window.api.automations.runPrecheck({
-              automationId: automation.id,
-              runId: run.id
-            })
-            if (precheckResult && !didAutomationPrecheckPass(precheckResult)) {
-              await markDispatchResult({
-                runId: run.id,
-                status: 'skipped_precheck',
-                workspaceId: dispatchWorkspaceId,
-                workspaceDisplayName: dispatchWorkspaceDisplayName,
-                precheckResult,
-                error: formatAutomationPrecheckFailure(precheckResult)
-              })
-              return
-            }
-          }
-
-          const automationWorkspaceCreateRequestId = createBrowserUuid()
-          const createResult =
-            automation.workspaceMode === 'new_per_run'
-              ? await useAppStore.getState().createWorktree(
-                  runRepoId,
-                  buildAutomationWorkspaceName(run.title, run.scheduledFor),
-                  automation.baseBranch ?? undefined,
-                  automation.setupDecision ?? 'skip',
-                  undefined,
-                  'unknown',
-                  run.title,
-                  undefined,
-                  undefined,
-                  undefined,
-                  // Why: the automation session below owns the prompt-bearing
-                  // agent tab; createdWithAgent would reopen an empty fallback.
-                  undefined,
-                  undefined,
-                  undefined,
-                  undefined,
-                  undefined,
-                  undefined,
-                  undefined,
-                  undefined,
-                  undefined,
-                  undefined,
-                  undefined,
-                  undefined,
-                  undefined,
-                  undefined,
-                  undefined,
-                  {
-                    automationProvenanceRequest: {
-                      automationId: automation.id,
-                      automationRunId: run.id,
-                      dispatchToken,
-                      createRequestId: automationWorkspaceCreateRequestId
-                    }
-                  }
-                )
-              : null
-          const worktree = createResult
-            ? createResult.worktree
-            : automation.workspaceId
-              ? automationWorktree
-              : null
-
-          if (!worktree) {
-            await markDispatchResult({
-              runId: run.id,
-              status: 'skipped_unavailable',
-              workspaceId: automation.workspaceId,
-              workspaceDisplayName: dispatchWorkspaceDisplayName,
-              error: translate(
-                'auto.hooks.useAutomationDispatchEvents.59718b120b',
-                'The target workspace is no longer available.'
-              )
-            })
-            return
-          }
-          dispatchWorkspaceId = worktree.id
-          dispatchWorkspaceDisplayName = worktree.displayName
-          if (createResult?.setup || createResult?.defaultTabs) {
-            void launchWorktreeBackgroundTerminals({
-              worktreeId: worktree.id,
-              setup: createResult.setup,
-              defaultTabs: createResult.defaultTabs
-            }).catch((error) => {
-              // Why: setup/defaultTabs match normal worktree creation: they are
-              // best-effort terminal work and must not block the automation agent.
-              console.warn('[automations] Failed to launch workspace setup/default tabs:', error)
-            })
-          }
-
-          const outputSnapshotBuffer = createAutomationRunOutputSnapshotBuffer()
-          let latestAssistantMessage: string | null = null
-          const getOutputSnapshot = () =>
-            selectAutomationRunOutputSnapshot(
-              latestAssistantMessage,
-              outputSnapshotBuffer.snapshot()
-            )
-          let dispatchMarked = false
-          let pendingExitCode: number | null = null
-          let pendingDone = false
-          let completionMarked = false
-          let unsubscribeAgentStatus = (): void => {}
-          let unsubscribeSessionObserver = (): void => {}
-          let releaseReuseDispatchTab = (): void => {}
-          const cleanupRunObservers = (): void => {
-            unsubscribeAgentStatus()
-            unsubscribeSessionObserver()
-            releaseReuseDispatchTab()
-            unsubscribeAgentStatus = (): void => {}
-            unsubscribeSessionObserver = (): void => {}
-            releaseReuseDispatchTab = (): void => {}
-          }
-          const markCompletionResult = async (): Promise<void> => {
-            if (completionMarked) {
-              return
-            }
-            completionMarked = true
-            cleanupRunObservers()
-            try {
-              await markDispatchResult({
-                runId: run.id,
-                status: 'completed',
-                workspaceId: worktree.id,
-                workspaceDisplayName: worktree.displayName,
-                outputSnapshot: getOutputSnapshot(),
-                precheckResult,
-                error: null
-              })
-            } catch (error) {
-              releaseTerminalOwnership()
-              throw error
-            }
-            if (finalizeTerminalOwnership()) {
-              await clearRetiredRunTerminalIdentity()
-            }
-          }
-          const clearRetiredRunTerminalIdentity = async (): Promise<void> => {
-            // Why: the owned terminal was just retired, so the run's pane/pty
-            // pointers now reference a closed tab. Drop them (best-effort) so
-            // "View run" resolves to the workspace/snapshot instead of dead-ending
-            // on an unavailable terminal.
-            try {
-              await markDispatchResult({
-                runId: run.id,
-                status: 'completed',
-                terminalSessionId: null,
-                terminalPaneKey: null,
-                terminalPtyId: null
-              })
-            } catch (error) {
-              console.error('[automations] Failed to clear retired terminal identity:', error)
-            }
-          }
-          const markExitResult = async (code: number): Promise<void> => {
-            if (completionMarked) {
-              return
-            }
-            completionMarked = true
-            cleanupRunObservers()
-            try {
-              await markDispatchResult({
-                runId: run.id,
-                status: code === 0 ? 'completed' : 'dispatch_failed',
-                workspaceId: worktree.id,
-                workspaceDisplayName: worktree.displayName,
-                outputSnapshot: getOutputSnapshot(),
-                precheckResult,
-                error: code === 0 ? null : `Automation process exited with code ${code}.`
-              })
-            } catch (error) {
-              releaseTerminalOwnership()
-              throw error
-            }
-            if (code === 0) {
-              if (finalizeTerminalOwnership()) {
-                await clearRetiredRunTerminalIdentity()
-              }
-            } else {
-              releaseTerminalOwnership()
-            }
-          }
-          const settleLateResult = (result: Promise<void>): void => {
-            // Why: status/exit callbacks have no awaitable caller; the result
-            // path already releases ownership before propagating persistence errors.
-            void result.catch((error) => {
-              console.error('[automations] Failed to persist late automation result:', error)
-            })
-          }
-          const handleAgentDone = (): void => {
-            if (completionMarked) {
-              return
-            }
-            if (!dispatchMarked) {
-              pendingDone = true
-              return
-            }
-            settleLateResult(markCompletionResult())
-          }
-          const observeAgentStatus = (
-            targetPaneKey: string,
-            startedAfter: number,
-            options?: { requireWorkingAfterStart?: boolean }
-          ): void => {
-            let sawWorkingAfterStart = false
-            let observedStateHistory: AgentStateHistoryEntry[] = []
-            const checkCurrentStatus = (): void => {
-              const { agentStatusByPaneKey } = useAppStore.getState()
-              for (const [paneKey, entry] of Object.entries(agentStatusByPaneKey)) {
-                if (paneKey !== targetPaneKey || entry.updatedAt < startedAfter) {
-                  continue
-                }
-                const historyOverlap = getAgentStateHistoryOverlap(
-                  observedStateHistory,
-                  entry.stateHistory
-                )
-                // Why: sawWorkingAfterStart stays monotonic — a recreated entry
-                // (transport loss, PTY exit, cap eviction) arrives with an empty
-                // stateHistory, so clearing it here would strand reuseSession runs
-                // with nothing left to re-derive the working edge from.
-                for (const historicalState of entry.stateHistory.slice(historyOverlap)) {
-                  if (historicalState.startedAt < startedAfter) {
-                    continue
-                  }
-                  if (historicalState.state === 'working') {
-                    sawWorkingAfterStart = true
-                  }
-                  if (
-                    historicalState.state === 'done' &&
-                    (!options?.requireWorkingAfterStart || sawWorkingAfterStart)
-                  ) {
-                    // Why: this `done` already rolled out of the live entry, so its output
-                    // survives only in the entry-level completed slot.
-                    latestAssistantMessage =
-                      entry.lastCompletedAssistantMessage?.trim() || latestAssistantMessage
-                    handleAgentDone()
-                    return
-                  }
-                }
-                observedStateHistory = [...entry.stateHistory]
-                if (entry.state === 'working') {
-                  sawWorkingAfterStart = true
-                }
-                if (
-                  entry.state === 'done' &&
-                  // Why: a session-boundary done is the agent CONNECTING (Claude SessionStart
-                  // fires at launch, before the argv prompt submits) — completing here would
-                  // close the tab and record an empty run result.
-                  entry.sessionBoundary !== true &&
-                  (!options?.requireWorkingAfterStart || sawWorkingAfterStart)
-                ) {
-                  latestAssistantMessage =
-                    entry.lastAssistantMessage?.trim() || latestAssistantMessage
-                  handleAgentDone()
-                  return
-                }
-              }
-            }
-            // Why: Codex/Claude completion normally arrives through the global
-            // hook IPC listener, not the hidden PTY OSC fallback.
-            unsubscribeAgentStatus = useAppStore.subscribe(checkCurrentStatus)
-            checkCurrentStatus()
-          }
-          const dispatchStartedAt = Date.now()
-          if (automation.reuseSession) {
-            const reusableSession = findReusableAutomationSession({
-              automationId: automation.id,
-              agentId: automation.agentId,
-              worktreeId: worktree.id,
-              currentRunId: run.id,
-              // Why: the dispatch loop only ever executes for the desktop authority,
-              // so its history read addresses the local runtime explicitly.
-              runs: await listAutomationRunsForTarget({ kind: 'local' }, automation.id),
-              state: useAppStore.getState()
-            })
-            if (reusableSession) {
-              const releaseTab = acquireReuseDispatchTab(reusableSession.tabId)
-              if (releaseTab) {
-                releaseReuseDispatchTab = releaseTab
-                try {
-                  const submitted = await submitPromptToAgentPty({
-                    tabId: reusableSession.tabId,
-                    ptyId: reusableSession.ptyId,
-                    content: automation.prompt
-                  })
-                  if (!submitted) {
-                    cleanupRunObservers()
-                  } else {
-                    let reuseSawWorking = false
-                    const handleReusableAgentStatus = (payload: { state: string }): void => {
-                      if (payload.state === 'working') {
-                        reuseSawWorking = true
-                        return
-                      }
-                      if (payload.state === 'done' && reuseSawWorking) {
-                        handleAgentDone()
-                      }
-                    }
-                    const reuseCompletionStartedAt = Date.now()
-                    unsubscribeSessionObserver = await observeExistingAutomationSession({
-                      ptyId: reusableSession.ptyId,
-                      paneKey: reusableSession.paneKey,
-                      runId: run.id,
-                      onData: (chunk) => {
-                        outputSnapshotBuffer.append(chunk)
-                      },
-                      onAgentStatus: (payload) => {
-                        latestAssistantMessage =
-                          payload.lastAssistantMessage?.trim() || latestAssistantMessage
-                        handleReusableAgentStatus(payload)
-                      },
-                      onExit: (code) => {
-                        if (completionMarked) {
-                          return
-                        }
-                        if (!dispatchMarked) {
-                          pendingExitCode = code
-                          return
-                        }
-                        settleLateResult(markExitResult(code))
-                      }
-                    })
-                    observeAgentStatus(reusableSession.paneKey, reuseCompletionStartedAt, {
-                      requireWorkingAfterStart: true
-                    })
-                    await markDispatchResult({
-                      runId: run.id,
-                      status: 'dispatched',
-                      workspaceId: worktree.id,
-                      workspaceDisplayName: worktree.displayName,
-                      terminalSessionId: reusableSession.tabId,
-                      terminalPaneKey: reusableSession.paneKey,
-                      terminalPtyId: reusableSession.ptyId,
-                      precheckResult,
-                      error: null
-                    })
-                    dispatchMarked = true
-                    if (pendingDone) {
-                      await markCompletionResult()
-                    } else if (pendingExitCode !== null) {
-                      await markExitResult(pendingExitCode)
-                    }
-                    return
-                  }
-                } catch (error) {
-                  cleanupRunObservers()
-                  throw error
-                }
-              }
-            }
-          }
-          const result = await launchAgentBackgroundSession({
-            agent: automation.agentId,
-            worktreeId: worktree.id,
-            prompt: automation.prompt,
-            launchSource: 'unknown',
-            title: run.title,
-            onData: (chunk) => {
-              outputSnapshotBuffer.append(chunk)
-            },
-            onAgentStatus: (payload) => {
-              latestAssistantMessage =
-                payload.lastAssistantMessage?.trim() || latestAssistantMessage
-              // Why: session-boundary done = launch connect, not run completion (see observeAgentStatus).
-              if (payload.state !== 'done' || payload.sessionBoundary === true) {
-                return
-              }
-              handleAgentDone()
-            },
-            onExit: (_ptyId, code) => {
-              if (completionMarked) {
-                return
-              }
-              if (!dispatchMarked) {
-                pendingExitCode = code
-                return
-              }
-              settleLateResult(markExitResult(code))
-            }
-          })
-          if (!result) {
-            throw new Error('Unable to build an agent launch plan.')
-          }
-          terminalOwnership = result.terminalOwnership
-          if (automation.reuseSession) {
-            // Why: the first fresh launch is the seed for later reuse and must
-            // survive completion under the same policy as an already-reused tab.
-            releaseTerminalOwnership()
-          }
-          const launchedTabId = result.tabId
-          observeAgentStatus(result.paneKey, dispatchStartedAt)
-          try {
-            await markDispatchResult({
-              runId: run.id,
-              status: 'dispatched',
-              workspaceId: worktree.id,
-              workspaceDisplayName: worktree.displayName,
-              terminalSessionId: launchedTabId,
-              terminalPaneKey: result.paneKey,
-              terminalPtyId: result.ptyId,
-              precheckResult,
-              error: null
-            })
-            dispatchMarked = true
-            if (pendingDone) {
-              await markCompletionResult()
-            } else if (pendingExitCode !== null) {
-              await markExitResult(pendingExitCode)
-            }
-          } catch (error) {
-            cleanupRunObservers()
-            throw error
-          }
-          const currentState = useAppStore.getState()
-          // Why: Run Now and scheduled dispatches should create workspaces/tabs in
-          // the background; only an explicit row click should navigate there.
-          if (
-            focusBeforeDispatch.activeWorktreeId !== worktree.id &&
-            currentState.activeWorktreeId === worktree.id
-          ) {
-            currentState.setActiveView(focusBeforeDispatch.activeView)
-            currentState.setActiveWorktree(focusBeforeDispatch.activeWorktreeId)
-            if (focusBeforeDispatch.activeTabId) {
-              currentState.setActiveTab(focusBeforeDispatch.activeTabId)
-            }
-            currentState.setActiveTabType(focusBeforeDispatch.activeTabType)
-          }
-        } catch (error) {
-          releaseTerminalOwnership()
-          await markDispatchResult({
-            runId: run.id,
-            status: 'dispatch_failed',
-            workspaceId: dispatchWorkspaceId,
-            workspaceDisplayName: dispatchWorkspaceDisplayName,
-            precheckResult,
-            error: error instanceof Error ? error.message : String(error)
-          })
-        }
-      }
-    )
+    const unsubscribe = window.api.automations.onDispatchRequested(handleAutomationDispatchRequest)
     void window.api.automations.rendererReady()
     return unsubscribe
   }, [])
diff --git a/src/renderer/src/hooks/useIpcEvents-agent-status-batch-projection.test.ts b/src/renderer/src/hooks/useIpcEvents-agent-status-batch-projection.test.ts
index 3afc0833b77..798fd284fd0 100644
--- a/src/renderer/src/hooks/useIpcEvents-agent-status-batch-projection.test.ts
+++ b/src/renderer/src/hooks/useIpcEvents-agent-status-batch-projection.test.ts
@@ -107,18 +107,16 @@ describe('useIpcEvents agent status snapshot integration', () => {
         expandedLeafId: null
       }
     }
-    const snapshot = cases.map(
-      (entry, index): AgentStatusSetData => ({
-        paneKey: makePaneKey(entry.tabId, entry.leafId),
-        worktreeId: entry.payloadWorktreeId,
-        ...(entry.connectionId ? { connectionId: entry.connectionId } : {}),
-        state: 'working',
-        prompt: `routing case ${index}`,
-        agentType: 'claude',
-        receivedAt: 1_700_000_001_000 + index,
-        stateStartedAt: 1_700_000_001_000 + index
-      })
-    )
+    const snapshot = cases.map((entry, index): AgentStatusSetData => ({
+      paneKey: makePaneKey(entry.tabId, entry.leafId),
+      worktreeId: entry.payloadWorktreeId,
+      ...(entry.connectionId ? { connectionId: entry.connectionId } : {}),
+      state: 'working',
+      prompt: `routing case ${index}`,
+      agentType: 'claude',
+      receivedAt: 1_700_000_001_000 + index,
+      stateStartedAt: 1_700_000_001_000 + index
+    }))
     const localRepo = { ...TEST_REPO, id: 'repo-routing-local', connectionId: null }
     const sshRepo = { ...TEST_REPO, id: 'repo-routing-ssh', connectionId: 'ssh-live' }
     const store = createTestStore()
diff --git a/src/renderer/src/hooks/useIpcEvents-agent-status-queue-ordering.test.ts b/src/renderer/src/hooks/useIpcEvents-agent-status-queue-ordering.test.ts
index 322e253e541..eb613f21e70 100644
--- a/src/renderer/src/hooks/useIpcEvents-agent-status-queue-ordering.test.ts
+++ b/src/renderer/src/hooks/useIpcEvents-agent-status-queue-ordering.test.ts
@@ -1,4 +1,4 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type { AgentStatusUpdate } from '../store/slices/agent-status'
 import { YOLO_TUI_AGENT_ARGS } from '../../../shared/tui-agent-permissions'
 import {
@@ -22,6 +22,10 @@ describe('useIpcEvents agent status snapshot integration', () => {
     vi.unstubAllGlobals()
   })
 
+  afterEach(() => {
+    vi.useRealTimers()
+  })
+
   it('preserves queued set-clear order for working removal and done retention', async () => {
     vi.useFakeTimers()
     let storeState: StoreLike
@@ -163,7 +167,7 @@ describe('useIpcEvents agent status snapshot integration', () => {
 
   it('does not recurse when flushing a pending status re-enters via the store subscriber', async () => {
     // Repro for crash 9fc89529 (RangeError: Maximum call stack size exceeded):
-    // the store subscriber calls flushPendingAgentStatuses() on every update.
+    // the store subscriber retries pending statuses synchronously on hydration.
     // flush -> applyAgentStatus -> store.setAgentStatus notifies subscribers
     // synchronously (like Zustand) -> subscriber -> flush again while the same
     // event is still queued -> infinite recursion. Model setAgentStatus with a
@@ -173,10 +177,10 @@ describe('useIpcEvents agent status snapshot integration', () => {
       current: null
     }
     let setAgentStatusCalls = 0
-    const notify = (): void => {
+    const notify = (previousState: StoreLike = storeState): void => {
       const listener = subscribeListenerRef.current
       if (listener) {
-        listener(storeState, storeState)
+        listener(storeState, previousState)
       }
     }
     const storeState: StoreLike = buildStoreState({
@@ -243,6 +247,7 @@ describe('useIpcEvents agent status snapshot integration', () => {
 
     // Tab hydrates; the next store update flushes the pending event. Without the
     // re-entrancy guard this overflows the stack instead of applying once.
+    const beforeHydration = { ...storeState }
     storeState.tabsByWorktree = {
       'wt-1': [{ id: 'tab-future', ptyId: 'pty-1', worktreeId: 'wt-1', title: 'Future Tab' }]
     }
@@ -254,7 +259,7 @@ describe('useIpcEvents agent status snapshot integration', () => {
       }
     }
 
-    expect(() => notify()).not.toThrow()
+    expect(() => notify(beforeHydration)).not.toThrow()
     // Applied exactly once — the re-entrant flush is a no-op, not a loop.
     expect(setAgentStatusCalls).toBe(1)
   })
@@ -263,6 +268,7 @@ describe('useIpcEvents agent status snapshot integration', () => {
   // buffered event permanently. Before batching the queue was only replaced after the loop,
   // so a throw left it intact — keep that.
   it('keeps pending statuses queued when the retry fold throws', async () => {
+    vi.useFakeTimers()
     const subscribeListenerRef: { current: StoreSubscribeListener | null } = { current: null }
     const onSetListenerRef: { current: ((data: AgentStatusSetData) => void) | null } = {
       current: null
@@ -284,8 +290,6 @@ describe('useIpcEvents agent status snapshot integration', () => {
       tabsByWorktree: {},
       terminalLayoutsByTabId: {}
     })
-    const notify = (): void => subscribeListenerRef.current?.(storeState, storeState)
-
     stubReactSyncEffect()
     vi.doMock('../store', () => ({
       useAppStore: {
@@ -325,7 +329,10 @@ describe('useIpcEvents agent status snapshot integration', () => {
       stateStartedAt: 1_700_000_000_100
     })
 
-    // Tab hydrates, so the next store update flushes the pending event — and throws.
+    // The timer-owned retry throws after clearing its handle.
+    expect(() => vi.advanceTimersByTime(100)).toThrow('fold blew up')
+
+    // Hydrate without publishing so only the re-armed timer can recover the event.
     storeState.tabsByWorktree = {
       'wt-1': [{ id: 'tab-future', ptyId: 'pty-1', worktreeId: 'wt-1', title: 'Future Tab' }]
     }
@@ -336,10 +343,8 @@ describe('useIpcEvents agent status snapshot integration', () => {
         expandedLeafId: null
       }
     }
-    expect(() => notify()).toThrow('fold blew up')
 
-    // The event must still be queued, so the next flush replays it.
-    notify()
+    vi.advanceTimersByTime(100)
     const replayedAfterThrow = setAgentStatuses.mock.calls
       .slice(1)
       .flatMap((call) => call[0].map((update) => update.payload.prompt))
diff --git a/src/renderer/src/hooks/useIpcEvents-agent-status-snapshot-hydration.test.ts b/src/renderer/src/hooks/useIpcEvents-agent-status-snapshot-hydration.test.ts
index b273fac9876..0705e323399 100644
--- a/src/renderer/src/hooks/useIpcEvents-agent-status-snapshot-hydration.test.ts
+++ b/src/renderer/src/hooks/useIpcEvents-agent-status-snapshot-hydration.test.ts
@@ -486,17 +486,15 @@ describe('useIpcEvents agent status snapshot integration', () => {
         return tabId
       }
     })
-    const snapshot = leafIds.map(
-      (leafId, index): AgentStatusSetData => ({
-        paneKey: makePaneKey(tabId, leafId),
-        worktreeId,
-        state: 'working',
-        prompt: `indexed prompt ${index}`,
-        agentType: 'claude',
-        receivedAt: 1_700_000_000_000 + index,
-        stateStartedAt: 1_700_000_000_000 + index
-      })
-    )
+    const snapshot = leafIds.map((leafId, index): AgentStatusSetData => ({
+      paneKey: makePaneKey(tabId, leafId),
+      worktreeId,
+      state: 'working',
+      prompt: `indexed prompt ${index}`,
+      agentType: 'claude',
+      receivedAt: 1_700_000_000_000 + index,
+      stateStartedAt: 1_700_000_000_000 + index
+    }))
     let resolveSnapshot!: (entries: AgentStatusSetData[]) => void
     const getSnapshot = vi.fn(
       () =>
diff --git a/src/renderer/src/hooks/useIpcEvents-agent-status-snapshot-replay.test.ts b/src/renderer/src/hooks/useIpcEvents-agent-status-snapshot-replay.test.ts
index cbb4992e7f2..e26448f0b63 100644
--- a/src/renderer/src/hooks/useIpcEvents-agent-status-snapshot-replay.test.ts
+++ b/src/renderer/src/hooks/useIpcEvents-agent-status-snapshot-replay.test.ts
@@ -87,6 +87,7 @@ describe('useIpcEvents agent status snapshot integration', () => {
 
     expect(setAgentStatus).not.toHaveBeenCalled()
 
+    const beforeHydration = { ...storeState }
     Object.assign(storeState, {
       tabsByWorktree: {
         'wt-1': [{ id: 'tab-future', ptyId: 'pty-1', worktreeId: 'wt-1', title: 'SSH Tab' }]
@@ -99,7 +100,7 @@ describe('useIpcEvents agent status snapshot integration', () => {
         }
       }
     })
-    subscribeListenerRef.current?.(storeState, storeState)
+    subscribeListenerRef.current?.(storeState, beforeHydration)
 
     expect(setAgentStatus).toHaveBeenCalledTimes(1)
     expect(setAgentStatus).toHaveBeenCalledWith(
@@ -192,6 +193,7 @@ describe('useIpcEvents agent status snapshot integration', () => {
 
     expect(setAgentStatus).not.toHaveBeenCalled()
 
+    const beforeHydration = { ...storeState }
     Object.assign(storeState, {
       tabsByWorktree: {
         'wt-1': [{ id: 'tab-future', ptyId: 'pty-1', worktreeId: 'wt-1', title: 'SSH Tab' }]
@@ -204,7 +206,7 @@ describe('useIpcEvents agent status snapshot integration', () => {
         }
       }
     })
-    subscribeListenerRef.current?.(storeState, storeState)
+    subscribeListenerRef.current?.(storeState, beforeHydration)
 
     expect(setAgentStatus).toHaveBeenCalledWith(
       FUTURE_PANE_KEY,
diff --git a/src/renderer/src/hooks/useIpcEvents-close-routing-active-browser-tab.test.ts b/src/renderer/src/hooks/useIpcEvents-close-routing-active-browser-tab.test.ts
index e9a4097fcea..4225e309427 100644
--- a/src/renderer/src/hooks/useIpcEvents-close-routing-active-browser-tab.test.ts
+++ b/src/renderer/src/hooks/useIpcEvents-close-routing-active-browser-tab.test.ts
@@ -184,4 +184,77 @@ describe('useIpcEvents Close Tab on the active browser tab', () => {
     expect(closeUnifiedTab).not.toHaveBeenCalled()
     expect(closeBrowserTab).toHaveBeenCalledWith('workspace-1', undefined)
   })
+
+  // Why: in split layouts the activeTabType mirror can say 'terminal' while a browser guest holds
+  // focus (guest focus never reaches the group's focus-capture); the guest-forwarded source id must
+  // close the guest's own workspace anyway.
+  it('closes the source workspace when the active-tab mirror points at a terminal', async () => {
+    const listenerRef: { current: CloseActiveTabListener | null } = { current: null }
+    await useIpcEventsForCloseRouting({
+      closeActiveTabListenerRef: listenerRef,
+      getState: () => ({
+        ...activeBrowserWorkspace({}),
+        activeTabType: 'terminal',
+        activeBrowserTabId: null,
+        browserPagesByWorkspace: {
+          // Ownership comes from the canonical maps, not denormalized page fields.
+          'workspace-1': [{ id: 'page-1', workspaceId: 'stale-workspace', worktreeId: 'stale-wt' }]
+        }
+      })
+    })
+
+    requireListener(listenerRef)({ sourceId: 'page-1' })
+
+    expect(closeBrowserTab).toHaveBeenCalledWith('workspace-1', undefined)
+    expect(destroyWorkspaceWebviews).toHaveBeenCalled()
+  })
+
+  // Why: an open-but-empty floating panel is the ambient close fallback only; a guest-forwarded
+  // source id names a main-workspace target and must not be swallowed by the panel toggle.
+  it('closes the source workspace even while an empty floating panel is visible', async () => {
+    vi.stubGlobal('document', { querySelector: () => ({}) })
+    const listenerRef: { current: CloseActiveTabListener | null } = { current: null }
+    await useIpcEventsForCloseRouting({
+      closeActiveTabListenerRef: listenerRef,
+      getState: () => activeBrowserWorkspace({})
+    })
+
+    requireListener(listenerRef)({ sourceId: 'page-1' })
+
+    expect(closeBrowserTab).toHaveBeenCalledWith('workspace-1', undefined)
+    expect(destroyWorkspaceWebviews).toHaveBeenCalled()
+  })
+
+  it('no-ops on a stale source id instead of closing the ambient active tab', async () => {
+    const listenerRef: { current: CloseActiveTabListener | null } = { current: null }
+    await useIpcEventsForCloseRouting({
+      closeActiveTabListenerRef: listenerRef,
+      getState: () => activeBrowserWorkspace({})
+    })
+
+    requireListener(listenerRef)({ sourceId: 'page-that-no-longer-exists' })
+
+    expect(closeBrowserTab).not.toHaveBeenCalled()
+    expect(closeUnifiedTab).not.toHaveBeenCalled()
+    expect(closeWebRuntimeSessionTab).not.toHaveBeenCalled()
+  })
+
+  it('no-ops when a source page belongs to no live workspace', async () => {
+    const listenerRef: { current: CloseActiveTabListener | null } = { current: null }
+    await useIpcEventsForCloseRouting({
+      closeActiveTabListenerRef: listenerRef,
+      getState: () => ({
+        ...activeBrowserWorkspace({}),
+        browserPagesByWorkspace: {
+          orphan: [{ id: 'orphan-page', workspaceId: 'workspace-1', worktreeId: 'wt-1' }]
+        }
+      })
+    })
+
+    requireListener(listenerRef)({ sourceId: 'orphan-page' })
+
+    expect(closeBrowserTab).not.toHaveBeenCalled()
+    expect(closeUnifiedTab).not.toHaveBeenCalled()
+    expect(closeWebRuntimeSessionTab).not.toHaveBeenCalled()
+  })
 })
diff --git a/src/renderer/src/hooks/useSettingsNavigationMetadata.test.ts b/src/renderer/src/hooks/useSettingsNavigationMetadata.test.ts
index 7cc5c009f9d..bf12b2c0c28 100644
--- a/src/renderer/src/hooks/useSettingsNavigationMetadata.test.ts
+++ b/src/renderer/src/hooks/useSettingsNavigationMetadata.test.ts
@@ -1,4 +1,4 @@
-import { readFileSync } from 'node:fs'
+import { readdirSync, readFileSync } from 'node:fs'
 import { resolve } from 'node:path'
 import { describe, expect, it } from 'vitest'
 import { buildSettingsNavigationMetadata } from './useSettingsNavigationMetadata'
@@ -408,9 +408,17 @@ describe('settings navigation metadata', () => {
 
   it('does not import Settings page or pane UI modules from the metadata hook', () => {
     const testDir = import.meta.dirname
-    const hookSource = readFileSync(resolve(testDir, 'useSettingsNavigationMetadata.ts'), 'utf8')
-    const importLines = hookSource
-      .split('\n')
+    // Why: the section tables live in sibling settings-navigation-* modules, so reading only the
+    // hook would scan a file that no longer holds the imports this guard exists to police.
+    const sourceFiles = [
+      'useSettingsNavigationMetadata.ts',
+      ...readdirSync(testDir).filter(
+        (name) => name.startsWith('settings-navigation-') && name.endsWith('.ts')
+      )
+    ]
+    expect(sourceFiles.length).toBeGreaterThan(1)
+    const importLines = sourceFiles
+      .flatMap((name) => readFileSync(resolve(testDir, name), 'utf8').split('\n'))
       .filter((line) => line.trim().startsWith('import '))
       .join('\n')
 
diff --git a/src/renderer/src/hooks/useSettingsNavigationMetadata.ts b/src/renderer/src/hooks/useSettingsNavigationMetadata.ts
index 9983ba38f0a..4941233c2af 100644
--- a/src/renderer/src/hooks/useSettingsNavigationMetadata.ts
+++ b/src/renderer/src/hooks/useSettingsNavigationMetadata.ts
@@ -1,127 +1,38 @@
-/* oxlint-disable max-lines */
 import { useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useShallow } from 'zustand/react/shallow'
 // Why: this registry mirrors the Settings sidebar in one neutral module so
 // Cmd+J and Settings visibility cannot drift. Keep it free of Settings pane UI
 // imports; the boundary is enforced by a focused architecture test.
-import {
-  BarChart3,
-  Bell,
-  Blocks,
-  Bot,
-  Bug,
-  Cable,
-  CalendarClock,
-  CircleUserRound,
-  FlaskConical,
-  GitBranch,
-  Globe,
-  Keyboard,
-  ListChecks,
-  Lock,
-  Mic,
-  MousePointerClick,
-  Network,
-  Palette,
-  PanelsTopLeft,
-  Play,
-  Server,
-  ShieldCheck,
-  SlidersHorizontal,
-  Smartphone,
-  TabletSmartphone,
-  SquareTerminal,
-  TextCursorInput,
-  Files,
-  BookOpen,
-  UserCog,
-  Wrench
-} from 'lucide-react'
-import { OrcaLogoSettingsIcon } from '@/components/settings/orca-logo-settings-icon'
-import { LinearIcon } from '@/components/icons/LinearIcon'
-import type { Repo } from '../../../shared/repo-types'
-import { getRepoKindLabel } from '../../../shared/repo-kind'
-import { useAppStore } from '@/store'
-import { isMacUserAgent, isWindowsUserAgent } from '@/components/terminal-pane/pane-helpers'
-import type { SettingsNavSection } from '@/lib/settings-navigation-types'
-import { getGeneralPaneSearchEntries } from '@/components/settings/general-search'
-import { getAgentsPaneSearchEntries } from '@/components/settings/agents-search'
-import { getAccountsPaneSearchEntries } from '@/components/settings/accounts-search'
-import { getIntegrationsPaneSearchEntries } from '@/components/settings/integrations-search'
-import { getGitPaneSearchEntries } from '@/components/settings/git-search'
-import { getGitProviderApiBudgetSearchEntries } from '@/components/settings/git-provider-api-budget-search'
-import { getCommitMessageAiPaneSearchEntries } from '@/components/settings/commit-message-ai-search'
-import { getTasksPaneSearchEntries } from '@/components/settings/tasks-search'
-import { getFloatingWorkspaceSearchEntries } from '@/components/settings/floating-workspace-search'
-import { getAppearancePaneSearchEntries } from '@/components/settings/appearance-search'
-import { getInputPaneSearchEntries } from '@/components/settings/input-search'
-import { getTerminalPaneSearchEntries } from '@/components/settings/terminal-search'
-import { getQuickCommandsPaneSearchEntries } from '@/components/settings/quick-commands-search'
-import { getBrowserPaneCombinedSearchEntries } from '@/components/settings/browser-pane-search'
-import { getNotificationsPaneSearchEntries } from '@/components/settings/notifications-search'
-import { getOrchestrationPaneSearchEntries } from '@/components/settings/orchestration-search'
-import { getArtifactsSettingsSearchEntries } from '@/components/settings/artifacts-settings-search'
-import { getShareSkillsSettingsSearchEntries } from '@/components/settings/share-skills-settings-search'
-import { getAutomationsSettingsSearchEntries } from '@/components/settings/automations-settings-search'
-import { getOrcaAccountSettingsSearchEntries } from '@/components/settings/orca-account-settings-search'
-import { getLinearAgentSkillPaneSearchEntries } from '@/components/settings/linear-agent-skill-search'
 import {
   getRuntimeEnvironmentsSearchEntry,
   getWebRuntimeEnvironmentsSearchEntry
 } from '@/components/settings/runtime-environments-search'
-import { getSshPaneSearchEntries } from '@/components/settings/ssh-search'
-import { getMobileSettingsPaneSearchEntries } from '@/components/settings/mobile-settings-search'
-import { getMobileEmulatorSearchEntries } from '@/components/settings/mobile-emulator-search'
-import { getComputerUsePaneSearchEntries } from '@/components/settings/computer-use-search'
-import { getVoicePaneSearchEntries } from '@/components/settings/voice-pane-search'
-import { getDeveloperPermissionsPaneSearchEntries } from '@/components/settings/developer-permissions-search'
-import { getPrivacyPaneSearchEntries } from '@/components/settings/privacy-search'
-import { getAdvancedPaneSearchEntries } from '@/components/settings/advanced-search'
-import { getShortcutsPaneSearchEntries } from '@/components/settings/shortcuts-search'
-import { getStatsPaneSearchEntries } from '@/components/stats/stats-search'
-import { getExperimentalPaneSearchEntries } from '@/components/settings/experimental-search'
-import { getPluginsPaneSearchEntries } from '@/components/settings/plugins-search'
-import { getRepositoryPaneSearchEntries } from '@/components/settings/repository-search'
-import { buildSettingsProjectList } from '@/components/settings/settings-project-list'
+import { getTerminalPaneSearchEntries } from '@/components/settings/terminal-search'
+import { isMacUserAgent, isWindowsUserAgent } from '@/components/terminal-pane/pane-helpers'
+import { useLinearProviderConnected } from '@/hooks/useLinearProviderConnected'
+import { getClientCreationActionPolicy } from '@/lib/client-creation-action-policy'
+import type { SettingsNavSection } from '@/lib/settings-navigation-types'
 import { isWebClientLocation } from '@/lib/web-client-location'
 import {
   isWindowsTerminalCapabilityHost,
   useWindowsTerminalCapabilities
 } from '@/lib/windows-terminal-capabilities'
-import { useWindowsTerminalCapabilityOwnerKey } from './useWindowsTerminalCapabilityOwnerKey'
 import { getActiveRuntimeTarget } from '@/runtime/runtime-rpc-client'
-import { useLinearProviderConnected } from '@/hooks/useLinearProviderConnected'
-import { translate } from '@/i18n/i18n'
-import { getClientCreationActionPolicy } from '@/lib/client-creation-action-policy'
+import { useAppStore } from '@/store'
+import type { Repo } from '../../../shared/repo-types'
+import {
+  buildCapabilitySettingsSections,
+  buildSetupSettingsSections
+} from './settings-navigation-capability-sections'
+import type { SettingsNavigationBuildOptions } from './settings-navigation-build-options'
+import { buildInterfaceSettingsSections } from './settings-navigation-interface-sections'
+import { buildRemoteSettingsSections } from './settings-navigation-remote-sections'
+import { buildWorkflowSettingsSections } from './settings-navigation-workflow-sections'
+import { useWindowsTerminalCapabilityOwnerKey } from './useWindowsTerminalCapabilityOwnerKey'
 
 export { isWebClientLocation } from '@/lib/web-client-location'
 
-function getDevToolsPaneSearchEntries(): SettingsNavSection['searchEntries'] {
-  return [
-    {
-      title: translate(
-        'auto.hooks.useSettingsNavigationMetadata.devSearchNotificationPlayground',
-        'Notification playground'
-      ),
-      description: translate(
-        'auto.hooks.useSettingsNavigationMetadata.devSearchNotificationPlaygroundDescription',
-        'Trigger representative toast and notification UI states.'
-      ),
-      keywords: [
-        translate('auto.hooks.useSettingsNavigationMetadata.devSearchKeywordDev', 'dev'),
-        translate('auto.hooks.useSettingsNavigationMetadata.devSearchKeywordToast', 'toast'),
-        translate('auto.hooks.useSettingsNavigationMetadata.devSearchKeywordSonner', 'sonner'),
-        translate('auto.hooks.useSettingsNavigationMetadata.devSearchKeywordError', 'error'),
-        translate(
-          'auto.hooks.useSettingsNavigationMetadata.devSearchKeywordNotification',
-          'notification'
-        )
-      ]
-    }
-  ]
-}
-
 export function buildSettingsNavigationMetadata({
   isMac,
   isWindows,
@@ -145,7 +56,6 @@ export function buildSettingsNavigationMetadata({
   isLinearConnected?: boolean
   repos: readonly Repo[]
 }): SettingsNavSection[] {
-  const showDesktopOnlySettings = !isWebClient
   const terminalPaneSearchEntries = getTerminalPaneSearchEntries({
     isWindows,
     isWindowsTerminalHost,
@@ -160,537 +70,28 @@ export function buildSettingsNavigationMetadata({
       reposById.set(repo.id, repo)
     }
   }
+  const options: SettingsNavigationBuildOptions = {
+    isMac,
+    isWindows,
+    isLocalWindowsHost,
+    isWindowsTerminalHost,
+    isWebClient,
+    managedBrowserCreationEnabled,
+    mobileEmulatorCreationEnabled,
+    isDev,
+    isLinearConnected,
+    repos
+  }
 
+  // Why: this array's order must mirror SETTINGS_NAV_GROUPS so the Settings
+  // sidebar and the Cmd+J palette both read top-to-bottom in the same grouped
+  // order — keep each new entry beside its group's siblings.
   return [
-    // Why: this array's order must mirror SETTINGS_NAV_GROUPS so the Settings
-    // sidebar and the Cmd+J palette both read top-to-bottom in the same grouped
-    // order — keep each new entry beside its group's siblings.
-    {
-      id: 'agents',
-      title: translate('auto.hooks.useSettingsNavigationMetadata.b49abbd2f7', 'Agents'),
-      description: translate(
-        'auto.hooks.useSettingsNavigationMetadata.4121f7a0a2',
-        'Manage AI agents, set a default, and customize commands.'
-      ),
-      icon: Bot,
-      searchEntries: getAgentsPaneSearchEntries({
-        includeAgentAwake: !isWebClient,
-        includeAgentRuntime: isLocalWindowsHost
-      }),
-      group: 'capabilities'
-    },
-    {
-      id: 'accounts',
-      title: translate(
-        'auto.hooks.useSettingsNavigationMetadata.f70ac54d38',
-        'AI Provider Accounts'
-      ),
-      description: translate(
-        'auto.hooks.useSettingsNavigationMetadata.b1c2f8b0ac',
-        'Optional account switching and usage setup for Claude, Codex, Gemini, OpenCode Go, MiniMax, and Grok.'
-      ),
-      icon: UserCog,
-      searchEntries: getAccountsPaneSearchEntries(),
-      group: 'capabilities',
-      badge: translate('auto.hooks.useSettingsNavigationMetadata.7c79d3b7bf', 'Optional')
-    },
-    {
-      id: 'orchestration',
-      title: translate('auto.hooks.useSettingsNavigationMetadata.58a868e8e4', 'Orchestration'),
-      description: translate(
-        'auto.hooks.useSettingsNavigationMetadata.cd50cec5d7',
-        'Coordinate multiple coding agents through Orca.'
-      ),
-      icon: Network,
-      searchEntries: getOrchestrationPaneSearchEntries({
-        includeNestedWorkerDepth: !isWebClient
-      }),
-      group: 'capabilities'
-    },
-    // Why: only surfaced once Linear is connected — a capability that needs a
-    // linked provider before the agent skill has anything to act on.
-    ...(isLinearConnected
-      ? [
-          {
-            id: 'linear',
-            title: translate('auto.hooks.useSettingsNavigationMetadata.linearTitle', 'Linear'),
-            description: translate(
-              'auto.hooks.useSettingsNavigationMetadata.linearDescription',
-              'How Linear works in Orca, setup checklist, agent skill, and example prompts.'
-            ),
-            icon: LinearIcon,
-            searchEntries: getLinearAgentSkillPaneSearchEntries(),
-            group: 'capabilities'
-          }
-        ]
-      : []),
-    ...(showDesktopOnlySettings
-      ? [
-          {
-            id: 'computer-use',
-            title: translate('auto.hooks.useSettingsNavigationMetadata.b35e92364b', 'Computer Use'),
-            description: translate(
-              'auto.hooks.useSettingsNavigationMetadata.0059bd17f3',
-              'Enable agents to control any app on your computer.'
-            ),
-            icon: MousePointerClick,
-            searchEntries: getComputerUsePaneSearchEntries(),
-            group: 'capabilities'
-          },
-          {
-            id: 'voice',
-            title: translate('auto.hooks.useSettingsNavigationMetadata.6a50cdcd7c', 'Voice'),
-            description: translate(
-              'auto.hooks.useSettingsNavigationMetadata.8ac3de82f5',
-              'Local speech-to-text dictation with on-device models.'
-            ),
-            icon: Mic,
-            searchEntries: getVoicePaneSearchEntries(),
-            group: 'capabilities'
-          }
-        ]
-      : []),
-    ...(showDesktopOnlySettings
-      ? [
-          {
-            id: 'orca-account',
-            title: translate('auto.components.settings.orcaAccount.title', 'Orca Account'),
-            description: translate(
-              'auto.components.settings.orcaAccount.description',
-              'Share work instantly and reach your desktop from Orca Mobile wherever you are.'
-            ),
-            icon: CircleUserRound,
-            searchEntries: getOrcaAccountSettingsSearchEntries(),
-            group: 'setup'
-          }
-        ]
-      : []),
-    {
-      id: 'setup-guide',
-      title: translate(
-        'auto.hooks.useSettingsNavigationMetadata.ded9e9032f',
-        'Onboarding checklist'
-      ),
-      description: translate(
-        'auto.hooks.useSettingsNavigationMetadata.5f32ac08f3',
-        'Finish the onboarding checklist for core Orca workflows.'
-      ),
-      icon: OrcaLogoSettingsIcon,
-      searchEntries: [
-        {
-          title: translate(
-            'auto.hooks.useSettingsNavigationMetadata.ded9e9032f',
-            'Onboarding checklist'
-          ),
-          description: translate(
-            'auto.hooks.useSettingsNavigationMetadata.17005c73d4',
-            'Open the onboarding checklist for setup and milestone steps.'
-          ),
-          keywords: [
-            translate('auto.hooks.useSettingsNavigationMetadata.ea0b1bc7b8', 'setup guide'),
-            translate(
-              'auto.hooks.useSettingsNavigationMetadata.0505d0df29',
-              'get started with Orca'
-            ),
-            translate('auto.hooks.useSettingsNavigationMetadata.724c440e72', 'getting started')
-          ]
-        }
-      ],
-      group: 'setup'
-    },
-    {
-      id: 'general',
-      title: translate('auto.hooks.useSettingsNavigationMetadata.13241992bd', 'General'),
-      description: translate(
-        'auto.hooks.useSettingsNavigationMetadata.2cd4ea75da',
-        'Workspace defaults, app setup, and maintenance.'
-      ),
-      icon: SlidersHorizontal,
-      searchEntries: getGeneralPaneSearchEntries({ includeProjectRuntime: isLocalWindowsHost }),
-      group: 'setup'
-    },
-    {
-      id: 'integrations',
-      title: translate('auto.hooks.useSettingsNavigationMetadata.2b043783ef', 'Integrations'),
-      description: translate(
-        'auto.hooks.useSettingsNavigationMetadata.33a5e1d597',
-        'Connect GitHub, GitLab, Linear, and source-hosting services.'
-      ),
-      icon: Blocks,
-      searchEntries: getIntegrationsPaneSearchEntries(),
-      group: 'setup'
-    },
-    ...(showDesktopOnlySettings
-      ? [
-          {
-            id: 'mobile',
-            title: translate('auto.hooks.useSettingsNavigationMetadata.1cd25673df', 'Mobile'),
-            description: translate(
-              'auto.hooks.useSettingsNavigationMetadata.95a1886d94',
-              'Control terminals and agents from your phone.'
-            ),
-            icon: Smartphone,
-            searchEntries: getMobileSettingsPaneSearchEntries(),
-            group: 'setup'
-          }
-        ]
-      : []),
-    {
-      id: 'automations',
-      title: translate('auto.hooks.useSettingsNavigationMetadata.automationsTitle', 'Automations'),
-      description: translate(
-        'auto.hooks.useSettingsNavigationMetadata.automationsDescription',
-        'Schedule agent work and choose whether Automations appears in the sidebar.'
-      ),
-      icon: CalendarClock,
-      searchEntries: getAutomationsSettingsSearchEntries(),
-      group: 'workflows'
-    },
-    {
-      id: 'artifacts',
-      title: translate('auto.hooks.useSettingsNavigationMetadata.artifactsTitle', 'Artifacts'),
-      description: translate(
-        'auto.hooks.useSettingsNavigationMetadata.artifactsDescription',
-        'Share HTML and Markdown files with your team and manage their public links.'
-      ),
-      icon: Files,
-      searchEntries: getArtifactsSettingsSearchEntries(),
-      group: 'workflows',
-      badge: translate('auto.hooks.useSettingsNavigationMetadata.40d80bad8a', 'Beta')
-    },
-    {
-      id: 'share-skills',
-      title: translate('auto.hooks.useSettingsNavigationMetadata.shareSkillsTitle', 'Share Skills'),
-      description: translate(
-        'auto.hooks.useSettingsNavigationMetadata.shareSkillsDescription',
-        'Share your skills with an unlisted link. Anyone who has it can install them.'
-      ),
-      // Why: the sidebar entry and the page header both use BookOpen for
-      // skills, so the settings row that opens them matches.
-      icon: BookOpen,
-      searchEntries: getShareSkillsSettingsSearchEntries(),
-      group: 'workflows',
-      badge: translate('auto.hooks.useSettingsNavigationMetadata.40d80bad8a', 'Beta')
-    },
-    {
-      id: 'git',
-      title: translate(
-        'auto.hooks.useSettingsNavigationMetadata.09607cb0fe',
-        'Git & Source Control'
-      ),
-      description: translate(
-        'auto.hooks.useSettingsNavigationMetadata.ab4b21b58e',
-        'Branch naming, base refs, and Git AI Author.'
-      ),
-      icon: GitBranch,
-      // Why: Git AI Author is rendered inside Git, so shared
-      // metadata must search both surfaces wherever Git appears.
-      searchEntries: [
-        ...getGitPaneSearchEntries(),
-        ...getCommitMessageAiPaneSearchEntries(),
-        ...getGitProviderApiBudgetSearchEntries()
-      ],
-      group: 'workflows'
-    },
-    {
-      id: 'tasks',
-      title: translate('auto.hooks.useSettingsNavigationMetadata.85f4fd7710', 'Task Sources'),
-      description: translate(
-        'auto.hooks.useSettingsNavigationMetadata.tasksDescription',
-        'Connect providers, install the Linear skill, and choose what appears in Tasks.'
-      ),
-      icon: ListChecks,
-      searchEntries: getTasksPaneSearchEntries(),
-      group: 'workflows'
-    },
-    {
-      id: 'terminal',
-      title: translate('auto.hooks.useSettingsNavigationMetadata.a9fb10afca', 'Terminal'),
-      description: translate(
-        'auto.hooks.useSettingsNavigationMetadata.c33bfd664c',
-        'Shells, renderer, sessions, and terminal behavior.'
-      ),
-      icon: SquareTerminal,
-      searchEntries: terminalPaneSearchEntries,
-      group: 'workflows'
-    },
-    {
-      id: 'quick-commands',
-      title: translate('auto.hooks.useSettingsNavigationMetadata.3fc3db144f', 'Quick Commands'),
-      description: translate(
-        'auto.hooks.useSettingsNavigationMetadata.42ae40842f',
-        'Saved terminal commands, scoped globally or per project.'
-      ),
-      icon: Play,
-      searchEntries: getQuickCommandsPaneSearchEntries(),
-      group: 'workflows'
-    },
-    ...(showDesktopOnlySettings
-      ? [
-          {
-            id: 'browser',
-            title: translate('auto.hooks.useSettingsNavigationMetadata.8c197f74a1', 'Browser'),
-            description: translate(
-              'auto.hooks.useSettingsNavigationMetadata.e815fd01bd',
-              'Home page, link routing, and session cookies.'
-            ),
-            icon: Globe,
-            searchEntries: getBrowserPaneCombinedSearchEntries(),
-            group: 'workflows'
-          }
-        ]
-      : []),
-    ...(showDesktopOnlySettings
-      ? [
-          {
-            id: 'mobile-emulator',
-            title: translate(
-              'auto.hooks.useSettingsNavigationMetadata.1e761cff2b',
-              'Mobile Emulator'
-            ),
-            description: translate(
-              'auto.hooks.useSettingsNavigationMetadata.3d65d3f1b9',
-              'Configure mobile emulator support for Orca and coding agents.'
-            ),
-            icon: TabletSmartphone,
-            searchEntries: getMobileEmulatorSearchEntries(),
-            group: 'workflows'
-          }
-        ]
-      : []),
-    {
-      id: 'floating-workspace',
-      title: translate('auto.hooks.useSettingsNavigationMetadata.65b19f5bde', 'Floating Workspace'),
-      description: showDesktopOnlySettings
-        ? translate(
-            'auto.hooks.useSettingsNavigationMetadata.2d0659f6f0',
-            'Global terminal, browser, and markdown tabs.'
-          )
-        : translate(
-            'auto.hooks.useSettingsNavigationMetadata.floatingWorkspaceWebDescription',
-            'Global terminal and markdown tabs.'
-          ),
-      icon: PanelsTopLeft,
-      searchEntries: getFloatingWorkspaceSearchEntries({
-        includeBrowser: showDesktopOnlySettings
-      }),
-      group: 'workflows'
-    },
-    {
-      id: 'appearance',
-      title: translate('auto.hooks.useSettingsNavigationMetadata.93d88d20bf', 'Appearance'),
-      description: translate(
-        'auto.hooks.useSettingsNavigationMetadata.b11a5a48a2',
-        'Theme, zoom, app and terminal appearance, sidebars, and status bar.'
-      ),
-      icon: Palette,
-      searchEntries: getAppearancePaneSearchEntries({
-        showWarpImport: showDesktopOnlySettings,
-        showSystemTray: showDesktopOnlySettings && isWindows,
-        showMenuBarIcon: showDesktopOnlySettings && isMac
-      }),
-      group: 'interface'
-    },
-    {
-      id: 'input',
-      title: translate('auto.hooks.useSettingsNavigationMetadata.0c6ee88a5f', 'Input & Editing'),
-      description: translate(
-        'auto.hooks.useSettingsNavigationMetadata.1f452cbd4c',
-        'Selection and editing behavior.'
-      ),
-      icon: TextCursorInput,
-      searchEntries: getInputPaneSearchEntries(),
-      group: 'interface'
-    },
-    ...(showDesktopOnlySettings
-      ? [
-          {
-            id: 'notifications',
-            title: translate(
-              'auto.hooks.useSettingsNavigationMetadata.2eece16ad1',
-              'Notifications'
-            ),
-            description: translate(
-              'auto.hooks.useSettingsNavigationMetadata.7682607591',
-              'Native desktop notifications for agent and terminal events.'
-            ),
-            icon: Bell,
-            searchEntries: getNotificationsPaneSearchEntries(),
-            group: 'interface'
-          }
-        ]
-      : []),
-    {
-      id: 'shortcuts',
-      title: translate('auto.hooks.useSettingsNavigationMetadata.94295ebfb3', 'Shortcuts'),
-      description: translate(
-        'auto.hooks.useSettingsNavigationMetadata.dcd0d9b74f',
-        'Keyboard shortcuts for common actions.'
-      ),
-      icon: Keyboard,
-      searchEntries: getShortcutsPaneSearchEntries({
-        includeManagedBrowser: managedBrowserCreationEnabled,
-        includeMobileEmulator: mobileEmulatorCreationEnabled
-      }),
-      group: 'interface'
-    },
-    {
-      id: 'stats',
-      title: translate('auto.hooks.useSettingsNavigationMetadata.d72a58b5b9', 'Stats & Usage'),
-      description: translate(
-        'auto.hooks.useSettingsNavigationMetadata.b351014180',
-        'Orca stats plus Claude, Codex, OpenCode token analytics and Grok subscription usage.'
-      ),
-      icon: BarChart3,
-      searchEntries: getStatsPaneSearchEntries(),
-      group: 'interface'
-    },
-    ...(showDesktopOnlySettings
-      ? [
-          {
-            id: 'ssh',
-            title: translate('auto.hooks.useSettingsNavigationMetadata.94a5afe910', 'SSH Hosts'),
-            description: translate(
-              'auto.hooks.useSettingsNavigationMetadata.31e57d1c70',
-              'Use existing machines over SSH for files, terminals, Git, and workspaces.'
-            ),
-            icon: Cable,
-            searchEntries: getSshPaneSearchEntries(),
-            group: 'remote'
-          }
-        ]
-      : []),
-    {
-      id: 'servers',
-      title: translate(
-        'auto.hooks.useSettingsNavigationMetadata.de0c2907a1',
-        'Remote Orca Servers'
-      ),
-      description: isWebClient
-        ? 'Connect this browser to a saved Orca server.'
-        : 'Pair remote Orca runtimes for persistent sessions, richer remote state, and web or mobile handoff.',
-      icon: Server,
-      searchEntries: [runtimeEnvironmentsSearchEntry],
-      group: 'remote',
-      badge: translate('auto.hooks.useSettingsNavigationMetadata.40d80bad8a', 'Beta')
-    },
-    ...(showDesktopOnlySettings && isMac
-      ? [
-          {
-            id: 'developer-permissions',
-            title: translate(
-              'auto.hooks.useSettingsNavigationMetadata.d91ae31fbd',
-              'macOS Permissions'
-            ),
-            description: translate(
-              'auto.hooks.useSettingsNavigationMetadata.65ec7d1968',
-              'macOS privacy access for terminal-launched developer tools.'
-            ),
-            icon: ShieldCheck,
-            searchEntries: getDeveloperPermissionsPaneSearchEntries(),
-            group: 'security'
-          }
-        ]
-      : []),
-    {
-      id: 'privacy',
-      title: translate(
-        'auto.hooks.useSettingsNavigationMetadata.3618579df6',
-        'Privacy & Telemetry'
-      ),
-      description: translate(
-        'auto.hooks.useSettingsNavigationMetadata.8400cfe1c1',
-        'Anonymous usage data and telemetry controls.'
-      ),
-      icon: Lock,
-      searchEntries: getPrivacyPaneSearchEntries(),
-      group: 'security'
-    },
-    ...(showDesktopOnlySettings
-      ? [
-          {
-            id: 'advanced',
-            title: translate('auto.hooks.useSettingsNavigationMetadata.580a04cd81', 'Advanced'),
-            description: translate(
-              'auto.hooks.useSettingsNavigationMetadata.e338c507c1',
-              'Low-level compatibility settings for troubleshooting.'
-            ),
-            icon: Wrench,
-            searchEntries: getAdvancedPaneSearchEntries(),
-            group: 'advanced'
-          }
-        ]
-      : []),
-    // Why: dev tooling must not be reachable from packaged/web builds even if
-    // this pure metadata builder is called manually with isDev=true.
-    ...(showDesktopOnlySettings && import.meta.env.DEV && isDev
-      ? [
-          {
-            id: 'dev',
-            title: translate('auto.hooks.useSettingsNavigationMetadata.dev', 'Dev Tools'),
-            description: translate(
-              'auto.hooks.useSettingsNavigationMetadata.devDescription',
-              'Dev-only tools for exercising UI states.'
-            ),
-            // Why: distinct from the sibling Advanced section's Wrench so the two
-            // entries in the same 'advanced' group stay visually distinguishable.
-            icon: Bug,
-            searchEntries: getDevToolsPaneSearchEntries(),
-            group: 'advanced',
-            badge: translate('auto.hooks.useSettingsNavigationMetadata.devBadge', 'Dev')
-          }
-        ]
-      : []),
-    {
-      id: 'experimental',
-      title: translate('auto.hooks.useSettingsNavigationMetadata.225071c560', 'Experimental'),
-      description: translate(
-        'auto.hooks.useSettingsNavigationMetadata.4a728cd56b',
-        'New features that are still taking shape. Give them a try.'
-      ),
-      icon: FlaskConical,
-      searchEntries: getExperimentalPaneSearchEntries(),
-      group: 'experimental'
-    },
-    ...(showDesktopOnlySettings
-      ? [
-          {
-            id: 'plugins',
-            title: translate('auto.hooks.useSettingsNavigationMetadata.pluginsTitle', 'Plugins'),
-            description: translate(
-              'auto.hooks.useSettingsNavigationMetadata.pluginsDescription',
-              'Install and manage experimental Orca plugins.'
-            ),
-            icon: Blocks,
-            searchEntries: getPluginsPaneSearchEntries(),
-            group: 'experimental'
-          }
-        ]
-      : []),
-    // Why: one nav row per project, not per repo row — a project set up on
-    // multiple hosts (local + a Remote Orca Server, or two clones) collapses to
-    // a single entry. Derived from repos alone so this list matches the panes.
-    ...buildSettingsProjectList(repos).map(({ project, representativeRepoId, setups }) => {
-      const representativeRepo = reposById.get(representativeRepoId) ?? repos[0]
-      const hostSummary =
-        setups.length > 1
-          ? translate(
-              'auto.hooks.useSettingsNavigationMetadata.projectHostsSummary',
-              '{{value0}} hosts',
-              { value0: setups.length }
-            )
-          : (setups[0]?.path ?? representativeRepo.path)
-      return {
-        id: `repo-${representativeRepoId}`,
-        title: project.displayName,
-        description: `${getRepoKindLabel(project)} • ${hostSummary}`,
-        icon: SlidersHorizontal,
-        searchEntries: getRepositoryPaneSearchEntries(representativeRepo, {
-          windowsRuntimeSupported: isWindowsTerminalHost
-        }),
-        group: 'repositories'
-      }
-    })
+    ...buildCapabilitySettingsSections(options),
+    ...buildSetupSettingsSections(options),
+    ...buildWorkflowSettingsSections(options, terminalPaneSearchEntries),
+    ...buildInterfaceSettingsSections(options),
+    ...buildRemoteSettingsSections(options, runtimeEnvironmentsSearchEntry, reposById)
   ]
 }
 
diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json
index 62c9ca3436d..4689516b072 100644
--- a/src/renderer/src/i18n/locales/en.json
+++ b/src/renderer/src/i18n/locales/en.json
@@ -15406,7 +15406,7 @@
           "53fc5f07ab": "Run history",
           "a00e38d1a3": "n/a",
           "fdb3caa8fb": "known",
-          "historyUnavailable": "Run history could not be loaded for this automation."
+          "historyUnavailable": "Run history is unavailable from this host. This does not mean the automation failed or has no runs."
         },
         "AutomationRunPageFrame": {
           "40a511bed4": "Run context",
@@ -15728,7 +15728,7 @@
         },
         "capturedOwner": {
           "orphan": "This automation has no host to run on. Delete it, or re-add the host it belongs to.",
-          "unfenced": "This host cannot confirm which automation it is changing, so this automation is read-only here."
+          "unfenced": "Orca on this host needs an update before you can view run history or manage this automation. Scheduled runs may still continue on the host."
         },
         "hostStatus": {
           "authority": {
diff --git a/src/renderer/src/lib/browser-workspace-source-resolution.ts b/src/renderer/src/lib/browser-workspace-source-resolution.ts
new file mode 100644
index 00000000000..9e10c6f7043
--- /dev/null
+++ b/src/renderer/src/lib/browser-workspace-source-resolution.ts
@@ -0,0 +1,27 @@
+import type { AppState } from '../store/types'
+
+export type BrowserWorkspaceOwner = {
+  worktreeId: string
+  workspaceId: string
+}
+
+export function resolveBrowserWorkspaceOwner(
+  state: Pick<AppState, 'browserTabsByWorktree' | 'browserPagesByWorkspace'>,
+  sourceId: string,
+  requiredWorktreeId?: string
+): BrowserWorkspaceOwner | null {
+  for (const [worktreeId, workspaces] of Object.entries(state.browserTabsByWorktree)) {
+    if (requiredWorktreeId && worktreeId !== requiredWorktreeId) {
+      continue
+    }
+    for (const workspace of workspaces) {
+      if (
+        workspace.id === sourceId ||
+        (state.browserPagesByWorkspace[workspace.id] ?? []).some((page) => page.id === sourceId)
+      ) {
+        return { worktreeId, workspaceId: workspace.id }
+      }
+    }
+  }
+  return null
+}
diff --git a/src/renderer/src/lib/floating-workspace-terminal-actions.ts b/src/renderer/src/lib/floating-workspace-terminal-actions.ts
index 484143160d9..d8c81add055 100644
--- a/src/renderer/src/lib/floating-workspace-terminal-actions.ts
+++ b/src/renderer/src/lib/floating-workspace-terminal-actions.ts
@@ -9,6 +9,7 @@ import {
   type TypeCyclableTab
 } from '@/components/terminal/tab-type-cycle'
 import type { AppState } from '@/store/types'
+import { resolveBrowserWorkspaceOwner } from './browser-workspace-source-resolution'
 import { TOGGLE_FLOATING_TERMINAL_EVENT } from './floating-terminal'
 import { focusTerminalTabSurface } from './focus-terminal-tab-surface'
 import { keybindingMatchesAction, type KeybindingOverrides } from '../../../shared/keybindings'
@@ -143,17 +144,10 @@ export function resolveFloatingWorkspaceBrowserWorkspaceId(
   store: Pick<AppState, 'browserTabsByWorktree' | 'browserPagesByWorkspace'>,
   sourceId: string
 ): string | null {
-  const workspaces = store.browserTabsByWorktree[FLOATING_TERMINAL_WORKTREE_ID] ?? []
-  const pagesByWorkspace = store.browserPagesByWorkspace ?? {}
-  for (const workspace of workspaces) {
-    if (workspace.id === sourceId) {
-      return workspace.id
-    }
-    if ((pagesByWorkspace[workspace.id] ?? []).some((page) => page.id === sourceId)) {
-      return workspace.id
-    }
-  }
-  return null
+  return (
+    resolveBrowserWorkspaceOwner(store, sourceId, FLOATING_TERMINAL_WORKTREE_ID)?.workspaceId ??
+    null
+  )
 }
 
 function activateFloatingWorkspaceCyclableTab(
diff --git a/src/renderer/src/lib/pane-manager/pane-terminal-foreground-queue-state.ts b/src/renderer/src/lib/pane-manager/pane-terminal-foreground-queue-state.ts
new file mode 100644
index 00000000000..6d9d7524e27
--- /dev/null
+++ b/src/renderer/src/lib/pane-manager/pane-terminal-foreground-queue-state.ts
@@ -0,0 +1,128 @@
+import {
+  queuedByTerminal,
+  scheduleDrain,
+  type QueueEntry,
+  type TerminalOutputTarget,
+  type WriteTerminalOutputOptions
+} from './pane-terminal-output-queue-registry'
+
+const DEFAULT_FOREGROUND_COALESCE_DELAY_MS = 1000
+export const FOREGROUND_HOLD_SAFETY_DELAY_MS = 250
+export const LATENCY_SENSITIVE_FOREGROUND_COALESCE_DELAY_MS = 16
+export const LATENCY_SENSITIVE_FOREGROUND_HOLD_SAFETY_DELAY_MS = 32
+
+export function createQueueEntry(
+  terminal: TerminalOutputTarget,
+  options: WriteTerminalOutputOptions
+): QueueEntry {
+  return {
+    terminal,
+    chunks: [],
+    chunkIndex: 0,
+    queuedChars: 0,
+    onBackgroundBacklogDropped: options.onBackgroundBacklogDropped,
+    backgroundBacklogDropped: false,
+    highPriority: true,
+    foregroundHold: false,
+    foregroundHoldSafetyDelayMs: FOREGROUND_HOLD_SAFETY_DELAY_MS,
+    foregroundCoalesce: false,
+    foregroundCoalesceDelayMs: DEFAULT_FOREGROUND_COALESCE_DELAY_MS,
+    foregroundHoldSafetyTimer: null,
+    foregroundCoalesceTimer: null,
+    foregroundReleaseDeadlineAt: null,
+    foregroundReleaseDeadlineFixed: false
+  }
+}
+
+function getDrainNow(): number {
+  return typeof performance !== 'undefined' ? performance.now() : Date.now()
+}
+
+function armForegroundReleaseDeadline(
+  entry: QueueEntry,
+  delayMs: number,
+  mayExtend: boolean
+): number {
+  const now = getDrainNow()
+  const requested = now + delayMs
+  entry.foregroundReleaseDeadlineAt =
+    entry.foregroundReleaseDeadlineAt === null ||
+    (mayExtend && !entry.foregroundReleaseDeadlineFixed)
+      ? requested
+      : Math.min(entry.foregroundReleaseDeadlineAt, requested)
+  return Math.max(0, entry.foregroundReleaseDeadlineAt - now)
+}
+
+// Why: reopen the gate only once the entry is drainable again, so the next synchronized frame gets a full budget.
+function resetForegroundReleaseGate(entry: QueueEntry): void {
+  entry.foregroundReleaseDeadlineAt = null
+  entry.foregroundReleaseDeadlineFixed = false
+}
+
+export function clearForegroundRelease(entry: QueueEntry): void {
+  clearForegroundHoldSafety(entry)
+  clearForegroundCoalesce(entry)
+  resetForegroundReleaseGate(entry)
+}
+
+export function clearForegroundHoldSafety(entry: QueueEntry): void {
+  if (entry.foregroundHoldSafetyTimer === null) {
+    return
+  }
+  clearTimeout(entry.foregroundHoldSafetyTimer)
+  entry.foregroundHoldSafetyTimer = null
+  entry.foregroundHoldSafetyDelayMs = FOREGROUND_HOLD_SAFETY_DELAY_MS
+}
+
+export function clearForegroundCoalesce(entry: QueueEntry): void {
+  if (entry.foregroundCoalesceTimer !== null) {
+    clearTimeout(entry.foregroundCoalesceTimer)
+    entry.foregroundCoalesceTimer = null
+  }
+  entry.foregroundCoalesce = false
+  entry.foregroundCoalesceDelayMs = DEFAULT_FOREGROUND_COALESCE_DELAY_MS
+}
+
+export function scheduleForegroundHoldSafety(entry: QueueEntry): void {
+  clearForegroundHoldSafety(entry)
+  const delayMs = armForegroundReleaseDeadline(entry, entry.foregroundHoldSafetyDelayMs, true)
+  entry.foregroundHoldSafetyTimer = setTimeout(() => {
+    entry.foregroundHoldSafetyTimer = null
+    entry.foregroundHold = false
+    clearForegroundCoalesce(entry)
+    resetForegroundReleaseGate(entry)
+    if (queuedByTerminal.has(entry.terminal)) {
+      scheduleDrain(0)
+    }
+  }, delayMs)
+}
+
+export function scheduleForegroundCoalesceRelease(
+  entry: QueueEntry,
+  options?: { rescheduleEarlier?: boolean }
+): void {
+  if (entry.foregroundCoalesceTimer !== null) {
+    if (options?.rescheduleEarlier !== true) {
+      entry.foregroundCoalesce = true
+      return
+    }
+    clearTimeout(entry.foregroundCoalesceTimer)
+    entry.foregroundCoalesceTimer = null
+  }
+  entry.foregroundCoalesce = true
+  // Why fixed from here: a later hold chunk must clamp to this deadline instead of restarting the pair's mutual re-arm (#8754).
+  entry.foregroundReleaseDeadlineFixed = true
+  const delayMs = armForegroundReleaseDeadline(entry, entry.foregroundCoalesceDelayMs, false)
+  entry.foregroundCoalesceTimer = setTimeout(() => {
+    entry.foregroundCoalesceTimer = null
+    entry.foregroundCoalesce = false
+    resetForegroundReleaseGate(entry)
+    if (queuedByTerminal.has(entry.terminal)) {
+      scheduleDrain(0)
+    }
+  }, delayMs)
+}
+
+export function isEntryDrainable(entry: QueueEntry): boolean {
+  return !entry.foregroundHold && !entry.foregroundCoalesce
+}
diff --git a/src/renderer/src/lib/pane-manager/pane-terminal-output-drain.ts b/src/renderer/src/lib/pane-manager/pane-terminal-output-drain.ts
new file mode 100644
index 00000000000..4753eb38feb
--- /dev/null
+++ b/src/renderer/src/lib/pane-manager/pane-terminal-output-drain.ts
@@ -0,0 +1,128 @@
+import {
+  recordTerminalOutputQueueDebugPressure as recordQueueDebugPressure,
+  terminalOutputSchedulerDebugEnabled as debugEnabled,
+  terminalOutputSchedulerDebugState as debugState
+} from './pane-terminal-output-scheduler-debug'
+import { clearForegroundRelease, isEntryDrainable } from './pane-terminal-foreground-queue-state'
+import { hasHighPriorityBacklog, hasQueuedChunks } from './pane-terminal-output-queue-backlog'
+import {
+  BACKGROUND_DRAIN_INTERVAL_MS,
+  DRAIN_TIME_BUDGET_MS,
+  HIGH_PRIORITY_DRAIN_INTERVAL_MS,
+  HIGH_PRIORITY_MAX_WRITES_PER_DRAIN,
+  LARGE_BACKLOG_CHARS,
+  MAX_WRITES_PER_DRAIN,
+  isMessageChannelDrainEnabled,
+  markTerminalOutputDrainStarted,
+  queuedByTerminal,
+  scheduleDrain,
+  setTerminalOutputDrainRunner,
+  type QueueEntry
+} from './pane-terminal-output-queue-registry'
+
+import { writeQueuedChunk } from './pane-terminal-output-pipeline'
+
+function hasDrainableBacklog(): boolean {
+  for (const entry of queuedByTerminal.values()) {
+    if (isEntryDrainable(entry)) {
+      return true
+    }
+  }
+  return false
+}
+
+// Why no per-write scroll enforcement: xterm's BufferService.isUserScrolling owns live follow/pin; app-side enforcement is limited to structural ops xterm can't identify, like replay.
+
+function takeNextDrainableEntry(): QueueEntry | null {
+  let largeBacklogEntry: QueueEntry | null = null
+  for (const entry of queuedByTerminal.values()) {
+    if (!isEntryDrainable(entry)) {
+      continue
+    }
+    // Why: active/foreground output should be chosen first, not left in insertion order behind older background terminals.
+    if (entry.highPriority) {
+      queuedByTerminal.delete(entry.terminal)
+      return entry
+    }
+    if (!largeBacklogEntry && entry.queuedChars > LARGE_BACKLOG_CHARS) {
+      largeBacklogEntry = entry
+    }
+  }
+  if (largeBacklogEntry) {
+    queuedByTerminal.delete(largeBacklogEntry.terminal)
+    return largeBacklogEntry
+  }
+  for (const entry of queuedByTerminal.values()) {
+    if (!isEntryDrainable(entry)) {
+      continue
+    }
+    queuedByTerminal.delete(entry.terminal)
+    return entry
+  }
+  return null
+}
+
+// Why: re-arm a zero-delay drain once xterm confirms the previous high-priority batch parsed; the fixed 4/16ms cadence otherwise drips far below xterm's ~100 MB/s parse. Only visible panes are pacer-clocked; background keeps the fixed cadence to protect the focused terminal.
+
+function getDrainNow(): number {
+  if (typeof performance !== 'undefined') {
+    return performance.now()
+  }
+  return Date.now()
+}
+
+export function drainQueuedOutputImpl(): void {
+  markTerminalOutputDrainStarted()
+  let writes = 0
+  const startedAt = getDrainNow()
+  const highPriority = hasHighPriorityBacklog()
+  const maxWrites = highPriority ? HIGH_PRIORITY_MAX_WRITES_PER_DRAIN : MAX_WRITES_PER_DRAIN
+
+  while (queuedByTerminal.size > 0 && writes < maxWrites) {
+    const entry = takeNextDrainableEntry()
+    if (!entry) {
+      break
+    }
+
+    const writeKind = writeQueuedChunk(entry)
+    if (writeKind) {
+      writes++
+      if (debugEnabled) {
+        if (writeKind === 'foreground') {
+          debugState.deferredForegroundWriteCount++
+        } else {
+          debugState.backgroundWriteCount++
+        }
+      }
+    }
+    if (hasQueuedChunks(entry)) {
+      queuedByTerminal.set(entry.terminal, entry)
+    } else {
+      entry.highPriority = false
+      clearForegroundRelease(entry)
+    }
+    // Why: xterm parsing and DOM work share the renderer thread with input; keep draining cooperative so WSL/agent output can't pin the UI.
+    if (writes > 0 && getDrainNow() - startedAt >= DRAIN_TIME_BUDGET_MS) {
+      break
+    }
+  }
+
+  if (debugEnabled && writes > 0) {
+    debugState.drainWrites.push(writes)
+    debugState.drainHighPriority.push(highPriority)
+  }
+  recordQueueDebugPressure()
+  if (queuedByTerminal.size > 0 && hasDrainableBacklog()) {
+    // Why 0 on the channel path: a posted message already yields (input/paint serviced between macrotasks), so the 4ms interval only deepened the queue; timer path keeps it for fake-timer tests.
+    scheduleDrain(
+      hasHighPriorityBacklog()
+        ? isMessageChannelDrainEnabled()
+          ? 0
+          : HIGH_PRIORITY_DRAIN_INTERVAL_MS
+        : BACKGROUND_DRAIN_INTERVAL_MS
+    )
+  }
+}
+
+// Why at module scope: the registry's scheduleDrain must never fire before a runner exists, so registration happens as this module is evaluated rather than on first use.
+setTerminalOutputDrainRunner(drainQueuedOutputImpl)
diff --git a/src/renderer/src/lib/pane-manager/pane-terminal-output-flusher.ts b/src/renderer/src/lib/pane-manager/pane-terminal-output-flusher.ts
new file mode 100644
index 00000000000..cf6727bb7ff
--- /dev/null
+++ b/src/renderer/src/lib/pane-manager/pane-terminal-output-flusher.ts
@@ -0,0 +1,130 @@
+import { writeForegroundTerminalChunk } from './pane-terminal-foreground-render-settle'
+import { registerTerminalOutputAckCredits } from './pane-terminal-output-ack-credit'
+import {
+  armTerminalWriteStallWatch,
+  cancelTerminalWriteStallWatch,
+  isTerminalWritePipelineCertifiedDead
+} from './terminal-write-pipeline-health'
+import { removeTransientCursorShowSequences } from './pane-terminal-cursor-sequencing'
+import { takeQueuedChunk } from './pane-terminal-output-queue-chunks'
+import {
+  exposeTerminalOutputSchedulerDebugApi as exposeDebugApi,
+  recordTerminalOutputQueueDebugPressure as recordQueueDebugPressure,
+  terminalOutputSchedulerDebugEnabled as debugEnabled,
+  terminalOutputSchedulerDebugState as debugState
+} from './pane-terminal-output-scheduler-debug'
+import {
+  composeParsedCallback,
+  composeWriteFailureCallback,
+  writeBackgroundTerminalChunk
+} from './pane-terminal-output-pipeline'
+import { discardDetachedQueueEntry, hasQueuedChunks } from './pane-terminal-output-queue-backlog'
+import { clearForegroundRelease, isEntryDrainable } from './pane-terminal-foreground-queue-state'
+import {
+  BACKGROUND_CHUNK_CHARS,
+  discardTerminalOutput,
+  fireQueuedAckCredits,
+  queuedByTerminal,
+  requestRegisteredTerminalBacklogRecovery,
+  scheduleDrain,
+  type TerminalOutputTarget
+} from './pane-terminal-output-queue-registry'
+
+export function flushTerminalOutputImpl(
+  terminal: TerminalOutputTarget,
+  options?: { maxChars?: number }
+): void {
+  exposeDebugApi()
+  const entry = queuedByTerminal.get(terminal)
+  if (!entry) {
+    return
+  }
+  queuedByTerminal.delete(terminal)
+  if (isTerminalWritePipelineCertifiedDead(terminal)) {
+    discardDetachedQueueEntry(entry)
+    discardTerminalOutput(terminal)
+    return
+  }
+  if (!isEntryDrainable(entry)) {
+    queuedByTerminal.set(terminal, entry)
+    return
+  }
+  if (entry.backgroundBacklogDropped && requestRegisteredTerminalBacklogRecovery(terminal)) {
+    fireQueuedAckCredits(entry)
+    entry.chunks.length = 0
+    entry.chunkIndex = 0
+    entry.queuedChars = 0
+    entry.highPriority = false
+    clearForegroundRelease(entry)
+    recordQueueDebugPressure()
+    return
+  }
+
+  let flushedChars = 0
+  let queuedWrite = takeQueuedChunk(entry, BACKGROUND_CHUNK_CHARS)
+  while (queuedWrite) {
+    flushedChars += queuedWrite.data.length
+    if (debugEnabled) {
+      debugState.flushWriteCount++
+    }
+    const ackCreditsParsed = registerTerminalOutputAckCredits(terminal, queuedWrite.ackCredits)
+    armTerminalWriteStallWatch(terminal, {
+      onCertifiedDead: () => discardTerminalOutput(terminal)
+    })
+    try {
+      queuedWrite.beforeWrite?.(queuedWrite.data)
+      const writeAccepted = queuedWrite.foreground
+        ? writeForegroundTerminalChunk(
+            terminal,
+            queuedWrite.stripTransientCursorShows
+              ? removeTransientCursorShowSequences(queuedWrite.data)
+              : queuedWrite.data,
+            {
+              forceViewportRefresh: queuedWrite.forceForegroundRefresh,
+              followupViewportRefresh: queuedWrite.followupForegroundRefresh,
+              shouldRefreshViewportSynchronously: queuedWrite.shouldRefreshForegroundSynchronously,
+              onParsed: composeParsedCallback(
+                terminal,
+                queuedWrite.onParsed,
+                ackCreditsParsed,
+                undefined
+              ),
+              onWriteFailure: composeWriteFailureCallback(terminal, ackCreditsParsed)
+            }
+          )
+        : writeBackgroundTerminalChunk(
+            terminal,
+            queuedWrite.data,
+            composeParsedCallback(terminal, queuedWrite.onParsed, ackCreditsParsed, undefined),
+            composeWriteFailureCallback(terminal, ackCreditsParsed)
+          )
+      if (!writeAccepted) {
+        fireQueuedAckCredits(entry)
+        clearForegroundRelease(entry)
+        recordQueueDebugPressure()
+        return
+      }
+    } catch {
+      // Why: pre-write hooks/setup failed before xterm owned these bytes; cancel the watch, but consumed + abandoned chunks still credit delivery.
+      cancelTerminalWriteStallWatch(terminal)
+      ackCreditsParsed?.()
+      fireQueuedAckCredits(entry)
+      clearForegroundRelease(entry)
+      recordQueueDebugPressure()
+      return
+    }
+    if (options?.maxChars !== undefined && flushedChars >= options.maxChars) {
+      break
+    }
+    queuedWrite = takeQueuedChunk(entry, BACKGROUND_CHUNK_CHARS)
+  }
+  if (hasQueuedChunks(entry)) {
+    entry.highPriority = true
+    queuedByTerminal.set(terminal, entry)
+    scheduleDrain(0)
+  } else {
+    entry.highPriority = false
+    clearForegroundRelease(entry)
+  }
+  recordQueueDebugPressure()
+}
diff --git a/src/renderer/src/lib/pane-manager/pane-terminal-output-pipeline.ts b/src/renderer/src/lib/pane-manager/pane-terminal-output-pipeline.ts
new file mode 100644
index 00000000000..06ba58568d2
--- /dev/null
+++ b/src/renderer/src/lib/pane-manager/pane-terminal-output-pipeline.ts
@@ -0,0 +1,171 @@
+import { writeForegroundTerminalChunk } from './pane-terminal-foreground-render-settle'
+import { runGuardedWriteCompletionStep } from './xterm-write-callback-guard'
+import { registerTerminalOutputAckCredits } from './pane-terminal-output-ack-credit'
+import {
+  armTerminalWriteStallWatch,
+  cancelTerminalWriteStallWatch,
+  failTerminalWriteStallWatch,
+  isTerminalWritePipelineCertifiedDead,
+  settleTerminalWriteStallWatch
+} from './terminal-write-pipeline-health'
+import { removeTransientCursorShowSequences } from './pane-terminal-cursor-sequencing'
+import { takeQueuedChunk } from './pane-terminal-output-queue-chunks'
+import { recordTerminalOutputQueueDebugPressure as recordQueueDebugPressure } from './pane-terminal-output-scheduler-debug'
+import { clearForegroundRelease } from './pane-terminal-foreground-queue-state'
+import {
+  BACKGROUND_CHUNK_CHARS,
+  discardTerminalOutput,
+  fireQueuedAckCredits,
+  queuedByTerminal,
+  scheduleDrain,
+  type QueueEntry,
+  type TerminalOutputParsedCallback,
+  type TerminalOutputTarget
+} from './pane-terminal-output-queue-registry'
+import {
+  discardDetachedQueueEntry,
+  hasHighPriorityBacklog
+} from './pane-terminal-output-queue-backlog'
+
+// Why no per-write scroll enforcement: xterm's BufferService.isUserScrolling owns live follow/pin; app-side enforcement is limited to structural ops xterm can't identify, like replay.
+export function writeBackgroundTerminalChunk(
+  terminal: TerminalOutputTarget,
+  data: string,
+  onParsed?: TerminalOutputParsedCallback,
+  onWriteFailure?: () => void
+): boolean {
+  // Why guarded: these callbacks run inside xterm's WriteBuffer loop, where an escaping throw permanently wedges the terminal (see xterm-write-callback-guard.ts).
+  const runOnParsed = onParsed
+    ? (): void => runGuardedWriteCompletionStep('background-on-parsed', onParsed)
+    : undefined
+  const runOnWriteFailure = onWriteFailure
+    ? (): void => runGuardedWriteCompletionStep('background-on-write-failure', onWriteFailure)
+    : undefined
+  try {
+    if (!runOnParsed || terminal.write.length < 2) {
+      terminal.write(data)
+      runOnParsed?.()
+      return true
+    }
+    terminal.write(data, runOnParsed)
+    return true
+  } catch {
+    runOnWriteFailure?.()
+    return false
+  }
+}
+
+// Why: re-arm a zero-delay drain once xterm confirms the previous high-priority batch parsed; the fixed 4/16ms cadence otherwise drips far below xterm's ~100 MB/s parse. Only visible panes are pacer-clocked; background keeps the fixed cadence to protect the focused terminal.
+function makeParseClockPacer(): () => void {
+  return () => {
+    try {
+      if (queuedByTerminal.size > 0 && hasHighPriorityBacklog()) {
+        scheduleDrain(0)
+      }
+    } catch {
+      // Why: runs inside xterm's write-callback chain; a throw here would wedge the terminal (see xterm-write-callback-guard.ts).
+    }
+  }
+}
+
+export function composeParsedCallback(
+  terminal: TerminalOutputTarget,
+  onParsed: TerminalOutputParsedCallback | undefined,
+  ackCreditsParsed: (() => void) | undefined,
+  pacer: (() => void) | undefined
+): TerminalOutputParsedCallback {
+  // Why always non-undefined: the callback doubles as the pipeline-health settle signal — with none, the stall watch could never settle, forcing a probe round-trip per healthy idle pane.
+  return () => {
+    try {
+      onParsed?.()
+    } finally {
+      ackCreditsParsed?.()
+      pacer?.()
+      settleTerminalWriteStallWatch(terminal)
+    }
+  }
+}
+
+export function composeWriteFailureCallback(
+  terminal: TerminalOutputTarget,
+  ackCreditsParsed: (() => void) | undefined
+): () => void {
+  return () => {
+    try {
+      // A rejected write still consumed the main-owned delivery window.
+      ackCreditsParsed?.()
+    } finally {
+      // Why: a synchronous rejection proves undeliverability but nothing about parse progress; recover without extending replay guards.
+      failTerminalWriteStallWatch(terminal)
+    }
+  }
+}
+
+export function writeQueuedChunk(entry: QueueEntry): 'foreground' | 'background' | null {
+  if (isTerminalWritePipelineCertifiedDead(entry.terminal)) {
+    // The drain owns this detached entry, so map-based discard cannot see it.
+    discardDetachedQueueEntry(entry)
+    discardTerminalOutput(entry.terminal)
+    return null
+  }
+  const queuedWrite = takeQueuedChunk(entry, BACKGROUND_CHUNK_CHARS)
+  if (!queuedWrite) {
+    return null
+  }
+  const pacer = entry.highPriority ? makeParseClockPacer() : undefined
+  const ackCreditsParsed = registerTerminalOutputAckCredits(entry.terminal, queuedWrite.ackCredits)
+  // Why armed BEFORE the write: a wedged WriteBuffer (issue #2836) or disposed xterm (6.1.0-beta.287) never runs the parsed callback, so the watch must be live first to catch it.
+  armTerminalWriteStallWatch(entry.terminal, {
+    onCertifiedDead: () => discardTerminalOutput(entry.terminal)
+  })
+  try {
+    queuedWrite.beforeWrite?.(queuedWrite.data)
+    const writeAccepted = queuedWrite.foreground
+      ? writeForegroundTerminalChunk(
+          entry.terminal,
+          queuedWrite.stripTransientCursorShows
+            ? removeTransientCursorShowSequences(queuedWrite.data)
+            : queuedWrite.data,
+          {
+            forceViewportRefresh: queuedWrite.forceForegroundRefresh,
+            followupViewportRefresh: queuedWrite.followupForegroundRefresh,
+            shouldRefreshViewportSynchronously: queuedWrite.shouldRefreshForegroundSynchronously,
+            onParsed: composeParsedCallback(
+              entry.terminal,
+              queuedWrite.onParsed,
+              ackCreditsParsed,
+              pacer
+            ),
+            onWriteFailure: composeWriteFailureCallback(entry.terminal, ackCreditsParsed)
+          }
+        )
+      : writeBackgroundTerminalChunk(
+          entry.terminal,
+          queuedWrite.data,
+          composeParsedCallback(entry.terminal, queuedWrite.onParsed, ackCreditsParsed, pacer),
+          composeWriteFailureCallback(entry.terminal, ackCreditsParsed)
+        )
+    if (!writeAccepted) {
+      // Why: the failure callback credited the submitted chunk; credit and abandon the detached tail so the drain can't retry a certified-dead xterm.
+      fireQueuedAckCredits(entry)
+      entry.chunks.length = 0
+      entry.chunkIndex = 0
+      entry.queuedChars = 0
+      clearForegroundRelease(entry)
+      recordQueueDebugPressure()
+      return null
+    }
+  } catch {
+    // Why: beforeWrite or write setup can fail before xterm owns the bytes; cancel the armed watch without claiming parser failure.
+    cancelTerminalWriteStallWatch(entry.terminal)
+    ackCreditsParsed?.()
+    fireQueuedAckCredits(entry)
+    entry.chunks.length = 0
+    entry.chunkIndex = 0
+    entry.queuedChars = 0
+    clearForegroundRelease(entry)
+    recordQueueDebugPressure()
+    return null
+  }
+  return queuedWrite.foreground ? 'foreground' : 'background'
+}
diff --git a/src/renderer/src/lib/pane-manager/pane-terminal-output-queue-backlog.ts b/src/renderer/src/lib/pane-manager/pane-terminal-output-queue-backlog.ts
new file mode 100644
index 00000000000..4bc1bcfb970
--- /dev/null
+++ b/src/renderer/src/lib/pane-manager/pane-terminal-output-queue-backlog.ts
@@ -0,0 +1,104 @@
+import { recordRendererCrashBreadcrumb } from '@/lib/crash-breadcrumb-recorder'
+import {
+  recordTerminalOutputQueueDebugPressure as recordQueueDebugPressure,
+  terminalOutputSchedulerDebugEnabled as debugEnabled,
+  terminalOutputSchedulerDebugState as debugState
+} from './pane-terminal-output-scheduler-debug'
+import {
+  clearForegroundHoldSafety,
+  clearForegroundRelease,
+  isEntryDrainable
+} from './pane-terminal-foreground-queue-state'
+import {
+  ALWAYS_REFRESH_FOREGROUND_SYNCHRONOUSLY,
+  BACKGROUND_BACKLOG_WARNING,
+  FOREGROUND_BACKLOG_WARNING,
+  LARGE_BACKLOG_CHARS,
+  MAX_BACKGROUND_QUEUE_CHUNKS,
+  fireQueuedAckCredits,
+  getTerminalOutputMaxQueueChars,
+  queuedByTerminal,
+  type QueueEntry,
+  type TerminalOutputBeforeWrite
+} from './pane-terminal-output-queue-registry'
+
+export function discardDetachedQueueEntry(entry: QueueEntry): void {
+  fireQueuedAckCredits(entry)
+  entry.chunks.length = 0
+  entry.chunkIndex = 0
+  entry.queuedChars = 0
+  entry.highPriority = false
+  clearForegroundRelease(entry)
+}
+
+export function queueCapExceeded(entry: QueueEntry): boolean {
+  return (
+    entry.queuedChars > getTerminalOutputMaxQueueChars() ||
+    entry.chunks.length - entry.chunkIndex > MAX_BACKGROUND_QUEUE_CHUNKS
+  )
+}
+
+export function replaceBacklogWithWarning(
+  entry: QueueEntry,
+  warning: string = BACKGROUND_BACKLOG_WARNING
+): void {
+  const shouldNotify = !entry.backgroundBacklogDropped
+  if (shouldNotify) {
+    // Why: field visibility for cap tuning — drop frequency and size decide whether the cap is too small (issue #2836 / #7017).
+    recordRendererCrashBreadcrumb('terminal_output_backlog_dropped', {
+      foreground: warning === FOREGROUND_BACKLOG_WARNING,
+      droppedChars: entry.queuedChars,
+      capChars: getTerminalOutputMaxQueueChars()
+    })
+  }
+  let beforeWrite: TerminalOutputBeforeWrite | undefined
+  for (let index = entry.chunks.length - 1; index >= entry.chunkIndex; index--) {
+    if (entry.chunks[index]?.beforeWrite) {
+      beforeWrite = entry.chunks[index].beforeWrite
+      break
+    }
+  }
+  clearForegroundHoldSafety(entry)
+  fireQueuedAckCredits(entry)
+  entry.chunks = [
+    {
+      data: warning,
+      retainedChars: warning.length,
+      foreground: false,
+      forceForegroundRefresh: false,
+      followupForegroundRefresh: false,
+      shouldRefreshForegroundSynchronously: ALWAYS_REFRESH_FOREGROUND_SYNCHRONOUSLY,
+      stripTransientCursorShows: false,
+      beforeWrite
+    }
+  ]
+  entry.chunkIndex = 0
+  entry.queuedChars = warning.length
+  entry.backgroundBacklogDropped = true
+  entry.highPriority = true
+  entry.foregroundHold = false
+  if (debugEnabled && shouldNotify) {
+    debugState.droppedBacklogCount++
+  }
+  clearForegroundRelease(entry)
+  recordQueueDebugPressure()
+  if (shouldNotify) {
+    entry.onBackgroundBacklogDropped?.()
+  }
+}
+
+export function hasQueuedChunks(entry: QueueEntry): boolean {
+  return entry.chunkIndex < entry.chunks.length
+}
+
+export function hasHighPriorityBacklog(): boolean {
+  for (const entry of queuedByTerminal.values()) {
+    if (
+      isEntryDrainable(entry) &&
+      (entry.highPriority || entry.queuedChars > LARGE_BACKLOG_CHARS)
+    ) {
+      return true
+    }
+  }
+  return false
+}
diff --git a/src/renderer/src/lib/pane-manager/pane-terminal-output-queue-chunks.ts b/src/renderer/src/lib/pane-manager/pane-terminal-output-queue-chunks.ts
index 0142c3528be..bdf7251df84 100644
--- a/src/renderer/src/lib/pane-manager/pane-terminal-output-queue-chunks.ts
+++ b/src/renderer/src/lib/pane-manager/pane-terminal-output-queue-chunks.ts
@@ -4,7 +4,7 @@ import type {
   QueuedWrite,
   TerminalOutputBeforeWrite,
   TerminalOutputParsedCallback
-} from './pane-terminal-output-scheduler'
+} from './pane-terminal-output-queue-registry'
 import { recordTerminalOutputQueueDebugPressure as recordQueueDebugPressure } from './pane-terminal-output-scheduler-debug'
 
 type ForegroundRefreshSyncResolver = () => boolean
diff --git a/src/renderer/src/lib/pane-manager/pane-terminal-output-queue-registry.ts b/src/renderer/src/lib/pane-manager/pane-terminal-output-queue-registry.ts
new file mode 100644
index 00000000000..a7e87f380de
--- /dev/null
+++ b/src/renderer/src/lib/pane-manager/pane-terminal-output-queue-registry.ts
@@ -0,0 +1,246 @@
+import {
+  discardForegroundRenderSettle,
+  type ForegroundTerminalOutputTarget
+} from './pane-terminal-foreground-render-settle'
+import { discardInFlightTerminalOutputAckCredits } from './pane-terminal-output-ack-credit'
+import { cancelTerminalWriteStallWatch } from './terminal-write-pipeline-health'
+import {
+  TERMINAL_OUTPUT_BACKLOG_MIN_CAP_CHARS,
+  terminalOutputBacklogCapChars
+} from '../../../../shared/terminal-scrollback-policy'
+import {
+  exposeTerminalOutputSchedulerDebugApi as exposeDebugApi,
+  recordTerminalOutputQueueDebugPressure as recordQueueDebugPressure,
+  setTerminalOutputDebugQueueReader,
+  terminalOutputSchedulerDebugEnabled as debugEnabled,
+  terminalOutputSchedulerDebugState as debugState
+} from './pane-terminal-output-scheduler-debug'
+
+export type TerminalOutputTarget = ForegroundTerminalOutputTarget
+
+export type TerminalOutputBeforeWrite = (data: string) => void
+type TerminalBacklogRecoveryRequest = () => boolean
+export type TerminalOutputParsedCallback = () => void
+type ForegroundRefreshSyncResolver = () => boolean
+
+export type WriteTerminalOutputOptions = {
+  foreground: boolean
+  beforeWrite?: TerminalOutputBeforeWrite
+  onParsed?: TerminalOutputParsedCallback
+  /** Parse-deferred delivery ACK (terminal-pty-ack-gate). MUST be invoked when the chunk is parsed OR discarded by any drop path; fire-once, so double invocation is safe but omission permanently shrinks main's in-flight window. */
+  ackCredit?: () => void
+  onBackgroundBacklogDropped?: () => void
+  latencySensitive?: boolean
+  forceForegroundRefresh?: boolean
+  followupForegroundRefresh?: boolean
+  shouldRefreshForegroundSynchronously?: ForegroundRefreshSyncResolver
+  stripTransientCursorShows?: boolean
+  coalesceForeground?: boolean
+  holdForeground?: boolean
+}
+
+type QueueChunk = {
+  data: string
+  // Tracks the backing data still reachable through this queue slot.
+  retainedChars: number
+  foreground: boolean
+  forceForegroundRefresh: boolean
+  followupForegroundRefresh: boolean
+  shouldRefreshForegroundSynchronously: ForegroundRefreshSyncResolver
+  stripTransientCursorShows: boolean
+  beforeWrite?: TerminalOutputBeforeWrite
+  onParsed?: TerminalOutputParsedCallback
+  ackCredit?: () => void
+}
+
+export type QueuedWrite = {
+  data: string
+  foreground: boolean
+  forceForegroundRefresh: boolean
+  followupForegroundRefresh: boolean
+  shouldRefreshForegroundSynchronously: ForegroundRefreshSyncResolver
+  stripTransientCursorShows: boolean
+  beforeWrite?: TerminalOutputBeforeWrite
+  onParsed?: TerminalOutputParsedCallback
+  ackCredits: (() => void)[]
+}
+
+export type QueueEntry = {
+  terminal: TerminalOutputTarget
+  chunks: QueueChunk[]
+  chunkIndex: number
+  queuedChars: number
+  onBackgroundBacklogDropped?: () => void
+  backgroundBacklogDropped: boolean
+  highPriority: boolean
+  foregroundHold: boolean
+  foregroundHoldSafetyDelayMs: number
+  foregroundCoalesce: boolean
+  foregroundCoalesceDelayMs: number
+  foregroundHoldSafetyTimer: ReturnType<typeof setTimeout> | null
+  foregroundCoalesceTimer: ReturnType<typeof setTimeout> | null
+  // Why: hold and coalesce cancel each other's fallback timer, so an alternating DEC 2026 stream could re-arm both forever and freeze a visible pane (#8754). This caps one non-drainable episode.
+  foregroundReleaseDeadlineAt: number | null
+  // Why: an open frame's own hold chunks may still push the deadline out, but once coalesce has taken the entry over the deadline stops moving so the two mechanisms can't re-arm each other.
+  foregroundReleaseDeadlineFixed: boolean
+}
+
+export const BACKGROUND_FLUSH_DELAY_MS = 50
+export const BACKGROUND_DRAIN_INTERVAL_MS = 16
+export const HIGH_PRIORITY_DRAIN_INTERVAL_MS = 4
+export const BACKGROUND_CHUNK_CHARS = 16 * 1024
+export const MAX_WRITES_PER_DRAIN = 2
+// Why 8: per-tick volume (8 x 16KB = 128KB ≈ 1.3ms parse) sets the sustained ceiling (~30MB/s) within DRAIN_TIME_BUDGET_MS; at 2 it was only 8MB/s against a ~100MB/s parser (see throughput bench).
+export const HIGH_PRIORITY_MAX_WRITES_PER_DRAIN = 8
+export const DRAIN_TIME_BUDGET_MS = 8
+export const LARGE_BACKLOG_CHARS = 512 * 1024
+// Why mutable: the cap scales with the user's scrollback setting (terminalOutputBacklogCapChars), configured when settings apply; the chunk-count cap stays fixed.
+let maxQueueChars = TERMINAL_OUTPUT_BACKLOG_MIN_CAP_CHARS
+export const MAX_BACKGROUND_QUEUE_CHUNKS = 4096
+
+export function configureTerminalOutputBacklogCap(scrollbackRows: unknown): void {
+  maxQueueChars = terminalOutputBacklogCapChars(scrollbackRows)
+}
+
+export function getTerminalOutputMaxQueueChars(): number {
+  return maxQueueChars
+}
+// Why: leading CAN aborts any partial escape sequence before the style reset so the backlog warning renders cleanly.
+export const BACKGROUND_BACKLOG_WARNING =
+  '\x18\x1b[0m\r\n[Orca skipped hidden terminal output because the backlog grew too large.]\r\n'
+// Why a separate foreground message: a visible pane hitting the cap means the drain couldn't keep up with a flood (starved renderer), not merely output produced while hidden.
+export const FOREGROUND_BACKLOG_WARNING =
+  '\x18\x1b[0m\r\n[Orca skipped a burst of terminal output because the backlog grew too large.]\r\n'
+export const ALWAYS_REFRESH_FOREGROUND_SYNCHRONOUSLY = (): boolean => true
+
+export const queuedByTerminal = new Map<TerminalOutputTarget, QueueEntry>()
+setTerminalOutputDebugQueueReader(() => queuedByTerminal.values())
+const backlogRecoveryByTerminal = new WeakMap<
+  TerminalOutputTarget,
+  TerminalBacklogRecoveryRequest
+>()
+let drainTimer: ReturnType<typeof setTimeout> | null = null
+let drainTimerDelayMs: number | null = null
+// Why a MessageChannel for zero-delay drains: Chromium clamps nested setTimeout(0) to ~4ms; a posted macrotask isn't clamped yet still yields to input/paint. Cancellation is by generation.
+let drainImmediatePending = false
+let drainImmediateGeneration = 0
+let useMessageChannelDrain = typeof MessageChannel !== 'undefined' && !isVitestEnv()
+let drainChannel: MessageChannel | null = null
+// Why indirect: the drain loop lives downstream of this module, so it registers itself here rather than being imported back into the queue state it operates on.
+let runDrain: (() => void) | null = null
+
+export function setTerminalOutputDrainRunner(runner: () => void): void {
+  runDrain = runner
+}
+
+function runDrainTick(): void {
+  runDrain?.()
+}
+
+function isVitestEnv(): boolean {
+  // Why: vitest fake timers can't advance MessageChannel macrotasks; the timer path keeps the suites' virtual clock authoritative.
+  return typeof process !== 'undefined' && process.env?.VITEST === 'true'
+}
+
+function getDrainChannel(): MessageChannel {
+  if (drainChannel === null) {
+    drainChannel = new MessageChannel()
+    drainChannel.port1.onmessage = (event: MessageEvent) => {
+      if (event.data !== drainImmediateGeneration || !drainImmediatePending) {
+        return
+      }
+      drainImmediatePending = false
+      runDrainTick()
+    }
+  }
+  return drainChannel
+}
+
+function cancelImmediateDrain(): void {
+  drainImmediateGeneration++
+  drainImmediatePending = false
+}
+
+export function setUseMessageChannelDrainForTesting(value: boolean | null): void {
+  cancelImmediateDrain()
+  useMessageChannelDrain = value ?? (typeof MessageChannel !== 'undefined' && !isVitestEnv())
+}
+
+export function isMessageChannelDrainEnabled(): boolean {
+  return useMessageChannelDrain
+}
+
+export function markTerminalOutputDrainStarted(): void {
+  drainTimer = null
+  drainTimerDelayMs = null
+}
+
+export function scheduleDrain(delayMs: number): void {
+  if (drainImmediatePending) {
+    // An immediate drain is already armed — nothing can beat zero delay.
+    return
+  }
+  if (drainTimer !== null) {
+    if (drainTimerDelayMs !== null && drainTimerDelayMs <= delayMs) {
+      return
+    }
+    clearTimeout(drainTimer)
+    drainTimer = null
+    drainTimerDelayMs = null
+  }
+  if (queuedByTerminal.size === 0) {
+    return
+  }
+  if (debugEnabled) {
+    debugState.scheduledDrainCount++
+  }
+  if (delayMs === 0 && useMessageChannelDrain) {
+    drainImmediatePending = true
+    getDrainChannel().port2.postMessage(drainImmediateGeneration)
+    return
+  }
+  drainTimer = setTimeout(runDrainTick, delayMs)
+  drainTimerDelayMs = delayMs
+}
+
+// Why: every discard path MUST fire these before clearing/replacing the queue — a dropped chunk still counts as consumed, or main's in-flight window shrinks permanently and the PTY wedges.
+export function fireQueuedAckCredits(entry: QueueEntry): void {
+  for (let index = entry.chunkIndex; index < entry.chunks.length; index += 1) {
+    entry.chunks[index].ackCredit?.()
+  }
+}
+
+export function requestRegisteredTerminalBacklogRecovery(terminal: TerminalOutputTarget): boolean {
+  const requestRecovery = backlogRecoveryByTerminal.get(terminal)
+  if (!requestRecovery) {
+    return false
+  }
+  return requestRecovery()
+}
+
+export function registerTerminalBacklogRecovery(
+  terminal: TerminalOutputTarget,
+  requestRecovery: TerminalBacklogRecoveryRequest
+): () => void {
+  backlogRecoveryByTerminal.set(terminal, requestRecovery)
+  return () => {
+    if (backlogRecoveryByTerminal.get(terminal) === requestRecovery) {
+      backlogRecoveryByTerminal.delete(terminal)
+    }
+  }
+}
+
+export function discardTerminalOutput(terminal: TerminalOutputTarget): void {
+  exposeDebugApi()
+  const entry = queuedByTerminal.get(terminal)
+  if (entry) {
+    // Why: discarded chunks still consumed their deliveries — credit them or main's in-flight window leaks (fireQueuedAckCredits).
+    fireQueuedAckCredits(entry)
+  }
+  discardInFlightTerminalOutputAckCredits(terminal)
+  queuedByTerminal.delete(terminal)
+  discardForegroundRenderSettle(terminal)
+  // Why: cancel the watch without masquerading as parse progress; replay guards use real completions to tell slow from wedged.
+  cancelTerminalWriteStallWatch(terminal)
+  recordQueueDebugPressure()
+}
diff --git a/src/renderer/src/lib/pane-manager/pane-terminal-output-scheduler.ts b/src/renderer/src/lib/pane-manager/pane-terminal-output-scheduler.ts
index 402b847d421..a181de7416e 100644
--- a/src/renderer/src/lib/pane-manager/pane-terminal-output-scheduler.ts
+++ b/src/renderer/src/lib/pane-manager/pane-terminal-output-scheduler.ts
@@ -1,962 +1,66 @@
-/* oxlint-disable max-lines -- Why: output ordering, foreground settle, queue state, and e2e diagnostics form one state machine; splitting it would make backlog/resume guarantees harder to audit. */
 import {
-  discardForegroundRenderSettle,
-  writeForegroundTerminalChunk,
-  type ForegroundTerminalOutputTarget
-} from './pane-terminal-foreground-render-settle'
-import { runGuardedWriteCompletionStep } from './xterm-write-callback-guard'
-import { recordRendererCrashBreadcrumb } from '@/lib/crash-breadcrumb-recorder'
-import {
-  discardInFlightTerminalOutputAckCredits,
-  registerTerminalOutputAckCredits
-} from './pane-terminal-output-ack-credit'
-import {
-  armTerminalWriteStallWatch,
-  cancelTerminalWriteStallWatch,
   failTerminalWriteStallWatch,
   isTerminalWritePipelineCertifiedDead,
-  recordTerminalParseProgress,
-  settleTerminalWriteStallWatch
+  recordTerminalParseProgress
 } from './terminal-write-pipeline-health'
+import { exposeTerminalOutputSchedulerDebugApi as exposeDebugApi } from './pane-terminal-output-scheduler-debug'
+import { flushTerminalOutputImpl } from './pane-terminal-output-flusher'
+import { writeTerminalOutputImpl } from './pane-terminal-output-writer'
 import {
-  TERMINAL_OUTPUT_BACKLOG_MIN_CAP_CHARS,
-  terminalOutputBacklogCapChars
-} from '../../../../shared/terminal-scrollback-policy'
-import {
-  coalescedQueuedDataNeedsCursorRestore,
-  containsDrainableCursorRestore,
-  removeTransientCursorShowSequences,
-  SYNC_FOREGROUND_FLUSH_CHARS
-} from './pane-terminal-cursor-sequencing'
-import {
-  exposeTerminalOutputSchedulerDebugApi as exposeDebugApi,
-  recordTerminalOutputQueueDebugPressure as recordQueueDebugPressure,
-  setTerminalOutputDebugQueueReader,
-  terminalOutputSchedulerDebugEnabled as debugEnabled,
-  terminalOutputSchedulerDebugState as debugState
-} from './pane-terminal-output-scheduler-debug'
-import { enqueueChunk, takeQueuedChunk } from './pane-terminal-output-queue-chunks'
+  requestRegisteredTerminalBacklogRecovery,
+  type TerminalOutputTarget,
+  type WriteTerminalOutputOptions
+} from './pane-terminal-output-queue-registry'
+// Why this bare import: pane-terminal-output-drain registers the drain runner that the registry's
+// scheduleDrain invokes, and this facade is every consumer's entry point into the scheduler graph.
+import './pane-terminal-output-drain'
 
-type TerminalOutputTarget = ForegroundTerminalOutputTarget
+export {
+  ALWAYS_REFRESH_FOREGROUND_SYNCHRONOUSLY,
+  BACKGROUND_BACKLOG_WARNING,
+  BACKGROUND_CHUNK_CHARS,
+  BACKGROUND_DRAIN_INTERVAL_MS,
+  BACKGROUND_FLUSH_DELAY_MS,
+  DRAIN_TIME_BUDGET_MS,
+  FOREGROUND_BACKLOG_WARNING,
+  HIGH_PRIORITY_DRAIN_INTERVAL_MS,
+  HIGH_PRIORITY_MAX_WRITES_PER_DRAIN,
+  LARGE_BACKLOG_CHARS,
+  MAX_BACKGROUND_QUEUE_CHUNKS,
+  MAX_WRITES_PER_DRAIN,
+  configureTerminalOutputBacklogCap,
+  discardTerminalOutput,
+  getTerminalOutputMaxQueueChars,
+  isMessageChannelDrainEnabled,
+  markTerminalOutputDrainStarted,
+  queuedByTerminal,
+  registerTerminalBacklogRecovery,
+  requestRegisteredTerminalBacklogRecovery,
+  scheduleDrain,
+  setUseMessageChannelDrainForTesting,
+  type QueueEntry,
+  type QueuedWrite,
+  type TerminalOutputBeforeWrite,
+  type TerminalOutputParsedCallback,
+  type TerminalOutputTarget,
+  type WriteTerminalOutputOptions
+} from './pane-terminal-output-queue-registry'
 
-export type TerminalOutputBeforeWrite = (data: string) => void
-type TerminalBacklogRecoveryRequest = () => boolean
-export type TerminalOutputParsedCallback = () => void
-type ForegroundRefreshSyncResolver = () => boolean
-
-type WriteTerminalOutputOptions = {
-  foreground: boolean
-  beforeWrite?: TerminalOutputBeforeWrite
-  onParsed?: TerminalOutputParsedCallback
-  /** Parse-deferred delivery ACK (terminal-pty-ack-gate). MUST be invoked when the chunk is parsed OR discarded by any drop path; fire-once, so double invocation is safe but omission permanently shrinks main's in-flight window. */
-  ackCredit?: () => void
-  onBackgroundBacklogDropped?: () => void
-  latencySensitive?: boolean
-  forceForegroundRefresh?: boolean
-  followupForegroundRefresh?: boolean
-  shouldRefreshForegroundSynchronously?: ForegroundRefreshSyncResolver
-  stripTransientCursorShows?: boolean
-  coalesceForeground?: boolean
-  holdForeground?: boolean
-}
-
-type QueueChunk = {
-  data: string
-  // Tracks the backing data still reachable through this queue slot.
-  retainedChars: number
-  foreground: boolean
-  forceForegroundRefresh: boolean
-  followupForegroundRefresh: boolean
-  shouldRefreshForegroundSynchronously: ForegroundRefreshSyncResolver
-  stripTransientCursorShows: boolean
-  beforeWrite?: TerminalOutputBeforeWrite
-  onParsed?: TerminalOutputParsedCallback
-  ackCredit?: () => void
-}
-
-export type QueuedWrite = {
-  data: string
-  foreground: boolean
-  forceForegroundRefresh: boolean
-  followupForegroundRefresh: boolean
-  shouldRefreshForegroundSynchronously: ForegroundRefreshSyncResolver
-  stripTransientCursorShows: boolean
-  beforeWrite?: TerminalOutputBeforeWrite
-  onParsed?: TerminalOutputParsedCallback
-  ackCredits: (() => void)[]
-}
-
-export type QueueEntry = {
-  terminal: TerminalOutputTarget
-  chunks: QueueChunk[]
-  chunkIndex: number
-  queuedChars: number
-  onBackgroundBacklogDropped?: () => void
-  backgroundBacklogDropped: boolean
-  highPriority: boolean
-  foregroundHold: boolean
-  foregroundHoldSafetyDelayMs: number
-  foregroundCoalesce: boolean
-  foregroundCoalesceDelayMs: number
-  foregroundHoldSafetyTimer: ReturnType<typeof setTimeout> | null
-  foregroundCoalesceTimer: ReturnType<typeof setTimeout> | null
-  // Why: hold and coalesce cancel each other's fallback timer, so an alternating DEC 2026 stream could re-arm both forever and freeze a visible pane (#8754). This caps one non-drainable episode.
-  foregroundReleaseDeadlineAt: number | null
-  // Why: an open frame's own hold chunks may still push the deadline out, but once coalesce has taken the entry over the deadline stops moving so the two mechanisms can't re-arm each other.
-  foregroundReleaseDeadlineFixed: boolean
-}
-
-const BACKGROUND_FLUSH_DELAY_MS = 50
-const BACKGROUND_DRAIN_INTERVAL_MS = 16
-const HIGH_PRIORITY_DRAIN_INTERVAL_MS = 4
-const BACKGROUND_CHUNK_CHARS = 16 * 1024
-const MAX_WRITES_PER_DRAIN = 2
-// Why 8: per-tick volume (8 x 16KB = 128KB ≈ 1.3ms parse) sets the sustained ceiling (~30MB/s) within DRAIN_TIME_BUDGET_MS; at 2 it was only 8MB/s against a ~100MB/s parser (see throughput bench).
-const HIGH_PRIORITY_MAX_WRITES_PER_DRAIN = 8
-const DRAIN_TIME_BUDGET_MS = 8
-const LARGE_BACKLOG_CHARS = 512 * 1024
-// Why mutable: the cap scales with the user's scrollback setting (terminalOutputBacklogCapChars), configured when settings apply; the chunk-count cap stays fixed.
-let maxQueueChars = TERMINAL_OUTPUT_BACKLOG_MIN_CAP_CHARS
-const MAX_BACKGROUND_QUEUE_CHUNKS = 4096
-
-export function configureTerminalOutputBacklogCap(scrollbackRows: unknown): void {
-  maxQueueChars = terminalOutputBacklogCapChars(scrollbackRows)
-}
 const PARSE_SETTLE_TIMEOUT_MS = 250
-const FOREGROUND_COALESCE_DELAY_MS = 1000
-const FOREGROUND_HOLD_SAFETY_DELAY_MS = 250
-// Why: key repeat can tick every 30-50ms; one frame catches split restores without batching multiple typed-character redraws behind the fallback.
-const LATENCY_SENSITIVE_FOREGROUND_COALESCE_DELAY_MS = 16
-const LATENCY_SENSITIVE_FOREGROUND_HOLD_SAFETY_DELAY_MS = 32
-// Why: leading CAN aborts any partial escape sequence before the style reset so the backlog warning renders cleanly.
-const BACKGROUND_BACKLOG_WARNING =
-  '\x18\x1b[0m\r\n[Orca skipped hidden terminal output because the backlog grew too large.]\r\n'
-// Why a separate foreground message: a visible pane hitting the cap means the drain couldn't keep up with a flood (starved renderer), not merely output produced while hidden.
-const FOREGROUND_BACKLOG_WARNING =
-  '\x18\x1b[0m\r\n[Orca skipped a burst of terminal output because the backlog grew too large.]\r\n'
-const ALWAYS_REFRESH_FOREGROUND_SYNCHRONOUSLY = (): boolean => true
-
-const queuedByTerminal = new Map<TerminalOutputTarget, QueueEntry>()
-setTerminalOutputDebugQueueReader(() => queuedByTerminal.values())
-const backlogRecoveryByTerminal = new WeakMap<
-  TerminalOutputTarget,
-  TerminalBacklogRecoveryRequest
->()
-let drainTimer: ReturnType<typeof setTimeout> | null = null
-let drainTimerDelayMs: number | null = null
-// Why a MessageChannel for zero-delay drains: Chromium clamps nested setTimeout(0) to ~4ms; a posted macrotask isn't clamped yet still yields to input/paint. Cancellation is by generation.
-let drainImmediatePending = false
-let drainImmediateGeneration = 0
-let useMessageChannelDrain = typeof MessageChannel !== 'undefined' && !isVitestEnv()
-let drainChannel: MessageChannel | null = null
-
-function isVitestEnv(): boolean {
-  // Why: vitest fake timers can't advance MessageChannel macrotasks; the timer path keeps the suites' virtual clock authoritative.
-  return typeof process !== 'undefined' && process.env?.VITEST === 'true'
-}
-
-function getDrainChannel(): MessageChannel {
-  if (drainChannel === null) {
-    drainChannel = new MessageChannel()
-    drainChannel.port1.onmessage = (event: MessageEvent) => {
-      if (event.data !== drainImmediateGeneration || !drainImmediatePending) {
-        return
-      }
-      drainImmediatePending = false
-      drainQueuedOutput()
-    }
-  }
-  return drainChannel
-}
-
-function cancelImmediateDrain(): void {
-  drainImmediateGeneration++
-  drainImmediatePending = false
-}
-
-export function setUseMessageChannelDrainForTesting(value: boolean | null): void {
-  cancelImmediateDrain()
-  useMessageChannelDrain = value ?? (typeof MessageChannel !== 'undefined' && !isVitestEnv())
-}
-
-function scheduleDrain(delayMs: number): void {
-  if (drainImmediatePending) {
-    // An immediate drain is already armed — nothing can beat zero delay.
-    return
-  }
-  if (drainTimer !== null) {
-    if (drainTimerDelayMs !== null && drainTimerDelayMs <= delayMs) {
-      return
-    }
-    clearTimeout(drainTimer)
-    drainTimer = null
-    drainTimerDelayMs = null
-  }
-  if (queuedByTerminal.size === 0) {
-    return
-  }
-  if (debugEnabled) {
-    debugState.scheduledDrainCount++
-  }
-  if (delayMs === 0 && useMessageChannelDrain) {
-    drainImmediatePending = true
-    getDrainChannel().port2.postMessage(drainImmediateGeneration)
-    return
-  }
-  drainTimer = setTimeout(drainQueuedOutput, delayMs)
-  drainTimerDelayMs = delayMs
-}
-
-function createQueueEntry(
-  terminal: TerminalOutputTarget,
-  options: WriteTerminalOutputOptions
-): QueueEntry {
-  return {
-    terminal,
-    chunks: [],
-    chunkIndex: 0,
-    queuedChars: 0,
-    onBackgroundBacklogDropped: options.onBackgroundBacklogDropped,
-    backgroundBacklogDropped: false,
-    highPriority: true,
-    foregroundHold: false,
-    foregroundHoldSafetyDelayMs: FOREGROUND_HOLD_SAFETY_DELAY_MS,
-    foregroundCoalesce: false,
-    foregroundCoalesceDelayMs: FOREGROUND_COALESCE_DELAY_MS,
-    foregroundHoldSafetyTimer: null,
-    foregroundCoalesceTimer: null,
-    foregroundReleaseDeadlineAt: null,
-    foregroundReleaseDeadlineFixed: false
-  }
-}
-
-// Returns the delay the caller's timer must use so it never outlives the episode deadline.
-function armForegroundReleaseDeadline(
-  entry: QueueEntry,
-  delayMs: number,
-  mayExtend: boolean
-): number {
-  const now = getDrainNow()
-  const requested = now + delayMs
-  entry.foregroundReleaseDeadlineAt =
-    entry.foregroundReleaseDeadlineAt === null ||
-    (mayExtend && !entry.foregroundReleaseDeadlineFixed)
-      ? requested
-      : Math.min(entry.foregroundReleaseDeadlineAt, requested)
-  return Math.max(0, entry.foregroundReleaseDeadlineAt - now)
-}
-
-// Why: reopen the gate only once the entry is drainable again, so the next synchronized frame gets a full budget.
-function resetForegroundReleaseGate(entry: QueueEntry): void {
-  entry.foregroundReleaseDeadlineAt = null
-  entry.foregroundReleaseDeadlineFixed = false
-}
-
-function clearForegroundRelease(entry: QueueEntry): void {
-  clearForegroundHoldSafety(entry)
-  clearForegroundCoalesce(entry)
-  resetForegroundReleaseGate(entry)
-}
-
-function clearForegroundHoldSafety(entry: QueueEntry): void {
-  if (entry.foregroundHoldSafetyTimer === null) {
-    return
-  }
-  clearTimeout(entry.foregroundHoldSafetyTimer)
-  entry.foregroundHoldSafetyTimer = null
-  entry.foregroundHoldSafetyDelayMs = FOREGROUND_HOLD_SAFETY_DELAY_MS
-}
-
-function clearForegroundCoalesce(entry: QueueEntry): void {
-  if (entry.foregroundCoalesceTimer !== null) {
-    clearTimeout(entry.foregroundCoalesceTimer)
-    entry.foregroundCoalesceTimer = null
-  }
-  entry.foregroundCoalesce = false
-  entry.foregroundCoalesceDelayMs = FOREGROUND_COALESCE_DELAY_MS
-}
-
-function scheduleForegroundHoldSafety(entry: QueueEntry): void {
-  clearForegroundHoldSafety(entry)
-  const delayMs = armForegroundReleaseDeadline(entry, entry.foregroundHoldSafetyDelayMs, true)
-  entry.foregroundHoldSafetyTimer = setTimeout(() => {
-    entry.foregroundHoldSafetyTimer = null
-    entry.foregroundHold = false
-    clearForegroundCoalesce(entry)
-    resetForegroundReleaseGate(entry)
-    if (queuedByTerminal.has(entry.terminal)) {
-      scheduleDrain(0)
-    }
-  }, delayMs)
-}
-
-function scheduleForegroundCoalesceRelease(
-  entry: QueueEntry,
-  options?: { rescheduleEarlier?: boolean }
-): void {
-  if (entry.foregroundCoalesceTimer !== null) {
-    if (options?.rescheduleEarlier !== true) {
-      entry.foregroundCoalesce = true
-      return
-    }
-    clearTimeout(entry.foregroundCoalesceTimer)
-    entry.foregroundCoalesceTimer = null
-  }
-  entry.foregroundCoalesce = true
-  // Why fixed from here: a later hold chunk must clamp to this deadline instead of restarting the pair's mutual re-arm (#8754).
-  entry.foregroundReleaseDeadlineFixed = true
-  const delayMs = armForegroundReleaseDeadline(entry, entry.foregroundCoalesceDelayMs, false)
-  entry.foregroundCoalesceTimer = setTimeout(() => {
-    entry.foregroundCoalesceTimer = null
-    entry.foregroundCoalesce = false
-    resetForegroundReleaseGate(entry)
-    if (queuedByTerminal.has(entry.terminal)) {
-      scheduleDrain(0)
-    }
-  }, delayMs)
-}
-
-function isEntryDrainable(entry: QueueEntry): boolean {
-  return !entry.foregroundHold && !entry.foregroundCoalesce
-}
-
-// Why: every discard path MUST fire these before clearing/replacing the queue — a dropped chunk still counts as consumed, or main's in-flight window shrinks permanently and the PTY wedges.
-function fireQueuedAckCredits(entry: QueueEntry): void {
-  for (let index = entry.chunkIndex; index < entry.chunks.length; index += 1) {
-    entry.chunks[index].ackCredit?.()
-  }
-}
-
-function discardDetachedQueueEntry(entry: QueueEntry): void {
-  fireQueuedAckCredits(entry)
-  entry.chunks.length = 0
-  entry.chunkIndex = 0
-  entry.queuedChars = 0
-  entry.highPriority = false
-  clearForegroundRelease(entry)
-}
-
-function queueCapExceeded(entry: QueueEntry): boolean {
-  return (
-    entry.queuedChars > maxQueueChars ||
-    entry.chunks.length - entry.chunkIndex > MAX_BACKGROUND_QUEUE_CHUNKS
-  )
-}
-
-function replaceBacklogWithWarning(
-  entry: QueueEntry,
-  warning: string = BACKGROUND_BACKLOG_WARNING
-): void {
-  const shouldNotify = !entry.backgroundBacklogDropped
-  if (shouldNotify) {
-    // Why: field visibility for cap tuning — drop frequency and size decide whether the cap is too small (issue #2836 / #7017).
-    recordRendererCrashBreadcrumb('terminal_output_backlog_dropped', {
-      foreground: warning === FOREGROUND_BACKLOG_WARNING,
-      droppedChars: entry.queuedChars,
-      capChars: maxQueueChars
-    })
-  }
-  let beforeWrite: TerminalOutputBeforeWrite | undefined
-  for (let index = entry.chunks.length - 1; index >= entry.chunkIndex; index--) {
-    if (entry.chunks[index]?.beforeWrite) {
-      beforeWrite = entry.chunks[index].beforeWrite
-      break
-    }
-  }
-  clearForegroundHoldSafety(entry)
-  fireQueuedAckCredits(entry)
-  entry.chunks = [
-    {
-      data: warning,
-      retainedChars: warning.length,
-      foreground: false,
-      forceForegroundRefresh: false,
-      followupForegroundRefresh: false,
-      shouldRefreshForegroundSynchronously: ALWAYS_REFRESH_FOREGROUND_SYNCHRONOUSLY,
-      stripTransientCursorShows: false,
-      beforeWrite
-    }
-  ]
-  entry.chunkIndex = 0
-  entry.queuedChars = warning.length
-  entry.backgroundBacklogDropped = true
-  entry.highPriority = true
-  entry.foregroundHold = false
-  if (debugEnabled && shouldNotify) {
-    debugState.droppedBacklogCount++
-  }
-  clearForegroundRelease(entry)
-  recordQueueDebugPressure()
-  if (shouldNotify) {
-    entry.onBackgroundBacklogDropped?.()
-  }
-}
-
-function hasQueuedChunks(entry: QueueEntry): boolean {
-  return entry.chunkIndex < entry.chunks.length
-}
-
-function hasHighPriorityBacklog(): boolean {
-  for (const entry of queuedByTerminal.values()) {
-    if (
-      isEntryDrainable(entry) &&
-      (entry.highPriority || entry.queuedChars > LARGE_BACKLOG_CHARS)
-    ) {
-      return true
-    }
-  }
-  return false
-}
-
-function hasDrainableBacklog(): boolean {
-  for (const entry of queuedByTerminal.values()) {
-    if (isEntryDrainable(entry)) {
-      return true
-    }
-  }
-  return false
-}
-
-// Why no per-write scroll enforcement: xterm's BufferService.isUserScrolling owns live follow/pin; app-side enforcement is limited to structural ops xterm can't identify, like replay.
-function writeBackgroundTerminalChunk(
-  terminal: TerminalOutputTarget,
-  data: string,
-  onParsed?: TerminalOutputParsedCallback,
-  onWriteFailure?: () => void
-): boolean {
-  // Why guarded: these callbacks run inside xterm's WriteBuffer loop, where an escaping throw permanently wedges the terminal (see xterm-write-callback-guard.ts).
-  const runOnParsed = onParsed
-    ? (): void => runGuardedWriteCompletionStep('background-on-parsed', onParsed)
-    : undefined
-  const runOnWriteFailure = onWriteFailure
-    ? (): void => runGuardedWriteCompletionStep('background-on-write-failure', onWriteFailure)
-    : undefined
-  try {
-    if (!runOnParsed || terminal.write.length < 2) {
-      terminal.write(data)
-      runOnParsed?.()
-      return true
-    }
-    terminal.write(data, runOnParsed)
-    return true
-  } catch {
-    runOnWriteFailure?.()
-    return false
-  }
-}
-
-function takeNextDrainableEntry(): QueueEntry | null {
-  let largeBacklogEntry: QueueEntry | null = null
-  for (const entry of queuedByTerminal.values()) {
-    if (!isEntryDrainable(entry)) {
-      continue
-    }
-    // Why: active/foreground output should be chosen first, not left in insertion order behind older background terminals.
-    if (entry.highPriority) {
-      queuedByTerminal.delete(entry.terminal)
-      return entry
-    }
-    if (!largeBacklogEntry && entry.queuedChars > LARGE_BACKLOG_CHARS) {
-      largeBacklogEntry = entry
-    }
-  }
-  if (largeBacklogEntry) {
-    queuedByTerminal.delete(largeBacklogEntry.terminal)
-    return largeBacklogEntry
-  }
-  for (const entry of queuedByTerminal.values()) {
-    if (!isEntryDrainable(entry)) {
-      continue
-    }
-    queuedByTerminal.delete(entry.terminal)
-    return entry
-  }
-  return null
-}
-
-// Why: re-arm a zero-delay drain once xterm confirms the previous high-priority batch parsed; the fixed 4/16ms cadence otherwise drips far below xterm's ~100 MB/s parse. Only visible panes are pacer-clocked; background keeps the fixed cadence to protect the focused terminal.
-function makeParseClockPacer(): () => void {
-  return () => {
-    try {
-      if (queuedByTerminal.size > 0 && hasHighPriorityBacklog()) {
-        scheduleDrain(0)
-      }
-    } catch {
-      // Why: runs inside xterm's write-callback chain; a throw here would wedge the terminal (see xterm-write-callback-guard.ts).
-    }
-  }
-}
-
-function composeParsedCallback(
-  terminal: TerminalOutputTarget,
-  onParsed: TerminalOutputParsedCallback | undefined,
-  ackCreditsParsed: (() => void) | undefined,
-  pacer: (() => void) | undefined
-): TerminalOutputParsedCallback {
-  // Why always non-undefined: the callback doubles as the pipeline-health settle signal — with none, the stall watch could never settle, forcing a probe round-trip per healthy idle pane.
-  return () => {
-    try {
-      onParsed?.()
-    } finally {
-      ackCreditsParsed?.()
-      pacer?.()
-      settleTerminalWriteStallWatch(terminal)
-    }
-  }
-}
-
-function composeWriteFailureCallback(
-  terminal: TerminalOutputTarget,
-  ackCreditsParsed: (() => void) | undefined
-): () => void {
-  return () => {
-    try {
-      // A rejected write still consumed the main-owned delivery window.
-      ackCreditsParsed?.()
-    } finally {
-      // Why: a synchronous rejection proves undeliverability but nothing about parse progress; recover without extending replay guards.
-      failTerminalWriteStallWatch(terminal)
-    }
-  }
-}
-
-function writeQueuedChunk(entry: QueueEntry): 'foreground' | 'background' | null {
-  if (isTerminalWritePipelineCertifiedDead(entry.terminal)) {
-    // The drain owns this detached entry, so map-based discard cannot see it.
-    discardDetachedQueueEntry(entry)
-    discardTerminalOutput(entry.terminal)
-    return null
-  }
-  const queuedWrite = takeQueuedChunk(entry, BACKGROUND_CHUNK_CHARS)
-  if (!queuedWrite) {
-    return null
-  }
-  const pacer = entry.highPriority ? makeParseClockPacer() : undefined
-  const ackCreditsParsed = registerTerminalOutputAckCredits(entry.terminal, queuedWrite.ackCredits)
-  // Why armed BEFORE the write: a wedged WriteBuffer (issue #2836) or disposed xterm (6.1.0-beta.287) never runs the parsed callback, so the watch must be live first to catch it.
-  armTerminalWriteStallWatch(entry.terminal, {
-    onCertifiedDead: () => discardTerminalOutput(entry.terminal)
-  })
-  try {
-    queuedWrite.beforeWrite?.(queuedWrite.data)
-    const writeAccepted = queuedWrite.foreground
-      ? writeForegroundTerminalChunk(
-          entry.terminal,
-          queuedWrite.stripTransientCursorShows
-            ? removeTransientCursorShowSequences(queuedWrite.data)
-            : queuedWrite.data,
-          {
-            forceViewportRefresh: queuedWrite.forceForegroundRefresh,
-            followupViewportRefresh: queuedWrite.followupForegroundRefresh,
-            shouldRefreshViewportSynchronously: queuedWrite.shouldRefreshForegroundSynchronously,
-            onParsed: composeParsedCallback(
-              entry.terminal,
-              queuedWrite.onParsed,
-              ackCreditsParsed,
-              pacer
-            ),
-            onWriteFailure: composeWriteFailureCallback(entry.terminal, ackCreditsParsed)
-          }
-        )
-      : writeBackgroundTerminalChunk(
-          entry.terminal,
-          queuedWrite.data,
-          composeParsedCallback(entry.terminal, queuedWrite.onParsed, ackCreditsParsed, pacer),
-          composeWriteFailureCallback(entry.terminal, ackCreditsParsed)
-        )
-    if (!writeAccepted) {
-      // Why: the failure callback credited the submitted chunk; credit and abandon the detached tail so the drain can't retry a certified-dead xterm.
-      fireQueuedAckCredits(entry)
-      entry.chunks.length = 0
-      entry.chunkIndex = 0
-      entry.queuedChars = 0
-      clearForegroundRelease(entry)
-      recordQueueDebugPressure()
-      return null
-    }
-  } catch {
-    // Why: beforeWrite or write setup can fail before xterm owns the bytes; cancel the armed watch without claiming parser failure.
-    cancelTerminalWriteStallWatch(entry.terminal)
-    ackCreditsParsed?.()
-    fireQueuedAckCredits(entry)
-    entry.chunks.length = 0
-    entry.chunkIndex = 0
-    entry.queuedChars = 0
-    clearForegroundRelease(entry)
-    recordQueueDebugPressure()
-    return null
-  }
-  return queuedWrite.foreground ? 'foreground' : 'background'
-}
-
-function getDrainNow(): number {
-  if (typeof performance !== 'undefined') {
-    return performance.now()
-  }
-  return Date.now()
-}
-
-function drainQueuedOutput(): void {
-  drainTimer = null
-  drainTimerDelayMs = null
-  let writes = 0
-  const startedAt = getDrainNow()
-  const highPriority = hasHighPriorityBacklog()
-  const maxWrites = highPriority ? HIGH_PRIORITY_MAX_WRITES_PER_DRAIN : MAX_WRITES_PER_DRAIN
-
-  while (queuedByTerminal.size > 0 && writes < maxWrites) {
-    const entry = takeNextDrainableEntry()
-    if (!entry) {
-      break
-    }
-
-    const writeKind = writeQueuedChunk(entry)
-    if (writeKind) {
-      writes++
-      if (debugEnabled) {
-        if (writeKind === 'foreground') {
-          debugState.deferredForegroundWriteCount++
-        } else {
-          debugState.backgroundWriteCount++
-        }
-      }
-    }
-    if (hasQueuedChunks(entry)) {
-      queuedByTerminal.set(entry.terminal, entry)
-    } else {
-      entry.highPriority = false
-      clearForegroundRelease(entry)
-    }
-    // Why: xterm parsing and DOM work share the renderer thread with input; keep draining cooperative so WSL/agent output can't pin the UI.
-    if (writes > 0 && getDrainNow() - startedAt >= DRAIN_TIME_BUDGET_MS) {
-      break
-    }
-  }
-
-  if (debugEnabled && writes > 0) {
-    debugState.drainWrites.push(writes)
-    debugState.drainHighPriority.push(highPriority)
-  }
-  recordQueueDebugPressure()
-  if (queuedByTerminal.size > 0 && hasDrainableBacklog()) {
-    // Why 0 on the channel path: a posted message already yields (input/paint serviced between macrotasks), so the 4ms interval only deepened the queue; timer path keeps it for fake-timer tests.
-    scheduleDrain(
-      hasHighPriorityBacklog()
-        ? useMessageChannelDrain
-          ? 0
-          : HIGH_PRIORITY_DRAIN_INTERVAL_MS
-        : BACKGROUND_DRAIN_INTERVAL_MS
-    )
-  }
-}
 
 export function writeTerminalOutput(
   terminal: TerminalOutputTarget,
   data: string,
   options: WriteTerminalOutputOptions
 ): void {
-  exposeDebugApi()
-  // Why: recovery may be budget-delayed while PTY output keeps flowing; main owns the authoritative buffer, so credit delivery without waking dead xterm.
-  if (isTerminalWritePipelineCertifiedDead(terminal)) {
-    options.ackCredit?.()
-    return
-  }
-  if (!data) {
-    // Why: an empty write still consumed its delivery — credit or main's in-flight window leaks.
-    options.ackCredit?.()
-    return
-  }
-
-  if (options.foreground) {
-    const entry = queuedByTerminal.get(terminal)
-    if (entry?.highPriority || options.coalesceForeground || options.holdForeground) {
-      const queued = entry ?? createQueueEntry(terminal, options)
-      queued.onBackgroundBacklogDropped = options.onBackgroundBacklogDropped
-      queued.highPriority = true
-      queuedByTerminal.set(terminal, queued)
-      enqueueChunk(queued, data, {
-        foreground: true,
-        forceForegroundRefresh: options.forceForegroundRefresh,
-        followupForegroundRefresh: options.followupForegroundRefresh,
-        shouldRefreshForegroundSynchronously: options.shouldRefreshForegroundSynchronously,
-        stripTransientCursorShows: options.stripTransientCursorShows,
-        beforeWrite: options.beforeWrite,
-        onParsed: options.onParsed,
-        ackCredit: options.ackCredit
-      })
-      if (debugEnabled) {
-        debugState.foregroundWriteCount++
-        debugState.deferredForegroundEnqueueCount++
-      }
-      // Why: a visible pane's queue was previously uncapped — a flood the drain couldn't keep up with ballooned renderer memory without bound.
-      if (queueCapExceeded(queued)) {
-        replaceBacklogWithWarning(queued, FOREGROUND_BACKLOG_WARNING)
-        scheduleDrain(0)
-        return
-      }
-      if (options.holdForeground) {
-        // Why: synchronized-output start/body chunks contain transient cursor moves; holding them prevents Chromium from rasterizing those states.
-        if (options.latencySensitive === true) {
-          // Why: Codex composer redraws can split the end marker from the input-triggered frame; keep cursor protection without a human-visible fallback delay on typed chars.
-          queued.foregroundHoldSafetyDelayMs = Math.min(
-            queued.foregroundHoldSafetyDelayMs,
-            LATENCY_SENSITIVE_FOREGROUND_HOLD_SAFETY_DELAY_MS
-          )
-        } else if (!queued.foregroundHold) {
-          queued.foregroundHoldSafetyDelayMs = FOREGROUND_HOLD_SAFETY_DELAY_MS
-        }
-        queued.foregroundHold = true
-        clearForegroundCoalesce(queued)
-        scheduleForegroundHoldSafety(queued)
-        return
-      }
-      if (options.coalesceForeground || queued.foregroundCoalesce) {
-        queued.foregroundHold = false
-        clearForegroundHoldSafety(queued)
-        const shouldShortenCoalesceForLatencySensitiveForeground = options.latencySensitive === true
-        if (shouldShortenCoalesceForLatencySensitiveForeground) {
-          // Why: user input echo must not inherit the normal synchronized-frame restore fallback; wait briefly for the restore, then paint.
-          queued.foregroundCoalesceDelayMs = Math.min(
-            queued.foregroundCoalesceDelayMs,
-            LATENCY_SENSITIVE_FOREGROUND_COALESCE_DELAY_MS
-          )
-        }
-        const shouldDrainForLatencySensitiveForeground =
-          shouldShortenCoalesceForLatencySensitiveForeground &&
-          !coalescedQueuedDataNeedsCursorRestore(queued)
-        if (containsDrainableCursorRestore(data) || shouldDrainForLatencySensitiveForeground) {
-          clearForegroundRelease(queued)
-          scheduleDrain(0)
-          return
-        }
-        // Why: the PTY transport can split TUI synchronized-output end markers from the cursor-restoring bytes; wait for the restore, with the timer as bounded fallback.
-        scheduleForegroundCoalesceRelease(queued, {
-          rescheduleEarlier: shouldShortenCoalesceForLatencySensitiveForeground
-        })
-        return
-      }
-      queued.foregroundHold = false
-      clearForegroundRelease(queued)
-      scheduleDrain(0)
-      return
-    }
-    if (entry && entry.queuedChars > SYNC_FOREGROUND_FLUSH_CHARS) {
-      entry.highPriority = true
-      enqueueChunk(entry, data, {
-        foreground: true,
-        forceForegroundRefresh: options.forceForegroundRefresh,
-        followupForegroundRefresh: options.followupForegroundRefresh,
-        shouldRefreshForegroundSynchronously: options.shouldRefreshForegroundSynchronously,
-        stripTransientCursorShows: options.stripTransientCursorShows,
-        beforeWrite: options.beforeWrite,
-        onParsed: options.onParsed,
-        ackCredit: options.ackCredit
-      })
-      if (debugEnabled) {
-        debugState.foregroundWriteCount++
-        debugState.deferredForegroundEnqueueCount++
-      }
-      if (queueCapExceeded(entry)) {
-        replaceBacklogWithWarning(entry, FOREGROUND_BACKLOG_WARNING)
-      }
-      // Why: returning from a hidden window can have megabytes queued — keep byte order but drain async so the first foreground frame isn't pinned behind the whole backlog.
-      scheduleDrain(0)
-      return
-    }
-    if (options.latencySensitive === false) {
-      let queued = entry
-      if (!queued) {
-        queued = createQueueEntry(terminal, options)
-        queuedByTerminal.set(terminal, queued)
-      } else {
-        queued.onBackgroundBacklogDropped = options.onBackgroundBacklogDropped
-        queued.highPriority = true
-      }
-      enqueueChunk(queued, data, {
-        foreground: true,
-        forceForegroundRefresh: options.forceForegroundRefresh,
-        followupForegroundRefresh: options.followupForegroundRefresh,
-        shouldRefreshForegroundSynchronously: options.shouldRefreshForegroundSynchronously,
-        stripTransientCursorShows: options.stripTransientCursorShows,
-        beforeWrite: options.beforeWrite,
-        onParsed: options.onParsed,
-        ackCredit: options.ackCredit
-      })
-      if (debugEnabled) {
-        debugState.foregroundWriteCount++
-        debugState.deferredForegroundEnqueueCount++
-      }
-      if (queueCapExceeded(queued)) {
-        replaceBacklogWithWarning(queued, FOREGROUND_BACKLOG_WARNING)
-      }
-      // Why: visible command floods are throughput work, not keystroke echo — queue behind a zero-delay drain so one IPC callback can't pin the renderer while input/paint wait.
-      scheduleDrain(0)
-      return
-    }
-    flushTerminalOutput(terminal)
-    if (debugEnabled) {
-      debugState.foregroundWriteCount++
-    }
-    const ackCreditsParsed = registerTerminalOutputAckCredits(
-      terminal,
-      options.ackCredit ? [options.ackCredit] : []
-    )
-    armTerminalWriteStallWatch(terminal, {
-      onCertifiedDead: () => discardTerminalOutput(terminal)
-    })
-    try {
-      options.beforeWrite?.(data)
-      writeForegroundTerminalChunk(
-        terminal,
-        options.stripTransientCursorShows ? removeTransientCursorShowSequences(data) : data,
-        {
-          forceViewportRefresh: options.forceForegroundRefresh === true,
-          followupViewportRefresh: options.followupForegroundRefresh === true,
-          shouldRefreshViewportSynchronously:
-            options.shouldRefreshForegroundSynchronously ?? ALWAYS_REFRESH_FOREGROUND_SYNCHRONOUSLY,
-          onParsed: composeParsedCallback(terminal, options.onParsed, ackCreditsParsed, undefined),
-          onWriteFailure: composeWriteFailureCallback(terminal, ackCreditsParsed)
-        }
-      )
-    } catch (error) {
-      // Why: beforeWrite can throw before xterm owns the callback, so consume the delivery here (xterm write throws are caught by the foreground writer).
-      ackCreditsParsed?.()
-      cancelTerminalWriteStallWatch(terminal)
-      throw error
-    }
-    return
-  }
-
-  let entry = queuedByTerminal.get(terminal)
-  if (!entry) {
-    entry = createQueueEntry(terminal, options)
-    entry.highPriority = false
-    queuedByTerminal.set(terminal, entry)
-  } else {
-    entry.onBackgroundBacklogDropped = options.onBackgroundBacklogDropped
-  }
-  enqueueChunk(entry, data, {
-    beforeWrite: options.beforeWrite,
-    onParsed: options.onParsed,
-    ackCredit: options.ackCredit
-  })
-  if (queueCapExceeded(entry)) {
-    replaceBacklogWithWarning(entry)
-  }
-  if (debugEnabled) {
-    debugState.backgroundEnqueueCount++
-  }
-  // Why: letting every non-focused pane call xterm.write immediately spawns a WriteBuffer timer per pane, starving the focused terminal on the shared renderer thread.
-  scheduleDrain(
-    entry.highPriority || entry.queuedChars > LARGE_BACKLOG_CHARS ? 0 : BACKGROUND_FLUSH_DELAY_MS
-  )
+  writeTerminalOutputImpl(terminal, data, options)
 }
 
 export function flushTerminalOutput(
   terminal: TerminalOutputTarget,
   options?: { maxChars?: number }
 ): void {
-  exposeDebugApi()
-  const entry = queuedByTerminal.get(terminal)
-  if (!entry) {
-    return
-  }
-  queuedByTerminal.delete(terminal)
-  if (isTerminalWritePipelineCertifiedDead(terminal)) {
-    discardDetachedQueueEntry(entry)
-    discardTerminalOutput(terminal)
-    return
-  }
-  if (!isEntryDrainable(entry)) {
-    queuedByTerminal.set(terminal, entry)
-    return
-  }
-  if (entry.backgroundBacklogDropped && requestRegisteredTerminalBacklogRecovery(terminal)) {
-    fireQueuedAckCredits(entry)
-    entry.chunks.length = 0
-    entry.chunkIndex = 0
-    entry.queuedChars = 0
-    entry.highPriority = false
-    clearForegroundRelease(entry)
-    recordQueueDebugPressure()
-    return
-  }
-
-  let flushedChars = 0
-  let queuedWrite = takeQueuedChunk(entry, BACKGROUND_CHUNK_CHARS)
-  while (queuedWrite) {
-    flushedChars += queuedWrite.data.length
-    if (debugEnabled) {
-      debugState.flushWriteCount++
-    }
-    const ackCreditsParsed = registerTerminalOutputAckCredits(terminal, queuedWrite.ackCredits)
-    armTerminalWriteStallWatch(terminal, {
-      onCertifiedDead: () => discardTerminalOutput(terminal)
-    })
-    try {
-      queuedWrite.beforeWrite?.(queuedWrite.data)
-      const writeAccepted = queuedWrite.foreground
-        ? writeForegroundTerminalChunk(
-            terminal,
-            queuedWrite.stripTransientCursorShows
-              ? removeTransientCursorShowSequences(queuedWrite.data)
-              : queuedWrite.data,
-            {
-              forceViewportRefresh: queuedWrite.forceForegroundRefresh,
-              followupViewportRefresh: queuedWrite.followupForegroundRefresh,
-              shouldRefreshViewportSynchronously: queuedWrite.shouldRefreshForegroundSynchronously,
-              onParsed: composeParsedCallback(
-                terminal,
-                queuedWrite.onParsed,
-                ackCreditsParsed,
-                undefined
-              ),
-              onWriteFailure: composeWriteFailureCallback(terminal, ackCreditsParsed)
-            }
-          )
-        : writeBackgroundTerminalChunk(
-            terminal,
-            queuedWrite.data,
-            composeParsedCallback(terminal, queuedWrite.onParsed, ackCreditsParsed, undefined),
-            composeWriteFailureCallback(terminal, ackCreditsParsed)
-          )
-      if (!writeAccepted) {
-        fireQueuedAckCredits(entry)
-        clearForegroundRelease(entry)
-        recordQueueDebugPressure()
-        return
-      }
-    } catch {
-      // Why: pre-write hooks/setup failed before xterm owned these bytes; cancel the watch, but consumed + abandoned chunks still credit delivery.
-      cancelTerminalWriteStallWatch(terminal)
-      ackCreditsParsed?.()
-      fireQueuedAckCredits(entry)
-      clearForegroundRelease(entry)
-      recordQueueDebugPressure()
-      return
-    }
-    if (options?.maxChars !== undefined && flushedChars >= options.maxChars) {
-      break
-    }
-    queuedWrite = takeQueuedChunk(entry, BACKGROUND_CHUNK_CHARS)
-  }
-  if (hasQueuedChunks(entry)) {
-    entry.highPriority = true
-    queuedByTerminal.set(terminal, entry)
-    scheduleDrain(0)
-  } else {
-    entry.highPriority = false
-    clearForegroundRelease(entry)
-  }
-  recordQueueDebugPressure()
-}
-
-function requestRegisteredTerminalBacklogRecovery(terminal: TerminalOutputTarget): boolean {
-  const requestRecovery = backlogRecoveryByTerminal.get(terminal)
-  if (!requestRecovery) {
-    return false
-  }
-  return requestRecovery()
+  flushTerminalOutputImpl(terminal, options)
 }
 
 export function requestTerminalBacklogRecovery(terminal: TerminalOutputTarget): void {
@@ -964,18 +68,6 @@ export function requestTerminalBacklogRecovery(terminal: TerminalOutputTarget):
   requestRegisteredTerminalBacklogRecovery(terminal)
 }
 
-export function registerTerminalBacklogRecovery(
-  terminal: TerminalOutputTarget,
-  requestRecovery: TerminalBacklogRecoveryRequest
-): () => void {
-  backlogRecoveryByTerminal.set(terminal, requestRecovery)
-  return () => {
-    if (backlogRecoveryByTerminal.get(terminal) === requestRecovery) {
-      backlogRecoveryByTerminal.delete(terminal)
-    }
-  }
-}
-
 export function waitForTerminalOutputParsed(terminal: TerminalOutputTarget): Promise<void> {
   flushTerminalOutput(terminal)
   if (isTerminalWritePipelineCertifiedDead(terminal)) {
@@ -1012,19 +104,4 @@ export function waitForTerminalOutputParsed(terminal: TerminalOutputTarget): Pro
   })
 }
 
-export function discardTerminalOutput(terminal: TerminalOutputTarget): void {
-  exposeDebugApi()
-  const entry = queuedByTerminal.get(terminal)
-  if (entry) {
-    // Why: discarded chunks still consumed their deliveries — credit them or main's in-flight window leaks (fireQueuedAckCredits).
-    fireQueuedAckCredits(entry)
-  }
-  discardInFlightTerminalOutputAckCredits(terminal)
-  queuedByTerminal.delete(terminal)
-  discardForegroundRenderSettle(terminal)
-  // Why: cancel the watch without masquerading as parse progress; replay guards use real completions to tell slow from wedged.
-  cancelTerminalWriteStallWatch(terminal)
-  recordQueueDebugPressure()
-}
-
 exposeDebugApi()
diff --git a/src/renderer/src/lib/pane-manager/pane-terminal-output-writer.ts b/src/renderer/src/lib/pane-manager/pane-terminal-output-writer.ts
new file mode 100644
index 00000000000..89c3ba13364
--- /dev/null
+++ b/src/renderer/src/lib/pane-manager/pane-terminal-output-writer.ts
@@ -0,0 +1,246 @@
+import { writeForegroundTerminalChunk } from './pane-terminal-foreground-render-settle'
+import { registerTerminalOutputAckCredits } from './pane-terminal-output-ack-credit'
+import {
+  armTerminalWriteStallWatch,
+  cancelTerminalWriteStallWatch,
+  isTerminalWritePipelineCertifiedDead
+} from './terminal-write-pipeline-health'
+import {
+  coalescedQueuedDataNeedsCursorRestore,
+  containsDrainableCursorRestore,
+  removeTransientCursorShowSequences,
+  SYNC_FOREGROUND_FLUSH_CHARS
+} from './pane-terminal-cursor-sequencing'
+import { enqueueChunk } from './pane-terminal-output-queue-chunks'
+import {
+  exposeTerminalOutputSchedulerDebugApi as exposeDebugApi,
+  terminalOutputSchedulerDebugEnabled as debugEnabled,
+  terminalOutputSchedulerDebugState as debugState
+} from './pane-terminal-output-scheduler-debug'
+import { flushTerminalOutputImpl } from './pane-terminal-output-flusher'
+import { composeParsedCallback, composeWriteFailureCallback } from './pane-terminal-output-pipeline'
+import { queueCapExceeded, replaceBacklogWithWarning } from './pane-terminal-output-queue-backlog'
+import {
+  FOREGROUND_HOLD_SAFETY_DELAY_MS,
+  LATENCY_SENSITIVE_FOREGROUND_COALESCE_DELAY_MS,
+  LATENCY_SENSITIVE_FOREGROUND_HOLD_SAFETY_DELAY_MS,
+  clearForegroundCoalesce,
+  clearForegroundHoldSafety,
+  clearForegroundRelease,
+  createQueueEntry,
+  scheduleForegroundCoalesceRelease,
+  scheduleForegroundHoldSafety
+} from './pane-terminal-foreground-queue-state'
+import {
+  ALWAYS_REFRESH_FOREGROUND_SYNCHRONOUSLY,
+  BACKGROUND_FLUSH_DELAY_MS,
+  FOREGROUND_BACKLOG_WARNING,
+  LARGE_BACKLOG_CHARS,
+  discardTerminalOutput,
+  queuedByTerminal,
+  scheduleDrain,
+  type TerminalOutputTarget,
+  type WriteTerminalOutputOptions
+} from './pane-terminal-output-queue-registry'
+
+export function writeTerminalOutputImpl(
+  terminal: TerminalOutputTarget,
+  data: string,
+  options: WriteTerminalOutputOptions
+): void {
+  exposeDebugApi()
+  // Why: recovery may be budget-delayed while PTY output keeps flowing; main owns the authoritative buffer, so credit delivery without waking dead xterm.
+  if (isTerminalWritePipelineCertifiedDead(terminal)) {
+    options.ackCredit?.()
+    return
+  }
+  if (!data) {
+    // Why: an empty write still consumed its delivery — credit or main's in-flight window leaks.
+    options.ackCredit?.()
+    return
+  }
+
+  if (options.foreground) {
+    const entry = queuedByTerminal.get(terminal)
+    if (entry?.highPriority || options.coalesceForeground || options.holdForeground) {
+      const queued = entry ?? createQueueEntry(terminal, options)
+      queued.onBackgroundBacklogDropped = options.onBackgroundBacklogDropped
+      queued.highPriority = true
+      queuedByTerminal.set(terminal, queued)
+      enqueueChunk(queued, data, {
+        foreground: true,
+        forceForegroundRefresh: options.forceForegroundRefresh,
+        followupForegroundRefresh: options.followupForegroundRefresh,
+        shouldRefreshForegroundSynchronously: options.shouldRefreshForegroundSynchronously,
+        stripTransientCursorShows: options.stripTransientCursorShows,
+        beforeWrite: options.beforeWrite,
+        onParsed: options.onParsed,
+        ackCredit: options.ackCredit
+      })
+      if (debugEnabled) {
+        debugState.foregroundWriteCount++
+        debugState.deferredForegroundEnqueueCount++
+      }
+      // Why: a visible pane's queue was previously uncapped — a flood the drain couldn't keep up with ballooned renderer memory without bound.
+      if (queueCapExceeded(queued)) {
+        replaceBacklogWithWarning(queued, FOREGROUND_BACKLOG_WARNING)
+        scheduleDrain(0)
+        return
+      }
+      if (options.holdForeground) {
+        // Why: synchronized-output start/body chunks contain transient cursor moves; holding them prevents Chromium from rasterizing those states.
+        if (options.latencySensitive === true) {
+          // Why: Codex composer redraws can split the end marker from the input-triggered frame; keep cursor protection without a human-visible fallback delay on typed chars.
+          queued.foregroundHoldSafetyDelayMs = Math.min(
+            queued.foregroundHoldSafetyDelayMs,
+            LATENCY_SENSITIVE_FOREGROUND_HOLD_SAFETY_DELAY_MS
+          )
+        } else if (!queued.foregroundHold) {
+          queued.foregroundHoldSafetyDelayMs = FOREGROUND_HOLD_SAFETY_DELAY_MS
+        }
+        queued.foregroundHold = true
+        clearForegroundCoalesce(queued)
+        scheduleForegroundHoldSafety(queued)
+        return
+      }
+      if (options.coalesceForeground || queued.foregroundCoalesce) {
+        queued.foregroundHold = false
+        clearForegroundHoldSafety(queued)
+        const shouldShortenCoalesceForLatencySensitiveForeground = options.latencySensitive === true
+        if (shouldShortenCoalesceForLatencySensitiveForeground) {
+          // Why: user input echo must not inherit the normal synchronized-frame restore fallback; wait briefly for the restore, then paint.
+          queued.foregroundCoalesceDelayMs = Math.min(
+            queued.foregroundCoalesceDelayMs,
+            LATENCY_SENSITIVE_FOREGROUND_COALESCE_DELAY_MS
+          )
+        }
+        const shouldDrainForLatencySensitiveForeground =
+          shouldShortenCoalesceForLatencySensitiveForeground &&
+          !coalescedQueuedDataNeedsCursorRestore(queued)
+        if (containsDrainableCursorRestore(data) || shouldDrainForLatencySensitiveForeground) {
+          clearForegroundRelease(queued)
+          scheduleDrain(0)
+          return
+        }
+        // Why: the PTY transport can split TUI synchronized-output end markers from the cursor-restoring bytes; wait for the restore, with the timer as bounded fallback.
+        scheduleForegroundCoalesceRelease(queued, {
+          rescheduleEarlier: shouldShortenCoalesceForLatencySensitiveForeground
+        })
+        return
+      }
+      queued.foregroundHold = false
+      clearForegroundRelease(queued)
+      scheduleDrain(0)
+      return
+    }
+    if (entry && entry.queuedChars > SYNC_FOREGROUND_FLUSH_CHARS) {
+      entry.highPriority = true
+      enqueueChunk(entry, data, {
+        foreground: true,
+        forceForegroundRefresh: options.forceForegroundRefresh,
+        followupForegroundRefresh: options.followupForegroundRefresh,
+        shouldRefreshForegroundSynchronously: options.shouldRefreshForegroundSynchronously,
+        stripTransientCursorShows: options.stripTransientCursorShows,
+        beforeWrite: options.beforeWrite,
+        onParsed: options.onParsed,
+        ackCredit: options.ackCredit
+      })
+      if (debugEnabled) {
+        debugState.foregroundWriteCount++
+        debugState.deferredForegroundEnqueueCount++
+      }
+      if (queueCapExceeded(entry)) {
+        replaceBacklogWithWarning(entry, FOREGROUND_BACKLOG_WARNING)
+      }
+      // Why: returning from a hidden window can have megabytes queued — keep byte order but drain async so the first foreground frame isn't pinned behind the whole backlog.
+      scheduleDrain(0)
+      return
+    }
+    if (options.latencySensitive === false) {
+      let queued = entry
+      if (!queued) {
+        queued = createQueueEntry(terminal, options)
+        queuedByTerminal.set(terminal, queued)
+      } else {
+        queued.onBackgroundBacklogDropped = options.onBackgroundBacklogDropped
+        queued.highPriority = true
+      }
+      enqueueChunk(queued, data, {
+        foreground: true,
+        forceForegroundRefresh: options.forceForegroundRefresh,
+        followupForegroundRefresh: options.followupForegroundRefresh,
+        shouldRefreshForegroundSynchronously: options.shouldRefreshForegroundSynchronously,
+        stripTransientCursorShows: options.stripTransientCursorShows,
+        beforeWrite: options.beforeWrite,
+        onParsed: options.onParsed,
+        ackCredit: options.ackCredit
+      })
+      if (debugEnabled) {
+        debugState.foregroundWriteCount++
+        debugState.deferredForegroundEnqueueCount++
+      }
+      if (queueCapExceeded(queued)) {
+        replaceBacklogWithWarning(queued, FOREGROUND_BACKLOG_WARNING)
+      }
+      // Why: visible command floods are throughput work, not keystroke echo — queue behind a zero-delay drain so one IPC callback can't pin the renderer while input/paint wait.
+      scheduleDrain(0)
+      return
+    }
+    flushTerminalOutputImpl(terminal)
+    if (debugEnabled) {
+      debugState.foregroundWriteCount++
+    }
+    const ackCreditsParsed = registerTerminalOutputAckCredits(
+      terminal,
+      options.ackCredit ? [options.ackCredit] : []
+    )
+    armTerminalWriteStallWatch(terminal, {
+      onCertifiedDead: () => discardTerminalOutput(terminal)
+    })
+    try {
+      options.beforeWrite?.(data)
+      writeForegroundTerminalChunk(
+        terminal,
+        options.stripTransientCursorShows ? removeTransientCursorShowSequences(data) : data,
+        {
+          forceViewportRefresh: options.forceForegroundRefresh === true,
+          followupViewportRefresh: options.followupForegroundRefresh === true,
+          shouldRefreshViewportSynchronously:
+            options.shouldRefreshForegroundSynchronously ?? ALWAYS_REFRESH_FOREGROUND_SYNCHRONOUSLY,
+          onParsed: composeParsedCallback(terminal, options.onParsed, ackCreditsParsed, undefined),
+          onWriteFailure: composeWriteFailureCallback(terminal, ackCreditsParsed)
+        }
+      )
+    } catch (error) {
+      // Why: beforeWrite can throw before xterm owns the callback, so consume the delivery here (xterm write throws are caught by the foreground writer).
+      ackCreditsParsed?.()
+      cancelTerminalWriteStallWatch(terminal)
+      throw error
+    }
+    return
+  }
+
+  let entry = queuedByTerminal.get(terminal)
+  if (!entry) {
+    entry = createQueueEntry(terminal, options)
+    entry.highPriority = false
+    queuedByTerminal.set(terminal, entry)
+  } else {
+    entry.onBackgroundBacklogDropped = options.onBackgroundBacklogDropped
+  }
+  enqueueChunk(entry, data, {
+    beforeWrite: options.beforeWrite,
+    onParsed: options.onParsed,
+    ackCredit: options.ackCredit
+  })
+  if (queueCapExceeded(entry)) {
+    replaceBacklogWithWarning(entry)
+  }
+  if (debugEnabled) {
+    debugState.backgroundEnqueueCount++
+  }
+  // Why: letting every non-focused pane call xterm.write immediately spawns a WriteBuffer timer per pane, starving the focused terminal on the shared renderer thread.
+  scheduleDrain(
+    entry.highPriority || entry.queuedChars > LARGE_BACKLOG_CHARS ? 0 : BACKGROUND_FLUSH_DELAY_MS
+  )
+}
diff --git a/src/renderer/src/lib/pane-manager/pane-tree-equalization.ts b/src/renderer/src/lib/pane-manager/pane-tree-equalization.ts
new file mode 100644
index 00000000000..7e36064d9bc
--- /dev/null
+++ b/src/renderer/src/lib/pane-manager/pane-tree-equalization.ts
@@ -0,0 +1,59 @@
+/** Find non-divider children (panes and splits) of an element. */
+export function findPaneChildren(parent: HTMLElement): HTMLElement[] {
+  return Array.from(parent.children).filter(
+    (child): child is HTMLElement =>
+      child instanceof HTMLElement &&
+      (child.classList.contains('pane') || child.classList.contains('pane-split'))
+  )
+}
+
+function getSplitDirection(split: HTMLElement): 'vertical' | 'horizontal' {
+  return split.classList.contains('is-horizontal') ? 'horizontal' : 'vertical'
+}
+
+function getEqualizeWeight(el: HTMLElement, direction: 'vertical' | 'horizontal'): number {
+  if (!el.classList.contains('pane-split') || getSplitDirection(el) !== direction) {
+    return 1
+  }
+
+  const children = findPaneChildren(el)
+  return Math.max(
+    1,
+    children.reduce((sum, child) => sum + getEqualizeWeight(child, direction), 0)
+  )
+}
+
+export function equalizePaneSplitSizes(root: HTMLElement | null): boolean {
+  if (!root) {
+    return false
+  }
+
+  let changed = false
+  const visit = (el: HTMLElement): void => {
+    if (!el.classList.contains('pane-split')) {
+      return
+    }
+
+    const direction = getSplitDirection(el)
+    const children = findPaneChildren(el)
+    if (children.length >= 2) {
+      for (const child of children) {
+        // Why: same-axis nested splits need pane-count weighting so three
+        // side-by-side panes become thirds, not 50/25/25.
+        const weight = getEqualizeWeight(child, direction)
+        const nextFlex = `${weight} 1 0%`
+        if (child.style.flex !== nextFlex) {
+          child.style.flex = nextFlex
+          changed = true
+        }
+      }
+    }
+
+    for (const child of children) {
+      visit(child)
+    }
+  }
+
+  visit(root)
+  return changed
+}
diff --git a/src/renderer/src/lib/pane-manager/pane-tree-ops.ts b/src/renderer/src/lib/pane-manager/pane-tree-ops.ts
index 833eb1ff822..3549860183b 100644
--- a/src/renderer/src/lib/pane-manager/pane-tree-ops.ts
+++ b/src/renderer/src/lib/pane-manager/pane-tree-ops.ts
@@ -1,4 +1,3 @@
-/* eslint-disable max-lines -- Why: split-tree DOM reparent, promote, and equalize rules need one consistent owner. */
 import type {
   DropZone,
   ManagedPane,
@@ -16,6 +15,7 @@ export {
   type SafeFitContinuationHandle
 } from './pane-fit'
 export { captureScrollState, restoreScrollState } from './pane-scroll'
+export { equalizePaneSplitSizes, findPaneChildren } from './pane-tree-equalization'
 
 // ---------------------------------------------------------------------------
 // Split-tree manipulation: detach, insert, promote sibling
@@ -242,66 +242,6 @@ export function removeDividers(parent: HTMLElement): void {
   }
 }
 
-/** Find non-divider children (panes and splits) of an element. */
-export function findPaneChildren(parent: HTMLElement): HTMLElement[] {
-  return Array.from(parent.children).filter(
-    (child): child is HTMLElement =>
-      child instanceof HTMLElement &&
-      (child.classList.contains('pane') || child.classList.contains('pane-split'))
-  )
-}
-
-function getSplitDirection(split: HTMLElement): 'vertical' | 'horizontal' {
-  return split.classList.contains('is-horizontal') ? 'horizontal' : 'vertical'
-}
-
-function getEqualizeWeight(el: HTMLElement, direction: 'vertical' | 'horizontal'): number {
-  if (!el.classList.contains('pane-split') || getSplitDirection(el) !== direction) {
-    return 1
-  }
-
-  const children = findPaneChildren(el)
-  return Math.max(
-    1,
-    children.reduce((sum, child) => sum + getEqualizeWeight(child, direction), 0)
-  )
-}
-
-export function equalizePaneSplitSizes(root: HTMLElement | null): boolean {
-  if (!root) {
-    return false
-  }
-
-  let changed = false
-  const visit = (el: HTMLElement): void => {
-    if (!el.classList.contains('pane-split')) {
-      return
-    }
-
-    const direction = getSplitDirection(el)
-    const children = findPaneChildren(el)
-    if (children.length >= 2) {
-      for (const child of children) {
-        // Why: same-axis nested splits need pane-count weighting so three
-        // side-by-side panes become thirds, not 50/25/25.
-        const weight = getEqualizeWeight(child, direction)
-        const nextFlex = `${weight} 1 0%`
-        if (child.style.flex !== nextFlex) {
-          child.style.flex = nextFlex
-          changed = true
-        }
-      }
-    }
-
-    for (const child of children) {
-      visit(child)
-    }
-  }
-
-  visit(root)
-  return changed
-}
-
 /**
  * Create a flex split wrapper that replaces `existingContainer` in the DOM,
  * then places [existing] [divider] [new] inside it.
diff --git a/src/renderer/src/lib/worktree-palette-create-action.test.ts b/src/renderer/src/lib/worktree-palette-create-action.test.ts
index 408d6227c45..8f4667a043e 100644
--- a/src/renderer/src/lib/worktree-palette-create-action.test.ts
+++ b/src/renderer/src/lib/worktree-palette-create-action.test.ts
@@ -182,7 +182,7 @@ describe('worktree-palette-create-action', () => {
     })
   })
 
-  it('derives selection ids from rendered entries while skipping headers and hints', () => {
+  it('derives selection ids from rendered entries while skipping headers', () => {
     expect(
       getWorktreePaletteSelectionItemIds([
         { id: '__header_worktrees__', type: 'section-header' },
@@ -198,6 +198,7 @@ describe('worktree-palette-create-action', () => {
     ).toEqual([
       'worktree:one',
       CREATE_WORKTREE_ITEM_ID,
+      '__hint_worktree_cap__',
       'settings:ai-provider-accounts',
       'quick-action:new-terminal',
       'browser-page:one'
diff --git a/src/renderer/src/lib/worktree-palette-create-action.ts b/src/renderer/src/lib/worktree-palette-create-action.ts
index f054b5d0f52..392bcddc33f 100644
--- a/src/renderer/src/lib/worktree-palette-create-action.ts
+++ b/src/renderer/src/lib/worktree-palette-create-action.ts
@@ -66,7 +66,8 @@ const SELECTABLE_ENTRY_TYPES = [
   'browser-page',
   'workspace-tab',
   'simulator-tab',
-  'project-target'
+  'project-target',
+  'hint'
 ] as const
 
 type WorktreePaletteSelectableEntryType = (typeof SELECTABLE_ENTRY_TYPES)[number]
@@ -85,7 +86,7 @@ export function getWorktreePaletteSelectionItemIds<
   T extends WorktreePaletteSelectionCandidateEntry
 >(entries: readonly T[], renderKeys: readonly string[] = []): string[] {
   // Why: keyboard focus should mirror rendered order, including synthetic
-  // action rows, while skipping headers and explanatory hint rows.
+  // action rows, while skipping only section headers.
   // Why renderKeys wins: rows render under de-duplicated keys, so naming the bare
   // id here would leave a duplicate row absent from the list the `includes` check
   // above consults — arrowing onto it would snap the highlight back to the top.
diff --git a/src/renderer/src/runtime/host-session-mirror-settle-census.test.ts b/src/renderer/src/runtime/host-session-mirror-settle-census.test.ts
index 2b99927cb8c..b50ed2ae795 100644
--- a/src/renderer/src/runtime/host-session-mirror-settle-census.test.ts
+++ b/src/renderer/src/runtime/host-session-mirror-settle-census.test.ts
@@ -144,7 +144,7 @@ describe('host-session-mirror settle census', () => {
       // singular frame, scoped active frame.
       'runtime/web-session-tabs-sync.ts': 5,
       // The eager post-create session.tabs.list refresh.
-      'runtime/web-runtime-session.ts': 1,
+      'runtime/web-runtime-session-snapshot.ts': 1,
       // The local structured-session inventory/subscription frame.
       'runtime/local-structured-session-tabs-sync.ts': 1
     })
@@ -192,7 +192,7 @@ describe('host-session-mirror settle census', () => {
       // frame patch, and its patchless twin) and three mirror ones
       // (visibility-resume repair, global singular frame patch and patchless).
       'runtime/web-session-tabs-sync.ts': { settleHydration: 4, settleMirror: 3 },
-      'runtime/web-runtime-session.ts': { settleMirror: 1 },
+      'runtime/web-runtime-session-snapshot.ts': { settleMirror: 1 },
       'runtime/local-structured-session-tabs-sync.ts': { settleStructuredSessionMirror: 1 }
     })
   })
diff --git a/src/renderer/src/runtime/remote-runtime-terminal-binary-controller.ts b/src/renderer/src/runtime/remote-runtime-terminal-binary-controller.ts
new file mode 100644
index 00000000000..b8abe9da61a
--- /dev/null
+++ b/src/renderer/src/runtime/remote-runtime-terminal-binary-controller.ts
@@ -0,0 +1,147 @@
+import {
+  TerminalStreamOpcode,
+  decodeTerminalStreamFrame,
+  decodeTerminalStreamJson,
+  decodeTerminalStreamText,
+  type TerminalStreamFrame
+} from '../../../shared/terminal-stream-protocol'
+import { deliverTerminalDataWithDeferredCredit } from '@/lib/pane-manager/terminal-delivery-credit'
+import {
+  shouldDropE2eRemoteTerminalOutput,
+  shouldHoldE2eRemoteTerminalAck
+} from './remote-runtime-terminal-e2e-control'
+import { RemoteRuntimeTerminalBinarySnapshots } from './remote-runtime-terminal-binary-snapshots'
+import type { RemoteRuntimeMultiplexedTerminalState } from './remote-runtime-terminal-multiplexer-types'
+
+export abstract class RemoteRuntimeTerminalBinaryController extends RemoteRuntimeTerminalBinarySnapshots {
+  protected handleBinary(bytes: Uint8Array<ArrayBufferLike>): void {
+    if (!this.matchesCurrentEnvironmentRevision()) {
+      this.closeForEnvironmentReplacement()
+      return
+    }
+    const frame = decodeTerminalStreamFrame(bytes)
+    if (!frame) {
+      // Why: malformed framing cannot be credited safely; closing makes the server release every stream window.
+      this.failConnection(new Error('Remote terminal stream received a malformed frame.'))
+      return
+    }
+    const stream = this.streams.get(frame.streamId)
+    if (!stream) {
+      if (
+        frame.opcode === TerminalStreamOpcode.Output ||
+        frame.opcode === TerminalStreamOpcode.OutputSpan
+      ) {
+        // Why: the renderer already disposed this stream; unsubscribe releases server credit that cannot reach a parser.
+        this.sendFrame(frame.streamId, TerminalStreamOpcode.Unsubscribe)
+      }
+      return
+    }
+    if (
+      (frame.opcode === TerminalStreamOpcode.Output ||
+        frame.opcode === TerminalStreamOpcode.OutputSpan) &&
+      shouldDropE2eRemoteTerminalOutput(stream, frame.payload.byteLength)
+    ) {
+      this.queueOutputAcknowledgement(stream, frame.payload.byteLength)
+      return
+    }
+    stream.watchdog.recordInbound()
+    if (frame.opcode === TerminalStreamOpcode.WriteUnavailable) {
+      stream.callbacks.onWriteUnavailable?.()
+      return
+    }
+    if (
+      frame.opcode === TerminalStreamOpcode.Output ||
+      frame.opcode === TerminalStreamOpcode.OutputSpan
+    ) {
+      this.handleOutputFrame(frame, stream)
+      return
+    }
+    this.handleSnapshotOrErrorFrame(frame, stream)
+  }
+
+  private handleOutputFrame(
+    frame: TerminalStreamFrame,
+    stream: RemoteRuntimeMultiplexedTerminalState
+  ): void {
+    const span =
+      frame.opcode === TerminalStreamOpcode.OutputSpan
+        ? decodeTerminalStreamJson<{
+            data?: unknown
+            rawLength?: unknown
+            transformed?: unknown
+          }>(frame.payload)
+        : null
+    const validSpan =
+      frame.opcode !== TerminalStreamOpcode.OutputSpan ||
+      (typeof span?.data === 'string' &&
+        typeof span.rawLength === 'number' &&
+        Number.isSafeInteger(span.rawLength) &&
+        span.rawLength >= 0 &&
+        span.transformed === true)
+    const data =
+      frame.opcode === TerminalStreamOpcode.OutputSpan
+        ? validSpan
+          ? (span!.data as string)
+          : ''
+        : decodeTerminalStreamText(frame.payload)
+    const deliverOutput = (): void => {
+      if (!validSpan) {
+        // Why: rendering malformed span JSON would expose protocol framing
+        // as terminal text and lose its raw sequence accounting.
+        this.requestResyncSnapshot(stream)
+        return
+      }
+      const rawLength =
+        frame.opcode === TerminalStreamOpcode.OutputSpan && typeof span?.rawLength === 'number'
+          ? span.rawLength
+          : data.length
+      // Why: a resync snapshot is authoritative; discard live output while
+      // it is in flight, but still return transport credit in finally.
+      if (stream.resyncInFlight) {
+        return
+      }
+      const seq = typeof frame.seq === 'number' && frame.seq > 0 ? frame.seq : undefined
+      // Why: older servers replay snapshot-covered buffered chunks after a
+      // requested recovery; rendering them would duplicate the recovered tail.
+      if (
+        typeof seq === 'number' &&
+        typeof stream.recoverySnapshotSeq === 'number' &&
+        seq <= stream.recoverySnapshotSeq
+      ) {
+        return
+      }
+      if (this.detectOutputGap(stream, seq, rawLength)) {
+        this.requestResyncSnapshot(stream)
+        return
+      }
+      if (typeof seq === 'number') {
+        stream.expectedSeq = seq
+        stream.commandProbeBaselineSeq = undefined
+      }
+      stream.callbacks.onData(data, {
+        seq,
+        rawLength,
+        ...(frame.opcode === TerminalStreamOpcode.OutputSpan ? { transformed: true } : {})
+      })
+    }
+    if (!stream.acknowledgeOutput) {
+      deliverOutput()
+      return
+    }
+    try {
+      const settleWatchdog = stream.watchdog.beginOutputDelivery(frame.payload.byteLength)
+      deliverTerminalDataWithDeferredCredit(() => {
+        settleWatchdog()
+        if (shouldHoldE2eRemoteTerminalAck(stream.terminal)) {
+          stream.heldAckBytes += frame.payload.byteLength
+        } else {
+          this.queueOutputAcknowledgement(stream, frame.payload.byteLength)
+        }
+      }, deliverOutput)
+    } catch (error) {
+      this.failConnection(
+        error instanceof Error ? error : new Error('Remote terminal output delivery failed.')
+      )
+    }
+  }
+}
diff --git a/src/renderer/src/runtime/remote-runtime-terminal-binary-snapshots.ts b/src/renderer/src/runtime/remote-runtime-terminal-binary-snapshots.ts
new file mode 100644
index 00000000000..208d6e99f48
--- /dev/null
+++ b/src/renderer/src/runtime/remote-runtime-terminal-binary-snapshots.ts
@@ -0,0 +1,166 @@
+import {
+  TerminalStreamOpcode,
+  decodeTerminalStreamText,
+  type TerminalStreamFrame
+} from '../../../shared/terminal-stream-protocol'
+import { TERMINAL_MULTIPLEX_STREAM_LIMIT_ERROR } from '../../../shared/terminal-multiplex-flow-control'
+import { RemoteRuntimeTerminalResponseController } from './remote-runtime-terminal-response-controller'
+import {
+  MAX_REMOTE_TERMINAL_SNAPSHOT_BYTES,
+  REMOTE_TERMINAL_SNAPSHOT_TOO_LARGE,
+  classifySnapshotAvailability,
+  clearPendingSnapshotRequest,
+  clearResyncTimer,
+  clearSnapshot,
+  concatBytes,
+  decodeSnapshotInfo
+} from './remote-runtime-terminal-snapshot-state'
+import type { RemoteRuntimeMultiplexedTerminalState } from './remote-runtime-terminal-multiplexer-types'
+
+export abstract class RemoteRuntimeTerminalBinarySnapshots extends RemoteRuntimeTerminalResponseController {
+  protected handleSnapshotOrErrorFrame(
+    frame: TerminalStreamFrame,
+    stream: RemoteRuntimeMultiplexedTerminalState
+  ): void {
+    if (frame.opcode === TerminalStreamOpcode.SnapshotStart) {
+      clearSnapshot(stream)
+      stream.snapshotInfo = decodeSnapshotInfo(frame.payload)
+      const requestId = stream.snapshotInfo?.requestId
+      stream.snapshotTarget =
+        typeof requestId === 'number' ||
+        (stream.initialSnapshotReceived && stream.pendingSnapshotRequest)
+          ? 'request'
+          : stream.initialSnapshotReceived
+            ? 'recovery'
+            : 'initial'
+      return
+    }
+    if (frame.opcode === TerminalStreamOpcode.SnapshotChunk) {
+      if (stream.snapshotOverflowed) {
+        return
+      }
+      stream.snapshotBytes += frame.payload.byteLength
+      if (stream.snapshotBytes > MAX_REMOTE_TERMINAL_SNAPSHOT_BYTES) {
+        stream.snapshotOverflowed = true
+        if (stream.snapshotTarget === 'initial') {
+          stream.callbacks.onError?.(REMOTE_TERMINAL_SNAPSHOT_TOO_LARGE)
+        }
+        return
+      }
+      stream.snapshotChunks.push(frame.payload)
+      return
+    }
+    if (frame.opcode === TerminalStreamOpcode.SnapshotEnd) {
+      const data = stream.snapshotOverflowed
+        ? null
+        : decodeTerminalStreamText(concatBytes(stream.snapshotChunks))
+      const target = stream.snapshotTarget
+      const info = stream.snapshotInfo
+      const pendingRequest = stream.pendingSnapshotRequest
+      const snapshotApplied = !stream.snapshotOverflowed && info?.truncated !== true
+      const matchesPendingRequest =
+        target === 'request' &&
+        pendingRequest &&
+        (typeof info?.requestId === 'number'
+          ? info.requestId === pendingRequest.requestId
+          : stream.initialSnapshotReceived)
+      if (snapshotApplied) {
+        if (matchesPendingRequest) {
+          pendingRequest.resolve({
+            availability: classifySnapshotAvailability(stream.snapshotOverflowed, info),
+            snapshot: {
+              data: data ?? '',
+              cols: info?.cols ?? 80,
+              rows: info?.rows ?? 24,
+              seq: info?.seq,
+              source: info?.source,
+              kittyKeyboardFlags: info?.kittyKeyboardFlags,
+              alternateScreen: info?.alternateScreen,
+              terminalOwner: info?.terminalOwner,
+              pendingEscapeTailAnsi: info?.pendingEscapeTailAnsi
+            }
+          })
+          clearPendingSnapshotRequest(stream)
+        } else if (target === 'initial') {
+          stream.callbacks.onSnapshot(data ?? '', {
+            pendingEscapeTailAnsi: info?.pendingEscapeTailAnsi,
+            seq: info?.seq,
+            kittyKeyboardFlags: info?.kittyKeyboardFlags,
+            alternateScreen: info?.alternateScreen,
+            terminalOwner: info?.terminalOwner
+          })
+        } else if (target === 'recovery') {
+          // Why: a server-pushed recovery snapshot replaces terminal state
+          // mid-session; clear the screen and scrollback before applying it.
+          // An empty snapshot is still applied so stale dropped output does
+          // not linger on a terminal the model says is blank.
+          stream.callbacks.onSnapshot(`\x1b[2J\x1b[3J\x1b[H${data ?? ''}`, {
+            pendingEscapeTailAnsi: info?.pendingEscapeTailAnsi,
+            seq: info?.seq,
+            kittyKeyboardFlags: info?.kittyKeyboardFlags,
+            alternateScreen: info?.alternateScreen,
+            terminalOwner: info?.terminalOwner
+          })
+        }
+      } else if (matchesPendingRequest) {
+        pendingRequest.resolve({
+          availability: classifySnapshotAvailability(stream.snapshotOverflowed, info),
+          snapshot: null
+        })
+        clearPendingSnapshotRequest(stream)
+      }
+      clearSnapshot(stream)
+      if (target === 'initial') {
+        clearResyncTimer(stream)
+        stream.expectedSeq = typeof info?.seq === 'number' ? info.seq : undefined
+        stream.commandProbeBaselineSeq = undefined
+        stream.resyncInFlight = false
+        stream.resyncPendingSend = false
+        stream.initialSnapshotReceived = true
+        stream.callbacks.onSubscribed?.()
+      } else if (target === 'recovery') {
+        // Why: only an applied recovery is authoritative; retaining the prior
+        // high-water after a discarded snapshot keeps the gap detectable.
+        if (snapshotApplied) {
+          clearResyncTimer(stream)
+          stream.expectedSeq = typeof info?.seq === 'number' ? info.seq : undefined
+          stream.commandProbeBaselineSeq = undefined
+          stream.recoverySnapshotSeq = typeof info?.seq === 'number' ? info.seq : undefined
+          stream.resyncAttempts = 0
+          stream.resyncInFlight = false
+          stream.resyncPendingSend = false
+        } else if (stream.resyncInFlight) {
+          this.scheduleResyncRetry(stream)
+        } else {
+          // Why: a discarded server-pushed recovery leaves dropped output
+          // unrepresented; pull a fresh snapshot now instead of waiting for
+          // the next chunk to expose the gap.
+          this.requestResyncSnapshot(stream)
+        }
+      } else {
+        this.sendDeferredResyncSnapshot(stream)
+      }
+      return
+    }
+    if (frame.opcode === TerminalStreamOpcode.Error) {
+      const message = decodeTerminalStreamText(frame.payload)
+      if (message === TERMINAL_MULTIPLEX_STREAM_LIMIT_ERROR) {
+        stream.capacityRejected = true
+        return
+      }
+      clearSnapshot(stream)
+      const pendingSnapshotRequest = stream.pendingSnapshotRequest
+      if (pendingSnapshotRequest) {
+        clearPendingSnapshotRequest(stream)
+        pendingSnapshotRequest.reject(new Error(message))
+        this.sendDeferredResyncSnapshot(stream)
+        return
+      }
+      // Why: a failed resync must re-open the live path or output stalls forever.
+      clearResyncTimer(stream)
+      stream.resyncInFlight = false
+      stream.resyncPendingSend = false
+      stream.callbacks.onError?.(message)
+    }
+  }
+}
diff --git a/src/renderer/src/runtime/remote-runtime-terminal-e2e-control.ts b/src/renderer/src/runtime/remote-runtime-terminal-e2e-control.ts
new file mode 100644
index 00000000000..e919ec12ea0
--- /dev/null
+++ b/src/renderer/src/runtime/remote-runtime-terminal-e2e-control.ts
@@ -0,0 +1,209 @@
+import { TerminalStreamOpcode } from '../../../shared/terminal-stream-protocol'
+import { e2eConfig } from '@/lib/e2e-config'
+import type {
+  RemoteRuntimeMultiplexedTerminalState,
+  RuntimeEnvironmentSubscriptionHandle
+} from './remote-runtime-terminal-multiplexer-types'
+
+type E2eRemoteTerminalMultiplexAckGateSnapshot = {
+  activeStreams: { environmentId: string; streamId: number; terminal: string }[]
+  droppedOutputBytes: number
+  droppedOutputFrames: number
+  heldTerminalCount: number
+  heldStreamCount: number
+  heldAckChars: number
+  releasedAckChars: number
+  streamSubscribeCount: number
+  streamUnsubscribeCount: number
+  transportSubscribeCount: number
+  transportUnsubscribeCount: number
+}
+
+type E2eRemoteTerminalMultiplexAckGateApi = {
+  dropOutputUntilResubscribe: (terminals: string[]) => number
+  forceError: (terminals: string[], message: string) => number
+  hold: (terminals: string[]) => void
+  holdEnd: (terminals: string[]) => void
+  release: () => void
+  sendInput: (terminal: string, text: string) => number
+  snapshot: () => E2eRemoteTerminalMultiplexAckGateSnapshot
+}
+
+type E2eRemoteTerminalMultiplexAckGateWindow = Window & {
+  __remoteTerminalMultiplexAckGate?: E2eRemoteTerminalMultiplexAckGateApi
+}
+
+export type RemoteRuntimeTerminalMultiplexerE2eAccess = {
+  getStreamsForE2e: () => Iterable<RemoteRuntimeMultiplexedTerminalState>
+  forceErrorForE2e: (terminals: ReadonlySet<string>, message: string) => number
+  releaseHeldAcksForE2e: () => number
+  sendInputForE2e: (terminal: string, text: string) => number
+}
+
+const e2eHeldRemoteAckTerminals = new Set<string>()
+const e2eHeldRemoteEndTerminals = new Set<string>()
+const e2eDroppedOutputStreams = new Set<RemoteRuntimeMultiplexedTerminalState>()
+let e2eDroppedOutputBytes = 0
+let e2eDroppedOutputFrames = 0
+let e2eReleasedRemoteAckChars = 0
+let e2eStreamSubscribeCount = 0
+let e2eStreamUnsubscribeCount = 0
+let e2eTransportSubscribeCount = 0
+let e2eTransportUnsubscribeCount = 0
+
+export function shouldHoldE2eRemoteTerminalAck(terminal: string): boolean {
+  return e2eConfig.exposeStore && e2eHeldRemoteAckTerminals.has(terminal)
+}
+
+export function shouldHoldE2eRemoteTerminalEnd(terminal: string): boolean {
+  return e2eConfig.exposeStore && e2eHeldRemoteEndTerminals.has(terminal)
+}
+
+function getE2eRemoteAckSnapshot(
+  multiplexers: ReadonlyMap<string, RemoteRuntimeTerminalMultiplexerE2eAccess>
+): E2eRemoteTerminalMultiplexAckGateSnapshot {
+  const activeStreams: E2eRemoteTerminalMultiplexAckGateSnapshot['activeStreams'] = []
+  let heldStreamCount = 0
+  let heldAckChars = 0
+  for (const [environmentId, multiplexer] of multiplexers) {
+    for (const stream of multiplexer.getStreamsForE2e()) {
+      activeStreams.push({ environmentId, streamId: stream.streamId, terminal: stream.terminal })
+      if (stream.heldAckBytes > 0) {
+        heldStreamCount += 1
+        heldAckChars += stream.heldAckBytes
+      }
+    }
+  }
+  return {
+    activeStreams,
+    droppedOutputBytes: e2eDroppedOutputBytes,
+    droppedOutputFrames: e2eDroppedOutputFrames,
+    heldTerminalCount: e2eHeldRemoteAckTerminals.size,
+    heldStreamCount,
+    heldAckChars,
+    releasedAckChars: e2eReleasedRemoteAckChars,
+    streamSubscribeCount: e2eStreamSubscribeCount,
+    streamUnsubscribeCount: e2eStreamUnsubscribeCount,
+    transportSubscribeCount: e2eTransportSubscribeCount,
+    transportUnsubscribeCount: e2eTransportUnsubscribeCount
+  }
+}
+
+export function recordE2eRemoteTransportSubscribe(): void {
+  if (e2eConfig.exposeStore) {
+    e2eTransportSubscribeCount += 1
+  }
+}
+
+export function unsubscribeRuntimeEnvironmentForE2e(
+  subscription: RuntimeEnvironmentSubscriptionHandle
+): void {
+  if (e2eConfig.exposeStore) {
+    e2eTransportUnsubscribeCount += 1
+  }
+  subscription.unsubscribe()
+}
+
+export function recordE2eRemoteStreamFrame(opcode: TerminalStreamOpcode): void {
+  if (!e2eConfig.exposeStore) {
+    return
+  }
+  if (opcode === TerminalStreamOpcode.Subscribe) {
+    e2eStreamSubscribeCount += 1
+  } else if (opcode === TerminalStreamOpcode.Unsubscribe) {
+    e2eStreamUnsubscribeCount += 1
+  }
+}
+
+function releaseE2eRemoteTerminalAcks(
+  multiplexers: ReadonlyMap<string, RemoteRuntimeTerminalMultiplexerE2eAccess>
+): void {
+  for (const multiplexer of multiplexers.values()) {
+    e2eReleasedRemoteAckChars += multiplexer.releaseHeldAcksForE2e()
+  }
+  e2eHeldRemoteAckTerminals.clear()
+}
+
+function resetE2eDroppedRemoteOutput(): void {
+  e2eDroppedOutputStreams.clear()
+  e2eDroppedOutputBytes = 0
+  e2eDroppedOutputFrames = 0
+}
+
+export function shouldDropE2eRemoteTerminalOutput(
+  stream: RemoteRuntimeMultiplexedTerminalState,
+  bytes: number
+): boolean {
+  if (!e2eConfig.exposeStore || !e2eDroppedOutputStreams.has(stream)) {
+    return false
+  }
+  e2eDroppedOutputBytes += bytes
+  e2eDroppedOutputFrames += 1
+  return true
+}
+
+export function exposeE2eRemoteTerminalMultiplexAckGate(
+  multiplexers: ReadonlyMap<string, RemoteRuntimeTerminalMultiplexerE2eAccess>
+): void {
+  if (!e2eConfig.exposeStore || typeof window === 'undefined') {
+    return
+  }
+  const target = window as E2eRemoteTerminalMultiplexAckGateWindow
+  target.__remoteTerminalMultiplexAckGate ??= {
+    dropOutputUntilResubscribe: (terminals) => {
+      resetE2eDroppedRemoteOutput()
+      const targets = new Set(terminals)
+      for (const multiplexer of multiplexers.values()) {
+        for (const stream of multiplexer.getStreamsForE2e()) {
+          if (targets.has(stream.terminal)) {
+            e2eDroppedOutputStreams.add(stream)
+          }
+        }
+      }
+      return e2eDroppedOutputStreams.size
+    },
+    forceError: (terminals, message) => {
+      let dispatched = 0
+      const targets = new Set(terminals)
+      for (const multiplexer of multiplexers.values()) {
+        dispatched += multiplexer.forceErrorForE2e(targets, message)
+      }
+      return dispatched
+    },
+    hold: (terminals) => {
+      releaseE2eRemoteTerminalAcks(multiplexers)
+      for (const terminal of terminals) {
+        e2eHeldRemoteAckTerminals.add(terminal)
+      }
+    },
+    holdEnd: (terminals) => {
+      e2eHeldRemoteEndTerminals.clear()
+      for (const terminal of terminals) {
+        e2eHeldRemoteEndTerminals.add(terminal)
+      }
+    },
+    release: () => {
+      releaseE2eRemoteTerminalAcks(multiplexers)
+      resetE2eDroppedRemoteOutput()
+      e2eHeldRemoteEndTerminals.clear()
+    },
+    sendInput: (terminal, value) => {
+      let sent = 0
+      for (const multiplexer of multiplexers.values()) {
+        sent += multiplexer.sendInputForE2e(terminal, value)
+      }
+      return sent
+    },
+    snapshot: () => getE2eRemoteAckSnapshot(multiplexers)
+  }
+}
+
+export function resetRemoteRuntimeTerminalE2eState(): void {
+  e2eHeldRemoteAckTerminals.clear()
+  resetE2eDroppedRemoteOutput()
+  e2eReleasedRemoteAckChars = 0
+  e2eStreamSubscribeCount = 0
+  e2eStreamUnsubscribeCount = 0
+  e2eTransportSubscribeCount = 0
+  e2eTransportUnsubscribeCount = 0
+}
diff --git a/src/renderer/src/runtime/remote-runtime-terminal-flow-controller.ts b/src/renderer/src/runtime/remote-runtime-terminal-flow-controller.ts
new file mode 100644
index 00000000000..640ec25933e
--- /dev/null
+++ b/src/renderer/src/runtime/remote-runtime-terminal-flow-controller.ts
@@ -0,0 +1,142 @@
+import {
+  TerminalStreamOpcode,
+  encodeTerminalStreamJson,
+  encodeTerminalStreamText
+} from '../../../shared/terminal-stream-protocol'
+import {
+  TERMINAL_MULTIPLEX_ACK_BATCH_BYTES,
+  TERMINAL_MULTIPLEX_ACK_FLUSH_MS
+} from '../../../shared/terminal-multiplex-flow-control'
+import { RemoteRuntimeTerminalSnapshotController } from './remote-runtime-terminal-snapshot-controller'
+import { clearAckFlushTimer } from './remote-runtime-terminal-snapshot-state'
+import type { RemoteRuntimeMultiplexedTerminalState } from './remote-runtime-terminal-multiplexer-types'
+
+export abstract class RemoteRuntimeTerminalFlowController extends RemoteRuntimeTerminalSnapshotController {
+  private acknowledgeOutput(stream: RemoteRuntimeMultiplexedTerminalState, bytes: number): boolean {
+    if (stream.acknowledgeOutputSourceRanges && stream.streamGeneration) {
+      const ackedEndByte = stream.sourceAckedEndByte + bytes
+      const sent = this.sendFrame(
+        stream.streamId,
+        TerminalStreamOpcode.Ack,
+        encodeTerminalStreamJson({
+          streamGeneration: stream.streamGeneration,
+          ackedEndByte
+        })
+      )
+      if (sent) {
+        stream.sourceAckedEndByte = ackedEndByte
+      }
+      return sent
+    }
+    return this.sendFrame(
+      stream.streamId,
+      TerminalStreamOpcode.Ack,
+      encodeTerminalStreamJson({ bytes })
+    )
+  }
+
+  // Why: sendFrame gates on readiness alone; a dropped handle would still report success.
+  protected isRegisteredStream(stream: RemoteRuntimeMultiplexedTerminalState): boolean {
+    return this.streams.get(stream.streamId) === stream
+  }
+
+  protected sendInput(stream: RemoteRuntimeMultiplexedTerminalState, text: string): boolean {
+    const sent = this.sendFrame(
+      stream.streamId,
+      TerminalStreamOpcode.Input,
+      encodeTerminalStreamText(text)
+    )
+    if (sent && !stream.outputPaused) {
+      stream.watchdog.recordCommandInput(text)
+    }
+    return sent
+  }
+
+  protected setOutputPaused(
+    stream: RemoteRuntimeMultiplexedTerminalState,
+    paused: boolean
+  ): boolean {
+    if (!stream.supportsOutputPause || this.streams.get(stream.streamId) !== stream) {
+      return false
+    }
+    if (stream.outputPaused === paused) {
+      return true
+    }
+    const sent = this.sendFrame(
+      stream.streamId,
+      TerminalStreamOpcode.SetOutputPaused,
+      encodeTerminalStreamJson({ paused })
+    )
+    if (sent) {
+      stream.outputPaused = paused
+    }
+    return sent
+  }
+
+  protected queueOutputAcknowledgement(
+    stream: RemoteRuntimeMultiplexedTerminalState,
+    bytes: number
+  ): boolean {
+    if (this.streams.get(stream.streamId) !== stream) {
+      return true
+    }
+    stream.pendingAckBytes += bytes
+    if (stream.pendingAckBytes >= TERMINAL_MULTIPLEX_ACK_BATCH_BYTES) {
+      return this.flushOutputAcknowledgement(stream)
+    }
+    if (stream.ackFlushTimer === null) {
+      stream.ackFlushTimer = setTimeout(() => {
+        stream.ackFlushTimer = null
+        this.flushOutputAcknowledgement(stream)
+      }, TERMINAL_MULTIPLEX_ACK_FLUSH_MS)
+    }
+    return true
+  }
+
+  private flushOutputAcknowledgement(stream: RemoteRuntimeMultiplexedTerminalState): boolean {
+    clearAckFlushTimer(stream)
+    const bytes = stream.pendingAckBytes
+    stream.pendingAckBytes = 0
+    return bytes <= 0 || this.acknowledgeOutput(stream, bytes)
+  }
+
+  getStreamsForE2e(): Iterable<RemoteRuntimeMultiplexedTerminalState> {
+    return this.streams.values()
+  }
+
+  forceErrorForE2e(terminals: ReadonlySet<string>, message: string): number {
+    let dispatched = 0
+    for (const stream of this.streams.values()) {
+      if (terminals.has(stream.terminal)) {
+        stream.callbacks.onError?.(message)
+        dispatched += 1
+      }
+    }
+    return dispatched
+  }
+
+  releaseHeldAcksForE2e(): number {
+    let released = 0
+    for (const stream of this.streams.values()) {
+      if (stream.heldAckBytes <= 0) {
+        continue
+      }
+      const bytes = stream.heldAckBytes
+      stream.heldAckBytes = 0
+      if (this.queueOutputAcknowledgement(stream, bytes)) {
+        released += bytes
+      }
+    }
+    return released
+  }
+
+  sendInputForE2e(terminal: string, text: string): number {
+    let sent = 0
+    for (const stream of this.streams.values()) {
+      if (stream.terminal === terminal && this.sendInput(stream, text)) {
+        sent += 1
+      }
+    }
+    return sent
+  }
+}
diff --git a/src/renderer/src/runtime/remote-runtime-terminal-multiplexer-base.ts b/src/renderer/src/runtime/remote-runtime-terminal-multiplexer-base.ts
new file mode 100644
index 00000000000..a9d27b7c6c9
--- /dev/null
+++ b/src/renderer/src/runtime/remote-runtime-terminal-multiplexer-base.ts
@@ -0,0 +1,213 @@
+import type { RuntimeRpcResponse } from '../../../shared/runtime-rpc-envelope'
+import { isRecoverableRemoteRuntimeConnectionError } from '../../../shared/remote-runtime-client-error-classification'
+import {
+  encodeTerminalStreamFrame,
+  type TerminalStreamOpcode
+} from '../../../shared/terminal-stream-protocol'
+import {
+  recordE2eRemoteStreamFrame,
+  recordE2eRemoteTransportSubscribe,
+  unsubscribeRuntimeEnvironmentForE2e
+} from './remote-runtime-terminal-e2e-control'
+import {
+  clearResyncTimer,
+  clearSnapshot,
+  discardOutputAcknowledgements,
+  rejectPendingSnapshotRequest
+} from './remote-runtime-terminal-snapshot-state'
+import type {
+  RemoteRuntimeMultiplexedTerminalState,
+  RuntimeEnvironmentSubscriptionHandle
+} from './remote-runtime-terminal-multiplexer-types'
+import { getRuntimeEnvironmentRevision } from './runtime-environment-revision'
+
+export abstract class RemoteRuntimeTerminalMultiplexerBase {
+  protected readonly streams = new Map<number, RemoteRuntimeMultiplexedTerminalState>()
+  protected subscription: RuntimeEnvironmentSubscriptionHandle | null = null
+  protected connectPromise: Promise<void> | null = null
+  protected readyResolver: (() => void) | null = null
+  protected readyRejecter: ((error: Error) => void) | null = null
+  protected ready = false
+  protected nextStreamId = 1
+  protected nextSnapshotRequestId = 1
+
+  constructor(
+    protected readonly environmentId: string,
+    protected readonly environmentRevision: number | undefined,
+    private readonly releaseIfCurrent: (
+      environmentId: string,
+      multiplexer: RemoteRuntimeTerminalMultiplexerBase
+    ) => void
+  ) {}
+
+  protected abstract handleResponse(response: RuntimeRpcResponse<unknown>): void
+  protected abstract handleBinary(bytes: Uint8Array<ArrayBufferLike>): void
+
+  matchesCurrentEnvironmentRevision(): boolean {
+    return getRuntimeEnvironmentRevision(this.environmentId) === this.environmentRevision
+  }
+
+  closeForEnvironmentReplacement(): void {
+    this.handleClose('Runtime environment pairing changed.')
+  }
+
+  protected allocateStreamId(): number {
+    const start = this.nextStreamId
+    do {
+      const candidate = this.nextStreamId
+      this.nextStreamId = this.nextStreamId >= 0x7fffffff ? 1 : this.nextStreamId + 1
+      if (!this.streams.has(candidate)) {
+        return candidate
+      }
+    } while (this.nextStreamId !== start)
+    throw new Error('No remote terminal stream ids available.')
+  }
+
+  protected allocateSnapshotRequestId(): number {
+    const id = this.nextSnapshotRequestId
+    this.nextSnapshotRequestId =
+      this.nextSnapshotRequestId >= 0x7fffffff ? 1 : this.nextSnapshotRequestId + 1
+    return id
+  }
+
+  protected ensureConnected(): Promise<void> {
+    if (this.ready && this.subscription) {
+      return Promise.resolve()
+    }
+    if (this.connectPromise) {
+      return this.connectPromise
+    }
+    const connectPromise = new Promise<void>((resolve, reject) => {
+      this.readyResolver = resolve
+      this.readyRejecter = reject
+      recordE2eRemoteTransportSubscribe()
+      void window.api.runtimeEnvironments
+        .subscribe(
+          {
+            selector: this.environmentId,
+            method: 'terminal.multiplex',
+            params: {},
+            timeoutMs: 15_000,
+            expectedEnvironmentPairingRevision: this.environmentRevision
+          },
+          {
+            onResponse: (response) => this.handleResponse(response),
+            onBinary: (bytes) => this.handleBinary(bytes),
+            onError: (error) => {
+              if (isRecoverableRemoteRuntimeConnectionError(error)) {
+                this.handleClose(error.message)
+              } else {
+                this.failConnection(Object.assign(new Error(error.message), { code: error.code }))
+              }
+            },
+            onClose: () => this.handleClose('Remote Orca runtime closed the connection.')
+          }
+        )
+        .then((subscription) => {
+          if (this.connectPromise !== connectPromise || (!this.ready && !this.readyRejecter)) {
+            // Why: close/error can arrive before subscribe() resolves because
+            // preload listens before ipcMain.handle() returns. The multiplexer
+            // may already be released; do not retain the late handle.
+            unsubscribeRuntimeEnvironmentForE2e(subscription)
+            return
+          }
+          this.subscription = subscription
+          this.resolveReadyIfConnected()
+        })
+        .catch((error) => {
+          if (this.connectPromise === connectPromise) {
+            this.connectPromise = null
+            this.readyResolver = null
+            this.readyRejecter = null
+          }
+          reject(error instanceof Error ? error : new Error(String(error)))
+        })
+    })
+    this.connectPromise = connectPromise
+    return this.connectPromise
+  }
+
+  protected sendFrame(
+    streamId: number,
+    opcode: TerminalStreamOpcode,
+    payload: Uint8Array<ArrayBufferLike> = new Uint8Array()
+  ): boolean {
+    if (!this.matchesCurrentEnvironmentRevision() || !this.ready || !this.subscription) {
+      return false
+    }
+    try {
+      this.subscription.sendBinary(encodeTerminalStreamFrame({ opcode, streamId, seq: 0, payload }))
+      recordE2eRemoteStreamFrame(opcode)
+      return true
+    } catch (error) {
+      this.handleClose(
+        error instanceof Error ? error.message : 'Remote terminal transport write failed.'
+      )
+      return false
+    }
+  }
+
+  protected resolveReadyIfConnected(): void {
+    if (!this.ready || !this.subscription) {
+      return
+    }
+    this.readyResolver?.()
+    this.readyResolver = null
+    this.readyRejecter = null
+  }
+
+  protected failConnection(error: Error): void {
+    this.readyRejecter?.(error)
+    this.readyResolver = null
+    this.readyRejecter = null
+    for (const stream of this.streams.values()) {
+      // Why: a stream still awaiting ensureConnected receives this failure through its rejected promise.
+      if (stream.subscriptionRequested) {
+        stream.callbacks.onError?.(error.message)
+      }
+    }
+    this.handleClose(undefined, false)
+  }
+
+  protected handleClose(message?: string, recoverable = true): void {
+    const streams = Array.from(this.streams.values())
+    const closingSubscription = this.subscription
+    this.ready = false
+    this.connectPromise = null
+    this.readyRejecter?.(new Error(message ?? 'Remote runtime connection closed.'))
+    this.readyResolver = null
+    this.readyRejecter = null
+    this.subscription = null
+    if (closingSubscription) {
+      unsubscribeRuntimeEnvironmentForE2e(closingSubscription)
+    }
+    this.streams.clear()
+    // Why: close callbacks may resubscribe synchronously; release first so every replacement shares the new environment multiplexer.
+    this.releaseIfCurrent(this.environmentId, this)
+    for (const stream of streams) {
+      discardOutputAcknowledgements(stream)
+      stream.watchdog.dispose()
+      clearSnapshot(stream)
+      clearResyncTimer(stream)
+      rejectPendingSnapshotRequest(stream, message ?? 'Remote runtime connection closed.')
+      const canHandleClose = Boolean(stream.callbacks.onTransportClose)
+      stream.callbacks.onTransportClose?.({ recoverable })
+      if (message && !canHandleClose) {
+        stream.callbacks.onError?.(message)
+      }
+    }
+  }
+
+  protected closeIfIdle(): void {
+    if (this.streams.size > 0) {
+      return
+    }
+    if (this.subscription) {
+      unsubscribeRuntimeEnvironmentForE2e(this.subscription)
+    }
+    this.subscription = null
+    this.connectPromise = null
+    this.ready = false
+    this.releaseIfCurrent(this.environmentId, this)
+  }
+}
diff --git a/src/renderer/src/runtime/remote-runtime-terminal-multiplexer-implementation.ts b/src/renderer/src/runtime/remote-runtime-terminal-multiplexer-implementation.ts
new file mode 100644
index 00000000000..d72de381ea7
--- /dev/null
+++ b/src/renderer/src/runtime/remote-runtime-terminal-multiplexer-implementation.ts
@@ -0,0 +1,166 @@
+import {
+  TerminalStreamOpcode,
+  encodeTerminalStreamJson
+} from '../../../shared/terminal-stream-protocol'
+import { e2eDisableRemoteTerminalStallRecovery } from '@/lib/e2e-config'
+import { recordRendererCrashBreadcrumb } from '@/lib/crash-breadcrumb-recorder'
+import { RemoteRuntimeTerminalBinaryController } from './remote-runtime-terminal-binary-controller'
+import {
+  CONTROL_STREAM_ID,
+  clearResyncTimer,
+  discardOutputAcknowledgements,
+  rejectPendingSnapshotRequest
+} from './remote-runtime-terminal-snapshot-state'
+import type {
+  RemoteRuntimeMultiplexedTerminal,
+  RemoteRuntimeMultiplexedTerminalCallbacks,
+  RemoteRuntimeMultiplexedTerminalState
+} from './remote-runtime-terminal-multiplexer-types'
+import { createRemoteTerminalStreamWatchdog } from './remote-terminal-stream-watchdog'
+
+export class RemoteRuntimeTerminalMultiplexer extends RemoteRuntimeTerminalBinaryController {
+  async subscribeTerminal(args: {
+    terminal: string
+    client: { id: string; type: 'desktop' | 'mobile' }
+    viewport?: { cols: number; rows: number }
+    callbacks: RemoteRuntimeMultiplexedTerminalCallbacks
+  }): Promise<RemoteRuntimeMultiplexedTerminal> {
+    const streamId = this.allocateStreamId()
+    const state: RemoteRuntimeMultiplexedTerminalState = {
+      streamId,
+      terminal: args.terminal,
+      callbacks: args.callbacks,
+      subscriptionRequested: false,
+      acknowledgeOutput: true,
+      acknowledgeOutputSourceRanges: false,
+      supportsOutputPause: false,
+      outputPaused: false,
+      streamGeneration: null,
+      sourceAckedEndByte: 0,
+      heldAckBytes: 0,
+      pendingAckBytes: 0,
+      ackFlushTimer: null,
+      snapshotChunks: [],
+      snapshotBytes: 0,
+      snapshotOverflowed: false,
+      snapshotTarget: 'initial',
+      snapshotInfo: null,
+      initialSnapshotReceived: false,
+      pendingSnapshotRequest: null,
+      expectedSeq: undefined,
+      commandProbeBaselineSeq: undefined,
+      recoverySnapshotSeq: undefined,
+      resyncInFlight: false,
+      resyncPendingSend: false,
+      resyncTimer: null,
+      resyncAttempts: 0,
+      capacityRejected: false,
+      watchdog: createRemoteTerminalStreamWatchdog((stall) => {
+        if (e2eDisableRemoteTerminalStallRecovery) {
+          state.watchdog.completeCommandResponseProbe()
+          return
+        }
+        recordRendererCrashBreadcrumb('remote_terminal_stream_stall_recovery', {
+          environmentId: this.environmentId,
+          expectedSeq: state.expectedSeq ?? null,
+          inactiveForMs: stall.inactiveForMs,
+          outstandingDeliveryBytes: stall.outstandingDeliveryBytes,
+          pendingAckBytes: state.pendingAckBytes,
+          reason: stall.reason,
+          resyncAttempts: state.resyncAttempts,
+          snapshotPending: state.pendingSnapshotRequest !== null,
+          streamId: state.streamId,
+          terminal: state.terminal
+        })
+        if (stall.reason === 'command-response-timeout') {
+          this.probeCommandResponse(state)
+        } else {
+          this.recoverStalledStream(state)
+        }
+      })
+    }
+    this.streams.set(streamId, state)
+
+    const stream: RemoteRuntimeMultiplexedTerminal = {
+      streamId,
+      sendInput: (text) => this.isRegisteredStream(state) && this.sendInput(state, text),
+      resize: (cols, rows) =>
+        this.isRegisteredStream(state) &&
+        this.sendFrame(
+          streamId,
+          TerminalStreamOpcode.Resize,
+          encodeTerminalStreamJson({ cols, rows })
+        ),
+      claimViewport: (cols, rows) => {
+        if (!this.isRegisteredStream(state)) {
+          return false
+        }
+        const claimed = this.sendFrame(
+          streamId,
+          TerminalStreamOpcode.ClaimViewport,
+          encodeTerminalStreamJson({ cols, rows })
+        )
+        // Why: older runtimes ignore the claim opcode but still understand
+        // Resize. Claim first keeps new-runtime ownership precise and leaves a
+        // backwards-compatible resize immediately behind it.
+        const resized = this.sendFrame(
+          streamId,
+          TerminalStreamOpcode.Resize,
+          encodeTerminalStreamJson({ cols, rows })
+        )
+        return claimed && resized
+      },
+      setOutputPaused: (paused) => this.setOutputPaused(state, paused),
+      serializeBuffer: (opts) => this.requestSnapshot(state, opts),
+      serializeBufferOutcome: (opts) => this.requestSnapshotOutcome(state, opts),
+      close: () => {
+        if (this.streams.get(streamId) === state) {
+          discardOutputAcknowledgements(state)
+          state.watchdog.dispose()
+          this.sendFrame(streamId, TerminalStreamOpcode.Unsubscribe)
+          clearResyncTimer(state)
+          rejectPendingSnapshotRequest(state, 'Remote terminal stream closed.')
+          this.streams.delete(streamId)
+          this.closeIfIdle()
+        }
+      }
+    }
+
+    try {
+      await this.ensureConnected()
+      if (this.streams.get(streamId) !== state) {
+        return stream
+      }
+      const sent = this.sendFrame(
+        CONTROL_STREAM_ID,
+        TerminalStreamOpcode.Subscribe,
+        encodeTerminalStreamJson({
+          streamId,
+          terminal: args.terminal,
+          client: args.client,
+          viewport: args.viewport,
+          capabilities: {
+            ackOutput: 1,
+            ackOutputSourceRanges: 1,
+            outputPause: 1,
+            writeUnavailable: 1,
+            ...(args.client.type === 'desktop' ? { desktopViewportClaims: 1 } : {})
+          }
+        })
+      )
+      if (!sent) {
+        throw new Error('Remote terminal stream is not connected.')
+      }
+      state.subscriptionRequested = true
+    } catch (error) {
+      const terminalError = error instanceof Error ? error : new Error(String(error))
+      if (this.streams.get(streamId) === state) {
+        this.streams.delete(streamId)
+        this.closeIfIdle()
+      }
+      throw terminalError
+    }
+
+    return stream
+  }
+}
diff --git a/src/renderer/src/runtime/remote-runtime-terminal-multiplexer-types.ts b/src/renderer/src/runtime/remote-runtime-terminal-multiplexer-types.ts
new file mode 100644
index 00000000000..a1b8f9101a7
--- /dev/null
+++ b/src/renderer/src/runtime/remote-runtime-terminal-multiplexer-types.ts
@@ -0,0 +1,204 @@
+import type { TerminalSnapshotUnavailableReason } from '../../../shared/terminal-snapshot-unavailability'
+import type { RemoteTerminalStreamWatchdog } from './remote-terminal-stream-watchdog'
+
+export type RuntimeEnvironmentSubscriptionHandle = {
+  unsubscribe: () => void
+  sendBinary: (bytes: Uint8Array<ArrayBufferLike>) => void
+}
+
+export type TerminalMultiplexEvent =
+  | { type: 'ready' }
+  | {
+      type: 'subscribed'
+      streamId: number
+      streamGeneration?: string
+      capabilities?: { ackOutputSourceRanges?: 1; outputPause?: 1 }
+    }
+  | { type: 'end'; streamId: number }
+  | { type: 'error'; streamId: number; message?: string }
+  | {
+      type: 'fit-override-changed'
+      streamId: number
+      mode: 'mobile-fit' | 'remote-desktop-fit' | 'desktop-fit'
+      cols: number
+      rows: number
+    }
+  | {
+      type: 'driver-changed'
+      streamId: number
+      driver: { kind: 'idle' } | { kind: 'desktop' } | { kind: 'mobile'; clientId: string }
+    }
+  | { type: string; streamId?: number; [key: string]: unknown }
+
+export type RemoteRuntimeMultiplexedTerminalCallbacks = {
+  onData: (data: string, meta?: { seq?: number; rawLength?: number; transformed?: boolean }) => void
+  onSnapshot: (
+    data: string,
+    meta?: {
+      pendingEscapeTailAnsi?: string
+      seq?: number
+      kittyKeyboardFlags?: number
+      alternateScreen?: boolean
+      terminalOwner?: 'shell'
+    }
+  ) => void
+  onSubscribed?: () => void
+  onOutputPauseCapability?: () => void
+  onEnd?: () => void
+  onError?: (message: string) => void
+  onFitOverrideChanged?: (event: {
+    mode: 'mobile-fit' | 'remote-desktop-fit' | 'desktop-fit'
+    cols: number
+    rows: number
+  }) => void
+  onDriverChanged?: (
+    driver: { kind: 'idle' } | { kind: 'desktop' } | { kind: 'mobile'; clientId: string }
+  ) => void
+  onWriteUnavailable?: () => void
+  onTransportClose?: (event: { recoverable: boolean; retryWithBackoff?: boolean }) => void
+}
+
+export type RemoteRuntimeSnapshotImage = {
+  data: string
+  cols: number
+  rows: number
+  seq?: number
+  source?: 'headless' | 'renderer'
+  pendingEscapeTailAnsi?: string
+  /** Effective kitty flags the HOST proved at this image's own `seq`. Absent
+   *  from any host that predates the field — the pane tracker then stays
+   *  unproven and commits raw text instead of guessing zero. */
+  kittyKeyboardFlags?: number
+  alternateScreen?: boolean
+  terminalOwner?: 'shell'
+}
+
+/** Transient causes the host itself reported: a request reached it and it declined to serialize now. */
+export type RemoteRuntimeSnapshotHostRetryCause =
+  | 'host-pending-output-overflowed'
+  | 'host-no-serializable-buffer'
+
+/** Transient causes decided entirely client-side: no request frame ever reached the host, so it answered nothing. */
+export type RemoteRuntimeSnapshotLocalRetryCause =
+  | 'resync-in-flight'
+  | 'stream-detached'
+  | 'connection-not-ready'
+  | 'request-already-in-flight'
+  | 'request-frame-not-sent'
+
+/** Transient causes: the same request may succeed later, so an absent buffer proves nothing about the pane. */
+export type RemoteRuntimeSnapshotRetryCause =
+  | RemoteRuntimeSnapshotHostRetryCause
+  | RemoteRuntimeSnapshotLocalRetryCause
+
+const HOST_ANSWERED_SNAPSHOT_RETRY_CAUSES = new Set<RemoteRuntimeSnapshotRetryCause>([
+  'host-pending-output-overflowed',
+  'host-no-serializable-buffer'
+])
+
+/** Callers budget host answers separately from local gates; only the former cost the host a request. */
+export function isHostAnsweredSnapshotRetryCause(
+  cause: RemoteRuntimeSnapshotRetryCause
+): cause is RemoteRuntimeSnapshotHostRetryCause {
+  return HOST_ANSWERED_SNAPSHOT_RETRY_CAUSES.has(cause)
+}
+
+/** Final causes: the host answered and repeating this exact request cannot produce the buffer. */
+export type RemoteRuntimeSnapshotPermanentReason = 'exceeds-client-replay-limit'
+
+export type RemoteRuntimeSnapshotAvailability =
+  | { kind: 'snapshot' }
+  | { kind: 'permanently-unavailable'; reason: RemoteRuntimeSnapshotPermanentReason }
+  | { kind: 'retry-worthy'; cause: RemoteRuntimeSnapshotRetryCause }
+  // Why: a pre-`unavailable` host sent an empty reply with no reason; the caller must fall back to its own heuristic.
+  | { kind: 'unknown-legacy-host' }
+
+/**
+ * `availability` is what the reply proves; `snapshot` is the buffer image the host actually sent.
+ * They are orthogonal so legacy callers can keep reading `snapshot` alone while new callers read the reason.
+ */
+export type RemoteRuntimeSnapshotOutcome = {
+  availability: RemoteRuntimeSnapshotAvailability
+  snapshot: RemoteRuntimeSnapshotImage | null
+}
+
+export type RemoteRuntimeMultiplexedTerminal = {
+  streamId: number
+  sendInput: (text: string) => boolean
+  resize: (cols: number, rows: number) => boolean
+  claimViewport: (cols: number, rows: number) => boolean
+  setOutputPaused: (paused: boolean) => boolean
+  serializeBuffer: (opts?: { scrollbackRows?: number }) => Promise<{
+    data: string
+    cols: number
+    rows: number
+    seq?: number
+    source?: 'headless' | 'renderer'
+  } | null>
+  // Why: same request as serializeBuffer, but keeps the host's reason for an absent buffer instead of collapsing it to null.
+  serializeBufferOutcome: (opts?: {
+    scrollbackRows?: number
+  }) => Promise<RemoteRuntimeSnapshotOutcome>
+  close: () => void
+}
+
+export type RemoteRuntimeMultiplexedTerminalState = {
+  streamId: number
+  terminal: string
+  callbacks: RemoteRuntimeMultiplexedTerminalCallbacks
+  subscriptionRequested: boolean
+  acknowledgeOutput: boolean
+  acknowledgeOutputSourceRanges: boolean
+  supportsOutputPause: boolean
+  outputPaused: boolean
+  streamGeneration: string | null
+  sourceAckedEndByte: number
+  heldAckBytes: number
+  pendingAckBytes: number
+  ackFlushTimer: ReturnType<typeof setTimeout> | null
+  snapshotChunks: Uint8Array<ArrayBufferLike>[]
+  snapshotBytes: number
+  snapshotOverflowed: boolean
+  snapshotTarget: 'initial' | 'request' | 'recovery'
+  snapshotInfo: RemoteRuntimeSnapshotInfo | null
+  initialSnapshotReceived: boolean
+  pendingSnapshotRequest: RemoteRuntimeSnapshotRequest | null
+  // Why: Output frames carry a UTF-16 offset high-water `seq`; a jump past the
+  // expected next offset means the server dropped frames under backpressure.
+  // Track it so a gap triggers a self-healing snapshot resync instead of
+  // silently rendering corrupt/missing output (frame-drop resync).
+  expectedSeq: number | undefined
+  // Why: compare command probes when initial/live frames supplied no high-water.
+  commandProbeBaselineSeq: number | undefined
+  recoverySnapshotSeq: number | undefined
+  resyncInFlight: boolean
+  resyncPendingSend: boolean
+  resyncTimer: ReturnType<typeof setTimeout> | null
+  resyncAttempts: number
+  capacityRejected: boolean
+  watchdog: RemoteTerminalStreamWatchdog
+}
+
+export type RemoteRuntimeSnapshotInfo = {
+  cols?: number
+  rows?: number
+  seq?: number
+  source?: 'headless' | 'renderer'
+  kittyKeyboardFlags?: number
+  alternateScreen?: boolean
+  terminalOwner?: 'shell'
+  requestId?: number
+  truncated?: boolean
+  unavailable?: TerminalSnapshotUnavailableReason
+  // Why: a mid-escape tail the emulator could not serialize; the transport
+  // must write it AFTER the replay reset so the next live chunk completes it
+  // instead of rendering literally (#7329).
+  pendingEscapeTailAnsi?: string
+}
+
+export type RemoteRuntimeSnapshotRequest = {
+  requestId: number
+  resolve: (outcome: RemoteRuntimeSnapshotOutcome) => void
+  reject: (error: Error) => void
+  timer: ReturnType<typeof setTimeout>
+}
diff --git a/src/renderer/src/runtime/remote-runtime-terminal-multiplexer.ts b/src/renderer/src/runtime/remote-runtime-terminal-multiplexer.ts
index b02f5b63870..06c2ed4736c 100644
--- a/src/renderer/src/runtime/remote-runtime-terminal-multiplexer.ts
+++ b/src/renderer/src/runtime/remote-runtime-terminal-multiplexer.ts
@@ -1,1503 +1,33 @@
-/* eslint-disable max-lines -- Why: the remote terminal multiplexer owns one bridged subscription, stream lifecycle, binary frame parsing, and remote lock events as a single transport contract. */
-import type { RuntimeRpcResponse } from '../../../shared/runtime-rpc-envelope'
-import { isRecoverableRemoteRuntimeConnectionError } from '../../../shared/remote-runtime-client-error-classification'
 import {
-  TerminalStreamOpcode,
-  decodeTerminalStreamFrame,
-  decodeTerminalStreamJson,
-  decodeTerminalStreamText,
-  encodeTerminalStreamFrame,
-  encodeTerminalStreamJson,
-  encodeTerminalStreamText
-} from '../../../shared/terminal-stream-protocol'
-import {
-  parseTerminalSnapshotUnavailableReason,
-  type TerminalSnapshotUnavailableReason
-} from '../../../shared/terminal-snapshot-unavailability'
-import { parseTerminalKittyKeyboardFlags } from '../../../shared/terminal-kitty-keyboard-flags'
-import { e2eConfig, e2eDisableRemoteTerminalStallRecovery } from '@/lib/e2e-config'
-import { recordRendererCrashBreadcrumb } from '@/lib/crash-breadcrumb-recorder'
-import { deliverTerminalDataWithDeferredCredit } from '@/lib/pane-manager/terminal-delivery-credit'
-import { unwrapRuntimeRpcResult } from './runtime-rpc-client'
+  exposeE2eRemoteTerminalMultiplexAckGate,
+  resetRemoteRuntimeTerminalE2eState
+} from './remote-runtime-terminal-e2e-control'
+import type { RemoteRuntimeTerminalMultiplexerBase } from './remote-runtime-terminal-multiplexer-base'
+import { RemoteRuntimeTerminalMultiplexer } from './remote-runtime-terminal-multiplexer-implementation'
 import { getRuntimeEnvironmentRevision } from './runtime-environment-revision'
-import {
-  TERMINAL_MULTIPLEX_ACK_BATCH_BYTES,
-  TERMINAL_MULTIPLEX_ACK_FLUSH_MS,
-  TERMINAL_MULTIPLEX_STREAM_LIMIT_ERROR
-} from '../../../shared/terminal-multiplex-flow-control'
-import {
-  createRemoteTerminalStreamWatchdog,
-  type RemoteTerminalStreamWatchdog
-} from './remote-terminal-stream-watchdog'
 
-type RuntimeEnvironmentSubscriptionHandle = {
-  unsubscribe: () => void
-  sendBinary: (bytes: Uint8Array<ArrayBufferLike>) => void
-}
-
-type TerminalMultiplexEvent =
-  | { type: 'ready' }
-  | {
-      type: 'subscribed'
-      streamId: number
-      streamGeneration?: string
-      capabilities?: { ackOutputSourceRanges?: 1; outputPause?: 1 }
-    }
-  | { type: 'end'; streamId: number }
-  | { type: 'error'; streamId: number; message?: string }
-  | {
-      type: 'fit-override-changed'
-      streamId: number
-      mode: 'mobile-fit' | 'remote-desktop-fit' | 'desktop-fit'
-      cols: number
-      rows: number
-    }
-  | {
-      type: 'driver-changed'
-      streamId: number
-      driver: { kind: 'idle' } | { kind: 'desktop' } | { kind: 'mobile'; clientId: string }
-    }
-  | { type: string; streamId?: number; [key: string]: unknown }
-
-export type RemoteRuntimeMultiplexedTerminalCallbacks = {
-  onData: (data: string, meta?: { seq?: number; rawLength?: number; transformed?: boolean }) => void
-  onSnapshot: (
-    data: string,
-    meta?: {
-      pendingEscapeTailAnsi?: string
-      seq?: number
-      kittyKeyboardFlags?: number
-      alternateScreen?: boolean
-      terminalOwner?: 'shell'
-    }
-  ) => void
-  onSubscribed?: () => void
-  onOutputPauseCapability?: () => void
-  onEnd?: () => void
-  onError?: (message: string) => void
-  onFitOverrideChanged?: (event: {
-    mode: 'mobile-fit' | 'remote-desktop-fit' | 'desktop-fit'
-    cols: number
-    rows: number
-  }) => void
-  onDriverChanged?: (
-    driver: { kind: 'idle' } | { kind: 'desktop' } | { kind: 'mobile'; clientId: string }
-  ) => void
-  onWriteUnavailable?: () => void
-  onTransportClose?: (event: { recoverable: boolean; retryWithBackoff?: boolean }) => void
-}
-
-export type RemoteRuntimeSnapshotImage = {
-  data: string
-  cols: number
-  rows: number
-  seq?: number
-  source?: 'headless' | 'renderer'
-  pendingEscapeTailAnsi?: string
-  /** Effective kitty flags the HOST proved at this image's own `seq`. Absent
-   *  from any host that predates the field — the pane tracker then stays
-   *  unproven and commits raw text instead of guessing zero. */
-  kittyKeyboardFlags?: number
-  alternateScreen?: boolean
-  terminalOwner?: 'shell'
-}
-
-/** Transient causes the host itself reported: a request reached it and it declined to serialize now. */
-export type RemoteRuntimeSnapshotHostRetryCause =
-  | 'host-pending-output-overflowed'
-  | 'host-no-serializable-buffer'
-
-/** Transient causes decided entirely client-side: no request frame ever reached the host, so it answered nothing. */
-export type RemoteRuntimeSnapshotLocalRetryCause =
-  | 'resync-in-flight'
-  | 'stream-detached'
-  | 'connection-not-ready'
-  | 'request-already-in-flight'
-  | 'request-frame-not-sent'
-
-/** Transient causes: the same request may succeed later, so an absent buffer proves nothing about the pane. */
-export type RemoteRuntimeSnapshotRetryCause =
-  | RemoteRuntimeSnapshotHostRetryCause
-  | RemoteRuntimeSnapshotLocalRetryCause
-
-const HOST_ANSWERED_SNAPSHOT_RETRY_CAUSES = new Set<RemoteRuntimeSnapshotRetryCause>([
-  'host-pending-output-overflowed',
-  'host-no-serializable-buffer'
-])
-
-/** Callers budget host answers separately from local gates; only the former cost the host a request. */
-export function isHostAnsweredSnapshotRetryCause(
-  cause: RemoteRuntimeSnapshotRetryCause
-): cause is RemoteRuntimeSnapshotHostRetryCause {
-  return HOST_ANSWERED_SNAPSHOT_RETRY_CAUSES.has(cause)
-}
-
-/** Final causes: the host answered and repeating this exact request cannot produce the buffer. */
-export type RemoteRuntimeSnapshotPermanentReason = 'exceeds-client-replay-limit'
-
-export type RemoteRuntimeSnapshotAvailability =
-  | { kind: 'snapshot' }
-  | { kind: 'permanently-unavailable'; reason: RemoteRuntimeSnapshotPermanentReason }
-  | { kind: 'retry-worthy'; cause: RemoteRuntimeSnapshotRetryCause }
-  // Why: a pre-`unavailable` host sent an empty reply with no reason; the caller must fall back to its own heuristic.
-  | { kind: 'unknown-legacy-host' }
-
-/**
- * `availability` is what the reply proves; `snapshot` is the buffer image the host actually sent.
- * They are orthogonal so legacy callers can keep reading `snapshot` alone while new callers read the reason.
- */
-export type RemoteRuntimeSnapshotOutcome = {
-  availability: RemoteRuntimeSnapshotAvailability
-  snapshot: RemoteRuntimeSnapshotImage | null
-}
-
-export type RemoteRuntimeMultiplexedTerminal = {
-  streamId: number
-  sendInput: (text: string) => boolean
-  resize: (cols: number, rows: number) => boolean
-  claimViewport: (cols: number, rows: number) => boolean
-  setOutputPaused: (paused: boolean) => boolean
-  serializeBuffer: (opts?: { scrollbackRows?: number }) => Promise<{
-    data: string
-    cols: number
-    rows: number
-    seq?: number
-    source?: 'headless' | 'renderer'
-  } | null>
-  // Why: same request as serializeBuffer, but keeps the host's reason for an absent buffer instead of collapsing it to null.
-  serializeBufferOutcome: (opts?: {
-    scrollbackRows?: number
-  }) => Promise<RemoteRuntimeSnapshotOutcome>
-  close: () => void
-}
-
-type RemoteRuntimeMultiplexedTerminalState = {
-  streamId: number
-  terminal: string
-  callbacks: RemoteRuntimeMultiplexedTerminalCallbacks
-  subscriptionRequested: boolean
-  acknowledgeOutput: boolean
-  acknowledgeOutputSourceRanges: boolean
-  supportsOutputPause: boolean
-  outputPaused: boolean
-  streamGeneration: string | null
-  sourceAckedEndByte: number
-  heldAckBytes: number
-  pendingAckBytes: number
-  ackFlushTimer: ReturnType<typeof setTimeout> | null
-  snapshotChunks: Uint8Array<ArrayBufferLike>[]
-  snapshotBytes: number
-  snapshotOverflowed: boolean
-  snapshotTarget: 'initial' | 'request' | 'recovery'
-  snapshotInfo: RemoteRuntimeSnapshotInfo | null
-  initialSnapshotReceived: boolean
-  pendingSnapshotRequest: RemoteRuntimeSnapshotRequest | null
-  // Why: Output frames carry a UTF-16 offset high-water `seq`; a jump past the
-  // expected next offset means the server dropped frames under backpressure.
-  // Track it so a gap triggers a self-healing snapshot resync instead of
-  // silently rendering corrupt/missing output (frame-drop resync).
-  expectedSeq: number | undefined
-  // Why: compare command probes when initial/live frames supplied no high-water.
-  commandProbeBaselineSeq: number | undefined
-  recoverySnapshotSeq: number | undefined
-  resyncInFlight: boolean
-  resyncPendingSend: boolean
-  resyncTimer: ReturnType<typeof setTimeout> | null
-  resyncAttempts: number
-  capacityRejected: boolean
-  watchdog: RemoteTerminalStreamWatchdog
-}
-
-type RemoteRuntimeSnapshotInfo = {
-  cols?: number
-  rows?: number
-  seq?: number
-  source?: 'headless' | 'renderer'
-  kittyKeyboardFlags?: number
-  alternateScreen?: boolean
-  terminalOwner?: 'shell'
-  requestId?: number
-  truncated?: boolean
-  unavailable?: TerminalSnapshotUnavailableReason
-  // Why: a mid-escape tail the emulator could not serialize; the transport
-  // must write it AFTER the replay reset so the next live chunk completes it
-  // instead of rendering literally (#7329).
-  pendingEscapeTailAnsi?: string
-}
-
-type RemoteRuntimeSnapshotRequest = {
-  requestId: number
-  resolve: (outcome: RemoteRuntimeSnapshotOutcome) => void
-  reject: (error: Error) => void
-  timer: ReturnType<typeof setTimeout>
-}
-
-const CONTROL_STREAM_ID = 0
-const MAX_REMOTE_TERMINAL_SNAPSHOT_BYTES = 2 * 1024 * 1024
-export const REMOTE_TERMINAL_SNAPSHOT_REQUEST_TIMEOUT_MS = 10_000
-const REMOTE_TERMINAL_RESYNC_TIMEOUT_MS = 10_000
-// Why: a truncated recovery means the server is too flooded to serialize;
-// retrying once per incoming chunk would stampede it, so back off instead.
-const REMOTE_TERMINAL_RESYNC_RETRY_BASE_MS = 500
-const REMOTE_TERMINAL_RESYNC_RETRY_MAX_MS = 5_000
-// Why: exported so the transport can classify it as benign — the snapshot was
-// skipped but live output continues, so it must not surface a fatal red banner.
-export const REMOTE_TERMINAL_SNAPSHOT_TOO_LARGE =
-  'Remote terminal snapshot exceeded the 2 MiB replay limit; live output will continue.'
-
-type E2eRemoteTerminalMultiplexAckGateSnapshot = {
-  activeStreams: { environmentId: string; streamId: number; terminal: string }[]
-  droppedOutputBytes: number
-  droppedOutputFrames: number
-  heldTerminalCount: number
-  heldStreamCount: number
-  heldAckChars: number
-  releasedAckChars: number
-  streamSubscribeCount: number
-  streamUnsubscribeCount: number
-  transportSubscribeCount: number
-  transportUnsubscribeCount: number
-}
-
-type E2eRemoteTerminalMultiplexAckGateApi = {
-  dropOutputUntilResubscribe: (terminals: string[]) => number
-  forceError: (terminals: string[], message: string) => number
-  hold: (terminals: string[]) => void
-  holdEnd: (terminals: string[]) => void
-  release: () => void
-  sendInput: (terminal: string, text: string) => number
-  snapshot: () => E2eRemoteTerminalMultiplexAckGateSnapshot
-}
-
-type E2eRemoteTerminalMultiplexAckGateWindow = Window & {
-  __remoteTerminalMultiplexAckGate?: E2eRemoteTerminalMultiplexAckGateApi
-}
-
-const e2eHeldRemoteAckTerminals = new Set<string>()
-const e2eHeldRemoteEndTerminals = new Set<string>()
-const e2eDroppedOutputStreams = new Set<RemoteRuntimeMultiplexedTerminalState>()
-let e2eDroppedOutputBytes = 0
-let e2eDroppedOutputFrames = 0
-let e2eReleasedRemoteAckChars = 0
-let e2eStreamSubscribeCount = 0
-let e2eStreamUnsubscribeCount = 0
-let e2eTransportSubscribeCount = 0
-let e2eTransportUnsubscribeCount = 0
-
-function shouldHoldE2eRemoteTerminalAck(terminal: string): boolean {
-  return e2eConfig.exposeStore && e2eHeldRemoteAckTerminals.has(terminal)
-}
-
-function getE2eRemoteAckSnapshot(): E2eRemoteTerminalMultiplexAckGateSnapshot {
-  const activeStreams: E2eRemoteTerminalMultiplexAckGateSnapshot['activeStreams'] = []
-  let heldStreamCount = 0
-  let heldAckChars = 0
-  for (const [environmentId, multiplexer] of multiplexers) {
-    for (const stream of multiplexer.getStreamsForE2e()) {
-      activeStreams.push({ environmentId, streamId: stream.streamId, terminal: stream.terminal })
-      if (stream.heldAckBytes > 0) {
-        heldStreamCount += 1
-        heldAckChars += stream.heldAckBytes
-      }
-    }
-  }
-  return {
-    activeStreams,
-    droppedOutputBytes: e2eDroppedOutputBytes,
-    droppedOutputFrames: e2eDroppedOutputFrames,
-    heldTerminalCount: e2eHeldRemoteAckTerminals.size,
-    heldStreamCount,
-    heldAckChars,
-    releasedAckChars: e2eReleasedRemoteAckChars,
-    streamSubscribeCount: e2eStreamSubscribeCount,
-    streamUnsubscribeCount: e2eStreamUnsubscribeCount,
-    transportSubscribeCount: e2eTransportSubscribeCount,
-    transportUnsubscribeCount: e2eTransportUnsubscribeCount
-  }
-}
-
-function unsubscribeRuntimeEnvironmentForE2e(
-  subscription: RuntimeEnvironmentSubscriptionHandle
-): void {
-  if (e2eConfig.exposeStore) {
-    e2eTransportUnsubscribeCount += 1
-  }
-  subscription.unsubscribe()
-}
-
-function releaseE2eRemoteTerminalAcks(): void {
-  for (const multiplexer of multiplexers.values()) {
-    e2eReleasedRemoteAckChars += multiplexer.releaseHeldAcksForE2e()
-  }
-  e2eHeldRemoteAckTerminals.clear()
-}
-
-function resetE2eDroppedRemoteOutput(): void {
-  e2eDroppedOutputStreams.clear()
-  e2eDroppedOutputBytes = 0
-  e2eDroppedOutputFrames = 0
-}
-
-function shouldDropE2eRemoteTerminalOutput(
-  stream: RemoteRuntimeMultiplexedTerminalState,
-  bytes: number
-): boolean {
-  if (!e2eConfig.exposeStore || !e2eDroppedOutputStreams.has(stream)) {
-    return false
-  }
-  e2eDroppedOutputBytes += bytes
-  e2eDroppedOutputFrames += 1
-  return true
-}
-
-function exposeE2eRemoteTerminalMultiplexAckGate(): void {
-  if (!e2eConfig.exposeStore || typeof window === 'undefined') {
-    return
-  }
-  const target = window as E2eRemoteTerminalMultiplexAckGateWindow
-  target.__remoteTerminalMultiplexAckGate ??= {
-    dropOutputUntilResubscribe: (terminals) => {
-      resetE2eDroppedRemoteOutput()
-      const targets = new Set(terminals)
-      for (const multiplexer of multiplexers.values()) {
-        for (const stream of multiplexer.getStreamsForE2e()) {
-          if (targets.has(stream.terminal)) {
-            e2eDroppedOutputStreams.add(stream)
-          }
-        }
-      }
-      return e2eDroppedOutputStreams.size
-    },
-    forceError: (terminals, message) => {
-      let dispatched = 0
-      const targets = new Set(terminals)
-      for (const multiplexer of multiplexers.values()) {
-        dispatched += multiplexer.forceErrorForE2e(targets, message)
-      }
-      return dispatched
-    },
-    hold: (terminals) => {
-      releaseE2eRemoteTerminalAcks()
-      for (const terminal of terminals) {
-        e2eHeldRemoteAckTerminals.add(terminal)
-      }
-    },
-    holdEnd: (terminals) => {
-      e2eHeldRemoteEndTerminals.clear()
-      for (const terminal of terminals) {
-        e2eHeldRemoteEndTerminals.add(terminal)
-      }
-    },
-    release: () => {
-      releaseE2eRemoteTerminalAcks()
-      resetE2eDroppedRemoteOutput()
-      e2eHeldRemoteEndTerminals.clear()
-    },
-    sendInput: (terminal, value) => {
-      let sent = 0
-      for (const multiplexer of multiplexers.values()) {
-        sent += multiplexer.sendInputForE2e(terminal, value)
-      }
-      return sent
-    },
-    snapshot: getE2eRemoteAckSnapshot
-  }
-}
-
-class RemoteRuntimeTerminalMultiplexer {
-  private readonly streams = new Map<number, RemoteRuntimeMultiplexedTerminalState>()
-  private subscription: RuntimeEnvironmentSubscriptionHandle | null = null
-  private connectPromise: Promise<void> | null = null
-  private readyResolver: (() => void) | null = null
-  private readyRejecter: ((error: Error) => void) | null = null
-  private ready = false
-  private nextStreamId = 1
-  private nextSnapshotRequestId = 1
-
-  constructor(
-    private readonly environmentId: string,
-    private readonly environmentRevision: number | undefined,
-    private readonly releaseIfCurrent: (
-      environmentId: string,
-      multiplexer: RemoteRuntimeTerminalMultiplexer
-    ) => void
-  ) {}
-
-  matchesCurrentEnvironmentRevision(): boolean {
-    return getRuntimeEnvironmentRevision(this.environmentId) === this.environmentRevision
-  }
-
-  closeForEnvironmentReplacement(): void {
-    this.handleClose('Runtime environment pairing changed.')
-  }
-
-  async subscribeTerminal(args: {
-    terminal: string
-    client: { id: string; type: 'desktop' | 'mobile' }
-    viewport?: { cols: number; rows: number }
-    callbacks: RemoteRuntimeMultiplexedTerminalCallbacks
-  }): Promise<RemoteRuntimeMultiplexedTerminal> {
-    const streamId = this.allocateStreamId()
-    const state: RemoteRuntimeMultiplexedTerminalState = {
-      streamId,
-      terminal: args.terminal,
-      callbacks: args.callbacks,
-      subscriptionRequested: false,
-      acknowledgeOutput: true,
-      acknowledgeOutputSourceRanges: false,
-      supportsOutputPause: false,
-      outputPaused: false,
-      streamGeneration: null,
-      sourceAckedEndByte: 0,
-      heldAckBytes: 0,
-      pendingAckBytes: 0,
-      ackFlushTimer: null,
-      snapshotChunks: [],
-      snapshotBytes: 0,
-      snapshotOverflowed: false,
-      snapshotTarget: 'initial',
-      snapshotInfo: null,
-      initialSnapshotReceived: false,
-      pendingSnapshotRequest: null,
-      expectedSeq: undefined,
-      commandProbeBaselineSeq: undefined,
-      recoverySnapshotSeq: undefined,
-      resyncInFlight: false,
-      resyncPendingSend: false,
-      resyncTimer: null,
-      resyncAttempts: 0,
-      capacityRejected: false,
-      watchdog: createRemoteTerminalStreamWatchdog((stall) => {
-        if (e2eDisableRemoteTerminalStallRecovery) {
-          state.watchdog.completeCommandResponseProbe()
-          return
-        }
-        recordRendererCrashBreadcrumb('remote_terminal_stream_stall_recovery', {
-          environmentId: this.environmentId,
-          expectedSeq: state.expectedSeq ?? null,
-          inactiveForMs: stall.inactiveForMs,
-          outstandingDeliveryBytes: stall.outstandingDeliveryBytes,
-          pendingAckBytes: state.pendingAckBytes,
-          reason: stall.reason,
-          resyncAttempts: state.resyncAttempts,
-          snapshotPending: state.pendingSnapshotRequest !== null,
-          streamId: state.streamId,
-          terminal: state.terminal
-        })
-        if (stall.reason === 'command-response-timeout') {
-          this.probeCommandResponse(state)
-        } else {
-          this.recoverStalledStream(state)
-        }
-      })
-    }
-    this.streams.set(streamId, state)
-
-    const stream: RemoteRuntimeMultiplexedTerminal = {
-      streamId,
-      sendInput: (text) => this.isRegisteredStream(state) && this.sendInput(state, text),
-      resize: (cols, rows) =>
-        this.isRegisteredStream(state) &&
-        this.sendFrame(
-          streamId,
-          TerminalStreamOpcode.Resize,
-          encodeTerminalStreamJson({ cols, rows })
-        ),
-      claimViewport: (cols, rows) => {
-        if (!this.isRegisteredStream(state)) {
-          return false
-        }
-        const claimed = this.sendFrame(
-          streamId,
-          TerminalStreamOpcode.ClaimViewport,
-          encodeTerminalStreamJson({ cols, rows })
-        )
-        // Why: older runtimes ignore the claim opcode but still understand
-        // Resize. Claim first keeps new-runtime ownership precise and leaves a
-        // backwards-compatible resize immediately behind it.
-        const resized = this.sendFrame(
-          streamId,
-          TerminalStreamOpcode.Resize,
-          encodeTerminalStreamJson({ cols, rows })
-        )
-        return claimed && resized
-      },
-      setOutputPaused: (paused) => this.setOutputPaused(state, paused),
-      serializeBuffer: (opts) => this.requestSnapshot(state, opts),
-      serializeBufferOutcome: (opts) => this.requestSnapshotOutcome(state, opts),
-      close: () => {
-        if (this.streams.get(streamId) === state) {
-          discardOutputAcknowledgements(state)
-          state.watchdog.dispose()
-          this.sendFrame(streamId, TerminalStreamOpcode.Unsubscribe)
-          clearResyncTimer(state)
-          rejectPendingSnapshotRequest(state, 'Remote terminal stream closed.')
-          this.streams.delete(streamId)
-          this.closeIfIdle()
-        }
-      }
-    }
-
-    try {
-      await this.ensureConnected()
-      if (this.streams.get(streamId) !== state) {
-        return stream
-      }
-      const sent = this.sendFrame(
-        CONTROL_STREAM_ID,
-        TerminalStreamOpcode.Subscribe,
-        encodeTerminalStreamJson({
-          streamId,
-          terminal: args.terminal,
-          client: args.client,
-          viewport: args.viewport,
-          capabilities: {
-            ackOutput: 1,
-            ackOutputSourceRanges: 1,
-            outputPause: 1,
-            writeUnavailable: 1,
-            ...(args.client.type === 'desktop' ? { desktopViewportClaims: 1 } : {})
-          }
-        })
-      )
-      if (!sent) {
-        throw new Error('Remote terminal stream is not connected.')
-      }
-      state.subscriptionRequested = true
-    } catch (error) {
-      const terminalError = error instanceof Error ? error : new Error(String(error))
-      if (this.streams.get(streamId) === state) {
-        this.streams.delete(streamId)
-        this.closeIfIdle()
-      }
-      throw terminalError
-    }
-
-    return stream
-  }
-
-  private allocateStreamId(): number {
-    const start = this.nextStreamId
-    do {
-      const candidate = this.nextStreamId
-      this.nextStreamId = this.nextStreamId >= 0x7fffffff ? 1 : this.nextStreamId + 1
-      if (!this.streams.has(candidate)) {
-        return candidate
-      }
-    } while (this.nextStreamId !== start)
-    throw new Error('No remote terminal stream ids available.')
-  }
-
-  private ensureConnected(): Promise<void> {
-    if (this.ready && this.subscription) {
-      return Promise.resolve()
-    }
-    if (this.connectPromise) {
-      return this.connectPromise
-    }
-    const connectPromise = new Promise<void>((resolve, reject) => {
-      this.readyResolver = resolve
-      this.readyRejecter = reject
-      if (e2eConfig.exposeStore) {
-        e2eTransportSubscribeCount += 1
-      }
-      void window.api.runtimeEnvironments
-        .subscribe(
-          {
-            selector: this.environmentId,
-            method: 'terminal.multiplex',
-            params: {},
-            timeoutMs: 15_000,
-            expectedEnvironmentPairingRevision: this.environmentRevision
-          },
-          {
-            onResponse: (response) => this.handleResponse(response),
-            onBinary: (bytes) => this.handleBinary(bytes),
-            onError: (error) => {
-              if (isRecoverableRemoteRuntimeConnectionError(error)) {
-                this.handleClose(error.message)
-              } else {
-                this.failConnection(Object.assign(new Error(error.message), { code: error.code }))
-              }
-            },
-            onClose: () => this.handleClose('Remote Orca runtime closed the connection.')
-          }
-        )
-        .then((subscription) => {
-          if (this.connectPromise !== connectPromise || (!this.ready && !this.readyRejecter)) {
-            // Why: close/error can arrive before subscribe() resolves because
-            // preload listens before ipcMain.handle() returns. The multiplexer
-            // may already be released; do not retain the late handle.
-            unsubscribeRuntimeEnvironmentForE2e(subscription)
-            return
-          }
-          this.subscription = subscription
-          this.resolveReadyIfConnected()
-        })
-        .catch((error) => {
-          if (this.connectPromise === connectPromise) {
-            this.connectPromise = null
-            this.readyResolver = null
-            this.readyRejecter = null
-          }
-          reject(error instanceof Error ? error : new Error(String(error)))
-        })
-    })
-    this.connectPromise = connectPromise
-    return this.connectPromise
-  }
-
-  private handleResponse(response: RuntimeRpcResponse<unknown>): void {
-    if (!this.matchesCurrentEnvironmentRevision()) {
-      this.closeForEnvironmentReplacement()
-      return
-    }
-    let event: TerminalMultiplexEvent
-    try {
-      event = unwrapRuntimeRpcResult(response) as TerminalMultiplexEvent
-    } catch (error) {
-      this.failConnection(error instanceof Error ? error : new Error(String(error)))
-      return
-    }
-
-    if (event.type === 'ready') {
-      this.ready = true
-      this.resolveReadyIfConnected()
-      return
-    }
-
-    if (!('streamId' in event) || typeof event.streamId !== 'number') {
-      return
-    }
-    const stream = this.streams.get(event.streamId)
-    if (!stream) {
-      return
-    }
-    stream.watchdog.recordInbound()
-    if (
-      event.type === 'end' &&
-      e2eConfig.exposeStore &&
-      e2eHeldRemoteEndTerminals.has(stream.terminal)
-    ) {
-      return
-    }
-    if (event.type === 'subscribed') {
-      const capabilities =
-        typeof event.capabilities === 'object' && event.capabilities !== null
-          ? (event.capabilities as { ackOutputSourceRanges?: unknown; outputPause?: unknown })
-          : null
-      if (
-        capabilities?.ackOutputSourceRanges === 1 &&
-        typeof event.streamGeneration === 'string' &&
-        event.streamGeneration.length > 0
-      ) {
-        stream.acknowledgeOutputSourceRanges = true
-        stream.streamGeneration = event.streamGeneration
-      }
-      stream.supportsOutputPause = capabilities?.outputPause === 1
-      if (stream.supportsOutputPause) {
-        stream.callbacks.onOutputPauseCapability?.()
-      }
-    } else if (event.type === 'end') {
-      discardOutputAcknowledgements(stream)
-      stream.watchdog.dispose()
-      clearSnapshot(stream)
-      clearResyncTimer(stream)
-      rejectPendingSnapshotRequest(stream, 'Remote terminal stream ended.')
-      this.streams.delete(event.streamId)
-      if (stream.capacityRejected) {
-        if (stream.callbacks.onTransportClose) {
-          stream.callbacks.onTransportClose({ recoverable: true, retryWithBackoff: true })
-        } else {
-          stream.callbacks.onError?.(TERMINAL_MULTIPLEX_STREAM_LIMIT_ERROR)
-        }
-      } else {
-        stream.callbacks.onEnd?.()
-      }
-      this.closeIfIdle()
-    } else if (event.type === 'error') {
-      const message =
-        typeof event.message === 'string' ? event.message : 'Remote terminal stream failed.'
-      if (message === TERMINAL_MULTIPLEX_STREAM_LIMIT_ERROR) {
-        stream.capacityRejected = true
-        return
-      }
-      clearSnapshot(stream)
-      rejectPendingSnapshotRequest(stream, message)
-      // Why: the paired binary Error frame can be dropped under backpressure;
-      // this reliable event must also dispatch or release the resync gate, and
-      // must never disarm the watchdog while leaving the gate shut.
-      if (stream.resyncPendingSend) {
-        this.sendDeferredResyncSnapshot(stream)
-      } else {
-        clearResyncTimer(stream)
-        stream.resyncInFlight = false
-      }
-      stream.callbacks.onError?.(message)
-    } else if (event.type === 'fit-override-changed') {
-      if (
-        (event.mode !== 'mobile-fit' &&
-          event.mode !== 'remote-desktop-fit' &&
-          event.mode !== 'desktop-fit') ||
-        typeof event.cols !== 'number' ||
-        typeof event.rows !== 'number'
-      ) {
-        return
-      }
-      stream.callbacks.onFitOverrideChanged?.({
-        mode: event.mode,
-        cols: event.cols,
-        rows: event.rows
-      })
-    } else if (event.type === 'driver-changed') {
-      if (!isTerminalDriverState(event.driver)) {
-        return
-      }
-      stream.callbacks.onDriverChanged?.(event.driver)
-    }
-  }
-
-  private handleBinary(bytes: Uint8Array<ArrayBufferLike>): void {
-    if (!this.matchesCurrentEnvironmentRevision()) {
-      this.closeForEnvironmentReplacement()
-      return
-    }
-    const frame = decodeTerminalStreamFrame(bytes)
-    if (!frame) {
-      // Why: malformed framing cannot be credited safely; closing makes the server release every stream window.
-      this.failConnection(new Error('Remote terminal stream received a malformed frame.'))
-      return
-    }
-    const stream = this.streams.get(frame.streamId)
-    if (!stream) {
-      if (
-        frame.opcode === TerminalStreamOpcode.Output ||
-        frame.opcode === TerminalStreamOpcode.OutputSpan
-      ) {
-        // Why: the renderer already disposed this stream; unsubscribe releases server credit that cannot reach a parser.
-        this.sendFrame(frame.streamId, TerminalStreamOpcode.Unsubscribe)
-      }
-      return
-    }
-    if (
-      (frame.opcode === TerminalStreamOpcode.Output ||
-        frame.opcode === TerminalStreamOpcode.OutputSpan) &&
-      shouldDropE2eRemoteTerminalOutput(stream, frame.payload.byteLength)
-    ) {
-      this.queueOutputAcknowledgement(stream, frame.payload.byteLength)
-      return
-    }
-    stream.watchdog.recordInbound()
-    if (frame.opcode === TerminalStreamOpcode.WriteUnavailable) {
-      stream.callbacks.onWriteUnavailable?.()
-      return
-    }
-    if (
-      frame.opcode === TerminalStreamOpcode.Output ||
-      frame.opcode === TerminalStreamOpcode.OutputSpan
-    ) {
-      const span =
-        frame.opcode === TerminalStreamOpcode.OutputSpan
-          ? decodeTerminalStreamJson<{
-              data?: unknown
-              rawLength?: unknown
-              transformed?: unknown
-            }>(frame.payload)
-          : null
-      const validSpan =
-        frame.opcode !== TerminalStreamOpcode.OutputSpan ||
-        (typeof span?.data === 'string' &&
-          typeof span.rawLength === 'number' &&
-          Number.isSafeInteger(span.rawLength) &&
-          span.rawLength >= 0 &&
-          span.transformed === true)
-      const data =
-        frame.opcode === TerminalStreamOpcode.OutputSpan
-          ? validSpan
-            ? (span!.data as string)
-            : ''
-          : decodeTerminalStreamText(frame.payload)
-      const deliverOutput = (): void => {
-        if (!validSpan) {
-          // Why: rendering malformed span JSON would expose protocol framing
-          // as terminal text and lose its raw sequence accounting.
-          this.requestResyncSnapshot(stream)
-          return
-        }
-        const rawLength =
-          frame.opcode === TerminalStreamOpcode.OutputSpan && typeof span?.rawLength === 'number'
-            ? span.rawLength
-            : data.length
-        // Why: a resync snapshot is authoritative; discard live output while
-        // it is in flight, but still return transport credit in finally.
-        if (stream.resyncInFlight) {
-          return
-        }
-        const seq = typeof frame.seq === 'number' && frame.seq > 0 ? frame.seq : undefined
-        // Why: older servers replay snapshot-covered buffered chunks after a
-        // requested recovery; rendering them would duplicate the recovered tail.
-        if (
-          typeof seq === 'number' &&
-          typeof stream.recoverySnapshotSeq === 'number' &&
-          seq <= stream.recoverySnapshotSeq
-        ) {
-          return
-        }
-        if (this.detectOutputGap(stream, seq, rawLength)) {
-          this.requestResyncSnapshot(stream)
-          return
-        }
-        if (typeof seq === 'number') {
-          stream.expectedSeq = seq
-          stream.commandProbeBaselineSeq = undefined
-        }
-        stream.callbacks.onData(data, {
-          seq,
-          rawLength,
-          ...(frame.opcode === TerminalStreamOpcode.OutputSpan ? { transformed: true } : {})
-        })
-      }
-      if (!stream.acknowledgeOutput) {
-        deliverOutput()
-        return
-      }
-      try {
-        const settleWatchdog = stream.watchdog.beginOutputDelivery(frame.payload.byteLength)
-        deliverTerminalDataWithDeferredCredit(() => {
-          settleWatchdog()
-          if (shouldHoldE2eRemoteTerminalAck(stream.terminal)) {
-            stream.heldAckBytes += frame.payload.byteLength
-          } else {
-            this.queueOutputAcknowledgement(stream, frame.payload.byteLength)
-          }
-        }, deliverOutput)
-      } catch (error) {
-        this.failConnection(
-          error instanceof Error ? error : new Error('Remote terminal output delivery failed.')
-        )
-      }
-      return
-    }
-    if (frame.opcode === TerminalStreamOpcode.SnapshotStart) {
-      clearSnapshot(stream)
-      stream.snapshotInfo = decodeSnapshotInfo(frame.payload)
-      const requestId = stream.snapshotInfo?.requestId
-      stream.snapshotTarget =
-        typeof requestId === 'number' ||
-        (stream.initialSnapshotReceived && stream.pendingSnapshotRequest)
-          ? 'request'
-          : stream.initialSnapshotReceived
-            ? 'recovery'
-            : 'initial'
-      return
-    }
-    if (frame.opcode === TerminalStreamOpcode.SnapshotChunk) {
-      if (stream.snapshotOverflowed) {
-        return
-      }
-      stream.snapshotBytes += frame.payload.byteLength
-      if (stream.snapshotBytes > MAX_REMOTE_TERMINAL_SNAPSHOT_BYTES) {
-        stream.snapshotOverflowed = true
-        if (stream.snapshotTarget === 'initial') {
-          stream.callbacks.onError?.(REMOTE_TERMINAL_SNAPSHOT_TOO_LARGE)
-        }
-        return
-      }
-      stream.snapshotChunks.push(frame.payload)
-      return
-    }
-    if (frame.opcode === TerminalStreamOpcode.SnapshotEnd) {
-      const data = stream.snapshotOverflowed
-        ? null
-        : decodeTerminalStreamText(concatBytes(stream.snapshotChunks))
-      const target = stream.snapshotTarget
-      const info = stream.snapshotInfo
-      const pendingRequest = stream.pendingSnapshotRequest
-      const snapshotApplied = !stream.snapshotOverflowed && info?.truncated !== true
-      const matchesPendingRequest =
-        target === 'request' &&
-        pendingRequest &&
-        (typeof info?.requestId === 'number'
-          ? info.requestId === pendingRequest.requestId
-          : stream.initialSnapshotReceived)
-      if (snapshotApplied) {
-        if (matchesPendingRequest) {
-          pendingRequest.resolve({
-            availability: classifySnapshotAvailability(stream.snapshotOverflowed, info),
-            snapshot: {
-              data: data ?? '',
-              cols: info?.cols ?? 80,
-              rows: info?.rows ?? 24,
-              seq: info?.seq,
-              source: info?.source,
-              kittyKeyboardFlags: info?.kittyKeyboardFlags,
-              alternateScreen: info?.alternateScreen,
-              terminalOwner: info?.terminalOwner,
-              pendingEscapeTailAnsi: info?.pendingEscapeTailAnsi
-            }
-          })
-          clearPendingSnapshotRequest(stream)
-        } else if (target === 'initial') {
-          stream.callbacks.onSnapshot(data ?? '', {
-            pendingEscapeTailAnsi: info?.pendingEscapeTailAnsi,
-            seq: info?.seq,
-            kittyKeyboardFlags: info?.kittyKeyboardFlags,
-            alternateScreen: info?.alternateScreen,
-            terminalOwner: info?.terminalOwner
-          })
-        } else if (target === 'recovery') {
-          // Why: a server-pushed recovery snapshot replaces terminal state
-          // mid-session; clear the screen and scrollback before applying it.
-          // An empty snapshot is still applied so stale dropped output does
-          // not linger on a terminal the model says is blank.
-          stream.callbacks.onSnapshot(`\x1b[2J\x1b[3J\x1b[H${data ?? ''}`, {
-            pendingEscapeTailAnsi: info?.pendingEscapeTailAnsi,
-            seq: info?.seq,
-            kittyKeyboardFlags: info?.kittyKeyboardFlags,
-            alternateScreen: info?.alternateScreen,
-            terminalOwner: info?.terminalOwner
-          })
-        }
-      } else if (matchesPendingRequest) {
-        pendingRequest.resolve({
-          availability: classifySnapshotAvailability(stream.snapshotOverflowed, info),
-          snapshot: null
-        })
-        clearPendingSnapshotRequest(stream)
-      }
-      clearSnapshot(stream)
-      if (target === 'initial') {
-        clearResyncTimer(stream)
-        stream.expectedSeq = typeof info?.seq === 'number' ? info.seq : undefined
-        stream.commandProbeBaselineSeq = undefined
-        stream.resyncInFlight = false
-        stream.resyncPendingSend = false
-        stream.initialSnapshotReceived = true
-        stream.callbacks.onSubscribed?.()
-      } else if (target === 'recovery') {
-        // Why: only an applied recovery is authoritative; retaining the prior
-        // high-water after a discarded snapshot keeps the gap detectable.
-        if (snapshotApplied) {
-          clearResyncTimer(stream)
-          stream.expectedSeq = typeof info?.seq === 'number' ? info.seq : undefined
-          stream.commandProbeBaselineSeq = undefined
-          stream.recoverySnapshotSeq = typeof info?.seq === 'number' ? info.seq : undefined
-          stream.resyncAttempts = 0
-          stream.resyncInFlight = false
-          stream.resyncPendingSend = false
-        } else if (stream.resyncInFlight) {
-          this.scheduleResyncRetry(stream)
-        } else {
-          // Why: a discarded server-pushed recovery leaves dropped output
-          // unrepresented; pull a fresh snapshot now instead of waiting for
-          // the next chunk to expose the gap.
-          this.requestResyncSnapshot(stream)
-        }
-      } else {
-        this.sendDeferredResyncSnapshot(stream)
-      }
-      return
-    }
-    if (frame.opcode === TerminalStreamOpcode.Error) {
-      const message = decodeTerminalStreamText(frame.payload)
-      if (message === TERMINAL_MULTIPLEX_STREAM_LIMIT_ERROR) {
-        stream.capacityRejected = true
-        return
-      }
-      clearSnapshot(stream)
-      const pendingSnapshotRequest = stream.pendingSnapshotRequest
-      if (pendingSnapshotRequest) {
-        clearPendingSnapshotRequest(stream)
-        pendingSnapshotRequest.reject(new Error(message))
-        this.sendDeferredResyncSnapshot(stream)
-        return
-      }
-      // Why: a failed resync must re-open the live path or output stalls forever.
-      clearResyncTimer(stream)
-      stream.resyncInFlight = false
-      stream.resyncPendingSend = false
-      stream.callbacks.onError?.(message)
-    }
-  }
-
-  // Why: Output `seq` is the UTF-16 high-water at the end of a chunk, so a chunk
-  // that begins after the last high-water (startSeq > expectedSeq) means the
-  // server dropped intervening frames under backpressure. Only flag a gap when
-  // both offsets are known, and never on the first seq (nothing to compare to).
-  private detectOutputGap(
-    stream: RemoteRuntimeMultiplexedTerminalState,
-    seq: number | undefined,
-    rawLength: number
-  ): boolean {
-    if (typeof seq !== 'number' || typeof stream.expectedSeq !== 'number') {
-      return false
-    }
-    const startSeq = seq - rawLength
-    return startSeq > stream.expectedSeq
-  }
-
-  // Why: on a detected gap, discard the corrupt tail and pull a fresh
-  // authoritative snapshot. The request carries no requestId so the server
-  // reply renders through the initial-snapshot path (full reset), self-healing
-  // without surfacing an error to the user.
-  private requestResyncSnapshot(stream: RemoteRuntimeMultiplexedTerminalState): void {
-    if (stream.resyncInFlight) {
-      return
-    }
-    stream.resyncInFlight = true
-    if (stream.pendingSnapshotRequest) {
-      // Why: snapshot frame groups are not multiplexed; wait for the manual
-      // snapshot to finish so its response cannot be mistaken for recovery.
-      // Arm the watchdog now so a dispatch path that consumes the pending
-      // request without re-dispatching cannot hold the gate shut forever.
-      stream.resyncPendingSend = true
-      this.startResyncTimer(stream)
-      return
-    }
-    this.sendResyncSnapshot(stream)
-  }
-
-  private sendDeferredResyncSnapshot(stream: RemoteRuntimeMultiplexedTerminalState): void {
-    if (!stream.resyncInFlight || !stream.resyncPendingSend || stream.pendingSnapshotRequest) {
-      return
-    }
-    this.sendResyncSnapshot(stream)
-  }
-
-  private sendResyncSnapshot(stream: RemoteRuntimeMultiplexedTerminalState): void {
-    stream.resyncPendingSend = false
-    this.startResyncTimer(stream)
-    const sent = this.sendFrame(
-      stream.streamId,
-      TerminalStreamOpcode.SnapshotRequest,
-      encodeTerminalStreamJson({ scrollbackRows: undefined })
-    )
-    if (!sent) {
-      // Transport is down; the reconnect path re-subscribes from scratch.
-      clearResyncTimer(stream)
-      stream.resyncInFlight = false
-    }
-  }
-
-  // Why: keep the gate shut across the backoff — the post-gap tail is corrupt
-  // either way — and heal even if the flood ends with no further output.
-  private scheduleResyncRetry(stream: RemoteRuntimeMultiplexedTerminalState): void {
-    stream.resyncAttempts += 1
-    const delay = Math.min(
-      REMOTE_TERMINAL_RESYNC_RETRY_MAX_MS,
-      REMOTE_TERMINAL_RESYNC_RETRY_BASE_MS * 2 ** Math.min(stream.resyncAttempts - 1, 4)
-    )
-    clearResyncTimer(stream)
-    const timer = setTimeout(() => {
-      if (
-        stream.resyncTimer !== timer ||
-        this.streams.get(stream.streamId) !== stream ||
-        !stream.resyncInFlight
-      ) {
-        return
-      }
-      stream.resyncTimer = null
-      if (stream.pendingSnapshotRequest) {
-        stream.resyncPendingSend = true
-        this.startResyncTimer(stream)
-        return
-      }
-      this.sendResyncSnapshot(stream)
-    }, delay)
-    if (typeof timer.unref === 'function') {
-      timer.unref()
-    }
-    stream.resyncTimer = timer
-  }
-
-  private startResyncTimer(stream: RemoteRuntimeMultiplexedTerminalState): void {
-    clearResyncTimer(stream)
-    const timer = setTimeout(() => {
-      if (
-        stream.resyncTimer !== timer ||
-        this.streams.get(stream.streamId) !== stream ||
-        !stream.resyncInFlight
-      ) {
-        return
-      }
-      stream.resyncTimer = null
-      stream.resyncInFlight = false
-      stream.resyncPendingSend = false
-    }, REMOTE_TERMINAL_RESYNC_TIMEOUT_MS)
-    if (typeof timer.unref === 'function') {
-      timer.unref()
-    }
-    stream.resyncTimer = timer
-  }
-
-  private async requestSnapshot(
-    stream: RemoteRuntimeMultiplexedTerminalState,
-    opts?: { scrollbackRows?: number }
-  ): Promise<{
-    data: string
-    cols: number
-    rows: number
-    seq?: number
-    source?: 'headless' | 'renderer'
-  } | null> {
-    const outcome = await this.requestSnapshotOutcome(stream, opts)
-    // Why: the concurrent-request guard used to reject before the outcome existed; keep that contract for legacy callers.
-    if (
-      outcome.availability.kind === 'retry-worthy' &&
-      outcome.availability.cause === 'request-already-in-flight'
-    ) {
-      throw new Error('Remote terminal snapshot already in flight.')
-    }
-    return outcome.snapshot
-  }
-
-  private requestSnapshotOutcome(
-    stream: RemoteRuntimeMultiplexedTerminalState,
-    opts?: { scrollbackRows?: number }
-  ): Promise<RemoteRuntimeSnapshotOutcome> {
-    if (this.streams.get(stream.streamId) !== stream) {
-      return Promise.resolve(retryWorthySnapshotOutcome('stream-detached'))
-    }
-    if (!this.ready || !this.subscription) {
-      return Promise.resolve(retryWorthySnapshotOutcome('connection-not-ready'))
-    }
-    // Recovery uses an untagged snapshot frame group; callers can retry after
-    // it completes instead of racing another request onto the same frame lane.
-    if (stream.resyncInFlight) {
-      return Promise.resolve(retryWorthySnapshotOutcome('resync-in-flight'))
-    }
-    if (stream.pendingSnapshotRequest) {
-      return Promise.resolve(retryWorthySnapshotOutcome('request-already-in-flight'))
-    }
-    const requestId = this.allocateSnapshotRequestId()
-    return new Promise((resolve, reject) => {
-      const timer = setTimeout(() => {
-        if (stream.pendingSnapshotRequest?.timer === timer) {
-          clearPendingSnapshotRequest(stream)
-          reject(new Error('Remote terminal snapshot timed out.'))
-          this.recoverStalledStream(stream)
-        }
-      }, REMOTE_TERMINAL_SNAPSHOT_REQUEST_TIMEOUT_MS)
-      if (typeof timer.unref === 'function') {
-        timer.unref()
-      }
-      stream.pendingSnapshotRequest = { requestId, resolve, reject, timer }
-      if (
-        !this.sendFrame(
-          stream.streamId,
-          TerminalStreamOpcode.SnapshotRequest,
-          encodeTerminalStreamJson({ requestId, scrollbackRows: opts?.scrollbackRows })
-        )
-      ) {
-        clearPendingSnapshotRequest(stream)
-        resolve(retryWorthySnapshotOutcome('request-frame-not-sent'))
-      }
-    })
-  }
-
-  private allocateSnapshotRequestId(): number {
-    const id = this.nextSnapshotRequestId
-    this.nextSnapshotRequestId =
-      this.nextSnapshotRequestId >= 0x7fffffff ? 1 : this.nextSnapshotRequestId + 1
-    return id
-  }
-
-  private acknowledgeOutput(stream: RemoteRuntimeMultiplexedTerminalState, bytes: number): boolean {
-    if (stream.acknowledgeOutputSourceRanges && stream.streamGeneration) {
-      const ackedEndByte = stream.sourceAckedEndByte + bytes
-      const sent = this.sendFrame(
-        stream.streamId,
-        TerminalStreamOpcode.Ack,
-        encodeTerminalStreamJson({
-          streamGeneration: stream.streamGeneration,
-          ackedEndByte
-        })
-      )
-      if (sent) {
-        stream.sourceAckedEndByte = ackedEndByte
-      }
-      return sent
-    }
-    return this.sendFrame(
-      stream.streamId,
-      TerminalStreamOpcode.Ack,
-      encodeTerminalStreamJson({ bytes })
-    )
-  }
-
-  // Why: sendFrame gates on readiness alone; a dropped handle would still report success.
-  private isRegisteredStream(stream: RemoteRuntimeMultiplexedTerminalState): boolean {
-    return this.streams.get(stream.streamId) === stream
-  }
-
-  private sendInput(stream: RemoteRuntimeMultiplexedTerminalState, text: string): boolean {
-    const sent = this.sendFrame(
-      stream.streamId,
-      TerminalStreamOpcode.Input,
-      encodeTerminalStreamText(text)
-    )
-    if (sent && !stream.outputPaused) {
-      stream.watchdog.recordCommandInput(text)
-    }
-    return sent
-  }
-
-  private setOutputPaused(stream: RemoteRuntimeMultiplexedTerminalState, paused: boolean): boolean {
-    if (!stream.supportsOutputPause || this.streams.get(stream.streamId) !== stream) {
-      return false
-    }
-    if (stream.outputPaused === paused) {
-      return true
-    }
-    const sent = this.sendFrame(
-      stream.streamId,
-      TerminalStreamOpcode.SetOutputPaused,
-      encodeTerminalStreamJson({ paused })
-    )
-    if (sent) {
-      stream.outputPaused = paused
-    }
-    return sent
-  }
-
-  private probeCommandResponse(stream: RemoteRuntimeMultiplexedTerminalState): void {
-    void this.requestSnapshot(stream).then(
-      (snapshot) => {
-        if (this.streams.get(stream.streamId) !== stream) {
-          return
-        }
-        if (typeof snapshot?.seq === 'number' && typeof stream.expectedSeq !== 'number') {
-          if (
-            typeof stream.commandProbeBaselineSeq === 'number' &&
-            snapshot.seq > stream.commandProbeBaselineSeq
-          ) {
-            recordRendererCrashBreadcrumb('remote_terminal_stream_stall_probe_baseline_advanced', {
-              baselineSeq: stream.commandProbeBaselineSeq,
-              environmentId: this.environmentId,
-              snapshotSeq: snapshot.seq,
-              streamId: stream.streamId,
-              terminal: stream.terminal
-            })
-            this.recoverStalledStream(stream)
-            return
-          }
-          stream.commandProbeBaselineSeq ??= snapshot.seq
-        } else if (
-          typeof snapshot?.seq === 'number' &&
-          typeof stream.expectedSeq === 'number' &&
-          snapshot.seq > stream.expectedSeq
-        ) {
-          recordRendererCrashBreadcrumb('remote_terminal_stream_stall_probe_detected_gap', {
-            deliveredSeq: stream.expectedSeq,
-            environmentId: this.environmentId,
-            snapshotSeq: snapshot.seq,
-            streamId: stream.streamId,
-            terminal: stream.terminal
-          })
-          this.recoverStalledStream(stream)
-          return
-        }
-        stream.watchdog.completeCommandResponseProbe()
-        recordRendererCrashBreadcrumb('remote_terminal_stream_stall_probe_succeeded', {
-          deliveredSeq: stream.expectedSeq ?? null,
-          environmentId: this.environmentId,
-          probeBaselineSeq: stream.commandProbeBaselineSeq ?? null,
-          snapshotSeq: snapshot?.seq ?? null,
-          streamId: stream.streamId,
-          terminal: stream.terminal
-        })
-      },
-      () => {
-        // Snapshot timeout owns recovery; an explicit host error already proves liveness.
-        if (this.streams.get(stream.streamId) === stream) {
-          stream.watchdog.completeCommandResponseProbe()
-        }
-      }
-    )
-  }
-
-  private recoverStalledStream(stream: RemoteRuntimeMultiplexedTerminalState): void {
-    if (this.streams.get(stream.streamId) !== stream) {
-      return
-    }
-    stream.watchdog.dispose()
-    discardOutputAcknowledgements(stream)
-    clearSnapshot(stream)
-    clearResyncTimer(stream)
-    rejectPendingSnapshotRequest(stream, 'Remote terminal stream stopped responding.')
-    this.streams.delete(stream.streamId)
-    this.sendFrame(stream.streamId, TerminalStreamOpcode.Unsubscribe)
-    if (stream.callbacks.onTransportClose) {
-      stream.callbacks.onTransportClose({ recoverable: true })
-    } else {
-      stream.callbacks.onError?.('Remote terminal stream stopped responding.')
-    }
-    this.closeIfIdle()
-  }
-
-  private queueOutputAcknowledgement(
-    stream: RemoteRuntimeMultiplexedTerminalState,
-    bytes: number
-  ): boolean {
-    if (this.streams.get(stream.streamId) !== stream) {
-      return true
-    }
-    stream.pendingAckBytes += bytes
-    if (stream.pendingAckBytes >= TERMINAL_MULTIPLEX_ACK_BATCH_BYTES) {
-      return this.flushOutputAcknowledgement(stream)
-    }
-    if (stream.ackFlushTimer === null) {
-      stream.ackFlushTimer = setTimeout(() => {
-        stream.ackFlushTimer = null
-        this.flushOutputAcknowledgement(stream)
-      }, TERMINAL_MULTIPLEX_ACK_FLUSH_MS)
-    }
-    return true
-  }
-
-  private flushOutputAcknowledgement(stream: RemoteRuntimeMultiplexedTerminalState): boolean {
-    clearAckFlushTimer(stream)
-    const bytes = stream.pendingAckBytes
-    stream.pendingAckBytes = 0
-    return bytes <= 0 || this.acknowledgeOutput(stream, bytes)
-  }
-
-  getStreamsForE2e(): Iterable<RemoteRuntimeMultiplexedTerminalState> {
-    return this.streams.values()
-  }
-
-  forceErrorForE2e(terminals: ReadonlySet<string>, message: string): number {
-    let dispatched = 0
-    for (const stream of this.streams.values()) {
-      if (terminals.has(stream.terminal)) {
-        stream.callbacks.onError?.(message)
-        dispatched += 1
-      }
-    }
-    return dispatched
-  }
-
-  releaseHeldAcksForE2e(): number {
-    let released = 0
-    for (const stream of this.streams.values()) {
-      if (stream.heldAckBytes <= 0) {
-        continue
-      }
-      const bytes = stream.heldAckBytes
-      stream.heldAckBytes = 0
-      if (this.queueOutputAcknowledgement(stream, bytes)) {
-        released += bytes
-      }
-    }
-    return released
-  }
-
-  sendInputForE2e(terminal: string, text: string): number {
-    let sent = 0
-    for (const stream of this.streams.values()) {
-      if (stream.terminal === terminal && this.sendInput(stream, text)) {
-        sent += 1
-      }
-    }
-    return sent
-  }
-
-  private sendFrame(
-    streamId: number,
-    opcode: TerminalStreamOpcode,
-    payload: Uint8Array<ArrayBufferLike> = new Uint8Array()
-  ): boolean {
-    if (!this.matchesCurrentEnvironmentRevision() || !this.ready || !this.subscription) {
-      return false
-    }
-    try {
-      this.subscription.sendBinary(encodeTerminalStreamFrame({ opcode, streamId, seq: 0, payload }))
-      if (e2eConfig.exposeStore) {
-        if (opcode === TerminalStreamOpcode.Subscribe) {
-          e2eStreamSubscribeCount += 1
-        } else if (opcode === TerminalStreamOpcode.Unsubscribe) {
-          e2eStreamUnsubscribeCount += 1
-        }
-      }
-      return true
-    } catch (error) {
-      this.handleClose(
-        error instanceof Error ? error.message : 'Remote terminal transport write failed.'
-      )
-      return false
-    }
-  }
-
-  private resolveReadyIfConnected(): void {
-    if (!this.ready || !this.subscription) {
-      return
-    }
-    this.readyResolver?.()
-    this.readyResolver = null
-    this.readyRejecter = null
-  }
-
-  private failConnection(error: Error): void {
-    this.readyRejecter?.(error)
-    this.readyResolver = null
-    this.readyRejecter = null
-    for (const stream of this.streams.values()) {
-      // Why: a stream still awaiting ensureConnected receives this failure through its rejected promise.
-      if (stream.subscriptionRequested) {
-        stream.callbacks.onError?.(error.message)
-      }
-    }
-    this.handleClose(undefined, false)
-  }
-
-  private handleClose(message?: string, recoverable = true): void {
-    const streams = Array.from(this.streams.values())
-    const closingSubscription = this.subscription
-    this.ready = false
-    this.connectPromise = null
-    this.readyRejecter?.(new Error(message ?? 'Remote runtime connection closed.'))
-    this.readyResolver = null
-    this.readyRejecter = null
-    this.subscription = null
-    if (closingSubscription) {
-      unsubscribeRuntimeEnvironmentForE2e(closingSubscription)
-    }
-    this.streams.clear()
-    // Why: close callbacks may resubscribe synchronously; release first so every replacement shares the new environment multiplexer.
-    this.releaseIfCurrent(this.environmentId, this)
-    for (const stream of streams) {
-      discardOutputAcknowledgements(stream)
-      stream.watchdog.dispose()
-      clearSnapshot(stream)
-      clearResyncTimer(stream)
-      rejectPendingSnapshotRequest(stream, message ?? 'Remote runtime connection closed.')
-      const canHandleClose = Boolean(stream.callbacks.onTransportClose)
-      stream.callbacks.onTransportClose?.({ recoverable })
-      if (message && !canHandleClose) {
-        stream.callbacks.onError?.(message)
-      }
-    }
-  }
-
-  private closeIfIdle(): void {
-    if (this.streams.size > 0) {
-      return
-    }
-    if (this.subscription) {
-      unsubscribeRuntimeEnvironmentForE2e(this.subscription)
-    }
-    this.subscription = null
-    this.connectPromise = null
-    this.ready = false
-    this.releaseIfCurrent(this.environmentId, this)
-  }
-}
+export {
+  REMOTE_TERMINAL_SNAPSHOT_REQUEST_TIMEOUT_MS,
+  REMOTE_TERMINAL_SNAPSHOT_TOO_LARGE
+} from './remote-runtime-terminal-snapshot-state'
+export { isHostAnsweredSnapshotRetryCause } from './remote-runtime-terminal-multiplexer-types'
+export type {
+  RemoteRuntimeMultiplexedTerminal,
+  RemoteRuntimeMultiplexedTerminalCallbacks,
+  RemoteRuntimeSnapshotAvailability,
+  RemoteRuntimeSnapshotHostRetryCause,
+  RemoteRuntimeSnapshotImage,
+  RemoteRuntimeSnapshotLocalRetryCause,
+  RemoteRuntimeSnapshotOutcome,
+  RemoteRuntimeSnapshotPermanentReason,
+  RemoteRuntimeSnapshotRetryCause
+} from './remote-runtime-terminal-multiplexer-types'
 
 const multiplexers = new Map<string, RemoteRuntimeTerminalMultiplexer>()
 
 function releaseRemoteRuntimeTerminalMultiplexer(
   environmentId: string,
-  multiplexer: RemoteRuntimeTerminalMultiplexer
+  multiplexer: RemoteRuntimeTerminalMultiplexerBase
 ): void {
   if (multiplexers.get(environmentId) === multiplexer) {
     multiplexers.delete(environmentId)
@@ -1507,7 +37,7 @@ function releaseRemoteRuntimeTerminalMultiplexer(
 export function getRemoteRuntimeTerminalMultiplexer(
   environmentId: string
 ): RemoteRuntimeTerminalMultiplexer {
-  exposeE2eRemoteTerminalMultiplexAckGate()
+  exposeE2eRemoteTerminalMultiplexAckGate(multiplexers)
   let multiplexer = multiplexers.get(environmentId)
   if (multiplexer && !multiplexer.matchesCurrentEnvironmentRevision()) {
     multiplexer.closeForEnvironmentReplacement()
@@ -1530,150 +60,5 @@ export function _getRemoteRuntimeTerminalMultiplexerCountForTest(): number {
 
 export function resetRemoteRuntimeTerminalMultiplexersForTests(): void {
   multiplexers.clear()
-  e2eHeldRemoteAckTerminals.clear()
-  resetE2eDroppedRemoteOutput()
-  e2eReleasedRemoteAckChars = 0
-  e2eStreamSubscribeCount = 0
-  e2eStreamUnsubscribeCount = 0
-  e2eTransportSubscribeCount = 0
-  e2eTransportUnsubscribeCount = 0
-}
-
-function concatBytes(chunks: Uint8Array<ArrayBufferLike>[]): Uint8Array<ArrayBufferLike> {
-  const total = chunks.reduce((sum, chunk) => sum + chunk.byteLength, 0)
-  const out = new Uint8Array(total)
-  let offset = 0
-  for (const chunk of chunks) {
-    out.set(chunk, offset)
-    offset += chunk.byteLength
-  }
-  return out
-}
-
-function clearSnapshot(stream: RemoteRuntimeMultiplexedTerminalState): void {
-  stream.snapshotChunks = []
-  stream.snapshotBytes = 0
-  stream.snapshotOverflowed = false
-  stream.snapshotTarget = 'initial'
-  stream.snapshotInfo = null
-}
-
-function clearAckFlushTimer(stream: RemoteRuntimeMultiplexedTerminalState): void {
-  if (stream.ackFlushTimer !== null) {
-    clearTimeout(stream.ackFlushTimer)
-    stream.ackFlushTimer = null
-  }
-}
-
-function discardOutputAcknowledgements(stream: RemoteRuntimeMultiplexedTerminalState): void {
-  clearAckFlushTimer(stream)
-  stream.pendingAckBytes = 0
-  stream.heldAckBytes = 0
-}
-
-function clearPendingSnapshotRequest(stream: RemoteRuntimeMultiplexedTerminalState): void {
-  const request = stream.pendingSnapshotRequest
-  stream.pendingSnapshotRequest = null
-  if (request) {
-    clearTimeout(request.timer)
-  }
-}
-
-function clearResyncTimer(stream: RemoteRuntimeMultiplexedTerminalState): void {
-  const timer = stream.resyncTimer
-  stream.resyncTimer = null
-  if (timer) {
-    clearTimeout(timer)
-  }
-}
-
-function rejectPendingSnapshotRequest(
-  stream: RemoteRuntimeMultiplexedTerminalState,
-  message: string
-): void {
-  const request = stream.pendingSnapshotRequest
-  if (!request) {
-    return
-  }
-  clearPendingSnapshotRequest(stream)
-  request.reject(new Error(message))
-}
-
-function decodeSnapshotInfo(
-  payload: Uint8Array<ArrayBufferLike>
-): RemoteRuntimeSnapshotInfo | null {
-  const raw = decodeTerminalStreamJson<{
-    cols?: unknown
-    rows?: unknown
-    seq?: unknown
-    source?: unknown
-    requestId?: unknown
-    truncated?: unknown
-    unavailable?: unknown
-    pendingEscapeTailAnsi?: unknown
-    kittyKeyboardFlags?: unknown
-    alternateScreen?: unknown
-    terminalOwner?: unknown
-  }>(payload)
-  if (!raw) {
-    return null
-  }
-  return {
-    cols: typeof raw.cols === 'number' ? raw.cols : undefined,
-    rows: typeof raw.rows === 'number' ? raw.rows : undefined,
-    seq: typeof raw.seq === 'number' ? raw.seq : undefined,
-    source: raw.source === 'headless' || raw.source === 'renderer' ? raw.source : undefined,
-    // Negative, fractional, and unsafe values are treated as absent, never clamped.
-    kittyKeyboardFlags: parseTerminalKittyKeyboardFlags(raw.kittyKeyboardFlags),
-    alternateScreen:
-      raw.terminalOwner === 'shell' && typeof raw.alternateScreen === 'boolean'
-        ? raw.alternateScreen
-        : undefined,
-    terminalOwner: raw.terminalOwner === 'shell' ? raw.terminalOwner : undefined,
-    requestId: typeof raw.requestId === 'number' ? raw.requestId : undefined,
-    truncated: raw.truncated === true,
-    unavailable: parseTerminalSnapshotUnavailableReason(raw.unavailable),
-    pendingEscapeTailAnsi:
-      typeof raw.pendingEscapeTailAnsi === 'string' ? raw.pendingEscapeTailAnsi : undefined
-  }
-}
-
-function retryWorthySnapshotOutcome(
-  cause: RemoteRuntimeSnapshotRetryCause
-): RemoteRuntimeSnapshotOutcome {
-  return { availability: { kind: 'retry-worthy', cause }, snapshot: null }
-}
-
-function classifySnapshotAvailability(
-  clientOverflowed: boolean,
-  info: RemoteRuntimeSnapshotInfo | null
-): RemoteRuntimeSnapshotAvailability {
-  if (clientOverflowed) {
-    return { kind: 'permanently-unavailable', reason: 'exceeds-client-replay-limit' }
-  }
-  if (info?.unavailable === 'pending-output-overflowed') {
-    return { kind: 'retry-worthy', cause: 'host-pending-output-overflowed' }
-  }
-  if (info?.unavailable === 'no-serializable-buffer') {
-    return { kind: 'retry-worthy', cause: 'host-no-serializable-buffer' }
-  }
-  // Why: a truncated reply with no stated reason can only come from a host that predates `unavailable`.
-  if (info?.truncated === true) {
-    return { kind: 'unknown-legacy-host' }
-  }
-  return { kind: 'snapshot' }
-}
-
-function isTerminalDriverState(
-  value: unknown
-): value is { kind: 'idle' } | { kind: 'desktop' } | { kind: 'mobile'; clientId: string } {
-  if (!value || typeof value !== 'object' || !('kind' in value)) {
-    return false
-  }
-  const driver = value as { kind?: unknown; clientId?: unknown }
-  return (
-    driver.kind === 'idle' ||
-    driver.kind === 'desktop' ||
-    (driver.kind === 'mobile' && typeof driver.clientId === 'string')
-  )
+  resetRemoteRuntimeTerminalE2eState()
 }
diff --git a/src/renderer/src/runtime/remote-runtime-terminal-response-controller.ts b/src/renderer/src/runtime/remote-runtime-terminal-response-controller.ts
new file mode 100644
index 00000000000..5fff44dbd9c
--- /dev/null
+++ b/src/renderer/src/runtime/remote-runtime-terminal-response-controller.ts
@@ -0,0 +1,121 @@
+import type { RuntimeRpcResponse } from '../../../shared/runtime-rpc-envelope'
+import { TERMINAL_MULTIPLEX_STREAM_LIMIT_ERROR } from '../../../shared/terminal-multiplex-flow-control'
+import { shouldHoldE2eRemoteTerminalEnd } from './remote-runtime-terminal-e2e-control'
+import { RemoteRuntimeTerminalFlowController } from './remote-runtime-terminal-flow-controller'
+import {
+  clearResyncTimer,
+  clearSnapshot,
+  discardOutputAcknowledgements,
+  isTerminalDriverState,
+  rejectPendingSnapshotRequest
+} from './remote-runtime-terminal-snapshot-state'
+import type { TerminalMultiplexEvent } from './remote-runtime-terminal-multiplexer-types'
+import { unwrapRuntimeRpcResult } from './runtime-rpc-client'
+
+export abstract class RemoteRuntimeTerminalResponseController extends RemoteRuntimeTerminalFlowController {
+  protected handleResponse(response: RuntimeRpcResponse<unknown>): void {
+    if (!this.matchesCurrentEnvironmentRevision()) {
+      this.closeForEnvironmentReplacement()
+      return
+    }
+    let event: TerminalMultiplexEvent
+    try {
+      event = unwrapRuntimeRpcResult(response) as TerminalMultiplexEvent
+    } catch (error) {
+      this.failConnection(error instanceof Error ? error : new Error(String(error)))
+      return
+    }
+
+    if (event.type === 'ready') {
+      this.ready = true
+      this.resolveReadyIfConnected()
+      return
+    }
+
+    if (!('streamId' in event) || typeof event.streamId !== 'number') {
+      return
+    }
+    const stream = this.streams.get(event.streamId)
+    if (!stream) {
+      return
+    }
+    stream.watchdog.recordInbound()
+    if (event.type === 'end' && shouldHoldE2eRemoteTerminalEnd(stream.terminal)) {
+      return
+    }
+    if (event.type === 'subscribed') {
+      const capabilities =
+        typeof event.capabilities === 'object' && event.capabilities !== null
+          ? (event.capabilities as { ackOutputSourceRanges?: unknown; outputPause?: unknown })
+          : null
+      if (
+        capabilities?.ackOutputSourceRanges === 1 &&
+        typeof event.streamGeneration === 'string' &&
+        event.streamGeneration.length > 0
+      ) {
+        stream.acknowledgeOutputSourceRanges = true
+        stream.streamGeneration = event.streamGeneration
+      }
+      stream.supportsOutputPause = capabilities?.outputPause === 1
+      if (stream.supportsOutputPause) {
+        stream.callbacks.onOutputPauseCapability?.()
+      }
+    } else if (event.type === 'end') {
+      discardOutputAcknowledgements(stream)
+      stream.watchdog.dispose()
+      clearSnapshot(stream)
+      clearResyncTimer(stream)
+      rejectPendingSnapshotRequest(stream, 'Remote terminal stream ended.')
+      this.streams.delete(event.streamId)
+      if (stream.capacityRejected) {
+        if (stream.callbacks.onTransportClose) {
+          stream.callbacks.onTransportClose({ recoverable: true, retryWithBackoff: true })
+        } else {
+          stream.callbacks.onError?.(TERMINAL_MULTIPLEX_STREAM_LIMIT_ERROR)
+        }
+      } else {
+        stream.callbacks.onEnd?.()
+      }
+      this.closeIfIdle()
+    } else if (event.type === 'error') {
+      const message =
+        typeof event.message === 'string' ? event.message : 'Remote terminal stream failed.'
+      if (message === TERMINAL_MULTIPLEX_STREAM_LIMIT_ERROR) {
+        stream.capacityRejected = true
+        return
+      }
+      clearSnapshot(stream)
+      rejectPendingSnapshotRequest(stream, message)
+      // Why: the paired binary Error frame can be dropped under backpressure;
+      // this reliable event must also dispatch or release the resync gate, and
+      // must never disarm the watchdog while leaving the gate shut.
+      if (stream.resyncPendingSend) {
+        this.sendDeferredResyncSnapshot(stream)
+      } else {
+        clearResyncTimer(stream)
+        stream.resyncInFlight = false
+      }
+      stream.callbacks.onError?.(message)
+    } else if (event.type === 'fit-override-changed') {
+      if (
+        (event.mode !== 'mobile-fit' &&
+          event.mode !== 'remote-desktop-fit' &&
+          event.mode !== 'desktop-fit') ||
+        typeof event.cols !== 'number' ||
+        typeof event.rows !== 'number'
+      ) {
+        return
+      }
+      stream.callbacks.onFitOverrideChanged?.({
+        mode: event.mode,
+        cols: event.cols,
+        rows: event.rows
+      })
+    } else if (event.type === 'driver-changed') {
+      if (!isTerminalDriverState(event.driver)) {
+        return
+      }
+      stream.callbacks.onDriverChanged?.(event.driver)
+    }
+  }
+}
diff --git a/src/renderer/src/runtime/remote-runtime-terminal-snapshot-controller.ts b/src/renderer/src/runtime/remote-runtime-terminal-snapshot-controller.ts
new file mode 100644
index 00000000000..e7f3eda6218
--- /dev/null
+++ b/src/renderer/src/runtime/remote-runtime-terminal-snapshot-controller.ts
@@ -0,0 +1,274 @@
+import {
+  TerminalStreamOpcode,
+  encodeTerminalStreamJson
+} from '../../../shared/terminal-stream-protocol'
+import { recordRendererCrashBreadcrumb } from '@/lib/crash-breadcrumb-recorder'
+import { RemoteRuntimeTerminalMultiplexerBase } from './remote-runtime-terminal-multiplexer-base'
+import {
+  REMOTE_TERMINAL_RESYNC_RETRY_BASE_MS,
+  REMOTE_TERMINAL_RESYNC_RETRY_MAX_MS,
+  REMOTE_TERMINAL_RESYNC_TIMEOUT_MS,
+  REMOTE_TERMINAL_SNAPSHOT_REQUEST_TIMEOUT_MS,
+  clearPendingSnapshotRequest,
+  clearResyncTimer,
+  clearSnapshot,
+  discardOutputAcknowledgements,
+  rejectPendingSnapshotRequest,
+  retryWorthySnapshotOutcome
+} from './remote-runtime-terminal-snapshot-state'
+import type {
+  RemoteRuntimeMultiplexedTerminalState,
+  RemoteRuntimeSnapshotOutcome
+} from './remote-runtime-terminal-multiplexer-types'
+
+export abstract class RemoteRuntimeTerminalSnapshotController extends RemoteRuntimeTerminalMultiplexerBase {
+  // Why: Output `seq` is the UTF-16 high-water at the end of a chunk, so a chunk
+  // that begins after the last high-water (startSeq > expectedSeq) means the
+  // server dropped intervening frames under backpressure. Only flag a gap when
+  // both offsets are known, and never on the first seq (nothing to compare to).
+  protected detectOutputGap(
+    stream: RemoteRuntimeMultiplexedTerminalState,
+    seq: number | undefined,
+    rawLength: number
+  ): boolean {
+    if (typeof seq !== 'number' || typeof stream.expectedSeq !== 'number') {
+      return false
+    }
+    const startSeq = seq - rawLength
+    return startSeq > stream.expectedSeq
+  }
+
+  // Why: on a detected gap, discard the corrupt tail and pull a fresh
+  // authoritative snapshot. The request carries no requestId so the server
+  // reply renders through the initial-snapshot path (full reset), self-healing
+  // without surfacing an error to the user.
+  protected requestResyncSnapshot(stream: RemoteRuntimeMultiplexedTerminalState): void {
+    if (stream.resyncInFlight) {
+      return
+    }
+    stream.resyncInFlight = true
+    if (stream.pendingSnapshotRequest) {
+      // Why: snapshot frame groups are not multiplexed; wait for the manual
+      // snapshot to finish so its response cannot be mistaken for recovery.
+      // Arm the watchdog now so a dispatch path that consumes the pending
+      // request without re-dispatching cannot hold the gate shut forever.
+      stream.resyncPendingSend = true
+      this.startResyncTimer(stream)
+      return
+    }
+    this.sendResyncSnapshot(stream)
+  }
+
+  protected sendDeferredResyncSnapshot(stream: RemoteRuntimeMultiplexedTerminalState): void {
+    if (!stream.resyncInFlight || !stream.resyncPendingSend || stream.pendingSnapshotRequest) {
+      return
+    }
+    this.sendResyncSnapshot(stream)
+  }
+
+  private sendResyncSnapshot(stream: RemoteRuntimeMultiplexedTerminalState): void {
+    stream.resyncPendingSend = false
+    this.startResyncTimer(stream)
+    const sent = this.sendFrame(
+      stream.streamId,
+      TerminalStreamOpcode.SnapshotRequest,
+      encodeTerminalStreamJson({ scrollbackRows: undefined })
+    )
+    if (!sent) {
+      // Transport is down; the reconnect path re-subscribes from scratch.
+      clearResyncTimer(stream)
+      stream.resyncInFlight = false
+    }
+  }
+
+  // Why: keep the gate shut across the backoff — the post-gap tail is corrupt
+  // either way — and heal even if the flood ends with no further output.
+  protected scheduleResyncRetry(stream: RemoteRuntimeMultiplexedTerminalState): void {
+    stream.resyncAttempts += 1
+    const delay = Math.min(
+      REMOTE_TERMINAL_RESYNC_RETRY_MAX_MS,
+      REMOTE_TERMINAL_RESYNC_RETRY_BASE_MS * 2 ** Math.min(stream.resyncAttempts - 1, 4)
+    )
+    clearResyncTimer(stream)
+    const timer = setTimeout(() => {
+      if (
+        stream.resyncTimer !== timer ||
+        this.streams.get(stream.streamId) !== stream ||
+        !stream.resyncInFlight
+      ) {
+        return
+      }
+      stream.resyncTimer = null
+      if (stream.pendingSnapshotRequest) {
+        stream.resyncPendingSend = true
+        this.startResyncTimer(stream)
+        return
+      }
+      this.sendResyncSnapshot(stream)
+    }, delay)
+    if (typeof timer.unref === 'function') {
+      timer.unref()
+    }
+    stream.resyncTimer = timer
+  }
+
+  private startResyncTimer(stream: RemoteRuntimeMultiplexedTerminalState): void {
+    clearResyncTimer(stream)
+    const timer = setTimeout(() => {
+      if (
+        stream.resyncTimer !== timer ||
+        this.streams.get(stream.streamId) !== stream ||
+        !stream.resyncInFlight
+      ) {
+        return
+      }
+      stream.resyncTimer = null
+      stream.resyncInFlight = false
+      stream.resyncPendingSend = false
+    }, REMOTE_TERMINAL_RESYNC_TIMEOUT_MS)
+    if (typeof timer.unref === 'function') {
+      timer.unref()
+    }
+    stream.resyncTimer = timer
+  }
+
+  protected async requestSnapshot(
+    stream: RemoteRuntimeMultiplexedTerminalState,
+    opts?: { scrollbackRows?: number }
+  ): Promise<{
+    data: string
+    cols: number
+    rows: number
+    seq?: number
+    source?: 'headless' | 'renderer'
+  } | null> {
+    const outcome = await this.requestSnapshotOutcome(stream, opts)
+    // Why: the concurrent-request guard used to reject before the outcome existed; keep that contract for legacy callers.
+    if (
+      outcome.availability.kind === 'retry-worthy' &&
+      outcome.availability.cause === 'request-already-in-flight'
+    ) {
+      throw new Error('Remote terminal snapshot already in flight.')
+    }
+    return outcome.snapshot
+  }
+
+  protected requestSnapshotOutcome(
+    stream: RemoteRuntimeMultiplexedTerminalState,
+    opts?: { scrollbackRows?: number }
+  ): Promise<RemoteRuntimeSnapshotOutcome> {
+    if (this.streams.get(stream.streamId) !== stream) {
+      return Promise.resolve(retryWorthySnapshotOutcome('stream-detached'))
+    }
+    if (!this.ready || !this.subscription) {
+      return Promise.resolve(retryWorthySnapshotOutcome('connection-not-ready'))
+    }
+    // Recovery uses an untagged snapshot frame group; callers can retry after
+    // it completes instead of racing another request onto the same frame lane.
+    if (stream.resyncInFlight) {
+      return Promise.resolve(retryWorthySnapshotOutcome('resync-in-flight'))
+    }
+    if (stream.pendingSnapshotRequest) {
+      return Promise.resolve(retryWorthySnapshotOutcome('request-already-in-flight'))
+    }
+    const requestId = this.allocateSnapshotRequestId()
+    return new Promise((resolve, reject) => {
+      const timer = setTimeout(() => {
+        if (stream.pendingSnapshotRequest?.timer === timer) {
+          clearPendingSnapshotRequest(stream)
+          reject(new Error('Remote terminal snapshot timed out.'))
+          this.recoverStalledStream(stream)
+        }
+      }, REMOTE_TERMINAL_SNAPSHOT_REQUEST_TIMEOUT_MS)
+      if (typeof timer.unref === 'function') {
+        timer.unref()
+      }
+      stream.pendingSnapshotRequest = { requestId, resolve, reject, timer }
+      if (
+        !this.sendFrame(
+          stream.streamId,
+          TerminalStreamOpcode.SnapshotRequest,
+          encodeTerminalStreamJson({ requestId, scrollbackRows: opts?.scrollbackRows })
+        )
+      ) {
+        clearPendingSnapshotRequest(stream)
+        resolve(retryWorthySnapshotOutcome('request-frame-not-sent'))
+      }
+    })
+  }
+
+  protected probeCommandResponse(stream: RemoteRuntimeMultiplexedTerminalState): void {
+    void this.requestSnapshot(stream).then(
+      (snapshot) => {
+        if (this.streams.get(stream.streamId) !== stream) {
+          return
+        }
+        if (typeof snapshot?.seq === 'number' && typeof stream.expectedSeq !== 'number') {
+          if (
+            typeof stream.commandProbeBaselineSeq === 'number' &&
+            snapshot.seq > stream.commandProbeBaselineSeq
+          ) {
+            recordRendererCrashBreadcrumb('remote_terminal_stream_stall_probe_baseline_advanced', {
+              baselineSeq: stream.commandProbeBaselineSeq,
+              environmentId: this.environmentId,
+              snapshotSeq: snapshot.seq,
+              streamId: stream.streamId,
+              terminal: stream.terminal
+            })
+            this.recoverStalledStream(stream)
+            return
+          }
+          stream.commandProbeBaselineSeq ??= snapshot.seq
+        } else if (
+          typeof snapshot?.seq === 'number' &&
+          typeof stream.expectedSeq === 'number' &&
+          snapshot.seq > stream.expectedSeq
+        ) {
+          recordRendererCrashBreadcrumb('remote_terminal_stream_stall_probe_detected_gap', {
+            deliveredSeq: stream.expectedSeq,
+            environmentId: this.environmentId,
+            snapshotSeq: snapshot.seq,
+            streamId: stream.streamId,
+            terminal: stream.terminal
+          })
+          this.recoverStalledStream(stream)
+          return
+        }
+        stream.watchdog.completeCommandResponseProbe()
+        recordRendererCrashBreadcrumb('remote_terminal_stream_stall_probe_succeeded', {
+          deliveredSeq: stream.expectedSeq ?? null,
+          environmentId: this.environmentId,
+          probeBaselineSeq: stream.commandProbeBaselineSeq ?? null,
+          snapshotSeq: snapshot?.seq ?? null,
+          streamId: stream.streamId,
+          terminal: stream.terminal
+        })
+      },
+      () => {
+        // Snapshot timeout owns recovery; an explicit host error already proves liveness.
+        if (this.streams.get(stream.streamId) === stream) {
+          stream.watchdog.completeCommandResponseProbe()
+        }
+      }
+    )
+  }
+
+  protected recoverStalledStream(stream: RemoteRuntimeMultiplexedTerminalState): void {
+    if (this.streams.get(stream.streamId) !== stream) {
+      return
+    }
+    stream.watchdog.dispose()
+    discardOutputAcknowledgements(stream)
+    clearSnapshot(stream)
+    clearResyncTimer(stream)
+    rejectPendingSnapshotRequest(stream, 'Remote terminal stream stopped responding.')
+    this.streams.delete(stream.streamId)
+    this.sendFrame(stream.streamId, TerminalStreamOpcode.Unsubscribe)
+    if (stream.callbacks.onTransportClose) {
+      stream.callbacks.onTransportClose({ recoverable: true })
+    } else {
+      stream.callbacks.onError?.('Remote terminal stream stopped responding.')
+    }
+    this.closeIfIdle()
+  }
+}
diff --git a/src/renderer/src/runtime/remote-runtime-terminal-snapshot-state.ts b/src/renderer/src/runtime/remote-runtime-terminal-snapshot-state.ts
new file mode 100644
index 00000000000..d8f930dc898
--- /dev/null
+++ b/src/renderer/src/runtime/remote-runtime-terminal-snapshot-state.ts
@@ -0,0 +1,162 @@
+import { decodeTerminalStreamJson } from '../../../shared/terminal-stream-protocol'
+import { parseTerminalSnapshotUnavailableReason } from '../../../shared/terminal-snapshot-unavailability'
+import { parseTerminalKittyKeyboardFlags } from '../../../shared/terminal-kitty-keyboard-flags'
+import type {
+  RemoteRuntimeMultiplexedTerminalState,
+  RemoteRuntimeSnapshotAvailability,
+  RemoteRuntimeSnapshotInfo,
+  RemoteRuntimeSnapshotOutcome,
+  RemoteRuntimeSnapshotRetryCause
+} from './remote-runtime-terminal-multiplexer-types'
+
+export const CONTROL_STREAM_ID = 0
+export const MAX_REMOTE_TERMINAL_SNAPSHOT_BYTES = 2 * 1024 * 1024
+export const REMOTE_TERMINAL_SNAPSHOT_REQUEST_TIMEOUT_MS = 10_000
+export const REMOTE_TERMINAL_RESYNC_TIMEOUT_MS = 10_000
+// Why: a truncated recovery means the server is too flooded to serialize;
+// retrying once per incoming chunk would stampede it, so back off instead.
+export const REMOTE_TERMINAL_RESYNC_RETRY_BASE_MS = 500
+export const REMOTE_TERMINAL_RESYNC_RETRY_MAX_MS = 5_000
+// Why: exported so the transport can classify it as benign — the snapshot was
+// skipped but live output continues, so it must not surface a fatal red banner.
+export const REMOTE_TERMINAL_SNAPSHOT_TOO_LARGE =
+  'Remote terminal snapshot exceeded the 2 MiB replay limit; live output will continue.'
+
+export function concatBytes(chunks: Uint8Array<ArrayBufferLike>[]): Uint8Array<ArrayBufferLike> {
+  const total = chunks.reduce((sum, chunk) => sum + chunk.byteLength, 0)
+  const out = new Uint8Array(total)
+  let offset = 0
+  for (const chunk of chunks) {
+    out.set(chunk, offset)
+    offset += chunk.byteLength
+  }
+  return out
+}
+
+export function clearSnapshot(stream: RemoteRuntimeMultiplexedTerminalState): void {
+  stream.snapshotChunks = []
+  stream.snapshotBytes = 0
+  stream.snapshotOverflowed = false
+  stream.snapshotTarget = 'initial'
+  stream.snapshotInfo = null
+}
+
+export function clearAckFlushTimer(stream: RemoteRuntimeMultiplexedTerminalState): void {
+  if (stream.ackFlushTimer !== null) {
+    clearTimeout(stream.ackFlushTimer)
+    stream.ackFlushTimer = null
+  }
+}
+
+export function discardOutputAcknowledgements(stream: RemoteRuntimeMultiplexedTerminalState): void {
+  clearAckFlushTimer(stream)
+  stream.pendingAckBytes = 0
+  stream.heldAckBytes = 0
+}
+
+export function clearPendingSnapshotRequest(stream: RemoteRuntimeMultiplexedTerminalState): void {
+  const request = stream.pendingSnapshotRequest
+  stream.pendingSnapshotRequest = null
+  if (request) {
+    clearTimeout(request.timer)
+  }
+}
+
+export function clearResyncTimer(stream: RemoteRuntimeMultiplexedTerminalState): void {
+  const timer = stream.resyncTimer
+  stream.resyncTimer = null
+  if (timer) {
+    clearTimeout(timer)
+  }
+}
+
+export function rejectPendingSnapshotRequest(
+  stream: RemoteRuntimeMultiplexedTerminalState,
+  message: string
+): void {
+  const request = stream.pendingSnapshotRequest
+  if (!request) {
+    return
+  }
+  clearPendingSnapshotRequest(stream)
+  request.reject(new Error(message))
+}
+
+export function decodeSnapshotInfo(
+  payload: Uint8Array<ArrayBufferLike>
+): RemoteRuntimeSnapshotInfo | null {
+  const raw = decodeTerminalStreamJson<{
+    cols?: unknown
+    rows?: unknown
+    seq?: unknown
+    source?: unknown
+    requestId?: unknown
+    truncated?: unknown
+    unavailable?: unknown
+    pendingEscapeTailAnsi?: unknown
+    kittyKeyboardFlags?: unknown
+    alternateScreen?: unknown
+    terminalOwner?: unknown
+  }>(payload)
+  if (!raw) {
+    return null
+  }
+  return {
+    cols: typeof raw.cols === 'number' ? raw.cols : undefined,
+    rows: typeof raw.rows === 'number' ? raw.rows : undefined,
+    seq: typeof raw.seq === 'number' ? raw.seq : undefined,
+    source: raw.source === 'headless' || raw.source === 'renderer' ? raw.source : undefined,
+    // Negative, fractional, and unsafe values are treated as absent, never clamped.
+    kittyKeyboardFlags: parseTerminalKittyKeyboardFlags(raw.kittyKeyboardFlags),
+    alternateScreen:
+      raw.terminalOwner === 'shell' && typeof raw.alternateScreen === 'boolean'
+        ? raw.alternateScreen
+        : undefined,
+    terminalOwner: raw.terminalOwner === 'shell' ? raw.terminalOwner : undefined,
+    requestId: typeof raw.requestId === 'number' ? raw.requestId : undefined,
+    truncated: raw.truncated === true,
+    unavailable: parseTerminalSnapshotUnavailableReason(raw.unavailable),
+    pendingEscapeTailAnsi:
+      typeof raw.pendingEscapeTailAnsi === 'string' ? raw.pendingEscapeTailAnsi : undefined
+  }
+}
+
+export function retryWorthySnapshotOutcome(
+  cause: RemoteRuntimeSnapshotRetryCause
+): RemoteRuntimeSnapshotOutcome {
+  return { availability: { kind: 'retry-worthy', cause }, snapshot: null }
+}
+
+export function classifySnapshotAvailability(
+  clientOverflowed: boolean,
+  info: RemoteRuntimeSnapshotInfo | null
+): RemoteRuntimeSnapshotAvailability {
+  if (clientOverflowed) {
+    return { kind: 'permanently-unavailable', reason: 'exceeds-client-replay-limit' }
+  }
+  if (info?.unavailable === 'pending-output-overflowed') {
+    return { kind: 'retry-worthy', cause: 'host-pending-output-overflowed' }
+  }
+  if (info?.unavailable === 'no-serializable-buffer') {
+    return { kind: 'retry-worthy', cause: 'host-no-serializable-buffer' }
+  }
+  // Why: a truncated reply with no stated reason can only come from a host that predates `unavailable`.
+  if (info?.truncated === true) {
+    return { kind: 'unknown-legacy-host' }
+  }
+  return { kind: 'snapshot' }
+}
+
+export function isTerminalDriverState(
+  value: unknown
+): value is { kind: 'idle' } | { kind: 'desktop' } | { kind: 'mobile'; clientId: string } {
+  if (!value || typeof value !== 'object' || !('kind' in value)) {
+    return false
+  }
+  const driver = value as { kind?: unknown; clientId?: unknown }
+  return (
+    driver.kind === 'idle' ||
+    driver.kind === 'desktop' ||
+    (driver.kind === 'mobile' && typeof driver.clientId === 'string')
+  )
+}
diff --git a/src/renderer/src/runtime/remote-server-update-coordinator.test.ts b/src/renderer/src/runtime/remote-server-update-coordinator.test.ts
index 66cb646f711..3a6b152c416 100644
--- a/src/renderer/src/runtime/remote-server-update-coordinator.test.ts
+++ b/src/renderer/src/runtime/remote-server-update-coordinator.test.ts
@@ -64,14 +64,12 @@ function transport(
     getUpdaterStatus: vi.fn(async () => availableSnapshot),
     check: vi.fn(async () => availableSnapshot),
     download: vi.fn(async () => availableSnapshot),
-    install: vi.fn(
-      async (): Promise<RemoteServerUpdateInstallResult> => ({
-        accepted: true,
-        fromVersion: '1.4.0',
-        targetVersion: '1.5.0',
-        runtimeId: 'runtime-old'
-      })
-    ),
+    install: vi.fn(async (): Promise<RemoteServerUpdateInstallResult> => ({
+      accepted: true,
+      fromVersion: '1.4.0',
+      targetVersion: '1.5.0',
+      runtimeId: 'runtime-old'
+    })),
     wait: vi.fn(async (milliseconds) => {
       clock += milliseconds
     }),
diff --git a/src/renderer/src/runtime/runtime-file-client-types.ts b/src/renderer/src/runtime/runtime-file-client-types.ts
new file mode 100644
index 00000000000..6525fc7e357
--- /dev/null
+++ b/src/renderer/src/runtime/runtime-file-client-types.ts
@@ -0,0 +1,34 @@
+import type { GlobalSettings } from '../../../shared/global-settings-types'
+
+export type RuntimeReadableFileContent = {
+  content: string
+  isBinary: boolean
+  isImage?: boolean
+  mimeType?: string
+  fileIdentity?: string
+}
+
+export type RuntimeFileReadArgs = {
+  settings: Pick<GlobalSettings, 'activeRuntimeEnvironmentId'> | null | undefined
+  filePath: string
+  relativePath?: string
+  worktreeId?: string
+  connectionId?: string
+  expectedExternalSshTargetId?: string
+  includeLocalLogMetadata?: boolean
+}
+
+export type RuntimeFileOperationArgs = {
+  settings: Pick<GlobalSettings, 'activeRuntimeEnvironmentId'> | null | undefined
+  worktreeId: string | null | undefined
+  worktreePath: string | null | undefined
+  connectionId?: string
+  expectedExecutionHostId?: 'local' | `ssh:${string}`
+  expectedSshTargetId?: string
+  expectedSshConnectionGeneration?: number
+  expectedExternalSshTargetId?: string
+}
+
+export type RuntimeFileDownloadResult =
+  | { canceled: true }
+  | { canceled: false; destinationPath: string }
diff --git a/src/renderer/src/runtime/runtime-file-client.ts b/src/renderer/src/runtime/runtime-file-client.ts
index 29d1e26ad96..104053a4664 100644
--- a/src/renderer/src/runtime/runtime-file-client.ts
+++ b/src/renderer/src/runtime/runtime-file-client.ts
@@ -1,1518 +1,34 @@
-/* eslint-disable max-lines -- Why: this client intentionally centralizes the
-file preload API plus remote runtime fallbacks so call sites cannot drift on
-local-vs-environment routing rules. */
-import type { SearchOptions, SearchResult } from '../../../shared/code-search-types'
-import type {
-  DirEntry,
-  FsChangedPayload,
-  MarkdownDocument
-} from '../../../shared/filesystem-entry-types'
-import type { GlobalSettings } from '../../../shared/global-settings-types'
-import type {
-  RuntimeFilePreviewResult,
-  RuntimeFileReadChunkResult,
-  RuntimeFileReadResult,
-  RuntimeFileListResult,
-  RuntimeStatus
-} from '../../../shared/runtime-types'
-import {
-  callRuntimeRpc,
-  getActiveRuntimeTarget,
-  RuntimeRpcCallError,
-  unwrapRuntimeRpcResult
-} from './runtime-rpc-client'
-import type { RuntimeRpcResponse } from '../../../shared/runtime-rpc-envelope'
-import { basename, joinPath, normalizeRelativePath } from '@/lib/path'
-import {
-  isWindowsAbsolutePathLike,
-  relativePathInsideRoot
-} from '../../../shared/cross-platform-path'
-import { toRuntimeWorktreeSelector } from './runtime-worktree-selector'
-import {
-  createEmptyRuntimeFileSearchResult,
-  getRuntimeFileSearchRejectedField
-} from './runtime-file-search-bounds'
-import {
-  buildExcludePathPrefixes,
-  shouldExcludeQuickOpenRelPath
-} from '../../../shared/quick-open-filter'
-import { assertFileMutationOwnershipCapability } from '../../../shared/file-mutation-ownership'
-import {
-  captureRuntimeEnvironmentRequestRevision,
-  getRuntimeEnvironmentRevision
-} from './runtime-environment-revision'
-import {
-  hasCachedLegacyQuickOpenInventory,
-  searchLegacyQuickOpenInventory
-} from './runtime-legacy-quick-open-inventory'
-
-export type RuntimeReadableFileContent = {
-  content: string
-  isBinary: boolean
-  isImage?: boolean
-  mimeType?: string
-  fileIdentity?: string
-}
-
-export type RuntimeFileReadArgs = {
-  settings: Pick<GlobalSettings, 'activeRuntimeEnvironmentId'> | null | undefined
-  filePath: string
-  relativePath?: string
-  worktreeId?: string
-  connectionId?: string
-  expectedExternalSshTargetId?: string
-  includeLocalLogMetadata?: boolean
-}
-
-export type RuntimeFileOperationArgs = {
-  settings: Pick<GlobalSettings, 'activeRuntimeEnvironmentId'> | null | undefined
-  worktreeId: string | null | undefined
-  worktreePath: string | null | undefined
-  connectionId?: string
-  expectedExecutionHostId?: 'local' | `ssh:${string}`
-  expectedSshTargetId?: string
-  expectedSshConnectionGeneration?: number
-  expectedExternalSshTargetId?: string
-}
-
-const QUICK_OPEN_REMOTE_UPDATE_REQUIRED_MESSAGE =
-  'Quick Open search requires a newer paired Orca host. Update the remote host and reconnect.'
-
-function assertExternalSshReadOwnership(
-  settings: Pick<GlobalSettings, 'activeRuntimeEnvironmentId'> | null | undefined,
-  connectionId: string | undefined,
-  expectedExternalSshTargetId: string | undefined
-): void {
-  const expectedTargetId = expectedExternalSshTargetId?.trim()
-  if (
-    expectedTargetId &&
-    (getActiveRuntimeTarget(settings).kind === 'environment' || connectionId !== expectedTargetId)
-  ) {
-    throw new Error('External SSH files are not available after the workspace host changes.')
-  }
-}
-
-function withSshMutationExpectation<T extends object>(
-  context: RuntimeFileOperationArgs,
-  params: T
-): T & {
-  expectedExecutionHostId: 'local' | `ssh:${string}`
-  expectedSshTargetId?: string
-  expectedSshConnectionGeneration?: number
-} {
-  const sshTargetId = context.expectedSshTargetId ?? context.connectionId
-  return {
-    ...params,
-    expectedExecutionHostId:
-      context.expectedExecutionHostId ??
-      (sshTargetId ? `ssh:${encodeURIComponent(sshTargetId)}` : 'local'),
-    ...(context.expectedSshTargetId === undefined
-      ? {}
-      : { expectedSshTargetId: context.expectedSshTargetId }),
-    ...(context.expectedSshConnectionGeneration === undefined
-      ? {}
-      : { expectedSshConnectionGeneration: context.expectedSshConnectionGeneration })
-  }
-}
-
-export type RuntimeFileDownloadResult =
-  | { canceled: true }
-  | { canceled: false; destinationPath: string }
-
-type StagedRuntimeImportSource =
-  | {
-      sourcePath: string
-      status: 'staged'
-      name: string
-      kind: 'file' | 'directory'
-      entries: StagedRuntimeImportEntry[]
-    }
-  | {
-      sourcePath: string
-      status: 'skipped'
-      reason: 'missing' | 'symlink' | 'permission-denied' | 'unsupported'
-    }
-  | { sourcePath: string; status: 'failed'; reason: string }
-
-type StagedRuntimeImportEntry =
-  | { relativePath: string; kind: 'directory' }
-  | { relativePath: string; kind: 'file'; contentBase64: string }
-
-type RuntimeImportResult =
-  | {
-      sourcePath: string
-      status: 'imported'
-      destPath: string
-      kind: 'file' | 'directory'
-      renamed: boolean
-    }
-  | {
-      sourcePath: string
-      status: 'skipped'
-      reason: 'missing' | 'symlink' | 'permission-denied' | 'unsupported'
-    }
-  | {
-      sourcePath: string
-      status: 'failed'
-      reason: string
-    }
-
-type RuntimeFileWatchEvent =
-  | { type: 'starting'; subscriptionId: string }
-  | { type: 'ready'; subscriptionId: string }
-  | { type: 'changed'; worktree: string; events: FsChangedPayload['events'] }
-  | { type: 'error'; message: string }
-  | { type: 'end' }
-
-const REMOTE_UPLOAD_BASE64_CHUNK_CHARS = 512 * 1024
-const REMOTE_DOWNLOAD_CHUNK_BYTES = 384 * 1024
-const REMOTE_DOWNLOAD_UPDATE_REQUIRED_MESSAGE =
-  'Remote file download requires a newer Orca server. Update the headless server and try again.'
-
-type RemoteFileDownloadArgs = NonNullable<ReturnType<typeof getRemoteFileArgs>>
-type RuntimeFileMutationTarget = { kind: 'environment'; environmentId: string }
-
-async function assertRuntimeFileMutationCapability(
-  target: RuntimeFileMutationTarget,
-  expectedEnvironmentPairingRevision: number | undefined
-): Promise<void> {
-  const status = await callRuntimeRpc<RuntimeStatus>(target, 'status.get', undefined, {
-    timeoutMs: 15_000,
-    expectedEnvironmentPairingRevision
-  })
-  assertFileMutationOwnershipCapability(status)
-}
-
-async function callRuntimeFileMutation<TResult>(
-  target: RuntimeFileMutationTarget,
-  method: string,
-  params: unknown,
-  timeoutMs: number,
-  expectedEnvironmentPairingRevision?: number
-): Promise<TResult> {
-  const requestRevision = captureRuntimeEnvironmentRequestRevision(
-    target.environmentId,
-    expectedEnvironmentPairingRevision
-  )
-  await assertRuntimeFileMutationCapability(target, requestRevision)
-  return callRuntimeRpc<TResult>(target, method, params, {
-    timeoutMs,
-    expectedEnvironmentPairingRevision: requestRevision
-  })
-}
-
-function createRuntimeImportSessionGuard(
-  environmentId: string,
-  expectedEnvironmentPairingRevision: number | undefined,
-  assertCallerCurrent?: () => void
-): () => void {
-  return () => {
-    if (getRuntimeEnvironmentRevision(environmentId) !== expectedEnvironmentPairingRevision) {
-      throw new Error('Runtime pairing changed; retry the import.')
-    }
-    assertCallerCurrent?.()
-  }
-}
-
-type RuntimeFileWatchListener = {
-  onPayload: (payload: FsChangedPayload) => void
-  onError?: (error: Error) => void
-}
-
-type SharedRuntimeFileWatch = {
-  target: { kind: 'environment'; environmentId: string }
-  worktreeId: string
-  listeners: Set<RuntimeFileWatchListener>
-  start: Promise<void>
-  unsubscribe: (() => void) | null
-  remoteSubscriptionId: string | null
-  keepStreamUntilReady: boolean
-  closed: boolean
-}
-
-const sharedRuntimeFileWatches = new Map<string, SharedRuntimeFileWatch>()
-
-function getSharedRuntimeFileWatchKey(
-  environmentId: string,
-  worktreeId: string,
-  worktreePath: string
-): string {
-  return `${environmentId}\0${worktreeId}\0${worktreePath}`
-}
-
-export function getRuntimeFileReadScope(
-  settings: Pick<GlobalSettings, 'activeRuntimeEnvironmentId'> | null | undefined,
-  connectionId: string | undefined
-): string | undefined {
-  const target = getActiveRuntimeTarget(settings)
-  return target.kind === 'environment' ? `runtime:${target.environmentId}` : connectionId
-}
-
-export async function readRuntimeFileContent({
-  settings,
-  filePath,
-  relativePath,
-  worktreeId,
-  connectionId,
-  expectedExternalSshTargetId,
-  includeLocalLogMetadata
-}: RuntimeFileReadArgs): Promise<RuntimeReadableFileContent> {
-  assertExternalSshReadOwnership(settings, connectionId, expectedExternalSshTargetId)
-  const target = getActiveRuntimeTarget(settings)
-  if (target.kind !== 'environment') {
-    return window.api.fs.readFile({ filePath, connectionId, includeLocalLogMetadata })
-  }
-  if (!worktreeId) {
-    return window.api.fs.readFile({ filePath, connectionId, includeLocalLogMetadata })
-  }
-  if (!canReadRelativeRuntimeFile(relativePath)) {
-    throw new Error('Remote file is outside the owning runtime worktree')
-  }
-
-  const worktree = toRuntimeWorktreeSelector(worktreeId)
-  let result: RuntimeFileReadResult
-  try {
-    result = await callRuntimeRpc<RuntimeFileReadResult>(
-      target,
-      'files.read',
-      { worktree, relativePath },
-      { timeoutMs: 15_000 }
-    )
-  } catch (err) {
-    // Why: files.read rejects binary paths with the typed 'binary_file' error; fall
-    // back to the base64 preview RPC so PDFs/images render like local/SSH paths.
-    // Match the exact typed error so an unrelated failure can't spoof the fallback.
-    if (err instanceof RuntimeRpcCallError && err.message === 'binary_file') {
-      return callRuntimeRpc<RuntimeFilePreviewResult>(
-        target,
-        'files.readPreview',
-        { worktree, relativePath },
-        { timeoutMs: 15_000 }
-      )
-    }
-    throw err
-  }
-  if (result.truncated) {
-    // Why: the runtime file RPC is preview-sized today; treating a truncated
-    // payload as editable content would make saves overwrite the rest of the file.
-    throw new Error(`Remote file is too large to open in the editor (${result.byteLength} bytes)`)
-  }
-  return { content: result.content, isBinary: false }
-}
-
-export async function readRuntimeFilePreview(
-  context: RuntimeFileOperationArgs,
-  filePath: string
-): Promise<RuntimeFilePreviewResult> {
-  assertExternalSshReadOwnership(
-    context.settings,
-    context.connectionId,
-    context.expectedExternalSshTargetId
-  )
-  const remoteArgs = getRemoteFileArgs(context, filePath)
-  if (!remoteArgs) {
-    if (hasRemoteRuntimeOwner(context)) {
-      throw new Error('Remote file is outside the owning runtime worktree')
-    }
-    return window.api.fs.readFile({ filePath, connectionId: context.connectionId })
-  }
-  return callRuntimeRpc<RuntimeFilePreviewResult>(
-    remoteArgs.target,
-    'files.readPreview',
-    { worktree: remoteArgs.worktreeSelector, relativePath: remoteArgs.relativePath },
-    { timeoutMs: 15_000 }
-  )
-}
-
-export async function downloadRuntimeFile(
-  context: RuntimeFileOperationArgs,
-  filePath: string,
-  suggestedName: string
-): Promise<RuntimeFileDownloadResult> {
-  assertExternalSshReadOwnership(
-    context.settings,
-    context.connectionId,
-    context.expectedExternalSshTargetId
-  )
-  const remoteArgs = getRemoteFileArgs(context, filePath)
-  if (!remoteArgs) {
-    if (hasRemoteRuntimeOwner(context)) {
-      throw new Error('Remote file is outside the owning runtime worktree')
-    }
-    if (context.connectionId) {
-      return window.api.fs.downloadFile({ filePath, connectionId: context.connectionId })
-    }
-    const result = await readRuntimeFilePreview(context, filePath)
-    return window.api.fs.saveDownloadedFile({
-      suggestedName,
-      content: result.content,
-      encoding: result.isBinary ? 'base64' : 'utf8'
-    })
-  }
-
-  if (!(await remoteChunkedDownloadAvailable(remoteArgs))) {
-    return downloadRemoteFileViaPreview(remoteArgs, suggestedName)
-  }
-
-  const download = await window.api.fs.startDownloadedFile({ suggestedName })
-  if (download.canceled) {
-    return download
-  }
-
-  let finished = false
-  try {
-    let offset = 0
-    for (;;) {
-      const chunk = await readRemoteDownloadChunk(remoteArgs, offset)
-      if (chunk.bytesRead > 0) {
-        await window.api.fs.appendDownloadedFileChunk({
-          transferId: download.transferId,
-          contentBase64: chunk.contentBase64
-        })
-      }
-      offset += chunk.bytesRead
-      if (chunk.eof) {
-        break
-      }
-      if (chunk.bytesRead <= 0) {
-        throw new Error('Remote download stalled before reaching EOF')
-      }
-    }
-    const result = await window.api.fs.finishDownloadedFile({ transferId: download.transferId })
-    finished = true
-    return result
-  } finally {
-    if (!finished) {
-      await window.api.fs.cancelDownloadedFile({ transferId: download.transferId }).catch(() => {})
-    }
-  }
-}
-
-async function remoteChunkedDownloadAvailable(
-  remoteArgs: RemoteFileDownloadArgs
-): Promise<boolean> {
-  try {
-    await callRuntimeRpc<RuntimeFileReadChunkResult>(
-      remoteArgs.target,
-      'files.readChunk',
-      {
-        worktree: remoteArgs.worktreeSelector,
-        relativePath: remoteArgs.relativePath,
-        offset: 0,
-        length: 1
-      },
-      { timeoutMs: 60_000 }
-    )
-    return true
-  } catch (error) {
-    // Why: compatible older headless servers may lack chunked downloads while
-    // still supporting preview-sized file reads that can complete the request.
-    if (error instanceof RuntimeRpcCallError && error.code === 'method_not_found') {
-      return false
-    }
-    throw error
-  }
-}
-
-async function readRemoteDownloadChunk(
-  remoteArgs: RemoteFileDownloadArgs,
-  offset: number
-): Promise<RuntimeFileReadChunkResult> {
-  return callRuntimeRpc<RuntimeFileReadChunkResult>(
-    remoteArgs.target,
-    'files.readChunk',
-    {
-      worktree: remoteArgs.worktreeSelector,
-      relativePath: remoteArgs.relativePath,
-      offset,
-      length: REMOTE_DOWNLOAD_CHUNK_BYTES
-    },
-    { timeoutMs: 60_000 }
-  )
-}
-
-async function downloadRemoteFileViaPreview(
-  remoteArgs: RemoteFileDownloadArgs,
-  suggestedName: string
-): Promise<RuntimeFileDownloadResult> {
-  try {
-    const result = await callRuntimeRpc<RuntimeFilePreviewResult>(
-      remoteArgs.target,
-      'files.readPreview',
-      { worktree: remoteArgs.worktreeSelector, relativePath: remoteArgs.relativePath },
-      { timeoutMs: 15_000 }
-    )
-    // Why: old servers use an empty, metadata-free binary result to signal an
-    // unsupported binary; recognized zero-byte previews are still complete.
-    if (result.isBinary && !result.content && !result.isImage && !result.mimeType) {
-      throw new Error(REMOTE_DOWNLOAD_UPDATE_REQUIRED_MESSAGE)
-    }
-    return window.api.fs.saveDownloadedFile({
-      suggestedName,
-      content: result.content,
-      encoding: result.isBinary ? 'base64' : 'utf8'
-    })
-  } catch (error) {
-    if (isUnsupportedRemotePreviewDownload(error)) {
-      throw new Error(REMOTE_DOWNLOAD_UPDATE_REQUIRED_MESSAGE)
-    }
-    throw error
-  }
-}
-
-function isUnsupportedRemotePreviewDownload(error: unknown): boolean {
-  if (!(error instanceof RuntimeRpcCallError)) {
-    return false
-  }
-  return (
-    error.code === 'method_not_found' ||
-    (error.code === 'runtime_error' &&
-      (error.message === 'file_too_large' || error.message === 'binary_file'))
-  )
-}
-
-export async function readRuntimeDirectory(
-  context: RuntimeFileOperationArgs,
-  dirPath: string
-): Promise<DirEntry[]> {
-  const remoteArgs = getRemoteFileArgs(context, dirPath)
-  if (!remoteArgs) {
-    assertLocalFilesystemFallbackAllowed(context)
-    return window.api.fs.readDir({ dirPath, connectionId: context.connectionId })
-  }
-  return callRuntimeRpc<DirEntry[]>(
-    remoteArgs.target,
-    'files.readDir',
-    { worktree: remoteArgs.worktreeSelector, relativePath: remoteArgs.relativePath },
-    { timeoutMs: 15_000 }
-  )
-}
-
-export async function writeRuntimeFile(
-  context: RuntimeFileOperationArgs,
-  filePath: string,
-  content: string
-): Promise<void> {
-  const remoteArgs = getRemoteFileArgs(context, filePath)
-  if (!remoteArgs) {
-    assertLocalFilesystemFallbackAllowed(context)
-    await window.api.fs.writeFile(
-      withSshMutationExpectation(context, { filePath, content, connectionId: context.connectionId })
-    )
-    return
-  }
-  await callRuntimeFileMutation(
-    remoteArgs.target,
-    'files.write',
-    withSshMutationExpectation(context, {
-      worktree: remoteArgs.worktreeSelector,
-      relativePath: remoteArgs.relativePath,
-      content
-    }),
-    15_000
-  )
-}
-
-export async function createRuntimePath(
-  context: RuntimeFileOperationArgs,
-  path: string,
-  kind: 'file' | 'directory'
-): Promise<void> {
-  const remoteArgs = getRemoteFileArgs(context, path)
-  if (!remoteArgs) {
-    assertLocalFilesystemFallbackAllowed(context)
-    await (kind === 'directory'
-      ? window.api.fs.createDir(
-          withSshMutationExpectation(context, { dirPath: path, connectionId: context.connectionId })
-        )
-      : window.api.fs.createFile(
-          withSshMutationExpectation(context, {
-            filePath: path,
-            connectionId: context.connectionId
-          })
-        ))
-    return
-  }
-  await callRuntimeFileMutation(
-    remoteArgs.target,
-    kind === 'directory' ? 'files.createDir' : 'files.createFile',
-    withSshMutationExpectation(context, {
-      worktree: remoteArgs.worktreeSelector,
-      relativePath: remoteArgs.relativePath
-    }),
-    15_000
-  )
-}
-
-export async function renameRuntimePath(
-  context: RuntimeFileOperationArgs,
-  oldPath: string,
-  newPath: string
-): Promise<void> {
-  const oldRemoteArgs = getRemoteFileArgs(context, oldPath)
-  const newRelativePath = getRelativePathInsideWorktree(context.worktreePath, newPath)
-  if (!oldRemoteArgs || newRelativePath === null) {
-    assertLocalFilesystemFallbackAllowed(context)
-    await window.api.fs.rename(
-      withSshMutationExpectation(context, { oldPath, newPath, connectionId: context.connectionId })
-    )
-    return
-  }
-  await callRuntimeFileMutation(
-    oldRemoteArgs.target,
-    'files.rename',
-    withSshMutationExpectation(context, {
-      worktree: oldRemoteArgs.worktreeSelector,
-      oldRelativePath: oldRemoteArgs.relativePath,
-      newRelativePath
-    }),
-    15_000
-  )
-}
-
-export async function copyRuntimePath(
-  context: RuntimeFileOperationArgs,
-  sourcePath: string,
-  destinationPath: string
-): Promise<void> {
-  const sourceArgs = getRemoteFileArgs(context, sourcePath)
-  const destinationArgs = getRemoteFileArgs(context, destinationPath)
-  if (!sourceArgs || !destinationArgs) {
-    assertLocalFilesystemFallbackAllowed(context)
-    await window.api.fs.copy(
-      withSshMutationExpectation(context, {
-        sourcePath,
-        destinationPath,
-        connectionId: context.connectionId
-      })
-    )
-    return
-  }
-  await callRuntimeFileMutation(
-    sourceArgs.target,
-    'files.copy',
-    withSshMutationExpectation(context, {
-      worktree: sourceArgs.worktreeSelector,
-      sourceRelativePath: sourceArgs.relativePath,
-      destinationRelativePath: destinationArgs.relativePath
-    }),
-    15_000
-  )
-}
-
-export async function deleteRuntimePath(
-  context: RuntimeFileOperationArgs,
-  targetPath: string,
-  recursive?: boolean
-): Promise<void> {
-  const remoteArgs = getRemoteFileArgs(context, targetPath)
-  if (!remoteArgs) {
-    assertLocalFilesystemFallbackAllowed(context)
-    await window.api.fs.deletePath(
-      withSshMutationExpectation(context, {
-        targetPath,
-        connectionId: context.connectionId,
-        recursive
-      })
-    )
-    return
-  }
-  await callRuntimeFileMutation(
-    remoteArgs.target,
-    'files.delete',
-    withSshMutationExpectation(context, {
-      worktree: remoteArgs.worktreeSelector,
-      relativePath: remoteArgs.relativePath,
-      recursive
-    }),
-    15_000
-  )
-}
-
-export async function deleteRuntimeRelativePath(
-  context: RuntimeFileOperationArgs,
-  relativePath: string,
-  recursive?: boolean
-): Promise<boolean> {
-  const target = getActiveRuntimeTarget(context.settings)
-  if (
-    target.kind !== 'environment' ||
-    !context.worktreeId ||
-    !canReadRelativeRuntimeFile(relativePath)
-  ) {
-    return false
-  }
-  await callRuntimeFileMutation(
-    target,
-    'files.delete',
-    withSshMutationExpectation(context, {
-      worktree: toRuntimeWorktreeSelector(context.worktreeId),
-      relativePath: normalizeRelativePath(relativePath),
-      recursive
-    }),
-    15_000
-  )
-  return true
-}
-
-export async function importExternalPathsToRuntime(
-  context: RuntimeFileOperationArgs,
-  sourcePaths: string[],
-  destinationDir: string,
-  options?: { ensureDestinationDir?: boolean; assertCurrent?: () => void }
-): Promise<{ results: RuntimeImportResult[] }> {
-  const target = getActiveRuntimeTarget(context.settings)
-  if (target.kind !== 'environment' || !context.worktreeId || !context.worktreePath) {
-    return window.api.fs.importExternalPaths(
-      withSshMutationExpectation(context, {
-        sourcePaths,
-        destDir: destinationDir,
-        connectionId: context.connectionId,
-        ensureDir: options?.ensureDestinationDir
-      })
-    )
-  }
-
-  const destinationArgs = getRemoteFileArgs(context, destinationDir)
-  if (!destinationArgs) {
-    throw new Error('Destination is outside the active runtime worktree')
-  }
-
-  const expectedEnvironmentPairingRevision = captureRuntimeEnvironmentRequestRevision(
-    target.environmentId
-  )
-  const assertImportSessionCurrent = createRuntimeImportSessionGuard(
-    target.environmentId,
-    expectedEnvironmentPairingRevision,
-    options?.assertCurrent
-  )
-  await assertRuntimeFileMutationCapability(target, expectedEnvironmentPairingRevision)
-  assertImportSessionCurrent()
-  const staged = await window.api.fs.stageExternalPathsForRuntimeUpload({ sourcePaths })
-  assertImportSessionCurrent()
-  const results: RuntimeImportResult[] = []
-  const reservedNames = new Set<string>()
-
-  await ensureRuntimeDirectory(
-    context,
-    destinationDir,
-    assertImportSessionCurrent,
-    expectedEnvironmentPairingRevision
-  )
-
-  for (const source of staged.sources as StagedRuntimeImportSource[]) {
-    if (source.status !== 'staged') {
-      results.push(source)
-      continue
-    }
-    let createdDirectoryImportRoot: string | null = null
-    try {
-      const finalName = await deconflictRuntimeImportName(
-        context,
-        destinationDir,
-        source.name,
-        reservedNames,
-        expectedEnvironmentPairingRevision
-      )
-      const destPath = joinPath(destinationDir, finalName)
-      const destRelativePath = joinRuntimeRelativePath(destinationArgs.relativePath, finalName)
-      for (const entry of source.entries) {
-        const entryRelativePath = joinRuntimeRelativePath(destRelativePath, entry.relativePath)
-        if (entry.kind === 'directory') {
-          assertImportSessionCurrent()
-          await callRuntimeFileMutation(
-            target,
-            'files.createDirNoClobber',
-            withSshMutationExpectation(context, {
-              worktree: toRuntimeWorktreeSelector(context.worktreeId),
-              relativePath: entryRelativePath
-            }),
-            15_000,
-            expectedEnvironmentPairingRevision
-          )
-          if (source.kind === 'directory' && entry.relativePath === '') {
-            createdDirectoryImportRoot = entryRelativePath
-          }
-          continue
-        }
-        await uploadRuntimeFileWithoutClobber(
-          target,
-          context.worktreeId,
-          entryRelativePath,
-          entry.contentBase64,
-          assertImportSessionCurrent,
-          context.expectedSshConnectionGeneration,
-          context.expectedSshTargetId,
-          context.expectedExecutionHostId ??
-            (context.expectedSshTargetId
-              ? `ssh:${encodeURIComponent(context.expectedSshTargetId)}`
-              : 'local'),
-          expectedEnvironmentPairingRevision
-        )
-      }
-      reservedNames.add(finalName)
-      results.push({
-        sourcePath: source.sourcePath,
-        status: 'imported',
-        destPath,
-        kind: source.kind,
-        renamed: finalName !== source.name
-      })
-    } catch (error) {
-      if (createdDirectoryImportRoot) {
-        // Why: match local directory imports by removing the no-clobber root
-        // Orca created when a nested runtime upload fails halfway through.
-        assertImportSessionCurrent()
-        await callRuntimeFileMutation(
-          target,
-          'files.delete',
-          withSshMutationExpectation(context, {
-            worktree: toRuntimeWorktreeSelector(context.worktreeId),
-            relativePath: createdDirectoryImportRoot,
-            recursive: true
-          }),
-          15_000,
-          expectedEnvironmentPairingRevision
-        ).catch(() => {})
-      }
-      results.push({
-        sourcePath: source.sourcePath,
-        status: 'failed',
-        reason: error instanceof Error ? error.message : String(error)
-      })
-    }
-  }
-
-  return { results }
-}
-
-async function uploadRuntimeFileWithoutClobber(
-  target: { kind: 'environment'; environmentId: string },
-  worktreeId: string,
-  relativePath: string,
-  contentBase64: string,
-  assertCurrent?: () => void,
-  expectedSshConnectionGeneration?: number,
-  expectedSshTargetId?: string,
-  expectedExecutionHostId?: 'local' | `ssh:${string}`,
-  expectedEnvironmentPairingRevision?: number
-): Promise<void> {
-  const tempRelativePath = makeRuntimeUploadTempPath(relativePath)
-  try {
-    await writeRuntimeBase64File(
-      target,
-      worktreeId,
-      tempRelativePath,
-      contentBase64,
-      assertCurrent,
-      expectedSshConnectionGeneration,
-      expectedSshTargetId,
-      expectedExecutionHostId,
-      expectedEnvironmentPairingRevision
-    )
-    assertCurrent?.()
-    await callRuntimeFileMutation(
-      target,
-      'files.commitUpload',
-      {
-        worktree: toRuntimeWorktreeSelector(worktreeId),
-        tempRelativePath,
-        finalRelativePath: relativePath,
-        expectedSshTargetId,
-        expectedSshConnectionGeneration,
-        expectedExecutionHostId
-      },
-      30_000,
-      expectedEnvironmentPairingRevision
-    )
-  } finally {
-    assertCurrent?.()
-    await callRuntimeFileMutation(
-      target,
-      'files.delete',
-      {
-        worktree: toRuntimeWorktreeSelector(worktreeId),
-        relativePath: tempRelativePath,
-        recursive: false,
-        expectedSshTargetId,
-        expectedSshConnectionGeneration,
-        expectedExecutionHostId
-      },
-      15_000,
-      expectedEnvironmentPairingRevision
-    ).catch(() => {})
-  }
-}
-
-async function writeRuntimeBase64File(
-  target: { kind: 'environment'; environmentId: string },
-  worktreeId: string,
-  relativePath: string,
-  contentBase64: string,
-  assertCurrent?: () => void,
-  expectedSshConnectionGeneration?: number,
-  expectedSshTargetId?: string,
-  expectedExecutionHostId?: 'local' | `ssh:${string}`,
-  expectedEnvironmentPairingRevision?: number
-): Promise<void> {
-  if (contentBase64.length <= REMOTE_UPLOAD_BASE64_CHUNK_CHARS) {
-    assertCurrent?.()
-    await callRuntimeFileMutation(
-      target,
-      'files.writeBase64',
-      {
-        worktree: toRuntimeWorktreeSelector(worktreeId),
-        relativePath,
-        contentBase64,
-        expectedSshTargetId,
-        expectedSshConnectionGeneration,
-        expectedExecutionHostId
-      },
-      30_000,
-      expectedEnvironmentPairingRevision
-    )
-    return
-  }
-
-  for (let offset = 0; offset < contentBase64.length; offset += REMOTE_UPLOAD_BASE64_CHUNK_CHARS) {
-    assertCurrent?.()
-    await callRuntimeFileMutation(
-      target,
-      'files.writeBase64Chunk',
-      {
-        worktree: toRuntimeWorktreeSelector(worktreeId),
-        relativePath,
-        contentBase64: contentBase64.slice(offset, offset + REMOTE_UPLOAD_BASE64_CHUNK_CHARS),
-        append: offset > 0,
-        expectedSshTargetId,
-        expectedSshConnectionGeneration,
-        expectedExecutionHostId
-      },
-      30_000,
-      expectedEnvironmentPairingRevision
-    )
-  }
-}
-
-function makeRuntimeUploadTempPath(relativePath: string): string {
-  const normalized = normalizeRelativePath(relativePath)
-  const slashIndex = normalized.lastIndexOf('/')
-  const dir = slashIndex === -1 ? '' : normalized.slice(0, slashIndex + 1)
-  const leaf = slashIndex === -1 ? normalized : normalized.slice(slashIndex + 1)
-  const nonce = `${Date.now().toString(36)}-${Math.random().toString(36).slice(2)}`
-  return `${dir}.${leaf}.orca-upload-${nonce}`
-}
-
-async function ensureRuntimeDirectory(
-  context: RuntimeFileOperationArgs,
-  destinationDir: string,
-  assertCurrent: () => void,
-  expectedEnvironmentPairingRevision: number | undefined
-): Promise<void> {
-  const destinationArgs = getRemoteFileArgs(context, destinationDir)
-  if (!destinationArgs) {
-    return
-  }
-  const parts = normalizeRelativePath(destinationArgs.relativePath)
-    .split('/')
-    .filter((part) => part.length > 0)
-  let current = ''
-  for (const part of parts) {
-    current = joinRuntimeRelativePath(current, part)
-    const absolutePath = joinPath(context.worktreePath ?? '', current)
-    assertCurrent()
-    if (await runtimePathExists(context, absolutePath, expectedEnvironmentPairingRevision)) {
-      continue
-    }
-    assertCurrent?.()
-    await callRuntimeFileMutation(
-      destinationArgs.target,
-      'files.createDir',
-      withSshMutationExpectation(context, {
-        worktree: destinationArgs.worktreeSelector,
-        relativePath: current
-      }),
-      15_000,
-      expectedEnvironmentPairingRevision
-    )
-  }
-}
-
-export async function searchRuntimeFiles(
-  context: RuntimeFileOperationArgs,
-  options: SearchOptions
-): Promise<SearchResult> {
-  if (getRuntimeFileSearchRejectedField(options)) {
-    return createEmptyRuntimeFileSearchResult()
-  }
-  const target = getActiveRuntimeTarget(context.settings)
-  if (target.kind !== 'environment' || !context.worktreeId) {
-    return window.api.fs.search({
-      ...options,
-      connectionId: context.connectionId
-    })
-  }
-  const { rootPath: _rootPath, ...runtimeOptions } = options
-  return callRuntimeRpc<SearchResult>(
-    target,
-    'files.search',
-    { worktree: toRuntimeWorktreeSelector(context.worktreeId), ...runtimeOptions },
-    { timeoutMs: 15_000 }
-  )
-}
-
-export async function listRuntimeFiles(
-  context: RuntimeFileOperationArgs,
-  args: {
-    rootPath: string
-    excludePaths?: string[]
-    requestToken?: string
-    signal?: AbortSignal
-  }
-): Promise<string[]> {
-  const target = getActiveRuntimeTarget(context.settings)
-  if (target.kind !== 'environment' || !context.worktreeId) {
-    return window.api.fs.listFiles({
-      rootPath: args.rootPath,
-      connectionId: context.connectionId,
-      excludePaths: args.excludePaths,
-      requestToken: args.requestToken
-    })
-  }
-  return callRuntimeRpc<string[]>(
-    target,
-    'files.listAll',
-    {
-      worktree: toRuntimeWorktreeSelector(context.worktreeId),
-      excludePaths: args.excludePaths
-    },
-    { timeoutMs: 15_000, ...(args.signal === undefined ? {} : { signal: args.signal }) }
-  )
-}
-
-export async function searchRuntimeFilePaths(
-  context: RuntimeFileOperationArgs,
-  args: {
-    query: string
-    limit?: number
-    excludePaths?: string[]
-    requestToken?: string
-    signal?: AbortSignal
-  }
-): Promise<{ files: string[]; truncated: boolean }> {
-  const target = getActiveRuntimeTarget(context.settings)
-  if (target.kind !== 'environment') {
-    if (!context.connectionId || !context.worktreePath) {
-      return { files: [], truncated: false }
-    }
-    const limit = args.limit ?? 32
-    const files = await window.api.fs.listFiles({
-      rootPath: context.worktreePath,
-      connectionId: context.connectionId,
-      excludePaths: args.excludePaths,
-      requestToken: args.requestToken,
-      maxResults: limit + 1,
-      searchQuery: args.query
-    })
-    return { files: files.slice(0, limit), truncated: files.length > limit }
-  }
-  if (!context.worktreeId) {
-    return { files: [], truncated: false }
-  }
-  const worktreeSelector = toRuntimeWorktreeSelector(context.worktreeId)
-  const limit = args.limit ?? 32
-  if (hasCachedLegacyQuickOpenInventory(target, worktreeSelector, context.worktreePath)) {
-    return searchLegacyQuickOpenInventory({
-      target,
-      worktreeSelector,
-      query: args.query,
-      limit,
-      worktreePath: context.worktreePath,
-      excludePaths: args.excludePaths,
-      signal: args.signal
-    })
-  }
-  let result: RuntimeFileListResult
-  try {
-    result = await callRuntimeRpc<RuntimeFileListResult>(
-      target,
-      'files.searchPaths',
-      {
-        worktree: worktreeSelector,
-        query: args.query,
-        limit,
-        excludePaths: args.excludePaths,
-        mode: 'quick-open'
-      },
-      { timeoutMs: 15_000, ...(args.signal === undefined ? {} : { signal: args.signal }) }
-    )
-  } catch (error) {
-    if (error instanceof RuntimeRpcCallError && error.code === 'method_not_found') {
-      try {
-        return await searchLegacyQuickOpenInventory({
-          target,
-          worktreeSelector,
-          query: args.query,
-          limit,
-          worktreePath: context.worktreePath,
-          excludePaths: args.excludePaths,
-          signal: args.signal
-        })
-      } catch (legacyError) {
-        if (legacyError instanceof RuntimeRpcCallError && legacyError.code === 'method_not_found') {
-          throw new Error(QUICK_OPEN_REMOTE_UPDATE_REQUIRED_MESSAGE)
-        }
-        throw legacyError
-      }
-    }
-    throw error
-  }
-  if (
-    args.excludePaths?.length &&
-    !(typeof result.quickOpenSearchVersion === 'number' && result.quickOpenSearchVersion >= 1)
-  ) {
-    try {
-      return await searchLegacyQuickOpenInventory({
-        target,
-        worktreeSelector,
-        query: args.query,
-        limit,
-        worktreePath: context.worktreePath,
-        excludePaths: args.excludePaths,
-        signal: args.signal
-      })
-    } catch (legacyError) {
-      if (legacyError instanceof RuntimeRpcCallError && legacyError.code === 'method_not_found') {
-        throw new Error(QUICK_OPEN_REMOTE_UPDATE_REQUIRED_MESSAGE)
-      }
-      throw legacyError
-    }
-  }
-  const excludePrefixes = buildExcludePathPrefixes(
-    context.worktreePath ?? result.rootPath,
-    args.excludePaths
-  )
-  return {
-    files: result.files
-      .map((entry) => entry.relativePath)
-      .filter((relativePath) => !shouldExcludeQuickOpenRelPath(relativePath, excludePrefixes)),
-    truncated: result.truncated
-  }
-}
-
-/**
- * Best-effort abort of an in-flight listRuntimeFiles call (#7721). Switching
- * workspaces must stop the previous workspace's full-tree scan — over SSH an
- * abandoned scan keeps loading the relay and starves fs.readDir/fs.stat.
- */
-export function cancelRuntimeFileList(
-  context: RuntimeFileOperationArgs,
-  requestToken: string
-): void {
-  const target = getActiveRuntimeTarget(context.settings)
-  if (target.kind !== 'environment' || !context.worktreeId) {
-    void window.api.fs.cancelListFiles({ requestToken }).catch(() => {
-      /* cancellation is advisory; the request path has its own timeouts */
-    })
-  }
-  // Environment runtimes bound files.listAll with their own RPC timeout.
-}
-
-export async function listRuntimeMarkdownDocuments(
-  context: RuntimeFileOperationArgs,
-  rootPath: string
-): Promise<MarkdownDocument[]> {
-  const target = getActiveRuntimeTarget(context.settings)
-  if (target.kind !== 'environment' || !context.worktreeId) {
-    return window.api.fs.listMarkdownDocuments({
-      rootPath,
-      connectionId: context.connectionId
-    })
-  }
-  return callRuntimeRpc<MarkdownDocument[]>(
-    target,
-    'files.listMarkdownDocuments',
-    { worktree: toRuntimeWorktreeSelector(context.worktreeId) },
-    { timeoutMs: 15_000 }
-  )
-}
-
-export async function statRuntimePath(
-  context: RuntimeFileOperationArgs,
-  absolutePath: string
-): Promise<{ size: number; isDirectory: boolean; mtime: number }> {
-  const remoteArgs = getRemoteFileArgs(context, absolutePath)
-  if (!remoteArgs) {
-    assertLocalFilesystemFallbackAllowed(context)
-    return window.api.fs.stat({
-      filePath: absolutePath,
-      connectionId: context.connectionId
-    })
-  }
-  return callRuntimeRpc<{ size: number; isDirectory: boolean; mtime: number }>(
-    remoteArgs.target,
-    'files.stat',
-    { worktree: remoteArgs.worktreeSelector, relativePath: remoteArgs.relativePath },
-    { timeoutMs: 15_000 }
-  )
-}
-
-export async function subscribeRuntimeFileChanges(
-  context: RuntimeFileOperationArgs,
-  onPayload: (payload: FsChangedPayload) => void,
-  onError?: (error: Error) => void
-): Promise<() => void> {
-  const target = getActiveRuntimeTarget(context.settings)
-  if (target.kind !== 'environment' || !context.worktreeId || !context.worktreePath) {
-    return window.api.fs.onFsChanged(onPayload)
-  }
-
-  const listener: RuntimeFileWatchListener = { onPayload, onError }
-  const key = getSharedRuntimeFileWatchKey(
-    target.environmentId,
-    context.worktreeId,
-    context.worktreePath
-  )
-  let shared = sharedRuntimeFileWatches.get(key)
-  if (!shared) {
-    shared = createSharedRuntimeFileWatch(key, target, context.worktreeId, context.worktreePath)
-    sharedRuntimeFileWatches.set(key, shared)
-  }
-  shared.listeners.add(listener)
-  try {
-    await shared.start
-  } catch (err) {
-    shared.listeners.delete(listener)
-    throw err
-  }
-
-  return () => {
-    const current = sharedRuntimeFileWatches.get(key)
-    if (!current) {
-      return
-    }
-    current.listeners.delete(listener)
-    if (current.listeners.size === 0) {
-      closeSharedRuntimeFileWatch(key, current)
-    }
-  }
-}
-
-function createSharedRuntimeFileWatch(
-  key: string,
-  target: { kind: 'environment'; environmentId: string },
-  worktreeId: string,
-  worktreePath: string
-): SharedRuntimeFileWatch {
-  const shared: SharedRuntimeFileWatch = {
-    target,
-    worktreeId,
-    listeners: new Set(),
-    start: Promise.resolve(),
-    unsubscribe: null,
-    remoteSubscriptionId: null,
-    keepStreamUntilReady: isWebRuntimeFileWatchSharedSocket(),
-    closed: false
-  }
-  // Why: editor reloads and the Explorer can watch the same remote worktree.
-  // Keep one runtime WebSocket/server watcher and fan out events in renderer.
-  shared.start = window.api.runtimeEnvironments
-    .subscribe(
-      {
-        selector: target.environmentId,
-        method: 'files.watch',
-        params: { worktree: toRuntimeWorktreeSelector(worktreeId) },
-        timeoutMs: 15_000
-      },
-      {
-        onResponse: (response) => {
-          handleSharedRuntimeFileWatchResponse(key, shared, worktreePath, response)
-        },
-        onError: (error) => {
-          failSharedRuntimeFileWatch(key, shared, new Error(error.message))
-        },
-        onClose: () => {
-          if (sharedRuntimeFileWatches.get(key) === shared) {
-            sharedRuntimeFileWatches.delete(key)
-          }
-          shared.closed = true
-          shared.unsubscribe = null
-        }
-      }
-    )
-    .then((subscription) => {
-      shared.unsubscribe = subscription.unsubscribe
-      if (shared.closed || sharedRuntimeFileWatches.get(key) !== shared) {
-        subscription.unsubscribe()
-        shared.unsubscribe = null
-        if (!shared.keepStreamUntilReady) {
-          unwatchSharedRuntimeFileWatch(shared)
-        }
-      }
-    })
-    .catch((err) => {
-      failSharedRuntimeFileWatch(key, shared, err instanceof Error ? err : new Error(String(err)))
-      throw err
-    })
-  return shared
-}
-
-function handleSharedRuntimeFileWatchResponse(
-  key: string,
-  shared: SharedRuntimeFileWatch,
-  worktreePath: string,
-  response: unknown
-): void {
-  try {
-    const event = unwrapRuntimeRpcResult<RuntimeFileWatchEvent>(
-      response as RuntimeRpcResponse<RuntimeFileWatchEvent>
-    )
-    if (event.type === 'starting' || event.type === 'ready') {
-      shared.remoteSubscriptionId = event.subscriptionId
-      if (shared.closed) {
-        shared.unsubscribe?.()
-        shared.unsubscribe = null
-        if (!shared.keepStreamUntilReady) {
-          unwatchSharedRuntimeFileWatch(shared)
-        }
-      }
-    } else if (event.type === 'changed') {
-      for (const listener of Array.from(shared.listeners)) {
-        listener.onPayload({ worktreePath, events: event.events })
-      }
-    } else if (event.type === 'error') {
-      // Why: error listeners may synchronously retry. Evict the terminal watch
-      // before callbacks run so the retry cannot join a stream awaiting `end`.
-      failSharedRuntimeFileWatch(key, shared, new Error(event.message))
-    } else if (event.type === 'end') {
-      // Why: shared-control completes without onClose; evict and release its
-      // transport handle so later listeners start cleanly without retained state.
-      if (sharedRuntimeFileWatches.get(key) === shared) {
-        sharedRuntimeFileWatches.delete(key)
-      }
-      shared.closed = true
-      const unsubscribe = shared.unsubscribe
-      shared.unsubscribe = null
-      shared.remoteSubscriptionId = null
-      shared.listeners.clear()
-      unsubscribe?.()
-    }
-  } catch (err) {
-    failSharedRuntimeFileWatch(key, shared, err instanceof Error ? err : new Error(String(err)))
-  }
-}
-
-function failSharedRuntimeFileWatch(
-  key: string,
-  shared: SharedRuntimeFileWatch,
-  error: Error
-): void {
-  if (sharedRuntimeFileWatches.get(key) === shared) {
-    sharedRuntimeFileWatches.delete(key)
-  }
-  shared.closed = true
-  shared.remoteSubscriptionId = null
-  const unsubscribe = shared.unsubscribe
-  shared.unsubscribe = null
-  const listeners = Array.from(shared.listeners)
-  shared.listeners.clear()
-  unsubscribe?.()
-  for (const listener of listeners) {
-    listener.onError?.(error)
-  }
-}
-
-function closeSharedRuntimeFileWatch(key: string, shared: SharedRuntimeFileWatch): void {
-  if (shared.closed) {
-    return
-  }
-  shared.closed = true
-  sharedRuntimeFileWatches.delete(key)
-  if (shared.keepStreamUntilReady) {
-    // Why: WebRuntimeClient owns shared-socket file-watch cleanup, including
-    // pre-ready cancellation ownership and late-ready files.unwatch.
-    shared.unsubscribe?.()
-    shared.unsubscribe = null
-    return
-  }
-  shared.unsubscribe?.()
-  shared.unsubscribe = null
-  unwatchSharedRuntimeFileWatch(shared)
-}
-
-function isWebRuntimeFileWatchSharedSocket(): boolean {
-  return Boolean((globalThis as { __ORCA_WEB_CLIENT__?: boolean }).__ORCA_WEB_CLIENT__)
-}
-
-function unwatchSharedRuntimeFileWatch(shared: SharedRuntimeFileWatch): void {
-  if (!shared.remoteSubscriptionId) {
-    return
-  }
-  void callRuntimeRpc(
-    shared.target,
-    'files.unwatch',
-    { subscriptionId: shared.remoteSubscriptionId },
-    { timeoutMs: 5_000 }
-  ).catch(() => {})
-}
-
-export async function runtimePathExists(
-  context: RuntimeFileOperationArgs,
-  absolutePath: string,
-  expectedEnvironmentPairingRevision?: number
-): Promise<boolean> {
-  const remoteArgs = getRemoteFileArgs(context, absolutePath)
-  if (!remoteArgs) {
-    assertLocalFilesystemFallbackAllowed(context)
-    return window.api.fs.pathExists({
-      filePath: absolutePath,
-      connectionId: context.connectionId
-    })
-  }
-
-  try {
-    await callRuntimeRpc(
-      remoteArgs.target,
-      'files.stat',
-      { worktree: remoteArgs.worktreeSelector, relativePath: remoteArgs.relativePath },
-      { timeoutMs: 15_000, expectedEnvironmentPairingRevision }
-    )
-    return true
-  } catch (err) {
-    const message = err instanceof Error ? err.message.toLowerCase() : String(err).toLowerCase()
-    if (
-      message.includes('enoent') ||
-      message.includes('not found') ||
-      message.includes('no such file')
-    ) {
-      return false
-    }
-    throw err
-  }
-}
-
-export function isRemoteRuntimeFileOperation(
-  context: RuntimeFileOperationArgs,
-  path: string
-): boolean {
-  return getRemoteFileArgs(context, path) !== null
-}
-
-function canReadRelativeRuntimeFile(relativePath: string | undefined): relativePath is string {
-  return Boolean(relativePath && relativePath.trim() && !isAbsolutePathLike(relativePath))
-}
-
-function isAbsolutePathLike(value: string): boolean {
-  return value.startsWith('/') || isWindowsAbsolutePathLike(value)
-}
-
-function getRemoteFileArgs(
-  context: RuntimeFileOperationArgs,
-  absolutePath: string
-): {
-  target: ReturnType<typeof getActiveRuntimeTarget> & { kind: 'environment' }
-  worktreeId: string
-  worktreeSelector: string
-  relativePath: string
-} | null {
-  const target = getActiveRuntimeTarget(context.settings)
-  if (target.kind !== 'environment' || !context.worktreeId) {
-    return null
-  }
-  const relativePath = getRelativePathInsideWorktree(context.worktreePath, absolutePath)
-  if (relativePath === null) {
-    return null
-  }
-  return {
-    target,
-    worktreeId: context.worktreeId,
-    worktreeSelector: toRuntimeWorktreeSelector(context.worktreeId),
-    relativePath
-  }
-}
-
-function hasRemoteRuntimeOwner(context: RuntimeFileOperationArgs): boolean {
-  return (
-    getActiveRuntimeTarget(context.settings).kind === 'environment' && Boolean(context.worktreeId)
-  )
-}
-
-function assertLocalFilesystemFallbackAllowed(context: RuntimeFileOperationArgs): void {
-  if (hasRemoteRuntimeOwner(context)) {
-    throw new Error('Remote file is outside the owning runtime worktree')
-  }
-}
-
-function getRelativePathInsideWorktree(
-  worktreePath: string | null | undefined,
-  absolutePath: string
-): string | null {
-  if (!worktreePath) {
-    return null
-  }
-  return relativePathInsideRoot(worktreePath, absolutePath)
-}
-
-async function deconflictRuntimeImportName(
-  context: RuntimeFileOperationArgs,
-  destinationDir: string,
-  originalName: string,
-  reservedNames: Set<string>,
-  expectedEnvironmentPairingRevision?: number
-): Promise<string> {
-  if (
-    !(await runtimePathExists(
-      context,
-      joinPath(destinationDir, originalName),
-      expectedEnvironmentPairingRevision
-    )) &&
-    !reservedNames.has(originalName)
-  ) {
-    return originalName
-  }
-
-  const dotIndex = originalName.lastIndexOf('.')
-  const hasMeaningfulExt = dotIndex > 0
-  const stem = hasMeaningfulExt ? originalName.slice(0, dotIndex) : originalName
-  const ext = hasMeaningfulExt ? originalName.slice(dotIndex) : ''
-  let candidate = `${stem} copy${ext}`
-  if (
-    !(await runtimePathExists(
-      context,
-      joinPath(destinationDir, candidate),
-      expectedEnvironmentPairingRevision
-    )) &&
-    !reservedNames.has(candidate)
-  ) {
-    return candidate
-  }
-
-  let counter = 2
-  while (counter < 10000) {
-    candidate = `${stem} copy ${counter}${ext}`
-    if (
-      !(await runtimePathExists(
-        context,
-        joinPath(destinationDir, candidate),
-        expectedEnvironmentPairingRevision
-      )) &&
-      !reservedNames.has(candidate)
-    ) {
-      return candidate
-    }
-    counter += 1
-  }
-  throw new Error(`Could not generate a unique name for '${basename(originalName)}'`)
-}
-
-function joinRuntimeRelativePath(basePath: string, relativePath: string): string {
-  const normalizedBase = normalizeRelativePath(basePath)
-  const normalizedRelative = normalizeRelativePath(relativePath)
-  if (!normalizedBase) {
-    return normalizedRelative
-  }
-  if (!normalizedRelative) {
-    return normalizedBase
-  }
-  return `${normalizedBase}/${normalizedRelative}`
-}
+export type {
+  RuntimeFileDownloadResult,
+  RuntimeFileOperationArgs,
+  RuntimeFileReadArgs,
+  RuntimeReadableFileContent
+} from './runtime-file-client-types'
+export {
+  downloadRuntimeFile,
+  readRuntimeFileContent,
+  readRuntimeFilePreview
+} from './runtime-file-read-client'
+export {
+  copyRuntimePath,
+  createRuntimePath,
+  deleteRuntimePath,
+  deleteRuntimeRelativePath,
+  readRuntimeDirectory,
+  renameRuntimePath,
+  writeRuntimeFile
+} from './runtime-file-mutation-client'
+export { importExternalPathsToRuntime } from './runtime-file-import-client'
+export {
+  cancelRuntimeFileList,
+  listRuntimeFiles,
+  searchRuntimeFilePaths,
+  searchRuntimeFiles
+} from './runtime-file-search-client'
+export {
+  listRuntimeMarkdownDocuments,
+  runtimePathExists,
+  statRuntimePath
+} from './runtime-file-metadata-client'
+export { getRuntimeFileReadScope, isRemoteRuntimeFileOperation } from './runtime-file-routing'
+export { subscribeRuntimeFileChanges } from './runtime-file-watch-client'
diff --git a/src/renderer/src/runtime/runtime-file-import-client.ts b/src/renderer/src/runtime/runtime-file-import-client.ts
new file mode 100644
index 00000000000..1ac059c0709
--- /dev/null
+++ b/src/renderer/src/runtime/runtime-file-import-client.ts
@@ -0,0 +1,241 @@
+import { basename, joinPath } from '@/lib/path'
+import type { RuntimeFileOperationArgs } from './runtime-file-client-types'
+import { captureRuntimeEnvironmentRequestRevision } from './runtime-environment-revision'
+import { runtimePathExists } from './runtime-file-metadata-client'
+import {
+  assertRuntimeFileMutationCapability,
+  callRuntimeFileMutation,
+  createRuntimeImportSessionGuard
+} from './runtime-file-mutation-rpc'
+import {
+  getRemoteFileArgs,
+  joinRuntimeRelativePath,
+  withSshMutationExpectation
+} from './runtime-file-routing'
+import {
+  ensureRuntimeDirectory,
+  uploadRuntimeFileWithoutClobber
+} from './runtime-file-upload-client'
+import { getActiveRuntimeTarget } from './runtime-rpc-client'
+import { toRuntimeWorktreeSelector } from './runtime-worktree-selector'
+
+type StagedRuntimeImportSource =
+  | {
+      sourcePath: string
+      status: 'staged'
+      name: string
+      kind: 'file' | 'directory'
+      entries: StagedRuntimeImportEntry[]
+    }
+  | {
+      sourcePath: string
+      status: 'skipped'
+      reason: 'missing' | 'symlink' | 'permission-denied' | 'unsupported'
+    }
+  | { sourcePath: string; status: 'failed'; reason: string }
+
+type StagedRuntimeImportEntry =
+  | { relativePath: string; kind: 'directory' }
+  | { relativePath: string; kind: 'file'; contentBase64: string }
+
+type RuntimeImportResult =
+  | {
+      sourcePath: string
+      status: 'imported'
+      destPath: string
+      kind: 'file' | 'directory'
+      renamed: boolean
+    }
+  | {
+      sourcePath: string
+      status: 'skipped'
+      reason: 'missing' | 'symlink' | 'permission-denied' | 'unsupported'
+    }
+  | {
+      sourcePath: string
+      status: 'failed'
+      reason: string
+    }
+
+export async function importExternalPathsToRuntime(
+  context: RuntimeFileOperationArgs,
+  sourcePaths: string[],
+  destinationDir: string,
+  options?: { ensureDestinationDir?: boolean; assertCurrent?: () => void }
+): Promise<{ results: RuntimeImportResult[] }> {
+  const target = getActiveRuntimeTarget(context.settings)
+  if (target.kind !== 'environment' || !context.worktreeId || !context.worktreePath) {
+    return window.api.fs.importExternalPaths(
+      withSshMutationExpectation(context, {
+        sourcePaths,
+        destDir: destinationDir,
+        connectionId: context.connectionId,
+        ensureDir: options?.ensureDestinationDir
+      })
+    )
+  }
+
+  const destinationArgs = getRemoteFileArgs(context, destinationDir)
+  if (!destinationArgs) {
+    throw new Error('Destination is outside the active runtime worktree')
+  }
+
+  const expectedEnvironmentPairingRevision = captureRuntimeEnvironmentRequestRevision(
+    target.environmentId
+  )
+  const assertImportSessionCurrent = createRuntimeImportSessionGuard(
+    target.environmentId,
+    expectedEnvironmentPairingRevision,
+    options?.assertCurrent
+  )
+  await assertRuntimeFileMutationCapability(target, expectedEnvironmentPairingRevision)
+  assertImportSessionCurrent()
+  const staged = await window.api.fs.stageExternalPathsForRuntimeUpload({ sourcePaths })
+  assertImportSessionCurrent()
+  const results: RuntimeImportResult[] = []
+  const reservedNames = new Set<string>()
+
+  await ensureRuntimeDirectory(
+    context,
+    destinationDir,
+    assertImportSessionCurrent,
+    expectedEnvironmentPairingRevision
+  )
+
+  for (const source of staged.sources as StagedRuntimeImportSource[]) {
+    if (source.status !== 'staged') {
+      results.push(source)
+      continue
+    }
+    let createdDirectoryImportRoot: string | null = null
+    try {
+      const finalName = await deconflictRuntimeImportName(
+        context,
+        destinationDir,
+        source.name,
+        reservedNames,
+        expectedEnvironmentPairingRevision
+      )
+      const destPath = joinPath(destinationDir, finalName)
+      const destRelativePath = joinRuntimeRelativePath(destinationArgs.relativePath, finalName)
+      for (const entry of source.entries) {
+        const entryRelativePath = joinRuntimeRelativePath(destRelativePath, entry.relativePath)
+        if (entry.kind === 'directory') {
+          assertImportSessionCurrent()
+          await callRuntimeFileMutation(
+            target,
+            'files.createDirNoClobber',
+            withSshMutationExpectation(context, {
+              worktree: toRuntimeWorktreeSelector(context.worktreeId),
+              relativePath: entryRelativePath
+            }),
+            15_000,
+            expectedEnvironmentPairingRevision
+          )
+          if (source.kind === 'directory' && entry.relativePath === '') {
+            createdDirectoryImportRoot = entryRelativePath
+          }
+          continue
+        }
+        await uploadRuntimeFileWithoutClobber(
+          target,
+          context.worktreeId,
+          entryRelativePath,
+          entry.contentBase64,
+          assertImportSessionCurrent,
+          context.expectedSshConnectionGeneration,
+          context.expectedSshTargetId,
+          context.expectedExecutionHostId ??
+            (context.expectedSshTargetId
+              ? `ssh:${encodeURIComponent(context.expectedSshTargetId)}`
+              : 'local'),
+          expectedEnvironmentPairingRevision
+        )
+      }
+      reservedNames.add(finalName)
+      results.push({
+        sourcePath: source.sourcePath,
+        status: 'imported',
+        destPath,
+        kind: source.kind,
+        renamed: finalName !== source.name
+      })
+    } catch (error) {
+      if (createdDirectoryImportRoot) {
+        // Why: match local directory imports by removing the no-clobber root
+        // Orca created when a nested runtime upload fails halfway through.
+        assertImportSessionCurrent()
+        await callRuntimeFileMutation(
+          target,
+          'files.delete',
+          withSshMutationExpectation(context, {
+            worktree: toRuntimeWorktreeSelector(context.worktreeId),
+            relativePath: createdDirectoryImportRoot,
+            recursive: true
+          }),
+          15_000,
+          expectedEnvironmentPairingRevision
+        ).catch(() => {})
+      }
+      results.push({
+        sourcePath: source.sourcePath,
+        status: 'failed',
+        reason: error instanceof Error ? error.message : String(error)
+      })
+    }
+  }
+
+  return { results }
+}
+
+async function deconflictRuntimeImportName(
+  context: RuntimeFileOperationArgs,
+  destinationDir: string,
+  originalName: string,
+  reservedNames: Set<string>,
+  expectedEnvironmentPairingRevision?: number
+): Promise<string> {
+  if (
+    !(await runtimePathExists(
+      context,
+      joinPath(destinationDir, originalName),
+      expectedEnvironmentPairingRevision
+    )) &&
+    !reservedNames.has(originalName)
+  ) {
+    return originalName
+  }
+
+  const dotIndex = originalName.lastIndexOf('.')
+  const hasMeaningfulExt = dotIndex > 0
+  const stem = hasMeaningfulExt ? originalName.slice(0, dotIndex) : originalName
+  const ext = hasMeaningfulExt ? originalName.slice(dotIndex) : ''
+  let candidate = `${stem} copy${ext}`
+  if (
+    !(await runtimePathExists(
+      context,
+      joinPath(destinationDir, candidate),
+      expectedEnvironmentPairingRevision
+    )) &&
+    !reservedNames.has(candidate)
+  ) {
+    return candidate
+  }
+
+  let counter = 2
+  while (counter < 10000) {
+    candidate = `${stem} copy ${counter}${ext}`
+    if (
+      !(await runtimePathExists(
+        context,
+        joinPath(destinationDir, candidate),
+        expectedEnvironmentPairingRevision
+      )) &&
+      !reservedNames.has(candidate)
+    ) {
+      return candidate
+    }
+    counter += 1
+  }
+  throw new Error(`Could not generate a unique name for '${basename(originalName)}'`)
+}
diff --git a/src/renderer/src/runtime/runtime-file-metadata-client.ts b/src/renderer/src/runtime/runtime-file-metadata-client.ts
new file mode 100644
index 00000000000..d072e800cb8
--- /dev/null
+++ b/src/renderer/src/runtime/runtime-file-metadata-client.ts
@@ -0,0 +1,79 @@
+import type { MarkdownDocument } from '../../../shared/filesystem-entry-types'
+import type { RuntimeFileOperationArgs } from './runtime-file-client-types'
+import { assertLocalFilesystemFallbackAllowed, getRemoteFileArgs } from './runtime-file-routing'
+import { callRuntimeRpc, getActiveRuntimeTarget } from './runtime-rpc-client'
+import { toRuntimeWorktreeSelector } from './runtime-worktree-selector'
+
+export async function listRuntimeMarkdownDocuments(
+  context: RuntimeFileOperationArgs,
+  rootPath: string
+): Promise<MarkdownDocument[]> {
+  const target = getActiveRuntimeTarget(context.settings)
+  if (target.kind !== 'environment' || !context.worktreeId) {
+    return window.api.fs.listMarkdownDocuments({
+      rootPath,
+      connectionId: context.connectionId
+    })
+  }
+  return callRuntimeRpc<MarkdownDocument[]>(
+    target,
+    'files.listMarkdownDocuments',
+    { worktree: toRuntimeWorktreeSelector(context.worktreeId) },
+    { timeoutMs: 15_000 }
+  )
+}
+
+export async function statRuntimePath(
+  context: RuntimeFileOperationArgs,
+  absolutePath: string
+): Promise<{ size: number; isDirectory: boolean; mtime: number }> {
+  const remoteArgs = getRemoteFileArgs(context, absolutePath)
+  if (!remoteArgs) {
+    assertLocalFilesystemFallbackAllowed(context)
+    return window.api.fs.stat({
+      filePath: absolutePath,
+      connectionId: context.connectionId
+    })
+  }
+  return callRuntimeRpc<{ size: number; isDirectory: boolean; mtime: number }>(
+    remoteArgs.target,
+    'files.stat',
+    { worktree: remoteArgs.worktreeSelector, relativePath: remoteArgs.relativePath },
+    { timeoutMs: 15_000 }
+  )
+}
+
+export async function runtimePathExists(
+  context: RuntimeFileOperationArgs,
+  absolutePath: string,
+  expectedEnvironmentPairingRevision?: number
+): Promise<boolean> {
+  const remoteArgs = getRemoteFileArgs(context, absolutePath)
+  if (!remoteArgs) {
+    assertLocalFilesystemFallbackAllowed(context)
+    return window.api.fs.pathExists({
+      filePath: absolutePath,
+      connectionId: context.connectionId
+    })
+  }
+
+  try {
+    await callRuntimeRpc(
+      remoteArgs.target,
+      'files.stat',
+      { worktree: remoteArgs.worktreeSelector, relativePath: remoteArgs.relativePath },
+      { timeoutMs: 15_000, expectedEnvironmentPairingRevision }
+    )
+    return true
+  } catch (err) {
+    const message = err instanceof Error ? err.message.toLowerCase() : String(err).toLowerCase()
+    if (
+      message.includes('enoent') ||
+      message.includes('not found') ||
+      message.includes('no such file')
+    ) {
+      return false
+    }
+    throw err
+  }
+}
diff --git a/src/renderer/src/runtime/runtime-file-mutation-client.ts b/src/renderer/src/runtime/runtime-file-mutation-client.ts
new file mode 100644
index 00000000000..b2a358a5200
--- /dev/null
+++ b/src/renderer/src/runtime/runtime-file-mutation-client.ts
@@ -0,0 +1,197 @@
+import type { DirEntry } from '../../../shared/filesystem-entry-types'
+import { normalizeRelativePath } from '@/lib/path'
+import { callRuntimeRpc, getActiveRuntimeTarget } from './runtime-rpc-client'
+import type { RuntimeFileOperationArgs } from './runtime-file-client-types'
+import {
+  assertLocalFilesystemFallbackAllowed,
+  canReadRelativeRuntimeFile,
+  getRelativePathInsideWorktree,
+  getRemoteFileArgs,
+  withSshMutationExpectation
+} from './runtime-file-routing'
+import { callRuntimeFileMutation } from './runtime-file-mutation-rpc'
+import { toRuntimeWorktreeSelector } from './runtime-worktree-selector'
+
+export async function readRuntimeDirectory(
+  context: RuntimeFileOperationArgs,
+  dirPath: string
+): Promise<DirEntry[]> {
+  const remoteArgs = getRemoteFileArgs(context, dirPath)
+  if (!remoteArgs) {
+    assertLocalFilesystemFallbackAllowed(context)
+    return window.api.fs.readDir({ dirPath, connectionId: context.connectionId })
+  }
+  return callRuntimeRpc<DirEntry[]>(
+    remoteArgs.target,
+    'files.readDir',
+    { worktree: remoteArgs.worktreeSelector, relativePath: remoteArgs.relativePath },
+    { timeoutMs: 15_000 }
+  )
+}
+
+export async function writeRuntimeFile(
+  context: RuntimeFileOperationArgs,
+  filePath: string,
+  content: string
+): Promise<void> {
+  const remoteArgs = getRemoteFileArgs(context, filePath)
+  if (!remoteArgs) {
+    assertLocalFilesystemFallbackAllowed(context)
+    await window.api.fs.writeFile(
+      withSshMutationExpectation(context, { filePath, content, connectionId: context.connectionId })
+    )
+    return
+  }
+  await callRuntimeFileMutation(
+    remoteArgs.target,
+    'files.write',
+    withSshMutationExpectation(context, {
+      worktree: remoteArgs.worktreeSelector,
+      relativePath: remoteArgs.relativePath,
+      content
+    }),
+    15_000
+  )
+}
+
+export async function createRuntimePath(
+  context: RuntimeFileOperationArgs,
+  path: string,
+  kind: 'file' | 'directory'
+): Promise<void> {
+  const remoteArgs = getRemoteFileArgs(context, path)
+  if (!remoteArgs) {
+    assertLocalFilesystemFallbackAllowed(context)
+    await (kind === 'directory'
+      ? window.api.fs.createDir(
+          withSshMutationExpectation(context, { dirPath: path, connectionId: context.connectionId })
+        )
+      : window.api.fs.createFile(
+          withSshMutationExpectation(context, {
+            filePath: path,
+            connectionId: context.connectionId
+          })
+        ))
+    return
+  }
+  await callRuntimeFileMutation(
+    remoteArgs.target,
+    kind === 'directory' ? 'files.createDir' : 'files.createFile',
+    withSshMutationExpectation(context, {
+      worktree: remoteArgs.worktreeSelector,
+      relativePath: remoteArgs.relativePath
+    }),
+    15_000
+  )
+}
+
+export async function renameRuntimePath(
+  context: RuntimeFileOperationArgs,
+  oldPath: string,
+  newPath: string
+): Promise<void> {
+  const oldRemoteArgs = getRemoteFileArgs(context, oldPath)
+  const newRelativePath = getRelativePathInsideWorktree(context.worktreePath, newPath)
+  if (!oldRemoteArgs || newRelativePath === null) {
+    assertLocalFilesystemFallbackAllowed(context)
+    await window.api.fs.rename(
+      withSshMutationExpectation(context, { oldPath, newPath, connectionId: context.connectionId })
+    )
+    return
+  }
+  await callRuntimeFileMutation(
+    oldRemoteArgs.target,
+    'files.rename',
+    withSshMutationExpectation(context, {
+      worktree: oldRemoteArgs.worktreeSelector,
+      oldRelativePath: oldRemoteArgs.relativePath,
+      newRelativePath
+    }),
+    15_000
+  )
+}
+
+export async function copyRuntimePath(
+  context: RuntimeFileOperationArgs,
+  sourcePath: string,
+  destinationPath: string
+): Promise<void> {
+  const sourceArgs = getRemoteFileArgs(context, sourcePath)
+  const destinationArgs = getRemoteFileArgs(context, destinationPath)
+  if (!sourceArgs || !destinationArgs) {
+    assertLocalFilesystemFallbackAllowed(context)
+    await window.api.fs.copy(
+      withSshMutationExpectation(context, {
+        sourcePath,
+        destinationPath,
+        connectionId: context.connectionId
+      })
+    )
+    return
+  }
+  await callRuntimeFileMutation(
+    sourceArgs.target,
+    'files.copy',
+    withSshMutationExpectation(context, {
+      worktree: sourceArgs.worktreeSelector,
+      sourceRelativePath: sourceArgs.relativePath,
+      destinationRelativePath: destinationArgs.relativePath
+    }),
+    15_000
+  )
+}
+
+export async function deleteRuntimePath(
+  context: RuntimeFileOperationArgs,
+  targetPath: string,
+  recursive?: boolean
+): Promise<void> {
+  const remoteArgs = getRemoteFileArgs(context, targetPath)
+  if (!remoteArgs) {
+    assertLocalFilesystemFallbackAllowed(context)
+    await window.api.fs.deletePath(
+      withSshMutationExpectation(context, {
+        targetPath,
+        connectionId: context.connectionId,
+        recursive
+      })
+    )
+    return
+  }
+  await callRuntimeFileMutation(
+    remoteArgs.target,
+    'files.delete',
+    withSshMutationExpectation(context, {
+      worktree: remoteArgs.worktreeSelector,
+      relativePath: remoteArgs.relativePath,
+      recursive
+    }),
+    15_000
+  )
+}
+
+export async function deleteRuntimeRelativePath(
+  context: RuntimeFileOperationArgs,
+  relativePath: string,
+  recursive?: boolean
+): Promise<boolean> {
+  const target = getActiveRuntimeTarget(context.settings)
+  if (
+    target.kind !== 'environment' ||
+    !context.worktreeId ||
+    !canReadRelativeRuntimeFile(relativePath)
+  ) {
+    return false
+  }
+  await callRuntimeFileMutation(
+    target,
+    'files.delete',
+    withSshMutationExpectation(context, {
+      worktree: toRuntimeWorktreeSelector(context.worktreeId),
+      relativePath: normalizeRelativePath(relativePath),
+      recursive
+    }),
+    15_000
+  )
+  return true
+}
diff --git a/src/renderer/src/runtime/runtime-file-mutation-rpc.ts b/src/renderer/src/runtime/runtime-file-mutation-rpc.ts
new file mode 100644
index 00000000000..2993c105855
--- /dev/null
+++ b/src/renderer/src/runtime/runtime-file-mutation-rpc.ts
@@ -0,0 +1,51 @@
+import type { RuntimeStatus } from '../../../shared/runtime-types'
+import { assertFileMutationOwnershipCapability } from '../../../shared/file-mutation-ownership'
+import { callRuntimeRpc } from './runtime-rpc-client'
+import {
+  captureRuntimeEnvironmentRequestRevision,
+  getRuntimeEnvironmentRevision
+} from './runtime-environment-revision'
+
+type RuntimeFileMutationTarget = { kind: 'environment'; environmentId: string }
+
+export async function assertRuntimeFileMutationCapability(
+  target: RuntimeFileMutationTarget,
+  expectedEnvironmentPairingRevision: number | undefined
+): Promise<void> {
+  const status = await callRuntimeRpc<RuntimeStatus>(target, 'status.get', undefined, {
+    timeoutMs: 15_000,
+    expectedEnvironmentPairingRevision
+  })
+  assertFileMutationOwnershipCapability(status)
+}
+
+export async function callRuntimeFileMutation<TResult>(
+  target: RuntimeFileMutationTarget,
+  method: string,
+  params: unknown,
+  timeoutMs: number,
+  expectedEnvironmentPairingRevision?: number
+): Promise<TResult> {
+  const requestRevision = captureRuntimeEnvironmentRequestRevision(
+    target.environmentId,
+    expectedEnvironmentPairingRevision
+  )
+  await assertRuntimeFileMutationCapability(target, requestRevision)
+  return callRuntimeRpc<TResult>(target, method, params, {
+    timeoutMs,
+    expectedEnvironmentPairingRevision: requestRevision
+  })
+}
+
+export function createRuntimeImportSessionGuard(
+  environmentId: string,
+  expectedEnvironmentPairingRevision: number | undefined,
+  assertCallerCurrent?: () => void
+): () => void {
+  return () => {
+    if (getRuntimeEnvironmentRevision(environmentId) !== expectedEnvironmentPairingRevision) {
+      throw new Error('Runtime pairing changed; retry the import.')
+    }
+    assertCallerCurrent?.()
+  }
+}
diff --git a/src/renderer/src/runtime/runtime-file-read-client.ts b/src/renderer/src/runtime/runtime-file-read-client.ts
new file mode 100644
index 00000000000..40b74611c67
--- /dev/null
+++ b/src/renderer/src/runtime/runtime-file-read-client.ts
@@ -0,0 +1,248 @@
+import type {
+  RuntimeFilePreviewResult,
+  RuntimeFileReadChunkResult,
+  RuntimeFileReadResult
+} from '../../../shared/runtime-types'
+import { callRuntimeRpc, getActiveRuntimeTarget, RuntimeRpcCallError } from './runtime-rpc-client'
+import type {
+  RuntimeFileDownloadResult,
+  RuntimeFileOperationArgs,
+  RuntimeFileReadArgs,
+  RuntimeReadableFileContent
+} from './runtime-file-client-types'
+import {
+  assertExternalSshReadOwnership,
+  canReadRelativeRuntimeFile,
+  getRemoteFileArgs,
+  hasRemoteRuntimeOwner
+} from './runtime-file-routing'
+import { toRuntimeWorktreeSelector } from './runtime-worktree-selector'
+
+const REMOTE_DOWNLOAD_CHUNK_BYTES = 384 * 1024
+const REMOTE_DOWNLOAD_UPDATE_REQUIRED_MESSAGE =
+  'Remote file download requires a newer Orca server. Update the headless server and try again.'
+
+type RemoteFileDownloadArgs = NonNullable<ReturnType<typeof getRemoteFileArgs>>
+
+export async function readRuntimeFileContent({
+  settings,
+  filePath,
+  relativePath,
+  worktreeId,
+  connectionId,
+  expectedExternalSshTargetId,
+  includeLocalLogMetadata
+}: RuntimeFileReadArgs): Promise<RuntimeReadableFileContent> {
+  assertExternalSshReadOwnership(settings, connectionId, expectedExternalSshTargetId)
+  const target = getActiveRuntimeTarget(settings)
+  if (target.kind !== 'environment') {
+    return window.api.fs.readFile({ filePath, connectionId, includeLocalLogMetadata })
+  }
+  if (!worktreeId) {
+    return window.api.fs.readFile({ filePath, connectionId, includeLocalLogMetadata })
+  }
+  if (!canReadRelativeRuntimeFile(relativePath)) {
+    throw new Error('Remote file is outside the owning runtime worktree')
+  }
+
+  const worktree = toRuntimeWorktreeSelector(worktreeId)
+  let result: RuntimeFileReadResult
+  try {
+    result = await callRuntimeRpc<RuntimeFileReadResult>(
+      target,
+      'files.read',
+      { worktree, relativePath },
+      { timeoutMs: 15_000 }
+    )
+  } catch (err) {
+    // Why: files.read rejects binary paths with the typed 'binary_file' error; fall
+    // back to the base64 preview RPC so PDFs/images render like local/SSH paths.
+    // Match the exact typed error so an unrelated failure can't spoof the fallback.
+    if (err instanceof RuntimeRpcCallError && err.message === 'binary_file') {
+      return callRuntimeRpc<RuntimeFilePreviewResult>(
+        target,
+        'files.readPreview',
+        { worktree, relativePath },
+        { timeoutMs: 15_000 }
+      )
+    }
+    throw err
+  }
+  if (result.truncated) {
+    // Why: the runtime file RPC is preview-sized today; treating a truncated
+    // payload as editable content would make saves overwrite the rest of the file.
+    throw new Error(`Remote file is too large to open in the editor (${result.byteLength} bytes)`)
+  }
+  return { content: result.content, isBinary: false }
+}
+
+export async function readRuntimeFilePreview(
+  context: RuntimeFileOperationArgs,
+  filePath: string
+): Promise<RuntimeFilePreviewResult> {
+  assertExternalSshReadOwnership(
+    context.settings,
+    context.connectionId,
+    context.expectedExternalSshTargetId
+  )
+  const remoteArgs = getRemoteFileArgs(context, filePath)
+  if (!remoteArgs) {
+    if (hasRemoteRuntimeOwner(context)) {
+      throw new Error('Remote file is outside the owning runtime worktree')
+    }
+    return window.api.fs.readFile({ filePath, connectionId: context.connectionId })
+  }
+  return callRuntimeRpc<RuntimeFilePreviewResult>(
+    remoteArgs.target,
+    'files.readPreview',
+    { worktree: remoteArgs.worktreeSelector, relativePath: remoteArgs.relativePath },
+    { timeoutMs: 15_000 }
+  )
+}
+
+export async function downloadRuntimeFile(
+  context: RuntimeFileOperationArgs,
+  filePath: string,
+  suggestedName: string
+): Promise<RuntimeFileDownloadResult> {
+  assertExternalSshReadOwnership(
+    context.settings,
+    context.connectionId,
+    context.expectedExternalSshTargetId
+  )
+  const remoteArgs = getRemoteFileArgs(context, filePath)
+  if (!remoteArgs) {
+    if (hasRemoteRuntimeOwner(context)) {
+      throw new Error('Remote file is outside the owning runtime worktree')
+    }
+    if (context.connectionId) {
+      return window.api.fs.downloadFile({ filePath, connectionId: context.connectionId })
+    }
+    const result = await readRuntimeFilePreview(context, filePath)
+    return window.api.fs.saveDownloadedFile({
+      suggestedName,
+      content: result.content,
+      encoding: result.isBinary ? 'base64' : 'utf8'
+    })
+  }
+
+  if (!(await remoteChunkedDownloadAvailable(remoteArgs))) {
+    return downloadRemoteFileViaPreview(remoteArgs, suggestedName)
+  }
+
+  const download = await window.api.fs.startDownloadedFile({ suggestedName })
+  if (download.canceled) {
+    return download
+  }
+
+  let finished = false
+  try {
+    let offset = 0
+    for (;;) {
+      const chunk = await readRemoteDownloadChunk(remoteArgs, offset)
+      if (chunk.bytesRead > 0) {
+        await window.api.fs.appendDownloadedFileChunk({
+          transferId: download.transferId,
+          contentBase64: chunk.contentBase64
+        })
+      }
+      offset += chunk.bytesRead
+      if (chunk.eof) {
+        break
+      }
+      if (chunk.bytesRead <= 0) {
+        throw new Error('Remote download stalled before reaching EOF')
+      }
+    }
+    const result = await window.api.fs.finishDownloadedFile({ transferId: download.transferId })
+    finished = true
+    return result
+  } finally {
+    if (!finished) {
+      await window.api.fs.cancelDownloadedFile({ transferId: download.transferId }).catch(() => {})
+    }
+  }
+}
+
+async function remoteChunkedDownloadAvailable(
+  remoteArgs: RemoteFileDownloadArgs
+): Promise<boolean> {
+  try {
+    await callRuntimeRpc<RuntimeFileReadChunkResult>(
+      remoteArgs.target,
+      'files.readChunk',
+      {
+        worktree: remoteArgs.worktreeSelector,
+        relativePath: remoteArgs.relativePath,
+        offset: 0,
+        length: 1
+      },
+      { timeoutMs: 60_000 }
+    )
+    return true
+  } catch (error) {
+    // Why: compatible older headless servers may lack chunked downloads while
+    // still supporting preview-sized file reads that can complete the request.
+    if (error instanceof RuntimeRpcCallError && error.code === 'method_not_found') {
+      return false
+    }
+    throw error
+  }
+}
+
+async function readRemoteDownloadChunk(
+  remoteArgs: RemoteFileDownloadArgs,
+  offset: number
+): Promise<RuntimeFileReadChunkResult> {
+  return callRuntimeRpc<RuntimeFileReadChunkResult>(
+    remoteArgs.target,
+    'files.readChunk',
+    {
+      worktree: remoteArgs.worktreeSelector,
+      relativePath: remoteArgs.relativePath,
+      offset,
+      length: REMOTE_DOWNLOAD_CHUNK_BYTES
+    },
+    { timeoutMs: 60_000 }
+  )
+}
+
+async function downloadRemoteFileViaPreview(
+  remoteArgs: RemoteFileDownloadArgs,
+  suggestedName: string
+): Promise<RuntimeFileDownloadResult> {
+  try {
+    const result = await callRuntimeRpc<RuntimeFilePreviewResult>(
+      remoteArgs.target,
+      'files.readPreview',
+      { worktree: remoteArgs.worktreeSelector, relativePath: remoteArgs.relativePath },
+      { timeoutMs: 15_000 }
+    )
+    // Why: old servers use an empty, metadata-free binary result to signal an
+    // unsupported binary; recognized zero-byte previews are still complete.
+    if (result.isBinary && !result.content && !result.isImage && !result.mimeType) {
+      throw new Error(REMOTE_DOWNLOAD_UPDATE_REQUIRED_MESSAGE)
+    }
+    return window.api.fs.saveDownloadedFile({
+      suggestedName,
+      content: result.content,
+      encoding: result.isBinary ? 'base64' : 'utf8'
+    })
+  } catch (error) {
+    if (isUnsupportedRemotePreviewDownload(error)) {
+      throw new Error(REMOTE_DOWNLOAD_UPDATE_REQUIRED_MESSAGE)
+    }
+    throw error
+  }
+}
+
+function isUnsupportedRemotePreviewDownload(error: unknown): boolean {
+  if (!(error instanceof RuntimeRpcCallError)) {
+    return false
+  }
+  return (
+    error.code === 'method_not_found' ||
+    (error.code === 'runtime_error' &&
+      (error.message === 'file_too_large' || error.message === 'binary_file'))
+  )
+}
diff --git a/src/renderer/src/runtime/runtime-file-routing.ts b/src/renderer/src/runtime/runtime-file-routing.ts
new file mode 100644
index 00000000000..e08b7f49320
--- /dev/null
+++ b/src/renderer/src/runtime/runtime-file-routing.ts
@@ -0,0 +1,130 @@
+import type { GlobalSettings } from '../../../shared/global-settings-types'
+import {
+  isWindowsAbsolutePathLike,
+  relativePathInsideRoot
+} from '../../../shared/cross-platform-path'
+import { normalizeRelativePath } from '@/lib/path'
+import { getActiveRuntimeTarget } from './runtime-rpc-client'
+import { toRuntimeWorktreeSelector } from './runtime-worktree-selector'
+import type { RuntimeFileOperationArgs } from './runtime-file-client-types'
+
+export function assertExternalSshReadOwnership(
+  settings: Pick<GlobalSettings, 'activeRuntimeEnvironmentId'> | null | undefined,
+  connectionId: string | undefined,
+  expectedExternalSshTargetId: string | undefined
+): void {
+  const expectedTargetId = expectedExternalSshTargetId?.trim()
+  if (
+    expectedTargetId &&
+    (getActiveRuntimeTarget(settings).kind === 'environment' || connectionId !== expectedTargetId)
+  ) {
+    throw new Error('External SSH files are not available after the workspace host changes.')
+  }
+}
+
+export function withSshMutationExpectation<T extends object>(
+  context: RuntimeFileOperationArgs,
+  params: T
+): T & {
+  expectedExecutionHostId: 'local' | `ssh:${string}`
+  expectedSshTargetId?: string
+  expectedSshConnectionGeneration?: number
+} {
+  const sshTargetId = context.expectedSshTargetId ?? context.connectionId
+  return {
+    ...params,
+    expectedExecutionHostId:
+      context.expectedExecutionHostId ??
+      (sshTargetId ? `ssh:${encodeURIComponent(sshTargetId)}` : 'local'),
+    ...(context.expectedSshTargetId === undefined
+      ? {}
+      : { expectedSshTargetId: context.expectedSshTargetId }),
+    ...(context.expectedSshConnectionGeneration === undefined
+      ? {}
+      : { expectedSshConnectionGeneration: context.expectedSshConnectionGeneration })
+  }
+}
+
+export function getRuntimeFileReadScope(
+  settings: Pick<GlobalSettings, 'activeRuntimeEnvironmentId'> | null | undefined,
+  connectionId: string | undefined
+): string | undefined {
+  const target = getActiveRuntimeTarget(settings)
+  return target.kind === 'environment' ? `runtime:${target.environmentId}` : connectionId
+}
+
+export function isRemoteRuntimeFileOperation(
+  context: RuntimeFileOperationArgs,
+  path: string
+): boolean {
+  return getRemoteFileArgs(context, path) !== null
+}
+
+export function canReadRelativeRuntimeFile(
+  relativePath: string | undefined
+): relativePath is string {
+  return Boolean(relativePath && relativePath.trim() && !isAbsolutePathLike(relativePath))
+}
+
+function isAbsolutePathLike(value: string): boolean {
+  return value.startsWith('/') || isWindowsAbsolutePathLike(value)
+}
+
+export function getRemoteFileArgs(
+  context: RuntimeFileOperationArgs,
+  absolutePath: string
+): {
+  target: ReturnType<typeof getActiveRuntimeTarget> & { kind: 'environment' }
+  worktreeId: string
+  worktreeSelector: string
+  relativePath: string
+} | null {
+  const target = getActiveRuntimeTarget(context.settings)
+  if (target.kind !== 'environment' || !context.worktreeId) {
+    return null
+  }
+  const relativePath = getRelativePathInsideWorktree(context.worktreePath, absolutePath)
+  if (relativePath === null) {
+    return null
+  }
+  return {
+    target,
+    worktreeId: context.worktreeId,
+    worktreeSelector: toRuntimeWorktreeSelector(context.worktreeId),
+    relativePath
+  }
+}
+
+export function hasRemoteRuntimeOwner(context: RuntimeFileOperationArgs): boolean {
+  return (
+    getActiveRuntimeTarget(context.settings).kind === 'environment' && Boolean(context.worktreeId)
+  )
+}
+
+export function assertLocalFilesystemFallbackAllowed(context: RuntimeFileOperationArgs): void {
+  if (hasRemoteRuntimeOwner(context)) {
+    throw new Error('Remote file is outside the owning runtime worktree')
+  }
+}
+
+export function getRelativePathInsideWorktree(
+  worktreePath: string | null | undefined,
+  absolutePath: string
+): string | null {
+  if (!worktreePath) {
+    return null
+  }
+  return relativePathInsideRoot(worktreePath, absolutePath)
+}
+
+export function joinRuntimeRelativePath(basePath: string, relativePath: string): string {
+  const normalizedBase = normalizeRelativePath(basePath)
+  const normalizedRelative = normalizeRelativePath(relativePath)
+  if (!normalizedBase) {
+    return normalizedRelative
+  }
+  if (!normalizedRelative) {
+    return normalizedBase
+  }
+  return `${normalizedBase}/${normalizedRelative}`
+}
diff --git a/src/renderer/src/runtime/runtime-file-search-client.ts b/src/renderer/src/runtime/runtime-file-search-client.ts
new file mode 100644
index 00000000000..31a91b2f150
--- /dev/null
+++ b/src/renderer/src/runtime/runtime-file-search-client.ts
@@ -0,0 +1,200 @@
+import type { SearchOptions, SearchResult } from '../../../shared/code-search-types'
+import type { RuntimeFileListResult } from '../../../shared/runtime-types'
+import {
+  buildExcludePathPrefixes,
+  shouldExcludeQuickOpenRelPath
+} from '../../../shared/quick-open-filter'
+import type { RuntimeFileOperationArgs } from './runtime-file-client-types'
+import {
+  createEmptyRuntimeFileSearchResult,
+  getRuntimeFileSearchRejectedField
+} from './runtime-file-search-bounds'
+import {
+  hasCachedLegacyQuickOpenInventory,
+  searchLegacyQuickOpenInventory
+} from './runtime-legacy-quick-open-inventory'
+import { callRuntimeRpc, getActiveRuntimeTarget, RuntimeRpcCallError } from './runtime-rpc-client'
+import { toRuntimeWorktreeSelector } from './runtime-worktree-selector'
+
+const QUICK_OPEN_REMOTE_UPDATE_REQUIRED_MESSAGE =
+  'Quick Open search requires a newer paired Orca host. Update the remote host and reconnect.'
+
+export async function searchRuntimeFiles(
+  context: RuntimeFileOperationArgs,
+  options: SearchOptions
+): Promise<SearchResult> {
+  if (getRuntimeFileSearchRejectedField(options)) {
+    return createEmptyRuntimeFileSearchResult()
+  }
+  const target = getActiveRuntimeTarget(context.settings)
+  if (target.kind !== 'environment' || !context.worktreeId) {
+    return window.api.fs.search({
+      ...options,
+      connectionId: context.connectionId
+    })
+  }
+  const { rootPath: _rootPath, ...runtimeOptions } = options
+  return callRuntimeRpc<SearchResult>(
+    target,
+    'files.search',
+    { worktree: toRuntimeWorktreeSelector(context.worktreeId), ...runtimeOptions },
+    { timeoutMs: 15_000 }
+  )
+}
+
+export async function listRuntimeFiles(
+  context: RuntimeFileOperationArgs,
+  args: {
+    rootPath: string
+    excludePaths?: string[]
+    requestToken?: string
+    signal?: AbortSignal
+  }
+): Promise<string[]> {
+  const target = getActiveRuntimeTarget(context.settings)
+  if (target.kind !== 'environment' || !context.worktreeId) {
+    return window.api.fs.listFiles({
+      rootPath: args.rootPath,
+      connectionId: context.connectionId,
+      excludePaths: args.excludePaths,
+      requestToken: args.requestToken
+    })
+  }
+  return callRuntimeRpc<string[]>(
+    target,
+    'files.listAll',
+    {
+      worktree: toRuntimeWorktreeSelector(context.worktreeId),
+      excludePaths: args.excludePaths
+    },
+    { timeoutMs: 15_000, ...(args.signal === undefined ? {} : { signal: args.signal }) }
+  )
+}
+
+export async function searchRuntimeFilePaths(
+  context: RuntimeFileOperationArgs,
+  args: {
+    query: string
+    limit?: number
+    excludePaths?: string[]
+    requestToken?: string
+    signal?: AbortSignal
+  }
+): Promise<{ files: string[]; truncated: boolean }> {
+  const target = getActiveRuntimeTarget(context.settings)
+  if (target.kind !== 'environment') {
+    if (!context.connectionId || !context.worktreePath) {
+      return { files: [], truncated: false }
+    }
+    const limit = args.limit ?? 32
+    const files = await window.api.fs.listFiles({
+      rootPath: context.worktreePath,
+      connectionId: context.connectionId,
+      excludePaths: args.excludePaths,
+      requestToken: args.requestToken,
+      maxResults: limit + 1,
+      searchQuery: args.query
+    })
+    return { files: files.slice(0, limit), truncated: files.length > limit }
+  }
+  if (!context.worktreeId) {
+    return { files: [], truncated: false }
+  }
+  const worktreeSelector = toRuntimeWorktreeSelector(context.worktreeId)
+  const limit = args.limit ?? 32
+  if (hasCachedLegacyQuickOpenInventory(target, worktreeSelector, context.worktreePath)) {
+    return searchLegacyQuickOpenInventory({
+      target,
+      worktreeSelector,
+      query: args.query,
+      limit,
+      worktreePath: context.worktreePath,
+      excludePaths: args.excludePaths,
+      signal: args.signal
+    })
+  }
+  let result: RuntimeFileListResult
+  try {
+    result = await callRuntimeRpc<RuntimeFileListResult>(
+      target,
+      'files.searchPaths',
+      {
+        worktree: worktreeSelector,
+        query: args.query,
+        limit,
+        excludePaths: args.excludePaths,
+        mode: 'quick-open'
+      },
+      { timeoutMs: 15_000, ...(args.signal === undefined ? {} : { signal: args.signal }) }
+    )
+  } catch (error) {
+    if (error instanceof RuntimeRpcCallError && error.code === 'method_not_found') {
+      try {
+        return await searchLegacyQuickOpenInventory({
+          target,
+          worktreeSelector,
+          query: args.query,
+          limit,
+          worktreePath: context.worktreePath,
+          excludePaths: args.excludePaths,
+          signal: args.signal
+        })
+      } catch (legacyError) {
+        if (legacyError instanceof RuntimeRpcCallError && legacyError.code === 'method_not_found') {
+          throw new Error(QUICK_OPEN_REMOTE_UPDATE_REQUIRED_MESSAGE)
+        }
+        throw legacyError
+      }
+    }
+    throw error
+  }
+  if (
+    args.excludePaths?.length &&
+    !(typeof result.quickOpenSearchVersion === 'number' && result.quickOpenSearchVersion >= 1)
+  ) {
+    try {
+      return await searchLegacyQuickOpenInventory({
+        target,
+        worktreeSelector,
+        query: args.query,
+        limit,
+        worktreePath: context.worktreePath,
+        excludePaths: args.excludePaths,
+        signal: args.signal
+      })
+    } catch (legacyError) {
+      if (legacyError instanceof RuntimeRpcCallError && legacyError.code === 'method_not_found') {
+        throw new Error(QUICK_OPEN_REMOTE_UPDATE_REQUIRED_MESSAGE)
+      }
+      throw legacyError
+    }
+  }
+  const excludePrefixes = buildExcludePathPrefixes(
+    context.worktreePath ?? result.rootPath,
+    args.excludePaths
+  )
+  return {
+    files: result.files
+      .map((entry) => entry.relativePath)
+      .filter((relativePath) => !shouldExcludeQuickOpenRelPath(relativePath, excludePrefixes)),
+    truncated: result.truncated
+  }
+}
+
+/**
+ * Best-effort abort of an in-flight listRuntimeFiles call (#7721). Switching
+ * workspaces must stop the previous workspace's full-tree scan — over SSH an
+ * abandoned scan keeps loading the relay and starves fs.readDir/fs.stat.
+ */
+export function cancelRuntimeFileList(
+  context: RuntimeFileOperationArgs,
+  requestToken: string
+): void {
+  const target = getActiveRuntimeTarget(context.settings)
+  if (target.kind !== 'environment' || !context.worktreeId) {
+    void window.api.fs.cancelListFiles({ requestToken }).catch(() => {
+      /* cancellation is advisory; the request path has its own timeouts */
+    })
+  }
+  // Environment runtimes bound files.listAll with their own RPC timeout.
+}
diff --git a/src/renderer/src/runtime/runtime-file-upload-client.ts b/src/renderer/src/runtime/runtime-file-upload-client.ts
new file mode 100644
index 00000000000..9ee1a906ef8
--- /dev/null
+++ b/src/renderer/src/runtime/runtime-file-upload-client.ts
@@ -0,0 +1,164 @@
+import { joinPath, normalizeRelativePath } from '@/lib/path'
+import type { RuntimeFileOperationArgs } from './runtime-file-client-types'
+import { callRuntimeFileMutation } from './runtime-file-mutation-rpc'
+import {
+  getRemoteFileArgs,
+  joinRuntimeRelativePath,
+  withSshMutationExpectation
+} from './runtime-file-routing'
+import { runtimePathExists } from './runtime-file-metadata-client'
+import { toRuntimeWorktreeSelector } from './runtime-worktree-selector'
+
+const REMOTE_UPLOAD_BASE64_CHUNK_CHARS = 512 * 1024
+
+export async function uploadRuntimeFileWithoutClobber(
+  target: { kind: 'environment'; environmentId: string },
+  worktreeId: string,
+  relativePath: string,
+  contentBase64: string,
+  assertCurrent?: () => void,
+  expectedSshConnectionGeneration?: number,
+  expectedSshTargetId?: string,
+  expectedExecutionHostId?: 'local' | `ssh:${string}`,
+  expectedEnvironmentPairingRevision?: number
+): Promise<void> {
+  const tempRelativePath = makeRuntimeUploadTempPath(relativePath)
+  try {
+    await writeRuntimeBase64File(
+      target,
+      worktreeId,
+      tempRelativePath,
+      contentBase64,
+      assertCurrent,
+      expectedSshConnectionGeneration,
+      expectedSshTargetId,
+      expectedExecutionHostId,
+      expectedEnvironmentPairingRevision
+    )
+    assertCurrent?.()
+    await callRuntimeFileMutation(
+      target,
+      'files.commitUpload',
+      {
+        worktree: toRuntimeWorktreeSelector(worktreeId),
+        tempRelativePath,
+        finalRelativePath: relativePath,
+        expectedSshTargetId,
+        expectedSshConnectionGeneration,
+        expectedExecutionHostId
+      },
+      30_000,
+      expectedEnvironmentPairingRevision
+    )
+  } finally {
+    assertCurrent?.()
+    await callRuntimeFileMutation(
+      target,
+      'files.delete',
+      {
+        worktree: toRuntimeWorktreeSelector(worktreeId),
+        relativePath: tempRelativePath,
+        recursive: false,
+        expectedSshTargetId,
+        expectedSshConnectionGeneration,
+        expectedExecutionHostId
+      },
+      15_000,
+      expectedEnvironmentPairingRevision
+    ).catch(() => {})
+  }
+}
+
+async function writeRuntimeBase64File(
+  target: { kind: 'environment'; environmentId: string },
+  worktreeId: string,
+  relativePath: string,
+  contentBase64: string,
+  assertCurrent?: () => void,
+  expectedSshConnectionGeneration?: number,
+  expectedSshTargetId?: string,
+  expectedExecutionHostId?: 'local' | `ssh:${string}`,
+  expectedEnvironmentPairingRevision?: number
+): Promise<void> {
+  if (contentBase64.length <= REMOTE_UPLOAD_BASE64_CHUNK_CHARS) {
+    assertCurrent?.()
+    await callRuntimeFileMutation(
+      target,
+      'files.writeBase64',
+      {
+        worktree: toRuntimeWorktreeSelector(worktreeId),
+        relativePath,
+        contentBase64,
+        expectedSshTargetId,
+        expectedSshConnectionGeneration,
+        expectedExecutionHostId
+      },
+      30_000,
+      expectedEnvironmentPairingRevision
+    )
+    return
+  }
+
+  for (let offset = 0; offset < contentBase64.length; offset += REMOTE_UPLOAD_BASE64_CHUNK_CHARS) {
+    assertCurrent?.()
+    await callRuntimeFileMutation(
+      target,
+      'files.writeBase64Chunk',
+      {
+        worktree: toRuntimeWorktreeSelector(worktreeId),
+        relativePath,
+        contentBase64: contentBase64.slice(offset, offset + REMOTE_UPLOAD_BASE64_CHUNK_CHARS),
+        append: offset > 0,
+        expectedSshTargetId,
+        expectedSshConnectionGeneration,
+        expectedExecutionHostId
+      },
+      30_000,
+      expectedEnvironmentPairingRevision
+    )
+  }
+}
+
+function makeRuntimeUploadTempPath(relativePath: string): string {
+  const normalized = normalizeRelativePath(relativePath)
+  const slashIndex = normalized.lastIndexOf('/')
+  const dir = slashIndex === -1 ? '' : normalized.slice(0, slashIndex + 1)
+  const leaf = slashIndex === -1 ? normalized : normalized.slice(slashIndex + 1)
+  const nonce = `${Date.now().toString(36)}-${Math.random().toString(36).slice(2)}`
+  return `${dir}.${leaf}.orca-upload-${nonce}`
+}
+
+export async function ensureRuntimeDirectory(
+  context: RuntimeFileOperationArgs,
+  destinationDir: string,
+  assertCurrent: () => void,
+  expectedEnvironmentPairingRevision: number | undefined
+): Promise<void> {
+  const destinationArgs = getRemoteFileArgs(context, destinationDir)
+  if (!destinationArgs) {
+    return
+  }
+  const parts = normalizeRelativePath(destinationArgs.relativePath)
+    .split('/')
+    .filter((part) => part.length > 0)
+  let current = ''
+  for (const part of parts) {
+    current = joinRuntimeRelativePath(current, part)
+    const absolutePath = joinPath(context.worktreePath ?? '', current)
+    assertCurrent()
+    if (await runtimePathExists(context, absolutePath, expectedEnvironmentPairingRevision)) {
+      continue
+    }
+    assertCurrent?.()
+    await callRuntimeFileMutation(
+      destinationArgs.target,
+      'files.createDir',
+      withSshMutationExpectation(context, {
+        worktree: destinationArgs.worktreeSelector,
+        relativePath: current
+      }),
+      15_000,
+      expectedEnvironmentPairingRevision
+    )
+  }
+}
diff --git a/src/renderer/src/runtime/runtime-file-watch-client.ts b/src/renderer/src/runtime/runtime-file-watch-client.ts
new file mode 100644
index 00000000000..8809a8f0d49
--- /dev/null
+++ b/src/renderer/src/runtime/runtime-file-watch-client.ts
@@ -0,0 +1,241 @@
+import type { FsChangedPayload } from '../../../shared/filesystem-entry-types'
+import type { RuntimeRpcResponse } from '../../../shared/runtime-rpc-envelope'
+import type { RuntimeFileOperationArgs } from './runtime-file-client-types'
+import {
+  callRuntimeRpc,
+  getActiveRuntimeTarget,
+  unwrapRuntimeRpcResult
+} from './runtime-rpc-client'
+import { toRuntimeWorktreeSelector } from './runtime-worktree-selector'
+
+type RuntimeFileWatchEvent =
+  | { type: 'starting'; subscriptionId: string }
+  | { type: 'ready'; subscriptionId: string }
+  | { type: 'changed'; worktree: string; events: FsChangedPayload['events'] }
+  | { type: 'error'; message: string }
+  | { type: 'end' }
+
+type RuntimeFileWatchListener = {
+  onPayload: (payload: FsChangedPayload) => void
+  onError?: (error: Error) => void
+}
+
+type SharedRuntimeFileWatch = {
+  target: { kind: 'environment'; environmentId: string }
+  worktreeId: string
+  listeners: Set<RuntimeFileWatchListener>
+  start: Promise<void>
+  unsubscribe: (() => void) | null
+  remoteSubscriptionId: string | null
+  keepStreamUntilReady: boolean
+  closed: boolean
+}
+
+const sharedRuntimeFileWatches = new Map<string, SharedRuntimeFileWatch>()
+
+function getSharedRuntimeFileWatchKey(
+  environmentId: string,
+  worktreeId: string,
+  worktreePath: string
+): string {
+  return `${environmentId}\0${worktreeId}\0${worktreePath}`
+}
+
+export async function subscribeRuntimeFileChanges(
+  context: RuntimeFileOperationArgs,
+  onPayload: (payload: FsChangedPayload) => void,
+  onError?: (error: Error) => void
+): Promise<() => void> {
+  const target = getActiveRuntimeTarget(context.settings)
+  if (target.kind !== 'environment' || !context.worktreeId || !context.worktreePath) {
+    return window.api.fs.onFsChanged(onPayload)
+  }
+
+  const listener: RuntimeFileWatchListener = { onPayload, onError }
+  const key = getSharedRuntimeFileWatchKey(
+    target.environmentId,
+    context.worktreeId,
+    context.worktreePath
+  )
+  let shared = sharedRuntimeFileWatches.get(key)
+  if (!shared) {
+    shared = createSharedRuntimeFileWatch(key, target, context.worktreeId, context.worktreePath)
+    sharedRuntimeFileWatches.set(key, shared)
+  }
+  shared.listeners.add(listener)
+  try {
+    await shared.start
+  } catch (err) {
+    shared.listeners.delete(listener)
+    throw err
+  }
+
+  return () => {
+    const current = sharedRuntimeFileWatches.get(key)
+    if (!current) {
+      return
+    }
+    current.listeners.delete(listener)
+    if (current.listeners.size === 0) {
+      closeSharedRuntimeFileWatch(key, current)
+    }
+  }
+}
+
+function createSharedRuntimeFileWatch(
+  key: string,
+  target: { kind: 'environment'; environmentId: string },
+  worktreeId: string,
+  worktreePath: string
+): SharedRuntimeFileWatch {
+  const shared: SharedRuntimeFileWatch = {
+    target,
+    worktreeId,
+    listeners: new Set(),
+    start: Promise.resolve(),
+    unsubscribe: null,
+    remoteSubscriptionId: null,
+    keepStreamUntilReady: isWebRuntimeFileWatchSharedSocket(),
+    closed: false
+  }
+  // Why: editor reloads and the Explorer can watch the same remote worktree.
+  // Keep one runtime WebSocket/server watcher and fan out events in renderer.
+  shared.start = window.api.runtimeEnvironments
+    .subscribe(
+      {
+        selector: target.environmentId,
+        method: 'files.watch',
+        params: { worktree: toRuntimeWorktreeSelector(worktreeId) },
+        timeoutMs: 15_000
+      },
+      {
+        onResponse: (response) => {
+          handleSharedRuntimeFileWatchResponse(key, shared, worktreePath, response)
+        },
+        onError: (error) => {
+          failSharedRuntimeFileWatch(key, shared, new Error(error.message))
+        },
+        onClose: () => {
+          if (sharedRuntimeFileWatches.get(key) === shared) {
+            sharedRuntimeFileWatches.delete(key)
+          }
+          shared.closed = true
+          shared.unsubscribe = null
+        }
+      }
+    )
+    .then((subscription) => {
+      shared.unsubscribe = subscription.unsubscribe
+      if (shared.closed || sharedRuntimeFileWatches.get(key) !== shared) {
+        subscription.unsubscribe()
+        shared.unsubscribe = null
+        if (!shared.keepStreamUntilReady) {
+          unwatchSharedRuntimeFileWatch(shared)
+        }
+      }
+    })
+    .catch((err) => {
+      failSharedRuntimeFileWatch(key, shared, err instanceof Error ? err : new Error(String(err)))
+      throw err
+    })
+  return shared
+}
+
+function handleSharedRuntimeFileWatchResponse(
+  key: string,
+  shared: SharedRuntimeFileWatch,
+  worktreePath: string,
+  response: unknown
+): void {
+  try {
+    const event = unwrapRuntimeRpcResult<RuntimeFileWatchEvent>(
+      response as RuntimeRpcResponse<RuntimeFileWatchEvent>
+    )
+    if (event.type === 'starting' || event.type === 'ready') {
+      shared.remoteSubscriptionId = event.subscriptionId
+      if (shared.closed) {
+        shared.unsubscribe?.()
+        shared.unsubscribe = null
+        if (!shared.keepStreamUntilReady) {
+          unwatchSharedRuntimeFileWatch(shared)
+        }
+      }
+    } else if (event.type === 'changed') {
+      for (const listener of Array.from(shared.listeners)) {
+        listener.onPayload({ worktreePath, events: event.events })
+      }
+    } else if (event.type === 'error') {
+      // Why: error listeners may synchronously retry. Evict the terminal watch
+      // before callbacks run so the retry cannot join a stream awaiting `end`.
+      failSharedRuntimeFileWatch(key, shared, new Error(event.message))
+    } else if (event.type === 'end') {
+      // Why: shared-control completes without onClose; evict and release its
+      // transport handle so later listeners start cleanly without retained state.
+      if (sharedRuntimeFileWatches.get(key) === shared) {
+        sharedRuntimeFileWatches.delete(key)
+      }
+      shared.closed = true
+      const unsubscribe = shared.unsubscribe
+      shared.unsubscribe = null
+      shared.remoteSubscriptionId = null
+      shared.listeners.clear()
+      unsubscribe?.()
+    }
+  } catch (err) {
+    failSharedRuntimeFileWatch(key, shared, err instanceof Error ? err : new Error(String(err)))
+  }
+}
+
+function failSharedRuntimeFileWatch(
+  key: string,
+  shared: SharedRuntimeFileWatch,
+  error: Error
+): void {
+  if (sharedRuntimeFileWatches.get(key) === shared) {
+    sharedRuntimeFileWatches.delete(key)
+  }
+  shared.closed = true
+  shared.remoteSubscriptionId = null
+  const unsubscribe = shared.unsubscribe
+  shared.unsubscribe = null
+  const listeners = Array.from(shared.listeners)
+  shared.listeners.clear()
+  unsubscribe?.()
+  for (const listener of listeners) {
+    listener.onError?.(error)
+  }
+}
+
+function closeSharedRuntimeFileWatch(key: string, shared: SharedRuntimeFileWatch): void {
+  if (shared.closed) {
+    return
+  }
+  shared.closed = true
+  sharedRuntimeFileWatches.delete(key)
+  if (shared.keepStreamUntilReady) {
+    // Why: WebRuntimeClient owns shared-socket file-watch cleanup, including
+    // pre-ready cancellation ownership and late-ready files.unwatch.
+    shared.unsubscribe?.()
+    shared.unsubscribe = null
+    return
+  }
+  shared.unsubscribe?.()
+  shared.unsubscribe = null
+  unwatchSharedRuntimeFileWatch(shared)
+}
+
+function isWebRuntimeFileWatchSharedSocket(): boolean {
+  return Boolean((globalThis as { __ORCA_WEB_CLIENT__?: boolean }).__ORCA_WEB_CLIENT__)
+}
+
+function unwatchSharedRuntimeFileWatch(shared: SharedRuntimeFileWatch): void {
+  if (!shared.remoteSubscriptionId) {
+    return
+  }
+  void callRuntimeRpc(
+    shared.target,
+    'files.unwatch',
+    { subscriptionId: shared.remoteSubscriptionId },
+    { timeoutMs: 5_000 }
+  ).catch(() => {})
+}
diff --git a/src/renderer/src/runtime/runtime-terminal-inspection.test.ts b/src/renderer/src/runtime/runtime-terminal-inspection.test.ts
index 4223f6d2b82..766e80f3f6e 100644
--- a/src/renderer/src/runtime/runtime-terminal-inspection.test.ts
+++ b/src/renderer/src/runtime/runtime-terminal-inspection.test.ts
@@ -209,6 +209,53 @@ describe('runtime terminal owner routing', () => {
     })
   })
 
+  it('attributes a delayed runtime acknowledgement to the current layout owner', async () => {
+    const pendingSend = Promise.withResolvers<{
+      ok: true
+      result: { send: { handle: string; accepted: true; bytesWritten: number } }
+      _meta: { runtimeId: string }
+    }>()
+    runtimeCall.mockReturnValue(pendingSend.promise)
+    useAppStore.setState({
+      terminalLayoutsByTabId: {
+        'tab-1': {
+          root: { type: 'leaf', leafId: LEAF_ID },
+          activeLeafId: LEAF_ID,
+          expandedLeafId: null,
+          ptyIdsByLeafId: { [LEAF_ID]: 'remote:env-1@@terminal-1' }
+        }
+      }
+    })
+    recordRuntimeTerminalInputForPtyId('remote:env-1@@terminal-1', 123)
+    useAppStore.setState({ lastTerminalInputAtByPaneKey: {} })
+
+    expect(
+      sendRuntimePtyInput({ activeRuntimeEnvironmentId: 'env-2' }, 'remote:env-1@@terminal-1', 'x')
+    ).toBe(true)
+    const nextLeafId = '22222222-2222-4222-8222-222222222222'
+    useAppStore.setState({
+      terminalLayoutsByTabId: {
+        'tab-2': {
+          root: { type: 'leaf', leafId: nextLeafId },
+          activeLeafId: nextLeafId,
+          expandedLeafId: null,
+          ptyIdsByLeafId: { [nextLeafId]: 'remote:env-1@@terminal-1' }
+        }
+      }
+    })
+    pendingSend.resolve({
+      ok: true,
+      result: { send: { handle: 'terminal-1', accepted: true, bytesWritten: 1 } },
+      _meta: { runtimeId: 'runtime-1' }
+    })
+
+    await vi.waitFor(() => {
+      expect(useAppStore.getState().lastTerminalInputAtByPaneKey).toEqual({
+        [`tab-2:${nextLeafId}`]: expect.any(Number)
+      })
+    })
+  })
+
   it('does not record declined fire-and-forget runtime input', async () => {
     runtimeCall.mockResolvedValue({
       ok: true,
@@ -479,6 +526,163 @@ describe('runtime terminal owner routing', () => {
     expect(useAppStore.getState().lastTerminalInputAtByPaneKey[PANE_KEY]).toBe(123)
   })
 
+  it('indexes a stable layout identity once across repeated terminal input', () => {
+    const layoutCount = 500
+    let layoutEnumerations = 0
+    let leafEnumerations = 0
+    const layouts = Object.fromEntries(
+      Array.from({ length: layoutCount }, (_, index) => {
+        const leafId = `00000000-0000-4000-8000-${index.toString(16).padStart(12, '0')}`
+        const ptyIdsByLeafId = new Proxy(
+          { [leafId]: `pty-${index}` },
+          {
+            ownKeys: (target) => {
+              leafEnumerations += 1
+              return Reflect.ownKeys(target)
+            }
+          }
+        )
+        return [
+          `tab-${index}`,
+          {
+            root: { type: 'leaf' as const, leafId },
+            activeLeafId: leafId,
+            expandedLeafId: null,
+            ptyIdsByLeafId
+          }
+        ]
+      })
+    )
+    const observedLayouts = new Proxy(layouts, {
+      ownKeys: (target) => {
+        layoutEnumerations += 1
+        return Reflect.ownKeys(target)
+      }
+    })
+    useAppStore.setState({ terminalLayoutsByTabId: observedLayouts })
+
+    recordRuntimeTerminalInputForPtyId('pty-0', 10_000)
+    expect({ layoutEnumerations, leafEnumerations }).toEqual({
+      layoutEnumerations: 1,
+      leafEnumerations: 1
+    })
+    layoutEnumerations = 0
+    leafEnumerations = 0
+
+    for (let timestamp = 1; timestamp <= 100; timestamp += 1) {
+      recordRuntimeTerminalInputForPtyId(`pty-${layoutCount - 1}`, timestamp * 10_000)
+    }
+
+    expect({ layoutEnumerations, leafEnumerations }).toEqual({
+      layoutEnumerations: 1,
+      leafEnumerations: layoutCount
+    })
+    expect(
+      useAppStore.getState().lastTerminalInputAtByPaneKey[
+        `tab-${layoutCount - 1}:00000000-0000-4000-8000-${(layoutCount - 1)
+          .toString(16)
+          .padStart(12, '0')}`
+      ]
+    ).toBe(1_000_000)
+  })
+
+  it('reindexes a PTY when the immutable layout identity changes', () => {
+    const nextLeafId = '22222222-2222-4222-8222-222222222222'
+    useAppStore.setState({
+      terminalLayoutsByTabId: {
+        'tab-1': {
+          root: { type: 'leaf', leafId: LEAF_ID },
+          activeLeafId: LEAF_ID,
+          expandedLeafId: null,
+          ptyIdsByLeafId: { [LEAF_ID]: 'rebound-pty' }
+        }
+      }
+    })
+    recordRuntimeTerminalInputForPtyId('rebound-pty', 123)
+
+    useAppStore.setState({
+      terminalLayoutsByTabId: {
+        'tab-2': {
+          root: { type: 'leaf', leafId: nextLeafId },
+          activeLeafId: nextLeafId,
+          expandedLeafId: null,
+          ptyIdsByLeafId: { [nextLeafId]: 'rebound-pty' }
+        }
+      }
+    })
+    recordRuntimeTerminalInputForPtyId('rebound-pty', 1_000)
+
+    expect(useAppStore.getState().lastTerminalInputAtByPaneKey).toEqual({
+      [PANE_KEY]: 123,
+      [`tab-2:${nextLeafId}`]: 1_000
+    })
+  })
+
+  it('reindexes stale owners without caching misses within the same layout identity', () => {
+    const nextLeafId = '22222222-2222-4222-8222-222222222222'
+    useAppStore.setState({
+      terminalLayoutsByTabId: {
+        'tab-1': {
+          root: { type: 'leaf', leafId: LEAF_ID },
+          activeLeafId: LEAF_ID,
+          expandedLeafId: null,
+          ptyIdsByLeafId: { [LEAF_ID]: 'rebound-pty' }
+        }
+      }
+    })
+    const layouts = useAppStore.getState().terminalLayoutsByTabId
+    recordRuntimeTerminalInputForPtyId('rebound-pty', 123)
+    recordRuntimeTerminalInputForPtyId('late-pty', 456)
+
+    const firstLayout = layouts['tab-1']
+    expect(firstLayout).toBeDefined()
+    if (!firstLayout) {
+      return
+    }
+    firstLayout.ptyIdsByLeafId = Object.create({ [LEAF_ID]: 'rebound-pty' })
+    Object.setPrototypeOf(layouts, { 'tab-1': firstLayout })
+    delete layouts['tab-1']
+    layouts['tab-2'] = {
+      root: { type: 'leaf', leafId: nextLeafId },
+      activeLeafId: nextLeafId,
+      expandedLeafId: null,
+      ptyIdsByLeafId: { [nextLeafId]: 'rebound-pty', [LEAF_ID]: 'late-pty' }
+    }
+    recordRuntimeTerminalInputForPtyId('rebound-pty', 1_000)
+    recordRuntimeTerminalInputForPtyId('late-pty', 2_000)
+
+    expect(useAppStore.getState().terminalLayoutsByTabId).toBe(layouts)
+    expect(useAppStore.getState().lastTerminalInputAtByPaneKey).toEqual({
+      [PANE_KEY]: 123,
+      [`tab-2:${nextLeafId}`]: 1_000,
+      [`tab-2:${LEAF_ID}`]: 2_000
+    })
+  })
+
+  it('preserves a malformed first match instead of routing a duplicate PTY', () => {
+    const nextLeafId = '22222222-2222-4222-8222-222222222222'
+    useAppStore.setState({
+      terminalLayoutsByTabId: {
+        'legacy:tab': {
+          root: { type: 'leaf', leafId: LEAF_ID },
+          activeLeafId: LEAF_ID,
+          expandedLeafId: null,
+          ptyIdsByLeafId: { [LEAF_ID]: 'duplicate-pty' }
+        },
+        'tab-2': {
+          root: { type: 'leaf', leafId: nextLeafId },
+          activeLeafId: nextLeafId,
+          expandedLeafId: null,
+          ptyIdsByLeafId: { [nextLeafId]: 'duplicate-pty' }
+        }
+      }
+    })
+
+    recordRuntimeTerminalInputForPtyId('duplicate-pty', 123)
+
+    expect(useAppStore.getState().lastTerminalInputAtByPaneKey).toEqual({})
+  })
+
   it('reports success after fallback fire-and-forget writes when local acceptance cannot be verified', async () => {
     localWriteAccepted.mockResolvedValue(false)
 
diff --git a/src/renderer/src/runtime/runtime-terminal-inspection.ts b/src/renderer/src/runtime/runtime-terminal-inspection.ts
index 9f7c446e35a..5903144ebcb 100644
--- a/src/renderer/src/runtime/runtime-terminal-inspection.ts
+++ b/src/renderer/src/runtime/runtime-terminal-inspection.ts
@@ -1,6 +1,6 @@
 import type { GlobalSettings } from '../../../shared/global-settings-types'
 import type { RuntimeTerminalSend } from '../../../shared/runtime-types'
-import { makePaneKey } from '../../../shared/stable-pane-id'
+import { makePaneKey, type PaneKey } from '../../../shared/stable-pane-id'
 import { isTerminalInputTooLargeWithDeferredMeasurement } from '../../../shared/terminal-input'
 import { useAppStore } from '../store'
 import { callRuntimeRpc, getActiveRuntimeTarget } from './runtime-rpc-client'
@@ -24,6 +24,56 @@ export type { RuntimeTerminalProcessInspection }
 
 const REMOTE_PTY_ID_PREFIX = 'remote:'
 const DESKTOP_RUNTIME_CLIENT = { id: 'orca-desktop', type: 'desktop' } as const
+type TerminalLayoutsByTabId = ReturnType<typeof useAppStore.getState>['terminalLayoutsByTabId']
+type TerminalPaneOwner = {
+  tabId: string
+  leafId: string
+  paneKey: PaneKey
+}
+
+const paneOwnersByPtyIdByLayoutIdentity = new WeakMap<
+  TerminalLayoutsByTabId,
+  Map<string, TerminalPaneOwner>
+>()
+
+function resolvePaneKeyForPtyId(layouts: TerminalLayoutsByTabId, ptyId: string): PaneKey | null {
+  let paneOwnersByPtyId = paneOwnersByPtyIdByLayoutIdentity.get(layouts)
+  if (!paneOwnersByPtyId) {
+    paneOwnersByPtyId = new Map<string, TerminalPaneOwner>()
+    paneOwnersByPtyIdByLayoutIdentity.set(layouts, paneOwnersByPtyId)
+  }
+  const cachedOwner = paneOwnersByPtyId.get(ptyId)
+  if (cachedOwner) {
+    const layout = Object.prototype.propertyIsEnumerable.call(layouts, cachedOwner.tabId)
+      ? layouts[cachedOwner.tabId]
+      : undefined
+    const ptyIdsByLeafId = layout?.ptyIdsByLeafId
+    if (
+      ptyIdsByLeafId &&
+      Object.prototype.propertyIsEnumerable.call(ptyIdsByLeafId, cachedOwner.leafId) &&
+      ptyIdsByLeafId[cachedOwner.leafId] === ptyId
+    ) {
+      return cachedOwner.paneKey
+    }
+    paneOwnersByPtyId.delete(ptyId)
+  }
+  for (const [tabId, layout] of Object.entries(layouts)) {
+    for (const [leafId, leafPtyId] of Object.entries(layout?.ptyIdsByLeafId ?? {})) {
+      if (leafPtyId !== ptyId) {
+        continue
+      }
+      try {
+        const paneKey = makePaneKey(tabId, leafId)
+        paneOwnersByPtyId.set(ptyId, { tabId, leafId, paneKey })
+        return paneKey
+      } catch {
+        // Preserve first-match behavior for malformed legacy layout rows.
+        return null
+      }
+    }
+  }
+  return null
+}
 
 function isRuntimePtyInputTooLarge(data: string): boolean | Promise<boolean> {
   return isTerminalInputTooLargeWithDeferredMeasurement(data)
@@ -35,21 +85,17 @@ export function isRemoteRuntimePtyId(ptyId: string): boolean {
 
 export function recordRuntimeTerminalInputForPtyId(ptyId: string, timestamp = Date.now()): void {
   const state = useAppStore.getState()
-  for (const [tabId, layout] of Object.entries(state.terminalLayoutsByTabId)) {
-    for (const [leafId, leafPtyId] of Object.entries(layout?.ptyIdsByLeafId ?? {})) {
-      if (leafPtyId !== ptyId) {
-        continue
-      }
-      try {
-        // Why: paired/runtime sends can bypass xterm.onData, so hibernation
-        // needs the same user-input marker from the PTY-id route.
-        state.recordTerminalInput(makePaneKey(tabId, leafId), timestamp)
-      } catch {
-        // Ignore malformed legacy layout data; the planner will stay
-        // conservative when a live PTY cannot be matched to an eligible pane.
-      }
-      return
-    }
+  const paneKey = resolvePaneKeyForPtyId(state.terminalLayoutsByTabId, ptyId)
+  if (!paneKey) {
+    return
+  }
+  try {
+    // Why: paired/runtime sends can bypass xterm.onData, so hibernation
+    // needs the same user-input marker from the PTY-id route.
+    state.recordTerminalInput(paneKey, timestamp)
+  } catch {
+    // Ignore malformed legacy layout data; the planner will stay
+    // conservative when a live PTY cannot be matched to an eligible pane.
   }
 }
 
diff --git a/src/renderer/src/runtime/web-runtime-browser-creation-context.ts b/src/renderer/src/runtime/web-runtime-browser-creation-context.ts
new file mode 100644
index 00000000000..d82f287b475
--- /dev/null
+++ b/src/renderer/src/runtime/web-runtime-browser-creation-context.ts
@@ -0,0 +1,265 @@
+import type { BrowserClientHostPlacementPreference } from '../../../shared/browser-client-host-placement'
+import { BROWSER_TAB_CREATE_KNOWN_ID_RUNTIME_CAPABILITY } from '../../../shared/protocol-version'
+import { assertRuntimeManagedBrowserCreationAvailable } from '../lib/client-creation-action-policy'
+import { createBrowserUuid } from '../lib/browser-uuid'
+import { useAppStore } from '../store'
+import {
+  clearWebSessionFocusIntentIfMatches,
+  peekWebSessionFocusIntent,
+  recordWebSessionFocusIntent,
+  resolveWebSessionVisibleTabId
+} from './web-session-focus-intent'
+import {
+  forgetWebSessionBrowserPlacement,
+  markWebSessionBrowserPlacementGroupMaterialized,
+  moveWebSessionBrowserPlacement,
+  recordWebSessionBrowserPlacement
+} from './web-session-browser-placement'
+import {
+  rehomeStagedWebRuntimeBrowserTab,
+  restageWebRuntimeBrowserTabHostingIntent,
+  stageWebRuntimeBrowserTab,
+  type StagedWebRuntimeBrowserTab
+} from './web-runtime-browser-tab-staging'
+import { throwIfE2eWebRuntimeBrowserCapabilityUnavailable } from './web-runtime-browser-creation-e2e-fault'
+import { expectsBrowserClientHosting } from '../../../shared/browser-client-hosting-eligibility'
+import {
+  captureRuntimeEnvironmentCall,
+  captureWebSessionIntentOwner,
+  matchesWebSessionIntentOwner
+} from './web-runtime-session-environment'
+import { selectWebRuntimeSessionBrowserWorktree } from './web-runtime-session-workspace-selection'
+
+export type CreateWebRuntimeSessionBrowserTabArgs = {
+  worktreeId: string
+  environmentId?: string | null
+  url?: string
+  profileId?: string | null
+  targetGroupId?: string
+  clientTargetGroupId?: string
+  clientTargetGroupCreated?: boolean
+  focusOnCreate?: boolean
+  /** Wait until a renderer-backed host can publish the new page in its session snapshot. */
+  waitForRegistration?: boolean
+  selectWorktree?: boolean
+  stagedTitle?: string
+  stagedFocusAddressBar?: boolean
+  failureLogMode?: 'details' | 'operation-only'
+  placementPreference?: BrowserClientHostPlacementPreference
+}
+
+export type WebRuntimeBrowserCreationContext = {
+  args: CreateWebRuntimeSessionBrowserTabArgs
+  environmentId: string
+  intentOwner: ReturnType<typeof captureWebSessionIntentOwner>
+  callEnvironment: ReturnType<typeof captureRuntimeEnvironmentCall>
+  shouldFocusOnCreate: boolean
+  shouldSelectWorktree: boolean
+  provisionalPageId: string
+  hostSupportsKnownPageId: boolean
+  expectsClientHosting: boolean
+  unsubscribeFocusGuard: () => void
+  guardedPageId: string
+  createdPageId: string | null
+  createAttempted: boolean
+  staged: StagedWebRuntimeBrowserTab | null
+  expectedCurrentLocalTabId?: string | null
+}
+
+export function createWebRuntimeBrowserCreationContext(
+  args: CreateWebRuntimeSessionBrowserTabArgs,
+  environmentId: string
+): WebRuntimeBrowserCreationContext {
+  const intentOwner = captureWebSessionIntentOwner(environmentId)
+  const callEnvironment = captureRuntimeEnvironmentCall(environmentId, intentOwner.pairingRevision)
+  const shouldFocusOnCreate = args.focusOnCreate !== false
+  const provisionalPageId = createBrowserUuid()
+  const advertisedCapabilities =
+    useAppStore.getState().runtimeStatusByEnvironmentId?.get(environmentId)?.status?.capabilities ??
+    []
+  const hostSupportsKnownPageId = advertisedCapabilities.includes(
+    BROWSER_TAB_CREATE_KNOWN_ID_RUNTIME_CAPABILITY
+  )
+  // Why the same predicate the main process uses: this mounts the staged pane one round-trip
+  // before prepareBrowserClientHostPlacement answers, so the two have to reach the same verdict
+  // from the same inputs. A cached status disagreeing with the live one is corrected by
+  // restageWebRuntimeBrowserTabHostingIntent below; it never decides the placement itself.
+  const expectsClientHosting = expectsBrowserClientHosting({
+    enabled: useAppStore.getState().settings?.browserClientHostedRemoteEnabled !== false,
+    preference: args.placementPreference,
+    deviceScope: useAppStore.getState().runtimeStatusByEnvironmentId?.get(environmentId)?.status
+      ?.deviceScope,
+    capabilities: advertisedCapabilities
+  })
+  return {
+    args,
+    environmentId,
+    intentOwner,
+    callEnvironment,
+    shouldFocusOnCreate,
+    shouldSelectWorktree: args.selectWorktree !== false,
+    provisionalPageId,
+    hostSupportsKnownPageId,
+    expectsClientHosting,
+    unsubscribeFocusGuard: (): void => {},
+    guardedPageId: provisionalPageId,
+    createdPageId: null,
+    createAttempted: false,
+    staged: null
+  }
+}
+
+export function stageWebRuntimeBrowserCreation(context: WebRuntimeBrowserCreationContext): void {
+  const { args, environmentId, intentOwner, provisionalPageId, shouldFocusOnCreate } = context
+  throwIfE2eWebRuntimeBrowserCapabilityUnavailable()
+  assertRuntimeManagedBrowserCreationAvailable(useAppStore.getState(), environmentId)
+  if (args.clientTargetGroupId) {
+    recordWebSessionBrowserPlacement({
+      environmentId,
+      worktreeId: args.worktreeId,
+      remotePageId: provisionalPageId,
+      groupId: args.clientTargetGroupId,
+      callerCreatedGroup: args.clientTargetGroupCreated
+    })
+  }
+  if (context.shouldSelectWorktree) {
+    selectWebRuntimeSessionBrowserWorktree(args.worktreeId, environmentId)
+  }
+  // Why: everything below this point is a host round-trip; stage the tab first so the strip
+  // reacts to the click instead of to the runtime.
+  context.staged = stageWebRuntimeBrowserTab({
+    environmentId,
+    worktreeId: args.worktreeId,
+    remotePageId: provisionalPageId,
+    activate: shouldFocusOnCreate,
+    ...(args.url !== undefined ? { url: args.url } : {}),
+    ...(args.stagedTitle !== undefined ? { title: args.stagedTitle } : {}),
+    ...(args.profileId !== undefined ? { profileId: args.profileId } : {}),
+    ...((args.clientTargetGroupId ?? args.targetGroupId)
+      ? { targetGroupId: (args.clientTargetGroupId ?? args.targetGroupId) as string }
+      : {}),
+    ...(args.stagedFocusAddressBar !== undefined
+      ? { focusAddressBar: args.stagedFocusAddressBar }
+      : {}),
+    clientHosted: context.expectsClientHosting
+  })
+  // Why: sample the focus expectation and arm its guard against the state staging just wrote,
+  // before any await. Sampling after the client-host preparation round-trip baked a switch made
+  // during it into the baseline, so the guard read the user's new tab as "hasn't moved" and
+  // adoption stole focus back.
+  const initialFocusState = shouldFocusOnCreate ? useAppStore.getState() : null
+  const expectedActiveWorktreeId = initialFocusState?.activeWorktreeId
+  const expectedActiveWorkspaceExecutionHostId = initialFocusState?.activeWorkspaceExecutionHostId
+  context.expectedCurrentLocalTabId = initialFocusState
+    ? resolveWebSessionVisibleTabId(initialFocusState, args.worktreeId)
+    : null
+  if (shouldFocusOnCreate && matchesWebSessionIntentOwner(intentOwner)) {
+    recordWebSessionFocusIntent(
+      intentOwner,
+      args.worktreeId,
+      provisionalPageId,
+      undefined,
+      context.expectedCurrentLocalTabId
+    )
+    context.unsubscribeFocusGuard = useAppStore.subscribe((state, previousState) => {
+      if (
+        state.activeBrowserTabIdByWorktree === previousState.activeBrowserTabIdByWorktree &&
+        state.activeFileIdByWorktree === previousState.activeFileIdByWorktree &&
+        // Why: resolveWebSessionVisibleTabId now reads group state, so a group-only focus move
+        // must re-evaluate it.
+        state.activeGroupIdByWorktree === previousState.activeGroupIdByWorktree &&
+        state.activeTabIdByWorktree === previousState.activeTabIdByWorktree &&
+        state.activeTabType === previousState.activeTabType &&
+        state.activeTabTypeByWorktree === previousState.activeTabTypeByWorktree &&
+        state.activeWorktreeId === previousState.activeWorktreeId &&
+        state.activeWorkspaceExecutionHostId === previousState.activeWorkspaceExecutionHostId &&
+        state.groupsByWorktree === previousState.groupsByWorktree &&
+        state.unifiedTabsByWorktree === previousState.unifiedTabsByWorktree
+      ) {
+        return
+      }
+      if (
+        state.activeWorktreeId === expectedActiveWorktreeId &&
+        state.activeWorkspaceExecutionHostId === expectedActiveWorkspaceExecutionHostId &&
+        resolveWebSessionVisibleTabId(state, args.worktreeId) === context.expectedCurrentLocalTabId
+      ) {
+        return
+      }
+      clearWebSessionFocusIntentIfMatches(intentOwner, args.worktreeId, context.guardedPageId)
+      context.unsubscribeFocusGuard()
+    })
+  }
+}
+
+export function restageWebRuntimeBrowserCreation(
+  context: WebRuntimeBrowserCreationContext,
+  clientHosted: boolean
+): void {
+  if (context.staged) {
+    context.staged = restageWebRuntimeBrowserTabHostingIntent(context.staged, {
+      environmentId: context.environmentId,
+      remotePageId: context.provisionalPageId,
+      clientHosted
+    })
+  }
+}
+
+export function rehomeWebRuntimeBrowserCreation(
+  context: WebRuntimeBrowserCreationContext,
+  remotePageId: string
+): void {
+  const { args, environmentId, intentOwner, provisionalPageId } = context
+  moveWebSessionBrowserPlacement({
+    environmentId,
+    worktreeId: args.worktreeId,
+    fromRemotePageId: provisionalPageId,
+    toRemotePageId: remotePageId
+  })
+  if (context.staged) {
+    context.staged = rehomeStagedWebRuntimeBrowserTab(context.staged, {
+      environmentId,
+      worktreeId: args.worktreeId,
+      remotePageId
+    })
+  }
+  const focusIntent = context.shouldFocusOnCreate
+    ? peekWebSessionFocusIntent(intentOwner, args.worktreeId)
+    : null
+  if (focusIntent?.hostTabId === provisionalPageId) {
+    recordWebSessionFocusIntent(
+      intentOwner,
+      args.worktreeId,
+      remotePageId,
+      undefined,
+      focusIntent.expectedCurrentLocalTabId
+    )
+  }
+  context.guardedPageId = remotePageId
+}
+
+export function completeWebRuntimeBrowserCreation(context: WebRuntimeBrowserCreationContext): true {
+  const { args, environmentId, intentOwner, guardedPageId } = context
+  context.staged = null
+  const remainingFocusIntent = context.shouldFocusOnCreate
+    ? peekWebSessionFocusIntent(intentOwner, args.worktreeId)
+    : null
+  if (
+    remainingFocusIntent?.hostTabId === guardedPageId &&
+    remainingFocusIntent.expectedCurrentLocalTabId === context.expectedCurrentLocalTabId
+  ) {
+    clearWebSessionFocusIntentIfMatches(intentOwner, args.worktreeId, guardedPageId)
+  }
+  context.unsubscribeFocusGuard()
+  if (args.clientTargetGroupId) {
+    markWebSessionBrowserPlacementGroupMaterialized({
+      worktreeId: args.worktreeId,
+      groupId: args.clientTargetGroupId
+    })
+  }
+  forgetWebSessionBrowserPlacement({
+    environmentId,
+    worktreeId: args.worktreeId,
+    remotePageId: guardedPageId
+  })
+  return true
+}
diff --git a/src/renderer/src/runtime/web-runtime-browser-creation-failure.ts b/src/renderer/src/runtime/web-runtime-browser-creation-failure.ts
new file mode 100644
index 00000000000..36a774ad5f8
--- /dev/null
+++ b/src/renderer/src/runtime/web-runtime-browser-creation-failure.ts
@@ -0,0 +1,118 @@
+import { useAppStore } from '../store'
+import { hasRuntimeRpcErrorCode } from './runtime-rpc-client'
+import { clearWebSessionFocusIntentIfMatches } from './web-session-focus-intent'
+import {
+  claimWebSessionBrowserPlacementGroupCleanup,
+  forgetWebSessionBrowserPlacement,
+  releaseWebSessionBrowserPlacementGroup
+} from './web-session-browser-placement'
+import {
+  discardStagedWebRuntimeBrowserTab,
+  StagedWebRuntimeBrowserTabCancelledError
+} from './web-runtime-browser-tab-staging'
+import type { WebRuntimeBrowserCreationContext } from './web-runtime-browser-creation-context'
+
+const DEFINITIVE_BROWSER_CREATE_FAILURE_CODES = [
+  'browser_error',
+  'capability_unsupported',
+  'invalid_argument',
+  'invalid_params',
+  'method_not_found',
+  'runtime_rpc_queue_overloaded',
+  'selector_ambiguous',
+  'selector_not_found',
+  'unauthorized'
+] as const
+
+function isDefinitiveBrowserCreateFailure(error: unknown): boolean {
+  return DEFINITIVE_BROWSER_CREATE_FAILURE_CODES.some((code) => hasRuntimeRpcErrorCode(error, code))
+}
+
+type WebRuntimeBrowserCreationFailure = {
+  cleanupPageId: string | null
+  createOutcomeUnknown: boolean
+  ownsClientGroupCleanup: boolean
+  recoveryError: unknown
+}
+
+export function prepareWebRuntimeBrowserCreationFailure(
+  context: WebRuntimeBrowserCreationContext,
+  error: unknown
+): WebRuntimeBrowserCreationFailure {
+  const { args, environmentId, guardedPageId } = context
+  context.unsubscribeFocusGuard()
+  // Why: unwind the optimistic tab before the cleanup round-trips below, so a failed create
+  // does not leave a dead tab sitting in the strip for the length of browser.tabClose.
+  if (context.staged) {
+    discardStagedWebRuntimeBrowserTab(context.staged)
+  }
+  const createFailureDefinitive = isDefinitiveBrowserCreateFailure(error)
+  const cleanupPageId =
+    context.createdPageId ??
+    (context.createAttempted && !createFailureDefinitive && context.hostSupportsKnownPageId
+      ? context.provisionalPageId
+      : null)
+  const createOutcomeUnknown = !cleanupPageId && !createFailureDefinitive
+  const ownsClientGroupCleanup = args.clientTargetGroupId
+    ? releaseWebSessionBrowserPlacementGroup({
+        environmentId,
+        worktreeId: args.worktreeId,
+        remotePageId: guardedPageId,
+        groupId: args.clientTargetGroupId,
+        callerCreatedGroup: args.clientTargetGroupCreated === true
+      })
+    : false
+  if (!args.clientTargetGroupId) {
+    forgetWebSessionBrowserPlacement({
+      environmentId,
+      worktreeId: args.worktreeId,
+      remotePageId: guardedPageId
+    })
+  }
+  return { cleanupPageId, createOutcomeUnknown, ownsClientGroupCleanup, recoveryError: null }
+}
+
+export function finishWebRuntimeBrowserCreationFailure(
+  context: WebRuntimeBrowserCreationContext,
+  failure: WebRuntimeBrowserCreationFailure,
+  error: unknown
+): false {
+  const { args, intentOwner, guardedPageId } = context
+  if (context.shouldFocusOnCreate) {
+    clearWebSessionFocusIntentIfMatches(intentOwner, args.worktreeId, guardedPageId)
+  }
+  if (
+    args.clientTargetGroupId &&
+    claimWebSessionBrowserPlacementGroupCleanup({
+      worktreeId: args.worktreeId,
+      groupId: args.clientTargetGroupId,
+      ownsGroupCleanup: failure.ownsClientGroupCleanup
+    })
+  ) {
+    useAppStore.getState().closeEmptyGroup(args.worktreeId, args.clientTargetGroupId)
+  }
+  if (error instanceof StagedWebRuntimeBrowserTabCancelledError) {
+    console.warn('[web-runtime-session] browser tab was closed before its create finished')
+  } else if (args.failureLogMode === 'operation-only') {
+    console.warn('[web-runtime-session] failed to create browser tab')
+  } else {
+    console.warn(
+      '[web-runtime-session] failed to create browser tab:',
+      error instanceof Error ? error.message : String(error)
+    )
+  }
+  if (failure.recoveryError) {
+    throw new Error('The paired runtime could not recover the failed browser creation.', {
+      cause: failure.recoveryError
+    })
+  }
+  if (!context.createAttempted) {
+    throw error
+  }
+  if (failure.createOutcomeUnknown) {
+    throw new Error('The paired runtime did not confirm whether the browser tab was created.', {
+      cause: error
+    })
+  }
+  return false
+}
diff --git a/src/renderer/src/runtime/web-runtime-browser-creation.ts b/src/renderer/src/runtime/web-runtime-browser-creation.ts
new file mode 100644
index 00000000000..99ad27d0adb
--- /dev/null
+++ b/src/renderer/src/runtime/web-runtime-browser-creation.ts
@@ -0,0 +1,255 @@
+import type { BrowserPageCreationPlacement } from '../../../shared/browser-client-host-placement'
+import type { RuntimeRpcResponse } from '../../../shared/runtime-rpc-envelope'
+import type { BrowserTabCreateResult } from '../../../shared/runtime-types'
+import { translate } from '../i18n/i18n'
+import { useAppStore } from '../store'
+import { hasRuntimeRpcErrorCode, unwrapRuntimeRpcResult } from './runtime-rpc-client'
+import { toRuntimeWorktreeSelector } from './runtime-worktree-selector'
+import { hasMaterializedWebRuntimeBrowserPage } from './web-runtime-browser-materialization'
+import { waitForWebRuntimeBrowserPageMaterialization } from './web-runtime-browser-materialization-wait'
+import {
+  isStagedWebRuntimeBrowserTabLive,
+  resolveStagedWebRuntimeBrowserTabGroupId,
+  StagedWebRuntimeBrowserTabCancelledError
+} from './web-runtime-browser-tab-staging'
+import {
+  completeWebRuntimeBrowserCreation,
+  createWebRuntimeBrowserCreationContext,
+  rehomeWebRuntimeBrowserCreation,
+  restageWebRuntimeBrowserCreation,
+  stageWebRuntimeBrowserCreation,
+  type CreateWebRuntimeSessionBrowserTabArgs
+} from './web-runtime-browser-creation-context'
+import {
+  finishWebRuntimeBrowserCreationFailure,
+  prepareWebRuntimeBrowserCreationFailure
+} from './web-runtime-browser-creation-failure'
+import {
+  pauseAfterE2eWebRuntimeBrowserCreate,
+  pauseDuringE2eWebRuntimeBrowserClientHostPreparation
+} from './web-runtime-browser-creation-e2e-fault'
+import { isWebRuntimeSessionActive } from './web-runtime-session-environment'
+import { refreshWebRuntimeSessionTabsSnapshot } from './web-runtime-session-snapshot'
+
+export async function createWebRuntimeSessionBrowserTab(
+  args: CreateWebRuntimeSessionBrowserTabArgs
+): Promise<boolean> {
+  const environmentId =
+    args.environmentId?.trim() ??
+    useAppStore.getState().settings?.activeRuntimeEnvironmentId?.trim() ??
+    null
+  if (!environmentId || !isWebRuntimeSessionActive(environmentId)) {
+    return false
+  }
+  const context = createWebRuntimeBrowserCreationContext(args, environmentId)
+  try {
+    stageWebRuntimeBrowserCreation(context)
+    const placementPreference = args.placementPreference ?? 'auto'
+    let placement: BrowserPageCreationPlacement = { kind: 'server' }
+    // Why no cached-capability gate here: the renderer's runtime status can hold a pre-upgrade
+    // "cannot client-host" verdict for a whole catalog TTL, and skipping the preparation on it
+    // pinned a capable pair to server placement for that long. The preparation reads live status
+    // and answers `server` for a runtime that truly cannot host, so staleness now costs a round
+    // trip against an incapable host instead of the wrong placement. An unreachable host pays for
+    // that on the failure path too: the probe's 15s ceiling, then the tabCreate behind it and the
+    // cleanup close its non-definitive failure needs, where before the create never started.
+    if (placementPreference !== 'server') {
+      try {
+        await pauseDuringE2eWebRuntimeBrowserClientHostPreparation()
+        placement = await window.api.runtimeEnvironments.prepareBrowserClientHostPlacement({
+          selector: environmentId,
+          expectedPairingRevision: context.intentOwner.pairingRevision,
+          preference: placementPreference
+        })
+      } catch (error) {
+        console.warn('[web-runtime-session] failed to prepare client browser host:', error)
+        throw new Error(
+          translate(
+            'browser.clientHosted.preparationFailed',
+            "Couldn't start the remote browser on this desktop. Check the paired connection and try again."
+          ),
+          { cause: error }
+        )
+      }
+    }
+    restageWebRuntimeBrowserCreation(context, placement.kind === 'client')
+    context.createAttempted = true
+    const navigateAfterCreate =
+      args.waitForRegistration === true && args.url && args.url !== 'about:blank'
+    const created = unwrapRuntimeRpcResult(
+      (await context.callEnvironment({
+        method: 'browser.tabCreate',
+        params: {
+          worktree: toRuntimeWorktreeSelector(args.worktreeId),
+          url: navigateAfterCreate ? undefined : args.url,
+          ...(context.hostSupportsKnownPageId ? { page: context.provisionalPageId } : {}),
+          ...(placement.kind === 'client' ? { placement } : {}),
+          profileId: args.profileId ?? undefined,
+          activate: context.shouldFocusOnCreate,
+          // Why: `activate` alone made every paired device — the host desktop included — jump to a
+          // tab this client created. New hosts read `navigation`; old ones ignore it and keep
+          // today's behavior, which is also what keeps their targetGroupId placement working.
+          navigation: 'caller',
+          // Why: place the new browser in the clicked split group so the host snapshot is authoritative for it (no left-snap).
+          ...(args.targetGroupId ? { targetGroupId: args.targetGroupId } : {}),
+          // Why: web clients need the local tab now; waiting for host webview registration makes the workspace appear to close.
+          waitForRegistration: args.waitForRegistration ?? false
+        },
+        timeoutMs: 15_000
+      })) as RuntimeRpcResponse<BrowserTabCreateResult>
+    )
+    context.createdPageId = created.browserPageId
+    if (navigateAfterCreate) {
+      void context
+        .callEnvironment({
+          method: 'browser.goto',
+          params: {
+            worktree: toRuntimeWorktreeSelector(args.worktreeId),
+            page: created.browserPageId,
+            url: args.url
+          },
+          timeoutMs: 15_000
+        })
+        .then((response) => unwrapRuntimeRpcResult(response))
+        .catch((error) => {
+          console.warn(
+            '[web-runtime-session] created browser tab navigation failed:',
+            error instanceof Error ? error.message : String(error)
+          )
+        })
+    }
+    await pauseAfterE2eWebRuntimeBrowserCreate(created.browserPageId)
+    // Why: the strip's X on a staged tab only unwinds this client's rows — it cannot close a host
+    // page whose id did not exist when the user clicked. Hand the cancel to the cleanup path in the
+    // catch below, which already owns retiring an unreconciled host page.
+    // Why (accepted bound): the host page has no name until the create answers, so a cancel during
+    // that round-trip leaves it alive for up to the RPC timeout. That is the same bound the
+    // unreconciled-cleanup path has always accepted, so no sweep is added for it.
+    if (context.staged && !isStagedWebRuntimeBrowserTabLive(context.staged, args.worktreeId)) {
+      throw new StagedWebRuntimeBrowserTabCancelledError()
+    }
+    if (created.browserPageId !== context.provisionalPageId) {
+      rehomeWebRuntimeBrowserCreation(context, created.browserPageId)
+    }
+    try {
+      await refreshWebRuntimeSessionTabsSnapshot(environmentId, args.worktreeId, {
+        expectedEnvironmentPairingRevision: context.intentOwner.pairingRevision,
+        acceptCurrentSnapshot: true,
+        afterCurrentInFlight: true,
+        errorMode: 'throw'
+      })
+    } catch (error) {
+      if (
+        !hasMaterializedWebRuntimeBrowserPage(
+          useAppStore.getState(),
+          environmentId,
+          args.worktreeId,
+          created.browserPageId,
+          args.clientTargetGroupId ?? args.targetGroupId
+        )
+      ) {
+        throw error
+      }
+    }
+    const expectedGroupId =
+      (context.staged
+        ? resolveStagedWebRuntimeBrowserTabGroupId(context.staged, args.worktreeId)
+        : undefined) ??
+      args.clientTargetGroupId ??
+      args.targetGroupId
+    let materialized = hasMaterializedWebRuntimeBrowserPage(
+      useAppStore.getState(),
+      environmentId,
+      args.worktreeId,
+      created.browserPageId,
+      expectedGroupId
+    )
+    if (!materialized) {
+      materialized = await waitForWebRuntimeBrowserPageMaterialization({
+        environmentId,
+        worktreeId: args.worktreeId,
+        remotePageId: created.browserPageId,
+        ...(expectedGroupId ? { expectedGroupId } : {})
+      })
+    }
+    if (!materialized && expectedGroupId) {
+      // Why: an older runtime can honor creation but not group targeting; a live tab in
+      // the wrong split beats destroying what the user just made.
+      materialized = hasMaterializedWebRuntimeBrowserPage(
+        useAppStore.getState(),
+        environmentId,
+        args.worktreeId,
+        created.browserPageId
+      )
+      if (materialized) {
+        console.warn(
+          '[web-runtime-session] created browser tab landed outside the requested group:',
+          expectedGroupId
+        )
+      }
+    }
+    if (!materialized) {
+      throw new Error('The created browser tab did not materialize in the client.')
+    }
+    // Why: materialization only proves *some* workspace in this worktree carries the page — when the
+    // host mirrors it under its own id, the predicate goes true even though the staged row the user
+    // X-ed is gone. The whole materialization wait above is a live window for that X, so re-check the
+    // row here before the stage is surrendered, or the create reports success and never retires the
+    // host page.
+    if (context.staged && !isStagedWebRuntimeBrowserTabLive(context.staged, args.worktreeId)) {
+      throw new StagedWebRuntimeBrowserTabCancelledError()
+    }
+    // Why: materialization means the snapshot has taken ownership of these rows, so nothing
+    // downstream may still unwind them as an optimistic stage.
+    return completeWebRuntimeBrowserCreation(context)
+  } catch (error) {
+    const failure = prepareWebRuntimeBrowserCreationFailure(context, error)
+    if (failure.cleanupPageId) {
+      try {
+        const closeResult = unwrapRuntimeRpcResult(
+          (await context.callEnvironment({
+            method: 'browser.tabClose',
+            params: {
+              worktree: toRuntimeWorktreeSelector(args.worktreeId),
+              page: failure.cleanupPageId
+            },
+            timeoutMs: 15_000
+          })) as RuntimeRpcResponse<{ closed: boolean }>
+        )
+        if (!closeResult.closed) {
+          throw new Error('The paired runtime did not close the unreconciled browser tab.')
+        }
+        await refreshWebRuntimeSessionTabsSnapshot(environmentId, args.worktreeId, {
+          expectedEnvironmentPairingRevision: context.intentOwner.pairingRevision,
+          afterCurrentInFlight: true,
+          errorMode: 'throw'
+        })
+        if (
+          hasMaterializedWebRuntimeBrowserPage(
+            useAppStore.getState(),
+            environmentId,
+            args.worktreeId,
+            failure.cleanupPageId
+          )
+        ) {
+          throw new Error('The closed browser tab remained materialized in the client.')
+        }
+      } catch (cleanupError) {
+        if (
+          !context.createdPageId &&
+          context.hostSupportsKnownPageId &&
+          hasRuntimeRpcErrorCode(cleanupError, 'browser_tab_not_found')
+        ) {
+          failure.recoveryError = null
+        } else {
+          failure.recoveryError = cleanupError
+          console.warn(
+            '[web-runtime-session] failed to clean up unreconciled browser tab:',
+            cleanupError instanceof Error ? cleanupError.message : String(cleanupError)
+          )
+        }
+      }
+    }
+    return finishWebRuntimeBrowserCreationFailure(context, failure, error)
+  }
+}
diff --git a/src/renderer/src/runtime/web-runtime-session-environment.ts b/src/renderer/src/runtime/web-runtime-session-environment.ts
new file mode 100644
index 00000000000..f07164c3173
--- /dev/null
+++ b/src/renderer/src/runtime/web-runtime-session-environment.ts
@@ -0,0 +1,37 @@
+import type { RuntimeRpcResponse } from '../../../shared/runtime-rpc-envelope'
+import { getRuntimeEnvironmentRevision } from './runtime-environment-revision'
+import type { WebSessionIntentOwner } from './web-session-intent-owner'
+
+export function isWebRuntimeSessionActive(
+  activeRuntimeEnvironmentId: string | null | undefined
+): boolean {
+  // Why: headless serve sessions are owned by the remote runtime, whether the client is web or desktop Electron.
+  return Boolean(activeRuntimeEnvironmentId?.trim())
+}
+
+export function captureRuntimeEnvironmentCall(
+  environmentId: string,
+  expectedEnvironmentPairingRevision = getRuntimeEnvironmentRevision(environmentId)
+): (args: {
+  method: string
+  params?: unknown
+  timeoutMs?: number
+}) => Promise<RuntimeRpcResponse<unknown>> {
+  return (args) =>
+    window.api.runtimeEnvironments.call({
+      selector: environmentId,
+      ...args,
+      expectedEnvironmentPairingRevision
+    })
+}
+
+export function captureWebSessionIntentOwner(environmentId: string): WebSessionIntentOwner {
+  return {
+    environmentId,
+    pairingRevision: getRuntimeEnvironmentRevision(environmentId)
+  }
+}
+
+export function matchesWebSessionIntentOwner(owner: WebSessionIntentOwner): boolean {
+  return getRuntimeEnvironmentRevision(owner.environmentId) === owner.pairingRevision
+}
diff --git a/src/renderer/src/runtime/web-runtime-session-snapshot.ts b/src/renderer/src/runtime/web-runtime-session-snapshot.ts
new file mode 100644
index 00000000000..17866fceacf
--- /dev/null
+++ b/src/renderer/src/runtime/web-runtime-session-snapshot.ts
@@ -0,0 +1,169 @@
+import type { RuntimeRpcResponse } from '../../../shared/runtime-rpc-envelope'
+import type { RuntimeMobileSessionTabsResult } from '../../../shared/runtime-types'
+import { getRuntimeEnvironmentConnectionGeneration } from '@/store/slices/runtime-status'
+import { useAppStore } from '../store'
+import {
+  listRemoteRuntimeSessionTabsAfterCurrentInFlight,
+  listRemoteRuntimeSessionTabsDeduped
+} from './remote-runtime-session-tabs-inflight'
+import { getRuntimeEnvironmentRevision } from './runtime-environment-revision'
+import { unwrapRuntimeRpcResult } from './runtime-rpc-client'
+import { toRuntimeWorktreeSelector } from './runtime-worktree-selector'
+import { captureRuntimeEnvironmentCall } from './web-runtime-session-environment'
+import { throwIfE2eWebRuntimeBrowserReconciliationFails } from './web-runtime-browser-creation-e2e-fault'
+
+const pendingRuntimeWorktreeRecoveryRefreshes = new Map<string, symbol>()
+const RUNTIME_WORKTREE_RECOVERY_REFRESH_DELAYS_MS = [250, 500, 1_000, 2_000, 4_000] as const
+
+export async function refreshWebRuntimeSessionTabsSnapshot(
+  environmentId: string,
+  worktreeId: string,
+  options: {
+    expectedEnvironmentPairingRevision?: number
+    acceptCurrentSnapshot?: boolean
+    confirmAgentSessionHandoff?: {
+      provisionalTabId: string
+      hostTabId: string
+      hostTerminalHandle: string
+    }
+    afterCurrentInFlight?: boolean
+    errorMode?: 'warn' | 'throw'
+  } = {}
+): Promise<void> {
+  const webSessionTabsSync = await import('./web-session-tabs-sync')
+  const expectedEnvironmentPairingRevision =
+    options.expectedEnvironmentPairingRevision ?? getRuntimeEnvironmentRevision(environmentId)
+  const expectedEnvironmentConnectionGeneration =
+    getRuntimeEnvironmentConnectionGeneration(environmentId)
+  const expectedTrackingGeneration =
+    webSessionTabsSync.getWebSessionTabsTrackingGeneration(environmentId)
+  const callEnvironment = captureRuntimeEnvironmentCall(
+    environmentId,
+    expectedEnvironmentPairingRevision
+  )
+  try {
+    if (options.acceptCurrentSnapshot) {
+      const { acceptReplayedWebSessionTabsSnapshot } = await import('./web-session-tabs-sync')
+      // Why: the host snapshot may have arrived before structured create returned;
+      // re-accept its current version after the exact provisional handoff is known.
+      acceptReplayedWebSessionTabsSnapshot(environmentId, worktreeId)
+    }
+    const listSessionTabs =
+      options.confirmAgentSessionHandoff || options.afterCurrentInFlight
+        ? listRemoteRuntimeSessionTabsAfterCurrentInFlight
+        : listRemoteRuntimeSessionTabsDeduped
+    if (options.afterCurrentInFlight) {
+      throwIfE2eWebRuntimeBrowserReconciliationFails()
+    }
+    const snapshot = await listSessionTabs({
+      environmentId,
+      worktreeId,
+      load: async () => {
+        const response = await callEnvironment({
+          method: 'session.tabs.list',
+          params: {
+            worktree: toRuntimeWorktreeSelector(worktreeId)
+          },
+          timeoutMs: 15_000
+        })
+        return unwrapRuntimeRpcResult(
+          response as RuntimeRpcResponse<RuntimeMobileSessionTabsResult>
+        )
+      }
+    })
+    if (options.confirmAgentSessionHandoff) {
+      const { confirmWebAgentSessionHandoffAfterCreate } =
+        await import('./web-agent-session-handoff')
+      // Why: this list completed after structured creation, so absence now proves the exact host tab already retired.
+      confirmWebAgentSessionHandoffAfterCreate({
+        environmentId,
+        worktreeId,
+        ...options.confirmAgentSessionHandoff
+      })
+    }
+    const {
+      applyWebSessionTabsSnapshot,
+      applyWebSessionTabsStorePatch,
+      decideWebSessionTabsSnapshot
+    } = webSessionTabsSync
+    if (getRuntimeEnvironmentRevision(environmentId) !== expectedEnvironmentPairingRevision) {
+      return
+    }
+    // Why: this list is the host answering, but only the frame's own decision
+    // says whether that answer is evidence — a workspace the mirror never
+    // writes is discarded with nothing accepted behind it.
+    const decision = decideWebSessionTabsSnapshot(snapshot, environmentId)
+    const settleMirror = applyWebSessionTabsStorePatch(
+      (state) => {
+        // Why: eager refreshes can resolve after the user switched worktrees; update tabs without stealing focus.
+        const patch = decision.apply
+          ? applyWebSessionTabsSnapshot(state, snapshot, environmentId)
+          : state
+        return patch === state ? state : patch
+      },
+      {
+        frames: [
+          {
+            environmentId,
+            worktreeId: snapshot.worktree,
+            decision,
+            expectedEnvironmentConnectionGeneration,
+            expectedEnvironmentPairingRevision,
+            expectedTrackingGeneration
+          }
+        ]
+      },
+      snapshot
+    )
+    settleMirror()
+  } catch (error) {
+    if (options.errorMode === 'throw') {
+      throw error
+    }
+    // Why: host creation already succeeded; the long-lived session.tabs subscription catches up if this eager refresh fails.
+    console.warn(
+      '[web-runtime-session] failed to refresh session-tabs snapshot:',
+      error instanceof Error ? error.message : String(error)
+    )
+  }
+}
+
+export function scheduleRuntimeWorktreeRecoveryRefresh(
+  environmentId: string,
+  worktreeId: string,
+  expectedEnvironmentPairingRevision = getRuntimeEnvironmentRevision(environmentId)
+): void {
+  const initialState = useAppStore.getState()
+  if (!('tabsByWorktree' in initialState)) {
+    return
+  }
+  if ((initialState.tabsByWorktree[worktreeId] ?? []).length > 0) {
+    return
+  }
+  const key = `${environmentId}\0${expectedEnvironmentPairingRevision ?? ''}\0${worktreeId}`
+  const token = Symbol(key)
+  pendingRuntimeWorktreeRecoveryRefreshes.set(key, token)
+  void (async () => {
+    try {
+      for (const delayMs of RUNTIME_WORKTREE_RECOVERY_REFRESH_DELAYS_MS) {
+        await new Promise<void>((resolve) => setTimeout(resolve, delayMs))
+        if (pendingRuntimeWorktreeRecoveryRefreshes.get(key) !== token) {
+          return
+        }
+        if (getRuntimeEnvironmentRevision(environmentId) !== expectedEnvironmentPairingRevision) {
+          return
+        }
+        await refreshWebRuntimeSessionTabsSnapshot(environmentId, worktreeId, {
+          expectedEnvironmentPairingRevision
+        })
+        if ((useAppStore.getState().tabsByWorktree[worktreeId] ?? []).length > 0) {
+          return
+        }
+      }
+    } finally {
+      if (pendingRuntimeWorktreeRecoveryRefreshes.get(key) === token) {
+        pendingRuntimeWorktreeRecoveryRefreshes.delete(key)
+      }
+    }
+  })()
+}
diff --git a/src/renderer/src/runtime/web-runtime-session-tab-lifecycle.ts b/src/renderer/src/runtime/web-runtime-session-tab-lifecycle.ts
new file mode 100644
index 00000000000..a7381f10d6a
--- /dev/null
+++ b/src/renderer/src/runtime/web-runtime-session-tab-lifecycle.ts
@@ -0,0 +1,176 @@
+import type { RuntimeRpcResponse } from '../../../shared/runtime-rpc-envelope'
+import type {
+  RuntimeMobileSessionTabCloseResult,
+  RuntimeSessionTabCloseReason
+} from '../../../shared/runtime-types'
+import { useAppStore } from '../store'
+import { hasRuntimeRpcErrorCode, unwrapRuntimeRpcResult } from './runtime-rpc-client'
+import { toRuntimeWorktreeSelector } from './runtime-worktree-selector'
+import { clearWebSessionCloseIntent, recordWebSessionCloseIntent } from './web-session-close-intent'
+import {
+  clearWebSessionFocusIntentIfMatches,
+  recordWebSessionFocusIntent
+} from './web-session-focus-intent'
+import { toHostSessionTabId } from './web-terminal-surface-id'
+import {
+  captureRuntimeEnvironmentCall,
+  captureWebSessionIntentOwner,
+  isWebRuntimeSessionActive
+} from './web-runtime-session-environment'
+import { refreshWebRuntimeSessionTabsSnapshot } from './web-runtime-session-snapshot'
+
+export async function activateWebRuntimeSessionTab(args: {
+  worktreeId: string
+  tabId: string
+  environmentId?: string | null
+}): Promise<boolean> {
+  return (await callWebRuntimeSessionTabMethod('session.tabs.activate', args)) === 'applied'
+}
+
+/**
+ * Why 'unknown-tab' is its own outcome: it is the host's definitive answer that it has no such
+ * tab, which is the only evidence that lets a client finish a teardown the host cannot. Every
+ * other failure -- a dropped connection, a timeout -- is a "not now", and treating it the same
+ * would tear down tabs a reachable host still holds.
+ */
+export type WebRuntimeSessionTabCloseOutcome = 'applied' | 'unknown-tab' | 'failed'
+
+export async function closeWebRuntimeSessionTab(args: {
+  worktreeId: string
+  tabId: string
+  environmentId?: string | null
+  reason: RuntimeSessionTabCloseReason
+  publicationEpoch?: string | null
+  terminalHandle?: string | null
+}): Promise<WebRuntimeSessionTabCloseOutcome> {
+  return callWebRuntimeSessionTabMethod('session.tabs.close', args)
+}
+
+async function callWebRuntimeSessionTabMethod(
+  method: 'session.tabs.activate' | 'session.tabs.close',
+  args: {
+    worktreeId: string
+    tabId: string
+    environmentId?: string | null
+    reason?: RuntimeSessionTabCloseReason
+    publicationEpoch?: string | null
+    terminalHandle?: string | null
+  }
+): Promise<WebRuntimeSessionTabCloseOutcome> {
+  const environmentId =
+    args.environmentId?.trim() ??
+    useAppStore.getState().settings?.activeRuntimeEnvironmentId?.trim() ??
+    null
+  if (!environmentId || !isWebRuntimeSessionActive(environmentId)) {
+    return 'failed'
+  }
+  const intentOwner = captureWebSessionIntentOwner(environmentId)
+  const callEnvironment = captureRuntimeEnvironmentCall(environmentId, intentOwner.pairingRevision)
+  const closeIntentTabIds = new Set<string>()
+  let activationHostTabId: string | null = null
+
+  const isClose = method === 'session.tabs.close'
+  const isLifecycleClose = isClose && args.reason !== 'user'
+  if (isLifecycleClose && (!args.publicationEpoch || !args.terminalHandle)) {
+    // Why: missing host-generation or terminal-incarnation evidence means keep;
+    // a tab id alone can be stale or reused after reconnect.
+    const { acceptReplayedWebSessionTabsSnapshot } = await import('./web-session-tabs-sync')
+    acceptReplayedWebSessionTabsSnapshot(environmentId, args.worktreeId)
+    await refreshWebRuntimeSessionTabsSnapshot(environmentId, args.worktreeId)
+    console.warn('[web-runtime-session] suppressed lifecycle close without incarnation evidence', {
+      closeReason: args.reason
+    })
+    return 'failed'
+  }
+
+  const immediateHostTabId = toHostSessionTabId(args.tabId)
+  if (isClose) {
+    // Why: record before async id resolution so a stale snapshot cannot flash the closed tab back.
+    closeIntentTabIds.add(immediateHostTabId)
+    recordWebSessionCloseIntent(intentOwner, args.worktreeId, immediateHostTabId, Date.now())
+  }
+
+  try {
+    const { resolveHostSessionTabIdForWebSessionTab } = await import('./web-session-tabs-sync')
+    const state = useAppStore.getState()
+    const hostTabId =
+      resolveHostSessionTabIdForWebSessionTab(state, {
+        environmentId,
+        worktreeId: args.worktreeId,
+        tabId: args.tabId
+      }) ?? toHostSessionTabId(args.tabId)
+    if (isClose) {
+      // Why: suppress until the host confirms removal, else an in-flight pre-close snapshot flashes the tab back.
+      closeIntentTabIds.add(hostTabId)
+      recordWebSessionCloseIntent(intentOwner, args.worktreeId, hostTabId, Date.now())
+    } else {
+      activationHostTabId = hostTabId
+      recordWebSessionFocusIntent(intentOwner, args.worktreeId, hostTabId)
+    }
+    const response = await callEnvironment({
+      // Why: old hosts cannot route this additive method, so a generation
+      // cutover fails closed before their destructive legacy close handler.
+      method: isLifecycleClose ? 'session.tabs.closeLifecycle' : method,
+      params: {
+        worktree: toRuntimeWorktreeSelector(args.worktreeId),
+        tabId: hostTabId,
+        ...(method === 'session.tabs.activate'
+          ? {
+              // Why: the additive navigation target protects new hosts while notifyClients:false protects old hosts.
+              notifyClients: false,
+              navigation: 'caller' as const,
+              // Why: every caller here is a tab click, shortcut, or palette pick —
+              // the gesture that is supposed to wake a slept pane.
+              intent: 'user' as const
+            }
+          : {}),
+        ...(isLifecycleClose
+          ? {
+              reason: args.reason,
+              publicationEpoch: args.publicationEpoch,
+              terminal: args.terminalHandle
+            }
+          : isClose
+            ? { reason: args.reason }
+            : {})
+      },
+      timeoutMs: 15_000
+    })
+    const result = unwrapRuntimeRpcResult(
+      response as RuntimeRpcResponse<RuntimeMobileSessionTabCloseResult | undefined>
+    )
+    if (isClose) {
+      if (result?.refused === true && result.snapshotRepublished === true) {
+        // Why: the host kept an authoritative live PTY. Stop hiding its mirror
+        // only when it republished; dead-leaf refusals must stay suppressed.
+        clearWebSessionCloseIntent(intentOwner, args.worktreeId, immediateHostTabId)
+        clearWebSessionCloseIntent(intentOwner, args.worktreeId, hostTabId)
+        const { acceptReplayedWebSessionTabsSnapshot } = await import('./web-session-tabs-sync')
+        acceptReplayedWebSessionTabsSnapshot(environmentId, args.worktreeId)
+      }
+      await refreshWebRuntimeSessionTabsSnapshot(environmentId, args.worktreeId, {
+        expectedEnvironmentPairingRevision: intentOwner.pairingRevision
+      })
+    }
+    return 'applied'
+  } catch (error) {
+    if (activationHostTabId) {
+      clearWebSessionFocusIntentIfMatches(intentOwner, args.worktreeId, activationHostTabId)
+    }
+    for (const hostTabId of closeIntentTabIds) {
+      clearWebSessionCloseIntent(intentOwner, args.worktreeId, hostTabId)
+    }
+    if (isLifecycleClose) {
+      const { acceptReplayedWebSessionTabsSnapshot } = await import('./web-session-tabs-sync')
+      acceptReplayedWebSessionTabsSnapshot(environmentId, args.worktreeId)
+      await refreshWebRuntimeSessionTabsSnapshot(environmentId, args.worktreeId, {
+        expectedEnvironmentPairingRevision: intentOwner.pairingRevision
+      })
+    }
+    console.warn(
+      `[web-runtime-session] failed to ${isClose ? 'close' : 'activate'} tab:`,
+      error instanceof Error ? error.message : String(error)
+    )
+    return hasRuntimeRpcErrorCode(error, 'tab_not_found') ? 'unknown-tab' : 'failed'
+  }
+}
diff --git a/src/renderer/src/runtime/web-runtime-session-tab-move.ts b/src/renderer/src/runtime/web-runtime-session-tab-move.ts
new file mode 100644
index 00000000000..d928873ce03
--- /dev/null
+++ b/src/renderer/src/runtime/web-runtime-session-tab-move.ts
@@ -0,0 +1,125 @@
+import type { RuntimeRpcResponse } from '../../../shared/runtime-rpc-envelope'
+import type {
+  RuntimeMobileSessionTabMove,
+  RuntimeMobileSessionTabMoveResult
+} from '../../../shared/runtime-types'
+import { useAppStore } from '../store'
+import { unwrapRuntimeRpcResult } from './runtime-rpc-client'
+import { toRuntimeWorktreeSelector } from './runtime-worktree-selector'
+import {
+  clearWebSessionReorderIntent,
+  recordWebSessionReorderIntent
+} from './web-session-reorder-intent'
+import { isWebTerminalSurfaceTabId, toHostSessionTabId } from './web-terminal-surface-id'
+import {
+  captureRuntimeEnvironmentCall,
+  captureWebSessionIntentOwner,
+  isWebRuntimeSessionActive
+} from './web-runtime-session-environment'
+
+export async function moveWebRuntimeSessionTab(
+  args: RuntimeMobileSessionTabMove & {
+    worktreeId: string
+    environmentId?: string | null
+  }
+): Promise<boolean> {
+  const environmentId =
+    args.environmentId?.trim() ??
+    useAppStore.getState().settings?.activeRuntimeEnvironmentId?.trim() ??
+    null
+  if (!environmentId || !isWebRuntimeSessionActive(environmentId)) {
+    return false
+  }
+  const intentOwner = captureWebSessionIntentOwner(environmentId)
+  const callEnvironment = captureRuntimeEnvironmentCall(environmentId, intentOwner.pairingRevision)
+
+  if (args.kind === 'reorder') {
+    // Why: record local order synchronously before async host resolution, so a pre-move snapshot can't snap the tab back.
+    recordWebSessionReorderIntent(
+      intentOwner,
+      args.worktreeId,
+      args.targetGroupId,
+      args.tabOrder,
+      Date.now()
+    )
+  }
+
+  try {
+    const { resolveHostSessionTabIdForWebSessionTab } = await import('./web-session-tabs-sync')
+    const state = useAppStore.getState()
+    const resolveHostBackedTabId = (tabId: string): string | null =>
+      resolveHostSessionTabIdForWebSessionTab(state, {
+        environmentId,
+        worktreeId: args.worktreeId,
+        tabId
+      }) ?? (isWebTerminalSurfaceTabId(tabId) ? toHostSessionTabId(tabId) : null)
+    const toHostTabId = (tabId: string): string => resolveHostBackedTabId(tabId) ?? tabId
+    const movedHostTabId =
+      args.kind === 'reorder' ? resolveHostBackedTabId(args.tabId) : toHostTabId(args.tabId)
+    if (!movedHostTabId) {
+      clearWebSessionReorderIntent(intentOwner, args.worktreeId, args.targetGroupId)
+      return false
+    }
+    const reorderedHostTabOrder =
+      args.kind === 'reorder'
+        ? args.tabOrder
+            .map(resolveHostBackedTabId)
+            .filter((tabId): tabId is string => Boolean(tabId))
+        : null
+    if (reorderedHostTabOrder && !reorderedHostTabOrder.includes(movedHostTabId)) {
+      clearWebSessionReorderIntent(intentOwner, args.worktreeId, args.targetGroupId)
+      return false
+    }
+    const targetHostIndex =
+      args.kind === 'move-to-group' && typeof args.index === 'number'
+        ? (state.groupsByWorktree?.[args.worktreeId]
+            ?.find((group) => group.id === args.targetGroupId)
+            ?.tabOrder.slice(0, args.index)
+            .map(resolveHostBackedTabId)
+            .filter((tabId): tabId is string => Boolean(tabId)).length ?? args.index)
+        : args.kind === 'move-to-group'
+          ? args.index
+          : undefined
+    const base = {
+      worktree: toRuntimeWorktreeSelector(args.worktreeId),
+      tabId: movedHostTabId,
+      targetGroupId: args.targetGroupId
+    }
+    const move =
+      args.kind === 'reorder'
+        ? {
+            ...base,
+            kind: 'reorder' as const,
+            // Why: the host reorder API only accepts host tab ids, so local-only tabs must be omitted from the mirrored order.
+            tabOrder: reorderedHostTabOrder
+          }
+        : args.kind === 'split'
+          ? {
+              ...base,
+              kind: 'split' as const,
+              splitDirection: args.splitDirection
+            }
+          : {
+              ...base,
+              kind: 'move-to-group' as const,
+              // Why: web groups can contain local-only tabs, so host insertion indexes count only the filtered host-backed order.
+              index: targetHostIndex
+            }
+    const response = await callEnvironment({
+      method: 'session.tabs.move',
+      params: move,
+      timeoutMs: 15_000
+    })
+    unwrapRuntimeRpcResult(response as RuntimeRpcResponse<RuntimeMobileSessionTabMoveResult>)
+    return true
+  } catch (error) {
+    if (args.kind === 'reorder') {
+      clearWebSessionReorderIntent(intentOwner, args.worktreeId, args.targetGroupId)
+    }
+    console.warn(
+      '[web-runtime-session] failed to move tab:',
+      error instanceof Error ? error.message : String(error)
+    )
+    return false
+  }
+}
diff --git a/src/renderer/src/runtime/web-runtime-session-types.ts b/src/renderer/src/runtime/web-runtime-session-types.ts
new file mode 100644
index 00000000000..289562674cb
--- /dev/null
+++ b/src/renderer/src/runtime/web-runtime-session-types.ts
@@ -0,0 +1,50 @@
+import type {
+  AgentProviderSessionMetadata,
+  SleepingAgentLaunchConfig
+} from '../../../shared/agent-session-resume'
+import type {
+  AgentLaunchPreferences,
+  AgentPromptDelivery
+} from '../../../shared/agent-session-host-authority'
+import type { StartupCommandDelivery } from '../../../shared/codex-startup-delivery'
+import type { RuntimeTerminalCreate } from '../../../shared/runtime-types'
+import type { TuiAgent } from '../../../shared/tui-agent'
+
+export type WebRuntimeTerminalCreateOutcome =
+  | { status: 'created' }
+  | { status: 'failed'; message: string }
+
+export type CreateWebRuntimeSessionTerminalArgs = {
+  worktreeId: string
+  environmentId?: string | null
+  afterTabId?: string
+  targetGroupId?: string
+  command?: string
+  cwd?: string
+  env?: Record<string, string>
+  envToDelete?: string[]
+  startupCommandDelivery?: StartupCommandDelivery
+  launchConfig?: SleepingAgentLaunchConfig
+  launchToken?: string
+  agent?: TuiAgent
+  launchAgent?: TuiAgent
+  agentSessionKind?: 'fresh' | 'resume'
+  prompt?: string
+  promptDelivery?: AgentPromptDelivery
+  /** Explicit CLI override; omission leaves the remote host's defaults authoritative. */
+  agentArgs?: string | null
+  launchPreferences?: AgentLaunchPreferences
+  providerSession?: AgentProviderSessionMetadata
+  viewMode?: 'terminal' | 'chat'
+  activate?: boolean
+  selectWorktree?: boolean
+}
+
+export type CreatedWebRuntimeSessionTerminal = {
+  outcome: WebRuntimeTerminalCreateOutcome
+  hostTabId?: string
+}
+
+export type CreatedAgentTerminalIdentity = Pick<RuntimeTerminalCreate, 'tabId' | 'paneKey'> & {
+  leafId?: string
+}
diff --git a/src/renderer/src/runtime/web-runtime-session-workspace-selection.ts b/src/renderer/src/runtime/web-runtime-session-workspace-selection.ts
new file mode 100644
index 00000000000..0b2151e7e80
--- /dev/null
+++ b/src/renderer/src/runtime/web-runtime-session-workspace-selection.ts
@@ -0,0 +1,52 @@
+import { toRuntimeExecutionHostId } from '../../../shared/execution-host'
+import { useAppStore } from '../store'
+import {
+  shouldRestoreWebRuntimeSessionWorkspaceSelection,
+  type WebRuntimeSessionWorkspaceSelection
+} from './web-runtime-session-workspace-routing'
+
+export function selectWebRuntimeSessionWorktree(worktreeId: string, environmentId: string): void {
+  useAppStore.getState().setActiveWorktree(worktreeId, toRuntimeExecutionHostId(environmentId))
+}
+
+export type WebRuntimeSessionWorkspaceSelectionRollback = {
+  previous: WebRuntimeSessionWorkspaceSelection
+  applied: WebRuntimeSessionWorkspaceSelection
+}
+
+export function readActiveWorkspaceSelection(): WebRuntimeSessionWorkspaceSelection {
+  const state = useAppStore.getState()
+  return {
+    worktreeId: state.activeWorktreeId ?? null,
+    executionHostId: state.activeWorkspaceExecutionHostId ?? null
+  }
+}
+
+export function restoreActiveWorkspaceSelection(
+  rollback: WebRuntimeSessionWorkspaceSelectionRollback
+): void {
+  if (
+    !shouldRestoreWebRuntimeSessionWorkspaceSelection({
+      ...rollback,
+      current: readActiveWorkspaceSelection()
+    })
+  ) {
+    return
+  }
+  useAppStore
+    .getState()
+    .setActiveWorktree(rollback.previous.worktreeId, rollback.previous.executionHostId ?? undefined)
+}
+
+export function selectWebRuntimeSessionBrowserWorktree(
+  worktreeId: string,
+  environmentId: string
+): void {
+  const state = useAppStore.getState()
+  if (
+    state.activeWorktreeId !== worktreeId ||
+    state.activeWorkspaceExecutionHostId !== toRuntimeExecutionHostId(environmentId)
+  ) {
+    state.setActiveWorktree(worktreeId, toRuntimeExecutionHostId(environmentId))
+  }
+}
diff --git a/src/renderer/src/runtime/web-runtime-session.ts b/src/renderer/src/runtime/web-runtime-session.ts
index c9313bbca7d..12de456a537 100644
--- a/src/renderer/src/runtime/web-runtime-session.ts
+++ b/src/renderer/src/runtime/web-runtime-session.ts
@@ -1,118 +1,3 @@
-/* eslint-disable max-lines */
-import { toast } from 'sonner'
-import type { RuntimeRpcResponse } from '../../../shared/runtime-rpc-envelope'
-import type {
-  BrowserTabCreateResult,
-  RuntimeMobileSessionCreateTerminalResult,
-  RuntimeMobileSessionTabCloseResult,
-  RuntimeMobileSessionTabMove,
-  RuntimeMobileSessionTabMoveResult,
-  RuntimeMobileSessionTabsResult,
-  RuntimeSessionTabCloseReason,
-  RuntimeTerminalCreate,
-  RuntimeTerminalClose,
-  RuntimeTerminalSplit
-} from '../../../shared/runtime-types'
-import type { TerminalPaneSplitSource } from '../../../shared/feature-education-telemetry'
-import type { StartupCommandDelivery } from '../../../shared/codex-startup-delivery'
-import type {
-  SleepingAgentLaunchConfig,
-  AgentProviderSessionMetadata
-} from '../../../shared/agent-session-resume'
-import { BROWSER_TAB_CREATE_KNOWN_ID_RUNTIME_CAPABILITY } from '../../../shared/protocol-version'
-import { agentResumeHostAuthorityCapability } from './agent-resume-host-authority-capability'
-import { expectsBrowserClientHosting } from '../../../shared/browser-client-hosting-eligibility'
-import type {
-  BrowserClientHostPlacementPreference,
-  BrowserPageCreationPlacement
-} from '../../../shared/browser-client-host-placement'
-import type {
-  AgentLaunchPreferences,
-  AgentPromptDelivery,
-  RuntimeCreateAgentSessionResult,
-  RuntimeEnsureAgentSessionResult
-} from '../../../shared/agent-session-host-authority'
-import type { TerminalPaneLayoutNode } from '../../../shared/terminal-tab-types'
-import type { TuiAgent } from '../../../shared/tui-agent'
-import { createBrowserUuid } from '../lib/browser-uuid'
-import { getRuntimeEnvironmentIdForWorktree } from '../lib/worktree-runtime-owner'
-import { useAppStore } from '../store'
-import { hasRuntimeRpcErrorCode, unwrapRuntimeRpcResult } from './runtime-rpc-client'
-import {
-  createAgentSessionCreateOperation,
-  withAgentSessionCreateOperationId
-} from './agent-session-create-operation'
-import { parseRemoteRuntimePtyId } from './runtime-terminal-stream'
-import { toRuntimeWorktreeSelector } from './runtime-worktree-selector'
-import {
-  clearWebSessionFocusIntentIfMatches,
-  peekWebSessionFocusIntent,
-  recordWebSessionFocusIntent,
-  resolveWebSessionVisibleTabId
-} from './web-session-focus-intent'
-import { clearWebSessionCloseIntent, recordWebSessionCloseIntent } from './web-session-close-intent'
-import {
-  clearWebSessionReorderIntent,
-  recordWebSessionReorderIntent
-} from './web-session-reorder-intent'
-import type { WebSessionIntentOwner } from './web-session-intent-owner'
-import {
-  isWebTerminalSurfaceTabId,
-  toHostSessionTabId,
-  toWebTerminalSurfaceTabId
-} from './web-terminal-surface-id'
-import {
-  deliverLaunchPromptToAgentTab,
-  seedNativeChatLaunchDraftForAgentTab
-} from '../lib/agent-launch-prompt-delivery'
-import {
-  listRemoteRuntimeSessionTabsAfterCurrentInFlight,
-  listRemoteRuntimeSessionTabsDeduped
-} from './remote-runtime-session-tabs-inflight'
-import { runRemoteAgentSessionLaunch } from './remote-agent-session-launch'
-import { translate } from '../i18n/i18n'
-import { getRuntimeEnvironmentRevision } from './runtime-environment-revision'
-import { getRuntimeEnvironmentConnectionGeneration } from '@/store/slices/runtime-status'
-import { parsePaneKey } from '../../../shared/stable-pane-id'
-import { toRuntimeExecutionHostId } from '../../../shared/execution-host'
-import {
-  resolveWebRuntimeSessionEnvironmentId,
-  shouldRestoreWebRuntimeSessionWorkspaceSelection,
-  type WebRuntimeSessionWorkspaceSelection
-} from './web-runtime-session-workspace-routing'
-import {
-  forgetWebSessionTerminalPlacement,
-  recordWebSessionTerminalPlacement,
-  webTerminalPlacementParentTabId
-} from './web-session-terminal-placement'
-import {
-  claimWebSessionBrowserPlacementGroupCleanup,
-  forgetWebSessionBrowserPlacement,
-  markWebSessionBrowserPlacementGroupMaterialized,
-  moveWebSessionBrowserPlacement,
-  recordWebSessionBrowserPlacement,
-  releaseWebSessionBrowserPlacementGroup
-} from './web-session-browser-placement'
-import { assertRuntimeManagedBrowserCreationAvailable } from '../lib/client-creation-action-policy'
-import { hasMaterializedWebRuntimeBrowserPage } from './web-runtime-browser-materialization'
-import { waitForWebRuntimeBrowserPageMaterialization } from './web-runtime-browser-materialization-wait'
-import {
-  discardStagedWebRuntimeBrowserTab,
-  isStagedWebRuntimeBrowserTabLive,
-  rehomeStagedWebRuntimeBrowserTab,
-  resolveStagedWebRuntimeBrowserTabGroupId,
-  restageWebRuntimeBrowserTabHostingIntent,
-  stageWebRuntimeBrowserTab,
-  StagedWebRuntimeBrowserTabCancelledError,
-  type StagedWebRuntimeBrowserTab
-} from './web-runtime-browser-tab-staging'
-import {
-  pauseAfterE2eWebRuntimeBrowserCreate,
-  pauseDuringE2eWebRuntimeBrowserClientHostPreparation,
-  throwIfE2eWebRuntimeBrowserCapabilityUnavailable,
-  throwIfE2eWebRuntimeBrowserReconciliationFails
-} from './web-runtime-browser-creation-e2e-fault'
-
 export {
   HOST_TERMINAL_SURFACE_SEPARATOR,
   isWebTerminalSurfaceTabId,
@@ -121,1673 +6,25 @@ export {
   WEB_TERMINAL_SURFACE_TAB_PREFIX
 } from './web-terminal-surface-id'
 
-export function isWebRuntimeSessionActive(
-  activeRuntimeEnvironmentId: string | null | undefined
-): boolean {
-  // Why: headless serve sessions are owned by the remote runtime, whether the client is web or desktop Electron.
-  return Boolean(activeRuntimeEnvironmentId?.trim())
-}
-
-export type WebRuntimeTerminalCreateOutcome =
-  | { status: 'created' }
-  | { status: 'failed'; message: string }
-
-const DEFINITIVE_BROWSER_CREATE_FAILURE_CODES = [
-  'browser_error',
-  'capability_unsupported',
-  'invalid_argument',
-  'invalid_params',
-  'method_not_found',
-  'runtime_rpc_queue_overloaded',
-  'selector_ambiguous',
-  'selector_not_found',
-  'unauthorized'
-] as const
-
-function isDefinitiveBrowserCreateFailure(error: unknown): boolean {
-  return DEFINITIVE_BROWSER_CREATE_FAILURE_CODES.some((code) => hasRuntimeRpcErrorCode(error, code))
-}
-
-const pendingWebRuntimeSplitMirrorTelemetry = new Map<string, Set<string>>()
-const WEB_RUNTIME_SPLIT_MIRROR_SUPPRESSION_TTL_MS = 30_000
-let pendingWebRuntimeSplitMirrorTelemetryId = 0
-const pendingRuntimeWorktreeRecoveryRefreshes = new Map<string, symbol>()
-const RUNTIME_WORKTREE_RECOVERY_REFRESH_DELAYS_MS = [250, 500, 1_000, 2_000, 4_000] as const
-
-function captureRuntimeEnvironmentCall(
-  environmentId: string,
-  expectedEnvironmentPairingRevision = getRuntimeEnvironmentRevision(environmentId)
-): (args: {
-  method: string
-  params?: unknown
-  timeoutMs?: number
-}) => Promise<RuntimeRpcResponse<unknown>> {
-  return (args) =>
-    window.api.runtimeEnvironments.call({
-      selector: environmentId,
-      ...args,
-      expectedEnvironmentPairingRevision
-    })
-}
-
-function captureWebSessionIntentOwner(environmentId: string): WebSessionIntentOwner {
-  return {
-    environmentId,
-    pairingRevision: getRuntimeEnvironmentRevision(environmentId)
-  }
-}
-
-function matchesWebSessionIntentOwner(owner: WebSessionIntentOwner): boolean {
-  return getRuntimeEnvironmentRevision(owner.environmentId) === owner.pairingRevision
-}
-
-type CreateWebRuntimeSessionTerminalArgs = {
-  worktreeId: string
-  environmentId?: string | null
-  afterTabId?: string
-  targetGroupId?: string
-  command?: string
-  cwd?: string
-  env?: Record<string, string>
-  envToDelete?: string[]
-  startupCommandDelivery?: StartupCommandDelivery
-  launchConfig?: SleepingAgentLaunchConfig
-  launchToken?: string
-  agent?: TuiAgent
-  launchAgent?: TuiAgent
-  agentSessionKind?: 'fresh' | 'resume'
-  prompt?: string
-  promptDelivery?: AgentPromptDelivery
-  /** Explicit CLI override; omission leaves the remote host's defaults authoritative. */
-  agentArgs?: string | null
-  launchPreferences?: AgentLaunchPreferences
-  providerSession?: AgentProviderSessionMetadata
-  viewMode?: 'terminal' | 'chat'
-  activate?: boolean
-  selectWorktree?: boolean
-}
-
-type CreatedWebRuntimeSessionTerminal = {
-  outcome: WebRuntimeTerminalCreateOutcome
-  hostTabId?: string
-}
-
-type CreatedAgentTerminalIdentity = Pick<RuntimeTerminalCreate, 'tabId' | 'paneKey'> & {
-  leafId?: string
-}
-
-function createdTerminalLeafId(terminal: CreatedAgentTerminalIdentity): string | undefined {
-  const pane = parsePaneKey(terminal.paneKey ?? '')
-  return pane && pane.tabId === terminal.tabId ? pane.leafId : undefined
-}
-
-export async function createWebRuntimeSessionTerminal(
-  args: CreateWebRuntimeSessionTerminalArgs
-): Promise<WebRuntimeTerminalCreateOutcome> {
-  return (await createWebRuntimeSessionTerminalResult(args)).outcome
-}
-
-export async function createWebRuntimeAgentSessionTerminal(
-  args: CreateWebRuntimeSessionTerminalArgs & {
-    agent: TuiAgent
-    promptAfterReady: string
-    submitPrompt: boolean
-    forcePromptPaste: boolean
-  }
-): Promise<{
-  outcome: WebRuntimeTerminalCreateOutcome
-  promptDelivered: boolean
-}> {
-  const created = await createWebRuntimeSessionTerminalResult(args)
-  if (created.outcome.status === 'failed' || !created.hostTabId) {
-    return { outcome: created.outcome, promptDelivered: false }
-  }
-
-  const promptDelivered = await deliverLaunchPromptToAgentTab({
-    tabId: toWebTerminalSurfaceTabId(created.hostTabId),
-    content: args.promptAfterReady,
-    agent: args.agent,
-    submit: args.submitPrompt,
-    forcePaste: args.forcePromptPaste
-  })
-  return { outcome: created.outcome, promptDelivered }
-}
-
-/**
- * Launch a web-host agent terminal whose draft already rode in on the launch
- * command (argv prefill). No post-ready paste runs for that delivery, so seed
- * the chat-composer copy here once the mirrored host tab id is known.
- */
-export async function createWebRuntimeAgentSessionTerminalWithLaunchDraft(
-  args: CreateWebRuntimeSessionTerminalArgs & {
-    agent: TuiAgent
-    launchDraft: string
-  }
-): Promise<WebRuntimeTerminalCreateOutcome> {
-  const created = await createWebRuntimeSessionTerminalResult(args)
-  if (created.outcome.status !== 'failed' && created.hostTabId) {
-    seedNativeChatLaunchDraftForAgentTab({
-      tabId: toWebTerminalSurfaceTabId(created.hostTabId),
-      agent: args.agent,
-      text: args.launchDraft
-    })
-  }
-  return created.outcome
-}
-
-async function createWebRuntimeSessionTerminalResult(
-  args: CreateWebRuntimeSessionTerminalArgs
-): Promise<CreatedWebRuntimeSessionTerminal> {
-  const environmentId = resolveWebRuntimeSessionEnvironmentId(
-    args.environmentId,
-    useAppStore.getState().settings?.activeRuntimeEnvironmentId
-  )
-  if (!environmentId || !isWebRuntimeSessionActive(environmentId)) {
-    return {
-      outcome: {
-        status: 'failed',
-        message: translate(
-          'auto.runtime.webRuntimeSession.remoteHostDisconnected',
-          'The workspace is not connected to a remote Orca host.'
-        )
-      }
-    }
-  }
-  const intentOwner = captureWebSessionIntentOwner(environmentId)
-  const callEnvironment = captureRuntimeEnvironmentCall(environmentId, intentOwner.pairingRevision)
-
-  let workspaceSelectionRollback: WebRuntimeSessionWorkspaceSelectionRollback | null = null
-  if (args.selectWorktree !== false) {
-    const previous = readActiveWorkspaceSelection()
-    selectWebRuntimeSessionWorktree(args.worktreeId, environmentId)
-    workspaceSelectionRollback = {
-      previous,
-      applied: {
-        worktreeId: args.worktreeId,
-        executionHostId: toRuntimeExecutionHostId(environmentId)
-      }
-    }
-  }
-  let hostCreated = false
-  let createdTabId: string | undefined
-  let createdLeafId: string | undefined
-  try {
-    const agent = args.launchAgent ?? args.agent
-    const agentArgsOverride =
-      args.agentArgs !== undefined ? args.agentArgs : args.launchConfig?.agentArgs
-    if (agent) {
-      let legacyAlreadyPlacedInGroup = false
-      // Why: structured creation cannot yet express afterTabId; keep the exact legacy placement contract until it can.
-      // Why: focus belongs to the paired client; a headless execution host has no renderer to focus.
-      const hostAuthority = args.afterTabId
-        ? undefined
-        : args.agentSessionKind === 'resume'
-          ? args.providerSession
-            ? async () =>
-                unwrapRuntimeRpcResult(
-                  (await callEnvironment({
-                    method: 'terminal.ensureAgentSession',
-                    params: {
-                      kind: 'explicit',
-                      worktree: toRuntimeWorktreeSelector(args.worktreeId),
-                      agent,
-                      providerSession: args.providerSession!,
-                      ...(args.launchConfig?.ompResumeFilePath
-                        ? { ompResumeFilePath: args.launchConfig.ompResumeFilePath }
-                        : {}),
-                      ...(agentArgsOverride !== undefined ? { agentArgs: agentArgsOverride } : {}),
-                      ...(args.launchPreferences
-                        ? { launchPreferences: args.launchPreferences }
-                        : {}),
-                      presentation: 'background'
-                    },
-                    timeoutMs: 15_000
-                  })) as RuntimeRpcResponse<RuntimeEnsureAgentSessionResult>
-                )
-            : undefined
-          : async () =>
-              await createAgentSessionCreateOperation().run(async (clientOperationId) =>
-                unwrapRuntimeRpcResult(
-                  (await callEnvironment({
-                    method: 'terminal.createAgentSession',
-                    params: withAgentSessionCreateOperationId(
-                      {
-                        worktree: toRuntimeWorktreeSelector(args.worktreeId),
-                        agent,
-                        ...(args.prompt ? { prompt: args.prompt } : {}),
-                        ...(args.promptDelivery ? { promptDelivery: args.promptDelivery } : {}),
-                        ...(agentArgsOverride !== undefined
-                          ? { agentArgs: agentArgsOverride }
-                          : {}),
-                        ...(args.launchPreferences
-                          ? { launchPreferences: args.launchPreferences }
-                          : {}),
-                        ...(args.cwd ? { startupCwd: args.cwd } : {}),
-                        ...(args.viewMode ? { viewMode: args.viewMode } : {}),
-                        presentation: 'background'
-                      },
-                      clientOperationId
-                    ),
-                    timeoutMs: 15_000
-                  })) as RuntimeRpcResponse<RuntimeCreateAgentSessionResult>
-                )
-              )
-      const resumeHostAuthorityCapability =
-        args.agentSessionKind === 'resume' ? agentResumeHostAuthorityCapability(agent) : undefined
-      const created = await runRemoteAgentSessionLaunch<{
-        terminal: CreatedAgentTerminalIdentity
-      }>({
-        environmentId,
-        ...(hostAuthority ? { hostAuthority } : {}),
-        ...(resumeHostAuthorityCapability
-          ? { hostAuthorityCapability: resumeHostAuthorityCapability }
-          : {}),
-        legacy: async () => {
-          const response = await callEnvironment({
-            method: 'session.tabs.createTerminal',
-            params: {
-              worktree: toRuntimeWorktreeSelector(args.worktreeId),
-              afterTabId: args.afterTabId ? toHostSessionTabId(args.afterTabId) : undefined,
-              targetGroupId: args.targetGroupId,
-              command: args.command,
-              cwd: args.cwd,
-              ...(args.env ? { env: args.env } : {}),
-              ...(args.envToDelete ? { envToDelete: args.envToDelete } : {}),
-              startupCommandDelivery: args.startupCommandDelivery,
-              ...(args.launchConfig ? { launchConfig: args.launchConfig } : {}),
-              ...(args.launchToken ? { launchToken: args.launchToken } : {}),
-              ...(args.agent ? { agent: args.agent } : {}),
-              ...(args.launchAgent ? { launchAgent: args.launchAgent } : {}),
-              ...(args.viewMode ? { viewMode: args.viewMode } : {}),
-              // Why: old hosts understand activate:false; new hosts use select/navigation for caller-local focus.
-              activate: false,
-              select: args.activate !== false,
-              navigation: 'caller'
-            },
-            timeoutMs: 15_000
-          })
-          const legacyCreated = unwrapRuntimeRpcResult(
-            response as RuntimeRpcResponse<RuntimeMobileSessionCreateTerminalResult>
-          )
-          legacyAlreadyPlacedInGroup = true
-          return {
-            terminal: {
-              tabId: legacyCreated.tab.id,
-              leafId: legacyCreated.tab.leafId
-            }
-          }
-        }
-      })
-      hostCreated = true
-      createdTabId = created.terminal.tabId
-      createdLeafId = legacyAlreadyPlacedInGroup
-        ? created.terminal.leafId
-        : createdTerminalLeafId(created.terminal)
-      if (args.targetGroupId && createdTabId && !legacyAlreadyPlacedInGroup) {
-        await callEnvironment({
-          method: 'session.tabs.move',
-          params: {
-            worktree: toRuntimeWorktreeSelector(args.worktreeId),
-            tabId: createdTabId,
-            targetGroupId: args.targetGroupId,
-            kind: 'move-to-group'
-          },
-          timeoutMs: 15_000
-        })
-      }
-    } else {
-      const response = await callEnvironment({
-        method: 'session.tabs.createTerminal',
-        params: {
-          worktree: toRuntimeWorktreeSelector(args.worktreeId),
-          afterTabId: args.afterTabId ? toHostSessionTabId(args.afterTabId) : undefined,
-          targetGroupId: args.targetGroupId,
-          command: args.command,
-          cwd: args.cwd,
-          ...(args.env ? { env: args.env } : {}),
-          ...(args.envToDelete ? { envToDelete: args.envToDelete } : {}),
-          startupCommandDelivery: args.startupCommandDelivery,
-          ...(args.launchConfig ? { launchConfig: args.launchConfig } : {}),
-          ...(args.launchToken ? { launchToken: args.launchToken } : {}),
-          ...(args.viewMode ? { viewMode: args.viewMode } : {}),
-          // Why: old hosts understand activate:false; new hosts use select/navigation for caller-local focus.
-          activate: false,
-          select: args.activate !== false,
-          navigation: 'caller'
-        },
-        timeoutMs: 15_000
-      })
-      const created = unwrapRuntimeRpcResult(
-        response as RuntimeRpcResponse<RuntimeMobileSessionCreateTerminalResult>
-      )
-      hostCreated = true
-      createdTabId = created.tab.id
-      createdLeafId = created.tab.leafId
-    }
-    if (args.targetGroupId && createdTabId) {
-      // Why: the host drops client-minted group ids, so this client's own record is what
-      // lands the mirrored tab in the requested pane under client-owned placement.
-      recordWebSessionTerminalPlacement({
-        environmentId,
-        worktreeId: args.worktreeId,
-        hostTabId: webTerminalPlacementParentTabId(createdTabId),
-        groupId: args.targetGroupId
-      })
-    }
-    if (args.activate !== false && createdTabId && matchesWebSessionIntentOwner(intentOwner)) {
-      // Why: record focus intent so the reconcile follows the snapshot's active
-      // tab to THIS new terminal, instead of sticky-keeping the prior tab.
-      recordWebSessionFocusIntent(intentOwner, args.worktreeId, createdTabId, createdLeafId)
-    }
-    await refreshWebRuntimeSessionTabsSnapshot(environmentId, args.worktreeId, {
-      expectedEnvironmentPairingRevision: intentOwner.pairingRevision,
-      // Why: the publication can beat the RPC response; replay it once after caller intent exists.
-      acceptCurrentSnapshot:
-        Boolean(createdTabId) && (args.activate !== false || Boolean(args.targetGroupId)),
-      // Why: a placement record needs a post-create list; a deduped in-flight one can predate it.
-      ...(args.targetGroupId && createdTabId ? { afterCurrentInFlight: true } : {})
-    })
-    if (args.targetGroupId && createdTabId) {
-      await settleWebRuntimeTerminalPlacement(
-        environmentId,
-        args.worktreeId,
-        webTerminalPlacementParentTabId(createdTabId),
-        { groupId: args.targetGroupId, activate: args.activate !== false }
-      )
-    }
-    return {
-      outcome: { status: 'created' },
-      ...(createdTabId ? { hostTabId: createdTabId } : {})
-    }
-  } catch (error) {
-    const message = error instanceof Error ? error.message : String(error)
-    console.warn(
-      hostCreated
-        ? '[web-runtime-session] terminal created but reconciliation failed:'
-        : '[web-runtime-session] failed to create terminal:',
-      message
-    )
-    if (createdTabId) {
-      // Why: a record that outlives the create flow could yank a user-dragged tab back later.
-      forgetWebSessionTerminalPlacement({
-        environmentId,
-        worktreeId: args.worktreeId,
-        hostTabId: webTerminalPlacementParentTabId(createdTabId)
-      })
-    }
-    if (!hostCreated && workspaceSelectionRollback) {
-      restoreActiveWorkspaceSelection(workspaceSelectionRollback)
-    }
-    // Why: once the host accepted creation, reporting failure invites the user
-    // to retry with a new operation ID and can duplicate a fresh agent.
-    return {
-      outcome: hostCreated ? { status: 'created' } : { status: 'failed', message },
-      ...(createdTabId ? { hostTabId: createdTabId } : {})
-    }
-  }
-}
-
-/** Settle the placement once the mirrored tab exists (bounded poll), then consume the record. */
-async function settleWebRuntimeTerminalPlacement(
-  environmentId: string,
-  worktreeId: string,
-  hostTabId: string,
-  placement: { groupId: string; activate: boolean }
-): Promise<void> {
-  const unifiedTabId = toWebTerminalSurfaceTabId(hostTabId)
-  const findTab = () =>
-    (useAppStore.getState().unifiedTabsByWorktree[worktreeId] ?? []).find(
-      (tab) => tab.id === unifiedTabId
-    )
-  try {
-    const deadline = Date.now() + 10_000
-    while (!findTab() && Date.now() < deadline) {
-      await new Promise((resolve) => setTimeout(resolve, 250))
-    }
-    const tab = findTab()
-    const state = useAppStore.getState()
-    const targetGroupExists = (state.groupsByWorktree[worktreeId] ?? []).some(
-      (group) => group.id === placement.groupId
-    )
-    if (tab && targetGroupExists && tab.groupId !== placement.groupId) {
-      // Why: a snapshot can adopt the tab before the record exists (the publication races the
-      // RPC response); repair through the same client-owned move a user drag takes.
-      state.moveUnifiedTabToGroup(unifiedTabId, placement.groupId, {
-        activate: placement.activate,
-        recordInteraction: false
-      })
-    }
-  } finally {
-    forgetWebSessionTerminalPlacement({ environmentId, worktreeId, hostTabId })
-  }
-}
-
-export async function createWebRuntimeSessionBrowserTab(args: {
-  worktreeId: string
-  environmentId?: string | null
-  url?: string
-  profileId?: string | null
-  targetGroupId?: string
-  clientTargetGroupId?: string
-  clientTargetGroupCreated?: boolean
-  focusOnCreate?: boolean
-  /** Wait until a renderer-backed host can publish the new page in its session snapshot. */
-  waitForRegistration?: boolean
-  selectWorktree?: boolean
-  stagedTitle?: string
-  stagedFocusAddressBar?: boolean
-  failureLogMode?: 'details' | 'operation-only'
-  placementPreference?: BrowserClientHostPlacementPreference
-}): Promise<boolean> {
-  const environmentId =
-    args.environmentId?.trim() ??
-    useAppStore.getState().settings?.activeRuntimeEnvironmentId?.trim() ??
-    null
-  if (!environmentId || !isWebRuntimeSessionActive(environmentId)) {
-    return false
-  }
-  const intentOwner = captureWebSessionIntentOwner(environmentId)
-  const callEnvironment = captureRuntimeEnvironmentCall(environmentId, intentOwner.pairingRevision)
-  const shouldFocusOnCreate = args.focusOnCreate !== false
-  const shouldSelectWorktree = args.selectWorktree !== false
-  const provisionalPageId = createBrowserUuid()
-  const advertisedCapabilities =
-    useAppStore.getState().runtimeStatusByEnvironmentId?.get(environmentId)?.status?.capabilities ??
-    []
-  const hostSupportsKnownPageId = advertisedCapabilities.includes(
-    BROWSER_TAB_CREATE_KNOWN_ID_RUNTIME_CAPABILITY
-  )
-  // Why the same predicate the main process uses: this mounts the staged pane one round-trip
-  // before prepareBrowserClientHostPlacement answers, so the two have to reach the same verdict
-  // from the same inputs. A cached status disagreeing with the live one is corrected by
-  // restageWebRuntimeBrowserTabHostingIntent below; it never decides the placement itself.
-  const expectsClientHosting = expectsBrowserClientHosting({
-    enabled: useAppStore.getState().settings?.browserClientHostedRemoteEnabled !== false,
-    preference: args.placementPreference,
-    deviceScope: useAppStore.getState().runtimeStatusByEnvironmentId?.get(environmentId)?.status
-      ?.deviceScope,
-    capabilities: advertisedCapabilities
-  })
-  let unsubscribeFocusGuard = (): void => {}
-  let guardedPageId = provisionalPageId
-  let createdPageId: string | null = null
-  let createAttempted = false
-  let staged: StagedWebRuntimeBrowserTab | null = null
-  try {
-    throwIfE2eWebRuntimeBrowserCapabilityUnavailable()
-    assertRuntimeManagedBrowserCreationAvailable(useAppStore.getState(), environmentId)
-    if (args.clientTargetGroupId) {
-      recordWebSessionBrowserPlacement({
-        environmentId,
-        worktreeId: args.worktreeId,
-        remotePageId: provisionalPageId,
-        groupId: args.clientTargetGroupId,
-        callerCreatedGroup: args.clientTargetGroupCreated
-      })
-    }
-    if (shouldSelectWorktree) {
-      selectWebRuntimeSessionBrowserWorktree(args.worktreeId, environmentId)
-    }
-    // Why: everything below this point is a host round-trip; stage the tab first so the strip
-    // reacts to the click instead of to the runtime.
-    staged = stageWebRuntimeBrowserTab({
-      environmentId,
-      worktreeId: args.worktreeId,
-      remotePageId: provisionalPageId,
-      activate: shouldFocusOnCreate,
-      ...(args.url !== undefined ? { url: args.url } : {}),
-      ...(args.stagedTitle !== undefined ? { title: args.stagedTitle } : {}),
-      ...(args.profileId !== undefined ? { profileId: args.profileId } : {}),
-      ...((args.clientTargetGroupId ?? args.targetGroupId)
-        ? { targetGroupId: (args.clientTargetGroupId ?? args.targetGroupId) as string }
-        : {}),
-      ...(args.stagedFocusAddressBar !== undefined
-        ? { focusAddressBar: args.stagedFocusAddressBar }
-        : {}),
-      clientHosted: expectsClientHosting
-    })
-    // Why: sample the focus expectation and arm its guard against the state staging just wrote,
-    // before any await. Sampling after the client-host preparation round-trip baked a switch made
-    // during it into the baseline, so the guard read the user's new tab as "hasn't moved" and
-    // adoption stole focus back.
-    const initialFocusState = shouldFocusOnCreate ? useAppStore.getState() : null
-    const expectedActiveWorktreeId = initialFocusState?.activeWorktreeId
-    const expectedActiveWorkspaceExecutionHostId = initialFocusState?.activeWorkspaceExecutionHostId
-    const expectedCurrentLocalTabId = initialFocusState
-      ? resolveWebSessionVisibleTabId(initialFocusState, args.worktreeId)
-      : null
-    if (shouldFocusOnCreate && matchesWebSessionIntentOwner(intentOwner)) {
-      recordWebSessionFocusIntent(
-        intentOwner,
-        args.worktreeId,
-        provisionalPageId,
-        undefined,
-        expectedCurrentLocalTabId
-      )
-      unsubscribeFocusGuard = useAppStore.subscribe((state, previousState) => {
-        if (
-          state.activeBrowserTabIdByWorktree === previousState.activeBrowserTabIdByWorktree &&
-          state.activeFileIdByWorktree === previousState.activeFileIdByWorktree &&
-          // Why: resolveWebSessionVisibleTabId now reads group state, so a group-only focus move
-          // must re-evaluate it.
-          state.activeGroupIdByWorktree === previousState.activeGroupIdByWorktree &&
-          state.activeTabIdByWorktree === previousState.activeTabIdByWorktree &&
-          state.activeTabType === previousState.activeTabType &&
-          state.activeTabTypeByWorktree === previousState.activeTabTypeByWorktree &&
-          state.activeWorktreeId === previousState.activeWorktreeId &&
-          state.activeWorkspaceExecutionHostId === previousState.activeWorkspaceExecutionHostId &&
-          state.groupsByWorktree === previousState.groupsByWorktree &&
-          state.unifiedTabsByWorktree === previousState.unifiedTabsByWorktree
-        ) {
-          return
-        }
-        if (
-          state.activeWorktreeId === expectedActiveWorktreeId &&
-          state.activeWorkspaceExecutionHostId === expectedActiveWorkspaceExecutionHostId &&
-          resolveWebSessionVisibleTabId(state, args.worktreeId) === expectedCurrentLocalTabId
-        ) {
-          return
-        }
-        clearWebSessionFocusIntentIfMatches(intentOwner, args.worktreeId, guardedPageId)
-        unsubscribeFocusGuard()
-      })
-    }
-    const placementPreference = args.placementPreference ?? 'auto'
-    let placement: BrowserPageCreationPlacement = { kind: 'server' }
-    // Why no cached-capability gate here: the renderer's runtime status can hold a pre-upgrade
-    // "cannot client-host" verdict for a whole catalog TTL, and skipping the preparation on it
-    // pinned a capable pair to server placement for that long. The preparation reads live status
-    // and answers `server` for a runtime that truly cannot host, so staleness now costs a round
-    // trip against an incapable host instead of the wrong placement. An unreachable host pays for
-    // that on the failure path too: the probe's 15s ceiling, then the tabCreate behind it and the
-    // cleanup close its non-definitive failure needs, where before the create never started.
-    if (placementPreference !== 'server') {
-      try {
-        await pauseDuringE2eWebRuntimeBrowserClientHostPreparation()
-        placement = await window.api.runtimeEnvironments.prepareBrowserClientHostPlacement({
-          selector: environmentId,
-          expectedPairingRevision: intentOwner.pairingRevision,
-          preference: placementPreference
-        })
-      } catch (error) {
-        console.warn('[web-runtime-session] failed to prepare client browser host:', error)
-        throw new Error(
-          translate(
-            'browser.clientHosted.preparationFailed',
-            "Couldn't start the remote browser on this desktop. Check the paired connection and try again."
-          ),
-          { cause: error }
-        )
-      }
-    }
-    if (staged) {
-      staged = restageWebRuntimeBrowserTabHostingIntent(staged, {
-        environmentId,
-        remotePageId: provisionalPageId,
-        clientHosted: placement.kind === 'client'
-      })
-    }
-    createAttempted = true
-    const navigateAfterCreate =
-      args.waitForRegistration === true && args.url && args.url !== 'about:blank'
-    const created = unwrapRuntimeRpcResult(
-      (await callEnvironment({
-        method: 'browser.tabCreate',
-        params: {
-          worktree: toRuntimeWorktreeSelector(args.worktreeId),
-          url: navigateAfterCreate ? undefined : args.url,
-          ...(hostSupportsKnownPageId ? { page: provisionalPageId } : {}),
-          ...(placement.kind === 'client' ? { placement } : {}),
-          profileId: args.profileId ?? undefined,
-          activate: shouldFocusOnCreate,
-          // Why: `activate` alone made every paired device — the host desktop included — jump to a
-          // tab this client created. New hosts read `navigation`; old ones ignore it and keep
-          // today's behavior, which is also what keeps their targetGroupId placement working.
-          navigation: 'caller',
-          // Why: place the new browser in the clicked split group so the host snapshot is authoritative for it (no left-snap).
-          ...(args.targetGroupId ? { targetGroupId: args.targetGroupId } : {}),
-          // Why: web clients need the local tab now; waiting for host webview registration makes the workspace appear to close.
-          waitForRegistration: args.waitForRegistration ?? false
-        },
-        timeoutMs: 15_000
-      })) as RuntimeRpcResponse<BrowserTabCreateResult>
-    )
-    createdPageId = created.browserPageId
-    if (navigateAfterCreate) {
-      void callEnvironment({
-        method: 'browser.goto',
-        params: {
-          worktree: toRuntimeWorktreeSelector(args.worktreeId),
-          page: created.browserPageId,
-          url: args.url
-        },
-        timeoutMs: 15_000
-      })
-        .then((response) => unwrapRuntimeRpcResult(response))
-        .catch((error) => {
-          console.warn(
-            '[web-runtime-session] created browser tab navigation failed:',
-            error instanceof Error ? error.message : String(error)
-          )
-        })
-    }
-    await pauseAfterE2eWebRuntimeBrowserCreate(created.browserPageId)
-    // Why: the strip's X on a staged tab only unwinds this client's rows — it cannot close a host
-    // page whose id did not exist when the user clicked. Hand the cancel to the cleanup path in the
-    // catch below, which already owns retiring an unreconciled host page.
-    // Why (accepted bound): the host page has no name until the create answers, so a cancel during
-    // that round-trip leaves it alive for up to the RPC timeout. That is the same bound the
-    // unreconciled-cleanup path has always accepted, so no sweep is added for it.
-    if (staged && !isStagedWebRuntimeBrowserTabLive(staged, args.worktreeId)) {
-      throw new StagedWebRuntimeBrowserTabCancelledError()
-    }
-    if (created.browserPageId !== provisionalPageId) {
-      moveWebSessionBrowserPlacement({
-        environmentId,
-        worktreeId: args.worktreeId,
-        fromRemotePageId: provisionalPageId,
-        toRemotePageId: created.browserPageId
-      })
-      if (staged) {
-        staged = rehomeStagedWebRuntimeBrowserTab(staged, {
-          environmentId,
-          worktreeId: args.worktreeId,
-          remotePageId: created.browserPageId
-        })
-      }
-      const focusIntent = shouldFocusOnCreate
-        ? peekWebSessionFocusIntent(intentOwner, args.worktreeId)
-        : null
-      if (focusIntent?.hostTabId === provisionalPageId) {
-        recordWebSessionFocusIntent(
-          intentOwner,
-          args.worktreeId,
-          created.browserPageId,
-          undefined,
-          focusIntent.expectedCurrentLocalTabId
-        )
-      }
-      guardedPageId = created.browserPageId
-    }
-    try {
-      await refreshWebRuntimeSessionTabsSnapshot(environmentId, args.worktreeId, {
-        expectedEnvironmentPairingRevision: intentOwner.pairingRevision,
-        acceptCurrentSnapshot: true,
-        afterCurrentInFlight: true,
-        errorMode: 'throw'
-      })
-    } catch (error) {
-      if (
-        !hasMaterializedWebRuntimeBrowserPage(
-          useAppStore.getState(),
-          environmentId,
-          args.worktreeId,
-          created.browserPageId,
-          args.clientTargetGroupId ?? args.targetGroupId
-        )
-      ) {
-        throw error
-      }
-    }
-    const expectedGroupId =
-      (staged ? resolveStagedWebRuntimeBrowserTabGroupId(staged, args.worktreeId) : undefined) ??
-      args.clientTargetGroupId ??
-      args.targetGroupId
-    let materialized = hasMaterializedWebRuntimeBrowserPage(
-      useAppStore.getState(),
-      environmentId,
-      args.worktreeId,
-      created.browserPageId,
-      expectedGroupId
-    )
-    if (!materialized) {
-      materialized = await waitForWebRuntimeBrowserPageMaterialization({
-        environmentId,
-        worktreeId: args.worktreeId,
-        remotePageId: created.browserPageId,
-        ...(expectedGroupId ? { expectedGroupId } : {})
-      })
-    }
-    if (!materialized && expectedGroupId) {
-      // Why: an older runtime can honor creation but not group targeting; a live tab in
-      // the wrong split beats destroying what the user just made.
-      materialized = hasMaterializedWebRuntimeBrowserPage(
-        useAppStore.getState(),
-        environmentId,
-        args.worktreeId,
-        created.browserPageId
-      )
-      if (materialized) {
-        console.warn(
-          '[web-runtime-session] created browser tab landed outside the requested group:',
-          expectedGroupId
-        )
-      }
-    }
-    if (!materialized) {
-      throw new Error('The created browser tab did not materialize in the client.')
-    }
-    // Why: materialization only proves *some* workspace in this worktree carries the page — when the
-    // host mirrors it under its own id, the predicate goes true even though the staged row the user
-    // X-ed is gone. The whole materialization wait above is a live window for that X, so re-check the
-    // row here before the stage is surrendered, or the create reports success and never retires the
-    // host page.
-    if (staged && !isStagedWebRuntimeBrowserTabLive(staged, args.worktreeId)) {
-      throw new StagedWebRuntimeBrowserTabCancelledError()
-    }
-    // Why: materialization means the snapshot has taken ownership of these rows, so nothing
-    // downstream may still unwind them as an optimistic stage.
-    staged = null
-    const remainingFocusIntent = shouldFocusOnCreate
-      ? peekWebSessionFocusIntent(intentOwner, args.worktreeId)
-      : null
-    if (
-      remainingFocusIntent?.hostTabId === guardedPageId &&
-      remainingFocusIntent.expectedCurrentLocalTabId === expectedCurrentLocalTabId
-    ) {
-      clearWebSessionFocusIntentIfMatches(intentOwner, args.worktreeId, guardedPageId)
-    }
-    unsubscribeFocusGuard()
-    if (args.clientTargetGroupId) {
-      markWebSessionBrowserPlacementGroupMaterialized({
-        worktreeId: args.worktreeId,
-        groupId: args.clientTargetGroupId
-      })
-    }
-    forgetWebSessionBrowserPlacement({
-      environmentId,
-      worktreeId: args.worktreeId,
-      remotePageId: guardedPageId
-    })
-    return true
-  } catch (error) {
-    unsubscribeFocusGuard()
-    // Why: unwind the optimistic tab before the cleanup round-trips below, so a failed create
-    // does not leave a dead tab sitting in the strip for the length of browser.tabClose.
-    if (staged) {
-      discardStagedWebRuntimeBrowserTab(staged)
-    }
-    let recoveryError: unknown = null
-    const createFailureDefinitive = isDefinitiveBrowserCreateFailure(error)
-    const cleanupPageId =
-      createdPageId ??
-      (createAttempted && !createFailureDefinitive && hostSupportsKnownPageId
-        ? provisionalPageId
-        : null)
-    const createOutcomeUnknown = !cleanupPageId && !createFailureDefinitive
-    const ownsClientGroupCleanup = args.clientTargetGroupId
-      ? releaseWebSessionBrowserPlacementGroup({
-          environmentId,
-          worktreeId: args.worktreeId,
-          remotePageId: guardedPageId,
-          groupId: args.clientTargetGroupId,
-          callerCreatedGroup: args.clientTargetGroupCreated === true
-        })
-      : false
-    if (!args.clientTargetGroupId) {
-      forgetWebSessionBrowserPlacement({
-        environmentId,
-        worktreeId: args.worktreeId,
-        remotePageId: guardedPageId
-      })
-    }
-    if (cleanupPageId) {
-      try {
-        const closeResult = unwrapRuntimeRpcResult(
-          (await callEnvironment({
-            method: 'browser.tabClose',
-            params: {
-              worktree: toRuntimeWorktreeSelector(args.worktreeId),
-              page: cleanupPageId
-            },
-            timeoutMs: 15_000
-          })) as RuntimeRpcResponse<{ closed: boolean }>
-        )
-        if (!closeResult.closed) {
-          throw new Error('The paired runtime did not close the unreconciled browser tab.')
-        }
-        await refreshWebRuntimeSessionTabsSnapshot(environmentId, args.worktreeId, {
-          expectedEnvironmentPairingRevision: intentOwner.pairingRevision,
-          afterCurrentInFlight: true,
-          errorMode: 'throw'
-        })
-        if (
-          hasMaterializedWebRuntimeBrowserPage(
-            useAppStore.getState(),
-            environmentId,
-            args.worktreeId,
-            cleanupPageId
-          )
-        ) {
-          throw new Error('The closed browser tab remained materialized in the client.')
-        }
-      } catch (cleanupError) {
-        if (
-          !createdPageId &&
-          hostSupportsKnownPageId &&
-          hasRuntimeRpcErrorCode(cleanupError, 'browser_tab_not_found')
-        ) {
-          recoveryError = null
-        } else {
-          recoveryError = cleanupError
-          console.warn(
-            '[web-runtime-session] failed to clean up unreconciled browser tab:',
-            cleanupError instanceof Error ? cleanupError.message : String(cleanupError)
-          )
-        }
-      }
-    }
-    if (shouldFocusOnCreate) {
-      clearWebSessionFocusIntentIfMatches(intentOwner, args.worktreeId, guardedPageId)
-    }
-    if (
-      args.clientTargetGroupId &&
-      claimWebSessionBrowserPlacementGroupCleanup({
-        worktreeId: args.worktreeId,
-        groupId: args.clientTargetGroupId,
-        ownsGroupCleanup: ownsClientGroupCleanup
-      })
-    ) {
-      useAppStore.getState().closeEmptyGroup(args.worktreeId, args.clientTargetGroupId)
-    }
-    if (error instanceof StagedWebRuntimeBrowserTabCancelledError) {
-      console.warn('[web-runtime-session] browser tab was closed before its create finished')
-    } else if (args.failureLogMode === 'operation-only') {
-      console.warn('[web-runtime-session] failed to create browser tab')
-    } else {
-      console.warn(
-        '[web-runtime-session] failed to create browser tab:',
-        error instanceof Error ? error.message : String(error)
-      )
-    }
-    if (recoveryError) {
-      throw new Error('The paired runtime could not recover the failed browser creation.', {
-        cause: recoveryError
-      })
-    }
-    if (!createAttempted) {
-      throw error
-    }
-    if (createOutcomeUnknown) {
-      throw new Error('The paired runtime did not confirm whether the browser tab was created.', {
-        cause: error
-      })
-    }
-    return false
-  }
-}
-
-function selectWebRuntimeSessionWorktree(worktreeId: string, environmentId: string): void {
-  useAppStore.getState().setActiveWorktree(worktreeId, toRuntimeExecutionHostId(environmentId))
-}
-
-type WebRuntimeSessionWorkspaceSelectionRollback = {
-  previous: WebRuntimeSessionWorkspaceSelection
-  applied: WebRuntimeSessionWorkspaceSelection
-}
-
-function readActiveWorkspaceSelection(): WebRuntimeSessionWorkspaceSelection {
-  const state = useAppStore.getState()
-  return {
-    worktreeId: state.activeWorktreeId ?? null,
-    executionHostId: state.activeWorkspaceExecutionHostId ?? null
-  }
-}
-
-function restoreActiveWorkspaceSelection(
-  rollback: WebRuntimeSessionWorkspaceSelectionRollback
-): void {
-  if (
-    !shouldRestoreWebRuntimeSessionWorkspaceSelection({
-      ...rollback,
-      current: readActiveWorkspaceSelection()
-    })
-  ) {
-    return
-  }
-  useAppStore
-    .getState()
-    .setActiveWorktree(rollback.previous.worktreeId, rollback.previous.executionHostId ?? undefined)
-}
-
-function selectWebRuntimeSessionBrowserWorktree(worktreeId: string, environmentId: string): void {
-  const state = useAppStore.getState()
-  if (
-    state.activeWorktreeId !== worktreeId ||
-    state.activeWorkspaceExecutionHostId !== toRuntimeExecutionHostId(environmentId)
-  ) {
-    state.setActiveWorktree(worktreeId, toRuntimeExecutionHostId(environmentId))
-  }
-}
-
-export async function refreshWebRuntimeSessionTabsSnapshot(
-  environmentId: string,
-  worktreeId: string,
-  options: {
-    expectedEnvironmentPairingRevision?: number
-    acceptCurrentSnapshot?: boolean
-    confirmAgentSessionHandoff?: {
-      provisionalTabId: string
-      hostTabId: string
-      hostTerminalHandle: string
-    }
-    afterCurrentInFlight?: boolean
-    errorMode?: 'warn' | 'throw'
-  } = {}
-): Promise<void> {
-  const webSessionTabsSync = await import('./web-session-tabs-sync')
-  const expectedEnvironmentPairingRevision =
-    options.expectedEnvironmentPairingRevision ?? getRuntimeEnvironmentRevision(environmentId)
-  const expectedEnvironmentConnectionGeneration =
-    getRuntimeEnvironmentConnectionGeneration(environmentId)
-  const expectedTrackingGeneration =
-    webSessionTabsSync.getWebSessionTabsTrackingGeneration(environmentId)
-  const callEnvironment = captureRuntimeEnvironmentCall(
-    environmentId,
-    expectedEnvironmentPairingRevision
-  )
-  try {
-    if (options.acceptCurrentSnapshot) {
-      const { acceptReplayedWebSessionTabsSnapshot } = await import('./web-session-tabs-sync')
-      // Why: the host snapshot may have arrived before structured create returned;
-      // re-accept its current version after the exact provisional handoff is known.
-      acceptReplayedWebSessionTabsSnapshot(environmentId, worktreeId)
-    }
-    const listSessionTabs =
-      options.confirmAgentSessionHandoff || options.afterCurrentInFlight
-        ? listRemoteRuntimeSessionTabsAfterCurrentInFlight
-        : listRemoteRuntimeSessionTabsDeduped
-    if (options.afterCurrentInFlight) {
-      throwIfE2eWebRuntimeBrowserReconciliationFails()
-    }
-    const snapshot = await listSessionTabs({
-      environmentId,
-      worktreeId,
-      load: async () => {
-        const response = await callEnvironment({
-          method: 'session.tabs.list',
-          params: {
-            worktree: toRuntimeWorktreeSelector(worktreeId)
-          },
-          timeoutMs: 15_000
-        })
-        return unwrapRuntimeRpcResult(
-          response as RuntimeRpcResponse<RuntimeMobileSessionTabsResult>
-        )
-      }
-    })
-    if (options.confirmAgentSessionHandoff) {
-      const { confirmWebAgentSessionHandoffAfterCreate } =
-        await import('./web-agent-session-handoff')
-      // Why: this list completed after structured creation, so absence now proves the exact host tab already retired.
-      confirmWebAgentSessionHandoffAfterCreate({
-        environmentId,
-        worktreeId,
-        ...options.confirmAgentSessionHandoff
-      })
-    }
-    const {
-      applyWebSessionTabsSnapshot,
-      applyWebSessionTabsStorePatch,
-      decideWebSessionTabsSnapshot
-    } = webSessionTabsSync
-    if (getRuntimeEnvironmentRevision(environmentId) !== expectedEnvironmentPairingRevision) {
-      return
-    }
-    // Why: this list is the host answering, but only the frame's own decision
-    // says whether that answer is evidence — a workspace the mirror never
-    // writes is discarded with nothing accepted behind it.
-    const decision = decideWebSessionTabsSnapshot(snapshot, environmentId)
-    const settleMirror = applyWebSessionTabsStorePatch(
-      (state) => {
-        // Why: eager refreshes can resolve after the user switched worktrees; update tabs without stealing focus.
-        const patch = decision.apply
-          ? applyWebSessionTabsSnapshot(state, snapshot, environmentId)
-          : state
-        return patch === state ? state : patch
-      },
-      {
-        frames: [
-          {
-            environmentId,
-            worktreeId: snapshot.worktree,
-            decision,
-            expectedEnvironmentConnectionGeneration,
-            expectedEnvironmentPairingRevision,
-            expectedTrackingGeneration
-          }
-        ]
-      },
-      snapshot
-    )
-    settleMirror()
-  } catch (error) {
-    if (options.errorMode === 'throw') {
-      throw error
-    }
-    // Why: host creation already succeeded; the long-lived session.tabs subscription catches up if this eager refresh fails.
-    console.warn(
-      '[web-runtime-session] failed to refresh session-tabs snapshot:',
-      error instanceof Error ? error.message : String(error)
-    )
-  }
-}
-
-function scheduleRuntimeWorktreeRecoveryRefresh(
-  environmentId: string,
-  worktreeId: string,
-  expectedEnvironmentPairingRevision = getRuntimeEnvironmentRevision(environmentId)
-): void {
-  const initialState = useAppStore.getState()
-  if (!('tabsByWorktree' in initialState)) {
-    return
-  }
-  if ((initialState.tabsByWorktree[worktreeId] ?? []).length > 0) {
-    return
-  }
-  const key = `${environmentId}\0${expectedEnvironmentPairingRevision ?? ''}\0${worktreeId}`
-  const token = Symbol(key)
-  pendingRuntimeWorktreeRecoveryRefreshes.set(key, token)
-  void (async () => {
-    try {
-      for (const delayMs of RUNTIME_WORKTREE_RECOVERY_REFRESH_DELAYS_MS) {
-        await new Promise<void>((resolve) => setTimeout(resolve, delayMs))
-        if (pendingRuntimeWorktreeRecoveryRefreshes.get(key) !== token) {
-          return
-        }
-        if (getRuntimeEnvironmentRevision(environmentId) !== expectedEnvironmentPairingRevision) {
-          return
-        }
-        await refreshWebRuntimeSessionTabsSnapshot(environmentId, worktreeId, {
-          expectedEnvironmentPairingRevision
-        })
-        if ((useAppStore.getState().tabsByWorktree[worktreeId] ?? []).length > 0) {
-          return
-        }
-      }
-    } finally {
-      if (pendingRuntimeWorktreeRecoveryRefreshes.get(key) === token) {
-        pendingRuntimeWorktreeRecoveryRefreshes.delete(key)
-      }
-    }
-  })()
-}
-
-export async function activateWebRuntimeSessionWorktree(args: {
-  worktreeId: string
-  environmentId?: string | null
-}): Promise<boolean> {
-  const environmentId =
-    args.environmentId?.trim() ??
-    useAppStore.getState().settings?.activeRuntimeEnvironmentId?.trim() ??
-    null
-  if (!environmentId || !isWebRuntimeSessionActive(environmentId)) {
-    return false
-  }
-  const intentOwner = captureWebSessionIntentOwner(environmentId)
-  const callEnvironment = captureRuntimeEnvironmentCall(environmentId, intentOwner.pairingRevision)
-
-  try {
-    const response = await callEnvironment({
-      method: 'worktree.activate',
-      params: {
-        worktree: toRuntimeWorktreeSelector(args.worktreeId),
-        // Why: notifyClients:false keeps navigation local when this client reaches an older host.
-        notifyClients: false,
-        navigation: 'caller'
-      },
-      timeoutMs: 15_000
-    })
-    unwrapRuntimeRpcResult(response as RuntimeRpcResponse<unknown>)
-    // Why: a restarted HUB can recover its SSH pane after this client's subscription replayed an empty startup snapshot.
-    await refreshWebRuntimeSessionTabsSnapshot(environmentId, args.worktreeId, {
-      expectedEnvironmentPairingRevision: intentOwner.pairingRevision,
-      acceptCurrentSnapshot: true
-    })
-    // Why: HUB reachability can precede its nested SSH relay; bounded owner-scoped re-lists converge without asking the paired client to connect SSH itself.
-    scheduleRuntimeWorktreeRecoveryRefresh(
-      environmentId,
-      args.worktreeId,
-      intentOwner.pairingRevision
-    )
-    return true
-  } catch (error) {
-    console.warn(
-      '[web-runtime-session] failed to activate worktree:',
-      error instanceof Error ? error.message : String(error)
-    )
-    return false
-  }
-}
-
-export async function activateWebRuntimeSessionTab(args: {
-  worktreeId: string
-  tabId: string
-  environmentId?: string | null
-}): Promise<boolean> {
-  return (await callWebRuntimeSessionTabMethod('session.tabs.activate', args)) === 'applied'
-}
-
-/**
- * Why 'unknown-tab' is its own outcome: it is the host's definitive answer that it has no such
- * tab, which is the only evidence that lets a client finish a teardown the host cannot. Every
- * other failure -- a dropped connection, a timeout -- is a "not now", and treating it the same
- * would tear down tabs a reachable host still holds.
- */
-export type WebRuntimeSessionTabCloseOutcome = 'applied' | 'unknown-tab' | 'failed'
-
-export async function closeWebRuntimeSessionTab(args: {
-  worktreeId: string
-  tabId: string
-  environmentId?: string | null
-  reason: RuntimeSessionTabCloseReason
-  publicationEpoch?: string | null
-  terminalHandle?: string | null
-}): Promise<WebRuntimeSessionTabCloseOutcome> {
-  return callWebRuntimeSessionTabMethod('session.tabs.close', args)
-}
-
-export async function moveWebRuntimeSessionTab(
-  args: RuntimeMobileSessionTabMove & {
-    worktreeId: string
-    environmentId?: string | null
-  }
-): Promise<boolean> {
-  const environmentId =
-    args.environmentId?.trim() ??
-    useAppStore.getState().settings?.activeRuntimeEnvironmentId?.trim() ??
-    null
-  if (!environmentId || !isWebRuntimeSessionActive(environmentId)) {
-    return false
-  }
-  const intentOwner = captureWebSessionIntentOwner(environmentId)
-  const callEnvironment = captureRuntimeEnvironmentCall(environmentId, intentOwner.pairingRevision)
-
-  if (args.kind === 'reorder') {
-    // Why: record local order synchronously before async host resolution, so a pre-move snapshot can't snap the tab back.
-    recordWebSessionReorderIntent(
-      intentOwner,
-      args.worktreeId,
-      args.targetGroupId,
-      args.tabOrder,
-      Date.now()
-    )
-  }
-
-  try {
-    const { resolveHostSessionTabIdForWebSessionTab } = await import('./web-session-tabs-sync')
-    const state = useAppStore.getState()
-    const resolveHostBackedTabId = (tabId: string): string | null =>
-      resolveHostSessionTabIdForWebSessionTab(state, {
-        environmentId,
-        worktreeId: args.worktreeId,
-        tabId
-      }) ?? (isWebTerminalSurfaceTabId(tabId) ? toHostSessionTabId(tabId) : null)
-    const toHostTabId = (tabId: string): string => resolveHostBackedTabId(tabId) ?? tabId
-    const movedHostTabId =
-      args.kind === 'reorder' ? resolveHostBackedTabId(args.tabId) : toHostTabId(args.tabId)
-    if (!movedHostTabId) {
-      clearWebSessionReorderIntent(intentOwner, args.worktreeId, args.targetGroupId)
-      return false
-    }
-    const reorderedHostTabOrder =
-      args.kind === 'reorder'
-        ? args.tabOrder
-            .map(resolveHostBackedTabId)
-            .filter((tabId): tabId is string => Boolean(tabId))
-        : null
-    if (reorderedHostTabOrder && !reorderedHostTabOrder.includes(movedHostTabId)) {
-      clearWebSessionReorderIntent(intentOwner, args.worktreeId, args.targetGroupId)
-      return false
-    }
-    const targetHostIndex =
-      args.kind === 'move-to-group' && typeof args.index === 'number'
-        ? (state.groupsByWorktree?.[args.worktreeId]
-            ?.find((group) => group.id === args.targetGroupId)
-            ?.tabOrder.slice(0, args.index)
-            .map(resolveHostBackedTabId)
-            .filter((tabId): tabId is string => Boolean(tabId)).length ?? args.index)
-        : args.kind === 'move-to-group'
-          ? args.index
-          : undefined
-    const base = {
-      worktree: toRuntimeWorktreeSelector(args.worktreeId),
-      tabId: movedHostTabId,
-      targetGroupId: args.targetGroupId
-    }
-    const move =
-      args.kind === 'reorder'
-        ? {
-            ...base,
-            kind: 'reorder' as const,
-            // Why: the host reorder API only accepts host tab ids, so local-only tabs must be omitted from the mirrored order.
-            tabOrder: reorderedHostTabOrder
-          }
-        : args.kind === 'split'
-          ? {
-              ...base,
-              kind: 'split' as const,
-              splitDirection: args.splitDirection
-            }
-          : {
-              ...base,
-              kind: 'move-to-group' as const,
-              // Why: web groups can contain local-only tabs, so host insertion indexes count only the filtered host-backed order.
-              index: targetHostIndex
-            }
-    const response = await callEnvironment({
-      method: 'session.tabs.move',
-      params: move,
-      timeoutMs: 15_000
-    })
-    unwrapRuntimeRpcResult(response as RuntimeRpcResponse<RuntimeMobileSessionTabMoveResult>)
-    return true
-  } catch (error) {
-    if (args.kind === 'reorder') {
-      clearWebSessionReorderIntent(intentOwner, args.worktreeId, args.targetGroupId)
-    }
-    console.warn(
-      '[web-runtime-session] failed to move tab:',
-      error instanceof Error ? error.message : String(error)
-    )
-    return false
-  }
-}
-
-async function callWebRuntimeSessionTabMethod(
-  method: 'session.tabs.activate' | 'session.tabs.close',
-  args: {
-    worktreeId: string
-    tabId: string
-    environmentId?: string | null
-    reason?: RuntimeSessionTabCloseReason
-    publicationEpoch?: string | null
-    terminalHandle?: string | null
-  }
-): Promise<WebRuntimeSessionTabCloseOutcome> {
-  const environmentId =
-    args.environmentId?.trim() ??
-    useAppStore.getState().settings?.activeRuntimeEnvironmentId?.trim() ??
-    null
-  if (!environmentId || !isWebRuntimeSessionActive(environmentId)) {
-    return 'failed'
-  }
-  const intentOwner = captureWebSessionIntentOwner(environmentId)
-  const callEnvironment = captureRuntimeEnvironmentCall(environmentId, intentOwner.pairingRevision)
-  const closeIntentTabIds = new Set<string>()
-  let activationHostTabId: string | null = null
-
-  const isClose = method === 'session.tabs.close'
-  const isLifecycleClose = isClose && args.reason !== 'user'
-  if (isLifecycleClose && (!args.publicationEpoch || !args.terminalHandle)) {
-    // Why: missing host-generation or terminal-incarnation evidence means keep;
-    // a tab id alone can be stale or reused after reconnect.
-    const { acceptReplayedWebSessionTabsSnapshot } = await import('./web-session-tabs-sync')
-    acceptReplayedWebSessionTabsSnapshot(environmentId, args.worktreeId)
-    await refreshWebRuntimeSessionTabsSnapshot(environmentId, args.worktreeId)
-    console.warn('[web-runtime-session] suppressed lifecycle close without incarnation evidence', {
-      closeReason: args.reason
-    })
-    return 'failed'
-  }
-
-  const immediateHostTabId = toHostSessionTabId(args.tabId)
-  if (isClose) {
-    // Why: record before async id resolution so a stale snapshot cannot flash the closed tab back.
-    closeIntentTabIds.add(immediateHostTabId)
-    recordWebSessionCloseIntent(intentOwner, args.worktreeId, immediateHostTabId, Date.now())
-  }
-
-  try {
-    const { resolveHostSessionTabIdForWebSessionTab } = await import('./web-session-tabs-sync')
-    const state = useAppStore.getState()
-    const hostTabId =
-      resolveHostSessionTabIdForWebSessionTab(state, {
-        environmentId,
-        worktreeId: args.worktreeId,
-        tabId: args.tabId
-      }) ?? toHostSessionTabId(args.tabId)
-    if (isClose) {
-      // Why: suppress until the host confirms removal, else an in-flight pre-close snapshot flashes the tab back.
-      closeIntentTabIds.add(hostTabId)
-      recordWebSessionCloseIntent(intentOwner, args.worktreeId, hostTabId, Date.now())
-    } else {
-      activationHostTabId = hostTabId
-      recordWebSessionFocusIntent(intentOwner, args.worktreeId, hostTabId)
-    }
-    const response = await callEnvironment({
-      // Why: old hosts cannot route this additive method, so a generation
-      // cutover fails closed before their destructive legacy close handler.
-      method: isLifecycleClose ? 'session.tabs.closeLifecycle' : method,
-      params: {
-        worktree: toRuntimeWorktreeSelector(args.worktreeId),
-        tabId: hostTabId,
-        ...(method === 'session.tabs.activate'
-          ? {
-              // Why: the additive navigation target protects new hosts while notifyClients:false protects old hosts.
-              notifyClients: false,
-              navigation: 'caller' as const,
-              // Why: every caller here is a tab click, shortcut, or palette pick —
-              // the gesture that is supposed to wake a slept pane.
-              intent: 'user' as const
-            }
-          : {}),
-        ...(isLifecycleClose
-          ? {
-              reason: args.reason,
-              publicationEpoch: args.publicationEpoch,
-              terminal: args.terminalHandle
-            }
-          : isClose
-            ? { reason: args.reason }
-            : {})
-      },
-      timeoutMs: 15_000
-    })
-    const result = unwrapRuntimeRpcResult(
-      response as RuntimeRpcResponse<RuntimeMobileSessionTabCloseResult | undefined>
-    )
-    if (isClose) {
-      if (result?.refused === true && result.snapshotRepublished === true) {
-        // Why: the host kept an authoritative live PTY. Stop hiding its mirror
-        // only when it republished; dead-leaf refusals must stay suppressed.
-        clearWebSessionCloseIntent(intentOwner, args.worktreeId, immediateHostTabId)
-        clearWebSessionCloseIntent(intentOwner, args.worktreeId, hostTabId)
-        const { acceptReplayedWebSessionTabsSnapshot } = await import('./web-session-tabs-sync')
-        acceptReplayedWebSessionTabsSnapshot(environmentId, args.worktreeId)
-      }
-      await refreshWebRuntimeSessionTabsSnapshot(environmentId, args.worktreeId, {
-        expectedEnvironmentPairingRevision: intentOwner.pairingRevision
-      })
-    }
-    return 'applied'
-  } catch (error) {
-    if (activationHostTabId) {
-      clearWebSessionFocusIntentIfMatches(intentOwner, args.worktreeId, activationHostTabId)
-    }
-    for (const hostTabId of closeIntentTabIds) {
-      clearWebSessionCloseIntent(intentOwner, args.worktreeId, hostTabId)
-    }
-    if (isLifecycleClose) {
-      const { acceptReplayedWebSessionTabsSnapshot } = await import('./web-session-tabs-sync')
-      acceptReplayedWebSessionTabsSnapshot(environmentId, args.worktreeId)
-      await refreshWebRuntimeSessionTabsSnapshot(environmentId, args.worktreeId, {
-        expectedEnvironmentPairingRevision: intentOwner.pairingRevision
-      })
-    }
-    console.warn(
-      `[web-runtime-session] failed to ${isClose ? 'close' : 'activate'} tab:`,
-      error instanceof Error ? error.message : String(error)
-    )
-    return hasRuntimeRpcErrorCode(error, 'tab_not_found') ? 'unknown-tab' : 'failed'
-  }
-}
-
-export function splitWebRuntimeTerminal(
-  ptyId: string | null | undefined,
-  direction: 'horizontal' | 'vertical',
-  telemetrySource: TerminalPaneSplitSource
-): boolean {
-  if (!ptyId) {
-    return false
-  }
-  const remote = parseRemoteRuntimePtyId(ptyId)
-  const environmentId = remote?.environmentId?.trim()
-  if (!remote || !environmentId || !isWebRuntimeSessionActive(environmentId)) {
-    return false
-  }
-
-  // Why: split must run on the host pane; a local split mints a web-only pane the host mirrors back as a tab, not a split.
-  const pendingMirrorSuppressionId = reservePendingWebRuntimeSplitMirrorTelemetry(ptyId, direction)
-  const releasePendingMirrorSuppression = schedulePendingWebRuntimeSplitMirrorTelemetryRelease(
-    ptyId,
-    direction,
-    pendingMirrorSuppressionId
-  )
-  void window.api.runtimeEnvironments
-    .call({
-      selector: environmentId,
-      method: 'terminal.split',
-      params: {
-        terminal: remote.handle,
-        direction,
-        telemetrySource
-      },
-      timeoutMs: 15_000
-    })
-    .then((response) => {
-      unwrapRuntimeRpcResult(response as RuntimeRpcResponse<{ split: RuntimeTerminalSplit }>)
-    })
-    .catch((error) => {
-      releasePendingMirrorSuppression()
-      const message = error instanceof Error ? error.message : String(error)
-      // Why: a split that fails only in the console leaves the user with a pane that silently
-      // never appears.
-      toast.error(message)
-      console.warn('[web-runtime-session] failed to split terminal:', message)
-    })
-  return true
-}
-
-export function consumePendingWebRuntimeSplitMirrorTelemetry(
-  sourcePtyId: string | null | undefined,
-  direction: 'horizontal' | 'vertical'
-): boolean {
-  if (!sourcePtyId) {
-    return false
-  }
-  const key = getPendingWebRuntimeSplitMirrorTelemetryKey(sourcePtyId, direction)
-  const ids = pendingWebRuntimeSplitMirrorTelemetry.get(key)
-  const id = ids?.values().next().value
-  if (!ids || !id) {
-    return false
-  }
-  ids.delete(id)
-  if (ids.size === 0) {
-    pendingWebRuntimeSplitMirrorTelemetry.delete(key)
-  }
-  return true
-}
-
-function reservePendingWebRuntimeSplitMirrorTelemetry(
-  sourcePtyId: string,
-  direction: 'horizontal' | 'vertical'
-): string {
-  const id = String(++pendingWebRuntimeSplitMirrorTelemetryId)
-  const key = getPendingWebRuntimeSplitMirrorTelemetryKey(sourcePtyId, direction)
-  const ids = pendingWebRuntimeSplitMirrorTelemetry.get(key) ?? new Set<string>()
-  ids.add(id)
-  pendingWebRuntimeSplitMirrorTelemetry.set(key, ids)
-  return id
-}
-
-function schedulePendingWebRuntimeSplitMirrorTelemetryRelease(
-  sourcePtyId: string,
-  direction: 'horizontal' | 'vertical',
-  id: string
-): () => void {
-  let released = false
-  const release = (): void => {
-    if (released) {
-      return
-    }
-    released = true
-    releasePendingWebRuntimeSplitMirrorTelemetry(sourcePtyId, direction, id)
-  }
-  const timeout = globalThis.setTimeout(release, WEB_RUNTIME_SPLIT_MIRROR_SUPPRESSION_TTL_MS)
-  return () => {
-    globalThis.clearTimeout(timeout)
-    release()
-  }
-}
-
-function releasePendingWebRuntimeSplitMirrorTelemetry(
-  sourcePtyId: string,
-  direction: 'horizontal' | 'vertical',
-  id: string
-): void {
-  const key = getPendingWebRuntimeSplitMirrorTelemetryKey(sourcePtyId, direction)
-  const ids = pendingWebRuntimeSplitMirrorTelemetry.get(key)
-  if (!ids) {
-    return
-  }
-  ids.delete(id)
-  if (ids.size === 0) {
-    pendingWebRuntimeSplitMirrorTelemetry.delete(key)
-  }
-}
-
-function getPendingWebRuntimeSplitMirrorTelemetryKey(
-  sourcePtyId: string,
-  direction: 'horizontal' | 'vertical'
-): string {
-  return `${direction}:${sourcePtyId}`
-}
-
-export function closeWebRuntimeTerminal(ptyId: string | null | undefined): boolean {
-  if (!ptyId) {
-    return false
-  }
-  const remote = parseRemoteRuntimePtyId(ptyId)
-  const environmentId = remote?.environmentId?.trim()
-  if (!remote || !environmentId || !isWebRuntimeSessionActive(environmentId)) {
-    return false
-  }
-
-  // Why: host owns the real pane graph; close the host terminal first so later snapshots can't resurrect the removed pane.
-  void window.api.runtimeEnvironments
-    .call({
-      selector: environmentId,
-      method: 'terminal.close',
-      params: {
-        terminal: remote.handle
-      },
-      timeoutMs: 15_000
-    })
-    .then((response) => {
-      unwrapRuntimeRpcResult(response as RuntimeRpcResponse<{ close: RuntimeTerminalClose }>)
-    })
-    .catch((error) => {
-      console.warn(
-        '[web-runtime-session] failed to close terminal pane:',
-        error instanceof Error ? error.message : String(error)
-      )
-    })
-  return true
-}
-
-// Why: pane geometry is host-authoritative for remote tabs; local-only changes revert on next snapshot, so push to host.
-export async function updateWebRuntimePaneLayout(args: {
-  worktreeId: string
-  tabId: string
-  root: TerminalPaneLayoutNode | null
-  expandedLeafId: string | null
-  titlesByLeafId?: Record<string, string>
-}): Promise<boolean> {
-  const environmentId =
-    getRuntimeEnvironmentIdForWorktree(useAppStore.getState(), args.worktreeId) ?? null
-  if (!environmentId || !isWebRuntimeSessionActive(environmentId)) {
-    return false
-  }
-  const callEnvironment = captureRuntimeEnvironmentCall(environmentId)
-  const hostTabId = isWebTerminalSurfaceTabId(args.tabId)
-    ? toHostSessionTabId(args.tabId)
-    : args.tabId
-  try {
-    const response = await callEnvironment({
-      method: 'session.tabs.updatePaneLayout',
-      params: {
-        worktree: toRuntimeWorktreeSelector(args.worktreeId),
-        tabId: hostTabId,
-        root: args.root,
-        expandedLeafId: args.expandedLeafId,
-        ...(args.titlesByLeafId ? { titlesByLeafId: args.titlesByLeafId } : {})
-      },
-      timeoutMs: 15_000
-    })
-    unwrapRuntimeRpcResult(response as RuntimeRpcResponse<{ updated: true }>)
-    return true
-  } catch (error) {
-    console.warn(
-      '[web-runtime-session] failed to update pane layout:',
-      error instanceof Error ? error.message : String(error)
-    )
-    return false
-  }
-}
-
-// Why: tab color/pin are host-authoritative; mirror the change so it persists (undefined field = leave as-is on host).
-export function setWebRuntimeTabProps(args: {
-  worktreeId: string
-  tabId: string
-  color?: string | null
-  isPinned?: boolean
-  viewMode?: 'terminal' | 'chat'
-}): boolean {
-  const environmentId =
-    getRuntimeEnvironmentIdForWorktree(useAppStore.getState(), args.worktreeId) ?? null
-  if (!environmentId || !isWebRuntimeSessionActive(environmentId)) {
-    return false
-  }
-  const callEnvironment = captureRuntimeEnvironmentCall(environmentId)
-  const state = useAppStore.getState()
-  void import('./web-session-tabs-sync')
-    .then(({ resolveHostSessionTabIdForWebSessionTab }) => {
-      const hostTabId =
-        resolveHostSessionTabIdForWebSessionTab(state, {
-          environmentId,
-          worktreeId: args.worktreeId,
-          tabId: args.tabId
-        }) ?? (isWebTerminalSurfaceTabId(args.tabId) ? toHostSessionTabId(args.tabId) : args.tabId)
-      return callEnvironment({
-        method: 'session.tabs.setTabProps',
-        params: {
-          worktree: toRuntimeWorktreeSelector(args.worktreeId),
-          tabId: hostTabId,
-          ...(args.color !== undefined ? { color: args.color } : {}),
-          ...(args.isPinned !== undefined ? { isPinned: args.isPinned } : {}),
-          ...(args.viewMode !== undefined ? { viewMode: args.viewMode } : {})
-        },
-        timeoutMs: 15_000
-      })
-    })
-    .then((response) => {
-      unwrapRuntimeRpcResult(response as RuntimeRpcResponse<{ updated: true }>)
-    })
-    .catch((error) => {
-      console.warn(
-        '[web-runtime-session] failed to set tab props:',
-        error instanceof Error ? error.message : String(error)
-      )
-    })
-  return true
-}
-
-// Why: local pane.terminal.clear() is undone by the next host snapshot replay; clear the host buffer so it sticks.
-export function clearWebRuntimeTerminalBuffer(ptyId: string | null | undefined): boolean {
-  if (!ptyId) {
-    return false
-  }
-  const remote = parseRemoteRuntimePtyId(ptyId)
-  const environmentId = remote?.environmentId?.trim()
-  if (!remote || !environmentId || !isWebRuntimeSessionActive(environmentId)) {
-    return false
-  }
-  void window.api.runtimeEnvironments
-    .call({
-      selector: environmentId,
-      method: 'terminal.clearBuffer',
-      params: { terminal: remote.handle },
-      timeoutMs: 15_000
-    })
-    .then((response) => {
-      unwrapRuntimeRpcResult(response as RuntimeRpcResponse<{ clear: unknown }>)
-    })
-    .catch((error) => {
-      console.warn(
-        '[web-runtime-session] failed to clear terminal buffer:',
-        error instanceof Error ? error.message : String(error)
-      )
-    })
-  return true
-}
+export { isWebRuntimeSessionActive } from './web-runtime-session-environment'
+export type { WebRuntimeTerminalCreateOutcome } from './web-runtime-session-types'
+export {
+  createWebRuntimeSessionTerminal,
+  createWebRuntimeAgentSessionTerminal,
+  createWebRuntimeAgentSessionTerminalWithLaunchDraft
+} from './web-runtime-terminal-creation'
+export { createWebRuntimeSessionBrowserTab } from './web-runtime-browser-creation'
+export { refreshWebRuntimeSessionTabsSnapshot } from './web-runtime-session-snapshot'
+export { activateWebRuntimeSessionWorktree } from './web-runtime-worktree-activation'
+export { activateWebRuntimeSessionTab } from './web-runtime-session-tab-lifecycle'
+export type { WebRuntimeSessionTabCloseOutcome } from './web-runtime-session-tab-lifecycle'
+export { closeWebRuntimeSessionTab } from './web-runtime-session-tab-lifecycle'
+export { moveWebRuntimeSessionTab } from './web-runtime-session-tab-move'
+export {
+  splitWebRuntimeTerminal,
+  consumePendingWebRuntimeSplitMirrorTelemetry,
+  closeWebRuntimeTerminal,
+  updateWebRuntimePaneLayout,
+  setWebRuntimeTabProps,
+  clearWebRuntimeTerminalBuffer
+} from './web-runtime-terminal-actions'
diff --git a/src/renderer/src/runtime/web-runtime-terminal-actions.ts b/src/renderer/src/runtime/web-runtime-terminal-actions.ts
new file mode 100644
index 00000000000..c794031ef59
--- /dev/null
+++ b/src/renderer/src/runtime/web-runtime-terminal-actions.ts
@@ -0,0 +1,288 @@
+import { toast } from 'sonner'
+import type { TerminalPaneSplitSource } from '../../../shared/feature-education-telemetry'
+import type { RuntimeRpcResponse } from '../../../shared/runtime-rpc-envelope'
+import type { RuntimeTerminalClose, RuntimeTerminalSplit } from '../../../shared/runtime-types'
+import type { TerminalPaneLayoutNode } from '../../../shared/terminal-tab-types'
+import { getRuntimeEnvironmentIdForWorktree } from '../lib/worktree-runtime-owner'
+import { useAppStore } from '../store'
+import { unwrapRuntimeRpcResult } from './runtime-rpc-client'
+import { parseRemoteRuntimePtyId } from './runtime-terminal-stream'
+import { toRuntimeWorktreeSelector } from './runtime-worktree-selector'
+import { isWebTerminalSurfaceTabId, toHostSessionTabId } from './web-terminal-surface-id'
+import {
+  captureRuntimeEnvironmentCall,
+  isWebRuntimeSessionActive
+} from './web-runtime-session-environment'
+
+const pendingWebRuntimeSplitMirrorTelemetry = new Map<string, Set<string>>()
+const WEB_RUNTIME_SPLIT_MIRROR_SUPPRESSION_TTL_MS = 30_000
+let pendingWebRuntimeSplitMirrorTelemetryId = 0
+
+export function splitWebRuntimeTerminal(
+  ptyId: string | null | undefined,
+  direction: 'horizontal' | 'vertical',
+  telemetrySource: TerminalPaneSplitSource
+): boolean {
+  if (!ptyId) {
+    return false
+  }
+  const remote = parseRemoteRuntimePtyId(ptyId)
+  const environmentId = remote?.environmentId?.trim()
+  if (!remote || !environmentId || !isWebRuntimeSessionActive(environmentId)) {
+    return false
+  }
+
+  // Why: split must run on the host pane; a local split mints a web-only pane the host mirrors back as a tab, not a split.
+  const pendingMirrorSuppressionId = reservePendingWebRuntimeSplitMirrorTelemetry(ptyId, direction)
+  const releasePendingMirrorSuppression = schedulePendingWebRuntimeSplitMirrorTelemetryRelease(
+    ptyId,
+    direction,
+    pendingMirrorSuppressionId
+  )
+  void window.api.runtimeEnvironments
+    .call({
+      selector: environmentId,
+      method: 'terminal.split',
+      params: {
+        terminal: remote.handle,
+        direction,
+        telemetrySource
+      },
+      timeoutMs: 15_000
+    })
+    .then((response) => {
+      unwrapRuntimeRpcResult(response as RuntimeRpcResponse<{ split: RuntimeTerminalSplit }>)
+    })
+    .catch((error) => {
+      releasePendingMirrorSuppression()
+      const message = error instanceof Error ? error.message : String(error)
+      // Why: a split that fails only in the console leaves the user with a pane that silently
+      // never appears.
+      toast.error(message)
+      console.warn('[web-runtime-session] failed to split terminal:', message)
+    })
+  return true
+}
+
+export function consumePendingWebRuntimeSplitMirrorTelemetry(
+  sourcePtyId: string | null | undefined,
+  direction: 'horizontal' | 'vertical'
+): boolean {
+  if (!sourcePtyId) {
+    return false
+  }
+  const key = getPendingWebRuntimeSplitMirrorTelemetryKey(sourcePtyId, direction)
+  const ids = pendingWebRuntimeSplitMirrorTelemetry.get(key)
+  const id = ids?.values().next().value
+  if (!ids || !id) {
+    return false
+  }
+  ids.delete(id)
+  if (ids.size === 0) {
+    pendingWebRuntimeSplitMirrorTelemetry.delete(key)
+  }
+  return true
+}
+
+function reservePendingWebRuntimeSplitMirrorTelemetry(
+  sourcePtyId: string,
+  direction: 'horizontal' | 'vertical'
+): string {
+  const id = String(++pendingWebRuntimeSplitMirrorTelemetryId)
+  const key = getPendingWebRuntimeSplitMirrorTelemetryKey(sourcePtyId, direction)
+  const ids = pendingWebRuntimeSplitMirrorTelemetry.get(key) ?? new Set<string>()
+  ids.add(id)
+  pendingWebRuntimeSplitMirrorTelemetry.set(key, ids)
+  return id
+}
+
+function schedulePendingWebRuntimeSplitMirrorTelemetryRelease(
+  sourcePtyId: string,
+  direction: 'horizontal' | 'vertical',
+  id: string
+): () => void {
+  let released = false
+  const release = (): void => {
+    if (released) {
+      return
+    }
+    released = true
+    releasePendingWebRuntimeSplitMirrorTelemetry(sourcePtyId, direction, id)
+  }
+  const timeout = globalThis.setTimeout(release, WEB_RUNTIME_SPLIT_MIRROR_SUPPRESSION_TTL_MS)
+  return () => {
+    globalThis.clearTimeout(timeout)
+    release()
+  }
+}
+
+function releasePendingWebRuntimeSplitMirrorTelemetry(
+  sourcePtyId: string,
+  direction: 'horizontal' | 'vertical',
+  id: string
+): void {
+  const key = getPendingWebRuntimeSplitMirrorTelemetryKey(sourcePtyId, direction)
+  const ids = pendingWebRuntimeSplitMirrorTelemetry.get(key)
+  if (!ids) {
+    return
+  }
+  ids.delete(id)
+  if (ids.size === 0) {
+    pendingWebRuntimeSplitMirrorTelemetry.delete(key)
+  }
+}
+
+function getPendingWebRuntimeSplitMirrorTelemetryKey(
+  sourcePtyId: string,
+  direction: 'horizontal' | 'vertical'
+): string {
+  return `${direction}:${sourcePtyId}`
+}
+
+export function closeWebRuntimeTerminal(ptyId: string | null | undefined): boolean {
+  if (!ptyId) {
+    return false
+  }
+  const remote = parseRemoteRuntimePtyId(ptyId)
+  const environmentId = remote?.environmentId?.trim()
+  if (!remote || !environmentId || !isWebRuntimeSessionActive(environmentId)) {
+    return false
+  }
+
+  // Why: host owns the real pane graph; close the host terminal first so later snapshots can't resurrect the removed pane.
+  void window.api.runtimeEnvironments
+    .call({
+      selector: environmentId,
+      method: 'terminal.close',
+      params: {
+        terminal: remote.handle
+      },
+      timeoutMs: 15_000
+    })
+    .then((response) => {
+      unwrapRuntimeRpcResult(response as RuntimeRpcResponse<{ close: RuntimeTerminalClose }>)
+    })
+    .catch((error) => {
+      console.warn(
+        '[web-runtime-session] failed to close terminal pane:',
+        error instanceof Error ? error.message : String(error)
+      )
+    })
+  return true
+}
+
+// Why: pane geometry is host-authoritative for remote tabs; local-only changes revert on next snapshot, so push to host.
+export async function updateWebRuntimePaneLayout(args: {
+  worktreeId: string
+  tabId: string
+  root: TerminalPaneLayoutNode | null
+  expandedLeafId: string | null
+  titlesByLeafId?: Record<string, string>
+}): Promise<boolean> {
+  const environmentId =
+    getRuntimeEnvironmentIdForWorktree(useAppStore.getState(), args.worktreeId) ?? null
+  if (!environmentId || !isWebRuntimeSessionActive(environmentId)) {
+    return false
+  }
+  const callEnvironment = captureRuntimeEnvironmentCall(environmentId)
+  const hostTabId = isWebTerminalSurfaceTabId(args.tabId)
+    ? toHostSessionTabId(args.tabId)
+    : args.tabId
+  try {
+    const response = await callEnvironment({
+      method: 'session.tabs.updatePaneLayout',
+      params: {
+        worktree: toRuntimeWorktreeSelector(args.worktreeId),
+        tabId: hostTabId,
+        root: args.root,
+        expandedLeafId: args.expandedLeafId,
+        ...(args.titlesByLeafId ? { titlesByLeafId: args.titlesByLeafId } : {})
+      },
+      timeoutMs: 15_000
+    })
+    unwrapRuntimeRpcResult(response as RuntimeRpcResponse<{ updated: true }>)
+    return true
+  } catch (error) {
+    console.warn(
+      '[web-runtime-session] failed to update pane layout:',
+      error instanceof Error ? error.message : String(error)
+    )
+    return false
+  }
+}
+
+// Why: tab color/pin are host-authoritative; mirror the change so it persists (undefined field = leave as-is on host).
+export function setWebRuntimeTabProps(args: {
+  worktreeId: string
+  tabId: string
+  color?: string | null
+  isPinned?: boolean
+  viewMode?: 'terminal' | 'chat'
+}): boolean {
+  const environmentId =
+    getRuntimeEnvironmentIdForWorktree(useAppStore.getState(), args.worktreeId) ?? null
+  if (!environmentId || !isWebRuntimeSessionActive(environmentId)) {
+    return false
+  }
+  const callEnvironment = captureRuntimeEnvironmentCall(environmentId)
+  const state = useAppStore.getState()
+  void import('./web-session-tabs-sync')
+    .then(({ resolveHostSessionTabIdForWebSessionTab }) => {
+      const hostTabId =
+        resolveHostSessionTabIdForWebSessionTab(state, {
+          environmentId,
+          worktreeId: args.worktreeId,
+          tabId: args.tabId
+        }) ?? (isWebTerminalSurfaceTabId(args.tabId) ? toHostSessionTabId(args.tabId) : args.tabId)
+      return callEnvironment({
+        method: 'session.tabs.setTabProps',
+        params: {
+          worktree: toRuntimeWorktreeSelector(args.worktreeId),
+          tabId: hostTabId,
+          ...(args.color !== undefined ? { color: args.color } : {}),
+          ...(args.isPinned !== undefined ? { isPinned: args.isPinned } : {}),
+          ...(args.viewMode !== undefined ? { viewMode: args.viewMode } : {})
+        },
+        timeoutMs: 15_000
+      })
+    })
+    .then((response) => {
+      unwrapRuntimeRpcResult(response as RuntimeRpcResponse<{ updated: true }>)
+    })
+    .catch((error) => {
+      console.warn(
+        '[web-runtime-session] failed to set tab props:',
+        error instanceof Error ? error.message : String(error)
+      )
+    })
+  return true
+}
+
+// Why: local pane.terminal.clear() is undone by the next host snapshot replay; clear the host buffer so it sticks.
+export function clearWebRuntimeTerminalBuffer(ptyId: string | null | undefined): boolean {
+  if (!ptyId) {
+    return false
+  }
+  const remote = parseRemoteRuntimePtyId(ptyId)
+  const environmentId = remote?.environmentId?.trim()
+  if (!remote || !environmentId || !isWebRuntimeSessionActive(environmentId)) {
+    return false
+  }
+  void window.api.runtimeEnvironments
+    .call({
+      selector: environmentId,
+      method: 'terminal.clearBuffer',
+      params: { terminal: remote.handle },
+      timeoutMs: 15_000
+    })
+    .then((response) => {
+      unwrapRuntimeRpcResult(response as RuntimeRpcResponse<{ clear: unknown }>)
+    })
+    .catch((error) => {
+      console.warn(
+        '[web-runtime-session] failed to clear terminal buffer:',
+        error instanceof Error ? error.message : String(error)
+      )
+    })
+  return true
+}
diff --git a/src/renderer/src/runtime/web-runtime-terminal-create-operation.ts b/src/renderer/src/runtime/web-runtime-terminal-create-operation.ts
new file mode 100644
index 00000000000..5ca20bdb7f3
--- /dev/null
+++ b/src/renderer/src/runtime/web-runtime-terminal-create-operation.ts
@@ -0,0 +1,297 @@
+import type { RuntimeRpcResponse } from '../../../shared/runtime-rpc-envelope'
+import type { RuntimeMobileSessionCreateTerminalResult } from '../../../shared/runtime-types'
+import type {
+  RuntimeCreateAgentSessionResult,
+  RuntimeEnsureAgentSessionResult
+} from '../../../shared/agent-session-host-authority'
+import { toRuntimeExecutionHostId } from '../../../shared/execution-host'
+import { translate } from '../i18n/i18n'
+import { useAppStore } from '../store'
+import { agentResumeHostAuthorityCapability } from './agent-resume-host-authority-capability'
+import {
+  createAgentSessionCreateOperation,
+  withAgentSessionCreateOperationId
+} from './agent-session-create-operation'
+import { runRemoteAgentSessionLaunch } from './remote-agent-session-launch'
+import { unwrapRuntimeRpcResult } from './runtime-rpc-client'
+import { toRuntimeWorktreeSelector } from './runtime-worktree-selector'
+import { resolveWebRuntimeSessionEnvironmentId } from './web-runtime-session-workspace-routing'
+import { recordWebSessionFocusIntent } from './web-session-focus-intent'
+import {
+  forgetWebSessionTerminalPlacement,
+  recordWebSessionTerminalPlacement,
+  webTerminalPlacementParentTabId
+} from './web-session-terminal-placement'
+import { toHostSessionTabId } from './web-terminal-surface-id'
+import {
+  captureRuntimeEnvironmentCall,
+  captureWebSessionIntentOwner,
+  isWebRuntimeSessionActive,
+  matchesWebSessionIntentOwner
+} from './web-runtime-session-environment'
+import { refreshWebRuntimeSessionTabsSnapshot } from './web-runtime-session-snapshot'
+import type {
+  CreatedAgentTerminalIdentity,
+  CreatedWebRuntimeSessionTerminal,
+  CreateWebRuntimeSessionTerminalArgs
+} from './web-runtime-session-types'
+import {
+  readActiveWorkspaceSelection,
+  restoreActiveWorkspaceSelection,
+  selectWebRuntimeSessionWorktree,
+  type WebRuntimeSessionWorkspaceSelectionRollback
+} from './web-runtime-session-workspace-selection'
+import { createdTerminalLeafId } from './web-runtime-terminal-identity'
+import { settleWebRuntimeTerminalPlacement } from './web-runtime-terminal-placement-settlement'
+
+export async function createWebRuntimeSessionTerminalResult(
+  args: CreateWebRuntimeSessionTerminalArgs
+): Promise<CreatedWebRuntimeSessionTerminal> {
+  const environmentId = resolveWebRuntimeSessionEnvironmentId(
+    args.environmentId,
+    useAppStore.getState().settings?.activeRuntimeEnvironmentId
+  )
+  if (!environmentId || !isWebRuntimeSessionActive(environmentId)) {
+    return {
+      outcome: {
+        status: 'failed',
+        message: translate(
+          'auto.runtime.webRuntimeSession.remoteHostDisconnected',
+          'The workspace is not connected to a remote Orca host.'
+        )
+      }
+    }
+  }
+  const intentOwner = captureWebSessionIntentOwner(environmentId)
+  const callEnvironment = captureRuntimeEnvironmentCall(environmentId, intentOwner.pairingRevision)
+
+  let workspaceSelectionRollback: WebRuntimeSessionWorkspaceSelectionRollback | null = null
+  if (args.selectWorktree !== false) {
+    const previous = readActiveWorkspaceSelection()
+    selectWebRuntimeSessionWorktree(args.worktreeId, environmentId)
+    workspaceSelectionRollback = {
+      previous,
+      applied: {
+        worktreeId: args.worktreeId,
+        executionHostId: toRuntimeExecutionHostId(environmentId)
+      }
+    }
+  }
+  let hostCreated = false
+  let createdTabId: string | undefined
+  let createdLeafId: string | undefined
+  try {
+    const agent = args.launchAgent ?? args.agent
+    const agentArgsOverride =
+      args.agentArgs !== undefined ? args.agentArgs : args.launchConfig?.agentArgs
+    if (agent) {
+      let legacyAlreadyPlacedInGroup = false
+      // Why: structured creation cannot yet express afterTabId; keep the exact legacy placement contract until it can.
+      // Why: focus belongs to the paired client; a headless execution host has no renderer to focus.
+      const hostAuthority = args.afterTabId
+        ? undefined
+        : args.agentSessionKind === 'resume'
+          ? args.providerSession
+            ? async () =>
+                unwrapRuntimeRpcResult(
+                  (await callEnvironment({
+                    method: 'terminal.ensureAgentSession',
+                    params: {
+                      kind: 'explicit',
+                      worktree: toRuntimeWorktreeSelector(args.worktreeId),
+                      agent,
+                      providerSession: args.providerSession!,
+                      ...(args.launchConfig?.ompResumeFilePath
+                        ? { ompResumeFilePath: args.launchConfig.ompResumeFilePath }
+                        : {}),
+                      ...(agentArgsOverride !== undefined ? { agentArgs: agentArgsOverride } : {}),
+                      ...(args.launchPreferences
+                        ? { launchPreferences: args.launchPreferences }
+                        : {}),
+                      presentation: 'background'
+                    },
+                    timeoutMs: 15_000
+                  })) as RuntimeRpcResponse<RuntimeEnsureAgentSessionResult>
+                )
+            : undefined
+          : async () =>
+              await createAgentSessionCreateOperation().run(async (clientOperationId) =>
+                unwrapRuntimeRpcResult(
+                  (await callEnvironment({
+                    method: 'terminal.createAgentSession',
+                    params: withAgentSessionCreateOperationId(
+                      {
+                        worktree: toRuntimeWorktreeSelector(args.worktreeId),
+                        agent,
+                        ...(args.prompt ? { prompt: args.prompt } : {}),
+                        ...(args.promptDelivery ? { promptDelivery: args.promptDelivery } : {}),
+                        ...(agentArgsOverride !== undefined
+                          ? { agentArgs: agentArgsOverride }
+                          : {}),
+                        ...(args.launchPreferences
+                          ? { launchPreferences: args.launchPreferences }
+                          : {}),
+                        ...(args.cwd ? { startupCwd: args.cwd } : {}),
+                        ...(args.viewMode ? { viewMode: args.viewMode } : {}),
+                        presentation: 'background'
+                      },
+                      clientOperationId
+                    ),
+                    timeoutMs: 15_000
+                  })) as RuntimeRpcResponse<RuntimeCreateAgentSessionResult>
+                )
+              )
+      const resumeHostAuthorityCapability =
+        args.agentSessionKind === 'resume' ? agentResumeHostAuthorityCapability(agent) : undefined
+      const created = await runRemoteAgentSessionLaunch<{
+        terminal: CreatedAgentTerminalIdentity
+      }>({
+        environmentId,
+        ...(hostAuthority ? { hostAuthority } : {}),
+        ...(resumeHostAuthorityCapability
+          ? { hostAuthorityCapability: resumeHostAuthorityCapability }
+          : {}),
+        legacy: async () => {
+          const response = await callEnvironment({
+            method: 'session.tabs.createTerminal',
+            params: {
+              worktree: toRuntimeWorktreeSelector(args.worktreeId),
+              afterTabId: args.afterTabId ? toHostSessionTabId(args.afterTabId) : undefined,
+              targetGroupId: args.targetGroupId,
+              command: args.command,
+              cwd: args.cwd,
+              ...(args.env ? { env: args.env } : {}),
+              ...(args.envToDelete ? { envToDelete: args.envToDelete } : {}),
+              startupCommandDelivery: args.startupCommandDelivery,
+              ...(args.launchConfig ? { launchConfig: args.launchConfig } : {}),
+              ...(args.launchToken ? { launchToken: args.launchToken } : {}),
+              ...(args.agent ? { agent: args.agent } : {}),
+              ...(args.launchAgent ? { launchAgent: args.launchAgent } : {}),
+              ...(args.viewMode ? { viewMode: args.viewMode } : {}),
+              // Why: old hosts understand activate:false; new hosts use select/navigation for caller-local focus.
+              activate: false,
+              select: args.activate !== false,
+              navigation: 'caller'
+            },
+            timeoutMs: 15_000
+          })
+          const legacyCreated = unwrapRuntimeRpcResult(
+            response as RuntimeRpcResponse<RuntimeMobileSessionCreateTerminalResult>
+          )
+          legacyAlreadyPlacedInGroup = true
+          return {
+            terminal: {
+              tabId: legacyCreated.tab.id,
+              leafId: legacyCreated.tab.leafId
+            }
+          }
+        }
+      })
+      hostCreated = true
+      createdTabId = created.terminal.tabId
+      createdLeafId = legacyAlreadyPlacedInGroup
+        ? created.terminal.leafId
+        : createdTerminalLeafId(created.terminal)
+      if (args.targetGroupId && createdTabId && !legacyAlreadyPlacedInGroup) {
+        await callEnvironment({
+          method: 'session.tabs.move',
+          params: {
+            worktree: toRuntimeWorktreeSelector(args.worktreeId),
+            tabId: createdTabId,
+            targetGroupId: args.targetGroupId,
+            kind: 'move-to-group'
+          },
+          timeoutMs: 15_000
+        })
+      }
+    } else {
+      const response = await callEnvironment({
+        method: 'session.tabs.createTerminal',
+        params: {
+          worktree: toRuntimeWorktreeSelector(args.worktreeId),
+          afterTabId: args.afterTabId ? toHostSessionTabId(args.afterTabId) : undefined,
+          targetGroupId: args.targetGroupId,
+          command: args.command,
+          cwd: args.cwd,
+          ...(args.env ? { env: args.env } : {}),
+          ...(args.envToDelete ? { envToDelete: args.envToDelete } : {}),
+          startupCommandDelivery: args.startupCommandDelivery,
+          ...(args.launchConfig ? { launchConfig: args.launchConfig } : {}),
+          ...(args.launchToken ? { launchToken: args.launchToken } : {}),
+          ...(args.viewMode ? { viewMode: args.viewMode } : {}),
+          // Why: old hosts understand activate:false; new hosts use select/navigation for caller-local focus.
+          activate: false,
+          select: args.activate !== false,
+          navigation: 'caller'
+        },
+        timeoutMs: 15_000
+      })
+      const created = unwrapRuntimeRpcResult(
+        response as RuntimeRpcResponse<RuntimeMobileSessionCreateTerminalResult>
+      )
+      hostCreated = true
+      createdTabId = created.tab.id
+      createdLeafId = created.tab.leafId
+    }
+    if (args.targetGroupId && createdTabId) {
+      // Why: the host drops client-minted group ids, so this client's own record is what
+      // lands the mirrored tab in the requested pane under client-owned placement.
+      recordWebSessionTerminalPlacement({
+        environmentId,
+        worktreeId: args.worktreeId,
+        hostTabId: webTerminalPlacementParentTabId(createdTabId),
+        groupId: args.targetGroupId
+      })
+    }
+    if (args.activate !== false && createdTabId && matchesWebSessionIntentOwner(intentOwner)) {
+      // Why: record focus intent so the reconcile follows the snapshot's active
+      // tab to THIS new terminal, instead of sticky-keeping the prior tab.
+      recordWebSessionFocusIntent(intentOwner, args.worktreeId, createdTabId, createdLeafId)
+    }
+    await refreshWebRuntimeSessionTabsSnapshot(environmentId, args.worktreeId, {
+      expectedEnvironmentPairingRevision: intentOwner.pairingRevision,
+      // Why: the publication can beat the RPC response; replay it once after caller intent exists.
+      acceptCurrentSnapshot:
+        Boolean(createdTabId) && (args.activate !== false || Boolean(args.targetGroupId)),
+      // Why: a placement record needs a post-create list; a deduped in-flight one can predate it.
+      ...(args.targetGroupId && createdTabId ? { afterCurrentInFlight: true } : {})
+    })
+    if (args.targetGroupId && createdTabId) {
+      await settleWebRuntimeTerminalPlacement(
+        environmentId,
+        args.worktreeId,
+        webTerminalPlacementParentTabId(createdTabId),
+        { groupId: args.targetGroupId, activate: args.activate !== false }
+      )
+    }
+    return {
+      outcome: { status: 'created' },
+      ...(createdTabId ? { hostTabId: createdTabId } : {})
+    }
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error)
+    console.warn(
+      hostCreated
+        ? '[web-runtime-session] terminal created but reconciliation failed:'
+        : '[web-runtime-session] failed to create terminal:',
+      message
+    )
+    if (createdTabId) {
+      // Why: a record that outlives the create flow could yank a user-dragged tab back later.
+      forgetWebSessionTerminalPlacement({
+        environmentId,
+        worktreeId: args.worktreeId,
+        hostTabId: webTerminalPlacementParentTabId(createdTabId)
+      })
+    }
+    if (!hostCreated && workspaceSelectionRollback) {
+      restoreActiveWorkspaceSelection(workspaceSelectionRollback)
+    }
+    // Why: once the host accepted creation, reporting failure invites the user
+    // to retry with a new operation ID and can duplicate a fresh agent.
+    return {
+      outcome: hostCreated ? { status: 'created' } : { status: 'failed', message },
+      ...(createdTabId ? { hostTabId: createdTabId } : {})
+    }
+  }
+}
diff --git a/src/renderer/src/runtime/web-runtime-terminal-creation.ts b/src/renderer/src/runtime/web-runtime-terminal-creation.ts
new file mode 100644
index 00000000000..c448051a7c8
--- /dev/null
+++ b/src/renderer/src/runtime/web-runtime-terminal-creation.ts
@@ -0,0 +1,65 @@
+import type { TuiAgent } from '../../../shared/tui-agent'
+import {
+  deliverLaunchPromptToAgentTab,
+  seedNativeChatLaunchDraftForAgentTab
+} from '../lib/agent-launch-prompt-delivery'
+import { createWebRuntimeSessionTerminalResult } from './web-runtime-terminal-create-operation'
+import { toWebTerminalSurfaceTabId } from './web-terminal-surface-id'
+import type {
+  CreateWebRuntimeSessionTerminalArgs,
+  WebRuntimeTerminalCreateOutcome
+} from './web-runtime-session-types'
+
+export async function createWebRuntimeSessionTerminal(
+  args: CreateWebRuntimeSessionTerminalArgs
+): Promise<WebRuntimeTerminalCreateOutcome> {
+  return (await createWebRuntimeSessionTerminalResult(args)).outcome
+}
+
+export async function createWebRuntimeAgentSessionTerminal(
+  args: CreateWebRuntimeSessionTerminalArgs & {
+    agent: TuiAgent
+    promptAfterReady: string
+    submitPrompt: boolean
+    forcePromptPaste: boolean
+  }
+): Promise<{
+  outcome: WebRuntimeTerminalCreateOutcome
+  promptDelivered: boolean
+}> {
+  const created = await createWebRuntimeSessionTerminalResult(args)
+  if (created.outcome.status === 'failed' || !created.hostTabId) {
+    return { outcome: created.outcome, promptDelivered: false }
+  }
+
+  const promptDelivered = await deliverLaunchPromptToAgentTab({
+    tabId: toWebTerminalSurfaceTabId(created.hostTabId),
+    content: args.promptAfterReady,
+    agent: args.agent,
+    submit: args.submitPrompt,
+    forcePaste: args.forcePromptPaste
+  })
+  return { outcome: created.outcome, promptDelivered }
+}
+
+/**
+ * Launch a web-host agent terminal whose draft already rode in on the launch
+ * command (argv prefill). No post-ready paste runs for that delivery, so seed
+ * the chat-composer copy here once the mirrored host tab id is known.
+ */
+export async function createWebRuntimeAgentSessionTerminalWithLaunchDraft(
+  args: CreateWebRuntimeSessionTerminalArgs & {
+    agent: TuiAgent
+    launchDraft: string
+  }
+): Promise<WebRuntimeTerminalCreateOutcome> {
+  const created = await createWebRuntimeSessionTerminalResult(args)
+  if (created.outcome.status !== 'failed' && created.hostTabId) {
+    seedNativeChatLaunchDraftForAgentTab({
+      tabId: toWebTerminalSurfaceTabId(created.hostTabId),
+      agent: args.agent,
+      text: args.launchDraft
+    })
+  }
+  return created.outcome
+}
diff --git a/src/renderer/src/runtime/web-runtime-terminal-identity.ts b/src/renderer/src/runtime/web-runtime-terminal-identity.ts
new file mode 100644
index 00000000000..755eb904c07
--- /dev/null
+++ b/src/renderer/src/runtime/web-runtime-terminal-identity.ts
@@ -0,0 +1,7 @@
+import { parsePaneKey } from '../../../shared/stable-pane-id'
+import type { CreatedAgentTerminalIdentity } from './web-runtime-session-types'
+
+export function createdTerminalLeafId(terminal: CreatedAgentTerminalIdentity): string | undefined {
+  const pane = parsePaneKey(terminal.paneKey ?? '')
+  return pane && pane.tabId === terminal.tabId ? pane.leafId : undefined
+}
diff --git a/src/renderer/src/runtime/web-runtime-terminal-placement-settlement.ts b/src/renderer/src/runtime/web-runtime-terminal-placement-settlement.ts
new file mode 100644
index 00000000000..50cbb551f97
--- /dev/null
+++ b/src/renderer/src/runtime/web-runtime-terminal-placement-settlement.ts
@@ -0,0 +1,38 @@
+import { useAppStore } from '../store'
+import { forgetWebSessionTerminalPlacement } from './web-session-terminal-placement'
+import { toWebTerminalSurfaceTabId } from './web-terminal-surface-id'
+
+/** Settle the placement once the mirrored tab exists (bounded poll), then consume the record. */
+export async function settleWebRuntimeTerminalPlacement(
+  environmentId: string,
+  worktreeId: string,
+  hostTabId: string,
+  placement: { groupId: string; activate: boolean }
+): Promise<void> {
+  const unifiedTabId = toWebTerminalSurfaceTabId(hostTabId)
+  const findTab = () =>
+    (useAppStore.getState().unifiedTabsByWorktree[worktreeId] ?? []).find(
+      (tab) => tab.id === unifiedTabId
+    )
+  try {
+    const deadline = Date.now() + 10_000
+    while (!findTab() && Date.now() < deadline) {
+      await new Promise((resolve) => setTimeout(resolve, 250))
+    }
+    const tab = findTab()
+    const state = useAppStore.getState()
+    const targetGroupExists = (state.groupsByWorktree[worktreeId] ?? []).some(
+      (group) => group.id === placement.groupId
+    )
+    if (tab && targetGroupExists && tab.groupId !== placement.groupId) {
+      // Why: a snapshot can adopt the tab before the record exists (the publication races the
+      // RPC response); repair through the same client-owned move a user drag takes.
+      state.moveUnifiedTabToGroup(unifiedTabId, placement.groupId, {
+        activate: placement.activate,
+        recordInteraction: false
+      })
+    }
+  } finally {
+    forgetWebSessionTerminalPlacement({ environmentId, worktreeId, hostTabId })
+  }
+}
diff --git a/src/renderer/src/runtime/web-runtime-worktree-activation.ts b/src/renderer/src/runtime/web-runtime-worktree-activation.ts
new file mode 100644
index 00000000000..e542283c53d
--- /dev/null
+++ b/src/renderer/src/runtime/web-runtime-worktree-activation.ts
@@ -0,0 +1,60 @@
+import type { RuntimeRpcResponse } from '../../../shared/runtime-rpc-envelope'
+import { useAppStore } from '../store'
+import { unwrapRuntimeRpcResult } from './runtime-rpc-client'
+import { toRuntimeWorktreeSelector } from './runtime-worktree-selector'
+import {
+  captureRuntimeEnvironmentCall,
+  captureWebSessionIntentOwner,
+  isWebRuntimeSessionActive
+} from './web-runtime-session-environment'
+import {
+  refreshWebRuntimeSessionTabsSnapshot,
+  scheduleRuntimeWorktreeRecoveryRefresh
+} from './web-runtime-session-snapshot'
+
+export async function activateWebRuntimeSessionWorktree(args: {
+  worktreeId: string
+  environmentId?: string | null
+}): Promise<boolean> {
+  const environmentId =
+    args.environmentId?.trim() ??
+    useAppStore.getState().settings?.activeRuntimeEnvironmentId?.trim() ??
+    null
+  if (!environmentId || !isWebRuntimeSessionActive(environmentId)) {
+    return false
+  }
+  const intentOwner = captureWebSessionIntentOwner(environmentId)
+  const callEnvironment = captureRuntimeEnvironmentCall(environmentId, intentOwner.pairingRevision)
+
+  try {
+    const response = await callEnvironment({
+      method: 'worktree.activate',
+      params: {
+        worktree: toRuntimeWorktreeSelector(args.worktreeId),
+        // Why: notifyClients:false keeps navigation local when this client reaches an older host.
+        notifyClients: false,
+        navigation: 'caller'
+      },
+      timeoutMs: 15_000
+    })
+    unwrapRuntimeRpcResult(response as RuntimeRpcResponse<unknown>)
+    // Why: a restarted HUB can recover its SSH pane after this client's subscription replayed an empty startup snapshot.
+    await refreshWebRuntimeSessionTabsSnapshot(environmentId, args.worktreeId, {
+      expectedEnvironmentPairingRevision: intentOwner.pairingRevision,
+      acceptCurrentSnapshot: true
+    })
+    // Why: HUB reachability can precede its nested SSH relay; bounded owner-scoped re-lists converge without asking the paired client to connect SSH itself.
+    scheduleRuntimeWorktreeRecoveryRefresh(
+      environmentId,
+      args.worktreeId,
+      intentOwner.pairingRevision
+    )
+    return true
+  } catch (error) {
+    console.warn(
+      '[web-runtime-session] failed to activate worktree:',
+      error instanceof Error ? error.message : String(error)
+    )
+    return false
+  }
+}
diff --git a/src/renderer/src/store/slices/browser.ts b/src/renderer/src/store/slices/browser.ts
index 21394e8ff36..21fc58ebee5 100644
--- a/src/renderer/src/store/slices/browser.ts
+++ b/src/renderer/src/store/slices/browser.ts
@@ -1326,8 +1326,8 @@ export const createBrowserSlice: StateCreator<AppState, [], [], BrowserSlice> =
         },
         browserTabsByWorktree: {
           ...s.browserTabsByWorktree,
-          [workspace.worktreeId]: (s.browserTabsByWorktree[workspace.worktreeId] ?? []).map((tab) =>
-            tab.id === workspaceId ? nextWorkspace : tab
+          [workspace.worktreeId]: (s.browserTabsByWorktree[workspace.worktreeId] ?? []).map(
+            (tab) => (tab.id === workspaceId ? nextWorkspace : tab)
           )
         },
         pendingAddressBarFocusByPageId: shouldFocusAddressBar
@@ -1409,8 +1409,8 @@ export const createBrowserSlice: StateCreator<AppState, [], [], BrowserSlice> =
         },
         browserTabsByWorktree: {
           ...s.browserTabsByWorktree,
-          [workspace.worktreeId]: (s.browserTabsByWorktree[workspace.worktreeId] ?? []).map((tab) =>
-            tab.id === workspace.id ? nextWorkspace : tab
+          [workspace.worktreeId]: (s.browserTabsByWorktree[workspace.worktreeId] ?? []).map(
+            (tab) => (tab.id === workspace.id ? nextWorkspace : tab)
           )
         },
         recentlyClosedBrowserPagesByWorkspace: {
@@ -1509,8 +1509,8 @@ export const createBrowserSlice: StateCreator<AppState, [], [], BrowserSlice> =
       return {
         browserTabsByWorktree: {
           ...s.browserTabsByWorktree,
-          [workspace.worktreeId]: (s.browserTabsByWorktree[workspace.worktreeId] ?? []).map((tab) =>
-            tab.id === workspaceId ? nextWorkspace : tab
+          [workspace.worktreeId]: (s.browserTabsByWorktree[workspace.worktreeId] ?? []).map(
+            (tab) => (tab.id === workspaceId ? nextWorkspace : tab)
           )
         }
       }
@@ -1707,8 +1707,8 @@ export const createBrowserSlice: StateCreator<AppState, [], [], BrowserSlice> =
       if (!browserWorkspaceMirrorFieldsEqual(workspace, nextWorkspace)) {
         nextState.browserTabsByWorktree = {
           ...s.browserTabsByWorktree,
-          [workspace.worktreeId]: (s.browserTabsByWorktree[workspace.worktreeId] ?? []).map((tab) =>
-            tab.id === workspace.id ? nextWorkspace : tab
+          [workspace.worktreeId]: (s.browserTabsByWorktree[workspace.worktreeId] ?? []).map(
+            (tab) => (tab.id === workspace.id ? nextWorkspace : tab)
           )
         }
       }
@@ -1804,8 +1804,8 @@ export const createBrowserSlice: StateCreator<AppState, [], [], BrowserSlice> =
         },
         browserTabsByWorktree: {
           ...s.browserTabsByWorktree,
-          [workspace.worktreeId]: (s.browserTabsByWorktree[workspace.worktreeId] ?? []).map((tab) =>
-            tab.id === workspace.id ? nextWorkspace : tab
+          [workspace.worktreeId]: (s.browserTabsByWorktree[workspace.worktreeId] ?? []).map(
+            (tab) => (tab.id === workspace.id ? nextWorkspace : tab)
           )
         },
         ...(shouldClearAnnotations
diff --git a/src/renderer/src/store/slices/worktrees/metadata/worktree-lineage-refresh.ts b/src/renderer/src/store/slices/worktrees/metadata/worktree-lineage-refresh.ts
index ae584253173..309f39603a1 100644
--- a/src/renderer/src/store/slices/worktrees/metadata/worktree-lineage-refresh.ts
+++ b/src/renderer/src/store/slices/worktrees/metadata/worktree-lineage-refresh.ts
@@ -49,7 +49,9 @@ export async function listWorktreeLineageForRuntime(
     lineage?: Record<string, WorktreeLineage>
     workspaceLineage?: Record<string, WorkspaceLineage>
   }
-  const normalizeLineageResponse = (value: Record<string, WorktreeLineage> | LineageListResponse) =>
+  const normalizeLineageResponse = (
+    value: Record<string, WorktreeLineage> | LineageListResponse
+  ) =>
     Object.hasOwn(value, 'lineage') || Object.hasOwn(value, 'workspaceLineage')
       ? {
           worktreeLineageById: (value as LineageListResponse).lineage ?? {},
diff --git a/src/renderer/src/web/web-preload-api-runtime-environment.test.ts b/src/renderer/src/web/web-preload-api-runtime-environment.test.ts
index 58ecb5e96c0..08167e2e140 100644
--- a/src/renderer/src/web/web-preload-api-runtime-environment.test.ts
+++ b/src/renderer/src/web/web-preload-api-runtime-environment.test.ts
@@ -528,14 +528,13 @@ describe('web runtime environment identity', () => {
 
   it('replaces API closures on reinstall while retaining the runtime client singleton', async () => {
     let clientCount = 0
-    const call = vi.fn(
-      (method: string): Promise<RuntimeRpcResponse<unknown>> =>
-        Promise.resolve({
-          id: method,
-          ok: true,
-          result: { method },
-          _meta: { runtimeId: 'runtime-a' }
-        })
+    const call = vi.fn((method: string): Promise<RuntimeRpcResponse<unknown>> =>
+      Promise.resolve({
+        id: method,
+        ok: true,
+        result: { method },
+        _meta: { runtimeId: 'runtime-a' }
+      })
     )
     vi.doMock('./web-runtime-client', () => ({
       WebRuntimeClient: class {
diff --git a/src/shared/child-process/__fixtures__/child-process-import-allowlist.txt b/src/shared/child-process/__fixtures__/child-process-import-allowlist.txt
index 874ab972787..42cfe12add2 100644
--- a/src/shared/child-process/__fixtures__/child-process-import-allowlist.txt
+++ b/src/shared/child-process/__fixtures__/child-process-import-allowlist.txt
@@ -20,6 +20,9 @@
 # The src/main/git/command-runner/* entries are the seven spawn sites that used
 # to live in the single line src/main/git/runner.ts; splitting that file moved
 # them, it did not add any.
+#
+# daemon-launched-child.ts holds daemon-init.ts's fork() site; splitting that
+# file moved the import, it did not add one.
 src/cli/handlers/account.ts
 src/cli/handlers/core.ts
 src/cli/handlers/interactive-login-interruption.ts
@@ -56,7 +59,7 @@ src/main/computer/macos-computer-use-permissions.ts
 src/main/computer/macos-native-provider-transport.ts
 src/main/computer/sidecar-client.ts
 src/main/daemon/daemon-bash-wrapper-osc133-fixture.ts
-src/main/daemon/daemon-init.ts
+src/main/daemon/daemon-launched-child.ts
 src/main/daemon/daemon-process-identity-query.ts
 src/main/daemon/daemon-process-inspection.ts
 src/main/daemon/daemon-process-start-time.ts
diff --git a/src/shared/constants.ts b/src/shared/constants.ts
index 15c47bdd968..96c7901cc08 100644
--- a/src/shared/constants.ts
+++ b/src/shared/constants.ts
@@ -83,16 +83,13 @@ export const getDefaultTerminalRightClickToPaste = (
   platform = typeof process !== 'undefined' ? process.platform : ''
 ): boolean => platform === 'win32'
 
-/** Why: ProseMirror renders the whole document — no virtualization — so opening
- *  one blocks the main thread for as long as it takes to build the DOM. Measured
- *  in a packaged build (M-series) on a doc with a code block every ~570 bytes,
- *  blocking mount / median keystroke: 300 KB 1.7 s / 59 ms · 600 KB 4.2 s / 201 ms
- *  · 900 KB 8.8 s / 431 ms. The same 300 KB as pure prose is 0.8 s / 16 ms, so
- *  node-view count drives the cost far more than byte size — but bytes are the
- *  only thing cheap enough to test before parsing. The blocking mount is what
- *  pins this ceiling; past it, fall back to source mode (Monaco) with a per-file
- *  "Open anyway" escape hatch. Real headroom needs #7056. */
-export const RICH_MARKDOWN_MAX_SIZE_BYTES = 300 * 1024
+/** Why: ProseMirror renders the whole document without virtualization. After the
+ *  parser/highlighter work in #17134/#17147/#17158, M-series Electron measurements
+ *  on distinct code blocks every ~600 bytes put visible mount / longest task at
+ *  300 KB 0.70 / 0.66 s · 450 KB 1.09 / 1.02 s · 600 KB 1.49 / 1.41 s, with
+ *  600 KB typing at 38 ms median / 39 ms p95. Bytes remain the only cheap
+ *  pre-parse guard; larger files use source mode with an "Open anyway" escape hatch. */
+export const RICH_MARKDOWN_MAX_SIZE_BYTES = 600 * 1024
 
 export const DEFAULT_EDITOR_AUTO_SAVE_DELAY_MS = 1000
 export const MIN_EDITOR_AUTO_SAVE_DELAY_MS = 250
diff --git a/src/shared/git-fetch-head-lock.test.ts b/src/shared/git-fetch-head-lock.test.ts
index bcf1e13a7fc..4133d8d373e 100644
--- a/src/shared/git-fetch-head-lock.test.ts
+++ b/src/shared/git-fetch-head-lock.test.ts
@@ -26,13 +26,15 @@ describe('runWithGitFetchHeadLock', () => {
     expect(resolveGitFetchHeadCommand(args, '/repo').needsLock).toBe(expected)
   })
 
+  // Why resolve() rather than a literal: the subject resolves these through path.resolve, so a
+  // POSIX literal asserts the separator of the machine running the suite instead of the behaviour.
   it('resolves -C and --git-dir before deriving the lock identity', () => {
     expect(resolveGitFetchHeadCommand(['-C', 'repo', 'fetch'], '/tmp')).toMatchObject({
-      cwd: '/tmp/repo',
+      cwd: path.resolve('/tmp', 'repo'),
       needsLock: true
     })
     expect(resolveGitFetchHeadCommand(['--git-dir=/repo/.git', 'fetch'], '/tmp')).toMatchObject({
-      gitDir: '/repo/.git',
+      gitDir: path.resolve('/tmp', '/repo/.git'),
       needsLock: true
     })
   })
diff --git a/src/shared/map-settled-with-concurrency.test.ts b/src/shared/map-settled-with-concurrency.test.ts
index 506d7a4d3e0..3127a31f852 100644
--- a/src/shared/map-settled-with-concurrency.test.ts
+++ b/src/shared/map-settled-with-concurrency.test.ts
@@ -24,11 +24,10 @@ describe('mapSettledWithConcurrency', () => {
 
     expect(peak).toBe(limit)
     expect(results).toEqual(
-      items.map(
-        (item): PromiseSettledResult<string> =>
-          item % 97 === 0
-            ? { status: 'rejected', reason: `rejected-${item}` }
-            : { status: 'fulfilled', value: `fulfilled-${item}` }
+      items.map((item): PromiseSettledResult<string> =>
+        item % 97 === 0
+          ? { status: 'rejected', reason: `rejected-${item}` }
+          : { status: 'fulfilled', value: `fulfilled-${item}` }
       )
     )
   })
diff --git a/src/shared/node-markdown-document-discovery.test.ts b/src/shared/node-markdown-document-discovery.test.ts
index e151f25ad90..9c5e1bdfd14 100644
--- a/src/shared/node-markdown-document-discovery.test.ts
+++ b/src/shared/node-markdown-document-discovery.test.ts
@@ -1,4 +1,5 @@
 import type { Dirent } from 'node:fs'
+import { join } from 'node:path'
 import { describe, expect, it } from 'vitest'
 import { MarkdownDocumentListingCapacityError } from './markdown-document-listing-limits'
 import { discoverMarkdownRelativePaths } from './node-markdown-document-discovery'
@@ -22,6 +23,8 @@ function reader(entriesByPath: Record<string, Dirent[]>) {
 
 describe('bounded Markdown document discovery', () => {
   it('preserves depth-first discovery and skips excluded and symlinked directories', async () => {
+    // Why join() for the child key: the subject descends with path.join, so a '/repo/docs'
+    // literal never matches on Windows and the walk silently stops at the root.
     const result = await discoverMarkdownRelativePaths('/repo', {
       readDirectory: reader({
         '/repo': [
@@ -30,7 +33,7 @@ describe('bounded Markdown document discovery', () => {
           entry('docs', 'directory'),
           entry('linked', 'symlink')
         ],
-        '/repo/docs': [entry('guide.mdx'), entry('app.ts')]
+        [join('/repo', 'docs')]: [entry('guide.mdx'), entry('app.ts')]
       }),
       shouldDescend: (_relativePath, name) => name !== '.git'
     })
@@ -65,7 +68,7 @@ describe('bounded Markdown document discovery', () => {
         limits: { maxDepth: 1 },
         readDirectory: reader({
           '/repo': [entry('one', 'directory')],
-          '/repo/one': [entry('two', 'directory')]
+          [join('/repo', 'one')]: [entry('two', 'directory')]
         }),
         shouldDescend: () => true
       })
diff --git a/src/shared/pane-agent-identity-inventory.test.ts b/src/shared/pane-agent-identity-inventory.test.ts
index 0bd70cba10d..f2f79203041 100644
--- a/src/shared/pane-agent-identity-inventory.test.ts
+++ b/src/shared/pane-agent-identity-inventory.test.ts
@@ -272,7 +272,7 @@ const DIRECT_SINGLE_SOURCE_SURFACES: readonly {
     marker: 'isCursorAgentTitle'
   },
   {
-    path: 'src/main/providers/local-pty-provider.ts',
+    path: 'src/main/providers/local-pty-session-activation.ts',
     classification: 'action-consumer',
     marker: 'launchAgent'
   },
diff --git a/src/shared/priority-semaphore.test.ts b/src/shared/priority-semaphore.test.ts
index 035e3ca920d..aeeacda94ef 100644
--- a/src/shared/priority-semaphore.test.ts
+++ b/src/shared/priority-semaphore.test.ts
@@ -145,4 +145,19 @@ describe('PrioritySemaphore', () => {
     const r2 = await sem.acquire(0)
     r2()
   })
+
+  it('removes an aborted waiter without consuming the next permit', async () => {
+    const sem = new PrioritySemaphore(1)
+    const release = await sem.acquire(0)
+    const controller = new AbortController()
+    const reason = new Error('canceled')
+    const waiting = sem.acquire(0, controller.signal)
+
+    controller.abort(reason)
+    await expect(waiting).rejects.toBe(reason)
+    release()
+
+    const nextRelease = await sem.acquire(0)
+    nextRelease()
+  })
 })
diff --git a/src/shared/priority-semaphore.ts b/src/shared/priority-semaphore.ts
index 4d31726937d..b7a0a50e06c 100644
--- a/src/shared/priority-semaphore.ts
+++ b/src/shared/priority-semaphore.ts
@@ -1,6 +1,8 @@
 type Waiter = {
   priority: number
   resolve: (release: () => void) => void
+  signal?: AbortSignal
+  onAbort?: () => void
 }
 
 export class PrioritySemaphore {
@@ -11,7 +13,10 @@ export class PrioritySemaphore {
     this.available = concurrency
   }
 
-  acquire(priority: number): Promise<() => void> {
+  acquire(priority: number, signal?: AbortSignal): Promise<() => void> {
+    if (signal?.aborted) {
+      return Promise.reject(signal.reason)
+    }
     if (this.available > 0) {
       this.available--
       let released = false
@@ -24,8 +29,20 @@ export class PrioritySemaphore {
       })
     }
 
-    return new Promise<() => void>((resolve) => {
-      this.waiters.push({ priority, resolve })
+    return new Promise<() => void>((resolve, reject) => {
+      const waiter: Waiter = { priority, resolve, signal }
+      if (signal) {
+        waiter.onAbort = () => {
+          const index = this.waiters.indexOf(waiter)
+          if (index === -1) {
+            return
+          }
+          this.waiters.splice(index, 1)
+          reject(signal.reason)
+        }
+        signal.addEventListener('abort', waiter.onAbort, { once: true })
+      }
+      this.waiters.push(waiter)
     })
   }
 
@@ -45,6 +62,9 @@ export class PrioritySemaphore {
     }
 
     const waiter = this.waiters.splice(bestIdx, 1)[0]
+    if (waiter.signal && waiter.onAbort) {
+      waiter.signal.removeEventListener('abort', waiter.onAbort)
+    }
     let released = false
     waiter.resolve(() => {
       if (released) {
diff --git a/src/shared/raster-image-dimensions.test.ts b/src/shared/raster-image-dimensions.test.ts
index 1a517a82791..d6e5e3ad3b5 100644
--- a/src/shared/raster-image-dimensions.test.ts
+++ b/src/shared/raster-image-dimensions.test.ts
@@ -28,7 +28,7 @@ function jpegWithMetadata(
   extraSegments = 0
 ): Buffer {
   const parts = [Buffer.from([0xff, 0xd8])]
-  for (let written = 0; written < metadataBytes; ) {
+  for (let written = 0; written < metadataBytes;) {
     // A JPEG segment length field is 16 bits, so real files chain many segments to carry a profile.
     const size = Math.min(65_533, metadataBytes - written)
     const header = Buffer.alloc(4)
diff --git a/src/shared/telemetry-app-event-schemas.ts b/src/shared/telemetry-app-event-schemas.ts
new file mode 100644
index 00000000000..888eb389046
--- /dev/null
+++ b/src/shared/telemetry-app-event-schemas.ts
@@ -0,0 +1,134 @@
+import { z } from 'zod'
+import { appStarSourceSchema } from './gh-star-source'
+import {
+  FEATURE_INTERACTION_CATEGORIES,
+  FEATURE_INTERACTION_IDS,
+  FEATURE_INTERACTION_USAGE_BUCKETS,
+  getFeatureInteractionCategory
+} from './feature-interactions'
+import {
+  starNagAgentBucketSchema,
+  starNagOutcomeSchema,
+  starNagPromptModeSchema,
+  starNagPromptSourceSchema
+} from './star-nag-telemetry'
+import {
+  agentKindSchema,
+  errorClassSchema,
+  launchSourceSchema,
+  repoMethodSchema,
+  requestKindSchema,
+  workspaceSourceSchema
+} from './telemetry-property-schemas'
+
+// ── Per-event schemas ───────────────────────────────────────────────────
+
+// Cohort signal (repo count at emit time); `.optional()` lets a fail-soft `undefined` validate. See docs/onboarding-funnel-cohort-addendum.md.
+export const nthRepoAddedSchema = z.number().int().nonnegative().optional()
+
+export const appOpenedSchema = z.object({ nth_repo_added: nthRepoAddedSchema }).strict()
+
+export const featureInteractionIdSchema = z.enum(FEATURE_INTERACTION_IDS)
+export const featureInteractionCategorySchema = z.enum(FEATURE_INTERACTION_CATEGORIES)
+export const featureInteractionUsageBucketSchema = z.enum(FEATURE_INTERACTION_USAGE_BUCKETS)
+export const featureInteractionUsageBucketSourceSchema = z.enum([
+  'crossed_now',
+  'observed_existing'
+])
+export const featureInteractionUsageBucketReachedSchema = z
+  .object({
+    feature_id: featureInteractionIdSchema,
+    feature_category: featureInteractionCategorySchema,
+    count_bucket: featureInteractionUsageBucketSchema,
+    bucket_source: featureInteractionUsageBucketSourceSchema,
+    nth_repo_added: nthRepoAddedSchema
+  })
+  .strict()
+  .refine((value) => getFeatureInteractionCategory(value.feature_id) === value.feature_category, {
+    message: 'feature_category must match feature_id',
+    path: ['feature_category']
+  })
+
+export const repoAddedSchema = z
+  // Why: `.optional()` so paths that can't detect git-ness validate cleanly; never default-guess `false` — omit instead.
+  .object({
+    method: repoMethodSchema,
+    is_git_repo: z.boolean().optional(),
+    nth_repo_added: nthRepoAddedSchema
+  })
+  .strict()
+
+export const appStarredOrcaSchema = z
+  .object({
+    source: appStarSourceSchema,
+    nth_repo_added: nthRepoAddedSchema
+  })
+  .strict()
+
+export const starNagOutcomeEventSchema = z
+  .object({
+    outcome: starNagOutcomeSchema,
+    source: starNagPromptSourceSchema,
+    mode: starNagPromptModeSchema,
+    threshold: z.number().int().positive(),
+    agents_since_baseline: z.number().int().nonnegative(),
+    agents_since_baseline_bucket: starNagAgentBucketSchema,
+    nth_repo_added: nthRepoAddedSchema,
+    next_threshold: z.number().int().positive().optional(),
+    cooldown_days: z.number().int().positive().optional()
+  })
+  .strict()
+  .refine(
+    (payload) =>
+      payload.next_threshold === undefined ||
+      payload.outcome === 'dismissed' ||
+      payload.outcome === 'later',
+    {
+      message: 'next_threshold is only valid for later or dismissed outcomes',
+      path: ['next_threshold']
+    }
+  )
+  .refine(
+    (payload) =>
+      payload.cooldown_days === undefined ||
+      payload.outcome === 'later' ||
+      payload.outcome === 'dismissed',
+    {
+      message: 'cooldown_days is only valid for later or dismissed outcomes',
+      path: ['cooldown_days']
+    }
+  )
+
+export const workspaceCreatedSchema = z
+  .object({
+    source: workspaceSourceSchema,
+    from_existing_branch: z.boolean(),
+    nth_repo_added: nthRepoAddedSchema
+  })
+  .strict()
+
+export const agentStartedSchema = z
+  .object({
+    agent_kind: agentKindSchema,
+    launch_source: launchSourceSchema,
+    request_kind: requestKindSchema,
+    nth_repo_added: nthRepoAddedSchema
+  })
+  .strict()
+export const agentPromptSentSchema = z
+  .object({
+    agent_kind: agentKindSchema,
+    launch_source: launchSourceSchema,
+    request_kind: requestKindSchema,
+    nth_repo_added: nthRepoAddedSchema
+  })
+  .strict()
+
+// Enum-only by design: `.strict()` blocks `error_message`/`error_stack`, keeping raw user/path content off the wire.
+export const agentErrorSchema = z
+  .object({
+    error_class: errorClassSchema,
+    agent_kind: agentKindSchema,
+    nth_repo_added: nthRepoAddedSchema
+  })
+  .strict()
diff --git a/src/shared/telemetry-daemon-event-schemas.ts b/src/shared/telemetry-daemon-event-schemas.ts
new file mode 100644
index 00000000000..a0543d4d49b
--- /dev/null
+++ b/src/shared/telemetry-daemon-event-schemas.ts
@@ -0,0 +1,174 @@
+import { z } from 'zod'
+import { AGENT_HOOK_TARGETS } from './agent-hook-types'
+import {
+  DAEMON_LIFECYCLE_SESSION_BUCKETS,
+  DAEMON_LIFECYCLE_TRANSITIONS,
+  DAEMON_REPLACE_REASONS,
+  DAEMON_RETIRE_REASONS
+} from './daemon-lifecycle-telemetry'
+import {
+  DAEMON_AUDIT_GENERATION_ROLE_VALUES,
+  DAEMON_AUDIT_PROCESS_REASON_VALUES,
+  DAEMON_AUDIT_REASON_VALUES,
+  DAEMON_AUDIT_STATE_VALUES,
+  DAEMON_AUDIT_TRIGGER_VALUES,
+  DAEMON_EVIDENCE_SOURCE_VALUES
+} from './daemon-audit-eligibility'
+import { errorClassSchema, settingsChangedKeySchema } from './telemetry-property-schemas'
+
+// Why: daemon start-failure signal (fleet-wide outage like v1.4.129-rc.1); enum-only so raw stderr never reaches the wire.
+export const daemonStartFailedSchema = z.object({ error_class: errorClassSchema }).strict()
+
+export const runtimeRpcStartErrorClassSchema = z.enum([
+  'permission_denied',
+  'address_in_use',
+  'storage_unavailable',
+  'invalid_path',
+  'unknown'
+])
+export type RuntimeRpcStartErrorClass = z.infer<typeof runtimeRpcStartErrorClassSchema>
+
+// Why: runtime discovery failures can contain user paths; keep telemetry to closed filesystem/socket categories.
+export const runtimeRpcStartFailedSchema = z
+  .object({ error_class: runtimeRpcStartErrorClassSchema })
+  .strict()
+
+// Why: classify session-killing 1013 closures as producer size failures or queue backpressure.
+export const remoteOutboundBudgetCloseSchema = z
+  .object({ emitter: z.enum(['size', 'queue']) })
+  .strict()
+
+// Why: a deadlocked main thread never crashes, so it produces no crash report and no user report
+// beyond "it froze" — incidence has been unmeasurable. `self_recovered` splits stalls that cleared
+// from ones that never did, which is the number that decides whether auto-recovery is ever safe to
+// build: every self-recovered stall is a kill that design would have gotten wrong. `unresponsive_ms`
+// is the observed silence, kept raw so the 45s threshold can be calibrated against real tails.
+export const mainThreadHangDetectedSchema = z
+  .object({
+    unresponsive_ms: z.number().int().nonnegative(),
+    self_recovered: z.boolean()
+  })
+  .strict()
+
+// Why: daemon replace/retire lifecycle signal — issue #7936 was undiagnosable without asking a user for daemon.log.
+// Enum-only + bucketed session count so no paths, raw versions, or exact counts reach the wire.
+// The union keeps each reason pinned to its transition, so a death can't be reported as a replace.
+export const daemonLifecycleSchema = z.discriminatedUnion('transition', [
+  z
+    .object({
+      transition: z.literal(DAEMON_LIFECYCLE_TRANSITIONS[0]),
+      reason: z.enum(DAEMON_REPLACE_REASONS),
+      live_session_count_bucket: z.enum(DAEMON_LIFECYCLE_SESSION_BUCKETS)
+    })
+    .strict(),
+  z
+    .object({
+      transition: z.literal(DAEMON_LIFECYCLE_TRANSITIONS[1]),
+      reason: z.enum(DAEMON_RETIRE_REASONS),
+      live_session_count_bucket: z.enum(DAEMON_LIFECYCLE_SESSION_BUCKETS)
+    })
+    .strict()
+])
+
+export const daemonAuditEligibilityBaseSchema = z.object({
+  state: z.enum(DAEMON_AUDIT_STATE_VALUES),
+  reason: z.enum(DAEMON_AUDIT_REASON_VALUES),
+  trigger: z.enum(DAEMON_AUDIT_TRIGGER_VALUES),
+  evidence_sources: z.array(z.enum(DAEMON_EVIDENCE_SOURCE_VALUES)).min(1).max(12),
+  protocol_generation: z.number().int().positive().max(1_000),
+  generation_role: z.enum(DAEMON_AUDIT_GENERATION_ROLE_VALUES),
+  provider: z.literal('local-daemon'),
+  endpoint_kind: z.enum(['unix-socket', 'windows-named-pipe']),
+  profile_scope: z.enum(['configured', 'unspecified']),
+  reachability: z.enum(['authenticated', 'disconnected', 'unknown']),
+  inventory_authority: z.enum(['authoritative', 'unavailable']),
+  process_liveness: z.enum(['present', 'gone', 'unknown']),
+  process_reason: z.enum(DAEMON_AUDIT_PROCESS_REASON_VALUES).nullable(),
+  endpoint_state: z.enum(['missing', 'named-pipe', 'non-socket', 'socket', 'unknown'])
+})
+
+export const daemonAuditEligibilitySchema = z.discriminatedUnion('exact_incarnation', [
+  daemonAuditEligibilityBaseSchema
+    .extend({
+      exact_incarnation: z.literal('endpoint-identity'),
+      exact_incarnation_correlation: z.string().regex(/^v1:[0-9a-f]{32}$/)
+    })
+    .strict(),
+  daemonAuditEligibilityBaseSchema
+    .extend({
+      exact_incarnation: z.literal('endpoint-identity-linux-ticks'),
+      exact_incarnation_correlation: z.string().regex(/^v1:[0-9a-f]{32}$/)
+    })
+    .strict(),
+  daemonAuditEligibilityBaseSchema.extend({ exact_incarnation: z.literal('unavailable') }).strict()
+])
+
+// Rollout signal for granting Codex hook trust via codex app-server RPCs
+// instead of Orca's self-computed trusted_hash. `fallback`/`verify_failed`
+// spikes mean the RPC lane is not taking; steady-state ledger skips are not
+// reported (they would only measure launch volume). `lane` attributes the
+// grant surface (real ~/.codex vs managed home); `error_class`/`verify_class`
+// are closed classifications so `error` fallbacks are diagnosable in the
+// field — e.g. `binary-missing` = codex CLI absent, no rollout impact.
+export const codexTrustGrantSchema = z
+  .object({
+    outcome: z.enum(['granted', 'fallback', 'verify_failed']),
+    host_kind: z.enum(['native', 'wsl']),
+    lane: z.enum(['real-home', 'managed']),
+    fallback_reason: z
+      .enum([
+        'disabled',
+        'no-managed-entries',
+        'unsupported',
+        'unsupported-cached',
+        'verify-failed',
+        'retry-cached',
+        'error'
+      ])
+      .optional(),
+    error_class: z
+      .enum(['binary-missing', 'timeout', 'entry-failed', 'early-exit', 'rpc-failed', 'unexpected'])
+      .optional(),
+    verify_class: z
+      .enum([
+        'list-mismatch',
+        'post-grant-untrusted',
+        'post-grant-mismatch',
+        'unexpected-key',
+        'duplicate-key',
+        'coverage'
+      ])
+      .optional()
+  })
+  .strict()
+
+export const settingsChangedSchema = z
+  .object({
+    setting_key: settingsChangedKeySchema,
+    value_kind: z.enum(['bool', 'enum'])
+  })
+  .strict()
+
+// Managed-hook installer label from `AGENT_HOOK_TARGETS`, distinct from `AGENT_KIND_VALUES`; `claude` (not `claude-code`) is intentional.
+export const hookInstallAgentSchema = z.enum(AGENT_HOOK_TARGETS)
+export type HookInstallAgent = z.infer<typeof hookInstallAgentSchema>
+
+// Why: config-shape errors (not user content); callers must truncate before `track` — `.max(200)` drops overlength strings.
+export const agentHookInstallFailedSchema = z
+  .object({
+    agent: hookInstallAgentSchema,
+    error_message: z.string().max(200)
+  })
+  .strict()
+
+// Why: regression signal for paneKey attribution — a hook event that can't route to a pane. See docs/cli-terminal-hook-pane-key.md.
+export const agentHookUnattributedSchema = z
+  .object({ reason: z.enum(['empty_pane_key', 'unknown_tab_id']) })
+  .strict()
+
+// Why (#11217): loopback hook POSTs reset mid-body by local security software kill agent status for
+// every runtime at once. Count only — the truncated bodies carry user prompts and tool I/O, so
+// nothing derived from them may reach the wire.
+export const agentHookTransportBlockedSchema = z
+  .object({ count: z.number().int().nonnegative() })
+  .strict()
diff --git a/src/shared/telemetry-event-classification.ts b/src/shared/telemetry-event-classification.ts
new file mode 100644
index 00000000000..23b471fd4f5
--- /dev/null
+++ b/src/shared/telemetry-event-classification.ts
@@ -0,0 +1,135 @@
+import { z } from 'zod'
+
+import { eventSchemas } from './telemetry-event-registry'
+import type { cohortSchema } from './telemetry-onboarding-foundation-schemas'
+
+export type EventMap = { [N in keyof typeof eventSchemas]: z.infer<(typeof eventSchemas)[N]> }
+export type EventName = keyof EventMap
+export type EventProps<N extends EventName> = EventMap[N]
+
+// Why: non-`ZodObject` schemas have no `.shape`; return null so `key in undefined` can't throw at module load.
+function eventSchemaShape(schema: z.ZodTypeAny): z.ZodRawShape | null {
+  if (schema instanceof z.ZodObject) {
+    return schema.shape
+  }
+
+  const shapeBearingSchema = schema as { shape?: unknown }
+  // Why: refined object schemas may expose `.shape` even when refinement breaks `instanceof ZodObject`.
+  if (shapeBearingSchema.shape && typeof shapeBearingSchema.shape === 'object') {
+    return shapeBearingSchema.shape as z.ZodRawShape
+  }
+  return null
+}
+
+function eventsWithShapeKey(key: string): ReadonlySet<EventName> {
+  return new Set(
+    (Object.entries(eventSchemas) as [EventName, z.ZodTypeAny][])
+      .filter(([, schema]) => {
+        const shape = eventSchemaShape(schema)
+        return shape !== null && key in shape
+      })
+      .map(([name]) => name)
+  )
+}
+
+// Cohort injection is gated on this derived set because `.strict()` schemas drop events that don't declare `nth_repo_added`.
+const COHORT_EXTENDED_SET = eventsWithShapeKey('nth_repo_added')
+
+// Compile-time roster guarding the runtime injection set against silent schema drift.
+type _CohortExtendedRoster =
+  | 'app_opened'
+  | 'app_starred_orca'
+  | 'star_nag_outcome'
+  | 'feature_interaction_usage_bucket_reached'
+  | 'repo_added'
+  | 'add_repo_setup_step_action'
+  | 'add_repo_existing_workspaces_detected'
+  | 'add_repo_default_checkout_handoff'
+  | 'add_repo_nested_scan_result'
+  | 'add_repo_nested_import_action'
+  | 'add_repo_nested_import_result'
+  | 'workspace_created'
+  | 'workspace_create_failed'
+  | 'setup_script_prompt_shown'
+  | 'setup_script_prompt_action'
+  | 'agent_started'
+  | 'agent_prompt_sent'
+  | 'agent_error'
+  | 'orca_cli_feature_tip_shown'
+  | 'orca_cli_feature_tip_setup_clicked'
+  | 'orca_cli_feature_tip_setup_result'
+  | 'cmd_j_palette_feature_tip_shown'
+  | 'cmd_j_palette_feature_tip_acknowledged'
+// Why: strict empty payloads infer a string index signature; ignore index-only keys so they aren't pulled into keyed rosters.
+type _KnownPayloadKeys<T> = string extends keyof T ? never : keyof T
+type _DerivedCohortExtendedEvents = {
+  [N in EventName]: 'nth_repo_added' extends _KnownPayloadKeys<EventMap[N]> ? N : never
+}[EventName]
+type _CohortExtendedRosterSync = _CohortExtendedRoster extends _DerivedCohortExtendedEvents
+  ? _DerivedCohortExtendedEvents extends _CohortExtendedRoster
+    ? true
+    : never
+  : never
+const _cohortExtendedRosterSyncCheck: _CohortExtendedRosterSync = true
+void _cohortExtendedRosterSyncCheck
+
+export function isCohortExtendedEvent(name: EventName): boolean {
+  return COHORT_EXTENDED_SET.has(name)
+}
+
+// Events whose schema declares `cohort`: the IPC handler injects cohort only for these — a `.strict()` schema without it would reject the event.
+const ONBOARDING_COHORT_SET = eventsWithShapeKey('cohort')
+// `NonNullable` strips `undefined` introduced by `cohortSchema`'s `.optional()`.
+export type OnboardingCohort = NonNullable<z.infer<typeof cohortSchema>>
+
+// Compile-time roster: dropping `cohort` from any of these fails tsc, rather than silently at runtime (`.optional()` would tolerate that).
+type _OnboardingCohortRoster =
+  | 'onboarding_started'
+  | 'onboarding_step_viewed'
+  | 'onboarding_step_completed'
+  | 'onboarding_step_skipped'
+  | 'onboarding_tour_outcome'
+  | 'onboarding_step4_path_clicked'
+  | 'onboarding_step4_path_failed'
+  | 'onboarding_task_sources_snapshot'
+  | 'onboarding_windows_terminal_snapshot'
+  | 'onboarding_completed'
+  | 'onboarding_dismissed'
+  | 'onboarding_agent_picked'
+  | 'onboarding_ghostty_discovered'
+  | 'onboarding_ghostty_import_clicked'
+  | 'onboarding_ghostty_import_failed'
+  | 'onboarding_feature_setup_toggled'
+  | 'onboarding_feature_setup_run'
+  | 'onboarding_feature_setup_terminal_opened'
+  | 'onboarding_feature_setup_terminal_interacted'
+type _DerivedOnboardingCohortEvents = {
+  [N in EventName]: 'cohort' extends _KnownPayloadKeys<EventMap[N]> ? N : never
+}[EventName]
+type _OnboardingCohortRosterSync = _OnboardingCohortRoster extends _DerivedOnboardingCohortEvents
+  ? _DerivedOnboardingCohortEvents extends _OnboardingCohortRoster
+    ? true
+    : never
+  : never
+const _onboardingCohortRosterSyncCheck: _OnboardingCohortRosterSync = true
+void _onboardingCohortRosterSyncCheck
+
+export function isOnboardingEvent(name: EventName): boolean {
+  return ONBOARDING_COHORT_SET.has(name)
+}
+
+// No `env` discriminator: every transmitted event is from an official CI build (dev/contributor builds only console-mirror).
+// The per-field `.max(64)` is the validator's string-length cap — there is no separate post-parse length check.
+export const commonPropsSchema = z
+  .object({
+    app_version: z.string().max(64),
+    platform: z.string().max(64),
+    arch: z.string().max(64),
+    os_release: z.string().max(64),
+    // `.min(1)`: an empty install_id/session_id would collapse unrelated events into one synthetic user/session, corrupting analytics.
+    install_id: z.string().min(1).max(64),
+    session_id: z.string().min(1).max(64),
+    orca_channel: z.enum(['stable', 'rc'])
+  })
+  .strict()
+export type CommonProps = z.infer<typeof commonPropsSchema>
diff --git a/src/shared/telemetry-event-registry.ts b/src/shared/telemetry-event-registry.ts
new file mode 100644
index 00000000000..29479f363cb
--- /dev/null
+++ b/src/shared/telemetry-event-registry.ts
@@ -0,0 +1,193 @@
+import {
+  agentErrorSchema,
+  agentPromptSentSchema,
+  agentStartedSchema,
+  appOpenedSchema,
+  appStarredOrcaSchema,
+  featureInteractionUsageBucketReachedSchema,
+  repoAddedSchema,
+  starNagOutcomeEventSchema,
+  workspaceCreatedSchema
+} from './telemetry-app-event-schemas'
+import {
+  agentHookInstallFailedSchema,
+  agentHookTransportBlockedSchema,
+  agentHookUnattributedSchema,
+  codexTrustGrantSchema,
+  daemonAuditEligibilitySchema,
+  daemonLifecycleSchema,
+  daemonStartFailedSchema,
+  mainThreadHangDetectedSchema,
+  remoteOutboundBudgetCloseSchema,
+  runtimeRpcStartFailedSchema,
+  settingsChangedSchema
+} from './telemetry-daemon-event-schemas'
+import {
+  contextualTourOutcomeSchema,
+  contextualTourShownSchema,
+  directSshReconnectOperationSchema,
+  editorExternalChangeConflictActionSchema,
+  editorExternalChangeConflictShownSchema,
+  setupGuideClosedSchema,
+  setupGuideOpenedSchema,
+  setupGuideStepCompletedSchema,
+  terminalPaneSplitSchema
+} from './telemetry-feature-education-event-schemas'
+import {
+  cmdJPaletteFeatureTipAcknowledgedSchema,
+  cmdJPaletteFeatureTipShownSchema,
+  featureWallClosedSchema,
+  featureWallDocsClickedSchema,
+  featureWallFeatureSelectedSchema,
+  featureWallGroupSelectedSchema,
+  featureWallOpenedSchema,
+  featureWallTileClickedSchema,
+  featureWallTileFocusedSchema,
+  nativeChatMessageSentSchema,
+  nativeChatPickerItemAcceptedSchema,
+  nativeChatPickerOpenedSchema,
+  nativeChatSendClassifiedSchema,
+  nativeChatSkillDiscoverySchema,
+  nativeChatToggledSchema,
+  orcaCliFeatureTipSetupClickedSchema,
+  orcaCliFeatureTipSetupResultSchema,
+  orcaCliFeatureTipShownSchema,
+  telemetryOptedInSchema,
+  telemetryOptedOutSchema
+} from './telemetry-native-feature-event-schemas'
+import {
+  activationChecklistItemCompletedSchema,
+  onboardingAgentPickedSchema,
+  onboardingCompletedSchema,
+  onboardingDismissedSchema,
+  onboardingFeatureSetupRunSchema,
+  onboardingFeatureSetupTerminalInteractedSchema,
+  onboardingFeatureSetupTerminalOpenedSchema,
+  onboardingFeatureSetupToggledSchema,
+  onboardingGhosttyDiscoveredSchema,
+  onboardingGhosttyImportClickedSchema,
+  onboardingGhosttyImportFailedSchema,
+  onboardingStartedSchema,
+  onboardingStep4PathClickedSchema,
+  onboardingStep4PathFailedSchema,
+  onboardingStepCompletedSchema,
+  onboardingStepSkippedSchema,
+  onboardingStepViewedSchema,
+  onboardingTaskSourcesSnapshotSchema,
+  onboardingTourOutcomeEventSchema,
+  onboardingWindowsTerminalSnapshotSchema,
+  smartSortClass1PromotionSchema,
+  smartSortClassDistributionSchema,
+  smartToRecentSwitchSchema
+} from './telemetry-onboarding-event-schemas'
+import {
+  addRepoDefaultCheckoutHandoffSchema,
+  addRepoExistingWorkspacesDetectedSchema,
+  addRepoNestedImportActionSchema,
+  addRepoNestedImportResultSchema,
+  addRepoNestedScanResultSchema,
+  addRepoSetupStepActionEventSchema,
+  setupScriptPromptActionSchema,
+  setupScriptPromptShownSchema,
+  workspaceCreateFailedSchema
+} from './telemetry-repository-event-schemas'
+
+// ── Event registry: the one record the validator consumes ───────────────
+// Versioning: breaking changes (rename/re-mean/remove a key) need a new event name; in-place edits blend pre/post rows unmixably. Additive-optional fields are safe.
+export const eventSchemas = {
+  app_opened: appOpenedSchema,
+  app_starred_orca: appStarredOrcaSchema,
+  star_nag_outcome: starNagOutcomeEventSchema,
+  feature_interaction_usage_bucket_reached: featureInteractionUsageBucketReachedSchema,
+
+  repo_added: repoAddedSchema,
+  add_repo_setup_step_action: addRepoSetupStepActionEventSchema,
+  add_repo_existing_workspaces_detected: addRepoExistingWorkspacesDetectedSchema,
+  add_repo_default_checkout_handoff: addRepoDefaultCheckoutHandoffSchema,
+  add_repo_nested_scan_result: addRepoNestedScanResultSchema,
+  add_repo_nested_import_action: addRepoNestedImportActionSchema,
+  add_repo_nested_import_result: addRepoNestedImportResultSchema,
+  workspace_created: workspaceCreatedSchema,
+  workspace_create_failed: workspaceCreateFailedSchema,
+  setup_script_prompt_shown: setupScriptPromptShownSchema,
+  setup_script_prompt_action: setupScriptPromptActionSchema,
+
+  agent_started: agentStartedSchema,
+  agent_prompt_sent: agentPromptSentSchema,
+  agent_error: agentErrorSchema,
+  agent_hook_install_failed: agentHookInstallFailedSchema,
+  agent_hook_unattributed: agentHookUnattributedSchema,
+  agent_hook_transport_blocked: agentHookTransportBlockedSchema,
+
+  daemon_start_failed: daemonStartFailedSchema,
+  main_thread_hang_detected: mainThreadHangDetectedSchema,
+  daemon_lifecycle: daemonLifecycleSchema,
+  daemon_audit_eligibility: daemonAuditEligibilitySchema,
+  runtime_rpc_start_failed: runtimeRpcStartFailedSchema,
+  remote_outbound_budget_close: remoteOutboundBudgetCloseSchema,
+
+  codex_trust_grant: codexTrustGrantSchema,
+
+  settings_changed: settingsChangedSchema,
+
+  native_chat_toggled: nativeChatToggledSchema,
+  native_chat_message_sent: nativeChatMessageSentSchema,
+  native_chat_picker_opened: nativeChatPickerOpenedSchema,
+  native_chat_picker_item_accepted: nativeChatPickerItemAcceptedSchema,
+  native_chat_send_classified: nativeChatSendClassifiedSchema,
+  native_chat_skill_discovery: nativeChatSkillDiscoverySchema,
+
+  telemetry_opted_in: telemetryOptedInSchema,
+  telemetry_opted_out: telemetryOptedOutSchema,
+
+  orca_cli_feature_tip_shown: orcaCliFeatureTipShownSchema,
+  orca_cli_feature_tip_setup_clicked: orcaCliFeatureTipSetupClickedSchema,
+  orca_cli_feature_tip_setup_result: orcaCliFeatureTipSetupResultSchema,
+  cmd_j_palette_feature_tip_shown: cmdJPaletteFeatureTipShownSchema,
+  cmd_j_palette_feature_tip_acknowledged: cmdJPaletteFeatureTipAcknowledgedSchema,
+
+  feature_wall_opened: featureWallOpenedSchema,
+  feature_wall_closed: featureWallClosedSchema,
+  feature_wall_tile_focused: featureWallTileFocusedSchema,
+  feature_wall_tile_clicked: featureWallTileClickedSchema,
+  feature_wall_group_selected: featureWallGroupSelectedSchema,
+  feature_wall_feature_selected: featureWallFeatureSelectedSchema,
+  feature_wall_docs_clicked: featureWallDocsClickedSchema,
+
+  onboarding_started: onboardingStartedSchema,
+  onboarding_step_viewed: onboardingStepViewedSchema,
+  onboarding_step_completed: onboardingStepCompletedSchema,
+  onboarding_step_skipped: onboardingStepSkippedSchema,
+  onboarding_tour_outcome: onboardingTourOutcomeEventSchema,
+  onboarding_step4_path_clicked: onboardingStep4PathClickedSchema,
+  onboarding_step4_path_failed: onboardingStep4PathFailedSchema,
+  onboarding_task_sources_snapshot: onboardingTaskSourcesSnapshotSchema,
+  onboarding_windows_terminal_snapshot: onboardingWindowsTerminalSnapshotSchema,
+  onboarding_completed: onboardingCompletedSchema,
+  onboarding_dismissed: onboardingDismissedSchema,
+  onboarding_agent_picked: onboardingAgentPickedSchema,
+  onboarding_ghostty_discovered: onboardingGhosttyDiscoveredSchema,
+  onboarding_ghostty_import_clicked: onboardingGhosttyImportClickedSchema,
+  onboarding_ghostty_import_failed: onboardingGhosttyImportFailedSchema,
+  onboarding_feature_setup_toggled: onboardingFeatureSetupToggledSchema,
+  onboarding_feature_setup_run: onboardingFeatureSetupRunSchema,
+  onboarding_feature_setup_terminal_opened: onboardingFeatureSetupTerminalOpenedSchema,
+  onboarding_feature_setup_terminal_interacted: onboardingFeatureSetupTerminalInteractedSchema,
+  activation_checklist_item_completed: activationChecklistItemCompletedSchema,
+
+  contextual_tour_shown: contextualTourShownSchema,
+  contextual_tour_outcome: contextualTourOutcomeSchema,
+  setup_guide_opened: setupGuideOpenedSchema,
+  setup_guide_closed: setupGuideClosedSchema,
+  setup_guide_step_completed: setupGuideStepCompletedSchema,
+  terminal_pane_split: terminalPaneSplitSchema,
+
+  editor_external_change_conflict_shown: editorExternalChangeConflictShownSchema,
+  editor_external_change_conflict_action: editorExternalChangeConflictActionSchema,
+
+  direct_ssh_reconnect_operation: directSshReconnectOperationSchema,
+
+  smart_sort_class_distribution: smartSortClassDistributionSchema,
+  smart_sort_class_1_promotion: smartSortClass1PromotionSchema,
+  smart_to_recent_switch: smartToRecentSwitchSchema
+} as const
diff --git a/src/shared/telemetry-events.ts b/src/shared/telemetry-events.ts
index 9253d5d075d..c2cf9036dc0 100644
--- a/src/shared/telemetry-events.ts
+++ b/src/shared/telemetry-events.ts
@@ -1,1657 +1,68 @@
-/* eslint-disable max-lines -- Why: this is the single source of truth for every telemetry event schema, enum, and the cohort-injection set predicates. Splitting it would scatter the .strict() / Zod-first doctrine across files and break the EventMap derivation that makes adding an event a one-line change. */
 // Single source of truth for telemetry event names, schemas, and enums.
 // Zod-first: `EventMap` is `z.infer`-derived from the same `eventSchemas` record the runtime validator consumes — no parallel union to drift.
 // `.strict()` on every object schema is the runtime "no extra keys"; free-form strings carry an explicit `.max(N)` cap.
 
-import { z } from 'zod'
-import { FEATURE_WALL_MAX_DWELL_MS } from './feature-wall-telemetry'
-import { FEATURE_WALL_EXIT_ACTIONS, FEATURE_WALL_TOUR_DEPTH_STEPS } from './feature-wall-tour-depth'
-import {
-  CONTEXTUAL_TOUR_OUTCOMES,
-  FEATURE_EDUCATION_CONTEXTUAL_TOUR_IDS,
-  FEATURE_EDUCATION_SOURCES,
-  SETUP_GUIDE_CLOSE_OUTCOMES,
-  SETUP_GUIDE_SOURCES,
-  TERMINAL_PANE_SPLIT_SOURCES
-} from './feature-education-telemetry'
-import { FEATURE_WALL_SETUP_STEP_IDS } from './feature-wall-setup-steps'
-import {
-  FEATURE_INTERACTION_CATEGORIES,
-  FEATURE_INTERACTION_IDS,
-  FEATURE_INTERACTION_USAGE_BUCKETS,
-  getFeatureInteractionCategory
-} from './feature-interactions'
-import {
-  DAEMON_LIFECYCLE_SESSION_BUCKETS,
-  DAEMON_LIFECYCLE_TRANSITIONS,
-  DAEMON_REPLACE_REASONS,
-  DAEMON_RETIRE_REASONS
-} from './daemon-lifecycle-telemetry'
-import {
-  DAEMON_AUDIT_GENERATION_ROLE_VALUES,
-  DAEMON_AUDIT_PROCESS_REASON_VALUES,
-  DAEMON_AUDIT_REASON_VALUES,
-  DAEMON_AUDIT_STATE_VALUES,
-  DAEMON_AUDIT_TRIGGER_VALUES,
-  DAEMON_EVIDENCE_SOURCE_VALUES
-} from './daemon-audit-eligibility'
-import { SETUP_SCRIPT_IMPORT_PROVIDERS } from './setup-script-import-providers'
-import { WORKSPACE_SOURCE_VALUES, type WorkspaceSource } from './workspace-source'
-import { appStarSourceSchema } from './gh-star-source'
-import {
-  starNagAgentBucketSchema,
-  starNagOutcomeSchema,
-  starNagPromptModeSchema,
-  starNagPromptSourceSchema
-} from './star-nag-telemetry'
-import {
-  NESTED_REPO_COUNT_BUCKETS,
-  NESTED_REPO_IMPORT_ACTIONS,
-  NESTED_REPO_IMPORT_OUTCOMES,
-  NESTED_REPO_SCAN_RESULTS,
-  NESTED_REPO_TELEMETRY_MAX_REPO_COUNT,
-  NESTED_REPO_TELEMETRY_RUNTIME_KINDS,
-  NESTED_REPO_TELEMETRY_SURFACES,
-  bucketNestedRepoTelemetryCount
-} from './nested-repo-telemetry'
-
-import { AGENT_HOOK_TARGETS } from './agent-hook-types'
-import type { GlobalSettings } from './global-settings-types'
-import type { DiscoveryStatusEmitted, OnboardingChecklistState } from './onboarding-state-types'
-import type { PathSource, ShellHydrationFailureReason } from './shell-path-hydration-types'
-
-// ── Shared property enums ───────────────────────────────────────────────
-
-// Mirrors `TuiAgent` launch surface; `claude`↔`claude-code` (product, not CLI string). `other` is the escape hatch; see `tuiAgentToAgentKind`.
-export const AGENT_KIND_VALUES = [
-  'claude-code',
-  'claude-agent-teams',
-  'openclaude',
-  'codex',
-  'autohand',
-  'opencode',
-  'mimo-code',
-  'pi',
-  'omp',
-  'prime-agent',
-  'gemini',
-  'antigravity',
-  'aider',
-  'goose',
-  'amp',
-  'kilo',
-  'kiro',
-  'crush',
-  'aug',
-  'cline',
-  'codebuff',
-  'command-code',
-  'continue',
-  'cursor',
-  'droid',
-  'kimi',
-  'mistral-vibe',
-  'qwen-code',
-  'rovo',
-  'hermes',
-  'openclaw',
-  'copilot',
-  'grok',
-  'devin',
-  'ante',
-  'trae',
-  'other'
-] as const
-export const agentKindSchema = z.enum(AGENT_KIND_VALUES)
-export type AgentKind = z.infer<typeof agentKindSchema>
-
-// Small set: only failures Orca's PTY-typed-command launch can observe (`binary_not_found` = shell ENOENT, `paste_readiness_timeout`, `unknown`).
-// Provider-side errors (auth/rate-limit/network) happen inside the agent CLI subprocess and are invisible to Orca. See telemetry-plan.md §Defer per-incident error fields.
-export const errorClassSchema = z.enum(['binary_not_found', 'paste_readiness_timeout', 'unknown'])
-export type ErrorClass = z.infer<typeof errorClassSchema>
-
-export const repoMethodSchema = z.enum(['folder_picker', 'clone_url', 'drag_drop'])
-export type RepoMethod = z.infer<typeof repoMethodSchema>
-
-// Historical setup-step choices (current flows skip that screen); kept for pre-rollout rows and compatibility.
-export const addRepoSetupStepActionSchema = z.enum([
-  'open_primary',
-  'create_worktree',
-  'configure',
-  'skip',
-  'open_existing',
-  'back'
-])
-
-export const addRepoExistingWorkspaceSourceSchema = z.enum([
-  'local_folder_picker',
-  'runtime_server_path',
-  'ssh_remote_path',
-  'clone_url',
-  'create_project'
-])
-export type AddRepoExistingWorkspaceSource = z.infer<typeof addRepoExistingWorkspaceSourceSchema>
-export const addRepoDefaultCheckoutHandoffSourceSchema = z.enum([
-  'local_folder_picker',
-  'runtime_server_path',
-  'ssh_remote_path',
-  'clone_url',
-  'create_project',
-  'onboarding_open_folder',
-  'onboarding_clone_url',
-  'project_added_compat'
-])
-export type AddRepoDefaultCheckoutHandoffSource = z.infer<
-  typeof addRepoDefaultCheckoutHandoffSourceSchema
->
-export const addRepoDefaultCheckoutHandoffResultSchema = z.enum([
-  'opened_default_checkout',
-  'revealed_project'
-])
-export const addRepoDefaultCheckoutHandoffReasonSchema = z.enum([
-  'loaded_default_checkout',
-  'detected_default_checkout',
-  'no_authoritative_detection',
-  'no_default_checkout',
-  'show_detected_default_failed',
-  'show_detected_linked_failed',
-  'authoritative_refresh_failed',
-  'linked_external_refresh_failed',
-  'refreshed_default_missing'
-])
-
-export const setupScriptImportProviderSchema = z.enum(SETUP_SCRIPT_IMPORT_PROVIDERS)
-
-// Separate enum from `errorClassSchema` — different domain (git/filesystem worktree-create failures); merging would couple the two forever.
-export const workspaceCreateErrorClassSchema = z.enum([
-  'git_failed',
-  'path_collision',
-  'permission_denied',
-  'base_ref_missing',
-  'unknown'
-])
-export type WorkspaceCreateErrorClass = z.infer<typeof workspaceCreateErrorClassSchema>
-
-export const workspaceSourceSchema = z.enum(WORKSPACE_SOURCE_VALUES)
-export type { WorkspaceSource }
-
-export const launchSourceSchema = z.enum([
-  'command_palette',
-  'sidebar',
-  'quick_command',
-  'tab_bar_quick_launch',
-  'task_page',
-  'new_workspace_composer',
-  'workspace_jump_palette',
-  'shortcut',
-  'onboarding',
-  'diff_notes_send',
-  'notes_send',
-  'conflict_resolution',
-  'source_control_recovery',
-  'terminal_context_menu',
-  'unknown'
-])
-export type LaunchSource = z.infer<typeof launchSourceSchema>
-
-export const requestKindSchema = z.enum(['new', 'resume', 'followup'])
-export type RequestKind = z.infer<typeof requestKindSchema>
-
-export const featureWallTileIdSchema = z.enum([
-  'tile-01',
-  'tile-02',
-  'tile-03',
-  'tile-04',
-  'tile-05',
-  'tile-06',
-  'tile-07',
-  'tile-08',
-  'tile-09',
-  'tile-10',
-  'tile-11',
-  'tile-12'
-])
-
-export const featureWallOpenSourceSchema = z.enum(['help_menu', 'popup', 'onboarding', 'unknown'])
-export type FeatureWallOpenSourceTelemetry = z.infer<typeof featureWallOpenSourceSchema>
-
-export const featureWallWorkflowIdSchema = z.enum([
-  'tasks',
-  'workspaces',
-  'agents-orchestration',
-  'workbench',
-  'review'
-])
-
-export const featureWallTourDepthStepSchema = z.enum(FEATURE_WALL_TOUR_DEPTH_STEPS)
-
-export const featureWallExitActionSchema = z.enum(FEATURE_WALL_EXIT_ACTIONS)
-
-// `env_var` absent — env-var/CI paths override consent at runtime only, never firing an opt-in/out event.
-// `first_launch_notice` absent — the new-user cohort has no first-launch surface; those opt-outs come via `'settings'`.
-export const optInViaSchema = z.enum(['first_launch_banner', 'settings'])
-export type OptInVia = z.infer<typeof optInViaSchema>
-
-// Whitelist of settings emittable on `settings_changed`. `orca_channel` (build-time, not user-togglable) is absent.
-// The telemetry opt-in toggle is also absent — it fires dedicated `telemetry_opted_in/out` events; listing it would double-fire.
-type BooleanGlobalSettingsKey = {
-  // Why: new toggles may be optional for legacy-settings compat but are still boolean once defaulted.
-  [Key in keyof GlobalSettings]-?: NonNullable<GlobalSettings[Key]> extends boolean ? Key : never
-}[keyof GlobalSettings]
-export const SETTINGS_CHANGED_WHITELIST = [
-  'editorAutoSave',
-  'openLinksInApp',
-  'openLinksInAppModifierInverts',
-  'terminalLinkActionPopoverEnabled',
-  'experimentalMobile',
-  'experimentalPet',
-  'experimentalNativeChat',
-  'experimentalStructuredNativeChat',
-  'experimentalActivity',
-  'experimentalAgentDashboardPopout',
-  'experimentalTerminalAttention',
-  'experimentalAgentHibernation',
-  'experimentalEphemeralVms',
-  'geminiCliOAuthEnabled',
-  'openAgentTabsInChatByDefault'
-] as const satisfies readonly BooleanGlobalSettingsKey[]
-export const settingsChangedKeySchema = z.enum(SETTINGS_CHANGED_WHITELIST)
-export type SettingsChangedKey = z.infer<typeof settingsChangedKeySchema>
-
-// ── Per-event schemas ───────────────────────────────────────────────────
-
-// Cohort signal (repo count at emit time); `.optional()` lets a fail-soft `undefined` validate. See docs/onboarding-funnel-cohort-addendum.md.
-const nthRepoAddedSchema = z.number().int().nonnegative().optional()
-
-const appOpenedSchema = z.object({ nth_repo_added: nthRepoAddedSchema }).strict()
-
-export const featureInteractionIdSchema = z.enum(FEATURE_INTERACTION_IDS)
-export const featureInteractionCategorySchema = z.enum(FEATURE_INTERACTION_CATEGORIES)
-export const featureInteractionUsageBucketSchema = z.enum(FEATURE_INTERACTION_USAGE_BUCKETS)
-export const featureInteractionUsageBucketSourceSchema = z.enum([
-  'crossed_now',
-  'observed_existing'
-])
-const featureInteractionUsageBucketReachedSchema = z
-  .object({
-    feature_id: featureInteractionIdSchema,
-    feature_category: featureInteractionCategorySchema,
-    count_bucket: featureInteractionUsageBucketSchema,
-    bucket_source: featureInteractionUsageBucketSourceSchema,
-    nth_repo_added: nthRepoAddedSchema
-  })
-  .strict()
-  .refine((value) => getFeatureInteractionCategory(value.feature_id) === value.feature_category, {
-    message: 'feature_category must match feature_id',
-    path: ['feature_category']
-  })
-
-const repoAddedSchema = z
-  // Why: `.optional()` so paths that can't detect git-ness validate cleanly; never default-guess `false` — omit instead.
-  .object({
-    method: repoMethodSchema,
-    is_git_repo: z.boolean().optional(),
-    nth_repo_added: nthRepoAddedSchema
-  })
-  .strict()
-
-const appStarredOrcaSchema = z
-  .object({
-    source: appStarSourceSchema,
-    nth_repo_added: nthRepoAddedSchema
-  })
-  .strict()
-
-const starNagOutcomeEventSchema = z
-  .object({
-    outcome: starNagOutcomeSchema,
-    source: starNagPromptSourceSchema,
-    mode: starNagPromptModeSchema,
-    threshold: z.number().int().positive(),
-    agents_since_baseline: z.number().int().nonnegative(),
-    agents_since_baseline_bucket: starNagAgentBucketSchema,
-    nth_repo_added: nthRepoAddedSchema,
-    next_threshold: z.number().int().positive().optional(),
-    cooldown_days: z.number().int().positive().optional()
-  })
-  .strict()
-  .refine(
-    (payload) =>
-      payload.next_threshold === undefined ||
-      payload.outcome === 'dismissed' ||
-      payload.outcome === 'later',
-    {
-      message: 'next_threshold is only valid for later or dismissed outcomes',
-      path: ['next_threshold']
-    }
-  )
-  .refine(
-    (payload) =>
-      payload.cooldown_days === undefined ||
-      payload.outcome === 'later' ||
-      payload.outcome === 'dismissed',
-    {
-      message: 'cooldown_days is only valid for later or dismissed outcomes',
-      path: ['cooldown_days']
-    }
-  )
-
-const workspaceCreatedSchema = z
-  .object({
-    source: workspaceSourceSchema,
-    from_existing_branch: z.boolean(),
-    nth_repo_added: nthRepoAddedSchema
-  })
-  .strict()
-
-const agentStartedSchema = z
-  .object({
-    agent_kind: agentKindSchema,
-    launch_source: launchSourceSchema,
-    request_kind: requestKindSchema,
-    nth_repo_added: nthRepoAddedSchema
-  })
-  .strict()
-const agentPromptSentSchema = z
-  .object({
-    agent_kind: agentKindSchema,
-    launch_source: launchSourceSchema,
-    request_kind: requestKindSchema,
-    nth_repo_added: nthRepoAddedSchema
-  })
-  .strict()
-
-// Enum-only by design: `.strict()` blocks `error_message`/`error_stack`, keeping raw user/path content off the wire.
-const agentErrorSchema = z
-  .object({
-    error_class: errorClassSchema,
-    agent_kind: agentKindSchema,
-    nth_repo_added: nthRepoAddedSchema
-  })
-  .strict()
-
-// Why: daemon start-failure signal (fleet-wide outage like v1.4.129-rc.1); enum-only so raw stderr never reaches the wire.
-const daemonStartFailedSchema = z.object({ error_class: errorClassSchema }).strict()
-
-export const runtimeRpcStartErrorClassSchema = z.enum([
-  'permission_denied',
-  'address_in_use',
-  'storage_unavailable',
-  'invalid_path',
-  'unknown'
-])
-export type RuntimeRpcStartErrorClass = z.infer<typeof runtimeRpcStartErrorClassSchema>
-
-// Why: runtime discovery failures can contain user paths; keep telemetry to closed filesystem/socket categories.
-const runtimeRpcStartFailedSchema = z
-  .object({ error_class: runtimeRpcStartErrorClassSchema })
-  .strict()
-
-// Why: classify session-killing 1013 closures as producer size failures or queue backpressure.
-const remoteOutboundBudgetCloseSchema = z.object({ emitter: z.enum(['size', 'queue']) }).strict()
-
-// Why: a deadlocked main thread never crashes, so it produces no crash report and no user report
-// beyond "it froze" — incidence has been unmeasurable. `self_recovered` splits stalls that cleared
-// from ones that never did, which is the number that decides whether auto-recovery is ever safe to
-// build: every self-recovered stall is a kill that design would have gotten wrong. `unresponsive_ms`
-// is the observed silence, kept raw so the 45s threshold can be calibrated against real tails.
-const mainThreadHangDetectedSchema = z
-  .object({
-    unresponsive_ms: z.number().int().nonnegative(),
-    self_recovered: z.boolean()
-  })
-  .strict()
-
-// Why: daemon replace/retire lifecycle signal — issue #7936 was undiagnosable without asking a user for daemon.log.
-// Enum-only + bucketed session count so no paths, raw versions, or exact counts reach the wire.
-// The union keeps each reason pinned to its transition, so a death can't be reported as a replace.
-const daemonLifecycleSchema = z.discriminatedUnion('transition', [
-  z
-    .object({
-      transition: z.literal(DAEMON_LIFECYCLE_TRANSITIONS[0]),
-      reason: z.enum(DAEMON_REPLACE_REASONS),
-      live_session_count_bucket: z.enum(DAEMON_LIFECYCLE_SESSION_BUCKETS)
-    })
-    .strict(),
-  z
-    .object({
-      transition: z.literal(DAEMON_LIFECYCLE_TRANSITIONS[1]),
-      reason: z.enum(DAEMON_RETIRE_REASONS),
-      live_session_count_bucket: z.enum(DAEMON_LIFECYCLE_SESSION_BUCKETS)
-    })
-    .strict()
-])
-
-const daemonAuditEligibilityBaseSchema = z.object({
-  state: z.enum(DAEMON_AUDIT_STATE_VALUES),
-  reason: z.enum(DAEMON_AUDIT_REASON_VALUES),
-  trigger: z.enum(DAEMON_AUDIT_TRIGGER_VALUES),
-  evidence_sources: z.array(z.enum(DAEMON_EVIDENCE_SOURCE_VALUES)).min(1).max(12),
-  protocol_generation: z.number().int().positive().max(1_000),
-  generation_role: z.enum(DAEMON_AUDIT_GENERATION_ROLE_VALUES),
-  provider: z.literal('local-daemon'),
-  endpoint_kind: z.enum(['unix-socket', 'windows-named-pipe']),
-  profile_scope: z.enum(['configured', 'unspecified']),
-  reachability: z.enum(['authenticated', 'disconnected', 'unknown']),
-  inventory_authority: z.enum(['authoritative', 'unavailable']),
-  process_liveness: z.enum(['present', 'gone', 'unknown']),
-  process_reason: z.enum(DAEMON_AUDIT_PROCESS_REASON_VALUES).nullable(),
-  endpoint_state: z.enum(['missing', 'named-pipe', 'non-socket', 'socket', 'unknown'])
-})
-
-const daemonAuditEligibilitySchema = z.discriminatedUnion('exact_incarnation', [
-  daemonAuditEligibilityBaseSchema
-    .extend({
-      exact_incarnation: z.literal('endpoint-identity'),
-      exact_incarnation_correlation: z.string().regex(/^v1:[0-9a-f]{32}$/)
-    })
-    .strict(),
-  daemonAuditEligibilityBaseSchema
-    .extend({
-      exact_incarnation: z.literal('endpoint-identity-linux-ticks'),
-      exact_incarnation_correlation: z.string().regex(/^v1:[0-9a-f]{32}$/)
-    })
-    .strict(),
-  daemonAuditEligibilityBaseSchema.extend({ exact_incarnation: z.literal('unavailable') }).strict()
-])
-
-// Rollout signal for granting Codex hook trust via codex app-server RPCs
-// instead of Orca's self-computed trusted_hash. `fallback`/`verify_failed`
-// spikes mean the RPC lane is not taking; steady-state ledger skips are not
-// reported (they would only measure launch volume). `lane` attributes the
-// grant surface (real ~/.codex vs managed home); `error_class`/`verify_class`
-// are closed classifications so `error` fallbacks are diagnosable in the
-// field — e.g. `binary-missing` = codex CLI absent, no rollout impact.
-const codexTrustGrantSchema = z
-  .object({
-    outcome: z.enum(['granted', 'fallback', 'verify_failed']),
-    host_kind: z.enum(['native', 'wsl']),
-    lane: z.enum(['real-home', 'managed']),
-    fallback_reason: z
-      .enum([
-        'disabled',
-        'no-managed-entries',
-        'unsupported',
-        'unsupported-cached',
-        'verify-failed',
-        'retry-cached',
-        'error'
-      ])
-      .optional(),
-    error_class: z
-      .enum(['binary-missing', 'timeout', 'entry-failed', 'early-exit', 'rpc-failed', 'unexpected'])
-      .optional(),
-    verify_class: z
-      .enum([
-        'list-mismatch',
-        'post-grant-untrusted',
-        'post-grant-mismatch',
-        'unexpected-key',
-        'duplicate-key',
-        'coverage'
-      ])
-      .optional()
-  })
-  .strict()
-
-const settingsChangedSchema = z
-  .object({
-    setting_key: settingsChangedKeySchema,
-    value_kind: z.enum(['bool', 'enum'])
-  })
-  .strict()
-
-// Native chat (terminal⇄chat toggle) adoption; view-mode enum mirrors `Tab.viewMode` in shared/types.ts.
-const nativeChatViewModeSchema = z.enum(['terminal', 'chat'])
-const nativeChatToggledSchema = z
-  .object({
-    from_mode: nativeChatViewModeSchema,
-    to_mode: nativeChatViewModeSchema,
-    agent_kind: agentKindSchema
-  })
-  .strict()
-// `runtime`: local vs SSH/remote agent PTY; `'unknown'` when unresolved at send time.
-const nativeChatRuntimeSchema = z.enum(['local', 'remote', 'unknown'])
-export type NativeChatRuntime = z.infer<typeof nativeChatRuntimeSchema>
-const nativeChatMessageSentSchema = z
-  .object({
-    agent_kind: agentKindSchema,
-    runtime: nativeChatRuntimeSchema
-  })
-  .strict()
-const nativeChatPickerOpenedSchema = z
-  .object({ agent_kind: agentKindSchema, prefix: z.enum(['slash', 'dollar']) })
-  .strict()
-const nativeChatPickerItemAcceptedSchema = z
-  .object({ agent_kind: agentKindSchema, item_kind: z.enum(['command', 'skill']) })
-  .strict()
-const nativeChatSendClassifiedSchema = z
-  .object({ agent_kind: agentKindSchema, outcome: z.enum(['chat', 'command', 'unknown-token']) })
-  .strict()
-const nativeChatSkillDiscoverySchema = z
-  .object({
-    agent_kind: agentKindSchema,
-    outcome: z.enum(['ready', 'error', 'timeout', 'unavailable']),
-    execution_host_kind: z.enum(['local', 'runtime', 'ssh'])
-  })
-  .strict()
-
-const telemetryOptedInSchema = z.object({ via: optInViaSchema }).strict()
-const telemetryOptedOutSchema = z.object({ via: optInViaSchema }).strict()
-
-const orcaCliFeatureTipSourceSchema = z.enum(['app_open', 'manual'])
-const orcaCliFeatureTipShownSchema = z
-  .object({
-    source: orcaCliFeatureTipSourceSchema,
-    nth_repo_added: nthRepoAddedSchema
-  })
-  .strict()
-const orcaCliFeatureTipSetupClickedSchema = z
-  .object({
-    source: orcaCliFeatureTipSourceSchema,
-    nth_repo_added: nthRepoAddedSchema
-  })
-  .strict()
-const orcaCliFeatureTipSetupResultSchema = z
-  .object({
-    source: orcaCliFeatureTipSourceSchema,
-    result: z.enum(['installed', 'needs_attention', 'dev_preview', 'failed']),
-    nth_repo_added: nthRepoAddedSchema
-  })
-  .strict()
-
-const cmdJPaletteFeatureTipShownSchema = z
-  .object({
-    source: orcaCliFeatureTipSourceSchema,
-    nth_repo_added: nthRepoAddedSchema
-  })
-  .strict()
-const cmdJPaletteFeatureTipAcknowledgedSchema = z
-  .object({
-    source: orcaCliFeatureTipSourceSchema,
-    nth_repo_added: nthRepoAddedSchema
-  })
-  .strict()
-
-const featureWallOpenedSchema = z
-  .object({
-    source: featureWallOpenSourceSchema
-  })
-  .strict()
-const featureWallClosedSchema = z
-  .object({
-    dwell_ms: z.number().int().min(0).max(FEATURE_WALL_MAX_DWELL_MS),
-    source: featureWallOpenSourceSchema.optional(),
-    exit_action: featureWallExitActionSchema.optional(),
-    furthest_step: featureWallTourDepthStepSchema.optional(),
-    last_group_id: featureWallWorkflowIdSchema.optional(),
-    visited_workflow_count: z.number().int().min(0).max(5).optional(),
-    visited_substep_count: z.number().int().min(0).max(9).optional(),
-    completed_workflow_count: z.number().int().min(0).max(5).optional(),
-    completed_substep_count: z.number().int().min(0).max(9).optional()
-  })
-  .strict()
-const featureWallTileFocusedSchema = z
-  .object({
-    tile_id: featureWallTileIdSchema
-  })
-  .strict()
-const featureWallTileClickedSchema = z
-  .object({
-    tile_id: featureWallTileIdSchema
-  })
-  .strict()
-const featureWallGroupSelectedSchema = z
-  .object({
-    group_id: featureWallWorkflowIdSchema,
-    source: featureWallOpenSourceSchema
-  })
-  .strict()
-const featureWallFeatureSelectedSchema = z
-  .object({
-    group_id: featureWallWorkflowIdSchema,
-    tile_id: featureWallTileIdSchema,
-    source: featureWallOpenSourceSchema
-  })
-  .strict()
-const featureWallDocsClickedSchema = z
-  .object({
-    group_id: featureWallWorkflowIdSchema,
-    tile_id: featureWallTileIdSchema,
-    source: featureWallOpenSourceSchema
-  })
-  .strict()
-
-const existingWorkspaceCountSchema = z.number().int().min(1).max(50)
-const addRepoExistingWorkspaceContextSchema = {
-  source: addRepoExistingWorkspaceSourceSchema,
-  existing_workspace_count: existingWorkspaceCountSchema,
-  existing_linked_workspace_count: z.number().int().min(0).max(50)
-} as const
-
-const addRepoSetupStepActionEventSchema = z
-  .object({
-    action: addRepoSetupStepActionSchema,
-    source: addRepoExistingWorkspaceSourceSchema.optional(),
-    existing_workspace_count: existingWorkspaceCountSchema.optional(),
-    existing_linked_workspace_count: z.number().int().min(0).max(50).optional(),
-    nth_repo_added: nthRepoAddedSchema
-  })
-  .strict()
-const addRepoExistingWorkspacesDetectedSchema = z
-  .object({
-    ...addRepoExistingWorkspaceContextSchema,
-    main_workspace_count: z.number().int().min(0).max(50),
-    branch_named_workspace_count: z.number().int().min(0).max(50),
-    detached_workspace_count: z.number().int().min(0).max(50),
-    custom_named_workspace_count: z.number().int().min(0).max(50),
-    sparse_workspace_count: z.number().int().min(0).max(50),
-    nth_repo_added: nthRepoAddedSchema
-  })
-  .strict()
-const addRepoDefaultCheckoutHandoffSchema = z
-  .object({
-    source: addRepoDefaultCheckoutHandoffSourceSchema,
-    result: addRepoDefaultCheckoutHandoffResultSchema,
-    reason: addRepoDefaultCheckoutHandoffReasonSchema,
-    nth_repo_added: nthRepoAddedSchema
-  })
-  .strict()
-
-// Why: enum-only like `agent_error` — `.strict()` blocks raw error strings from ever crossing the wire.
-const workspaceCreateFailedSchema = z
-  .object({
-    source: workspaceSourceSchema,
-    error_class: workspaceCreateErrorClassSchema,
-    nth_repo_added: nthRepoAddedSchema
-  })
-  .strict()
-
-const setupScriptPromptModeSchema = z.enum(['import_available', 'configure_needed'])
-const setupScriptCountBucketSchema = z.enum(['0', '1', '2-3', '4+'])
-const setupScriptPromptContextSchema = {
-  mode: setupScriptPromptModeSchema,
-  // Why: superRefine (not transform) keeps the top-level ZodObject shape that cohort injection probes.
-  provider: setupScriptImportProviderSchema.optional(),
-  file_count_bucket: setupScriptCountBucketSchema,
-  unsupported_field_count_bucket: setupScriptCountBucketSchema,
-  has_shared_hooks: z.boolean(),
-  nth_repo_added: nthRepoAddedSchema
-} as const
-
-type SetupScriptPromptContextTelemetry = {
-  mode: z.infer<typeof setupScriptPromptModeSchema>
-  provider?: z.infer<typeof setupScriptImportProviderSchema>
-}
-
-function validateSetupScriptPromptProvider(
-  props: SetupScriptPromptContextTelemetry,
-  ctx: z.RefinementCtx
-): void {
-  if (props.mode === 'import_available' && props.provider === undefined) {
-    ctx.addIssue({
-      code: 'custom',
-      path: ['provider'],
-      message: 'provider is required when a setup candidate is available'
-    })
-  }
-  if (props.mode === 'configure_needed' && props.provider !== undefined) {
-    ctx.addIssue({
-      code: 'custom',
-      path: ['provider'],
-      message: 'provider is only valid when a setup candidate is available'
-    })
-  }
-}
-// Why: retention-cohort telemetry, not repo debugging — closed enums and count buckets only.
-const setupScriptPromptShownSchema = z
-  .object(setupScriptPromptContextSchema)
-  .strict()
-  .superRefine(validateSetupScriptPromptProvider)
-const setupScriptDetectedSaveActions = [
-  'save_detected_setup_clicked',
-  'save_detected_setup_completed',
-  'save_detected_setup_failed'
-] as const
-
-function isSetupScriptDetectedSaveAction(action: unknown): boolean {
-  return setupScriptDetectedSaveActions.includes(action as never)
-}
-
-function validateSetupScriptPromptAction(
-  props: SetupScriptPromptContextTelemetry & {
-    action?: string
-    edited_before_save?: boolean
-  },
-  ctx: z.RefinementCtx
-): void {
-  validateSetupScriptPromptProvider(props, ctx)
-  const isDetectedSave = isSetupScriptDetectedSaveAction(props.action)
-  if (isDetectedSave && props.provider !== 'package-manager') {
-    ctx.addIssue({
-      code: 'custom',
-      path: ['provider'],
-      message: 'detected setup save actions require the package-manager provider'
-    })
-  }
-  if (isDetectedSave && props.edited_before_save === undefined) {
-    ctx.addIssue({
-      code: 'custom',
-      path: ['edited_before_save'],
-      message: 'edited_before_save is required for detected setup save actions'
-    })
-  }
-  if (!isDetectedSave && props.edited_before_save !== undefined) {
-    ctx.addIssue({
-      code: 'custom',
-      path: ['edited_before_save'],
-      message: 'edited_before_save is only valid for detected setup save actions'
-    })
-  }
-}
-
-const setupScriptPromptActionSchema = z
-  .object({
-    ...setupScriptPromptContextSchema,
-    action: z.enum([
-      'import_completed',
-      'import_failed',
-      'configure_clicked',
-      'dismissed',
-      ...setupScriptDetectedSaveActions
-    ]),
-    edited_before_save: z.boolean().optional()
-  })
-  .strict()
-  .superRefine(validateSetupScriptPromptAction)
-
-// Managed-hook installer label from `AGENT_HOOK_TARGETS`, distinct from `AGENT_KIND_VALUES`; `claude` (not `claude-code`) is intentional.
-export const hookInstallAgentSchema = z.enum(AGENT_HOOK_TARGETS)
-export type HookInstallAgent = z.infer<typeof hookInstallAgentSchema>
-
-// Why: config-shape errors (not user content); callers must truncate before `track` — `.max(200)` drops overlength strings.
-const agentHookInstallFailedSchema = z
-  .object({
-    agent: hookInstallAgentSchema,
-    error_message: z.string().max(200)
-  })
-  .strict()
-
-// Why: regression signal for paneKey attribution — a hook event that can't route to a pane. See docs/cli-terminal-hook-pane-key.md.
-const agentHookUnattributedSchema = z
-  .object({ reason: z.enum(['empty_pane_key', 'unknown_tab_id']) })
-  .strict()
-
-// Why (#11217): loopback hook POSTs reset mid-body by local security software kill agent status for
-// every runtime at once. Count only — the truncated bodies carry user prompts and tool I/O, so
-// nothing derived from them may reach the wire.
-const agentHookTransportBlockedSchema = z.object({ count: z.number().int().nonnegative() }).strict()
-
-// ── Onboarding ──────────────────────────────────────────────────────────
-// Closed enums only — no raw paths/repo names/URLs/error strings (measures activation, not repo debugging).
-// Why: event names still carry legacy seven-step payloads; keep validation backward-compatible for old rows.
-const ONBOARDING_TELEMETRY_LEGACY_MAX_STEP = 7
-const onboardingStepSchema = z.number().int().min(1).max(ONBOARDING_TELEMETRY_LEGACY_MAX_STEP)
-const onboardingPathSchema = z.enum(['open_folder', 'clone_url', 'add_project_modal'])
-const onboardingFailureReasonSchema = z.enum([
-  'invalid_path',
-  'clone_failed',
-  'cancelled',
-  'unknown'
-])
-const onboardingValueKindSchema = z.enum([
-  'agent',
-  'theme',
-  'notifications',
-  'agent_setup',
-  'integrations',
-  'windows_terminal',
-  'tour',
-  'repo'
-])
-const onboardingTourOutcomeSchema = z.enum(['skipped_intro', 'started_partial', 'completed_inline'])
-const onboardingTaskSourcesGithubStatusSchema = z.enum([
-  'connected',
-  'not_authenticated',
-  'not_installed',
-  'checking',
-  'unknown'
-])
-const onboardingTaskSourcesLinearStatusSchema = z.enum([
-  'connected',
-  'not_connected',
-  'checking',
-  'unknown'
-])
-const onboardingTaskSourcesExitActionSchema = z.enum(['continue', 'skip_to_project_setup'])
-const onboardingWindowsTerminalShellSchema = z.enum([
-  'powershell',
-  'command_prompt',
-  'git_bash',
-  'wsl',
-  'other'
-])
-const onboardingWindowsTerminalRightClickSchema = z.enum(['paste', 'menu'])
-const onboardingWindowsTerminalExitActionSchema = z.enum(['continue', 'skip_to_project_setup'])
-// `dismissed` is intentionally excluded — it's a UI panel-visibility flag, not an activation event.
-const onboardingChecklistItemSchema = z.enum([
-  'addedRepo',
-  'addedFolder',
-  'choseAgent',
-  'ranFirstAgent',
-  'ranSecondAgentOnSameTask',
-  'triedCmdJ',
-  'shapedSidebar',
-  'reviewedDiff',
-  'openedPr',
-  'openedFile',
-  'ranAgentOnFile'
-])
-const onboardingFeatureSetupFeatureSchema = z.enum([
-  'browser_use',
-  'computer_use',
-  'orchestration',
-  'linear_tickets'
-])
-const onboardingFeatureSetupSelectionSchema = {
-  browser_use: z.boolean(),
-  computer_use: z.boolean(),
-  linear_tickets: z.boolean(),
-  orchestration: z.boolean(),
-  selected_count: z.number().int().min(0).max(3)
-} as const
-type OnboardingFeatureSetupSelectionTelemetry = {
-  browser_use: boolean
-  computer_use: boolean
-  linear_tickets: boolean
-  orchestration: boolean
-  selected_count: number
-}
-const onboardingFeatureSetupSelectedCountRefinement = {
-  path: ['selected_count'],
-  message: 'selected_count must match selected feature flags'
-}
-
-function hasMatchingOnboardingFeatureSetupSelectedCount(
-  props: OnboardingFeatureSetupSelectionTelemetry
-): boolean {
-  // Why: Linear ticket setup is a recommended add-on and excluded from progress metrics.
-  const selectedCount =
-    (props.browser_use ? 1 : 0) + (props.computer_use ? 1 : 0) + (props.orchestration ? 1 : 0)
-  return props.selected_count === selectedCount
-}
-
-// Compile-time guard: enum must match OnboardingChecklistState activation keys (minus UI-only `dismissed`); drift breaks the build.
-type _OnboardingChecklistItemSync =
-  z.infer<typeof onboardingChecklistItemSchema> extends Exclude<
-    keyof OnboardingChecklistState,
-    'dismissed'
-  >
-    ? Exclude<keyof OnboardingChecklistState, 'dismissed'> extends z.infer<
-        typeof onboardingChecklistItemSchema
-      >
-      ? true
-      : never
-    : never
-const _onboardingChecklistItemSyncCheck: _OnboardingChecklistItemSync = true
-void _onboardingChecklistItemSyncCheck
-
-// Cohort discriminator for onboarding events; `.optional()` is load-bearing so `.strict()` accepts the `undefined` fallback.
-const cohortSchema = z.enum(['fresh_install', 'upgrade_backfill']).optional()
-
-const nestedRepoTelemetrySurfaceSchema = z.enum(NESTED_REPO_TELEMETRY_SURFACES)
-const nestedRepoTelemetryRuntimeKindSchema = z.enum(NESTED_REPO_TELEMETRY_RUNTIME_KINDS)
-const nestedRepoCountSchema = z.number().int().min(0).max(NESTED_REPO_TELEMETRY_MAX_REPO_COUNT)
-const nestedRepoCountBucketSchema = z.enum(NESTED_REPO_COUNT_BUCKETS)
-const nestedRepoScanResultSchema = z.enum(NESTED_REPO_SCAN_RESULTS)
-const nestedRepoImportActionSchema = z.enum(NESTED_REPO_IMPORT_ACTIONS)
-const nestedRepoImportOutcomeSchema = z.enum(NESTED_REPO_IMPORT_OUTCOMES)
-const nestedRepoScanPathKindSchema = z.enum(['git_repo', 'non_git_folder'])
-const nestedRepoImportModeSchema = z.enum(['group', 'separate'])
-const nestedRepoAttemptIdSchema = z.string().uuid()
-
-function validateNestedRepoCountBucket(
-  props: Record<string, unknown>,
-  countKey: string,
-  bucketKey: string,
-  ctx: z.RefinementCtx
-): void {
-  const count = props[countKey]
-  const bucket = props[bucketKey]
-  if (typeof count !== 'number' || typeof bucket !== 'string') {
-    return
-  }
-  if (bucketNestedRepoTelemetryCount(count) !== bucket) {
-    ctx.addIssue({
-      code: 'custom',
-      path: [bucketKey],
-      message: `${bucketKey} must match ${countKey}`
-    })
-  }
-}
-
-function validateNestedRepoCountBuckets(
-  props: Record<string, unknown>,
-  ctx: z.RefinementCtx
-): void {
-  validateNestedRepoCountBucket(props, 'found_count', 'found_count_bucket', ctx)
-  validateNestedRepoCountBucket(props, 'selected_count', 'selected_count_bucket', ctx)
-  validateNestedRepoCountBucket(props, 'imported_count', 'imported_count_bucket', ctx)
-  validateNestedRepoCountBucket(props, 'already_known_count', 'already_known_count_bucket', ctx)
-  validateNestedRepoCountBucket(props, 'failed_count', 'failed_count_bucket', ctx)
-}
-
-const nestedRepoTelemetryBaseSchema = {
-  // Why: high-cardinality but random and non-persistent — correlates scan→action→result without path-derived IDs.
-  attempt_id: nestedRepoAttemptIdSchema,
-  surface: nestedRepoTelemetrySurfaceSchema,
-  runtime_kind: nestedRepoTelemetryRuntimeKindSchema,
-  nth_repo_added: nthRepoAddedSchema
-} as const
-
-const addRepoNestedScanResultSchema = z
-  .object({
-    ...nestedRepoTelemetryBaseSchema,
-    result: nestedRepoScanResultSchema,
-    selected_path_kind: nestedRepoScanPathKindSchema.optional(),
-    found_count: nestedRepoCountSchema,
-    found_count_bucket: nestedRepoCountBucketSchema,
-    truncated: z.boolean(),
-    timed_out: z.boolean()
-  })
-  .strict()
-  .superRefine(validateNestedRepoCountBuckets)
-
-const addRepoNestedImportActionSchema = z
-  .object({
-    ...nestedRepoTelemetryBaseSchema,
-    action: nestedRepoImportActionSchema,
-    found_count: nestedRepoCountSchema,
-    found_count_bucket: nestedRepoCountBucketSchema,
-    selected_count: nestedRepoCountSchema,
-    selected_count_bucket: nestedRepoCountBucketSchema,
-    all_selected: z.boolean()
-  })
-  .strict()
-  .superRefine(validateNestedRepoCountBuckets)
-
-const addRepoNestedImportResultSchema = z
-  .object({
-    ...nestedRepoTelemetryBaseSchema,
-    mode: nestedRepoImportModeSchema,
-    outcome: nestedRepoImportOutcomeSchema,
-    found_count: nestedRepoCountSchema,
-    found_count_bucket: nestedRepoCountBucketSchema,
-    selected_count: nestedRepoCountSchema,
-    selected_count_bucket: nestedRepoCountBucketSchema,
-    imported_count: nestedRepoCountSchema,
-    imported_count_bucket: nestedRepoCountBucketSchema,
-    already_known_count: nestedRepoCountSchema,
-    already_known_count_bucket: nestedRepoCountBucketSchema,
-    failed_count: nestedRepoCountSchema,
-    failed_count_bucket: nestedRepoCountBucketSchema,
-    all_selected: z.boolean()
-  })
-  .strict()
-  .superRefine(validateNestedRepoCountBuckets)
-
-// Uniform button/keyboard shape lets keyboard skip/dismiss paths arrive without a schema migration.
-const advancedViaSchema = z.enum(['button', 'keyboard']).optional()
-
-const onboardingStartedSchema = z
-  .object({ resumed_from_step: onboardingStepSchema.optional(), cohort: cohortSchema })
-  .strict()
-const onboardingStepViewedSchema = z
-  .object({
-    step: onboardingStepSchema,
-    value_kind: onboardingValueKindSchema,
-    cohort: cohortSchema
-  })
-  .strict()
-const onboardingStepCompletedSchema = z
-  .object({
-    step: onboardingStepSchema,
-    value_kind: onboardingValueKindSchema,
-    duration_ms: z.number().int().nonnegative().optional(),
-    advanced_via: advancedViaSchema,
-    cohort: cohortSchema
-  })
-  .strict()
-const onboardingStepSkippedSchema = z
-  .object({
-    step: onboardingStepSchema,
-    value_kind: onboardingValueKindSchema,
-    duration_ms: z.number().int().nonnegative().optional(),
-    advanced_via: advancedViaSchema,
-    cohort: cohortSchema
-  })
-  .strict()
-type OnboardingTourOutcomeTelemetry = {
-  outcome: z.infer<typeof onboardingTourOutcomeSchema>
-  tour_dwell_ms?: number
-  furthest_step?: z.infer<typeof featureWallTourDepthStepSchema>
-  visited_workflow_count?: number
-  visited_substep_count?: number
-  completed_workflow_count?: number
-  completed_substep_count?: number
-}
-
-function validateOnboardingTourOutcome(
-  props: OnboardingTourOutcomeTelemetry,
-  ctx: z.RefinementCtx
-): void {
-  if (props.outcome !== 'skipped_intro') {
-    return
-  }
-  for (const key of [
-    'tour_dwell_ms',
-    'furthest_step',
-    'visited_workflow_count',
-    'visited_substep_count',
-    'completed_workflow_count',
-    'completed_substep_count'
-  ] as const) {
-    if (props[key] !== undefined) {
-      ctx.addIssue({
-        code: 'custom',
-        path: [key],
-        message: `${key} is only valid after the inline tour starts`
-      })
-    }
-  }
-}
-
-const onboardingTourOutcomeEventSchema = z
-  .object({
-    outcome: onboardingTourOutcomeSchema,
-    intro_duration_ms: z.number().int().min(0).max(FEATURE_WALL_MAX_DWELL_MS).optional(),
-    tour_dwell_ms: z.number().int().min(0).max(FEATURE_WALL_MAX_DWELL_MS).optional(),
-    furthest_step: featureWallTourDepthStepSchema.optional(),
-    visited_workflow_count: z.number().int().min(0).max(5).optional(),
-    visited_substep_count: z.number().int().min(0).max(9).optional(),
-    completed_workflow_count: z.number().int().min(0).max(5).optional(),
-    completed_substep_count: z.number().int().min(0).max(9).optional(),
-    advanced_via: advancedViaSchema,
-    cohort: cohortSchema
-  })
-  .strict()
-  .superRefine(validateOnboardingTourOutcome)
-const onboardingStep4PathClickedSchema = z
-  .object({ path: onboardingPathSchema, cohort: cohortSchema })
-  .strict()
-const onboardingStep4PathFailedSchema = z
-  .object({
-    path: onboardingPathSchema,
-    reason: onboardingFailureReasonSchema,
-    cohort: cohortSchema
-  })
-  .strict()
-const onboardingTaskSourcesSnapshotSchema = z
-  .object({
-    github_status: onboardingTaskSourcesGithubStatusSchema,
-    linear_status: onboardingTaskSourcesLinearStatusSchema,
-    exit_action: onboardingTaskSourcesExitActionSchema,
-    duration_ms: z.number().int().nonnegative().optional(),
-    advanced_via: advancedViaSchema,
-    cohort: cohortSchema
-  })
-  .strict()
-const onboardingWindowsTerminalSnapshotSchema = z
-  .object({
-    default_shell: onboardingWindowsTerminalShellSchema,
-    right_click_behavior: onboardingWindowsTerminalRightClickSchema,
-    exit_action: onboardingWindowsTerminalExitActionSchema,
-    duration_ms: z.number().int().nonnegative().optional(),
-    advanced_via: advancedViaSchema,
-    cohort: cohortSchema
-  })
-  .strict()
-// Why: no `is_git_repo` here; the signal moved to `repo_added.is_git_repo`.
-const onboardingCompletedSchema = z
-  .object({
-    path: onboardingPathSchema,
-    total_duration_ms: z.number().int().nonnegative(),
-    cohort: cohortSchema
-  })
-  .strict()
-const onboardingDismissedSchema = z
-  .object({
-    last_step: onboardingStepSchema,
-    duration_ms: z.number().int().nonnegative().optional(),
-    advanced_via: advancedViaSchema,
-    cohort: cohortSchema
-  })
-  .strict()
-const activationChecklistItemCompletedSchema = z
-  .object({
-    item: onboardingChecklistItemSchema,
-    time_since_completed_ms: z.number().int().nonnegative()
-  })
-  .strict()
-
-// Why: disambiguates `on_path:false` rows on dashboard 1562016 (shell-hydration failure vs genuinely-not-on-PATH). See docs/agent-on-path-detection.md.
-const pathSourceSchema = z.enum(['shell_hydrate', 'sync_seed_only'])
-const pathFailureReasonSchema = z.enum(['none', 'no_shell', 'timeout', 'spawn_error', 'empty_path'])
-
-// Compile-time guard: schema enum must match `ShellHydrationFailureReason`; drift breaks the build, not runtime parsing.
-type _PathFailureReasonSync =
-  z.infer<typeof pathFailureReasonSchema> extends ShellHydrationFailureReason
-    ? ShellHydrationFailureReason extends z.infer<typeof pathFailureReasonSchema>
-      ? true
-      : never
-    : never
-const _pathFailureReasonSyncCheck: _PathFailureReasonSync = true
-void _pathFailureReasonSyncCheck
-
-type _PathSourceSync =
-  z.infer<typeof pathSourceSchema> extends PathSource
-    ? PathSource extends z.infer<typeof pathSourceSchema>
-      ? true
-      : never
-    : never
-const _pathSourceSyncCheck: _PathSourceSync = true
-void _pathSourceSyncCheck
-
-// Fired at click time (captures mind-changes); `agent_kind` uses `tuiAgentToAgentKind` to keep the wire enum closed.
-const onboardingAgentPickedSchema = z
-  .object({
-    agent_kind: agentKindSchema,
-    on_path: z.boolean(),
-    detected_count: z.number().int().nonnegative(),
-    // `'pending'` when detection is still running at click time (picked-before-detection vs picked-the-only-agent).
-    detection_state: z.enum(['complete', 'pending']),
-    // `true` when the agent lived under the "Show N more" disclosure — signals demand for less-popular agents.
-    from_collapsed_section: z.boolean(),
-    // Why: `.optional()` is load-bearing so pre-deploy events validate under `.strict()`. See docs/agent-on-path-detection.md.
-    path_source: pathSourceSchema.optional(),
-    path_failure_reason: pathFailureReasonSchema.optional(),
-    cohort: cohortSchema
-  })
-  .strict()
-
-// Mirrors ThemeStep.tsx DiscoveryState; `failed` is intentionally absent (it's an import outcome, see onboarding_ghostty_import_failed).
-const ghosttyDiscoveryStateSchema = z.enum(['found', 'absent', 'imported'])
-
-// Compile-time guard: schema enum must stay in sync with the renderer's DiscoveryState; drift breaks the build, not runtime.
-type _GhosttyDiscoveryStateSync =
-  z.infer<typeof ghosttyDiscoveryStateSchema> extends DiscoveryStatusEmitted
-    ? DiscoveryStatusEmitted extends z.infer<typeof ghosttyDiscoveryStateSchema>
-      ? true
-      : never
-    : never
-const _ghosttyDiscoveryStateSyncCheck: _GhosttyDiscoveryStateSync = true
-void _ghosttyDiscoveryStateSyncCheck
-
-const onboardingGhosttyDiscoveredSchema = z
-  .object({
-    state: ghosttyDiscoveryStateSchema,
-    // Bucketed not raw: exact group counts fingerprint heavy customizers.
-    field_group_count_bucket: z.enum(['0', '1-3', '4-7', '8+']),
-    cohort: cohortSchema
-  })
-  .strict()
-const onboardingGhosttyImportClickedSchema = z.object({ cohort: cohortSchema }).strict()
-
-// Smart-sort telemetry: measures whether the redesign concentrates users in Class 1-3, and flags Smart→Recent abandonment as a regression.
-const smartSortClassDistributionSchema = z
-  .object({
-    class_1: z.number().int().nonnegative(),
-    class_2: z.number().int().nonnegative(),
-    class_3: z.number().int().nonnegative(),
-    class_4: z.number().int().nonnegative(),
-    total_worktrees: z.number().int().nonnegative()
-  })
-  .strict()
-const smartSortClass1PromotionSchema = z
-  .object({
-    cause: z.enum(['blocked', 'waiting', 'title-heuristic'])
-  })
-  .strict()
-// Why `_v` not `z.object({})`: empty zod object infers as TS `{}` ("anything"), breaking the `keyof EventMap[N]` roster probes.
-const smartToRecentSwitchSchema = z.object({ _v: z.literal(1).optional() }).strict()
-const onboardingGhosttyImportFailedSchema = z
-  .object({
-    // `'no_config'` is reserved for future use; call sites currently emit `'empty_diff'` or `'unknown'`.
-    reason: z.enum(['no_config', 'empty_diff', 'unknown']),
-    cohort: cohortSchema
-  })
-  .strict()
-const onboardingFeatureSetupToggledSchema = z
-  .object({
-    feature: onboardingFeatureSetupFeatureSchema,
-    selected: z.boolean(),
-    cohort: cohortSchema
-  })
-  .strict()
-const onboardingFeatureSetupRunSchema = z
-  .object({
-    ...onboardingFeatureSetupSelectionSchema,
-    cli_touched: z.boolean(),
-    skill_commands_copied: z.boolean(),
-    skill_install_command_prepared: z.boolean(),
-    computer_use_permissions_opened: z.boolean(),
-    warning_count: z.number().int().nonnegative(),
-    cohort: cohortSchema
-  })
-  // Why: validate derived selected_count at the untrusted IPC boundary rather than trust renderer callers.
-  .refine(
-    hasMatchingOnboardingFeatureSetupSelectedCount,
-    onboardingFeatureSetupSelectedCountRefinement
-  )
-  .strict()
-const onboardingFeatureSetupTerminalOpenedSchema = z
-  .object({
-    ...onboardingFeatureSetupSelectionSchema,
-    cohort: cohortSchema
-  })
-  .refine(
-    hasMatchingOnboardingFeatureSetupSelectedCount,
-    onboardingFeatureSetupSelectedCountRefinement
-  )
-  .strict()
-const onboardingFeatureSetupTerminalInteractedSchema = z
-  .object({
-    ...onboardingFeatureSetupSelectionSchema,
-    method: z.enum(['keyboard', 'pointer']),
-    cohort: cohortSchema
-  })
-  .refine(
-    hasMatchingOnboardingFeatureSetupSelectedCount,
-    onboardingFeatureSetupSelectedCountRefinement
-  )
-  .strict()
-
-const featureEducationSourceSchema = z.enum(FEATURE_EDUCATION_SOURCES)
-const featureEducationContextualTourIdSchema = z.enum(FEATURE_EDUCATION_CONTEXTUAL_TOUR_IDS)
-const setupGuideSourceSchema = z.enum(SETUP_GUIDE_SOURCES)
-const setupGuideCloseOutcomeSchema = z.enum(SETUP_GUIDE_CLOSE_OUTCOMES)
-const setupGuideStepIdSchema = z.enum(FEATURE_WALL_SETUP_STEP_IDS)
-const setupGuideStepIdOrNoneSchema = z.enum([...FEATURE_WALL_SETUP_STEP_IDS, 'none'] as const)
-const terminalPaneSplitSourceSchema = z.enum(TERMINAL_PANE_SPLIT_SOURCES)
-
-const contextualTourShownSchema = z
-  .object({
-    tour_id: featureEducationContextualTourIdSchema,
-    source: featureEducationSourceSchema,
-    was_feature_previously_interacted: z.boolean()
-  })
-  .strict()
-
-const contextualTourOutcomeSchema = z
-  .object({
-    tour_id: featureEducationContextualTourIdSchema,
-    source: featureEducationSourceSchema,
-    outcome: z.enum(CONTEXTUAL_TOUR_OUTCOMES),
-    steps_seen: z.number().int().min(0).max(8),
-    total_steps: z.number().int().min(1).max(8),
-    furthest_step_index: z.number().int().min(1).max(8).optional(),
-    defined_step_count: z.number().int().min(1).max(8).optional()
-  })
-  .refine((payload) => payload.steps_seen <= payload.total_steps, {
-    message: 'steps_seen must be less than or equal to total_steps',
-    path: ['steps_seen']
-  })
-  .refine(
-    (payload) =>
-      payload.furthest_step_index === undefined ||
-      payload.defined_step_count === undefined ||
-      payload.furthest_step_index <= payload.defined_step_count,
-    {
-      message: 'furthest_step_index must be less than or equal to defined_step_count',
-      path: ['furthest_step_index']
-    }
-  )
-  .refine(
-    (payload) =>
-      (payload.furthest_step_index === undefined) === (payload.defined_step_count === undefined),
-    {
-      message: 'furthest_step_index and defined_step_count must be sent together',
-      path: ['defined_step_count']
-    }
-  )
-  .strict()
-
-const setupGuideOpenedSchema = z
-  .object({
-    source: setupGuideSourceSchema,
-    initial_completed_count: z.number().int().min(0).max(8),
-    total_steps: z.literal(8),
-    first_incomplete_step_id: setupGuideStepIdOrNoneSchema
-  })
-  .strict()
-
-const setupGuideClosedSchema = z
-  .object({
-    source: setupGuideSourceSchema,
-    outcome: setupGuideCloseOutcomeSchema,
-    initial_completed_count: z.number().int().min(0).max(8),
-    final_completed_count: z.number().int().min(0).max(8),
-    total_steps: z.literal(8),
-    active_step_id: setupGuideStepIdOrNoneSchema
-  })
-  .refine((payload) => payload.final_completed_count >= payload.initial_completed_count, {
-    message: 'final_completed_count must be greater than or equal to initial_completed_count',
-    path: ['final_completed_count']
-  })
-  .strict()
-
-const setupGuideStepCompletedSchema = z
-  .object({
-    step_id: setupGuideStepIdSchema,
-    section_id: z.enum(['parallel-work', 'setup']),
-    completed_count: z.number().int().min(1).max(8),
-    total_steps: z.literal(8),
-    setup_guide_visible: z.boolean()
-  })
-  .strict()
-
-const terminalPaneSplitSchema = z
-  .object({
-    source: terminalPaneSplitSourceSchema,
-    direction: z.enum(['vertical', 'horizontal'])
-  })
-  .strict()
-
-// Why: measures the changed-on-disk conflict flow (issue #7265) per transport; deliberately path-free.
-const editorExternalChangeConflictShownSchema = z
-  .object({
-    surface: z.enum(['edit', 'unstaged-diff']),
-    transport: z.enum(['local', 'ssh', 'runtime']),
-    origin: z.enum(['live', 'restore'])
-  })
-  .strict()
-
-const editorExternalChangeConflictActionSchema = z
-  .object({
-    action: z.enum(['reload', 'keep', 'compare', 'undo_reload', 'save_overwrite']),
-    surface: z.enum(['edit', 'unstaged-diff']),
-    transport: z.enum(['local', 'ssh', 'runtime'])
-  })
-  .strict()
-
-const directSshReconnectCountSchema = z.number().int().min(0).max(1_000_000)
-const directSshReconnectDurationSchema = z.number().int().min(0).max(86_400_000)
-const directSshReconnectOperationSchema = z
-  .object({
-    mode: z.enum(['reconnect', 'prepare_only']),
-    reason: z.enum(['reconnect', 'initial_hydration', 'workspace_snapshot', 'wake_refresh']),
-    outcome: z.enum(['complete', 'degraded', 'canceled', 'stale', 'stopped', 'stabilizing']),
-    terminal_retried_count: directSshReconnectCountSchema,
-    terminal_stale_binding_cleared_count: directSshReconnectCountSchema,
-    terminal_correction_succeeded_count: directSshReconnectCountSchema,
-    catalog_complete_count: directSshReconnectCountSchema,
-    catalog_degraded_count: directSshReconnectCountSchema,
-    catalog_stale_count: directSshReconnectCountSchema,
-    repo_complete_count: directSshReconnectCountSchema,
-    repo_non_authoritative_count: directSshReconnectCountSchema,
-    repo_retrying_count: directSshReconnectCountSchema,
-    repo_timed_out_count: directSshReconnectCountSchema,
-    repo_cancel_budget_exhausted_count: directSshReconnectCountSchema,
-    repo_canceled_count: directSshReconnectCountSchema,
-    repo_stale_count: directSshReconnectCountSchema,
-    repo_rejected_count: directSshReconnectCountSchema,
-    lineage_complete_count: directSshReconnectCountSchema,
-    lineage_degraded_count: directSshReconnectCountSchema,
-    lineage_canceled_count: directSshReconnectCountSchema,
-    lineage_stale_count: directSshReconnectCountSchema,
-    lineage_not_started_count: directSshReconnectCountSchema,
-    git_worktree_count: directSshReconnectCountSchema,
-    folder_workspace_count: directSshReconnectCountSchema,
-    ambiguous_owner_count: directSshReconnectCountSchema,
-    contradictory_owner_count: directSshReconnectCountSchema,
-    total_duration_ms: directSshReconnectDurationSchema,
-    terminal_finalization_duration_ms: directSshReconnectDurationSchema,
-    catalog_duration_ms: directSshReconnectDurationSchema,
-    queue_wait_sample_count: directSshReconnectCountSchema,
-    queue_wait_duration_ms_p50: directSshReconnectDurationSchema,
-    queue_wait_duration_ms_p95: directSshReconnectDurationSchema,
-    queue_wait_duration_ms_p99: directSshReconnectDurationSchema,
-    queue_wait_duration_ms_max: directSshReconnectDurationSchema,
-    provider_execution_sample_count: directSshReconnectCountSchema,
-    provider_execution_duration_ms_p50: directSshReconnectDurationSchema,
-    provider_execution_duration_ms_p95: directSshReconnectDurationSchema,
-    provider_execution_duration_ms_p99: directSshReconnectDurationSchema,
-    provider_execution_duration_ms_max: directSshReconnectDurationSchema,
-    timeout_retry_count: directSshReconnectCountSchema,
-    locally_settled_waiter_count: directSshReconnectCountSchema,
-    cancel_debt_count: directSshReconnectCountSchema,
-    replacement_admission_delayed_count: directSshReconnectCountSchema,
-    overlapping_join_count: directSshReconnectCountSchema,
-    coordinator_owned_direct_ssh_detected_worktree_concurrency_peak:
-      directSshReconnectCountSchema.max(5),
-    estimated_late_work_allowance_count: directSshReconnectCountSchema.max(2),
-    authority_rotation_count: directSshReconnectCountSchema,
-    damped_preparation_count: directSshReconnectCountSchema
-  })
-  .strict()
-
-// ── Event registry: the one record the validator consumes ───────────────
-// Versioning: breaking changes (rename/re-mean/remove a key) need a new event name; in-place edits blend pre/post rows unmixably. Additive-optional fields are safe.
-export const eventSchemas = {
-  app_opened: appOpenedSchema,
-  app_starred_orca: appStarredOrcaSchema,
-  star_nag_outcome: starNagOutcomeEventSchema,
-  feature_interaction_usage_bucket_reached: featureInteractionUsageBucketReachedSchema,
-
-  repo_added: repoAddedSchema,
-  add_repo_setup_step_action: addRepoSetupStepActionEventSchema,
-  add_repo_existing_workspaces_detected: addRepoExistingWorkspacesDetectedSchema,
-  add_repo_default_checkout_handoff: addRepoDefaultCheckoutHandoffSchema,
-  add_repo_nested_scan_result: addRepoNestedScanResultSchema,
-  add_repo_nested_import_action: addRepoNestedImportActionSchema,
-  add_repo_nested_import_result: addRepoNestedImportResultSchema,
-  workspace_created: workspaceCreatedSchema,
-  workspace_create_failed: workspaceCreateFailedSchema,
-  setup_script_prompt_shown: setupScriptPromptShownSchema,
-  setup_script_prompt_action: setupScriptPromptActionSchema,
-
-  agent_started: agentStartedSchema,
-  agent_prompt_sent: agentPromptSentSchema,
-  agent_error: agentErrorSchema,
-  agent_hook_install_failed: agentHookInstallFailedSchema,
-  agent_hook_unattributed: agentHookUnattributedSchema,
-  agent_hook_transport_blocked: agentHookTransportBlockedSchema,
-
-  daemon_start_failed: daemonStartFailedSchema,
-  main_thread_hang_detected: mainThreadHangDetectedSchema,
-  daemon_lifecycle: daemonLifecycleSchema,
-  daemon_audit_eligibility: daemonAuditEligibilitySchema,
-  runtime_rpc_start_failed: runtimeRpcStartFailedSchema,
-  remote_outbound_budget_close: remoteOutboundBudgetCloseSchema,
-
-  codex_trust_grant: codexTrustGrantSchema,
-
-  settings_changed: settingsChangedSchema,
-
-  native_chat_toggled: nativeChatToggledSchema,
-  native_chat_message_sent: nativeChatMessageSentSchema,
-  native_chat_picker_opened: nativeChatPickerOpenedSchema,
-  native_chat_picker_item_accepted: nativeChatPickerItemAcceptedSchema,
-  native_chat_send_classified: nativeChatSendClassifiedSchema,
-  native_chat_skill_discovery: nativeChatSkillDiscoverySchema,
-
-  telemetry_opted_in: telemetryOptedInSchema,
-  telemetry_opted_out: telemetryOptedOutSchema,
-
-  orca_cli_feature_tip_shown: orcaCliFeatureTipShownSchema,
-  orca_cli_feature_tip_setup_clicked: orcaCliFeatureTipSetupClickedSchema,
-  orca_cli_feature_tip_setup_result: orcaCliFeatureTipSetupResultSchema,
-  cmd_j_palette_feature_tip_shown: cmdJPaletteFeatureTipShownSchema,
-  cmd_j_palette_feature_tip_acknowledged: cmdJPaletteFeatureTipAcknowledgedSchema,
-
-  feature_wall_opened: featureWallOpenedSchema,
-  feature_wall_closed: featureWallClosedSchema,
-  feature_wall_tile_focused: featureWallTileFocusedSchema,
-  feature_wall_tile_clicked: featureWallTileClickedSchema,
-  feature_wall_group_selected: featureWallGroupSelectedSchema,
-  feature_wall_feature_selected: featureWallFeatureSelectedSchema,
-  feature_wall_docs_clicked: featureWallDocsClickedSchema,
-
-  onboarding_started: onboardingStartedSchema,
-  onboarding_step_viewed: onboardingStepViewedSchema,
-  onboarding_step_completed: onboardingStepCompletedSchema,
-  onboarding_step_skipped: onboardingStepSkippedSchema,
-  onboarding_tour_outcome: onboardingTourOutcomeEventSchema,
-  onboarding_step4_path_clicked: onboardingStep4PathClickedSchema,
-  onboarding_step4_path_failed: onboardingStep4PathFailedSchema,
-  onboarding_task_sources_snapshot: onboardingTaskSourcesSnapshotSchema,
-  onboarding_windows_terminal_snapshot: onboardingWindowsTerminalSnapshotSchema,
-  onboarding_completed: onboardingCompletedSchema,
-  onboarding_dismissed: onboardingDismissedSchema,
-  onboarding_agent_picked: onboardingAgentPickedSchema,
-  onboarding_ghostty_discovered: onboardingGhosttyDiscoveredSchema,
-  onboarding_ghostty_import_clicked: onboardingGhosttyImportClickedSchema,
-  onboarding_ghostty_import_failed: onboardingGhosttyImportFailedSchema,
-  onboarding_feature_setup_toggled: onboardingFeatureSetupToggledSchema,
-  onboarding_feature_setup_run: onboardingFeatureSetupRunSchema,
-  onboarding_feature_setup_terminal_opened: onboardingFeatureSetupTerminalOpenedSchema,
-  onboarding_feature_setup_terminal_interacted: onboardingFeatureSetupTerminalInteractedSchema,
-  activation_checklist_item_completed: activationChecklistItemCompletedSchema,
-
-  contextual_tour_shown: contextualTourShownSchema,
-  contextual_tour_outcome: contextualTourOutcomeSchema,
-  setup_guide_opened: setupGuideOpenedSchema,
-  setup_guide_closed: setupGuideClosedSchema,
-  setup_guide_step_completed: setupGuideStepCompletedSchema,
-  terminal_pane_split: terminalPaneSplitSchema,
-
-  editor_external_change_conflict_shown: editorExternalChangeConflictShownSchema,
-  editor_external_change_conflict_action: editorExternalChangeConflictActionSchema,
-
-  direct_ssh_reconnect_operation: directSshReconnectOperationSchema,
-
-  smart_sort_class_distribution: smartSortClassDistributionSchema,
-  smart_sort_class_1_promotion: smartSortClass1PromotionSchema,
-  smart_to_recent_switch: smartToRecentSwitchSchema
-} as const
-
-export type EventMap = { [N in keyof typeof eventSchemas]: z.infer<(typeof eventSchemas)[N]> }
-export type EventName = keyof EventMap
-export type EventProps<N extends EventName> = EventMap[N]
-
-// Why: non-`ZodObject` schemas have no `.shape`; return null so `key in undefined` can't throw at module load.
-function eventSchemaShape(schema: z.ZodTypeAny): z.ZodRawShape | null {
-  if (schema instanceof z.ZodObject) {
-    return schema.shape
-  }
-
-  const shapeBearingSchema = schema as { shape?: unknown }
-  // Why: refined object schemas may expose `.shape` even when refinement breaks `instanceof ZodObject`.
-  if (shapeBearingSchema.shape && typeof shapeBearingSchema.shape === 'object') {
-    return shapeBearingSchema.shape as z.ZodRawShape
-  }
-  return null
-}
-
-function eventsWithShapeKey(key: string): ReadonlySet<EventName> {
-  return new Set(
-    (Object.entries(eventSchemas) as [EventName, z.ZodTypeAny][])
-      .filter(([, schema]) => {
-        const shape = eventSchemaShape(schema)
-        return shape !== null && key in shape
-      })
-      .map(([name]) => name)
-  )
-}
-
-// Cohort injection is gated on this derived set because `.strict()` schemas drop events that don't declare `nth_repo_added`.
-const COHORT_EXTENDED_SET = eventsWithShapeKey('nth_repo_added')
-
-// Compile-time roster guarding the runtime injection set against silent schema drift.
-type _CohortExtendedRoster =
-  | 'app_opened'
-  | 'app_starred_orca'
-  | 'star_nag_outcome'
-  | 'feature_interaction_usage_bucket_reached'
-  | 'repo_added'
-  | 'add_repo_setup_step_action'
-  | 'add_repo_existing_workspaces_detected'
-  | 'add_repo_default_checkout_handoff'
-  | 'add_repo_nested_scan_result'
-  | 'add_repo_nested_import_action'
-  | 'add_repo_nested_import_result'
-  | 'workspace_created'
-  | 'workspace_create_failed'
-  | 'setup_script_prompt_shown'
-  | 'setup_script_prompt_action'
-  | 'agent_started'
-  | 'agent_prompt_sent'
-  | 'agent_error'
-  | 'orca_cli_feature_tip_shown'
-  | 'orca_cli_feature_tip_setup_clicked'
-  | 'orca_cli_feature_tip_setup_result'
-  | 'cmd_j_palette_feature_tip_shown'
-  | 'cmd_j_palette_feature_tip_acknowledged'
-// Why: strict empty payloads infer a string index signature; ignore index-only keys so they aren't pulled into keyed rosters.
-type _KnownPayloadKeys<T> = string extends keyof T ? never : keyof T
-type _DerivedCohortExtendedEvents = {
-  [N in EventName]: 'nth_repo_added' extends _KnownPayloadKeys<EventMap[N]> ? N : never
-}[EventName]
-type _CohortExtendedRosterSync = _CohortExtendedRoster extends _DerivedCohortExtendedEvents
-  ? _DerivedCohortExtendedEvents extends _CohortExtendedRoster
-    ? true
-    : never
-  : never
-const _cohortExtendedRosterSyncCheck: _CohortExtendedRosterSync = true
-void _cohortExtendedRosterSyncCheck
-
-export function isCohortExtendedEvent(name: EventName): boolean {
-  return COHORT_EXTENDED_SET.has(name)
-}
-
-// Events whose schema declares `cohort`: the IPC handler injects cohort only for these — a `.strict()` schema without it would reject the event.
-const ONBOARDING_COHORT_SET = eventsWithShapeKey('cohort')
-// `NonNullable` strips `undefined` introduced by `cohortSchema`'s `.optional()`.
-export type OnboardingCohort = NonNullable<z.infer<typeof cohortSchema>>
-
-// Compile-time roster: dropping `cohort` from any of these fails tsc, rather than silently at runtime (`.optional()` would tolerate that).
-type _OnboardingCohortRoster =
-  | 'onboarding_started'
-  | 'onboarding_step_viewed'
-  | 'onboarding_step_completed'
-  | 'onboarding_step_skipped'
-  | 'onboarding_tour_outcome'
-  | 'onboarding_step4_path_clicked'
-  | 'onboarding_step4_path_failed'
-  | 'onboarding_task_sources_snapshot'
-  | 'onboarding_windows_terminal_snapshot'
-  | 'onboarding_completed'
-  | 'onboarding_dismissed'
-  | 'onboarding_agent_picked'
-  | 'onboarding_ghostty_discovered'
-  | 'onboarding_ghostty_import_clicked'
-  | 'onboarding_ghostty_import_failed'
-  | 'onboarding_feature_setup_toggled'
-  | 'onboarding_feature_setup_run'
-  | 'onboarding_feature_setup_terminal_opened'
-  | 'onboarding_feature_setup_terminal_interacted'
-type _DerivedOnboardingCohortEvents = {
-  [N in EventName]: 'cohort' extends _KnownPayloadKeys<EventMap[N]> ? N : never
-}[EventName]
-type _OnboardingCohortRosterSync = _OnboardingCohortRoster extends _DerivedOnboardingCohortEvents
-  ? _DerivedOnboardingCohortEvents extends _OnboardingCohortRoster
-    ? true
-    : never
-  : never
-const _onboardingCohortRosterSyncCheck: _OnboardingCohortRosterSync = true
-void _onboardingCohortRosterSyncCheck
-
-export function isOnboardingEvent(name: EventName): boolean {
-  return ONBOARDING_COHORT_SET.has(name)
-}
-
-// No `env` discriminator: every transmitted event is from an official CI build (dev/contributor builds only console-mirror).
-// The per-field `.max(64)` is the validator's string-length cap — there is no separate post-parse length check.
-export const commonPropsSchema = z
-  .object({
-    app_version: z.string().max(64),
-    platform: z.string().max(64),
-    arch: z.string().max(64),
-    os_release: z.string().max(64),
-    // `.min(1)`: an empty install_id/session_id would collapse unrelated events into one synthetic user/session, corrupting analytics.
-    install_id: z.string().min(1).max(64),
-    session_id: z.string().min(1).max(64),
-    orca_channel: z.enum(['stable', 'rc'])
-  })
-  .strict()
-export type CommonProps = z.infer<typeof commonPropsSchema>
+export {
+  AGENT_KIND_VALUES,
+  SETTINGS_CHANGED_WHITELIST,
+  addRepoDefaultCheckoutHandoffReasonSchema,
+  addRepoDefaultCheckoutHandoffResultSchema,
+  addRepoDefaultCheckoutHandoffSourceSchema,
+  addRepoExistingWorkspaceSourceSchema,
+  addRepoSetupStepActionSchema,
+  agentKindSchema,
+  errorClassSchema,
+  featureWallExitActionSchema,
+  featureWallOpenSourceSchema,
+  featureWallTileIdSchema,
+  featureWallTourDepthStepSchema,
+  featureWallWorkflowIdSchema,
+  launchSourceSchema,
+  optInViaSchema,
+  repoMethodSchema,
+  requestKindSchema,
+  settingsChangedKeySchema,
+  setupScriptImportProviderSchema,
+  workspaceCreateErrorClassSchema,
+  workspaceSourceSchema
+} from './telemetry-property-schemas'
+export type {
+  AddRepoDefaultCheckoutHandoffSource,
+  AddRepoExistingWorkspaceSource,
+  AgentKind,
+  ErrorClass,
+  FeatureWallOpenSourceTelemetry,
+  LaunchSource,
+  OptInVia,
+  RepoMethod,
+  RequestKind,
+  SettingsChangedKey,
+  WorkspaceCreateErrorClass,
+  WorkspaceSource
+} from './telemetry-property-schemas'
+
+export {
+  featureInteractionCategorySchema,
+  featureInteractionIdSchema,
+  featureInteractionUsageBucketSchema,
+  featureInteractionUsageBucketSourceSchema
+} from './telemetry-app-event-schemas'
+export {
+  hookInstallAgentSchema,
+  runtimeRpcStartErrorClassSchema
+} from './telemetry-daemon-event-schemas'
+export type { HookInstallAgent, RuntimeRpcStartErrorClass } from './telemetry-daemon-event-schemas'
+export type { NativeChatRuntime } from './telemetry-native-feature-event-schemas'
+export { eventSchemas } from './telemetry-event-registry'
+export {
+  commonPropsSchema,
+  isCohortExtendedEvent,
+  isOnboardingEvent
+} from './telemetry-event-classification'
+export type {
+  CommonProps,
+  EventMap,
+  EventName,
+  EventProps,
+  OnboardingCohort
+} from './telemetry-event-classification'
diff --git a/src/shared/telemetry-feature-education-event-schemas.ts b/src/shared/telemetry-feature-education-event-schemas.ts
new file mode 100644
index 00000000000..18e6546026b
--- /dev/null
+++ b/src/shared/telemetry-feature-education-event-schemas.ts
@@ -0,0 +1,177 @@
+import { z } from 'zod'
+import {
+  CONTEXTUAL_TOUR_OUTCOMES,
+  FEATURE_EDUCATION_CONTEXTUAL_TOUR_IDS,
+  FEATURE_EDUCATION_SOURCES,
+  SETUP_GUIDE_CLOSE_OUTCOMES,
+  SETUP_GUIDE_SOURCES,
+  TERMINAL_PANE_SPLIT_SOURCES
+} from './feature-education-telemetry'
+import { FEATURE_WALL_SETUP_STEP_IDS } from './feature-wall-setup-steps'
+
+export const featureEducationSourceSchema = z.enum(FEATURE_EDUCATION_SOURCES)
+export const featureEducationContextualTourIdSchema = z.enum(FEATURE_EDUCATION_CONTEXTUAL_TOUR_IDS)
+export const setupGuideSourceSchema = z.enum(SETUP_GUIDE_SOURCES)
+export const setupGuideCloseOutcomeSchema = z.enum(SETUP_GUIDE_CLOSE_OUTCOMES)
+export const setupGuideStepIdSchema = z.enum(FEATURE_WALL_SETUP_STEP_IDS)
+export const setupGuideStepIdOrNoneSchema = z.enum([
+  ...FEATURE_WALL_SETUP_STEP_IDS,
+  'none'
+] as const)
+export const terminalPaneSplitSourceSchema = z.enum(TERMINAL_PANE_SPLIT_SOURCES)
+
+export const contextualTourShownSchema = z
+  .object({
+    tour_id: featureEducationContextualTourIdSchema,
+    source: featureEducationSourceSchema,
+    was_feature_previously_interacted: z.boolean()
+  })
+  .strict()
+
+export const contextualTourOutcomeSchema = z
+  .object({
+    tour_id: featureEducationContextualTourIdSchema,
+    source: featureEducationSourceSchema,
+    outcome: z.enum(CONTEXTUAL_TOUR_OUTCOMES),
+    steps_seen: z.number().int().min(0).max(8),
+    total_steps: z.number().int().min(1).max(8),
+    furthest_step_index: z.number().int().min(1).max(8).optional(),
+    defined_step_count: z.number().int().min(1).max(8).optional()
+  })
+  .refine((payload) => payload.steps_seen <= payload.total_steps, {
+    message: 'steps_seen must be less than or equal to total_steps',
+    path: ['steps_seen']
+  })
+  .refine(
+    (payload) =>
+      payload.furthest_step_index === undefined ||
+      payload.defined_step_count === undefined ||
+      payload.furthest_step_index <= payload.defined_step_count,
+    {
+      message: 'furthest_step_index must be less than or equal to defined_step_count',
+      path: ['furthest_step_index']
+    }
+  )
+  .refine(
+    (payload) =>
+      (payload.furthest_step_index === undefined) === (payload.defined_step_count === undefined),
+    {
+      message: 'furthest_step_index and defined_step_count must be sent together',
+      path: ['defined_step_count']
+    }
+  )
+  .strict()
+
+export const setupGuideOpenedSchema = z
+  .object({
+    source: setupGuideSourceSchema,
+    initial_completed_count: z.number().int().min(0).max(8),
+    total_steps: z.literal(8),
+    first_incomplete_step_id: setupGuideStepIdOrNoneSchema
+  })
+  .strict()
+
+export const setupGuideClosedSchema = z
+  .object({
+    source: setupGuideSourceSchema,
+    outcome: setupGuideCloseOutcomeSchema,
+    initial_completed_count: z.number().int().min(0).max(8),
+    final_completed_count: z.number().int().min(0).max(8),
+    total_steps: z.literal(8),
+    active_step_id: setupGuideStepIdOrNoneSchema
+  })
+  .refine((payload) => payload.final_completed_count >= payload.initial_completed_count, {
+    message: 'final_completed_count must be greater than or equal to initial_completed_count',
+    path: ['final_completed_count']
+  })
+  .strict()
+
+export const setupGuideStepCompletedSchema = z
+  .object({
+    step_id: setupGuideStepIdSchema,
+    section_id: z.enum(['parallel-work', 'setup']),
+    completed_count: z.number().int().min(1).max(8),
+    total_steps: z.literal(8),
+    setup_guide_visible: z.boolean()
+  })
+  .strict()
+
+export const terminalPaneSplitSchema = z
+  .object({
+    source: terminalPaneSplitSourceSchema,
+    direction: z.enum(['vertical', 'horizontal'])
+  })
+  .strict()
+
+// Why: measures the changed-on-disk conflict flow (issue #7265) per transport; deliberately path-free.
+export const editorExternalChangeConflictShownSchema = z
+  .object({
+    surface: z.enum(['edit', 'unstaged-diff']),
+    transport: z.enum(['local', 'ssh', 'runtime']),
+    origin: z.enum(['live', 'restore'])
+  })
+  .strict()
+
+export const editorExternalChangeConflictActionSchema = z
+  .object({
+    action: z.enum(['reload', 'keep', 'compare', 'undo_reload', 'save_overwrite']),
+    surface: z.enum(['edit', 'unstaged-diff']),
+    transport: z.enum(['local', 'ssh', 'runtime'])
+  })
+  .strict()
+
+export const directSshReconnectCountSchema = z.number().int().min(0).max(1_000_000)
+export const directSshReconnectDurationSchema = z.number().int().min(0).max(86_400_000)
+export const directSshReconnectOperationSchema = z
+  .object({
+    mode: z.enum(['reconnect', 'prepare_only']),
+    reason: z.enum(['reconnect', 'initial_hydration', 'workspace_snapshot', 'wake_refresh']),
+    outcome: z.enum(['complete', 'degraded', 'canceled', 'stale', 'stopped', 'stabilizing']),
+    terminal_retried_count: directSshReconnectCountSchema,
+    terminal_stale_binding_cleared_count: directSshReconnectCountSchema,
+    terminal_correction_succeeded_count: directSshReconnectCountSchema,
+    catalog_complete_count: directSshReconnectCountSchema,
+    catalog_degraded_count: directSshReconnectCountSchema,
+    catalog_stale_count: directSshReconnectCountSchema,
+    repo_complete_count: directSshReconnectCountSchema,
+    repo_non_authoritative_count: directSshReconnectCountSchema,
+    repo_retrying_count: directSshReconnectCountSchema,
+    repo_timed_out_count: directSshReconnectCountSchema,
+    repo_cancel_budget_exhausted_count: directSshReconnectCountSchema,
+    repo_canceled_count: directSshReconnectCountSchema,
+    repo_stale_count: directSshReconnectCountSchema,
+    repo_rejected_count: directSshReconnectCountSchema,
+    lineage_complete_count: directSshReconnectCountSchema,
+    lineage_degraded_count: directSshReconnectCountSchema,
+    lineage_canceled_count: directSshReconnectCountSchema,
+    lineage_stale_count: directSshReconnectCountSchema,
+    lineage_not_started_count: directSshReconnectCountSchema,
+    git_worktree_count: directSshReconnectCountSchema,
+    folder_workspace_count: directSshReconnectCountSchema,
+    ambiguous_owner_count: directSshReconnectCountSchema,
+    contradictory_owner_count: directSshReconnectCountSchema,
+    total_duration_ms: directSshReconnectDurationSchema,
+    terminal_finalization_duration_ms: directSshReconnectDurationSchema,
+    catalog_duration_ms: directSshReconnectDurationSchema,
+    queue_wait_sample_count: directSshReconnectCountSchema,
+    queue_wait_duration_ms_p50: directSshReconnectDurationSchema,
+    queue_wait_duration_ms_p95: directSshReconnectDurationSchema,
+    queue_wait_duration_ms_p99: directSshReconnectDurationSchema,
+    queue_wait_duration_ms_max: directSshReconnectDurationSchema,
+    provider_execution_sample_count: directSshReconnectCountSchema,
+    provider_execution_duration_ms_p50: directSshReconnectDurationSchema,
+    provider_execution_duration_ms_p95: directSshReconnectDurationSchema,
+    provider_execution_duration_ms_p99: directSshReconnectDurationSchema,
+    provider_execution_duration_ms_max: directSshReconnectDurationSchema,
+    timeout_retry_count: directSshReconnectCountSchema,
+    locally_settled_waiter_count: directSshReconnectCountSchema,
+    cancel_debt_count: directSshReconnectCountSchema,
+    replacement_admission_delayed_count: directSshReconnectCountSchema,
+    overlapping_join_count: directSshReconnectCountSchema,
+    coordinator_owned_direct_ssh_detected_worktree_concurrency_peak:
+      directSshReconnectCountSchema.max(5),
+    estimated_late_work_allowance_count: directSshReconnectCountSchema.max(2),
+    authority_rotation_count: directSshReconnectCountSchema,
+    damped_preparation_count: directSshReconnectCountSchema
+  })
+  .strict()
diff --git a/src/shared/telemetry-native-feature-event-schemas.ts b/src/shared/telemetry-native-feature-event-schemas.ts
new file mode 100644
index 00000000000..ad6791a8bae
--- /dev/null
+++ b/src/shared/telemetry-native-feature-event-schemas.ts
@@ -0,0 +1,133 @@
+import { z } from 'zod'
+import { FEATURE_WALL_MAX_DWELL_MS } from './feature-wall-telemetry'
+import { nthRepoAddedSchema } from './telemetry-app-event-schemas'
+import {
+  agentKindSchema,
+  featureWallExitActionSchema,
+  featureWallOpenSourceSchema,
+  featureWallTileIdSchema,
+  featureWallTourDepthStepSchema,
+  featureWallWorkflowIdSchema,
+  optInViaSchema
+} from './telemetry-property-schemas'
+
+// Native chat (terminal⇄chat toggle) adoption; view-mode enum mirrors `Tab.viewMode` in shared/types.ts.
+export const nativeChatViewModeSchema = z.enum(['terminal', 'chat'])
+export const nativeChatToggledSchema = z
+  .object({
+    from_mode: nativeChatViewModeSchema,
+    to_mode: nativeChatViewModeSchema,
+    agent_kind: agentKindSchema
+  })
+  .strict()
+// `runtime`: local vs SSH/remote agent PTY; `'unknown'` when unresolved at send time.
+export const nativeChatRuntimeSchema = z.enum(['local', 'remote', 'unknown'])
+export type NativeChatRuntime = z.infer<typeof nativeChatRuntimeSchema>
+export const nativeChatMessageSentSchema = z
+  .object({
+    agent_kind: agentKindSchema,
+    runtime: nativeChatRuntimeSchema
+  })
+  .strict()
+export const nativeChatPickerOpenedSchema = z
+  .object({ agent_kind: agentKindSchema, prefix: z.enum(['slash', 'dollar']) })
+  .strict()
+export const nativeChatPickerItemAcceptedSchema = z
+  .object({ agent_kind: agentKindSchema, item_kind: z.enum(['command', 'skill']) })
+  .strict()
+export const nativeChatSendClassifiedSchema = z
+  .object({ agent_kind: agentKindSchema, outcome: z.enum(['chat', 'command', 'unknown-token']) })
+  .strict()
+export const nativeChatSkillDiscoverySchema = z
+  .object({
+    agent_kind: agentKindSchema,
+    outcome: z.enum(['ready', 'error', 'timeout', 'unavailable']),
+    execution_host_kind: z.enum(['local', 'runtime', 'ssh'])
+  })
+  .strict()
+
+export const telemetryOptedInSchema = z.object({ via: optInViaSchema }).strict()
+export const telemetryOptedOutSchema = z.object({ via: optInViaSchema }).strict()
+
+export const orcaCliFeatureTipSourceSchema = z.enum(['app_open', 'manual'])
+export const orcaCliFeatureTipShownSchema = z
+  .object({
+    source: orcaCliFeatureTipSourceSchema,
+    nth_repo_added: nthRepoAddedSchema
+  })
+  .strict()
+export const orcaCliFeatureTipSetupClickedSchema = z
+  .object({
+    source: orcaCliFeatureTipSourceSchema,
+    nth_repo_added: nthRepoAddedSchema
+  })
+  .strict()
+export const orcaCliFeatureTipSetupResultSchema = z
+  .object({
+    source: orcaCliFeatureTipSourceSchema,
+    result: z.enum(['installed', 'needs_attention', 'dev_preview', 'failed']),
+    nth_repo_added: nthRepoAddedSchema
+  })
+  .strict()
+
+export const cmdJPaletteFeatureTipShownSchema = z
+  .object({
+    source: orcaCliFeatureTipSourceSchema,
+    nth_repo_added: nthRepoAddedSchema
+  })
+  .strict()
+export const cmdJPaletteFeatureTipAcknowledgedSchema = z
+  .object({
+    source: orcaCliFeatureTipSourceSchema,
+    nth_repo_added: nthRepoAddedSchema
+  })
+  .strict()
+
+export const featureWallOpenedSchema = z
+  .object({
+    source: featureWallOpenSourceSchema
+  })
+  .strict()
+export const featureWallClosedSchema = z
+  .object({
+    dwell_ms: z.number().int().min(0).max(FEATURE_WALL_MAX_DWELL_MS),
+    source: featureWallOpenSourceSchema.optional(),
+    exit_action: featureWallExitActionSchema.optional(),
+    furthest_step: featureWallTourDepthStepSchema.optional(),
+    last_group_id: featureWallWorkflowIdSchema.optional(),
+    visited_workflow_count: z.number().int().min(0).max(5).optional(),
+    visited_substep_count: z.number().int().min(0).max(9).optional(),
+    completed_workflow_count: z.number().int().min(0).max(5).optional(),
+    completed_substep_count: z.number().int().min(0).max(9).optional()
+  })
+  .strict()
+export const featureWallTileFocusedSchema = z
+  .object({
+    tile_id: featureWallTileIdSchema
+  })
+  .strict()
+export const featureWallTileClickedSchema = z
+  .object({
+    tile_id: featureWallTileIdSchema
+  })
+  .strict()
+export const featureWallGroupSelectedSchema = z
+  .object({
+    group_id: featureWallWorkflowIdSchema,
+    source: featureWallOpenSourceSchema
+  })
+  .strict()
+export const featureWallFeatureSelectedSchema = z
+  .object({
+    group_id: featureWallWorkflowIdSchema,
+    tile_id: featureWallTileIdSchema,
+    source: featureWallOpenSourceSchema
+  })
+  .strict()
+export const featureWallDocsClickedSchema = z
+  .object({
+    group_id: featureWallWorkflowIdSchema,
+    tile_id: featureWallTileIdSchema,
+    source: featureWallOpenSourceSchema
+  })
+  .strict()
diff --git a/src/shared/telemetry-onboarding-event-schemas.ts b/src/shared/telemetry-onboarding-event-schemas.ts
new file mode 100644
index 00000000000..d76cd466ece
--- /dev/null
+++ b/src/shared/telemetry-onboarding-event-schemas.ts
@@ -0,0 +1,296 @@
+import { z } from 'zod'
+import { FEATURE_WALL_MAX_DWELL_MS } from './feature-wall-telemetry'
+import type { DiscoveryStatusEmitted } from './onboarding-state-types'
+import type { PathSource, ShellHydrationFailureReason } from './shell-path-hydration-types'
+import { agentKindSchema, featureWallTourDepthStepSchema } from './telemetry-property-schemas'
+import {
+  cohortSchema,
+  hasMatchingOnboardingFeatureSetupSelectedCount,
+  onboardingChecklistItemSchema,
+  onboardingFailureReasonSchema,
+  onboardingFeatureSetupFeatureSchema,
+  onboardingFeatureSetupSelectedCountRefinement,
+  onboardingFeatureSetupSelectionSchema,
+  onboardingPathSchema,
+  onboardingStepSchema,
+  onboardingTaskSourcesExitActionSchema,
+  onboardingTaskSourcesGithubStatusSchema,
+  onboardingTaskSourcesLinearStatusSchema,
+  onboardingTourOutcomeSchema,
+  onboardingValueKindSchema,
+  onboardingWindowsTerminalExitActionSchema,
+  onboardingWindowsTerminalRightClickSchema,
+  onboardingWindowsTerminalShellSchema
+} from './telemetry-onboarding-foundation-schemas'
+
+// Uniform button/keyboard shape lets keyboard skip/dismiss paths arrive without a schema migration.
+export const advancedViaSchema = z.enum(['button', 'keyboard']).optional()
+
+export const onboardingStartedSchema = z
+  .object({ resumed_from_step: onboardingStepSchema.optional(), cohort: cohortSchema })
+  .strict()
+export const onboardingStepViewedSchema = z
+  .object({
+    step: onboardingStepSchema,
+    value_kind: onboardingValueKindSchema,
+    cohort: cohortSchema
+  })
+  .strict()
+export const onboardingStepCompletedSchema = z
+  .object({
+    step: onboardingStepSchema,
+    value_kind: onboardingValueKindSchema,
+    duration_ms: z.number().int().nonnegative().optional(),
+    advanced_via: advancedViaSchema,
+    cohort: cohortSchema
+  })
+  .strict()
+export const onboardingStepSkippedSchema = z
+  .object({
+    step: onboardingStepSchema,
+    value_kind: onboardingValueKindSchema,
+    duration_ms: z.number().int().nonnegative().optional(),
+    advanced_via: advancedViaSchema,
+    cohort: cohortSchema
+  })
+  .strict()
+export type OnboardingTourOutcomeTelemetry = {
+  outcome: z.infer<typeof onboardingTourOutcomeSchema>
+  tour_dwell_ms?: number
+  furthest_step?: z.infer<typeof featureWallTourDepthStepSchema>
+  visited_workflow_count?: number
+  visited_substep_count?: number
+  completed_workflow_count?: number
+  completed_substep_count?: number
+}
+
+export function validateOnboardingTourOutcome(
+  props: OnboardingTourOutcomeTelemetry,
+  ctx: z.RefinementCtx
+): void {
+  if (props.outcome !== 'skipped_intro') {
+    return
+  }
+  for (const key of [
+    'tour_dwell_ms',
+    'furthest_step',
+    'visited_workflow_count',
+    'visited_substep_count',
+    'completed_workflow_count',
+    'completed_substep_count'
+  ] as const) {
+    if (props[key] !== undefined) {
+      ctx.addIssue({
+        code: 'custom',
+        path: [key],
+        message: `${key} is only valid after the inline tour starts`
+      })
+    }
+  }
+}
+
+export const onboardingTourOutcomeEventSchema = z
+  .object({
+    outcome: onboardingTourOutcomeSchema,
+    intro_duration_ms: z.number().int().min(0).max(FEATURE_WALL_MAX_DWELL_MS).optional(),
+    tour_dwell_ms: z.number().int().min(0).max(FEATURE_WALL_MAX_DWELL_MS).optional(),
+    furthest_step: featureWallTourDepthStepSchema.optional(),
+    visited_workflow_count: z.number().int().min(0).max(5).optional(),
+    visited_substep_count: z.number().int().min(0).max(9).optional(),
+    completed_workflow_count: z.number().int().min(0).max(5).optional(),
+    completed_substep_count: z.number().int().min(0).max(9).optional(),
+    advanced_via: advancedViaSchema,
+    cohort: cohortSchema
+  })
+  .strict()
+  .superRefine(validateOnboardingTourOutcome)
+export const onboardingStep4PathClickedSchema = z
+  .object({ path: onboardingPathSchema, cohort: cohortSchema })
+  .strict()
+export const onboardingStep4PathFailedSchema = z
+  .object({
+    path: onboardingPathSchema,
+    reason: onboardingFailureReasonSchema,
+    cohort: cohortSchema
+  })
+  .strict()
+export const onboardingTaskSourcesSnapshotSchema = z
+  .object({
+    github_status: onboardingTaskSourcesGithubStatusSchema,
+    linear_status: onboardingTaskSourcesLinearStatusSchema,
+    exit_action: onboardingTaskSourcesExitActionSchema,
+    duration_ms: z.number().int().nonnegative().optional(),
+    advanced_via: advancedViaSchema,
+    cohort: cohortSchema
+  })
+  .strict()
+export const onboardingWindowsTerminalSnapshotSchema = z
+  .object({
+    default_shell: onboardingWindowsTerminalShellSchema,
+    right_click_behavior: onboardingWindowsTerminalRightClickSchema,
+    exit_action: onboardingWindowsTerminalExitActionSchema,
+    duration_ms: z.number().int().nonnegative().optional(),
+    advanced_via: advancedViaSchema,
+    cohort: cohortSchema
+  })
+  .strict()
+// Why: no `is_git_repo` here; the signal moved to `repo_added.is_git_repo`.
+export const onboardingCompletedSchema = z
+  .object({
+    path: onboardingPathSchema,
+    total_duration_ms: z.number().int().nonnegative(),
+    cohort: cohortSchema
+  })
+  .strict()
+export const onboardingDismissedSchema = z
+  .object({
+    last_step: onboardingStepSchema,
+    duration_ms: z.number().int().nonnegative().optional(),
+    advanced_via: advancedViaSchema,
+    cohort: cohortSchema
+  })
+  .strict()
+export const activationChecklistItemCompletedSchema = z
+  .object({
+    item: onboardingChecklistItemSchema,
+    time_since_completed_ms: z.number().int().nonnegative()
+  })
+  .strict()
+
+// Why: disambiguates `on_path:false` rows on dashboard 1562016 (shell-hydration failure vs genuinely-not-on-PATH). See docs/agent-on-path-detection.md.
+export const pathSourceSchema = z.enum(['shell_hydrate', 'sync_seed_only'])
+export const pathFailureReasonSchema = z.enum([
+  'none',
+  'no_shell',
+  'timeout',
+  'spawn_error',
+  'empty_path'
+])
+
+// Compile-time guard: schema enum must match `ShellHydrationFailureReason`; drift breaks the build, not runtime parsing.
+export type _PathFailureReasonSync =
+  z.infer<typeof pathFailureReasonSchema> extends ShellHydrationFailureReason
+    ? ShellHydrationFailureReason extends z.infer<typeof pathFailureReasonSchema>
+      ? true
+      : never
+    : never
+export const _pathFailureReasonSyncCheck: _PathFailureReasonSync = true
+void _pathFailureReasonSyncCheck
+
+export type _PathSourceSync =
+  z.infer<typeof pathSourceSchema> extends PathSource
+    ? PathSource extends z.infer<typeof pathSourceSchema>
+      ? true
+      : never
+    : never
+export const _pathSourceSyncCheck: _PathSourceSync = true
+void _pathSourceSyncCheck
+
+// Fired at click time (captures mind-changes); `agent_kind` uses `tuiAgentToAgentKind` to keep the wire enum closed.
+export const onboardingAgentPickedSchema = z
+  .object({
+    agent_kind: agentKindSchema,
+    on_path: z.boolean(),
+    detected_count: z.number().int().nonnegative(),
+    // `'pending'` when detection is still running at click time (picked-before-detection vs picked-the-only-agent).
+    detection_state: z.enum(['complete', 'pending']),
+    // `true` when the agent lived under the "Show N more" disclosure — signals demand for less-popular agents.
+    from_collapsed_section: z.boolean(),
+    // Why: `.optional()` is load-bearing so pre-deploy events validate under `.strict()`. See docs/agent-on-path-detection.md.
+    path_source: pathSourceSchema.optional(),
+    path_failure_reason: pathFailureReasonSchema.optional(),
+    cohort: cohortSchema
+  })
+  .strict()
+
+// Mirrors ThemeStep.tsx DiscoveryState; `failed` is intentionally absent (it's an import outcome, see onboarding_ghostty_import_failed).
+export const ghosttyDiscoveryStateSchema = z.enum(['found', 'absent', 'imported'])
+
+// Compile-time guard: schema enum must stay in sync with the renderer's DiscoveryState; drift breaks the build, not runtime.
+export type _GhosttyDiscoveryStateSync =
+  z.infer<typeof ghosttyDiscoveryStateSchema> extends DiscoveryStatusEmitted
+    ? DiscoveryStatusEmitted extends z.infer<typeof ghosttyDiscoveryStateSchema>
+      ? true
+      : never
+    : never
+export const _ghosttyDiscoveryStateSyncCheck: _GhosttyDiscoveryStateSync = true
+void _ghosttyDiscoveryStateSyncCheck
+
+export const onboardingGhosttyDiscoveredSchema = z
+  .object({
+    state: ghosttyDiscoveryStateSchema,
+    // Bucketed not raw: exact group counts fingerprint heavy customizers.
+    field_group_count_bucket: z.enum(['0', '1-3', '4-7', '8+']),
+    cohort: cohortSchema
+  })
+  .strict()
+export const onboardingGhosttyImportClickedSchema = z.object({ cohort: cohortSchema }).strict()
+
+// Smart-sort telemetry: measures whether the redesign concentrates users in Class 1-3, and flags Smart→Recent abandonment as a regression.
+export const smartSortClassDistributionSchema = z
+  .object({
+    class_1: z.number().int().nonnegative(),
+    class_2: z.number().int().nonnegative(),
+    class_3: z.number().int().nonnegative(),
+    class_4: z.number().int().nonnegative(),
+    total_worktrees: z.number().int().nonnegative()
+  })
+  .strict()
+export const smartSortClass1PromotionSchema = z
+  .object({
+    cause: z.enum(['blocked', 'waiting', 'title-heuristic'])
+  })
+  .strict()
+// Why `_v` not `z.object({})`: empty zod object infers as TS `{}` ("anything"), breaking the `keyof EventMap[N]` roster probes.
+export const smartToRecentSwitchSchema = z.object({ _v: z.literal(1).optional() }).strict()
+export const onboardingGhosttyImportFailedSchema = z
+  .object({
+    // `'no_config'` is reserved for future use; call sites currently emit `'empty_diff'` or `'unknown'`.
+    reason: z.enum(['no_config', 'empty_diff', 'unknown']),
+    cohort: cohortSchema
+  })
+  .strict()
+export const onboardingFeatureSetupToggledSchema = z
+  .object({
+    feature: onboardingFeatureSetupFeatureSchema,
+    selected: z.boolean(),
+    cohort: cohortSchema
+  })
+  .strict()
+export const onboardingFeatureSetupRunSchema = z
+  .object({
+    ...onboardingFeatureSetupSelectionSchema,
+    cli_touched: z.boolean(),
+    skill_commands_copied: z.boolean(),
+    skill_install_command_prepared: z.boolean(),
+    computer_use_permissions_opened: z.boolean(),
+    warning_count: z.number().int().nonnegative(),
+    cohort: cohortSchema
+  })
+  // Why: validate derived selected_count at the untrusted IPC boundary rather than trust renderer callers.
+  .refine(
+    hasMatchingOnboardingFeatureSetupSelectedCount,
+    onboardingFeatureSetupSelectedCountRefinement
+  )
+  .strict()
+export const onboardingFeatureSetupTerminalOpenedSchema = z
+  .object({
+    ...onboardingFeatureSetupSelectionSchema,
+    cohort: cohortSchema
+  })
+  .refine(
+    hasMatchingOnboardingFeatureSetupSelectedCount,
+    onboardingFeatureSetupSelectedCountRefinement
+  )
+  .strict()
+export const onboardingFeatureSetupTerminalInteractedSchema = z
+  .object({
+    ...onboardingFeatureSetupSelectionSchema,
+    method: z.enum(['keyboard', 'pointer']),
+    cohort: cohortSchema
+  })
+  .refine(
+    hasMatchingOnboardingFeatureSetupSelectedCount,
+    onboardingFeatureSetupSelectedCountRefinement
+  )
+  .strict()
diff --git a/src/shared/telemetry-onboarding-foundation-schemas.ts b/src/shared/telemetry-onboarding-foundation-schemas.ts
new file mode 100644
index 00000000000..4012e4c0eae
--- /dev/null
+++ b/src/shared/telemetry-onboarding-foundation-schemas.ts
@@ -0,0 +1,125 @@
+import { z } from 'zod'
+import type { OnboardingChecklistState } from './onboarding-state-types'
+
+// ── Onboarding ──────────────────────────────────────────────────────────
+// Closed enums only — no raw paths/repo names/URLs/error strings (measures activation, not repo debugging).
+// Why: event names still carry legacy seven-step payloads; keep validation backward-compatible for old rows.
+export const ONBOARDING_TELEMETRY_LEGACY_MAX_STEP = 7
+export const onboardingStepSchema = z
+  .number()
+  .int()
+  .min(1)
+  .max(ONBOARDING_TELEMETRY_LEGACY_MAX_STEP)
+export const onboardingPathSchema = z.enum(['open_folder', 'clone_url', 'add_project_modal'])
+export const onboardingFailureReasonSchema = z.enum([
+  'invalid_path',
+  'clone_failed',
+  'cancelled',
+  'unknown'
+])
+export const onboardingValueKindSchema = z.enum([
+  'agent',
+  'theme',
+  'notifications',
+  'agent_setup',
+  'integrations',
+  'windows_terminal',
+  'tour',
+  'repo'
+])
+export const onboardingTourOutcomeSchema = z.enum([
+  'skipped_intro',
+  'started_partial',
+  'completed_inline'
+])
+export const onboardingTaskSourcesGithubStatusSchema = z.enum([
+  'connected',
+  'not_authenticated',
+  'not_installed',
+  'checking',
+  'unknown'
+])
+export const onboardingTaskSourcesLinearStatusSchema = z.enum([
+  'connected',
+  'not_connected',
+  'checking',
+  'unknown'
+])
+export const onboardingTaskSourcesExitActionSchema = z.enum(['continue', 'skip_to_project_setup'])
+export const onboardingWindowsTerminalShellSchema = z.enum([
+  'powershell',
+  'command_prompt',
+  'git_bash',
+  'wsl',
+  'other'
+])
+export const onboardingWindowsTerminalRightClickSchema = z.enum(['paste', 'menu'])
+export const onboardingWindowsTerminalExitActionSchema = z.enum([
+  'continue',
+  'skip_to_project_setup'
+])
+// `dismissed` is intentionally excluded — it's a UI panel-visibility flag, not an activation event.
+export const onboardingChecklistItemSchema = z.enum([
+  'addedRepo',
+  'addedFolder',
+  'choseAgent',
+  'ranFirstAgent',
+  'ranSecondAgentOnSameTask',
+  'triedCmdJ',
+  'shapedSidebar',
+  'reviewedDiff',
+  'openedPr',
+  'openedFile',
+  'ranAgentOnFile'
+])
+export const onboardingFeatureSetupFeatureSchema = z.enum([
+  'browser_use',
+  'computer_use',
+  'orchestration',
+  'linear_tickets'
+])
+export const onboardingFeatureSetupSelectionSchema = {
+  browser_use: z.boolean(),
+  computer_use: z.boolean(),
+  linear_tickets: z.boolean(),
+  orchestration: z.boolean(),
+  selected_count: z.number().int().min(0).max(3)
+} as const
+export type OnboardingFeatureSetupSelectionTelemetry = {
+  browser_use: boolean
+  computer_use: boolean
+  linear_tickets: boolean
+  orchestration: boolean
+  selected_count: number
+}
+export const onboardingFeatureSetupSelectedCountRefinement = {
+  path: ['selected_count'],
+  message: 'selected_count must match selected feature flags'
+}
+
+export function hasMatchingOnboardingFeatureSetupSelectedCount(
+  props: OnboardingFeatureSetupSelectionTelemetry
+): boolean {
+  // Why: Linear ticket setup is a recommended add-on and excluded from progress metrics.
+  const selectedCount =
+    (props.browser_use ? 1 : 0) + (props.computer_use ? 1 : 0) + (props.orchestration ? 1 : 0)
+  return props.selected_count === selectedCount
+}
+
+// Compile-time guard: enum must match OnboardingChecklistState activation keys (minus UI-only `dismissed`); drift breaks the build.
+export type _OnboardingChecklistItemSync =
+  z.infer<typeof onboardingChecklistItemSchema> extends Exclude<
+    keyof OnboardingChecklistState,
+    'dismissed'
+  >
+    ? Exclude<keyof OnboardingChecklistState, 'dismissed'> extends z.infer<
+        typeof onboardingChecklistItemSchema
+      >
+      ? true
+      : never
+    : never
+export const _onboardingChecklistItemSyncCheck: _OnboardingChecklistItemSync = true
+void _onboardingChecklistItemSyncCheck
+
+// Cohort discriminator for onboarding events; `.optional()` is load-bearing so `.strict()` accepts the `undefined` fallback.
+export const cohortSchema = z.enum(['fresh_install', 'upgrade_backfill']).optional()
diff --git a/src/shared/telemetry-property-schemas.ts b/src/shared/telemetry-property-schemas.ts
new file mode 100644
index 00000000000..3346ea73320
--- /dev/null
+++ b/src/shared/telemetry-property-schemas.ts
@@ -0,0 +1,203 @@
+import { z } from 'zod'
+import { FEATURE_WALL_EXIT_ACTIONS, FEATURE_WALL_TOUR_DEPTH_STEPS } from './feature-wall-tour-depth'
+import { SETUP_SCRIPT_IMPORT_PROVIDERS } from './setup-script-import-providers'
+import { WORKSPACE_SOURCE_VALUES, type WorkspaceSource } from './workspace-source'
+import type { GlobalSettings } from './global-settings-types'
+
+// ── Shared property enums ───────────────────────────────────────────────
+
+// Mirrors `TuiAgent` launch surface; `claude`↔`claude-code` (product, not CLI string). `other` is the escape hatch; see `tuiAgentToAgentKind`.
+export const AGENT_KIND_VALUES = [
+  'claude-code',
+  'claude-agent-teams',
+  'openclaude',
+  'codex',
+  'autohand',
+  'opencode',
+  'mimo-code',
+  'pi',
+  'omp',
+  'prime-agent',
+  'gemini',
+  'antigravity',
+  'aider',
+  'goose',
+  'amp',
+  'kilo',
+  'kiro',
+  'crush',
+  'aug',
+  'cline',
+  'codebuff',
+  'command-code',
+  'continue',
+  'cursor',
+  'droid',
+  'kimi',
+  'mistral-vibe',
+  'qwen-code',
+  'rovo',
+  'hermes',
+  'openclaw',
+  'copilot',
+  'grok',
+  'devin',
+  'ante',
+  'trae',
+  'other'
+] as const
+export const agentKindSchema = z.enum(AGENT_KIND_VALUES)
+export type AgentKind = z.infer<typeof agentKindSchema>
+
+// Small set: only failures Orca's PTY-typed-command launch can observe (`binary_not_found` = shell ENOENT, `paste_readiness_timeout`, `unknown`).
+// Provider-side errors (auth/rate-limit/network) happen inside the agent CLI subprocess and are invisible to Orca. See telemetry-plan.md §Defer per-incident error fields.
+export const errorClassSchema = z.enum(['binary_not_found', 'paste_readiness_timeout', 'unknown'])
+export type ErrorClass = z.infer<typeof errorClassSchema>
+
+export const repoMethodSchema = z.enum(['folder_picker', 'clone_url', 'drag_drop'])
+export type RepoMethod = z.infer<typeof repoMethodSchema>
+
+// Historical setup-step choices (current flows skip that screen); kept for pre-rollout rows and compatibility.
+export const addRepoSetupStepActionSchema = z.enum([
+  'open_primary',
+  'create_worktree',
+  'configure',
+  'skip',
+  'open_existing',
+  'back'
+])
+
+export const addRepoExistingWorkspaceSourceSchema = z.enum([
+  'local_folder_picker',
+  'runtime_server_path',
+  'ssh_remote_path',
+  'clone_url',
+  'create_project'
+])
+export type AddRepoExistingWorkspaceSource = z.infer<typeof addRepoExistingWorkspaceSourceSchema>
+export const addRepoDefaultCheckoutHandoffSourceSchema = z.enum([
+  'local_folder_picker',
+  'runtime_server_path',
+  'ssh_remote_path',
+  'clone_url',
+  'create_project',
+  'onboarding_open_folder',
+  'onboarding_clone_url',
+  'project_added_compat'
+])
+export type AddRepoDefaultCheckoutHandoffSource = z.infer<
+  typeof addRepoDefaultCheckoutHandoffSourceSchema
+>
+export const addRepoDefaultCheckoutHandoffResultSchema = z.enum([
+  'opened_default_checkout',
+  'revealed_project'
+])
+export const addRepoDefaultCheckoutHandoffReasonSchema = z.enum([
+  'loaded_default_checkout',
+  'detected_default_checkout',
+  'no_authoritative_detection',
+  'no_default_checkout',
+  'show_detected_default_failed',
+  'show_detected_linked_failed',
+  'authoritative_refresh_failed',
+  'linked_external_refresh_failed',
+  'refreshed_default_missing'
+])
+
+export const setupScriptImportProviderSchema = z.enum(SETUP_SCRIPT_IMPORT_PROVIDERS)
+
+// Separate enum from `errorClassSchema` — different domain (git/filesystem worktree-create failures); merging would couple the two forever.
+export const workspaceCreateErrorClassSchema = z.enum([
+  'git_failed',
+  'path_collision',
+  'permission_denied',
+  'base_ref_missing',
+  'unknown'
+])
+export type WorkspaceCreateErrorClass = z.infer<typeof workspaceCreateErrorClassSchema>
+
+export const workspaceSourceSchema = z.enum(WORKSPACE_SOURCE_VALUES)
+export type { WorkspaceSource }
+
+export const launchSourceSchema = z.enum([
+  'command_palette',
+  'sidebar',
+  'quick_command',
+  'tab_bar_quick_launch',
+  'task_page',
+  'new_workspace_composer',
+  'workspace_jump_palette',
+  'shortcut',
+  'onboarding',
+  'diff_notes_send',
+  'notes_send',
+  'conflict_resolution',
+  'source_control_recovery',
+  'terminal_context_menu',
+  'unknown'
+])
+export type LaunchSource = z.infer<typeof launchSourceSchema>
+
+export const requestKindSchema = z.enum(['new', 'resume', 'followup'])
+export type RequestKind = z.infer<typeof requestKindSchema>
+
+export const featureWallTileIdSchema = z.enum([
+  'tile-01',
+  'tile-02',
+  'tile-03',
+  'tile-04',
+  'tile-05',
+  'tile-06',
+  'tile-07',
+  'tile-08',
+  'tile-09',
+  'tile-10',
+  'tile-11',
+  'tile-12'
+])
+
+export const featureWallOpenSourceSchema = z.enum(['help_menu', 'popup', 'onboarding', 'unknown'])
+export type FeatureWallOpenSourceTelemetry = z.infer<typeof featureWallOpenSourceSchema>
+
+export const featureWallWorkflowIdSchema = z.enum([
+  'tasks',
+  'workspaces',
+  'agents-orchestration',
+  'workbench',
+  'review'
+])
+
+export const featureWallTourDepthStepSchema = z.enum(FEATURE_WALL_TOUR_DEPTH_STEPS)
+
+export const featureWallExitActionSchema = z.enum(FEATURE_WALL_EXIT_ACTIONS)
+
+// `env_var` absent — env-var/CI paths override consent at runtime only, never firing an opt-in/out event.
+// `first_launch_notice` absent — the new-user cohort has no first-launch surface; those opt-outs come via `'settings'`.
+export const optInViaSchema = z.enum(['first_launch_banner', 'settings'])
+export type OptInVia = z.infer<typeof optInViaSchema>
+
+// Whitelist of settings emittable on `settings_changed`. `orca_channel` (build-time, not user-togglable) is absent.
+// The telemetry opt-in toggle is also absent — it fires dedicated `telemetry_opted_in/out` events; listing it would double-fire.
+export type BooleanGlobalSettingsKey = {
+  // Why: new toggles may be optional for legacy-settings compat but are still boolean once defaulted.
+  [Key in keyof GlobalSettings]-?: NonNullable<GlobalSettings[Key]> extends boolean ? Key : never
+}[keyof GlobalSettings]
+export const SETTINGS_CHANGED_WHITELIST = [
+  'editorAutoSave',
+  'openLinksInApp',
+  'openLinksInAppModifierInverts',
+  'terminalLinkActionPopoverEnabled',
+  'experimentalMobile',
+  'experimentalPet',
+  'experimentalNativeChat',
+  'experimentalStructuredNativeChat',
+  'experimentalActivity',
+  'experimentalAgentDashboardPopout',
+  'experimentalTerminalAttention',
+  'experimentalAgentHibernation',
+  'experimentalEphemeralVms',
+  'geminiCliOAuthEnabled',
+  'openAgentTabsInChatByDefault'
+] as const satisfies readonly BooleanGlobalSettingsKey[]
+export const settingsChangedKeySchema = z.enum(SETTINGS_CHANGED_WHITELIST)
+export type SettingsChangedKey = z.infer<typeof settingsChangedKeySchema>
diff --git a/src/shared/telemetry-repository-event-schemas.ts b/src/shared/telemetry-repository-event-schemas.ts
new file mode 100644
index 00000000000..f7be0dcff31
--- /dev/null
+++ b/src/shared/telemetry-repository-event-schemas.ts
@@ -0,0 +1,265 @@
+import { z } from 'zod'
+import {
+  NESTED_REPO_COUNT_BUCKETS,
+  NESTED_REPO_IMPORT_ACTIONS,
+  NESTED_REPO_IMPORT_OUTCOMES,
+  NESTED_REPO_SCAN_RESULTS,
+  NESTED_REPO_TELEMETRY_MAX_REPO_COUNT,
+  NESTED_REPO_TELEMETRY_RUNTIME_KINDS,
+  NESTED_REPO_TELEMETRY_SURFACES,
+  bucketNestedRepoTelemetryCount
+} from './nested-repo-telemetry'
+import { nthRepoAddedSchema } from './telemetry-app-event-schemas'
+import {
+  addRepoDefaultCheckoutHandoffReasonSchema,
+  addRepoDefaultCheckoutHandoffResultSchema,
+  addRepoDefaultCheckoutHandoffSourceSchema,
+  addRepoExistingWorkspaceSourceSchema,
+  addRepoSetupStepActionSchema,
+  setupScriptImportProviderSchema,
+  workspaceCreateErrorClassSchema,
+  workspaceSourceSchema
+} from './telemetry-property-schemas'
+
+export const existingWorkspaceCountSchema = z.number().int().min(1).max(50)
+export const addRepoExistingWorkspaceContextSchema = {
+  source: addRepoExistingWorkspaceSourceSchema,
+  existing_workspace_count: existingWorkspaceCountSchema,
+  existing_linked_workspace_count: z.number().int().min(0).max(50)
+} as const
+
+export const addRepoSetupStepActionEventSchema = z
+  .object({
+    action: addRepoSetupStepActionSchema,
+    source: addRepoExistingWorkspaceSourceSchema.optional(),
+    existing_workspace_count: existingWorkspaceCountSchema.optional(),
+    existing_linked_workspace_count: z.number().int().min(0).max(50).optional(),
+    nth_repo_added: nthRepoAddedSchema
+  })
+  .strict()
+export const addRepoExistingWorkspacesDetectedSchema = z
+  .object({
+    ...addRepoExistingWorkspaceContextSchema,
+    main_workspace_count: z.number().int().min(0).max(50),
+    branch_named_workspace_count: z.number().int().min(0).max(50),
+    detached_workspace_count: z.number().int().min(0).max(50),
+    custom_named_workspace_count: z.number().int().min(0).max(50),
+    sparse_workspace_count: z.number().int().min(0).max(50),
+    nth_repo_added: nthRepoAddedSchema
+  })
+  .strict()
+export const addRepoDefaultCheckoutHandoffSchema = z
+  .object({
+    source: addRepoDefaultCheckoutHandoffSourceSchema,
+    result: addRepoDefaultCheckoutHandoffResultSchema,
+    reason: addRepoDefaultCheckoutHandoffReasonSchema,
+    nth_repo_added: nthRepoAddedSchema
+  })
+  .strict()
+
+// Why: enum-only like `agent_error` — `.strict()` blocks raw error strings from ever crossing the wire.
+export const workspaceCreateFailedSchema = z
+  .object({
+    source: workspaceSourceSchema,
+    error_class: workspaceCreateErrorClassSchema,
+    nth_repo_added: nthRepoAddedSchema
+  })
+  .strict()
+
+export const setupScriptPromptModeSchema = z.enum(['import_available', 'configure_needed'])
+export const setupScriptCountBucketSchema = z.enum(['0', '1', '2-3', '4+'])
+export const setupScriptPromptContextSchema = {
+  mode: setupScriptPromptModeSchema,
+  // Why: superRefine (not transform) keeps the top-level ZodObject shape that cohort injection probes.
+  provider: setupScriptImportProviderSchema.optional(),
+  file_count_bucket: setupScriptCountBucketSchema,
+  unsupported_field_count_bucket: setupScriptCountBucketSchema,
+  has_shared_hooks: z.boolean(),
+  nth_repo_added: nthRepoAddedSchema
+} as const
+
+export type SetupScriptPromptContextTelemetry = {
+  mode: z.infer<typeof setupScriptPromptModeSchema>
+  provider?: z.infer<typeof setupScriptImportProviderSchema>
+}
+
+export function validateSetupScriptPromptProvider(
+  props: SetupScriptPromptContextTelemetry,
+  ctx: z.RefinementCtx
+): void {
+  if (props.mode === 'import_available' && props.provider === undefined) {
+    ctx.addIssue({
+      code: 'custom',
+      path: ['provider'],
+      message: 'provider is required when a setup candidate is available'
+    })
+  }
+  if (props.mode === 'configure_needed' && props.provider !== undefined) {
+    ctx.addIssue({
+      code: 'custom',
+      path: ['provider'],
+      message: 'provider is only valid when a setup candidate is available'
+    })
+  }
+}
+// Why: retention-cohort telemetry, not repo debugging — closed enums and count buckets only.
+export const setupScriptPromptShownSchema = z
+  .object(setupScriptPromptContextSchema)
+  .strict()
+  .superRefine(validateSetupScriptPromptProvider)
+export const setupScriptDetectedSaveActions = [
+  'save_detected_setup_clicked',
+  'save_detected_setup_completed',
+  'save_detected_setup_failed'
+] as const
+
+export function isSetupScriptDetectedSaveAction(action: unknown): boolean {
+  return setupScriptDetectedSaveActions.includes(action as never)
+}
+
+export function validateSetupScriptPromptAction(
+  props: SetupScriptPromptContextTelemetry & {
+    action?: string
+    edited_before_save?: boolean
+  },
+  ctx: z.RefinementCtx
+): void {
+  validateSetupScriptPromptProvider(props, ctx)
+  const isDetectedSave = isSetupScriptDetectedSaveAction(props.action)
+  if (isDetectedSave && props.provider !== 'package-manager') {
+    ctx.addIssue({
+      code: 'custom',
+      path: ['provider'],
+      message: 'detected setup save actions require the package-manager provider'
+    })
+  }
+  if (isDetectedSave && props.edited_before_save === undefined) {
+    ctx.addIssue({
+      code: 'custom',
+      path: ['edited_before_save'],
+      message: 'edited_before_save is required for detected setup save actions'
+    })
+  }
+  if (!isDetectedSave && props.edited_before_save !== undefined) {
+    ctx.addIssue({
+      code: 'custom',
+      path: ['edited_before_save'],
+      message: 'edited_before_save is only valid for detected setup save actions'
+    })
+  }
+}
+
+export const setupScriptPromptActionSchema = z
+  .object({
+    ...setupScriptPromptContextSchema,
+    action: z.enum([
+      'import_completed',
+      'import_failed',
+      'configure_clicked',
+      'dismissed',
+      ...setupScriptDetectedSaveActions
+    ]),
+    edited_before_save: z.boolean().optional()
+  })
+  .strict()
+  .superRefine(validateSetupScriptPromptAction)
+
+export const nestedRepoTelemetrySurfaceSchema = z.enum(NESTED_REPO_TELEMETRY_SURFACES)
+export const nestedRepoTelemetryRuntimeKindSchema = z.enum(NESTED_REPO_TELEMETRY_RUNTIME_KINDS)
+export const nestedRepoCountSchema = z
+  .number()
+  .int()
+  .min(0)
+  .max(NESTED_REPO_TELEMETRY_MAX_REPO_COUNT)
+export const nestedRepoCountBucketSchema = z.enum(NESTED_REPO_COUNT_BUCKETS)
+export const nestedRepoScanResultSchema = z.enum(NESTED_REPO_SCAN_RESULTS)
+export const nestedRepoImportActionSchema = z.enum(NESTED_REPO_IMPORT_ACTIONS)
+export const nestedRepoImportOutcomeSchema = z.enum(NESTED_REPO_IMPORT_OUTCOMES)
+export const nestedRepoScanPathKindSchema = z.enum(['git_repo', 'non_git_folder'])
+export const nestedRepoImportModeSchema = z.enum(['group', 'separate'])
+export const nestedRepoAttemptIdSchema = z.string().uuid()
+
+export function validateNestedRepoCountBucket(
+  props: Record<string, unknown>,
+  countKey: string,
+  bucketKey: string,
+  ctx: z.RefinementCtx
+): void {
+  const count = props[countKey]
+  const bucket = props[bucketKey]
+  if (typeof count !== 'number' || typeof bucket !== 'string') {
+    return
+  }
+  if (bucketNestedRepoTelemetryCount(count) !== bucket) {
+    ctx.addIssue({
+      code: 'custom',
+      path: [bucketKey],
+      message: `${bucketKey} must match ${countKey}`
+    })
+  }
+}
+
+export function validateNestedRepoCountBuckets(
+  props: Record<string, unknown>,
+  ctx: z.RefinementCtx
+): void {
+  validateNestedRepoCountBucket(props, 'found_count', 'found_count_bucket', ctx)
+  validateNestedRepoCountBucket(props, 'selected_count', 'selected_count_bucket', ctx)
+  validateNestedRepoCountBucket(props, 'imported_count', 'imported_count_bucket', ctx)
+  validateNestedRepoCountBucket(props, 'already_known_count', 'already_known_count_bucket', ctx)
+  validateNestedRepoCountBucket(props, 'failed_count', 'failed_count_bucket', ctx)
+}
+
+export const nestedRepoTelemetryBaseSchema = {
+  // Why: high-cardinality but random and non-persistent — correlates scan→action→result without path-derived IDs.
+  attempt_id: nestedRepoAttemptIdSchema,
+  surface: nestedRepoTelemetrySurfaceSchema,
+  runtime_kind: nestedRepoTelemetryRuntimeKindSchema,
+  nth_repo_added: nthRepoAddedSchema
+} as const
+
+export const addRepoNestedScanResultSchema = z
+  .object({
+    ...nestedRepoTelemetryBaseSchema,
+    result: nestedRepoScanResultSchema,
+    selected_path_kind: nestedRepoScanPathKindSchema.optional(),
+    found_count: nestedRepoCountSchema,
+    found_count_bucket: nestedRepoCountBucketSchema,
+    truncated: z.boolean(),
+    timed_out: z.boolean()
+  })
+  .strict()
+  .superRefine(validateNestedRepoCountBuckets)
+
+export const addRepoNestedImportActionSchema = z
+  .object({
+    ...nestedRepoTelemetryBaseSchema,
+    action: nestedRepoImportActionSchema,
+    found_count: nestedRepoCountSchema,
+    found_count_bucket: nestedRepoCountBucketSchema,
+    selected_count: nestedRepoCountSchema,
+    selected_count_bucket: nestedRepoCountBucketSchema,
+    all_selected: z.boolean()
+  })
+  .strict()
+  .superRefine(validateNestedRepoCountBuckets)
+
+export const addRepoNestedImportResultSchema = z
+  .object({
+    ...nestedRepoTelemetryBaseSchema,
+    mode: nestedRepoImportModeSchema,
+    outcome: nestedRepoImportOutcomeSchema,
+    found_count: nestedRepoCountSchema,
+    found_count_bucket: nestedRepoCountBucketSchema,
+    selected_count: nestedRepoCountSchema,
+    selected_count_bucket: nestedRepoCountBucketSchema,
+    imported_count: nestedRepoCountSchema,
+    imported_count_bucket: nestedRepoCountBucketSchema,
+    already_known_count: nestedRepoCountSchema,
+    already_known_count_bucket: nestedRepoCountBucketSchema,
+    failed_count: nestedRepoCountSchema,
+    failed_count_bucket: nestedRepoCountBucketSchema,
+    all_selected: z.boolean()
+  })
+  .strict()
+  .superRefine(validateNestedRepoCountBuckets)
diff --git a/tests/e2e/browser-split-find-shortcut.spec.ts b/tests/e2e/browser-split-shortcuts.spec.ts
similarity index 83%
rename from tests/e2e/browser-split-find-shortcut.spec.ts
rename to tests/e2e/browser-split-shortcuts.spec.ts
index a7563fb66f2..4d9c824bbac 100644
--- a/tests/e2e/browser-split-find-shortcut.spec.ts
+++ b/tests/e2e/browser-split-shortcuts.spec.ts
@@ -4,8 +4,9 @@ import { focusActiveTerminalInput } from './helpers/terminal'
 import { ensureTerminalVisible, waitForActiveWorktree, waitForSessionReady } from './helpers/store'
 
 const modifier = process.platform === 'darwin' ? 'Meta' : 'Control'
+const guestModifier: 'meta' | 'control' = process.platform === 'darwin' ? 'meta' : 'control'
 
-type SplitFindFixture = {
+type TerminalBrowserSplitFixture = {
   browserGroupId: string
   browserTabId: string
   terminalGroupId: string
@@ -17,7 +18,7 @@ type BrowserSplitFixture = {
   secondBrowserTabId: string
 }
 
-async function createTerminalBrowserSplit(page: Page): Promise<SplitFindFixture> {
+async function createTerminalBrowserSplit(page: Page): Promise<TerminalBrowserSplitFixture> {
   return page.evaluate(() => {
     const store = window.__store
     if (!store) {
@@ -28,6 +29,13 @@ async function createTerminalBrowserSplit(page: Page): Promise<SplitFindFixture>
     if (!worktreeId) {
       throw new Error('Active worktree unavailable')
     }
+    const terminalTabId = state.activeTabIdByWorktree[worktreeId] ?? state.activeTabId ?? undefined
+    if (
+      !terminalTabId ||
+      !(state.tabsByWorktree[worktreeId] ?? []).some((tab) => tab.id === terminalTabId)
+    ) {
+      throw new Error('Active terminal tab unavailable')
+    }
     const terminalGroupId = state.ensureWorktreeRootGroup(worktreeId)
     const browserGroupId = state.createEmptySplitGroup(worktreeId, terminalGroupId, 'right')
     if (!browserGroupId) {
@@ -38,7 +46,15 @@ async function createTerminalBrowserSplit(page: Page): Promise<SplitFindFixture>
       focusAddressBar: false,
       targetGroupId: browserGroupId
     })
-    return { browserGroupId, browserTabId: browserTab.id, terminalGroupId }
+    const browserPageId = browserTab.activePageId
+    if (!browserPageId) {
+      throw new Error('Active browser page unavailable')
+    }
+    return {
+      browserGroupId,
+      browserTabId: browserTab.id,
+      terminalGroupId
+    }
   })
 }
 
@@ -76,8 +92,12 @@ async function createBrowserSplit(page: Page): Promise<BrowserSplitFixture> {
       focusAddressBar: false,
       targetGroupId: secondBrowserGroupId
     })
+    const firstBrowserPageId = firstBrowserTab.activePageId
+    if (!firstBrowserPageId) {
+      throw new Error('First active browser page unavailable')
+    }
     return {
-      firstBrowserPageId: firstBrowserTab.activePageId,
+      firstBrowserPageId,
       firstBrowserTabId: firstBrowserTab.id,
       secondBrowserTabId: secondBrowserTab.id
     }
@@ -97,7 +117,7 @@ async function focusBrowserAddressBar(page: Page, browserTabId: string): Promise
     'form:has(> [data-orca-browser-address-bar="true"])'
   )
   await expect(addressBarForm).toBeVisible()
-  await addressBarForm.click()
+  await addressBar.focus()
   await expect(addressBar).toBeFocused()
 }
 
@@ -115,7 +135,7 @@ function browserSplitFindInput(page: Page, browserTabId: string) {
     .getByPlaceholder('Find in page...')
 }
 
-async function pressFindInBrowserGuest(
+async function waitForBrowserGuestRegistration(
   page: Page,
   browserTabId: string,
   browserPageId: string
@@ -123,7 +143,7 @@ async function pressFindInBrowserGuest(
   await expect
     .poll(() =>
       page.evaluate(
-        async ({ targetBrowserPageId, targetBrowserTabId, inputModifier }) => {
+        async ({ targetBrowserPageId, targetBrowserTabId }) => {
           const overlay = document.querySelector(
             `[data-browser-overlay-tab-id="${targetBrowserTabId}"]`
           )
@@ -140,17 +160,6 @@ async function pressFindInBrowserGuest(
             if (!registered) {
               return false
             }
-            webview.focus()
-            await webview.sendInputEvent({
-              type: 'keyDown',
-              keyCode: 'F',
-              modifiers: [inputModifier]
-            })
-            await webview.sendInputEvent({
-              type: 'keyUp',
-              keyCode: 'F',
-              modifiers: [inputModifier]
-            })
             return true
           } catch {
             return false
@@ -158,14 +167,44 @@ async function pressFindInBrowserGuest(
         },
         {
           targetBrowserPageId: browserPageId,
-          targetBrowserTabId: browserTabId,
-          inputModifier: modifier.toLowerCase()
+          targetBrowserTabId: browserTabId
         }
       )
     )
     .toBe(true)
 }
 
+async function pressFindInBrowserGuest(
+  page: Page,
+  browserTabId: string,
+  browserPageId: string
+): Promise<void> {
+  await waitForBrowserGuestRegistration(page, browserTabId, browserPageId)
+  await page.evaluate(
+    async ({ targetBrowserTabId, inputModifier }) => {
+      const overlay = document.querySelector(
+        `[data-browser-overlay-tab-id="${targetBrowserTabId}"]`
+      )
+      const webview = overlay?.querySelector('webview') as Electron.WebviewTag | null
+      if (!webview) {
+        throw new Error('Registered browser guest unavailable')
+      }
+      webview.focus()
+      await webview.sendInputEvent({
+        type: 'keyDown',
+        keyCode: 'F',
+        modifiers: [inputModifier]
+      })
+      await webview.sendInputEvent({
+        type: 'keyUp',
+        keyCode: 'F',
+        modifiers: [inputModifier]
+      })
+    },
+    { targetBrowserTabId: browserTabId, inputModifier: guestModifier }
+  )
+}
+
 function terminalFindInput(page: Page) {
   return page.locator('[data-terminal-search-root] input:visible')
 }
@@ -199,7 +238,7 @@ async function focusBrowserGroup(page: Page, groupId: string): Promise<void> {
   await waitForFocusedGroup(page, groupId)
 }
 
-test.describe('browser split Find shortcut', () => {
+test.describe('browser split shortcuts', () => {
   test.beforeEach(async ({ orcaPage }) => {
     await waitForSessionReady(orcaPage)
     await waitForActiveWorktree(orcaPage)
diff --git a/tests/e2e/cross-version-wire/cross-version-agent-session-wire.unit.test.ts b/tests/e2e/cross-version-wire/cross-version-agent-session-wire.unit.test.ts
index 093547102c6..0ce15ee6563 100644
--- a/tests/e2e/cross-version-wire/cross-version-agent-session-wire.unit.test.ts
+++ b/tests/e2e/cross-version-wire/cross-version-agent-session-wire.unit.test.ts
@@ -36,27 +36,69 @@ const WORKSPACE = 'workspace-1'
 const THREAD = '019fd532-7c11-7a90-b6de-4e1a2c3d5f60'
 const NOW = 1_800_000_000_000
 
-/** Every method the structured surface publishes, paired with the host method it
- *  must reach — a gate that hides one method and leaks another is the bug. */
-const STRUCTURED_CALLS: { method: string; hostMethod: string | null }[] = [
-  { method: 'agentSession.createSupport', hostMethod: null },
-  { method: 'agentSession.create', hostMethod: 'attach' },
-  { method: 'agentSession.ensure', hostMethod: 'attach' },
-  { method: 'agentSession.send', hostMethod: 'send' },
-  { method: 'agentSession.cancel', hostMethod: 'cancel' },
-  { method: 'agentSession.close', hostMethod: 'close' },
-  { method: 'agentSession.respondToApproval', hostMethod: 'respondToPrompt' },
-  { method: 'agentSession.respondToQuestion', hostMethod: 'respondToPrompt' },
-  { method: 'agentSession.setOption', hostMethod: 'setOption' },
-  { method: 'agentSession.handoffStatus', hostMethod: 'handoffStatus' },
-  { method: 'agentSession.options', hostMethod: 'readOptions' },
-  { method: 'agentSession.hold', hostMethod: 'hold' },
-  { method: 'agentSession.release', hostMethod: 'release' },
-  { method: 'agentSession.history', hostMethod: 'history' },
+/** Every method the structured surface publishes: the host method it must reach,
+ *  and the result it must hand back. A gate that hides one method and leaks
+ *  another is the bug; so is a method that is registered and answers with an
+ *  error, which is why `result` is declared per method rather than inferred from
+ *  "did not say method_not_found". `result` is omitted only where the method
+ *  legitimately answers with no reply at all. */
+const STRUCTURED_CALLS: {
+  method: string
+  hostMethod: string | null
+  result?: Record<string, unknown>
+}[] = [
+  { method: 'agentSession.createSupport', hostMethod: null, result: { supported: true } },
+  {
+    method: 'agentSession.create',
+    hostMethod: 'attach',
+    result: { ok: true, replayed: false, value: { sessionId: SESSION } }
+  },
+  {
+    method: 'agentSession.ensure',
+    hostMethod: 'attach',
+    result: { ok: true, replayed: false, value: { sessionId: SESSION } }
+  },
+  { method: 'agentSession.send', hostMethod: 'send', result: { ok: true, replayed: false } },
+  { method: 'agentSession.cancel', hostMethod: 'cancel', result: { ok: true, replayed: false } },
+  { method: 'agentSession.close', hostMethod: 'close', result: { ok: true } },
+  {
+    method: 'agentSession.respondToApproval',
+    hostMethod: 'respondToPrompt',
+    result: { ok: true, replayed: false }
+  },
+  {
+    method: 'agentSession.respondToQuestion',
+    hostMethod: 'respondToPrompt',
+    result: { ok: true, replayed: false }
+  },
+  {
+    method: 'agentSession.setOption',
+    hostMethod: 'setOption',
+    result: { ok: true, replayed: false }
+  },
+  {
+    method: 'agentSession.handoffStatus',
+    hostMethod: 'handoffStatus',
+    result: { owner: 'native' }
+  },
+  {
+    method: 'agentSession.options',
+    hostMethod: 'readOptions',
+    result: { current: { model: 'gpt-live' } }
+  },
+  { method: 'agentSession.hold', hostMethod: 'hold', result: { held: true } },
+  { method: 'agentSession.release', hostMethod: 'release', result: { released: true } },
+  {
+    method: 'agentSession.history',
+    hostMethod: 'history',
+    result: { ok: true, page: { items: [] } }
+  },
+  // A subscription that opens with nothing to say answers with no reply at all,
+  // so reaching the host is the only signal that the gate opened.
   { method: 'agentSession.subscribe', hostMethod: 'subscribe' },
   // Teardown runs through the runtime's subscription registry rather than the
   // host, so its reply is the only signal that the gate opened.
-  { method: 'agentSession.unsubscribe', hostMethod: null }
+  { method: 'agentSession.unsubscribe', hostMethod: null, result: { unsubscribed: true } }
 ]
 
 let baselineRef: string
@@ -199,6 +241,24 @@ function runtimeStub(): unknown {
   }
 }
 
+/**
+ * What a client too old to know the structured surface advertises: the baseline's
+ * own list, minus the capability. Derived rather than assumed to be the baseline's
+ * list as-is — the baseline is the newest release tag, so the day a release ships
+ * this capability the list would contain it and the gate below would stop being
+ * exercised at all, on a pull request that changed nothing.
+ */
+function legacyClientCapabilities(): string[] {
+  return baseline.capabilities.filter(
+    (capability) => capability !== STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY
+  )
+}
+
+/** The structured methods the baseline release actually registers, read from it. */
+function baselineStructuredMethods(): string[] {
+  return baseline.methodNames.filter((name) => name.startsWith('agentSession.'))
+}
+
 /** Every reply one call produced. Streaming methods answer more than once, and a
  *  refusal has to arrive as a reply rather than as silence. */
 async function callBuild(
@@ -219,6 +279,75 @@ async function callBuild(
   return replies
 }
 
+/** The host every skew installs to drive the surface: enough of the real host's
+ *  shape for each handler to run, and a spy per method so "which call reached the
+ *  host" is answerable per call rather than per suite. */
+function structuredHostStub(): Record<string, ReturnType<typeof vi.fn>> {
+  return {
+    attach: vi.fn(async () => ({ ok: true, replayed: false, value: { sessionId: SESSION } })),
+    send: vi.fn(async () => ({ ok: true, replayed: false })),
+    cancel: vi.fn(async () => ({ ok: true, replayed: false })),
+    close: vi.fn(async () => undefined),
+    hold: vi.fn(async () => undefined),
+    release: vi.fn(() => undefined),
+    respondToPrompt: vi.fn(async () => ({ ok: true, replayed: false })),
+    setOption: vi.fn(async () => ({ ok: true, replayed: false })),
+    requestHandoff: vi.fn(async () => ({ status: { owner: 'native' } })),
+    handoffStatus: vi.fn(async () => ({ owner: 'native' })),
+    readOptions: vi.fn(async () => ({ models: [], current: { model: 'gpt-live' } })),
+    history: vi.fn(() => ({ ok: true, page: { items: [] } })),
+    subscribe: vi.fn(() => () => undefined),
+    unsubscribe: vi.fn()
+  }
+}
+
+/**
+ * The one thing this suite exists to guarantee, written once and applied per
+ * build: every method the manifest declares is not merely registered but reaches
+ * its host method on this call, answers, and answers with its declared result.
+ *
+ * Written as a helper rather than inline because a build passing it is the claim,
+ * and each skew that registers the surface owes the same claim — a check that
+ * covers one method leaves the rest registered-but-unusable behind a green suite.
+ */
+async function expectDeclaredSurfaceExecutes(
+  build: AgentSessionWireBuild,
+  hostCalls: Record<string, ReturnType<typeof vi.fn>>,
+  clientCapabilities: readonly string[]
+): Promise<void> {
+  for (const { method, hostMethod, result } of STRUCTURED_CALLS) {
+    // Two methods share one host method, so "has been called" would already be
+    // true from the earlier one: only this call's own delta pins the pairing.
+    const before = hostMethod ? hostCalls[hostMethod].mock.calls.length : 0
+    const replies = await callBuild(build, method, paramsFor(method), {
+      clientKind: 'runtime',
+      clientCapabilities
+    })
+    if (hostMethod) {
+      expect(
+        hostCalls[hostMethod].mock.calls.length - before,
+        `${build.label}: ${method} did not reach the host`
+      ).toBe(1)
+    }
+    for (const reply of replies) {
+      expect(
+        reply,
+        `${build.label}: ${method} was refused: ${JSON.stringify(reply)}`
+      ).toMatchObject({ ok: true })
+    }
+    if (result) {
+      // The declared answer, not merely a non-refusal: a handler that is
+      // registered and returns an execution error, or hands back someone else's
+      // envelope, fails here rather than passing as "reached the host".
+      expect(replies, `${build.label}: ${method} must answer exactly once`).toHaveLength(1)
+      expect(replies[0], `${build.label}: ${method} answered off-contract`).toMatchObject({
+        ok: true,
+        result
+      })
+    }
+  }
+}
+
 describe('cross-version structured agent sessions', () => {
   it(
     'skews current code against a real published release',
@@ -239,22 +368,7 @@ describe('cross-version structured agent sessions', () => {
 
     beforeEach(() => {
       operations = 0
-      hostCalls = {
-        attach: vi.fn(async () => ({ ok: true, replayed: false, value: { sessionId: SESSION } })),
-        send: vi.fn(async () => ({ ok: true, replayed: false })),
-        cancel: vi.fn(async () => ({ ok: true, replayed: false })),
-        close: vi.fn(async () => undefined),
-        hold: vi.fn(async () => undefined),
-        release: vi.fn(() => undefined),
-        respondToPrompt: vi.fn(async () => ({ ok: true, replayed: false })),
-        setOption: vi.fn(async () => ({ ok: true, replayed: false })),
-        requestHandoff: vi.fn(async () => ({ status: { owner: 'native' } })),
-        handoffStatus: vi.fn(async () => ({ owner: 'native' })),
-        readOptions: vi.fn(async () => ({ models: [], current: { model: 'gpt-live' } })),
-        history: vi.fn(() => ({ ok: true, page: { items: [] } })),
-        subscribe: vi.fn(() => () => undefined),
-        unsubscribe: vi.fn()
-      }
+      hostCalls = structuredHostStub()
       setStructuredAgentSessionHost(hostCalls as unknown as StructuredAgentSessionHost)
     })
 
@@ -263,12 +377,13 @@ describe('cross-version structured agent sessions', () => {
     })
 
     it('is told the whole surface does not exist, and reaches no host method', async () => {
-      // The old build cannot name the capability, so its clients never send it.
-      expect(baseline.capabilities).not.toContain(STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY)
+      // Anti-vacuous: the old client still advertises a real list, so the refusal
+      // below is the capability gate answering, not an empty negotiation.
+      expect(legacyClientCapabilities().length).toBeGreaterThan(0)
       for (const { method } of STRUCTURED_CALLS) {
         const replies = await callBuild(current, method, paramsFor(method), {
           clientKind: 'runtime',
-          clientCapabilities: baseline.capabilities
+          clientCapabilities: legacyClientCapabilities()
         })
         expect(replies, `${method} must answer exactly once`).toHaveLength(1)
         expect(replies[0]).toMatchObject({
@@ -282,59 +397,91 @@ describe('cross-version structured agent sessions', () => {
     })
 
     it('is served the same calls once it advertises the capability', async () => {
-      for (const { method, hostMethod } of STRUCTURED_CALLS) {
-        const replies = await callBuild(current, method, paramsFor(method), {
-          clientKind: 'runtime',
-          clientCapabilities: [
-            ...baseline.capabilities,
-            STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY
-          ]
-        })
-        // A subscription that opens with nothing to say answers with no reply at
-        // all, so reaching the host is the signal that the gate opened.
-        if (hostMethod) {
-          expect(hostCalls[hostMethod], `${method} did not reach the host`).toHaveBeenCalled()
-        } else {
-          expect(replies[0], `${method} was refused`).toMatchObject({ ok: true })
-        }
-        for (const reply of replies) {
-          expect(reply, `${method} was refused: ${JSON.stringify(reply)}`).toMatchObject({
-            ok: true
-          })
-        }
-      }
+      await expectDeclaredSurfaceExecutes(current, hostCalls, [
+        ...legacyClientCapabilities(),
+        STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY
+      ])
     })
   })
 
   describe('a new client against an old host', () => {
-    it('finds no structured method registered on the old build', () => {
-      expect(baseline.methodNames.filter((name) => name.startsWith('agentSession.'))).toEqual([])
+    it('registers the whole surface on the new build', () => {
+      expect(current.capabilities).toContain(STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY)
       expect(current.methodNames.filter((name) => name.startsWith('agentSession.'))).toHaveLength(
         STRUCTURED_CALLS.length
       )
     })
 
     it('can detect the absence during negotiation instead of by calling', () => {
-      expect(current.capabilities).toContain(STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY)
-      expect(baseline.capabilities).not.toContain(STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY)
+      // The invariant that survives a release cut: each build's advertised list and
+      // its registered methods agree. "The old build has neither" is only true
+      // until a release ships the surface, and pinning it turns this red on the cut
+      // rather than on a change.
+      expect(baseline.capabilities.includes(STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY)).toBe(
+        baselineStructuredMethods().length > 0
+      )
       // Additive surface: bumping the protocol number would strand every paired
       // device on this release rather than degrade one feature.
       expect(current.protocolVersion).toBe(baseline.protocolVersion)
     })
 
-    it('gets a clean method_not_found from the old dispatcher rather than silence', async () => {
+    it('gets a clean answer from the old dispatcher rather than silence', async () => {
+      const registered = new Set(baselineStructuredMethods())
       for (const { method } of STRUCTURED_CALLS) {
         const replies = await callBuild(baseline, method, paramsFor(method), {
           clientKind: 'runtime',
           clientCapabilities: current.capabilities
         })
+        // Silence is the failure mode a new client cannot recover from, whatever
+        // the old build knows; the refusal code is only asserted for the methods
+        // that release genuinely does not have.
         expect(replies, `${method} must answer exactly once`).toHaveLength(1)
-        expect(replies[0], `${method} on the old host`).toMatchObject({
-          ok: false,
-          error: { code: 'method_not_found' }
-        })
+        if (!registered.has(method)) {
+          expect(replies[0], `${method} on the old host`).toMatchObject({
+            ok: false,
+            error: { code: 'method_not_found' }
+          })
+        } else {
+          expect(replies[0], `${method} is registered on the old host`).not.toMatchObject({
+            ok: false,
+            error: { code: 'method_not_found' }
+          })
+        }
       }
     })
+
+    it(
+      'executes every method a release-shaped checkout registers',
+      async () => {
+        // The stand-in for the release that ships this surface: the same source,
+        // read the way a release checkout reads it rather than through the test
+        // runner's module graph. It is the only place the "registered means
+        // usable" claim is executable today, because the baseline registers none
+        // of these methods — so it has to carry the whole manifest, not a sample.
+        const releasedCurrent = await loadAgentSessionWireBuild('HEAD')
+        expect(releasedCurrent.capabilities).toContain(STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY)
+        expect(
+          releasedCurrent.methodNames.filter((name) => name.startsWith('agentSession.'))
+        ).toHaveLength(STRUCTURED_CALLS.length)
+        // Each build owns its own host slot, so the one the suite installed in
+        // current source is not this dispatcher's. Installing here is also the
+        // anti-vacuous guard: without it every host-backed method answers
+        // `structured_agent_session_unsupported`, the same words the capability
+        // gate uses, and the run would read as a refusal rather than a miss.
+        const hostCalls = structuredHostStub()
+        await releasedCurrent.installStructuredHost(hostCalls)
+        try {
+          await expectDeclaredSurfaceExecutes(
+            releasedCurrent,
+            hostCalls,
+            releasedCurrent.capabilities
+          )
+        } finally {
+          await releasedCurrent.installStructuredHost(null)
+        }
+      },
+      SUITE_TIMEOUT_MS
+    )
   })
 
   describe('an old client against a structured-owned AI Vault row', () => {
@@ -429,7 +576,7 @@ describe('cross-version structured agent sessions', () => {
           {},
           {
             clientKind: 'runtime',
-            clientCapabilities: baseline.capabilities
+            clientCapabilities: legacyClientCapabilities()
           },
           runtime
         )
@@ -474,7 +621,7 @@ describe('cross-version structured agent sessions', () => {
             params,
             {
               clientKind: 'runtime',
-              clientCapabilities: baseline.capabilities
+              clientCapabilities: legacyClientCapabilities()
             },
             runtime
           )
@@ -487,7 +634,7 @@ describe('cross-version structured agent sessions', () => {
             current,
             'session.tabs.createTerminal',
             { worktree: `id:${WORKSPACE}`, command: `codex resume '${THREAD}'` },
-            { clientKind: 'runtime', clientCapabilities: baseline.capabilities },
+            { clientKind: 'runtime', clientCapabilities: legacyClientCapabilities() },
             runtime
           )
         )[0]
@@ -498,12 +645,29 @@ describe('cross-version structured agent sessions', () => {
             current,
             'terminal.send',
             { terminal: 'terminal-1', text: `codex resume '${THREAD}'`, enter: true },
-            { clientKind: 'runtime', clientCapabilities: baseline.capabilities },
+            { clientKind: 'runtime', clientCapabilities: legacyClientCapabilities() },
             runtime
           )
         )[0]
       ).toMatchObject({ ok: false, error: { code: 'agent_session_conflict' } })
       expect(createMobileSessionTerminal).not.toHaveBeenCalled()
+
+      // The positive control for the three refusals above: the same client, the
+      // same method, a command that is not this thread's resume, and it lands.
+      // Without it, a stub whose shape drifted from the runtime would satisfy
+      // "was never called" by never being reachable at all.
+      expect(
+        (
+          await callBuild(
+            current,
+            'session.tabs.createTerminal',
+            { worktree: `id:${WORKSPACE}`, command: 'echo unrelated' },
+            { clientKind: 'runtime', clientCapabilities: legacyClientCapabilities() },
+            runtime
+          )
+        )[0]
+      ).toMatchObject({ ok: true })
+      expect(createMobileSessionTerminal).toHaveBeenCalledTimes(1)
     })
   })
 
diff --git a/tests/e2e/cross-version-wire/cross-version-terminal-wire.unit.test.ts b/tests/e2e/cross-version-wire/cross-version-terminal-wire.unit.test.ts
index 54d303ac871..6b3a7abe5b6 100644
--- a/tests/e2e/cross-version-wire/cross-version-terminal-wire.unit.test.ts
+++ b/tests/e2e/cross-version-wire/cross-version-terminal-wire.unit.test.ts
@@ -1,6 +1,18 @@
+// Cross-version coverage for the remote terminal stream, paired in both skew
+// directions: current working tree against the newest published release.
+//
+// What each build publishes is read from that build, never written down here. The
+// baseline is whichever release tag is newest, so a list of "fields the old side
+// does not have yet" stops being true the moment a release ships one of them — the
+// suite then reddens on whatever pull request is in flight, with no code change
+// anywhere. Every version-dependent expectation below therefore comes from a
+// same-version reference pairing of the build that publishes the frame.
+
 import { afterEach, beforeAll, describe, expect, it } from 'vitest'
+import { comparePublishedFields, publishedFieldNames } from './published-field-shape'
 import { resolveBaselineReleaseRef, selectLatestStableReleaseTag } from './release-checkout'
 import {
+  CrossVersionJourneyStall,
   JOURNEY_INPUTS,
   JOURNEY_STEPS,
   runTerminalSkewJourney,
@@ -8,6 +20,7 @@ import {
 } from './terminal-skew-journey'
 import {
   loadTerminalWireBuild,
+  withoutOpcodeSupport,
   WORKING_TREE,
   type TerminalWireBuild
 } from './versioned-terminal-wire'
@@ -42,11 +55,17 @@ const EXPECTED_JOURNEY_FRAMES = [
 let baselineRef: string
 let current: TerminalWireBuild
 let baseline: TerminalWireBuild
+/** What a current host publishes to a client of its own version. */
+let currentReference: JourneyRecord
+/** What the baseline host publishes to a client of its own version. */
+let baselineReference: JourneyRecord
 
 beforeAll(async () => {
   baselineRef = resolveBaselineReleaseRef()
   current = await loadTerminalWireBuild(WORKING_TREE)
   baseline = await loadTerminalWireBuild(baselineRef)
+  currentReference = await runTerminalSkewJourney({ hostBuild: current, clientBuild: current })
+  baselineReference = await runTerminalSkewJourney({ hostBuild: baseline, clientBuild: baseline })
 }, SUITE_TIMEOUT_MS)
 
 afterEach(() => {
@@ -114,20 +133,26 @@ describe('cross-version remote terminal wire', () => {
     SUITE_TIMEOUT_MS
   )
 
-  it(
-    'current client against current server completes the journey',
-    async () => {
-      const record = await runTerminalSkewJourney({ hostBuild: current, clientBuild: current })
-      expectJourneyActuallyRan(record)
-      expectWireCompatible(record)
-      expect(record.snapshotStarts).toEqual([
-        expect.objectContaining({ alternateScreen: false, terminalOwner: 'shell' }),
-        expect.objectContaining({ alternateScreen: false, terminalOwner: 'shell' }),
-        expect.objectContaining({ alternateScreen: false, terminalOwner: 'shell' })
-      ])
-    },
-    SUITE_TIMEOUT_MS
-  )
+  it('current client against current server completes the journey, and is the reference for a current host', () => {
+    expectJourneyActuallyRan(currentReference)
+    expectWireCompatible(currentReference)
+    // Current code's own contract in both roles, so it is safe to state literally.
+    expect(currentReference.snapshotStarts).toEqual([
+      expect.objectContaining({ alternateScreen: false, terminalOwner: 'shell' }),
+      expect.objectContaining({ alternateScreen: false, terminalOwner: 'shell' }),
+      expect.objectContaining({ alternateScreen: false, terminalOwner: 'shell' })
+    ])
+  })
+
+  it('old client against old server completes the journey, and is the reference for an old host', () => {
+    expect(baselineReference.hostRevision).toBe(baseline.revision)
+    expect(baselineReference.clientRevision).toBe(baseline.revision)
+    expectJourneyActuallyRan(baselineReference)
+    expectWireCompatible(baselineReference)
+    // Anti-vacuous: a reference read from a pairing that published nothing would
+    // make every comparison against it trivially true.
+    expect(publishedFieldNames(baselineReference.snapshotStarts).length).toBeGreaterThan(4)
+  })
 
   it(
     'old client against new server completes the journey',
@@ -136,11 +161,10 @@ describe('cross-version remote terminal wire', () => {
       expect(record.clientRevision).toBe(baseline.revision)
       expectJourneyActuallyRan(record)
       expectWireCompatible(record)
-      expect(record.snapshotStarts).toEqual([
-        expect.objectContaining({ alternateScreen: false, terminalOwner: 'shell' }),
-        expect.objectContaining({ alternateScreen: false, terminalOwner: 'shell' }),
-        expect.objectContaining({ alternateScreen: false, terminalOwner: 'shell' })
-      ])
+      // Direction: the NEW host publishes here, and the old client only reads. Skew
+      // must not change what that host puts on the wire, so the expectation is the
+      // current host's own reference — whatever fields it carries today.
+      expect(record.snapshotStarts).toEqual(currentReference.snapshotStarts)
     },
     SUITE_TIMEOUT_MS
   )
@@ -152,10 +176,53 @@ describe('cross-version remote terminal wire', () => {
       expect(record.hostRevision).toBe(baseline.revision)
       expectJourneyActuallyRan(record)
       expectWireCompatible(record)
-      for (const start of record.snapshotStarts) {
-        expect(start).not.toHaveProperty('terminalOwner')
-        expect(start).not.toHaveProperty('alternateScreen')
-      }
+      // Direction: the OLD host publishes here, and the new client only reads. Which
+      // optional fields that release shipped is a property of the release, so it is
+      // read from the baseline's own pairing rather than named here.
+      expect(record.snapshotStarts).toEqual(baselineReference.snapshotStarts)
+    },
+    SUITE_TIMEOUT_MS
+  )
+
+  it('adds SnapshotStart fields rather than dropping ones the old host still publishes', () => {
+    const skew = comparePublishedFields({
+      older: publishedFieldNames(baselineReference.snapshotStarts),
+      newer: publishedFieldNames(currentReference.snapshotStarts)
+    })
+    // Rule 1 is additive-only. A field the old host still publishes is one an old
+    // client may still read, so dropping it breaks that client with no opcode
+    // change for the decoder check to catch.
+    expect(
+      skew.removed,
+      `current code stopped publishing SnapshotStart fields ${baselineRef} still publishes ` +
+        `(it added: ${skew.added.join(', ') || 'nothing'})`
+    ).toEqual([])
+  })
+
+  it(
+    'still fails a pairing whose peer cannot decode an opcode the other side sends',
+    async () => {
+      // The regression case for the guard itself: relaxing a stale field list must
+      // not relax the real incompatibility. A short barrier only bounds a stall
+      // that is already certain — the frame either arrives at once, or never.
+      const inputOpcode = Number(current.codec.TerminalStreamOpcode.Input)
+      const stall = await runTerminalSkewJourney({
+        hostBuild: withoutOpcodeSupport(current, 'Input'),
+        clientBuild: current,
+        barrierTimeoutMs: 2_000
+      }).then(
+        () => null,
+        (error: unknown) => error
+      )
+
+      expect(stall).toBeInstanceOf(CrossVersionJourneyStall)
+      const stalled = stall as CrossVersionJourneyStall
+      expect(stalled.step).toBe('input-reaches-process')
+      expect(stalled.record.completed).not.toContain('input-reaches-process')
+      expect(stalled.record.inputAtProcess).toEqual([])
+      expect(stalled.record.rejected).toContainEqual(
+        expect.objectContaining({ direction: 'client-to-host', rawOpcode: inputOpcode })
+      )
     },
     SUITE_TIMEOUT_MS
   )
diff --git a/tests/e2e/cross-version-wire/published-field-shape.ts b/tests/e2e/cross-version-wire/published-field-shape.ts
new file mode 100644
index 00000000000..726824add2e
--- /dev/null
+++ b/tests/e2e/cross-version-wire/published-field-shape.ts
@@ -0,0 +1,38 @@
+/**
+ * Reading the field shape of a published frame from the frame itself, so a
+ * cross-version expectation can be stated against the build that produced it.
+ *
+ * The baseline this suite pairs against is whichever release tag is newest, and
+ * that moves on every cut. An expectation written as a literal list of fields the
+ * old side does or does not have therefore expires by itself: the first release
+ * containing an already-merged optional field turns the assertion red on whatever
+ * pull request happens to be in flight, with no code change anywhere.
+ */
+
+export type PublishedFieldSkew = {
+  /** Names only the newer side publishes — additive, and safe under Rule 1. */
+  added: string[]
+  /** Names the older side still publishes and the newer side dropped — a break. */
+  removed: string[]
+}
+
+/** Sorted union of the keys across one published frame sequence. */
+export function publishedFieldNames(payloads: Record<string, unknown>[]): string[] {
+  return [...new Set(payloads.flatMap((payload) => Object.keys(payload)))].sort()
+}
+
+/**
+ * Which field names the two sides disagree on, by direction. Both sides are read
+ * from a real pairing; neither is a list this file knows.
+ */
+export function comparePublishedFields(args: {
+  older: string[]
+  newer: string[]
+}): PublishedFieldSkew {
+  const older = new Set(args.older)
+  const newer = new Set(args.newer)
+  return {
+    added: [...newer].filter((name) => !older.has(name)).sort(),
+    removed: [...older].filter((name) => !newer.has(name)).sort()
+  }
+}
diff --git a/tests/e2e/cross-version-wire/published-field-shape.unit.test.ts b/tests/e2e/cross-version-wire/published-field-shape.unit.test.ts
new file mode 100644
index 00000000000..53d9874f940
--- /dev/null
+++ b/tests/e2e/cross-version-wire/published-field-shape.unit.test.ts
@@ -0,0 +1,50 @@
+import { describe, expect, it } from 'vitest'
+import { comparePublishedFields, publishedFieldNames } from './published-field-shape'
+
+describe('published field shape', () => {
+  it('unions the keys across a frame sequence, so a field only one frame carries counts', () => {
+    expect(
+      publishedFieldNames([
+        { kind: 'scrollback', seq: 0 },
+        { kind: 'scrollback', seq: 27, requestId: 1 },
+        { kind: 'scrollback', seq: 27 }
+      ])
+    ).toEqual(['kind', 'requestId', 'seq'])
+  })
+
+  it('reads an empty sequence as no fields, which is what the anti-vacuous check tests', () => {
+    expect(publishedFieldNames([])).toEqual([])
+  })
+
+  it('reports an added field as added and nothing as removed', () => {
+    expect(
+      comparePublishedFields({
+        older: ['cols', 'kind', 'rows'],
+        newer: ['alternateScreen', 'cols', 'kind', 'rows', 'terminalOwner']
+      })
+    ).toEqual({ added: ['alternateScreen', 'terminalOwner'], removed: [] })
+  })
+
+  it('reports a field the newer side stopped publishing as removed', () => {
+    expect(
+      comparePublishedFields({
+        older: ['cols', 'kind', 'rows', 'source'],
+        newer: ['cols', 'kind', 'rows']
+      })
+    ).toEqual({ added: [], removed: ['source'] })
+  })
+
+  it('is silent when both sides publish the same names in a different order', () => {
+    expect(comparePublishedFields({ older: ['rows', 'cols'], newer: ['cols', 'rows'] })).toEqual({
+      added: [],
+      removed: []
+    })
+  })
+
+  it('does not repeat a name a caller passed twice', () => {
+    expect(comparePublishedFields({ older: [], newer: ['seq', 'seq'] })).toEqual({
+      added: ['seq'],
+      removed: []
+    })
+  })
+})
diff --git a/tests/e2e/cross-version-wire/terminal-skew-journey.ts b/tests/e2e/cross-version-wire/terminal-skew-journey.ts
index e5a84fc1683..136c8ee0179 100644
--- a/tests/e2e/cross-version-wire/terminal-skew-journey.ts
+++ b/tests/e2e/cross-version-wire/terminal-skew-journey.ts
@@ -63,14 +63,20 @@ function nameOpcode(build: TerminalWireBuild, opcode: number): string {
   return typeof name === 'string' ? name : `Opcode${opcode}`
 }
 
-async function barrier(label: string, predicate: () => boolean): Promise<void> {
-  try {
-    await vi.waitFor(() => expect(predicate()).toBe(true), {
-      timeout: BARRIER_TIMEOUT_MS,
-      interval: 5
-    })
-  } catch {
-    throw new Error(`Cross-version journey stalled at barrier: ${label}`)
+/**
+ * A pairing that never advanced. Carries the partial record so a caller can read
+ * what the wire actually did — which frames the receiving decoder refused, and
+ * which steps completed before the stall.
+ */
+export class CrossVersionJourneyStall extends Error {
+  readonly step: JourneyStep
+  readonly record: JourneyRecord
+
+  constructor(step: JourneyStep, detail: string, record: JourneyRecord) {
+    super(`Cross-version journey stalled at ${step}: ${detail}`)
+    this.name = 'CrossVersionJourneyStall'
+    this.step = step
+    this.record = record
   }
 }
 
@@ -86,8 +92,11 @@ async function barrier(label: string, predicate: () => boolean): Promise<void> {
 export async function runTerminalSkewJourney(args: {
   hostBuild: TerminalWireBuild
   clientBuild: TerminalWireBuild
+  /** Only lower this for a pairing whose stall is the expected outcome. */
+  barrierTimeoutMs?: number
 }): Promise<JourneyRecord> {
   const { hostBuild, clientBuild } = args
+  const barrierTimeoutMs = args.barrierTimeoutMs ?? BARRIER_TIMEOUT_MS
   const hostStub: HostTerminalRuntimeStub = createHostTerminalRuntimeStub({
     terminalHandle: TERMINAL_HANDLE,
     initialBuffer: INITIAL_BUFFER
@@ -114,6 +123,21 @@ export async function runTerminalSkewJourney(args: {
     missingRuntimeMethods: hostStub.missingRuntimeMethods
   }
 
+  const barrier = async (
+    step: JourneyStep,
+    detail: string,
+    predicate: () => boolean
+  ): Promise<void> => {
+    try {
+      await vi.waitFor(() => expect(predicate()).toBe(true), {
+        timeout: barrierTimeoutMs,
+        interval: 5
+      })
+    } catch {
+      throw new CrossVersionJourneyStall(step, detail, record)
+    }
+  }
+
   // Name opcodes with whichever build knows more of them, so an unknown opcode in
   // the journey reads as `Opcode17` instead of silently borrowing a wrong name.
   const namingBuild =
@@ -168,26 +192,27 @@ export async function runTerminalSkewJourney(args: {
 
   try {
     let terminal = await subscribe()
-    await barrier('subscribe: client never saw a `subscribed` event', () => subscribedCount >= 1)
+    await barrier('subscribe', 'client never saw a `subscribed` event', () => subscribedCount >= 1)
     record.subscribedEvents = link.connections.flatMap((connection) =>
       connection.events.filter((event) => event.type === 'subscribed')
     )
     record.completed.push('subscribe')
 
     await barrier(
-      'first-snapshot: client never rendered the initial buffer snapshot',
+      'first-snapshot',
+      'client never rendered the initial buffer snapshot',
       () => record.snapshotsRendered.length >= 1
     )
     record.completed.push('first-snapshot')
 
     terminal.sendInput(FIRST_INPUT)
-    await barrier('input-reaches-process: host never wrote the client input to the PTY', () =>
+    await barrier('input-reaches-process', 'host never wrote the client input to the PTY', () =>
       hostStub.writtenInput.includes(FIRST_INPUT)
     )
     record.completed.push('input-reaches-process')
 
     hostStub.emitOutput(LIVE_OUTPUT)
-    await barrier('live-output: client never rendered host output', () =>
+    await barrier('live-output', 'client never rendered host output', () =>
       record.dataRendered.join('').includes(LIVE_OUTPUT.trim())
     )
     record.completed.push('live-output')
@@ -203,7 +228,8 @@ export async function runTerminalSkewJourney(args: {
     const closesBeforeDrop = record.transportCloses
     link.disconnect()
     await barrier(
-      'transport-drop: client never observed the transport close',
+      'transport-drop',
+      'client never observed the transport close',
       () => record.transportCloses > closesBeforeDrop
     )
     record.completed.push('transport-drop')
@@ -211,7 +237,8 @@ export async function runTerminalSkewJourney(args: {
     const subscribedBeforeReconnect = subscribedCount
     terminal = await subscribe()
     await barrier(
-      'resubscribe: client never re-established the stream after reconnect',
+      'resubscribe',
+      'client never re-established the stream after reconnect',
       () => subscribedCount > subscribedBeforeReconnect
     )
     record.subscribedEvents = link.connections.flatMap((connection) =>
@@ -220,7 +247,7 @@ export async function runTerminalSkewJourney(args: {
     record.completed.push('resubscribe')
 
     terminal.sendInput(SECOND_INPUT)
-    await barrier('input-after-reconnect: host never wrote post-reconnect input to the PTY', () =>
+    await barrier('input-after-reconnect', 'host never wrote post-reconnect input to the PTY', () =>
       hostStub.writtenInput.includes(SECOND_INPUT)
     )
     record.completed.push('input-after-reconnect')
diff --git a/tests/e2e/cross-version-wire/versioned-agent-session-wire.ts b/tests/e2e/cross-version-wire/versioned-agent-session-wire.ts
index 420efcbd994..1b0dc297f81 100644
--- a/tests/e2e/cross-version-wire/versioned-agent-session-wire.ts
+++ b/tests/e2e/cross-version-wire/versioned-agent-session-wire.ts
@@ -1,9 +1,6 @@
-import { readFileSync, readdirSync } from 'node:fs'
-import { join } from 'node:path'
 import {
   importReleaseCheckoutModule,
   materializeReleaseCheckout,
-  REPO_ROOT,
   type ReleaseCheckout
 } from './release-checkout'
 
@@ -16,6 +13,11 @@ import {
 
 export const WORKING_TREE = 'working-tree' as const
 
+/** Each build owns its own copy of the module-level host slot, so a host installed
+ *  in current source is invisible to a release checkout's dispatcher. */
+const STRUCTURED_HOST_REGISTRY =
+  '/src/main/native-chat/agent-session-wire/structured-agent-session-registry.ts'
+
 export type RpcReply = {
   id: string
   ok: boolean
@@ -53,36 +55,34 @@ export type AgentSessionWireBuild = {
   /** A dispatcher carrying a method set this build really ships, so an
    *  unknown-method answer is about the method and not an empty registry. */
   createDispatcher: (runtime: unknown) => AgentSessionDispatcher
+  /** Put a host in *this* build's slot. Loaded on call so a release that predates
+   *  the surface stays loadable, and throws rather than no-opping so a build with
+   *  no slot cannot read as a surface that answered. */
+  installStructuredHost: (host: unknown) => Promise<void>
 }
 
 type DispatcherModule = {
   RpcDispatcher: new (options: { runtime: unknown; methods: unknown[] }) => AgentSessionDispatcher
 }
 
-// A dotted literal in a `name:` position. Deliberately loose: over-matching only
-// makes "this build registers no agentSession method" a stronger claim.
-const METHOD_NAME = /\bname:\s*'([A-Za-z][A-Za-z0-9]*(?:\.[A-Za-z0-9]+)+)'/g
-
-/**
- * Method names declared under `runtime/rpc/methods`, scanned rather than imported:
- * a released build's method manifest reaches Electron, which cannot load here.
- */
-function scanMethodNames(root: string): string[] {
-  const names = new Set<string>()
-  const walk = (directory: string): void => {
-    for (const entry of readdirSync(directory, { withFileTypes: true })) {
-      const full = join(directory, entry.name)
-      if (entry.isDirectory()) {
-        walk(full)
-      } else if (entry.isFile() && entry.name.endsWith('.ts')) {
-        for (const match of readFileSync(full, 'utf8').matchAll(METHOD_NAME)) {
-          names.add(match[1]!)
-        }
+function registeredMethodNames(methods: readonly unknown[]): string[] {
+  return methods
+    .flatMap((method) => {
+      if (!method || typeof method !== 'object') {
+        return []
       }
-    }
+      const name = Reflect.get(method, 'name')
+      return typeof name === 'string' ? [name] : []
+    })
+    .sort()
+}
+
+function applyStructuredHost(module: Record<string, unknown>, label: string, host: unknown): void {
+  const install = module.setStructuredAgentSessionHost
+  if (typeof install !== 'function') {
+    throw new Error(`Build ${label} publishes no structured agent-session host registry`)
   }
-  walk(join(root, 'src', 'main', 'runtime', 'rpc', 'methods'))
-  return [...names].sort()
+  ;(install as (next: unknown) => void)(host)
 }
 
 function capabilityStrings(module: Record<string, unknown>): readonly string[] {
@@ -94,52 +94,58 @@ function capabilityStrings(module: Record<string, unknown>): readonly string[] {
 }
 
 async function loadWorkingTreeBuild(): Promise<AgentSessionWireBuild> {
-  const [protocol, dispatcher, structured, aiVault, sessionTabs, terminal] = await Promise.all([
+  const [protocol, dispatcher, methodRegistry] = await Promise.all([
     import('../../../src/shared/protocol-version'),
     import('../../../src/main/runtime/rpc/dispatcher'),
-    import('../../../src/main/runtime/rpc/methods/structured-agent-session'),
-    import('../../../src/main/runtime/rpc/methods/ai-vault'),
-    import('../../../src/main/runtime/rpc/methods/session-tabs'),
-    import('../../../src/main/runtime/rpc/methods/terminal')
+    import('../../../src/main/runtime/rpc/methods')
   ])
   const module = dispatcher as unknown as DispatcherModule
+  const methods = methodRegistry.ALL_RPC_METHODS as unknown[]
   return {
     label: WORKING_TREE,
     revision: WORKING_TREE,
     capabilities: capabilityStrings(protocol as unknown as Record<string, unknown>),
     protocolVersion: protocol.RUNTIME_PROTOCOL_VERSION,
-    methodNames: scanMethodNames(REPO_ROOT),
+    methodNames: registeredMethodNames(methods),
     createDispatcher: (runtime) =>
       new module.RpcDispatcher({
         runtime,
-        methods: [
-          ...(structured.STRUCTURED_AGENT_SESSION_METHODS as unknown[]),
-          ...(aiVault.AI_VAULT_METHODS as unknown[]),
-          ...(sessionTabs.SESSION_TAB_METHODS as unknown[]),
-          ...(terminal.TERMINAL_METHODS as unknown[])
-        ]
-      })
+        methods
+      }),
+    installStructuredHost: async (host) => {
+      const registry =
+        await import('../../../src/main/native-chat/agent-session-wire/structured-agent-session-registry')
+      applyStructuredHost(registry as unknown as Record<string, unknown>, WORKING_TREE, host)
+    }
   }
 }
 
 async function loadReleaseBuild(checkout: ReleaseCheckout): Promise<AgentSessionWireBuild> {
-  const [protocol, dispatcher, terminalMethods] = await Promise.all([
+  const [protocol, dispatcher, methodRegistry] = await Promise.all([
     importReleaseCheckoutModule(checkout, '/src/shared/protocol-version.ts'),
     importReleaseCheckoutModule(checkout, '/src/main/runtime/rpc/dispatcher.ts'),
-    importReleaseCheckoutModule(checkout, '/src/main/runtime/rpc/methods/terminal.ts')
+    importReleaseCheckoutModule(checkout, '/src/main/runtime/rpc/methods/index.ts')
   ])
   const module = dispatcher as unknown as DispatcherModule
+  const methods = methodRegistry.ALL_RPC_METHODS as unknown[]
   return {
     label: checkout.ref,
     revision: checkout.commit,
     capabilities: capabilityStrings(protocol),
     protocolVersion: protocol.RUNTIME_PROTOCOL_VERSION as number,
-    methodNames: scanMethodNames(checkout.root),
+    methodNames: registeredMethodNames(methods),
     createDispatcher: (runtime) =>
       new module.RpcDispatcher({
         runtime,
-        methods: terminalMethods.TERMINAL_METHODS as unknown[]
-      })
+        methods
+      }),
+    installStructuredHost: async (host) => {
+      applyStructuredHost(
+        await importReleaseCheckoutModule(checkout, STRUCTURED_HOST_REGISTRY),
+        checkout.ref,
+        host
+      )
+    }
   }
 }
 
diff --git a/tests/e2e/cross-version-wire/versioned-terminal-wire.ts b/tests/e2e/cross-version-wire/versioned-terminal-wire.ts
index 08e721900d6..421f78cdb88 100644
--- a/tests/e2e/cross-version-wire/versioned-terminal-wire.ts
+++ b/tests/e2e/cross-version-wire/versioned-terminal-wire.ts
@@ -149,3 +149,37 @@ export async function loadTerminalWireBuild(ref: string): Promise<TerminalWireBu
   }
   return loadReleaseBuild(await materializeReleaseCheckout(ref))
 }
+
+/**
+ * The same build with one opcode taken out of its decoder — the shape a peer whose
+ * release predates that opcode has on the wire, without needing a release that
+ * predates it. Production drops a frame whose opcode the receiver cannot decode,
+ * so this is the failure the suite exists to catch, expressed as a build.
+ */
+export function withoutOpcodeSupport(
+  build: TerminalWireBuild,
+  opcodeName: string
+): TerminalWireBuild {
+  const opcode = build.codec.TerminalStreamOpcode[opcodeName]
+  if (typeof opcode !== 'number') {
+    throw new Error(`Build ${build.label} publishes no terminal stream opcode named ${opcodeName}`)
+  }
+  return {
+    ...build,
+    label: `${build.label}-without-${opcodeName}`,
+    codec: {
+      ...build.codec,
+      // Both directions of the reverse-mapped opcode table go, so an observer
+      // names the frame `Opcode<n>` rather than borrowing a name this build lost.
+      TerminalStreamOpcode: Object.fromEntries(
+        Object.entries(build.codec.TerminalStreamOpcode).filter(
+          ([name, value]) => name !== opcodeName && value !== opcodeName
+        )
+      ),
+      decodeTerminalStreamFrame: (bytes) => {
+        const frame = build.codec.decodeTerminalStreamFrame(bytes)
+        return frame && frame.opcode === opcode ? null : frame
+      }
+    }
+  }
+}
diff --git a/tests/e2e/helpers/store.ts b/tests/e2e/helpers/store.ts
index 92ca9461dbd..e11c3921f82 100644
--- a/tests/e2e/helpers/store.ts
+++ b/tests/e2e/helpers/store.ts
@@ -57,12 +57,10 @@ export async function getWorktreeTabs(
     }
 
     const state = store.getState()
-    return (state.tabsByWorktree[worktreeId] ?? []).map(
-      (tab): TerminalTabSummary => ({
-        id: tab.id,
-        title: tab.customTitle || tab.title
-      })
-    )
+    return (state.tabsByWorktree[worktreeId] ?? []).map((tab): TerminalTabSummary => ({
+      id: tab.id,
+      title: tab.customTitle || tab.title
+    }))
   }, worktreeId)
 }
 
@@ -116,13 +114,11 @@ export async function getBrowserTabs(
     }
 
     const state = store.getState()
-    return (state.browserTabsByWorktree[worktreeId] ?? []).map(
-      (tab): BrowserTabSummary => ({
-        id: tab.id,
-        url: tab.url,
-        title: tab.title
-      })
-    )
+    return (state.browserTabsByWorktree[worktreeId] ?? []).map((tab): BrowserTabSummary => ({
+      id: tab.id,
+      url: tab.url,
+      title: tab.title
+    }))
   }, worktreeId)
 }
 
@@ -140,13 +136,11 @@ export async function getOpenFiles(
     const state = store.getState()
     return state.openFiles
       .filter((file) => file.worktreeId === worktreeId)
-      .map(
-        (file): ExplorerFileSummary => ({
-          id: file.id,
-          filePath: file.filePath,
-          relativePath: file.relativePath
-        })
-      )
+      .map((file): ExplorerFileSummary => ({
+        id: file.id,
+        filePath: file.filePath,
+        relativePath: file.relativePath
+      }))
   }, worktreeId)
 }
 
diff --git a/tests/e2e/ssh-docker-reconnect-pane-restore.spec.ts b/tests/e2e/ssh-docker-reconnect-pane-restore.spec.ts
index 031cc0dcc81..a7a2261de68 100644
--- a/tests/e2e/ssh-docker-reconnect-pane-restore.spec.ts
+++ b/tests/e2e/ssh-docker-reconnect-pane-restore.spec.ts
@@ -46,8 +46,8 @@ const RUN_DOCKER_SSH = process.env.ORCA_E2E_SSH_DOCKER === '1'
  *   slot, and the next open throws "PTY source delivery already has an upstream owner". Seen live as
  *   an error toast and a blank pane.
  * - COMPARING record.identity.clientGeneration TO THE REQUEST is not available: that value is
- *   client-supplied through pty.openClient (dispatcher.ts:1219) and RequestContext carries no
- *   generation of its own.
+ *   client-supplied through pty.openClient (see admitsPtyDataPublication in
+ *   dispatcher-capacity-signals.ts) and RequestContext carries no generation of its own.
  *
  * The real cause is now established, and it is broader than this spec: a reconnect reuses the same
  * clientId (setWrite keeps the primary client), so the relay's activate() matches on it and returns
diff --git a/tests/e2e/terminal-ime-recorded-dom-trace-replay.ts b/tests/e2e/terminal-ime-recorded-dom-trace-replay.ts
index 9b73a5b4008..9a4c85fff02 100644
--- a/tests/e2e/terminal-ime-recorded-dom-trace-replay.ts
+++ b/tests/e2e/terminal-ime-recorded-dom-trace-replay.ts
@@ -166,7 +166,7 @@ export async function replayRecordedImeDomTrace(
   const samples: ReplayedCompositionSample[] = []
   let compositionOpen = false
 
-  for (let index = 0; index < trace.dom.length; ) {
+  for (let index = 0; index < trace.dom.length;) {
     const group = nextRecordedEventGroup(trace.dom, index)
     const recorded = group[0]
     await dispatchRecordedEvents(page, group)
diff --git a/tests/e2e/terminal-windows-codex-multiline-paste.spec.ts b/tests/e2e/terminal-windows-codex-multiline-paste.spec.ts
index c5ec42520f3..543f6072247 100644
--- a/tests/e2e/terminal-windows-codex-multiline-paste.spec.ts
+++ b/tests/e2e/terminal-windows-codex-multiline-paste.spec.ts
@@ -31,7 +31,7 @@ function pastePayload(repeats = 4): string {
     '',
     '- If the worktree is dirty before starting, stop and report it.',
     '',
-    '- Use native Windows PowerShell, Node 24, and pnpm 10.',
+    '- Use native Windows PowerShell, Node 24, and pnpm 12.',
     '',
     '- Confirm the checked-out full SHA before testing.',
     '',